summaryrefslogtreecommitdiff
path: root/spec/ruby/library/set/sortedset/shared/include.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/ruby/library/set/sortedset/shared/include.rb')
-rw-r--r--spec/ruby/library/set/sortedset/shared/include.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/spec/ruby/library/set/sortedset/shared/include.rb b/spec/ruby/library/set/sortedset/shared/include.rb
deleted file mode 100644
index cd1758819d..0000000000
--- a/spec/ruby/library/set/sortedset/shared/include.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-describe :sorted_set_include, shared: true do
- it "returns true when self contains the passed Object" do
- set = SortedSet["a", "b", "c"]
- set.send(@method, "a").should be_true
- set.send(@method, "e").should be_false
- end
-end
0.0%;'/> -rw-r--r--LGPL504
-rw-r--r--MANIFEST251
-rw-r--r--Makefile.in325
-rw-r--r--NEWS115
-rw-r--r--README101
-rw-r--r--README.EXT541
-rw-r--r--README.EXT.jp (renamed from README.EXT.ja)159
-rw-r--r--README.jp (renamed from README.ja)76
-rw-r--r--ToDo117
-rw-r--r--array.c2266
-rw-r--r--bcc32/Makefile.sub499
-rw-r--r--bcc32/README.bcc32137
-rwxr-xr-xbcc32/configure.bat92
-rwxr-xr-xbcc32/mkexports.rb27
-rw-r--r--bcc32/setup.mak133
-rw-r--r--bignum.c1312
-rwxr-xr-xbin/erb141
-rw-r--r--bin/rdoc67
-rwxr-xr-xbin/ri49
-rwxr-xr-xbin/testrb5
-rw-r--r--class.c654
-rw-r--r--common.mk446
-rw-r--r--compar.c166
-rw-r--r--config.guess1161
-rw-r--r--config.sub611
-rw-r--r--configure.in1343
-rw-r--r--cygwin/GNUmakefile.in71
-rw-r--r--defines.h234
-rw-r--r--dir.c2013
-rw-r--r--distruby.rb59
-rw-r--r--djgpp/GNUmakefile.in2
-rw-r--r--djgpp/README.djgpp2
-rw-r--r--djgpp/config.hin72
-rw-r--r--djgpp/config.sed184
-rw-r--r--[-rwxr-xr-x]djgpp/configure.bat1
-rw-r--r--dln.c358
-rw-r--r--dln.h21
-rw-r--r--dmydln.c2
-rw-r--r--doc/ChangeLog-1.8.024345
-rw-r--r--doc/NEWS-1.8.0837
-rw-r--r--doc/forwardable.rd.jp (renamed from doc/forwardable.rd.ja)0
-rw-r--r--doc/irb/irb-tools.rd.jp (renamed from doc/irb/irb-tools.rd.ja)0
-rw-r--r--doc/irb/irb.rd67
-rw-r--r--doc/irb/irb.rd.jp (renamed from doc/irb/irb.rd.ja)70
-rw-r--r--doc/shell.rd.jp (renamed from doc/shell.rd.ja)0
-rw-r--r--enum.c770
-rw-r--r--env.h16
-rw-r--r--error.c989
-rw-r--r--eval.c9161
-rw-r--r--ext/.cvsignore3
-rw-r--r--ext/.document11
-rw-r--r--ext/Setup29
-rw-r--r--ext/Setup.atheos34
-rw-r--r--ext/Setup.dj33
-rw-r--r--ext/Setup.emx20
-rw-r--r--ext/Setup.nt25
-rw-r--r--ext/Setup.x6832
-rw-r--r--ext/Win32API/.cvsignore3
-rw-r--r--ext/Win32API/MANIFEST7
-rw-r--r--ext/Win32API/Win32API.c232
-rw-r--r--ext/Win32API/extconf.rb9
-rw-r--r--ext/Win32API/lib/win32/registry.rb831
-rw-r--r--ext/Win32API/lib/win32/resolv.rb366
-rw-r--r--ext/aix_mksym.rb33
-rw-r--r--ext/bigdecimal/.cvsignore3
-rw-r--r--ext/bigdecimal/README60
-rw-r--r--ext/bigdecimal/bigdecimal.c4695
-rw-r--r--ext/bigdecimal/bigdecimal.def2
-rw-r--r--ext/bigdecimal/bigdecimal.h216
-rw-r--r--ext/bigdecimal/bigdecimal_en.html796
-rw-r--r--ext/bigdecimal/bigdecimal_ja.html799
-rw-r--r--ext/bigdecimal/depend1
-rw-r--r--ext/bigdecimal/extconf.rb2
-rw-r--r--ext/bigdecimal/lib/bigdecimal/jacobian.rb85
-rw-r--r--ext/bigdecimal/lib/bigdecimal/ludcmp.rb84
-rw-r--r--ext/bigdecimal/lib/bigdecimal/math.rb235
-rw-r--r--ext/bigdecimal/lib/bigdecimal/newton.rb77
-rw-r--r--ext/bigdecimal/lib/bigdecimal/util.rb65
-rw-r--r--ext/bigdecimal/sample/linear.rb71
-rw-r--r--ext/bigdecimal/sample/nlsolve.rb38
-rw-r--r--ext/bigdecimal/sample/pi.rb20
-rw-r--r--ext/configsub.rb32
-rw-r--r--ext/curses/.cvsignore2
-rw-r--r--ext/curses/MANIFEST7
-rw-r--r--ext/curses/curses.c1439
-rw-r--r--ext/curses/extconf.rb24
-rw-r--r--ext/curses/hello.rb2
-rw-r--r--ext/curses/mouse.rb53
-rw-r--r--ext/curses/view.rb2
-rw-r--r--ext/curses/view2.rb115
-rw-r--r--ext/dbm/.cvsignore2
-rw-r--r--ext/dbm/MANIFEST4
-rw-r--r--ext/dbm/dbm.c376
-rw-r--r--ext/dbm/extconf.rb54
-rw-r--r--ext/digest/.cvsignore3
-rw-r--r--ext/digest/bubblebabble/.cvsignore3
-rw-r--r--ext/digest/bubblebabble/bubblebabble.c142
-rw-r--r--ext/digest/bubblebabble/depend3
-rw-r--r--ext/digest/bubblebabble/extconf.rb6
-rw-r--r--ext/digest/defs.h33
-rw-r--r--ext/digest/depend2
-rw-r--r--ext/digest/digest.c642
-rw-r--r--ext/digest/digest.h32
-rw-r--r--ext/digest/extconf.rb10
-rw-r--r--ext/digest/lib/digest.rb50
-rw-r--r--ext/digest/lib/md5.rb23
-rw-r--r--ext/digest/lib/sha1.rb23
-rw-r--r--ext/digest/md5/.cvsignore3
-rw-r--r--ext/digest/md5/depend6
-rw-r--r--ext/digest/md5/extconf.rb29
-rw-r--r--ext/digest/md5/md5.c420
-rw-r--r--ext/digest/md5/md5.h80
-rw-r--r--ext/digest/md5/md5init.c40
-rw-r--r--ext/digest/md5/md5ossl.c9
-rw-r--r--ext/digest/md5/md5ossl.h13
-rw-r--r--ext/digest/rmd160/.cvsignore3
-rw-r--r--ext/digest/rmd160/depend6
-rw-r--r--ext/digest/rmd160/extconf.rb28
-rw-r--r--ext/digest/rmd160/rmd160.c457
-rw-r--r--ext/digest/rmd160/rmd160.h56
-rw-r--r--ext/digest/rmd160/rmd160init.c40
-rw-r--r--ext/digest/rmd160/rmd160ossl.c8
-rw-r--r--ext/digest/rmd160/rmd160ossl.h19
-rw-r--r--ext/digest/sha1/.cvsignore3
-rw-r--r--ext/digest/sha1/depend6
-rw-r--r--ext/digest/sha1/extconf.rb28
-rw-r--r--ext/digest/sha1/sha1.c269
-rw-r--r--ext/digest/sha1/sha1.h39
-rw-r--r--ext/digest/sha1/sha1init.c40
-rw-r--r--ext/digest/sha1/sha1ossl.c10
-rw-r--r--ext/digest/sha1/sha1ossl.h20
-rw-r--r--ext/digest/sha2/.cvsignore3
-rw-r--r--ext/digest/sha2/depend5
-rw-r--r--ext/digest/sha2/extconf.rb24
-rw-r--r--ext/digest/sha2/lib/sha2.rb73
-rw-r--r--ext/digest/sha2/sha2.c919
-rw-r--r--ext/digest/sha2/sha2.h109
-rw-r--r--ext/digest/sha2/sha2init.c52
-rw-r--r--ext/digest/test.sh30
-rw-r--r--ext/dl/.cvsignore8
-rw-r--r--ext/dl/depend46
-rw-r--r--ext/dl/dl.c728
-rw-r--r--ext/dl/dl.def59
-rw-r--r--ext/dl/dl.h313
-rw-r--r--ext/dl/doc/dl.txt266
-rw-r--r--ext/dl/extconf.rb193
-rw-r--r--ext/dl/h2rb500
-rw-r--r--ext/dl/handle.c215
-rw-r--r--ext/dl/install.rb49
-rw-r--r--ext/dl/lib/dl/import.rb225
-rw-r--r--ext/dl/lib/dl/struct.rb149
-rw-r--r--ext/dl/lib/dl/types.rb245
-rw-r--r--ext/dl/lib/dl/win32.rb25
-rw-r--r--ext/dl/mkcall.rb62
-rw-r--r--ext/dl/mkcallback.rb56
-rw-r--r--ext/dl/mkcbtable.rb18
-rw-r--r--ext/dl/ptr.c1068
-rw-r--r--ext/dl/sample/c++sample.C35
-rw-r--r--ext/dl/sample/c++sample.rb60
-rw-r--r--ext/dl/sample/drives.rb70
-rw-r--r--ext/dl/sample/getch.rb5
-rw-r--r--ext/dl/sample/libc.rb69
-rw-r--r--ext/dl/sample/msgbox.rb19
-rw-r--r--ext/dl/sample/msgbox2.rb18
-rw-r--r--ext/dl/sample/stream.rb87
-rw-r--r--ext/dl/sym.c992
-rw-r--r--ext/dl/test/libtest.def28
-rw-r--r--ext/dl/test/test.c247
-rw-r--r--ext/dl/test/test.rb306
-rw-r--r--ext/dl/type.rb115
-rw-r--r--ext/enumerator/enumerator.c298
-rw-r--r--ext/enumerator/enumerator.txt102
-rw-r--r--ext/enumerator/extconf.rb2
-rw-r--r--ext/etc/.cvsignore2
-rw-r--r--ext/etc/MANIFEST6
-rw-r--r--ext/etc/etc.c393
-rw-r--r--ext/etc/etc.txt2
-rw-r--r--ext/etc/etc.txt.jp (renamed from ext/etc/etc.txt.ja)2
-rw-r--r--ext/etc/extconf.rb56
-rw-r--r--ext/extmk.rb555
-rw-r--r--ext/extmk.rb.in779
-rw-r--r--ext/fcntl/.cvsignore2
-rw-r--r--ext/fcntl/MANIFEST3
-rw-r--r--ext/fcntl/extconf.rb2
-rw-r--r--ext/fcntl/fcntl.c82
-rw-r--r--ext/gdbm/.cvsignore2
-rw-r--r--ext/gdbm/MANIFEST5
-rw-r--r--ext/gdbm/gdbm.c884
-rw-r--r--ext/iconv/.cvsignore5
-rw-r--r--ext/iconv/charset_alias.rb103
-rw-r--r--ext/iconv/depend2
-rw-r--r--ext/iconv/extconf.rb51
-rw-r--r--ext/iconv/iconv.c910
-rw-r--r--ext/io/wait/extconf.rb17
-rw-r--r--ext/io/wait/lib/nonblock.rb23
-rw-r--r--ext/io/wait/wait.c126
-rw-r--r--ext/md5/.cvsignore (renamed from ext/enumerator/.cvsignore)1
-rw-r--r--ext/md5/MANIFEST8
-rw-r--r--ext/md5/depend2
-rw-r--r--ext/md5/extconf.rb3
-rw-r--r--ext/md5/md5.h86
-rw-r--r--ext/md5/md5.txt50
-rw-r--r--ext/md5/md5.txt.jp50
-rw-r--r--ext/md5/md5c.c337
-rw-r--r--ext/md5/md5init.c114
-rw-r--r--ext/nkf/.cvsignore2
-rw-r--r--ext/nkf/MANIFEST7
-rw-r--r--ext/nkf/depend2
-rw-r--r--ext/nkf/lib/kconv.rb336
-rw-r--r--ext/nkf/nkf-utf8/config.h88
-rw-r--r--ext/nkf/nkf-utf8/nkf.c6040
-rw-r--r--ext/nkf/nkf-utf8/utf8tbl.c8500
-rw-r--r--ext/nkf/nkf-utf8/utf8tbl.h34
-rw-r--r--ext/nkf/nkf.c568
-rw-r--r--ext/nkf/nkf1.7/nkf.c1900
-rw-r--r--ext/nkf/test.rb318
-rw-r--r--ext/openssl/.cvsignore5
-rw-r--r--ext/openssl/extconf.rb121
-rw-r--r--ext/openssl/lib/net/ftptls.rb53
-rw-r--r--ext/openssl/lib/net/telnets.rb251
-rw-r--r--ext/openssl/lib/openssl.rb24
-rw-r--r--ext/openssl/lib/openssl/bn.rb35
-rw-r--r--ext/openssl/lib/openssl/buffering.rb239
-rw-r--r--ext/openssl/lib/openssl/cipher.rb58
-rw-r--r--ext/openssl/lib/openssl/digest.rb49
-rw-r--r--ext/openssl/lib/openssl/ssl.rb135
-rw-r--r--ext/openssl/lib/openssl/x509.rb154
-rw-r--r--ext/openssl/openssl_missing.c345
-rw-r--r--ext/openssl/openssl_missing.h130
-rw-r--r--ext/openssl/ossl.c476
-rw-r--r--ext/openssl/ossl.h220
-rw-r--r--ext/openssl/ossl_asn1.c1170
-rw-r--r--ext/openssl/ossl_asn1.h59
-rw-r--r--ext/openssl/ossl_bio.c73
-rw-r--r--ext/openssl/ossl_bio.h21
-rw-r--r--ext/openssl/ossl_bn.c719
-rw-r--r--ext/openssl/ossl_bn.h22
-rw-r--r--ext/openssl/ossl_cipher.c410
-rw-r--r--ext/openssl/ossl_cipher.h23
-rw-r--r--ext/openssl/ossl_config.c462
-rw-r--r--ext/openssl/ossl_config.h22
-rw-r--r--ext/openssl/ossl_digest.c298
-rw-r--r--ext/openssl/ossl_digest.h23
-rw-r--r--ext/openssl/ossl_engine.c393
-rw-r--r--ext/openssl/ossl_engine.h20
-rw-r--r--ext/openssl/ossl_hmac.c224
-rw-r--r--ext/openssl/ossl_hmac.h19
-rw-r--r--ext/openssl/ossl_ns_spki.c257
-rw-r--r--ext/openssl/ossl_ns_spki.h21
-rw-r--r--ext/openssl/ossl_ocsp.c769
-rw-r--r--ext/openssl/ossl_ocsp.h24
-rw-r--r--ext/openssl/ossl_pkcs12.c154
-rw-r--r--ext/openssl/ossl_pkcs12.h16
-rw-r--r--ext/openssl/ossl_pkcs5.h6
-rw-r--r--ext/openssl/ossl_pkcs7.c995
-rw-r--r--ext/openssl/ossl_pkcs7.h23
-rw-r--r--ext/openssl/ossl_pkey.c236
-rw-r--r--ext/openssl/ossl_pkey.h120
-rw-r--r--ext/openssl/ossl_pkey_dh.c463
-rw-r--r--ext/openssl/ossl_pkey_dsa.c422
-rw-r--r--ext/openssl/ossl_pkey_rsa.c518
-rw-r--r--ext/openssl/ossl_rand.c134
-rw-r--r--ext/openssl/ossl_rand.h20
-rw-r--r--ext/openssl/ossl_ssl.c941
-rw-r--r--ext/openssl/ossl_ssl.h21
-rw-r--r--ext/openssl/ossl_version.h16
-rw-r--r--ext/openssl/ossl_x509.c104
-rw-r--r--ext/openssl/ossl_x509.h114
-rw-r--r--ext/openssl/ossl_x509attr.c249
-rw-r--r--ext/openssl/ossl_x509cert.c671
-rw-r--r--ext/openssl/ossl_x509crl.c535
-rw-r--r--ext/openssl/ossl_x509ext.c456
-rw-r--r--ext/openssl/ossl_x509name.c344
-rw-r--r--ext/openssl/ossl_x509req.c466
-rw-r--r--ext/openssl/ossl_x509revoked.c229
-rw-r--r--ext/openssl/ossl_x509store.c613
-rw-r--r--ext/openssl/ruby_missing.h18
-rw-r--r--ext/pty/.cvsignore2
-rw-r--r--ext/pty/MANIFEST12
-rw-r--r--ext/pty/README40
-rw-r--r--ext/pty/README.expect.jp (renamed from ext/pty/README.expect.ja)0
-rw-r--r--ext/pty/README.jp (renamed from ext/pty/README.ja)0
-rw-r--r--ext/pty/expect_sample.rb15
-rw-r--r--ext/pty/extconf.rb7
-rw-r--r--ext/pty/lib/expect.rb6
-rw-r--r--ext/pty/pty.c360
-rw-r--r--ext/pty/script.rb3
-rw-r--r--ext/pty/shl.rb8
-rw-r--r--ext/purelib.rb3
-rw-r--r--ext/racc/cparse/.cvsignore3
-rw-r--r--ext/racc/cparse/cparse.c828
-rw-r--r--ext/racc/cparse/depend1
-rw-r--r--ext/racc/cparse/extconf.rb4
-rw-r--r--ext/readline/.cvsignore2
-rw-r--r--ext/readline/MANIFEST5
-rw-r--r--ext/readline/README57
-rw-r--r--ext/readline/README.ja63
-rw-r--r--ext/readline/extconf.rb65
-rw-r--r--ext/readline/readline.c571
-rw-r--r--ext/sdbm/.cvsignore2
-rw-r--r--ext/sdbm/MANIFEST6
-rw-r--r--ext/sdbm/_sdbm.c4
-rw-r--r--ext/sdbm/init.c323
-rw-r--r--ext/socket/.cvsignore2
-rw-r--r--ext/socket/MANIFEST8
-rw-r--r--ext/socket/addrinfo.h7
-rw-r--r--ext/socket/extconf.rb301
-rw-r--r--ext/socket/getaddrinfo.c37
-rw-r--r--ext/socket/getnameinfo.c20
-rw-r--r--ext/socket/socket.c3514
-rw-r--r--ext/stringio/.cvsignore3
-rw-r--r--ext/stringio/README19
-rw-r--r--ext/stringio/depend2
-rw-r--r--ext/stringio/extconf.rb2
-rw-r--r--ext/stringio/stringio.c1320
-rw-r--r--ext/strscan/.cvsignore3
-rw-r--r--ext/strscan/depend1
-rw-r--r--ext/strscan/extconf.rb2
-rw-r--r--ext/strscan/strscan.c1320
-rw-r--r--ext/syck/.cvsignore3
-rw-r--r--ext/syck/bytecode.c1166
-rw-r--r--ext/syck/depend12
-rw-r--r--ext/syck/emitter.c1242
-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.c174
-rw-r--r--ext/syck/implicit.c2990
-rw-r--r--ext/syck/node.c408
-rw-r--r--ext/syck/rubyext.c2367
-rw-r--r--ext/syck/syck.c504
-rw-r--r--ext/syck/syck.h458
-rw-r--r--ext/syck/token.c2725
-rw-r--r--ext/syck/yaml2byte.c257
-rw-r--r--ext/syck/yamlbyte.h170
-rw-r--r--ext/syslog/.cvsignore3
-rw-r--r--ext/syslog/depend2
-rw-r--r--ext/syslog/extconf.rb10
-rw-r--r--ext/syslog/syslog.c394
-rw-r--r--ext/syslog/syslog.txt121
-rw-r--r--ext/syslog/test.rb164
-rw-r--r--ext/tcltklib/.cvsignore (renamed from ext/io/wait/.cvsignore)1
-rw-r--r--ext/tcltklib/MANIFEST16
-rw-r--r--ext/tcltklib/MANUAL.euc124
-rw-r--r--ext/tcltklib/README.euc (renamed from ext/tk/old-README.tcltklib.eucj)26
-rw-r--r--ext/tcltklib/demo/lines0.tcl (renamed from ext/tk/sample/tcltklib/lines0.tcl)0
-rw-r--r--ext/tcltklib/demo/lines1.rb (renamed from ext/tk/sample/tcltklib/lines2.rb)0
-rw-r--r--ext/tcltklib/demo/lines2.rb (renamed from ext/tk/sample/tcltklib/lines1.rb)0
-rw-r--r--ext/tcltklib/depend2
-rw-r--r--ext/tcltklib/extconf.rb71
-rw-r--r--ext/tcltklib/lib/tcltk.rb (renamed from ext/tk/lib/tcltk.rb)36
-rw-r--r--ext/tcltklib/sample/batsu.gif (renamed from ext/tk/sample/tcltklib/batsu.gif)bin538 -> 538 bytes-rw-r--r--ext/tcltklib/sample/maru.gif (renamed from ext/tk/sample/tcltklib/maru.gif)bin481 -> 481 bytes-rw-r--r--ext/tcltklib/sample/sample0.rb (renamed from ext/tk/sample/tcltklib/sample0.rb)0
-rw-r--r--ext/tcltklib/sample/sample1.rb (renamed from ext/tk/sample/tcltklib/sample1.rb)36
-rw-r--r--ext/tcltklib/sample/sample2.rb449
-rw-r--r--ext/tcltklib/stubs.c86
-rw-r--r--ext/tcltklib/tcltklib.c527
-rw-r--r--ext/thread/extconf.rb9
-rw-r--r--ext/thread/lib/thread.rb5
-rw-r--r--ext/thread/thread.c1203
-rw-r--r--ext/tk/.cvsignore2
-rw-r--r--ext/tk/ChangeLog.tkextlib918
-rw-r--r--ext/tk/MANIFEST25
-rw-r--r--ext/tk/MANUAL_tcltklib.eng445
-rw-r--r--ext/tk/MANUAL_tcltklib.eucj557
-rw-r--r--ext/tk/README.1st22
-rw-r--r--ext/tk/README.ActiveTcl49
-rw-r--r--ext/tk/README.fork34
-rw-r--r--ext/tk/README.macosx-aqua67
-rw-r--r--ext/tk/README.tcltklib81
-rw-r--r--ext/tk/depend3
-rw-r--r--ext/tk/extconf.rb312
-rw-r--r--ext/tk/lib/README30
-rw-r--r--ext/tk/lib/multi-tk.rb3233
-rw-r--r--ext/tk/lib/remote-tk.rb526
-rw-r--r--ext/tk/lib/tk.rb6388
-rw-r--r--ext/tk/lib/tk/after.rb6
-rw-r--r--ext/tk/lib/tk/autoload.rb196
-rw-r--r--ext/tk/lib/tk/bgerror.rb29
-rw-r--r--ext/tk/lib/tk/bindtag.rb81
-rw-r--r--ext/tk/lib/tk/button.rb27
-rw-r--r--ext/tk/lib/tk/canvas.rb759
-rw-r--r--ext/tk/lib/tk/canvastag.rb375
-rw-r--r--ext/tk/lib/tk/checkbutton.rb25
-rw-r--r--ext/tk/lib/tk/clipboard.rb75
-rw-r--r--ext/tk/lib/tk/clock.rb71
-rw-r--r--ext/tk/lib/tk/composite.rb394
-rw-r--r--ext/tk/lib/tk/console.rb52
-rw-r--r--ext/tk/lib/tk/dialog.rb326
-rw-r--r--ext/tk/lib/tk/encodedstr.rb111
-rw-r--r--ext/tk/lib/tk/entry.rb117
-rw-r--r--ext/tk/lib/tk/event.rb488
-rw-r--r--ext/tk/lib/tk/font.rb1762
-rw-r--r--ext/tk/lib/tk/frame.rb128
-rw-r--r--ext/tk/lib/tk/grid.rb220
-rw-r--r--ext/tk/lib/tk/image.rb237
-rw-r--r--ext/tk/lib/tk/itemconfig.rb1061
-rw-r--r--ext/tk/lib/tk/itemfont.rb300
-rw-r--r--ext/tk/lib/tk/kinput.rb71
-rw-r--r--ext/tk/lib/tk/label.rb18
-rw-r--r--ext/tk/lib/tk/labelframe.rb25
-rw-r--r--ext/tk/lib/tk/listbox.rb279
-rw-r--r--ext/tk/lib/tk/macpkg.rb73
-rw-r--r--ext/tk/lib/tk/menu.rb632
-rw-r--r--ext/tk/lib/tk/menubar.rb131
-rw-r--r--ext/tk/lib/tk/menuspec.rb269
-rw-r--r--ext/tk/lib/tk/message.rb19
-rw-r--r--ext/tk/lib/tk/mngfocus.rb33
-rw-r--r--ext/tk/lib/tk/msgcat.rb292
-rw-r--r--ext/tk/lib/tk/namespace.rb500
-rw-r--r--ext/tk/lib/tk/optiondb.rb371
-rw-r--r--ext/tk/lib/tk/optionobj.rb212
-rw-r--r--ext/tk/lib/tk/pack.rb90
-rw-r--r--ext/tk/lib/tk/package.rb139
-rw-r--r--ext/tk/lib/tk/palette.rb55
-rw-r--r--ext/tk/lib/tk/panedwindow.rb232
-rw-r--r--ext/tk/lib/tk/place.rb128
-rw-r--r--ext/tk/lib/tk/radiobutton.rb66
-rw-r--r--ext/tk/lib/tk/root.rb108
-rw-r--r--ext/tk/lib/tk/scale.rb86
-rw-r--r--ext/tk/lib/tk/scrollable.rb82
-rw-r--r--ext/tk/lib/tk/scrollbar.rb124
-rw-r--r--ext/tk/lib/tk/scrollbox.rb36
-rw-r--r--ext/tk/lib/tk/selection.rb86
-rw-r--r--ext/tk/lib/tk/spinbox.rb99
-rw-r--r--ext/tk/lib/tk/tagfont.rb43
-rw-r--r--ext/tk/lib/tk/text.rb1550
-rw-r--r--ext/tk/lib/tk/textimage.rb82
-rw-r--r--ext/tk/lib/tk/textmark.rb166
-rw-r--r--ext/tk/lib/tk/texttag.rb279
-rw-r--r--ext/tk/lib/tk/textwindow.rb149
-rw-r--r--ext/tk/lib/tk/timer.rb634
-rw-r--r--ext/tk/lib/tk/toplevel.rb257
-rw-r--r--ext/tk/lib/tk/txtwin_abst.rb39
-rw-r--r--ext/tk/lib/tk/validation.rb376
-rw-r--r--ext/tk/lib/tk/variable.rb1651
-rw-r--r--ext/tk/lib/tk/virtevent.rb106
-rw-r--r--ext/tk/lib/tk/winfo.rb392
-rw-r--r--ext/tk/lib/tk/winpkg.rb143
-rw-r--r--ext/tk/lib/tk/wm.rb360
-rw-r--r--ext/tk/lib/tk/xim.rb122
-rw-r--r--ext/tk/lib/tkafter.rb316
-rw-r--r--ext/tk/lib/tkbgerror.rb17
-rw-r--r--ext/tk/lib/tkcanvas.rb943
-rw-r--r--ext/tk/lib/tkclass.rb15
-rw-r--r--ext/tk/lib/tkconsole.rb4
-rw-r--r--ext/tk/lib/tkdialog.rb141
-rw-r--r--ext/tk/lib/tkentry.rb215
-rw-r--r--ext/tk/lib/tkextlib/ICONS.rb13
-rw-r--r--ext/tk/lib/tkextlib/ICONS/icons.rb129
-rw-r--r--ext/tk/lib/tkextlib/ICONS/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/SUPPORT_STATUS196
-rw-r--r--ext/tk/lib/tkextlib/blt.rb187
-rw-r--r--ext/tk/lib/tkextlib/blt/barchart.rb79
-rw-r--r--ext/tk/lib/tkextlib/blt/bitmap.rb99
-rw-r--r--ext/tk/lib/tkextlib/blt/busy.rb82
-rw-r--r--ext/tk/lib/tkextlib/blt/component.rb1835
-rw-r--r--ext/tk/lib/tkextlib/blt/container.rb28
-rw-r--r--ext/tk/lib/tkextlib/blt/cutbuffer.rb23
-rw-r--r--ext/tk/lib/tkextlib/blt/dragdrop.rb214
-rw-r--r--ext/tk/lib/tkextlib/blt/eps.rb32
-rw-r--r--ext/tk/lib/tkextlib/blt/graph.rb67
-rw-r--r--ext/tk/lib/tkextlib/blt/htext.rb110
-rw-r--r--ext/tk/lib/tkextlib/blt/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/blt/spline.rb23
-rw-r--r--ext/tk/lib/tkextlib/blt/stripchart.rb74
-rw-r--r--ext/tk/lib/tkextlib/blt/table.rb386
-rw-r--r--ext/tk/lib/tkextlib/blt/tabnotebook.rb21
-rw-r--r--ext/tk/lib/tkextlib/blt/tabset.rb401
-rw-r--r--ext/tk/lib/tkextlib/blt/ted.rb62
-rw-r--r--ext/tk/lib/tkextlib/blt/tile.rb21
-rw-r--r--ext/tk/lib/tkextlib/blt/tile/button.rb16
-rw-r--r--ext/tk/lib/tkextlib/blt/tile/checkbutton.rb17
-rw-r--r--ext/tk/lib/tkextlib/blt/tile/frame.rb16
-rw-r--r--ext/tk/lib/tkextlib/blt/tile/label.rb16
-rw-r--r--ext/tk/lib/tkextlib/blt/tile/radiobutton.rb17
-rw-r--r--ext/tk/lib/tkextlib/blt/tile/scrollbar.rb16
-rw-r--r--ext/tk/lib/tkextlib/blt/tile/toplevel.rb16
-rw-r--r--ext/tk/lib/tkextlib/blt/tree.rb923
-rw-r--r--ext/tk/lib/tkextlib/blt/treeview.rb1146
-rw-r--r--ext/tk/lib/tkextlib/blt/unix_dnd.rb129
-rw-r--r--ext/tk/lib/tkextlib/blt/vector.rb243
-rw-r--r--ext/tk/lib/tkextlib/blt/watch.rb142
-rw-r--r--ext/tk/lib/tkextlib/blt/win_printer.rb61
-rw-r--r--ext/tk/lib/tkextlib/blt/winop.rb107
-rw-r--r--ext/tk/lib/tkextlib/bwidget.rb151
-rw-r--r--ext/tk/lib/tkextlib/bwidget/arrowbutton.rb21
-rw-r--r--ext/tk/lib/tkextlib/bwidget/bitmap.rb21
-rw-r--r--ext/tk/lib/tkextlib/bwidget/button.rb31
-rw-r--r--ext/tk/lib/tkextlib/bwidget/buttonbox.rb78
-rw-r--r--ext/tk/lib/tkextlib/bwidget/combobox.rb45
-rw-r--r--ext/tk/lib/tkextlib/bwidget/dialog.rb157
-rw-r--r--ext/tk/lib/tkextlib/bwidget/dragsite.rb31
-rw-r--r--ext/tk/lib/tkextlib/bwidget/dropsite.rb39
-rw-r--r--ext/tk/lib/tkextlib/bwidget/dynamichelp.rb56
-rw-r--r--ext/tk/lib/tkextlib/bwidget/entry.rb43
-rw-r--r--ext/tk/lib/tkextlib/bwidget/label.rb41
-rw-r--r--ext/tk/lib/tkextlib/bwidget/labelentry.rb80
-rw-r--r--ext/tk/lib/tkextlib/bwidget/labelframe.rb46
-rw-r--r--ext/tk/lib/tkextlib/bwidget/listbox.rb339
-rw-r--r--ext/tk/lib/tkextlib/bwidget/mainframe.rb92
-rw-r--r--ext/tk/lib/tkextlib/bwidget/messagedlg.rb178
-rw-r--r--ext/tk/lib/tkextlib/bwidget/notebook.rb148
-rw-r--r--ext/tk/lib/tkextlib/bwidget/pagesmanager.rb61
-rw-r--r--ext/tk/lib/tkextlib/bwidget/panedwindow.rb31
-rw-r--r--ext/tk/lib/tkextlib/bwidget/panelframe.rb51
-rw-r--r--ext/tk/lib/tkextlib/bwidget/passwddlg.rb44
-rw-r--r--ext/tk/lib/tkextlib/bwidget/progressbar.rb20
-rw-r--r--ext/tk/lib/tkextlib/bwidget/progressdlg.rb54
-rw-r--r--ext/tk/lib/tkextlib/bwidget/scrollableframe.rb34
-rw-r--r--ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb32
-rw-r--r--ext/tk/lib/tkextlib/bwidget/scrollview.rb25
-rw-r--r--ext/tk/lib/tkextlib/bwidget/selectcolor.rb45
-rw-r--r--ext/tk/lib/tkextlib/bwidget/selectfont.rb85
-rw-r--r--ext/tk/lib/tkextlib/bwidget/separator.rb20
-rw-r--r--ext/tk/lib/tkextlib/bwidget/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/bwidget/spinbox.rb98
-rw-r--r--ext/tk/lib/tkextlib/bwidget/statusbar.rb46
-rw-r--r--ext/tk/lib/tkextlib/bwidget/titleframe.rb27
-rw-r--r--ext/tk/lib/tkextlib/bwidget/tree.rb434
-rw-r--r--ext/tk/lib/tkextlib/bwidget/widget.rb113
-rw-r--r--ext/tk/lib/tkextlib/itcl.rb13
-rw-r--r--ext/tk/lib/tkextlib/itcl/incr_tcl.rb172
-rw-r--r--ext/tk/lib/tkextlib/itcl/setup.rb13
-rw-r--r--ext/tk/lib/tkextlib/itk.rb13
-rw-r--r--ext/tk/lib/tkextlib/itk/incr_tk.rb428
-rw-r--r--ext/tk/lib/tkextlib/itk/setup.rb13
-rw-r--r--ext/tk/lib/tkextlib/iwidgets.rb94
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/buttonbox.rb119
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/calendar.rb106
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb53
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb38
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/checkbox.rb116
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/combobox.rb104
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/dateentry.rb20
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/datefield.rb58
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/dialog.rb20
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/dialogshell.rb119
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb50
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/entryfield.rb166
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/extbutton.rb40
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb46
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb33
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/feedback.rb35
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb46
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb33
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/finddialog.rb42
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/hierarchy.rb309
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb50
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/labeledframe.rb39
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb45
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/mainwindow.rb67
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/menubar.rb210
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/messagebox.rb91
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/messagedialog.rb20
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/notebook.rb168
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/optionmenu.rb92
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/panedwindow.rb132
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/promptdialog.rb131
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/pushbutton.rb35
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/radiobox.rb116
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scopedobject.rb24
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb347
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb59
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb58
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb207
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb538
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb20
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/selectionbox.rb102
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb92
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/shell.rb38
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spindate.rb48
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spinint.rb30
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spinner.rb150
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/spintime.rb48
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb169
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/tabset.rb99
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/timeentry.rb25
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/timefield.rb58
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/toolbar.rb112
-rw-r--r--ext/tk/lib/tkextlib/iwidgets/watch.rb56
-rwxr-xr-xext/tk/lib/tkextlib/pkg_checker.rb184
-rw-r--r--ext/tk/lib/tkextlib/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tcllib.rb90
-rw-r--r--ext/tk/lib/tkextlib/tcllib/README135
-rw-r--r--ext/tk/lib/tkextlib/tcllib/autoscroll.rb158
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ctext.rb160
-rw-r--r--ext/tk/lib/tkextlib/tcllib/cursor.rb97
-rw-r--r--ext/tk/lib/tkextlib/tcllib/datefield.rb57
-rw-r--r--ext/tk/lib/tkextlib/tcllib/dialog.rb84
-rw-r--r--ext/tk/lib/tkextlib/tcllib/getstring.rb131
-rw-r--r--ext/tk/lib/tkextlib/tcllib/history.rb73
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ico.rb114
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ip_entry.rb66
-rw-r--r--ext/tk/lib/tkextlib/tcllib/panelframe.rb72
-rw-r--r--ext/tk/lib/tkextlib/tcllib/plotchart.rb865
-rw-r--r--ext/tk/lib/tkextlib/tcllib/ruler.rb65
-rw-r--r--ext/tk/lib/tkextlib/tcllib/screenruler.rb68
-rw-r--r--ext/tk/lib/tkextlib/tcllib/scrollwin.rb61
-rw-r--r--ext/tk/lib/tkextlib/tcllib/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tcllib/style.rb61
-rw-r--r--ext/tk/lib/tkextlib/tcllib/superframe.rb51
-rw-r--r--ext/tk/lib/tkextlib/tcllib/swaplist.rb147
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist.rb27
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist_core.rb770
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb25
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tkpiechart.rb308
-rw-r--r--ext/tk/lib/tkextlib/tcllib/tooltip.rb95
-rw-r--r--ext/tk/lib/tkextlib/tcllib/widget.rb48
-rw-r--r--ext/tk/lib/tkextlib/tclx.rb13
-rw-r--r--ext/tk/lib/tkextlib/tclx/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tclx/tclx.rb74
-rw-r--r--ext/tk/lib/tkextlib/tile.rb230
-rw-r--r--ext/tk/lib/tkextlib/tile/dialog.rb84
-rw-r--r--ext/tk/lib/tkextlib/tile/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tile/sizegrip.rb25
-rw-r--r--ext/tk/lib/tkextlib/tile/style.rb107
-rw-r--r--ext/tk/lib/tkextlib/tile/tbutton.rb30
-rw-r--r--ext/tk/lib/tkextlib/tile/tcheckbutton.rb32
-rw-r--r--ext/tk/lib/tkextlib/tile/tcombobox.rb51
-rw-r--r--ext/tk/lib/tkextlib/tile/tentry.rb40
-rw-r--r--ext/tk/lib/tkextlib/tile/tframe.rb30
-rw-r--r--ext/tk/lib/tkextlib/tile/tlabel.rb30
-rw-r--r--ext/tk/lib/tkextlib/tile/tlabelframe.rb30
-rw-r--r--ext/tk/lib/tkextlib/tile/tmenubutton.rb30
-rw-r--r--ext/tk/lib/tkextlib/tile/tnotebook.rb114
-rw-r--r--ext/tk/lib/tkextlib/tile/tpaned.rb188
-rw-r--r--ext/tk/lib/tkextlib/tile/tprogressbar.rb53
-rw-r--r--ext/tk/lib/tkextlib/tile/tradiobutton.rb32
-rw-r--r--ext/tk/lib/tkextlib/tile/treeview.rb1133
-rw-r--r--ext/tk/lib/tkextlib/tile/tscale.rb50
-rw-r--r--ext/tk/lib/tkextlib/tile/tscrollbar.rb30
-rw-r--r--ext/tk/lib/tkextlib/tile/tseparator.rb30
-rw-r--r--ext/tk/lib/tkextlib/tile/tsquare.rb30
-rw-r--r--ext/tk/lib/tkextlib/tkDND.rb18
-rw-r--r--ext/tk/lib/tkextlib/tkDND/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tkDND/shape.rb123
-rw-r--r--ext/tk/lib/tkextlib/tkDND/tkdnd.rb164
-rw-r--r--ext/tk/lib/tkextlib/tkHTML.rb13
-rw-r--r--ext/tk/lib/tkextlib/tkHTML/htmlwidget.rb444
-rw-r--r--ext/tk/lib/tkextlib/tkHTML/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tkimg.rb36
-rw-r--r--ext/tk/lib/tkextlib/tkimg/README26
-rw-r--r--ext/tk/lib/tkextlib/tkimg/bmp.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/gif.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/ico.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/jpeg.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/pcx.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/pixmap.rb44
-rw-r--r--ext/tk/lib/tkextlib/tkimg/png.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/ppm.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/ps.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tkimg/sgi.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/sun.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/tga.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/tiff.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/window.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/xbm.rb33
-rw-r--r--ext/tk/lib/tkextlib/tkimg/xpm.rb33
-rw-r--r--ext/tk/lib/tkextlib/tktable.rb14
-rw-r--r--ext/tk/lib/tkextlib/tktable/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tktable/tktable.rb839
-rw-r--r--ext/tk/lib/tkextlib/tktrans.rb14
-rw-r--r--ext/tk/lib/tkextlib/tktrans/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/tktrans/tktrans.rb64
-rw-r--r--ext/tk/lib/tkextlib/treectrl.rb13
-rw-r--r--ext/tk/lib/tkextlib/treectrl/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/treectrl/tktreectrl.rb2311
-rw-r--r--ext/tk/lib/tkextlib/trofs.rb13
-rw-r--r--ext/tk/lib/tkextlib/trofs/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/trofs/trofs.rb51
-rw-r--r--ext/tk/lib/tkextlib/version.rb6
-rw-r--r--ext/tk/lib/tkextlib/vu.rb48
-rw-r--r--ext/tk/lib/tkextlib/vu/bargraph.rb61
-rw-r--r--ext/tk/lib/tkextlib/vu/charts.rb53
-rw-r--r--ext/tk/lib/tkextlib/vu/dial.rb102
-rw-r--r--ext/tk/lib/tkextlib/vu/pie.rb235
-rw-r--r--ext/tk/lib/tkextlib/vu/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/vu/spinbox.rb22
-rw-r--r--ext/tk/lib/tkextlib/winico.rb14
-rw-r--r--ext/tk/lib/tkextlib/winico/setup.rb8
-rw-r--r--ext/tk/lib/tkextlib/winico/winico.rb189
-rw-r--r--ext/tk/lib/tkfont.rb1026
-rw-r--r--ext/tk/lib/tkmacpkg.rb4
-rw-r--r--ext/tk/lib/tkmenubar.rb137
-rw-r--r--ext/tk/lib/tkmngfocus.rb27
-rw-r--r--ext/tk/lib/tkpalette.rb48
-rw-r--r--ext/tk/lib/tkscrollbox.rb31
-rw-r--r--ext/tk/lib/tktext.rb1087
-rw-r--r--ext/tk/lib/tkvirtevent.rb81
-rw-r--r--ext/tk/lib/tkwinpkg.rb4
-rw-r--r--ext/tk/sample/24hr_clock.rb286
-rw-r--r--ext/tk/sample/binding_sample.rb87
-rw-r--r--ext/tk/sample/bindtag_sample.rb127
-rw-r--r--ext/tk/sample/binstr_usage.rb39
-rw-r--r--ext/tk/sample/btn_with_frame.rb20
-rw-r--r--ext/tk/sample/cd_timer.rb81
-rw-r--r--ext/tk/sample/cmd_res_test.rb17
-rw-r--r--ext/tk/sample/cmd_resource5
-rw-r--r--ext/tk/sample/demos-en/ChangeLog64
-rw-r--r--ext/tk/sample/demos-en/ChangeLog.prev9
-rw-r--r--ext/tk/sample/demos-en/README138
-rw-r--r--ext/tk/sample/demos-en/README.1st18
-rw-r--r--ext/tk/sample/demos-en/README.tkencoding29
-rw-r--r--ext/tk/sample/demos-en/anilabel.rb172
-rw-r--r--ext/tk/sample/demos-en/aniwave.rb115
-rw-r--r--ext/tk/sample/demos-en/arrow.rb239
-rw-r--r--ext/tk/sample/demos-en/bind.rb128
-rw-r--r--ext/tk/sample/demos-en/bitmap.rb73
-rw-r--r--ext/tk/sample/demos-en/browse163
-rw-r--r--ext/tk/sample/demos-en/browse282
-rw-r--r--ext/tk/sample/demos-en/button.rb84
-rw-r--r--ext/tk/sample/demos-en/check.rb70
-rw-r--r--ext/tk/sample/demos-en/check2.rb107
-rw-r--r--ext/tk/sample/demos-en/clrpick.rb77
-rw-r--r--ext/tk/sample/demos-en/colors.rb148
-rw-r--r--ext/tk/sample/demos-en/cscroll.rb134
-rw-r--r--ext/tk/sample/demos-en/ctext.rb186
-rw-r--r--ext/tk/sample/demos-en/dialog1.rb38
-rw-r--r--ext/tk/sample/demos-en/dialog2.rb41
-rw-r--r--ext/tk/sample/demos-en/doc.org/README7
-rw-r--r--ext/tk/sample/demos-en/doc.org/README.JP14
-rw-r--r--ext/tk/sample/demos-en/doc.org/README.tk8046
-rw-r--r--ext/tk/sample/demos-en/doc.org/license.terms39
-rw-r--r--ext/tk/sample/demos-en/doc.org/license.terms.tk8039
-rw-r--r--ext/tk/sample/demos-en/entry1.rb56
-rw-r--r--ext/tk/sample/demos-en/entry2.rb91
-rw-r--r--ext/tk/sample/demos-en/entry3.rb200
-rw-r--r--ext/tk/sample/demos-en/filebox.rb97
-rw-r--r--ext/tk/sample/demos-en/floor.rb1721
-rw-r--r--ext/tk/sample/demos-en/floor2.rb1720
-rw-r--r--ext/tk/sample/demos-en/form.rb62
-rw-r--r--ext/tk/sample/demos-en/goldberg.rb1999
-rw-r--r--ext/tk/sample/demos-en/hello14
-rw-r--r--ext/tk/sample/demos-en/hscale.rb74
-rw-r--r--ext/tk/sample/demos-en/icon.rb99
-rw-r--r--ext/tk/sample/demos-en/image1.rb60
-rw-r--r--ext/tk/sample/demos-en/image2.rb105
-rw-r--r--ext/tk/sample/demos-en/image3.rb122
-rw-r--r--ext/tk/sample/demos-en/items.rb374
-rw-r--r--ext/tk/sample/demos-en/ixset333
-rw-r--r--ext/tk/sample/demos-en/ixset2367
-rw-r--r--ext/tk/sample/demos-en/label.rb69
-rw-r--r--ext/tk/sample/demos-en/labelframe.rb93
-rw-r--r--ext/tk/sample/demos-en/menu.rb194
-rw-r--r--ext/tk/sample/demos-en/menu84.rb213
-rw-r--r--ext/tk/sample/demos-en/menubu.rb235
-rw-r--r--ext/tk/sample/demos-en/msgbox.rb88
-rw-r--r--ext/tk/sample/demos-en/paned1.rb45
-rw-r--r--ext/tk/sample/demos-en/paned2.rb92
-rw-r--r--ext/tk/sample/demos-en/patch_1.1c193
-rw-r--r--ext/tk/sample/demos-en/pendulum.rb223
-rw-r--r--ext/tk/sample/demos-en/plot.rb122
-rw-r--r--ext/tk/sample/demos-en/puzzle.rb120
-rw-r--r--ext/tk/sample/demos-en/radio.rb84
-rw-r--r--ext/tk/sample/demos-en/radio2.rb106
-rw-r--r--ext/tk/sample/demos-en/radio3.rb114
-rw-r--r--ext/tk/sample/demos-en/rmt268
-rw-r--r--ext/tk/sample/demos-en/rolodex320
-rw-r--r--ext/tk/sample/demos-en/rolodex-j323
-rw-r--r--ext/tk/sample/demos-en/ruler.rb203
-rw-r--r--ext/tk/sample/demos-en/sayings.rb104
-rw-r--r--ext/tk/sample/demos-en/search.rb180
-rw-r--r--ext/tk/sample/demos-en/spin.rb63
-rw-r--r--ext/tk/sample/demos-en/square81
-rw-r--r--ext/tk/sample/demos-en/states.rb78
-rw-r--r--ext/tk/sample/demos-en/style.rb211
-rw-r--r--ext/tk/sample/demos-en/tcolor526
-rw-r--r--ext/tk/sample/demos-en/text.rb126
-rw-r--r--ext/tk/sample/demos-en/timer136
-rw-r--r--ext/tk/sample/demos-en/tkencoding.rb42
-rw-r--r--ext/tk/sample/demos-en/twind.rb285
-rw-r--r--ext/tk/sample/demos-en/twind2.rb382
-rw-r--r--ext/tk/sample/demos-en/unicodeout.rb112
-rw-r--r--ext/tk/sample/demos-en/vscale.rb78
-rw-r--r--ext/tk/sample/demos-en/widget944
-rw-r--r--ext/tk/sample/demos-jp/README54
-rw-r--r--ext/tk/sample/demos-jp/README.1st20
-rw-r--r--ext/tk/sample/demos-jp/anilabel.rb174
-rw-r--r--ext/tk/sample/demos-jp/aniwave.rb116
-rw-r--r--ext/tk/sample/demos-jp/arrow.rb236
-rw-r--r--ext/tk/sample/demos-jp/bind.rb125
-rw-r--r--ext/tk/sample/demos-jp/bitmap.rb71
-rw-r--r--ext/tk/sample/demos-jp/browse163
-rw-r--r--ext/tk/sample/demos-jp/browse282
-rw-r--r--ext/tk/sample/demos-jp/button.rb81
-rw-r--r--ext/tk/sample/demos-jp/check.rb67
-rw-r--r--ext/tk/sample/demos-jp/check2.rb107
-rw-r--r--ext/tk/sample/demos-jp/clrpick.rb75
-rw-r--r--ext/tk/sample/demos-jp/colors.rb144
-rw-r--r--ext/tk/sample/demos-jp/cscroll.rb131
-rw-r--r--ext/tk/sample/demos-jp/ctext.rb182
-rw-r--r--ext/tk/sample/demos-jp/dialog1.rb38
-rw-r--r--ext/tk/sample/demos-jp/dialog2.rb42
-rw-r--r--ext/tk/sample/demos-jp/doc.org/README7
-rw-r--r--ext/tk/sample/demos-jp/doc.org/README.JP14
-rw-r--r--ext/tk/sample/demos-jp/doc.org/README.tk8046
-rw-r--r--ext/tk/sample/demos-jp/doc.org/license.terms39
-rw-r--r--ext/tk/sample/demos-jp/doc.org/license.terms.tk8039
-rw-r--r--ext/tk/sample/demos-jp/entry1.rb57
-rw-r--r--ext/tk/sample/demos-jp/entry2.rb88
-rw-r--r--ext/tk/sample/demos-jp/entry3.rb204
-rw-r--r--ext/tk/sample/demos-jp/filebox.rb96
-rw-r--r--ext/tk/sample/demos-jp/floor.rb1718
-rw-r--r--ext/tk/sample/demos-jp/floor2.rb1716
-rw-r--r--ext/tk/sample/demos-jp/form.rb63
-rw-r--r--ext/tk/sample/demos-jp/goldberg.rb2003
-rw-r--r--ext/tk/sample/demos-jp/hello9
-rw-r--r--ext/tk/sample/demos-jp/hscale.rb77
-rw-r--r--ext/tk/sample/demos-jp/icon.rb96
-rw-r--r--ext/tk/sample/demos-jp/image1.rb58
-rw-r--r--ext/tk/sample/demos-jp/image2.rb102
-rw-r--r--ext/tk/sample/demos-jp/image3.rb123
-rw-r--r--ext/tk/sample/demos-jp/items.rb371
-rw-r--r--ext/tk/sample/demos-jp/ixset333
-rw-r--r--ext/tk/sample/demos-jp/ixset2368
-rw-r--r--ext/tk/sample/demos-jp/label.rb65
-rw-r--r--ext/tk/sample/demos-jp/labelframe.rb98
-rw-r--r--ext/tk/sample/demos-jp/menu.rb196
-rw-r--r--ext/tk/sample/demos-jp/menu84.rb210
-rw-r--r--ext/tk/sample/demos-jp/menu8x.rb230
-rw-r--r--ext/tk/sample/demos-jp/menubu.rb235
-rw-r--r--ext/tk/sample/demos-jp/msgbox.rb86
-rw-r--r--ext/tk/sample/demos-jp/paned1.rb48
-rw-r--r--ext/tk/sample/demos-jp/paned2.rb96
-rw-r--r--ext/tk/sample/demos-jp/pendulum.rb224
-rw-r--r--ext/tk/sample/demos-jp/plot.rb119
-rw-r--r--ext/tk/sample/demos-jp/puzzle.rb116
-rw-r--r--ext/tk/sample/demos-jp/radio.rb81
-rw-r--r--ext/tk/sample/demos-jp/radio2.rb107
-rw-r--r--ext/tk/sample/demos-jp/radio3.rb114
-rw-r--r--ext/tk/sample/demos-jp/rmt268
-rw-r--r--ext/tk/sample/demos-jp/rolodex320
-rw-r--r--ext/tk/sample/demos-jp/rolodex-j299
-rw-r--r--ext/tk/sample/demos-jp/ruler.rb200
-rw-r--r--ext/tk/sample/demos-jp/sayings.rb100
-rw-r--r--ext/tk/sample/demos-jp/search.rb176
-rw-r--r--ext/tk/sample/demos-jp/spin.rb67
-rw-r--r--ext/tk/sample/demos-jp/square81
-rw-r--r--ext/tk/sample/demos-jp/states.rb71
-rw-r--r--ext/tk/sample/demos-jp/style.rb248
-rw-r--r--ext/tk/sample/demos-jp/tcolor533
-rw-r--r--ext/tk/sample/demos-jp/text.rb117
-rw-r--r--ext/tk/sample/demos-jp/timer136
-rw-r--r--ext/tk/sample/demos-jp/twind.rb285
-rw-r--r--ext/tk/sample/demos-jp/twind2.rb381
-rw-r--r--ext/tk/sample/demos-jp/unicodeout.rb115
-rw-r--r--ext/tk/sample/demos-jp/vscale.rb78
-rw-r--r--ext/tk/sample/demos-jp/widget973
-rw-r--r--ext/tk/sample/editable_listbox.rb69
-rw-r--r--ext/tk/sample/encstr_usage.rb29
-rw-r--r--ext/tk/sample/images/earth.gifbin51712 -> 0 bytes-rw-r--r--ext/tk/sample/images/earthris.gifbin6343 -> 0 bytes-rw-r--r--ext/tk/sample/images/face.xbm173
-rw-r--r--ext/tk/sample/images/flagdown.xbm27
-rw-r--r--ext/tk/sample/images/flagup.xbm27
-rw-r--r--ext/tk/sample/images/gray25.xbm6
-rw-r--r--ext/tk/sample/images/grey.256
-rw-r--r--ext/tk/sample/images/grey.56
-rw-r--r--ext/tk/sample/images/letters.xbm27
-rw-r--r--ext/tk/sample/images/noletter.xbm27
-rw-r--r--ext/tk/sample/images/pattern.xbm6
-rw-r--r--ext/tk/sample/images/tcllogo.gifbin2341 -> 0 bytes-rw-r--r--ext/tk/sample/images/teapot.ppm31
-rw-r--r--ext/tk/sample/irbtk.rb30
-rw-r--r--ext/tk/sample/irbtkw.rbw124
-rw-r--r--ext/tk/sample/iso2022-kr.txt2
-rw-r--r--ext/tk/sample/menubar1.rb51
-rw-r--r--ext/tk/sample/menubar2.rb56
-rw-r--r--ext/tk/sample/msgs_rb/README3
-rw-r--r--ext/tk/sample/msgs_rb/cs.msg84
-rw-r--r--ext/tk/sample/msgs_rb/de.msg88
-rw-r--r--ext/tk/sample/msgs_rb/el.msg98
-rw-r--r--ext/tk/sample/msgs_rb/en.msg83
-rw-r--r--ext/tk/sample/msgs_rb/en_gb.msg7
-rw-r--r--ext/tk/sample/msgs_rb/eo.msg87
-rw-r--r--ext/tk/sample/msgs_rb/es.msg84
-rw-r--r--ext/tk/sample/msgs_rb/fr.msg84
-rw-r--r--ext/tk/sample/msgs_rb/it.msg84
-rw-r--r--ext/tk/sample/msgs_rb/ja.msg13
-rw-r--r--ext/tk/sample/msgs_rb/nl.msg123
-rw-r--r--ext/tk/sample/msgs_rb/pl.msg87
-rw-r--r--ext/tk/sample/msgs_rb/ru.msg87
-rw-r--r--ext/tk/sample/msgs_rb2/README5
-rw-r--r--ext/tk/sample/msgs_rb2/de.msg88
-rw-r--r--ext/tk/sample/msgs_rb2/ja.msg85
-rw-r--r--ext/tk/sample/msgs_tk/README4
-rw-r--r--ext/tk/sample/msgs_tk/cs.msg84
-rw-r--r--ext/tk/sample/msgs_tk/de.msg88
-rw-r--r--ext/tk/sample/msgs_tk/el.msg103
-rw-r--r--ext/tk/sample/msgs_tk/en.msg83
-rw-r--r--ext/tk/sample/msgs_tk/en_gb.msg7
-rw-r--r--ext/tk/sample/msgs_tk/eo.msg87
-rw-r--r--ext/tk/sample/msgs_tk/es.msg84
-rw-r--r--ext/tk/sample/msgs_tk/fr.msg84
-rw-r--r--ext/tk/sample/msgs_tk/it.msg84
-rw-r--r--ext/tk/sample/msgs_tk/ja.msg13
-rw-r--r--ext/tk/sample/msgs_tk/license.terms39
-rw-r--r--ext/tk/sample/msgs_tk/nl.msg123
-rw-r--r--ext/tk/sample/msgs_tk/pl.msg87
-rw-r--r--ext/tk/sample/msgs_tk/ru.msg87
-rw-r--r--ext/tk/sample/multi-ip_sample.rb102
-rw-r--r--ext/tk/sample/multi-ip_sample2.rb29
-rw-r--r--ext/tk/sample/optobj_sample.rb67
-rw-r--r--ext/tk/sample/propagate.rb30
-rw-r--r--ext/tk/sample/remote-ip_sample.rb33
-rw-r--r--ext/tk/sample/remote-ip_sample2.rb56
-rw-r--r--ext/tk/sample/resource.en13
-rw-r--r--ext/tk/sample/resource.ja13
-rw-r--r--ext/tk/sample/safe-tk.rb115
-rw-r--r--ext/tk/sample/scrollframe.rb237
-rw-r--r--ext/tk/sample/tcltklib/lines3.rb54
-rw-r--r--ext/tk/sample/tcltklib/lines4.rb54
-rw-r--r--ext/tk/sample/tcltklib/safeTk.rb22
-rw-r--r--ext/tk/sample/tcltklib/sample2.rb451
-rw-r--r--ext/tk/sample/tkalignbox.rb225
-rw-r--r--ext/tk/sample/tkballoonhelp.rb194
-rw-r--r--ext/tk/sample/tkbiff.rb38
-rw-r--r--ext/tk/sample/tkbrowse.rb10
-rw-r--r--ext/tk/sample/tkcombobox.rb426
-rw-r--r--ext/tk/sample/tkdialog.rb3
-rw-r--r--ext/tk/sample/tkextlib/ICONS/Orig_LICENSE.txt61
-rw-r--r--ext/tk/sample/tkextlib/ICONS/tkIcons195
-rw-r--r--ext/tk/sample/tkextlib/ICONS/tkIcons-sample.kde658
-rw-r--r--ext/tk/sample/tkextlib/ICONS/tkIcons.kde195
-rw-r--r--ext/tk/sample/tkextlib/ICONS/viewIcons.rb329
-rw-r--r--ext/tk/sample/tkextlib/blt/barchart5.rb101
-rw-r--r--ext/tk/sample/tkextlib/blt/calendar.rb117
-rw-r--r--ext/tk/sample/tkextlib/blt/graph6.rb2222
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7.rb40
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7a.rb63
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7b.rb41
-rw-r--r--ext/tk/sample/tkextlib/blt/graph7c.rb45
-rw-r--r--ext/tk/sample/tkextlib/blt/images/buckskin.gifbin7561 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/blt/images/chalk.gifbin4378 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/blt/images/qv100.t.gifbin2694 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/blt/images/rain.gifbin3785 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/blt/images/sample.gifbin186103 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/blt/pareto.rb90
-rw-r--r--ext/tk/sample/tkextlib/blt/plot1.rb9
-rw-r--r--ext/tk/sample/tkextlib/blt/plot1b.rb10
-rw-r--r--ext/tk/sample/tkextlib/blt/readme.txt2
-rw-r--r--ext/tk/sample/tkextlib/blt/scripts/stipples.rb156
-rw-r--r--ext/tk/sample/tkextlib/blt/winop1.rb40
-rw-r--r--ext/tk/sample/tkextlib/blt/winop2.rb28
-rw-r--r--ext/tk/sample/tkextlib/bwidget/Orig_LICENSE.txt53
-rw-r--r--ext/tk/sample/tkextlib/bwidget/basic.rb198
-rw-r--r--ext/tk/sample/tkextlib/bwidget/bwidget.xbm46
-rw-r--r--ext/tk/sample/tkextlib/bwidget/demo.rb243
-rw-r--r--ext/tk/sample/tkextlib/bwidget/dnd.rb46
-rw-r--r--ext/tk/sample/tkextlib/bwidget/manager.rb150
-rw-r--r--ext/tk/sample/tkextlib/bwidget/select.rb82
-rw-r--r--ext/tk/sample/tkextlib/bwidget/tmpldlg.rb221
-rw-r--r--ext/tk/sample/tkextlib/bwidget/tree.rb289
-rw-r--r--ext/tk/sample/tkextlib/bwidget/x1.xbm2258
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/Orig_LICENSE.txt42
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/box.xbm14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/clear.gifbin279 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/close.gifbin249 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/copy.gifbin269 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/cut.gifbin179 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/exit.gifbin396 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/find.gifbin386 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/help.gifbin591 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/line.xbm14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/mag.gifbin183 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/new.gifbin212 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/open.gifbin258 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/oval.xbm14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/paste.gifbin376 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/points.xbm14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/poly.gifbin141 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/print.gifbin263 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/ruler.gifbin174 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/save.gifbin270 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/select.gifbin124 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/iwidgets/catalog_demo/images/text.xbm14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/buttonbox.rb22
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/calendar.rb10
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/canvasprintbox.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/canvasprintdialog.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/checkbox.rb12
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/combobox.rb32
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/dateentry.rb7
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/datefield.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/dialog.rb20
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/dialogshell.rb14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/disjointlistbox.rb16
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/entryfield-1.rb39
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/entryfield-2.rb40
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/entryfield-3.rb40
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/extbutton.rb20
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/extfileselectionbox.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/extfileselectiondialog.rb29
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/feedback.rb10
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/fileselectionbox.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/fileselectiondialog.rb28
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/finddialog.rb15
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/hierarchy.rb25
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/hyperhelp.rb14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/labeledframe.rb14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/labeledwidget.rb13
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/mainwindow.rb64
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/menubar.rb124
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/menubar2.rb44
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/messagebox1.rb19
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/messagebox2.rb19
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/messagedialog.rb44
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/notebook.rb30
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/notebook2.rb30
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/optionmenu.rb14
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/panedwindow.rb22
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/panedwindow2.rb22
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/promptdialog.rb17
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/pushbutton.rb9
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/radiobox.rb13
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledcanvas.rb13
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledframe.rb18
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledhtml.rb15
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledlistbox.rb22
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/scrolledtext.rb11
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/selectionbox.rb19
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/selectiondialog.rb12
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/shell.rb17
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/spindate.rb7
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/spinint.rb10
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/spinner.rb33
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/spintime.rb7
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook.rb26
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/tabnotebook2.rb30
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/tabset.rb34
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/timeentry.rb7
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/timefield.rb8
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/toolbar.rb152
-rw-r--r--ext/tk/sample/tkextlib/iwidgets/sample/watch.rb18
-rw-r--r--ext/tk/sample/tkextlib/tcllib/Orig_LICENSE.txt46
-rw-r--r--ext/tk/sample/tkextlib/tcllib/datefield.rb29
-rw-r--r--ext/tk/sample/tkextlib/tcllib/plotdemos1.rb158
-rw-r--r--ext/tk/sample/tkextlib/tcllib/plotdemos2.rb71
-rw-r--r--ext/tk/sample/tkextlib/tcllib/plotdemos3.rb83
-rw-r--r--ext/tk/sample/tkextlib/tcllib/xyplot.rb17
-rw-r--r--ext/tk/sample/tkextlib/tile/Orig_LICENSE.txt30
-rw-r--r--ext/tk/sample/tkextlib/tile/demo.rb972
-rw-r--r--ext/tk/sample/tkextlib/tile/iconlib.tcl110
-rw-r--r--ext/tk/sample/tkextlib/tile/readme.txt2
-rw-r--r--ext/tk/sample/tkextlib/tile/repeater.tcl117
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue.tcl149
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-h.gifbin315 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown-p.gifbin312 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowdown.gifbin313 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-h.gifbin329 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft-p.gifbin327 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowleft.gifbin323 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-h.gifbin330 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright-p.gifbin327 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowright.gifbin324 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-h.gifbin309 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup-p.gifbin313 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/arrowup.gifbin314 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/button-h.gifbin696 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.gifbin770 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/button-n.xcfbin1942 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/button-p.gifbin769 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hc.gifbin254 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/check-hu.gifbin234 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nc.gifbin249 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/check-nu.gifbin229 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hc.gifbin1098 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-hu.gifbin626 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nc.gifbin389 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/radio-nu.gifbin401 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb-p.gifbin343 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-thumb.gifbin316 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb-p.gifbin333 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/sb-vthumb.gifbin308 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/slider-p.gifbin182 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/slider.gifbin182 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider-p.gifbin183 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/blue/vslider.gifbin283 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/blue/pkgIndex.tcl6
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik.tcl194
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-n.gifbin273 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowdown-p.gifbin258 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-n.gifbin292 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowleft-p.gifbin272 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-n.gifbin274 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowright-p.gifbin258 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-n.gifbin286 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/arrowup-p.gifbin271 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-d.gifbin1266 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-h.gifbin896 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-n.gifbin881 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-p.gifbin625 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/button-s.gifbin859 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-c.gifbin434 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/check-u.gifbin423 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-n.gifbin401 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hsb-p.gifbin395 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/hslider-n.gifbin592 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-a.gifbin1116 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-arrow-n.gifbin61 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-d.gifbin1057 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/mbut-n.gifbin1095 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-c.gifbin695 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/radio-u.gifbin686 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-n.gifbin383 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tab-p.gifbin878 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-a.gifbin907 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-n.gifbin238 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/tbar-p.gifbin927 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-n.gifbin405 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vsb-p.gifbin399 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/keramik/vslider-n.gifbin587 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/keramik/pkgIndex.tcl15
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc.rb200
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc.tcl163
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-h.gifbin522 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-n.gifbin554 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/button-p.gifbin548 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hc.gifbin281 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-hu.gifbin273 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nc.gifbin303 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/check-nu.gifbin294 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hc.gifbin652 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-hu.gifbin644 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nc.gifbin632 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/kroc/radio-nu.gifbin621 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/kroc/pkgIndex.tcl15
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/pkgIndex.tcl16
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik.tcl125
-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-n.gifbin362 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowdown-p.gifbin250 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-n.gifbin378 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowleft-p.gifbin267 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-n.gifbin379 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowright-p.gifbin266 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-n.gifbin363 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/arrowup-p.gifbin251 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-h.gifbin439 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-n.gifbin443 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/button-p.gifbin302 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hc.gifbin169 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-hu.gifbin170 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nc.gifbin235 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-nu.gifbin226 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/check-pc.gifbin169 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hsb-n.gifbin269 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/hslider-n.gifbin342 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hc.gifbin178 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-hu.gifbin179 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nc.gifbin236 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-nu.gifbin178 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/radio-pc.gifbin178 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vsb-n.gifbin366 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/themes/plastik/plastik/vslider-n.gifbin336 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tile/toolbutton.tcl152
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/Orig_COPYRIGHT.txt12
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/README12
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/hv.rb313
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image1bin8995 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image10bin3095 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image11bin1425 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image12bin2468 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image13bin4073 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image14bin53 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image2bin42 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image3bin3473 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image4bin1988 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image5bin973 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image6bin2184 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image7bin2022 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image8bin1186 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/image9bin139 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page1/index.html115
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image1bin1966 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image10bin255 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image11bin590 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image12bin254 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image13bin493 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image14bin195 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image15bin68 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image16bin157 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image17bin81 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image18bin545 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image19bin53 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image2bin49 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image20bin533 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image21bin564 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image22bin81 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image23bin539 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image24bin151 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image25bin453 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image26bin520 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image27bin565 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image28bin416 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image29bin121 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image3bin10835 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image30bin663 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image31bin78 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image32bin556 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image33bin598 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image34bin496 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image35bin724 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image36bin404 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image37bin124 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image38bin8330 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image39bin369 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image4bin268 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image5bin492 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image6bin246 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image7bin551 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image8bin497 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/image9bin492 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page2/index.html433
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image1bin113 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image10bin5088 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image11bin4485 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image12bin3579 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image13bin5119 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image14bin3603 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image2bin74 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image3bin681 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image4bin3056 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image5bin2297 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image6bin79 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image7bin1613 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image8bin864 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/image9bin2379 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page3/index.html2787
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image1bin42 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image2bin14343 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image3bin17750 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image4bin61 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image5bin201 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image6bin214 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image7bin149 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image8bin203 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/image9bin1504 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tkHTML/page4/index.html768
-rw-r--r--ext/tk/sample/tkextlib/tkHTML/ss.rb436
-rw-r--r--ext/tk/sample/tkextlib/tkimg/demo.rb1478
-rw-r--r--ext/tk/sample/tkextlib/tkimg/license_terms_of_Img_extension41
-rw-r--r--ext/tk/sample/tkextlib/tkimg/readme.txt3
-rw-r--r--ext/tk/sample/tkextlib/tktable/Orig_LICENSE.txt52
-rw-r--r--ext/tk/sample/tkextlib/tktable/basic.rb60
-rw-r--r--ext/tk/sample/tkextlib/tktable/buttons.rb76
-rw-r--r--ext/tk/sample/tkextlib/tktable/command.rb89
-rw-r--r--ext/tk/sample/tkextlib/tktable/debug.rb101
-rw-r--r--ext/tk/sample/tkextlib/tktable/dynarows.rb99
-rw-r--r--ext/tk/sample/tkextlib/tktable/maxsize.rb67
-rw-r--r--ext/tk/sample/tkextlib/tktable/spreadsheet.rb137
-rwxr-xr-xext/tk/sample/tkextlib/tktable/tcllogo.gifbin2341 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/tktable/valid.rb88
-rw-r--r--ext/tk/sample/tkextlib/treectrl/bitmaps.rb76
-rw-r--r--ext/tk/sample/tkextlib/treectrl/demo.rb1310
-rw-r--r--ext/tk/sample/tkextlib/treectrl/explorer.rb430
-rw-r--r--ext/tk/sample/tkextlib/treectrl/help.rb404
-rw-r--r--ext/tk/sample/tkextlib/treectrl/imovie.rb130
-rw-r--r--ext/tk/sample/tkextlib/treectrl/layout.rb159
-rw-r--r--ext/tk/sample/tkextlib/treectrl/mailwasher.rb269
-rw-r--r--ext/tk/sample/tkextlib/treectrl/outlook-folders.rb124
-rw-r--r--ext/tk/sample/tkextlib/treectrl/outlook-newgroup.rb448
-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/big-dll.gifbin437 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/big-exe.gifbin368 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/big-file.gifbin466 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/big-folder.gifbin459 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/big-txt.gifbin392 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/checked.gifbin78 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/file.gifbin279 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/folder-closed.gifbin111 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/folder-open.gifbin120 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/help-book-closed.gifbin115 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/help-book-open.gifbin128 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/help-page.gifbin132 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/imovie-01.gifbin5406 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/imovie-02.gifbin5912 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/imovie-03.gifbin4696 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/imovie-04.gifbin5783 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/imovie-05.gifbin3238 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/imovie-06.gifbin3509 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/imovie-07.gifbin2091 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/internet-check-off.gifbin70 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/internet-check-on.gifbin76 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/internet-print.gifbin124 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/internet-radio-off.gifbin68 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/internet-radio-on.gifbin71 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/internet-search.gifbin114 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/internet-security.gifbin108 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/mac-collapse.gifbin275 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/mac-expand.gifbin277 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-arrow.gifbin73 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-clip.gifbin73 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-deleted.gifbin138 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-draft.gifbin134 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-folder.gifbin133 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-group.gifbin144 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-inbox.gifbin133 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-local.gifbin146 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-main.gifbin174 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-outbox.gifbin136 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-read-2.gifbin343 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-read.gifbin304 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-sent.gifbin132 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-server.gifbin163 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-unread.gifbin303 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/outlook-watch.gifbin98 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/sky.gifbin6454 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/small-dll.gifbin311 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/small-exe.gifbin115 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/small-file.gifbin338 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/small-folder.gifbin307 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/small-txt.gifbin302 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/pics/unchecked.gifbin72 -> 0 bytes-rw-r--r--ext/tk/sample/tkextlib/treectrl/random.rb508
-rw-r--r--ext/tk/sample/tkextlib/treectrl/readme.txt2
-rw-r--r--ext/tk/sample/tkextlib/treectrl/www-options.rb303
-rw-r--r--ext/tk/sample/tkextlib/vu/Orig_LICENSE.txt51
-rw-r--r--ext/tk/sample/tkextlib/vu/README.txt50
-rw-r--r--ext/tk/sample/tkextlib/vu/canvItems.rb90
-rw-r--r--ext/tk/sample/tkextlib/vu/canvSticker.rb82
-rw-r--r--ext/tk/sample/tkextlib/vu/canvSticker2.rb99
-rw-r--r--ext/tk/sample/tkextlib/vu/dial_demo.rb113
-rw-r--r--ext/tk/sample/tkextlib/vu/m128_000.xbm174
-rw-r--r--ext/tk/sample/tkextlib/vu/oscilloscope.rb68
-rw-r--r--ext/tk/sample/tkextlib/vu/pie.rb56
-rw-r--r--ext/tk/sample/tkextlib/vu/vu_demo.rb67
-rw-r--r--ext/tk/sample/tkfrom.rb32
-rw-r--r--ext/tk/sample/tkhello.rb8
-rw-r--r--ext/tk/sample/tkline.rb6
-rw-r--r--ext/tk/sample/tkmenubutton.rb135
-rw-r--r--ext/tk/sample/tkmsgcat-load_rb.rb102
-rw-r--r--ext/tk/sample/tkmsgcat-load_rb2.rb102
-rw-r--r--ext/tk/sample/tkmsgcat-load_tk.rb118
-rw-r--r--ext/tk/sample/tkmulticolumnlist.rb743
-rw-r--r--ext/tk/sample/tkmultilistbox.rb654
-rw-r--r--ext/tk/sample/tkmultilistframe.rb940
-rw-r--r--ext/tk/sample/tkoptdb-safeTk.rb73
-rw-r--r--ext/tk/sample/tkoptdb.rb106
-rw-r--r--ext/tk/sample/tkrttimer.rb68
-rw-r--r--ext/tk/sample/tktextframe.rb162
-rw-r--r--ext/tk/sample/tktextio.rb1050
-rw-r--r--ext/tk/sample/tktimer.rb2
-rw-r--r--ext/tk/sample/tktimer2.rb47
-rw-r--r--ext/tk/sample/tktimer3.rb59
-rw-r--r--ext/tk/sample/tktree.rb103
-rw-r--r--ext/tk/sample/tktree.tcl305
-rw-r--r--ext/tk/stubs.c516
-rw-r--r--ext/tk/stubs.h33
-rw-r--r--ext/tk/tcltklib.c8152
-rw-r--r--ext/tk/tkutil.c45
-rw-r--r--ext/tk/tkutil/.cvsignore3
-rw-r--r--ext/tk/tkutil/depend1
-rw-r--r--ext/tk/tkutil/extconf.rb11
-rw-r--r--ext/tk/tkutil/tkutil.c1639
-rw-r--r--ext/win32ole/.cvsignore4
-rw-r--r--ext/win32ole/depend1
-rw-r--r--ext/win32ole/doc/win32ole.rd294
-rw-r--r--ext/win32ole/extconf.rb41
-rw-r--r--ext/win32ole/lib/win32ole/property.rb16
-rw-r--r--ext/win32ole/sample/excel1.rb22
-rw-r--r--ext/win32ole/sample/excel2.rb30
-rw-r--r--ext/win32ole/sample/excel3.rb13
-rw-r--r--ext/win32ole/sample/ie.rb11
-rw-r--r--ext/win32ole/sample/ieconst.rb32
-rw-r--r--ext/win32ole/sample/ienavi.rb40
-rw-r--r--ext/win32ole/sample/oledirs.rb23
-rw-r--r--ext/win32ole/sample/olegen.rb348
-rw-r--r--ext/win32ole/sample/xml.rb7306
-rw-r--r--ext/win32ole/tests/oleserver.rb10
-rw-r--r--ext/win32ole/tests/testNIL2VTEMPTY.rb28
-rw-r--r--ext/win32ole/tests/testOLEEVENT.rb91
-rw-r--r--ext/win32ole/tests/testOLEMETHOD.rb92
-rw-r--r--ext/win32ole/tests/testOLEPARAM.rb65
-rw-r--r--ext/win32ole/tests/testOLETYPE.rb96
-rw-r--r--ext/win32ole/tests/testOLEVARIABLE.rb49
-rw-r--r--ext/win32ole/tests/testVARIANT.rb32
-rw-r--r--ext/win32ole/tests/testWIN32OLE.rb372
-rw-r--r--ext/win32ole/tests/test_ole_methods.rb36
-rw-r--r--ext/win32ole/tests/test_propertyputref.rb19
-rw-r--r--ext/win32ole/tests/test_word.rb37
-rw-r--r--ext/win32ole/tests/testall.rb15
-rw-r--r--ext/win32ole/win32ole.c6276
-rw-r--r--ext/zlib/.cvsignore3
-rw-r--r--ext/zlib/doc/zlib.rd911
-rw-r--r--ext/zlib/extconf.rb61
-rw-r--r--ext/zlib/zlib.c3547
-rw-r--r--file.c3259
-rw-r--r--gc.c1433
-rw-r--r--hash.c1691
-rw-r--r--ia64.s33
-rw-r--r--inits.c6
-rw-r--r--[-rwxr-xr-x]instruby.rb401
-rw-r--r--intern.h267
-rw-r--r--io.c4149
-rw-r--r--keywords80
-rw-r--r--lex.c88
-rw-r--r--lib/.document106
-rw-r--r--lib/English.rb133
-rw-r--r--lib/README94
-rw-r--r--lib/abbrev.rb103
-rw-r--r--lib/base64.rb150
-rw-r--r--lib/benchmark.rb569
-rw-r--r--lib/cgi-lib.rb8
-rw-r--r--lib/cgi.rb2150
-rw-r--r--lib/cgi/.document2
-rw-r--r--lib/cgi/session.rb455
-rw-r--r--lib/cgi/session/pstore.rb111
-rw-r--r--lib/complex.rb471
-rw-r--r--lib/csv.rb992
-rw-r--r--lib/date.rb1757
-rw-r--r--lib/date/format.rb1088
-rw-r--r--lib/debug.rb1438
-rw-r--r--lib/delegate.rb309
-rw-r--r--lib/drb.rb2
-rw-r--r--lib/drb/acl.rb146
-rw-r--r--lib/drb/drb.rb1763
-rw-r--r--lib/drb/eq.rb16
-rw-r--r--lib/drb/extserv.rb64
-rw-r--r--lib/drb/extservm.rb96
-rw-r--r--lib/drb/gw.rb122
-rw-r--r--lib/drb/invokemethod.rb36
-rw-r--r--lib/drb/observer.rb22
-rw-r--r--lib/drb/ssl.rb190
-rw-r--r--lib/drb/timeridconv.rb91
-rw-r--r--lib/drb/unix.rb108
-rw-r--r--lib/e2mmap.rb5
-rw-r--r--lib/erb.rb826
-rw-r--r--lib/fileutils.rb1591
-rw-r--r--lib/final.rb4
-rw-r--r--lib/finalize.rb292
-rw-r--r--lib/find.rb58
-rw-r--r--lib/forwardable.rb178
-rw-r--r--lib/ftools.rb197
-rw-r--r--lib/ftplib.rb14
-rw-r--r--lib/generator.rb380
-rw-r--r--lib/getoptlong.rb217
-rw-r--r--lib/getopts.rb158
-rw-r--r--lib/gserver.rb253
-rw-r--r--lib/importenv.rb3
-rw-r--r--lib/ipaddr.rb766
-rw-r--r--lib/irb.rb162
-rw-r--r--lib/irb/cmd/chws.rb33
-rw-r--r--lib/irb/cmd/fork.rb39
-rw-r--r--lib/irb/cmd/help.rb34
-rw-r--r--lib/irb/cmd/load.rb67
-rw-r--r--lib/irb/cmd/nop.rb39
-rw-r--r--lib/irb/cmd/pushws.rb39
-rw-r--r--lib/irb/cmd/subirb.rb43
-rw-r--r--lib/irb/completion.rb54
-rw-r--r--lib/irb/context.rb200
-rw-r--r--lib/irb/ext/change-ws.rb62
-rw-r--r--lib/irb/ext/history.rb110
-rw-r--r--lib/irb/ext/loader.rb120
-rw-r--r--lib/irb/ext/math-mode.rb37
-rw-r--r--lib/irb/ext/save-history.rb85
-rw-r--r--lib/irb/ext/tracer.rb61
-rw-r--r--lib/irb/ext/use-loader.rb65
-rw-r--r--lib/irb/ext/workspaces.rb56
-rw-r--r--lib/irb/extend-command.rb284
-rw-r--r--lib/irb/frame.rb2
-rw-r--r--lib/irb/help.rb2
-rw-r--r--lib/irb/init.rb153
-rw-r--r--lib/irb/input-method.rb14
-rw-r--r--lib/irb/lc/error.rb14
-rw-r--r--lib/irb/lc/help-message39
-rw-r--r--lib/irb/lc/ja/error.rb16
-rw-r--r--lib/irb/lc/ja/help-message7
-rw-r--r--lib/irb/loader.rb118
-rw-r--r--lib/irb/locale.rb57
-rw-r--r--lib/irb/multi-irb.rb (renamed from lib/irb/ext/multi-irb.rb)47
-rw-r--r--lib/irb/notifier.rb145
-rw-r--r--lib/irb/output-method.rb85
-rw-r--r--lib/irb/ruby-lex.rb318
-rw-r--r--lib/irb/ruby-token.rb10
-rw-r--r--lib/irb/slex.rb362
-rw-r--r--lib/irb/version.rb6
-rw-r--r--lib/irb/workspace.rb25
-rw-r--r--lib/irb/ws-for-case-2.rb4
-rw-r--r--lib/irb/xmp.rb12
-rw-r--r--lib/jcode.rb59
-rw-r--r--lib/logger.rb703
-rw-r--r--lib/mailread.rb16
-rw-r--r--lib/mathn.rb47
-rw-r--r--lib/matrix.rb996
-rw-r--r--lib/mkmf.rb1831
-rw-r--r--lib/monitor.rb287
-rw-r--r--lib/mutex_m.rb73
-rw-r--r--lib/net/ftp.rb444
-rw-r--r--lib/net/http.rb2674
-rw-r--r--lib/net/https.rb173
-rw-r--r--lib/net/imap.rb4564
-rw-r--r--lib/net/pop.rb1078
-rw-r--r--lib/net/protocol.rb985
-rw-r--r--lib/net/smtp.rb803
-rw-r--r--lib/net/telnet.rb722
-rw-r--r--lib/observer.rb154
-rw-r--r--lib/open-uri.rb678
-rw-r--r--lib/open3.rb51
-rw-r--r--lib/optparse.rb1788
-rw-r--r--lib/optparse/date.rb17
-rw-r--r--lib/optparse/shellwords.rb6
-rw-r--r--lib/optparse/time.rb10
-rw-r--r--lib/optparse/uri.rb6
-rw-r--r--lib/optparse/version.rb70
-rw-r--r--lib/ostruct.rb147
-rw-r--r--lib/parsearg.rb6
-rw-r--r--lib/parsedate.rb220
-rw-r--r--lib/pathname.rb1062
-rw-r--r--lib/ping.rb70
-rw-r--r--lib/pp.rb647
-rw-r--r--lib/prettyprint.rb896
-rw-r--r--lib/profile.rb59
-rw-r--r--lib/profiler.rb59
-rw-r--r--lib/pstore.rb334
-rw-r--r--lib/racc/parser.rb442
-rw-r--r--lib/rational.rb442
-rw-r--r--lib/rdoc/README489
-rw-r--r--lib/rdoc/code_objects.rb765
-rw-r--r--lib/rdoc/diagram.rb335
-rw-r--r--lib/rdoc/dot/dot.rb255
-rw-r--r--lib/rdoc/generators/chm_generator.rb112
-rw-r--r--lib/rdoc/generators/html_generator.rb1509
-rw-r--r--lib/rdoc/generators/ri_generator.rb268
-rw-r--r--lib/rdoc/generators/template/chm/chm.rb87
-rw-r--r--lib/rdoc/generators/template/html/hefss.rb418
-rw-r--r--lib/rdoc/generators/template/html/html.rb711
-rw-r--r--lib/rdoc/generators/template/html/kilmer.rb435
-rw-r--r--lib/rdoc/generators/template/html/old_html.rb728
-rw-r--r--lib/rdoc/generators/template/html/one_page_html.rb122
-rw-r--r--lib/rdoc/generators/template/xml/rdf.rb112
-rw-r--r--lib/rdoc/generators/template/xml/xml.rb112
-rw-r--r--lib/rdoc/generators/xml_generator.rb130
-rw-r--r--lib/rdoc/markup/.document2
-rw-r--r--lib/rdoc/markup/sample/rdoc2latex.rb16
-rw-r--r--lib/rdoc/markup/sample/sample.rb42
-rw-r--r--lib/rdoc/markup/simple_markup.rb476
-rw-r--r--lib/rdoc/markup/simple_markup/fragments.rb328
-rw-r--r--lib/rdoc/markup/simple_markup/inline.rb340
-rw-r--r--lib/rdoc/markup/simple_markup/lines.rb151
-rw-r--r--lib/rdoc/markup/simple_markup/preprocess.rb73
-rw-r--r--lib/rdoc/markup/simple_markup/to_flow.rb188
-rw-r--r--lib/rdoc/markup/simple_markup/to_html.rb289
-rw-r--r--lib/rdoc/markup/simple_markup/to_latex.rb333
-rw-r--r--lib/rdoc/markup/test/AllTests.rb2
-rw-r--r--lib/rdoc/markup/test/TestInline.rb154
-rw-r--r--lib/rdoc/markup/test/TestParse.rb503
-rw-r--r--lib/rdoc/options.rb586
-rw-r--r--lib/rdoc/parsers/parse_c.rb773
-rw-r--r--lib/rdoc/parsers/parse_f95.rb1841
-rw-r--r--lib/rdoc/parsers/parse_rb.rb2605
-rw-r--r--lib/rdoc/parsers/parse_simple.rb41
-rw-r--r--lib/rdoc/parsers/parserfactory.rb99
-rw-r--r--lib/rdoc/rdoc.rb298
-rw-r--r--lib/rdoc/ri/ri_cache.rb187
-rw-r--r--lib/rdoc/ri/ri_descriptions.rb154
-rw-r--r--lib/rdoc/ri/ri_display.rb255
-rw-r--r--lib/rdoc/ri/ri_driver.rb143
-rw-r--r--lib/rdoc/ri/ri_formatter.rb672
-rw-r--r--lib/rdoc/ri/ri_options.rb313
-rw-r--r--lib/rdoc/ri/ri_paths.rb80
-rw-r--r--lib/rdoc/ri/ri_reader.rb100
-rw-r--r--lib/rdoc/ri/ri_util.rb75
-rw-r--r--lib/rdoc/ri/ri_writer.rb62
-rw-r--r--lib/rdoc/template.rb234
-rw-r--r--lib/rdoc/tokenstream.rb25
-rw-r--r--lib/rdoc/usage.rb210
-rw-r--r--lib/readbytes.rb15
-rw-r--r--lib/resolv-replace.rb62
-rw-r--r--lib/resolv.rb1884
-rw-r--r--lib/rexml/attlistdecl.rb62
-rw-r--r--lib/rexml/attribute.rb185
-rw-r--r--lib/rexml/cdata.rb67
-rw-r--r--lib/rexml/child.rb96
-rw-r--r--lib/rexml/comment.rb80
-rw-r--r--lib/rexml/doctype.rb271
-rw-r--r--lib/rexml/document.rb208
-rw-r--r--lib/rexml/dtd/attlistdecl.rb10
-rw-r--r--lib/rexml/dtd/dtd.rb51
-rw-r--r--lib/rexml/dtd/elementdecl.rb17
-rw-r--r--lib/rexml/dtd/entitydecl.rb56
-rw-r--r--lib/rexml/dtd/notationdecl.rb39
-rw-r--r--lib/rexml/element.rb1227
-rw-r--r--lib/rexml/encoding.rb71
-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.rb165
-rw-r--r--lib/rexml/formatters/default.rb109
-rw-r--r--lib/rexml/formatters/pretty.rb137
-rw-r--r--lib/rexml/formatters/transitive.rb56
-rw-r--r--lib/rexml/functions.rb382
-rw-r--r--lib/rexml/instruction.rb70
-rw-r--r--lib/rexml/light/node.rb196
-rw-r--r--lib/rexml/namespace.rb47
-rw-r--r--lib/rexml/node.rb75
-rw-r--r--lib/rexml/output.rb24
-rw-r--r--lib/rexml/parent.rb166
-rw-r--r--lib/rexml/parseexception.rb51
-rw-r--r--lib/rexml/parsers/baseparser.rb503
-rw-r--r--lib/rexml/parsers/lightparser.rb60
-rw-r--r--lib/rexml/parsers/pullparser.rb196
-rw-r--r--lib/rexml/parsers/sax2parser.rb238
-rw-r--r--lib/rexml/parsers/streamparser.rb46
-rw-r--r--lib/rexml/parsers/treeparser.rb97
-rw-r--r--lib/rexml/parsers/ultralightparser.rb56
-rw-r--r--lib/rexml/parsers/xpathparser.rb698
-rw-r--r--lib/rexml/quickpath.rb266
-rw-r--r--lib/rexml/rexml.rb32
-rw-r--r--lib/rexml/sax2listener.rb97
-rw-r--r--lib/rexml/source.rb251
-rw-r--r--lib/rexml/streamlistener.rb92
-rw-r--r--lib/rexml/syncenumerator.rb33
-rw-r--r--lib/rexml/text.rb344
-rw-r--r--lib/rexml/undefinednamespaceexception.rb8
-rw-r--r--lib/rexml/validation/relaxng.rb559
-rw-r--r--lib/rexml/validation/validation.rb155
-rw-r--r--lib/rexml/validation/validationexception.rb9
-rw-r--r--lib/rexml/xmldecl.rb119
-rw-r--r--lib/rexml/xmltokens.rb18
-rw-r--r--lib/rexml/xpath.rb66
-rw-r--r--lib/rexml/xpath_parser.rb792
-rw-r--r--lib/rinda/rinda.rb283
-rw-r--r--lib/rinda/ring.rb271
-rw-r--r--lib/rinda/tuplespace.rb592
-rw-r--r--lib/rss.rb16
-rw-r--r--lib/rss/0.9.rb422
-rw-r--r--lib/rss/1.0.rb451
-rw-r--r--lib/rss/2.0.rb111
-rw-r--r--lib/rss/content.rb38
-rw-r--r--lib/rss/converter.rb158
-rw-r--r--lib/rss/dublincore.rb154
-rw-r--r--lib/rss/image.rb193
-rw-r--r--lib/rss/maker.rb37
-rw-r--r--lib/rss/maker/0.9.rb224
-rw-r--r--lib/rss/maker/1.0.rb204
-rw-r--r--lib/rss/maker/2.0.rb168
-rw-r--r--lib/rss/maker/base.rb546
-rw-r--r--lib/rss/maker/content.rb29
-rw-r--r--lib/rss/maker/dublincore.rb169
-rw-r--r--lib/rss/maker/image.rb145
-rw-r--r--lib/rss/maker/syndication.rb27
-rw-r--r--lib/rss/maker/taxonomy.rb182
-rw-r--r--lib/rss/maker/trackback.rb130
-rw-r--r--lib/rss/parser.rb476
-rw-r--r--lib/rss/rexmlparser.rb54
-rw-r--r--lib/rss/rss.rb1015
-rw-r--r--lib/rss/syndication.rb64
-rw-r--r--lib/rss/taxonomy.rb145
-rw-r--r--lib/rss/trackback.rb288
-rw-r--r--lib/rss/utils.rb37
-rw-r--r--lib/rss/xml-stylesheet.rb101
-rw-r--r--lib/rss/xmlparser.rb93
-rw-r--r--lib/rss/xmlscanner.rb121
-rw-r--r--lib/rubyunit.rb6
-rw-r--r--lib/runit/assert.rb73
-rw-r--r--lib/runit/cui/testrunner.rb51
-rw-r--r--lib/runit/error.rb9
-rw-r--r--lib/runit/testcase.rb45
-rw-r--r--lib/runit/testresult.rb44
-rw-r--r--lib/runit/testsuite.rb26
-rw-r--r--lib/runit/topublic.rb8
-rw-r--r--lib/scanf.rb702
-rw-r--r--lib/set.rb1227
-rw-r--r--lib/shell.rb9
-rw-r--r--lib/shell/command-processor.rb40
-rw-r--r--lib/shell/error.rb4
-rw-r--r--lib/shell/filter.rb9
-rw-r--r--lib/shell/process-controller.rb10
-rw-r--r--lib/shell/system-command.rb4
-rw-r--r--lib/shellwords.rb65
-rw-r--r--lib/singleton.rb377
-rw-r--r--lib/soap/attachment.rb107
-rw-r--r--lib/soap/baseData.rb942
-rw-r--r--lib/soap/element.rb258
-rw-r--r--lib/soap/encodingstyle/aspDotNetHandler.rb213
-rw-r--r--lib/soap/encodingstyle/handler.rb100
-rw-r--r--lib/soap/encodingstyle/literalHandler.rb226
-rw-r--r--lib/soap/encodingstyle/soapHandler.rb582
-rw-r--r--lib/soap/generator.rb268
-rw-r--r--lib/soap/header/handler.rb57
-rw-r--r--lib/soap/header/handlerset.rb70
-rw-r--r--lib/soap/header/simplehandler.rb44
-rw-r--r--lib/soap/httpconfigloader.rb119
-rw-r--r--lib/soap/mapping.rb10
-rw-r--r--lib/soap/mapping/factory.rb355
-rw-r--r--lib/soap/mapping/mapping.rb381
-rw-r--r--lib/soap/mapping/registry.rb541
-rw-r--r--lib/soap/mapping/rubytypeFactory.rb475
-rw-r--r--lib/soap/mapping/typeMap.rb50
-rw-r--r--lib/soap/mapping/wsdlencodedregistry.rb280
-rw-r--r--lib/soap/mapping/wsdlliteralregistry.rb418
-rw-r--r--lib/soap/marshal.rb59
-rw-r--r--lib/soap/mimemessage.rb240
-rw-r--r--lib/soap/netHttpClient.rb190
-rw-r--r--lib/soap/parser.rb251
-rw-r--r--lib/soap/processor.rb66
-rw-r--r--lib/soap/property.rb333
-rw-r--r--lib/soap/rpc/cgistub.rb206
-rw-r--r--lib/soap/rpc/driver.rb254
-rw-r--r--lib/soap/rpc/element.rb325
-rw-r--r--lib/soap/rpc/httpserver.rb129
-rw-r--r--lib/soap/rpc/proxy.rb497
-rw-r--r--lib/soap/rpc/router.rb594
-rw-r--r--lib/soap/rpc/rpc.rb25
-rw-r--r--lib/soap/rpc/soaplet.rb162
-rw-r--r--lib/soap/rpc/standaloneServer.rb43
-rw-r--r--lib/soap/soap.rb140
-rw-r--r--lib/soap/streamHandler.rb229
-rw-r--r--lib/soap/wsdlDriver.rb575
-rw-r--r--lib/sync.rb68
-rw-r--r--lib/telnet.rb9
-rw-r--r--lib/tempfile.rb207
-rw-r--r--lib/test/unit.rb280
-rw-r--r--lib/test/unit/assertionfailederror.rb14
-rw-r--r--lib/test/unit/assertions.rb622
-rw-r--r--lib/test/unit/autorunner.rb220
-rw-r--r--lib/test/unit/collector.rb43
-rw-r--r--lib/test/unit/collector/dir.rb107
-rw-r--r--lib/test/unit/collector/objectspace.rb34
-rw-r--r--lib/test/unit/error.rb56
-rw-r--r--lib/test/unit/failure.rb51
-rw-r--r--lib/test/unit/testcase.rb160
-rw-r--r--lib/test/unit/testresult.rb80
-rw-r--r--lib/test/unit/testsuite.rb76
-rw-r--r--lib/test/unit/ui/console/testrunner.rb127
-rw-r--r--lib/test/unit/ui/fox/testrunner.rb268
-rw-r--r--lib/test/unit/ui/gtk/testrunner.rb416
-rw-r--r--lib/test/unit/ui/gtk2/testrunner.rb465
-rw-r--r--lib/test/unit/ui/testrunnermediator.rb68
-rw-r--r--lib/test/unit/ui/testrunnerutilities.rb46
-rw-r--r--lib/test/unit/ui/tk/testrunner.rb260
-rw-r--r--lib/test/unit/util/backtracefilter.rb40
-rw-r--r--lib/test/unit/util/observable.rb90
-rw-r--r--lib/test/unit/util/procwrapper.rb48
-rw-r--r--lib/thread.rb283
-rw-r--r--lib/thwait.rb88
-rw-r--r--lib/time.rb797
-rw-r--r--lib/timeout.rb119
-rw-r--r--lib/tmpdir.rb45
-rw-r--r--lib/tracer.rb52
-rw-r--r--lib/tsort.rb290
-rw-r--r--lib/un.rb235
-rw-r--r--lib/uri.rb28
-rw-r--r--lib/uri/common.rb611
-rw-r--r--lib/uri/ftp.rb148
-rw-r--r--lib/uri/generic.rb1121
-rw-r--r--lib/uri/http.rb100
-rw-r--r--lib/uri/https.rb20
-rw-r--r--lib/uri/ldap.rb190
-rw-r--r--lib/uri/mailto.rb266
-rw-r--r--lib/weakref.rb79
-rw-r--r--lib/webrick.rb29
-rw-r--r--lib/webrick/accesslog.rb67
-rw-r--r--lib/webrick/cgi.rb257
-rw-r--r--lib/webrick/compat.rb15
-rw-r--r--lib/webrick/config.rb97
-rw-r--r--lib/webrick/cookie.rb110
-rw-r--r--lib/webrick/htmlutils.rb25
-rw-r--r--lib/webrick/httpauth.rb45
-rw-r--r--lib/webrick/httpauth/authenticator.rb79
-rw-r--r--lib/webrick/httpauth/basicauth.rb65
-rw-r--r--lib/webrick/httpauth/digestauth.rb343
-rw-r--r--lib/webrick/httpauth/htdigest.rb91
-rw-r--r--lib/webrick/httpauth/htgroup.rb61
-rw-r--r--lib/webrick/httpauth/htpasswd.rb83
-rw-r--r--lib/webrick/httpauth/userdb.rb29
-rw-r--r--lib/webrick/httpproxy.rb254
-rw-r--r--lib/webrick/httprequest.rb365
-rw-r--r--lib/webrick/httpresponse.rb327
-rw-r--r--lib/webrick/https.rb63
-rw-r--r--lib/webrick/httpserver.rb210
-rw-r--r--lib/webrick/httpservlet.rb22
-rw-r--r--lib/webrick/httpservlet/abstract.rb71
-rw-r--r--lib/webrick/httpservlet/cgi_runner.rb47
-rw-r--r--lib/webrick/httpservlet/cgihandler.rb104
-rw-r--r--lib/webrick/httpservlet/erbhandler.rb54
-rw-r--r--lib/webrick/httpservlet/filehandler.rb435
-rw-r--r--lib/webrick/httpservlet/prochandler.rb33
-rw-r--r--lib/webrick/httpstatus.rb126
-rw-r--r--lib/webrick/httputils.rb399
-rw-r--r--lib/webrick/httpversion.rb49
-rw-r--r--lib/webrick/log.rb88
-rw-r--r--lib/webrick/server.rb200
-rw-r--r--lib/webrick/ssl.rb126
-rw-r--r--lib/webrick/utils.rb100
-rw-r--r--lib/webrick/version.rb13
-rw-r--r--lib/wsdl/binding.rb65
-rw-r--r--lib/wsdl/data.rb64
-rw-r--r--lib/wsdl/definitions.rb250
-rw-r--r--lib/wsdl/documentation.rb32
-rw-r--r--lib/wsdl/import.rb80
-rw-r--r--lib/wsdl/importer.rb38
-rw-r--r--lib/wsdl/info.rb39
-rw-r--r--lib/wsdl/message.rb54
-rw-r--r--lib/wsdl/operation.rb130
-rw-r--r--lib/wsdl/operationBinding.rb108
-rw-r--r--lib/wsdl/param.rb85
-rw-r--r--lib/wsdl/parser.rb163
-rw-r--r--lib/wsdl/part.rb52
-rw-r--r--lib/wsdl/port.rb84
-rw-r--r--lib/wsdl/portType.rb73
-rw-r--r--lib/wsdl/service.rb61
-rw-r--r--lib/wsdl/soap/address.rb40
-rw-r--r--lib/wsdl/soap/binding.rb49
-rw-r--r--lib/wsdl/soap/body.rb56
-rw-r--r--lib/wsdl/soap/cgiStubCreator.rb76
-rw-r--r--lib/wsdl/soap/classDefCreator.rb314
-rw-r--r--lib/wsdl/soap/classDefCreatorSupport.rb126
-rw-r--r--lib/wsdl/soap/clientSkeltonCreator.rb78
-rw-r--r--lib/wsdl/soap/complexType.rb161
-rw-r--r--lib/wsdl/soap/data.rb42
-rw-r--r--lib/wsdl/soap/definitions.rb149
-rw-r--r--lib/wsdl/soap/driverCreator.rb95
-rw-r--r--lib/wsdl/soap/element.rb28
-rw-r--r--lib/wsdl/soap/fault.rb56
-rw-r--r--lib/wsdl/soap/header.rb86
-rw-r--r--lib/wsdl/soap/headerfault.rb56
-rw-r--r--lib/wsdl/soap/mappingRegistryCreator.rb92
-rw-r--r--lib/wsdl/soap/methodDefCreator.rb228
-rw-r--r--lib/wsdl/soap/operation.rb122
-rw-r--r--lib/wsdl/soap/servantSkeltonCreator.rb67
-rw-r--r--lib/wsdl/soap/standaloneServerStubCreator.rb85
-rw-r--r--lib/wsdl/soap/wsdl2ruby.rb176
-rw-r--r--lib/wsdl/types.rb43
-rw-r--r--lib/wsdl/wsdl.rb23
-rw-r--r--lib/wsdl/xmlSchema/all.rb69
-rw-r--r--lib/wsdl/xmlSchema/annotation.rb34
-rw-r--r--lib/wsdl/xmlSchema/any.rb56
-rw-r--r--lib/wsdl/xmlSchema/attribute.rb127
-rw-r--r--lib/wsdl/xmlSchema/choice.rb69
-rw-r--r--lib/wsdl/xmlSchema/complexContent.rb92
-rw-r--r--lib/wsdl/xmlSchema/complexType.rb139
-rw-r--r--lib/wsdl/xmlSchema/content.rb96
-rw-r--r--lib/wsdl/xmlSchema/data.rb80
-rw-r--r--lib/wsdl/xmlSchema/element.rb154
-rw-r--r--lib/wsdl/xmlSchema/enumeration.rb36
-rw-r--r--lib/wsdl/xmlSchema/import.rb65
-rw-r--r--lib/wsdl/xmlSchema/importer.rb87
-rw-r--r--lib/wsdl/xmlSchema/include.rb54
-rw-r--r--lib/wsdl/xmlSchema/length.rb35
-rw-r--r--lib/wsdl/xmlSchema/parser.rb166
-rw-r--r--lib/wsdl/xmlSchema/pattern.rb36
-rw-r--r--lib/wsdl/xmlSchema/schema.rb143
-rw-r--r--lib/wsdl/xmlSchema/sequence.rb69
-rw-r--r--lib/wsdl/xmlSchema/simpleContent.rb65
-rw-r--r--lib/wsdl/xmlSchema/simpleExtension.rb54
-rw-r--r--lib/wsdl/xmlSchema/simpleRestriction.rb73
-rw-r--r--lib/wsdl/xmlSchema/simpleType.rb73
-rw-r--r--lib/wsdl/xmlSchema/unique.rb34
-rw-r--r--lib/wsdl/xmlSchema/xsd2ruby.rb107
-rw-r--r--lib/xmlrpc/.document1
-rw-r--r--lib/xmlrpc/README.txt31
-rw-r--r--lib/xmlrpc/base64.rb81
-rw-r--r--lib/xmlrpc/client.rb619
-rw-r--r--lib/xmlrpc/config.rb40
-rw-r--r--lib/xmlrpc/create.rb290
-rw-r--r--lib/xmlrpc/datetime.rb142
-rw-r--r--lib/xmlrpc/httpserver.rb178
-rw-r--r--lib/xmlrpc/marshal.rb76
-rw-r--r--lib/xmlrpc/parser.rb813
-rw-r--r--lib/xmlrpc/server.rb780
-rw-r--r--lib/xmlrpc/utils.rb165
-rw-r--r--lib/xsd/charset.rb187
-rw-r--r--lib/xsd/codegen.rb12
-rw-r--r--lib/xsd/codegen/classdef.rb203
-rw-r--r--lib/xsd/codegen/commentdef.rb34
-rw-r--r--lib/xsd/codegen/gensupport.rb166
-rw-r--r--lib/xsd/codegen/methoddef.rb63
-rw-r--r--lib/xsd/codegen/moduledef.rb191
-rw-r--r--lib/xsd/datatypes.rb1269
-rw-r--r--lib/xsd/datatypes1999.rb20
-rw-r--r--lib/xsd/iconvcharset.rb33
-rw-r--r--lib/xsd/mapping.rb42
-rw-r--r--lib/xsd/namedelements.rb95
-rw-r--r--lib/xsd/ns.rb140
-rw-r--r--lib/xsd/qname.rb78
-rw-r--r--lib/xsd/xmlparser.rb61
-rw-r--r--lib/xsd/xmlparser/parser.rb96
-rw-r--r--lib/xsd/xmlparser/rexmlparser.rb54
-rw-r--r--lib/xsd/xmlparser/xmlparser.rb50
-rw-r--r--lib/xsd/xmlparser/xmlscanner.rb147
-rw-r--r--lib/yaml.rb436
-rw-r--r--lib/yaml/baseemitter.rb247
-rw-r--r--lib/yaml/basenode.rb216
-rw-r--r--lib/yaml/constants.rb45
-rw-r--r--lib/yaml/dbm.rb111
-rw-r--r--lib/yaml/encoding.rb33
-rw-r--r--lib/yaml/error.rb34
-rw-r--r--lib/yaml/loader.rb14
-rw-r--r--lib/yaml/rubytypes.rb408
-rw-r--r--lib/yaml/store.rb29
-rw-r--r--lib/yaml/stream.rb40
-rw-r--r--lib/yaml/stringio.rb83
-rw-r--r--lib/yaml/syck.rb19
-rw-r--r--lib/yaml/tag.rb91
-rw-r--r--lib/yaml/types.rb194
-rw-r--r--lib/yaml/yamlnode.rb54
-rw-r--r--lib/yaml/ypath.rb52
-rw-r--r--main.c19
-rw-r--r--marshal.c987
-rw-r--r--math.c405
-rwxr-xr-xmdoc2man.rb465
-rw-r--r--misc/README12
-rw-r--r--misc/inf-ruby.el106
-rw-r--r--misc/rdebug.el136
-rw-r--r--misc/ruby-electric.el200
-rw-r--r--misc/ruby-mode.el1217
-rw-r--r--missing.h142
-rw-r--r--missing/acosh.c88
-rw-r--r--missing/alloca.c14
-rw-r--r--missing/crypt.c1162
-rw-r--r--missing/dir.h66
-rw-r--r--missing/erf.c92
-rw-r--r--missing/fileblocks.c1
-rw-r--r--missing/finite.c2
-rw-r--r--missing/flock.c5
-rw-r--r--missing/hypot.c17
-rw-r--r--missing/isinf.c38
-rw-r--r--missing/isnan.c24
-rw-r--r--missing/memcmp.c5
-rw-r--r--missing/memmove.c38
-rw-r--r--missing/mkdir.c104
-rw-r--r--missing/os2.c2
-rw-r--r--missing/strcasecmp.c6
-rw-r--r--missing/strchr.c59
-rw-r--r--missing/strerror.c8
-rw-r--r--missing/strftime.c49
-rw-r--r--missing/strncasecmp.c5
-rw-r--r--missing/strstr.c83
-rw-r--r--missing/strtol.c89
-rw-r--r--missing/vsnprintf.c26
-rw-r--r--missing/x68.c4
-rw-r--r--[-rwxr-xr-x]mkconfig.rb177
-rw-r--r--node.h344
-rw-r--r--numeric.c1998
-rw-r--r--object.c2240
-rw-r--r--pack.c1093
-rw-r--r--parse.y4189
-rw-r--r--prec.c70
-rw-r--r--process.c3234
-rw-r--r--random.c509
-rw-r--r--range.c605
-rw-r--r--re.c1430
-rw-r--r--re.h12
-rw-r--r--regex.c947
-rw-r--r--regex.h21
-rw-r--r--ruby.1570
-rw-r--r--ruby.c593
-rw-r--r--ruby.h491
-rw-r--r--rubyio.h32
-rw-r--r--rubysig.h71
-rw-r--r--[-rwxr-xr-x]rubytest.rb13
-rwxr-xr-xrunruby.rb61
-rw-r--r--sample/README5
-rw-r--r--sample/biorhythm.rb29
-rw-r--r--sample/cal.rb231
-rw-r--r--sample/clnt.rb12
-rw-r--r--sample/dir.rb6
-rw-r--r--sample/drb/README.rd56
-rw-r--r--sample/drb/README.rd.ja59
-rw-r--r--sample/drb/darray.rb12
-rw-r--r--sample/drb/darrayc.rb59
-rw-r--r--sample/drb/dbiff.rb51
-rw-r--r--sample/drb/dcdbiff.rb43
-rw-r--r--sample/drb/dchatc.rb41
-rw-r--r--sample/drb/dchats.rb70
-rw-r--r--sample/drb/dhasen.rb42
-rw-r--r--sample/drb/dhasenc.rb13
-rw-r--r--sample/drb/dlogc.rb16
-rw-r--r--sample/drb/dlogd.rb39
-rw-r--r--sample/drb/dqin.rb13
-rw-r--r--sample/drb/dqlib.rb14
-rw-r--r--sample/drb/dqout.rb14
-rw-r--r--sample/drb/dqueue.rb12
-rw-r--r--sample/drb/drbc.rb45
-rw-r--r--sample/drb/drbch.rb48
-rw-r--r--sample/drb/drbm.rb60
-rw-r--r--sample/drb/drbmc.rb22
-rw-r--r--sample/drb/drbs-acl.rb51
-rw-r--r--sample/drb/drbs.rb64
-rw-r--r--sample/drb/drbssl_c.rb19
-rw-r--r--sample/drb/drbssl_s.rb31
-rw-r--r--sample/drb/extserv_test.rb80
-rw-r--r--sample/drb/gw_ct.rb29
-rw-r--r--sample/drb/gw_cu.rb28
-rw-r--r--sample/drb/gw_s.rb10
-rw-r--r--sample/drb/holderc.rb22
-rw-r--r--sample/drb/holders.rb63
-rw-r--r--sample/drb/http0.rb77
-rw-r--r--sample/drb/http0serv.rb119
-rw-r--r--sample/drb/name.rb117
-rw-r--r--sample/drb/namec.rb36
-rw-r--r--sample/drb/old_tuplespace.rb214
-rw-r--r--sample/drb/rinda_ts.rb7
-rw-r--r--sample/drb/rindac.rb17
-rw-r--r--sample/drb/rindas.rb18
-rw-r--r--sample/drb/ring_echo.rb30
-rw-r--r--sample/drb/ring_inspect.rb30
-rw-r--r--sample/drb/ring_place.rb25
-rw-r--r--sample/drb/simpletuple.rb91
-rw-r--r--sample/drb/speedc.rb21
-rw-r--r--sample/drb/speeds.rb31
-rw-r--r--sample/dualstack-fetch.rb48
-rw-r--r--sample/dualstack-httpd.rb55
-rw-r--r--sample/eval.rb15
-rw-r--r--sample/exyacc.rb8
-rw-r--r--sample/fact.rb5
-rw-r--r--sample/fullpath.rb14
-rw-r--r--sample/goodfriday.rb8
-rw-r--r--sample/io.rb44
-rw-r--r--sample/irb.rb (renamed from bin/irb)6
-rw-r--r--sample/logger/app.rb46
-rw-r--r--sample/logger/log.rb27
-rw-r--r--sample/logger/shifting.rb26
-rw-r--r--sample/mkproto.rb8
-rw-r--r--sample/occur.rb2
-rw-r--r--sample/occur2.rb4
-rw-r--r--sample/openssl/c_rehash.rb174
-rw-r--r--sample/openssl/cert2text.rb23
-rw-r--r--sample/openssl/cert_store_view.rb911
-rw-r--r--sample/openssl/certstore.rb161
-rw-r--r--sample/openssl/cipher.rb33
-rw-r--r--sample/openssl/crlstore.rb122
-rw-r--r--sample/openssl/echo_cli.rb37
-rw-r--r--sample/openssl/echo_svr.rb62
-rw-r--r--sample/openssl/gen_csr.rb50
-rw-r--r--sample/openssl/smime_read.rb23
-rw-r--r--sample/openssl/smime_write.rb23
-rw-r--r--sample/openssl/wget.rb33
-rw-r--r--sample/optparse/opttest.rb85
-rwxr-xr-xsample/optparse/subcommand.rb19
-rw-r--r--sample/pi.rb2
-rw-r--r--sample/rcs.rb20
-rw-r--r--sample/rename.rb297
-rwxr-xr-xsample/rss/blend.rb73
-rwxr-xr-xsample/rss/convert.rb69
-rw-r--r--sample/rss/list_description.rb82
-rwxr-xr-xsample/rss/re_read.rb64
-rw-r--r--sample/rss/rss_recent.rb81
-rw-r--r--sample/sieve.rb2
-rw-r--r--sample/svr.rb10
-rw-r--r--sample/test.rb1041
-rw-r--r--sample/testunit/adder.rb13
-rw-r--r--sample/testunit/subtracter.rb12
-rw-r--r--sample/testunit/tc_adder.rb18
-rw-r--r--sample/testunit/tc_subtracter.rb18
-rw-r--r--sample/testunit/ts_examples.rb7
-rw-r--r--sample/time.rb2
-rw-r--r--sample/trojan.rb2
-rw-r--r--sample/tsvr.rb6
-rw-r--r--sample/uumerge.rb12
-rw-r--r--sample/webrick/demo-app.rb66
-rw-r--r--sample/webrick/demo-multipart.cgi12
-rw-r--r--sample/webrick/demo-servlet.rb6
-rw-r--r--sample/webrick/demo-urlencoded.cgi12
-rw-r--r--sample/webrick/hello.cgi11
-rw-r--r--sample/webrick/hello.rb8
-rw-r--r--sample/webrick/httpd.rb23
-rw-r--r--sample/webrick/httpproxy.rb26
-rw-r--r--sample/webrick/httpsd.rb33
-rw-r--r--signal.c701
-rw-r--r--sprintf.c602
-rw-r--r--st.c192
-rw-r--r--st.h50
-rw-r--r--string.c3156
-rw-r--r--struct.c640
-rw-r--r--test/csv/test_csv.rb1753
-rw-r--r--test/dbm/test_dbm.rb545
-rw-r--r--test/digest/test_digest.rb120
-rw-r--r--test/drb/drbtest.rb351
-rw-r--r--test/drb/ignore_test_drb.rb24
-rw-r--r--test/drb/test_acl.rb195
-rw-r--r--test/drb/test_drb.rb301
-rw-r--r--test/drb/test_drbssl.rb62
-rw-r--r--test/drb/test_drbunix.rb46
-rw-r--r--test/drb/ut_array.rb15
-rw-r--r--test/drb/ut_array_drbssl.rb24
-rw-r--r--test/drb/ut_array_drbunix.rb15
-rw-r--r--test/drb/ut_drb.rb160
-rw-r--r--test/drb/ut_drb_drbssl.rb25
-rw-r--r--test/drb/ut_drb_drbunix.rb16
-rw-r--r--test/drb/ut_eval.rb31
-rw-r--r--test/drb/ut_large.rb38
-rw-r--r--test/drb/ut_port.rb14
-rw-r--r--test/drb/ut_safe1.rb15
-rw-r--r--test/drb/ut_timerholder.rb49
-rw-r--r--test/erb/test_erb.rb40
-rw-r--r--test/fileutils/fileasserts.rb67
-rw-r--r--test/fileutils/test_dryrun.rb25
-rw-r--r--test/fileutils/test_fileutils.rb1085
-rw-r--r--test/fileutils/test_nowrite.rb99
-rw-r--r--test/fileutils/test_verbose.rb25
-rw-r--r--test/gdbm/test_gdbm.rb692
-rw-r--r--test/io/nonblock/test_flush.rb28
-rw-r--r--test/logger/test_logger.rb376
-rw-r--r--test/monitor/test_monitor.rb161
-rw-r--r--test/net/http/test_httpheader.rb317
-rw-r--r--test/net/http/test_https_proxy.rb30
-rw-r--r--test/net/imap/test_imap.rb11
-rw-r--r--test/nkf/test_kconv.rb71
-rw-r--r--test/nkf/test_nkf.rb16
-rw-r--r--test/openssl/ssl_server.rb81
-rw-r--r--test/openssl/test_asn1.rb197
-rw-r--r--test/openssl/test_cipher.rb95
-rw-r--r--test/openssl/test_digest.rb88
-rw-r--r--test/openssl/test_hmac.rb34
-rw-r--r--test/openssl/test_ns_spki.rb59
-rw-r--r--test/openssl/test_pair.rb144
-rw-r--r--test/openssl/test_pkcs7.rb154
-rw-r--r--test/openssl/test_pkey_rsa.rb49
-rw-r--r--test/openssl/test_ssl.rb286
-rw-r--r--test/openssl/test_x509cert.rb175
-rw-r--r--test/openssl/test_x509crl.rb218
-rw-r--r--test/openssl/test_x509ext.rb74
-rw-r--r--test/openssl/test_x509name.rb266
-rw-r--r--test/openssl/test_x509req.rb140
-rw-r--r--test/openssl/test_x509store.rb218
-rw-r--r--test/openssl/utils.rb135
-rw-r--r--test/optparse/test_getopts.rb31
-rw-r--r--test/optparse/test_noarg.rb57
-rw-r--r--test/optparse/test_optarg.rb44
-rw-r--r--test/optparse/test_optparse.rb46
-rw-r--r--test/optparse/test_placearg.rb45
-rw-r--r--test/optparse/test_reqarg.rb63
-rw-r--r--test/ostruct/test_ostruct.rb23
-rw-r--r--test/pathname/test_pathname.rb486
-rw-r--r--test/rdoc/parsers/test_parse_c.rb261
-rw-r--r--test/readline/test_readline.rb84
-rw-r--r--test/rinda/test_rinda.rb539
-rw-r--r--test/rss/rss-assertions.rb506
-rw-r--r--test/rss/rss-testcase.rb293
-rw-r--r--test/rss/test_1.0.rb249
-rw-r--r--test/rss/test_2.0.rb390
-rw-r--r--test/rss/test_accessor.rb103
-rw-r--r--test/rss/test_content.rb94
-rw-r--r--test/rss/test_dublincore.rb189
-rw-r--r--test/rss/test_image.rb204
-rw-r--r--test/rss/test_inherit.rb41
-rw-r--r--test/rss/test_maker_0.9.rb399
-rw-r--r--test/rss/test_maker_1.0.rb431
-rw-r--r--test/rss/test_maker_2.0.rb667
-rw-r--r--test/rss/test_maker_content.rb34
-rw-r--r--test/rss/test_maker_dc.rb145
-rw-r--r--test/rss/test_maker_image.rb62
-rw-r--r--test/rss/test_maker_sy.rb43
-rw-r--r--test/rss/test_maker_taxo.rb81
-rw-r--r--test/rss/test_maker_trackback.rb41
-rw-r--r--test/rss/test_maker_xml-stylesheet.rb79
-rw-r--r--test/rss/test_parser.rb60
-rw-r--r--test/rss/test_parser_1.0.rb512
-rw-r--r--test/rss/test_parser_2.0.rb122
-rw-r--r--test/rss/test_setup_maker_0.9.rb233
-rw-r--r--test/rss/test_setup_maker_1.0.rb534
-rw-r--r--test/rss/test_setup_maker_2.0.rb308
-rw-r--r--test/rss/test_syndication.rb127
-rw-r--r--test/rss/test_taxonomy.rb172
-rw-r--r--test/rss/test_to_s.rb440
-rw-r--r--test/rss/test_trackback.rb135
-rw-r--r--test/rss/test_version.rb9
-rw-r--r--test/rss/test_xml-stylesheet.rb108
-rw-r--r--test/ruby/beginmainend.rb80
-rw-r--r--test/ruby/endblockwarn.rb12
-rw-r--r--test/ruby/envutil.rb28
-rw-r--r--test/ruby/marshaltestlib.rb494
-rw-r--r--test/ruby/suicide.rb2
-rw-r--r--test/ruby/test_alias.rb40
-rw-r--r--test/ruby/test_array.rb145
-rw-r--r--test/ruby/test_assignment.rb467
-rw-r--r--test/ruby/test_beginendblock.rb86
-rw-r--r--test/ruby/test_bignum.rb87
-rw-r--r--test/ruby/test_call.rb19
-rw-r--r--test/ruby/test_case.rb49
-rw-r--r--test/ruby/test_clone.rb28
-rw-r--r--test/ruby/test_condition.rb16
-rw-r--r--test/ruby/test_const.rb33
-rw-r--r--test/ruby/test_defined.rb43
-rw-r--r--test/ruby/test_dir.rb42
-rw-r--r--test/ruby/test_env.rb82
-rw-r--r--test/ruby/test_eval.rb157
-rw-r--r--test/ruby/test_exception.rb187
-rw-r--r--test/ruby/test_file.rb108
-rw-r--r--test/ruby/test_float.rb113
-rw-r--r--test/ruby/test_gc.rb30
-rw-r--r--test/ruby/test_hash.rb638
-rw-r--r--test/ruby/test_ifunless.rb14
-rw-r--r--test/ruby/test_io.rb11
-rw-r--r--test/ruby/test_iterator.rb477
-rw-r--r--test/ruby/test_marshal.rb68
-rw-r--r--test/ruby/test_math.rb12
-rw-r--r--test/ruby/test_method.rb53
-rw-r--r--test/ruby/test_objectspace.rb36
-rw-r--r--test/ruby/test_pack.rb60
-rw-r--r--test/ruby/test_path.rb224
-rw-r--r--test/ruby/test_pipe.rb18
-rw-r--r--test/ruby/test_proc.rb89
-rw-r--r--test/ruby/test_process.rb41
-rw-r--r--test/ruby/test_rand.rb131
-rw-r--r--test/ruby/test_range.rb17
-rw-r--r--test/ruby/test_readpartial.rb74
-rw-r--r--test/ruby/test_settracefunc.rb138
-rw-r--r--test/ruby/test_signal.rb68
-rw-r--r--test/ruby/test_string.rb19
-rw-r--r--test/ruby/test_stringchar.rb166
-rw-r--r--test/ruby/test_struct.rb24
-rw-r--r--test/ruby/test_super.rb134
-rw-r--r--test/ruby/test_symbol.rb77
-rw-r--r--test/ruby/test_system.rb67
-rw-r--r--test/ruby/test_time.rb74
-rw-r--r--test/ruby/test_trace.rb21
-rw-r--r--test/ruby/test_variable.rb53
-rw-r--r--test/ruby/test_whileuntil.rb77
-rw-r--r--test/ruby/ut_eof.rb128
-rw-r--r--test/runner.rb7
-rw-r--r--test/sdbm/test_sdbm.rb534
-rw-r--r--test/soap/asp.net/hello.wsdl96
-rw-r--r--test/soap/asp.net/test_aspdotnet.rb111
-rw-r--r--test/soap/calc/calc.rb17
-rw-r--r--test/soap/calc/calc2.rb29
-rw-r--r--test/soap/calc/server.cgi13
-rw-r--r--test/soap/calc/server.rb17
-rw-r--r--test/soap/calc/server2.rb20
-rw-r--r--test/soap/calc/test_calc.rb49
-rw-r--r--test/soap/calc/test_calc2.rb53
-rw-r--r--test/soap/calc/test_calc_cgi.rb69
-rw-r--r--test/soap/fault/test_customfault.rb58
-rw-r--r--test/soap/header/server.cgi119
-rw-r--r--test/soap/header/test_authheader.rb240
-rw-r--r--test/soap/header/test_authheader_cgi.rb121
-rw-r--r--test/soap/header/test_simplehandler.rb116
-rw-r--r--test/soap/helloworld/hw_s.rb16
-rw-r--r--test/soap/helloworld/test_helloworld.rb40
-rw-r--r--test/soap/marshal/test_digraph.rb56
-rw-r--r--test/soap/marshal/test_marshal.rb26
-rw-r--r--test/soap/marshal/test_struct.rb47
-rw-r--r--test/soap/ssl/README1
-rw-r--r--test/soap/ssl/ca.cert23
-rw-r--r--test/soap/ssl/client.cert19
-rw-r--r--test/soap/ssl/client.key15
-rw-r--r--test/soap/ssl/server.cert19
-rw-r--r--test/soap/ssl/server.key15
-rw-r--r--test/soap/ssl/sslsvr.rb57
-rw-r--r--test/soap/ssl/subca.cert21
-rw-r--r--test/soap/ssl/test_ssl.rb204
-rw-r--r--test/soap/struct/test_struct.rb77
-rw-r--r--test/soap/swa/test_file.rb73
-rw-r--r--test/soap/test_basetype.rb970
-rw-r--r--test/soap/test_envelopenamespace.rb92
-rw-r--r--test/soap/test_httpconfigloader.rb39
-rw-r--r--test/soap/test_mapping.rb59
-rw-r--r--test/soap/test_no_indent.rb86
-rw-r--r--test/soap/test_property.rb424
-rw-r--r--test/soap/test_soapelement.rb122
-rw-r--r--test/soap/test_streamhandler.rb209
-rw-r--r--test/soap/test_styleuse.rb333
-rw-r--r--test/soap/wsdlDriver/README.txt2
-rw-r--r--test/soap/wsdlDriver/calc.wsdl126
-rw-r--r--test/soap/wsdlDriver/document.wsdl54
-rw-r--r--test/soap/wsdlDriver/echo_version.rb20
-rw-r--r--test/soap/wsdlDriver/simpletype.wsdl63
-rw-r--r--test/soap/wsdlDriver/test_calc.rb100
-rw-r--r--test/soap/wsdlDriver/test_document.rb78
-rw-r--r--test/soap/wsdlDriver/test_simpletype.rb87
-rw-r--r--test/socket/test_nonblock.rb179
-rw-r--r--test/socket/test_socket.rb83
-rw-r--r--test/socket/test_unix.rb141
-rw-r--r--test/stringio/test_stringio.rb43
-rw-r--r--test/strscan/test_stringscanner.rb571
-rw-r--r--test/testunit/collector/test_dir.rb406
-rw-r--r--test/testunit/collector/test_objectspace.rb98
-rw-r--r--test/testunit/runit/test_assert.rb402
-rw-r--r--test/testunit/runit/test_testcase.rb91
-rw-r--r--test/testunit/runit/test_testresult.rb144
-rw-r--r--test/testunit/runit/test_testsuite.rb49
-rw-r--r--test/testunit/test_assertions.rb528
-rw-r--r--test/testunit/test_error.rb26
-rw-r--r--test/testunit/test_failure.rb33
-rw-r--r--test/testunit/test_testcase.rb275
-rw-r--r--test/testunit/test_testresult.rb104
-rw-r--r--test/testunit/test_testsuite.rb129
-rw-r--r--test/testunit/util/test_backtracefilter.rb41
-rw-r--r--test/testunit/util/test_observable.rb102
-rw-r--r--test/testunit/util/test_procwrapper.rb36
-rwxr-xr-xtest/thread/lbtest.rb51
-rw-r--r--test/thread/test_thread.rb119
-rw-r--r--test/uri/test_common.rb56
-rw-r--r--test/uri/test_ftp.rb42
-rw-r--r--test/uri/test_generic.rb698
-rw-r--r--test/uri/test_http.rb63
-rw-r--r--test/uri/test_ldap.rb100
-rw-r--r--test/uri/test_mailto.rb122
-rw-r--r--test/webrick/.htaccess1
-rw-r--r--test/webrick/test_cgi.rb71
-rw-r--r--test/webrick/test_cookie.rb104
-rw-r--r--test/webrick/test_filehandler.rb200
-rw-r--r--test/webrick/test_httpauth.rb82
-rw-r--r--test/webrick/test_httprequest.rb272
-rw-r--r--test/webrick/test_httpserver.rb260
-rw-r--r--test/webrick/test_httputils.rb96
-rw-r--r--test/webrick/test_httpversion.rb40
-rw-r--r--test/webrick/test_server.rb64
-rw-r--r--test/webrick/utils.rb52
-rw-r--r--test/webrick/webrick.cgi36
-rwxr-xr-xtest/webrick/webrick_long_filename.cgi36
-rw-r--r--test/wsdl/any/any.wsdl50
-rw-r--r--test/wsdl/any/expectedDriver.rb54
-rw-r--r--test/wsdl/any/expectedEcho.rb14
-rw-r--r--test/wsdl/any/expectedService.rb52
-rw-r--r--test/wsdl/any/test_any.rb58
-rw-r--r--test/wsdl/axisArray/axisArray.wsdl60
-rw-r--r--test/wsdl/axisArray/itemList.rb27
-rw-r--r--test/wsdl/axisArray/test_axisarray.rb69
-rw-r--r--test/wsdl/datetime/DatetimeService.rb44
-rw-r--r--test/wsdl/datetime/datetime.rb0
-rw-r--r--test/wsdl/datetime/datetime.wsdl45
-rw-r--r--test/wsdl/datetime/datetimeServant.rb21
-rw-r--r--test/wsdl/datetime/test_datetime.rb82
-rw-r--r--test/wsdl/document/document.wsdl74
-rw-r--r--test/wsdl/document/echo.rb92
-rw-r--r--test/wsdl/document/number.wsdl54
-rw-r--r--test/wsdl/document/ping_nosoapaction.wsdl66
-rw-r--r--test/wsdl/document/test_nosoapaction.rb109
-rw-r--r--test/wsdl/document/test_number.rb99
-rw-r--r--test/wsdl/document/test_rpc.rb177
-rw-r--r--test/wsdl/emptycomplextype.wsdl31
-rw-r--r--test/wsdl/map/map.wsdl92
-rw-r--r--test/wsdl/map/map.xml43
-rw-r--r--test/wsdl/map/test_map.rb99
-rw-r--r--test/wsdl/marshal/person.wsdl21
-rw-r--r--test/wsdl/marshal/person_org.rb22
-rw-r--r--test/wsdl/marshal/test_wsdlmarshal.rb80
-rw-r--r--test/wsdl/multiplefault.wsdl68
-rw-r--r--test/wsdl/qualified/lp.rb0
-rw-r--r--test/wsdl/qualified/lp.wsdl47
-rw-r--r--test/wsdl/qualified/lp.xsd26
-rw-r--r--test/wsdl/qualified/np.wsdl50
-rw-r--r--test/wsdl/qualified/test_qualified.rb154
-rw-r--r--test/wsdl/qualified/test_unqualified.rb143
-rw-r--r--test/wsdl/raa/RAA.rb243
-rw-r--r--test/wsdl/raa/RAAServant.rb99
-rw-r--r--test/wsdl/raa/RAAService.rb100
-rw-r--r--test/wsdl/raa/README.txt8
-rw-r--r--test/wsdl/raa/raa.wsdl264
-rw-r--r--test/wsdl/raa/server.rb103
-rw-r--r--test/wsdl/raa/test_raa.rb71
-rw-r--r--test/wsdl/ref/expectedProduct.rb90
-rw-r--r--test/wsdl/ref/product.wsdl86
-rw-r--r--test/wsdl/ref/test_ref.rb54
-rw-r--r--test/wsdl/rpc/echoDriver.rb55
-rw-r--r--test/wsdl/rpc/echo_serviceClient.rb23
-rw-r--r--test/wsdl/rpc/rpc.wsdl75
-rw-r--r--test/wsdl/rpc/test-rpc-lit.wsdl364
-rw-r--r--test/wsdl/rpc/test-rpc-lit12.wsdl455
-rw-r--r--test/wsdl/rpc/test_rpc.rb118
-rw-r--r--test/wsdl/rpc/test_rpc_lit.rb399
-rw-r--r--test/wsdl/simpletype/rpc/expectedClient.rb34
-rw-r--r--test/wsdl/simpletype/rpc/expectedDriver.rb62
-rw-r--r--test/wsdl/simpletype/rpc/expectedEchoVersion.rb23
-rw-r--r--test/wsdl/simpletype/rpc/expectedServant.rb32
-rw-r--r--test/wsdl/simpletype/rpc/expectedService.rb60
-rw-r--r--test/wsdl/simpletype/rpc/rpc.wsdl80
-rw-r--r--test/wsdl/simpletype/rpc/test_rpc.rb62
-rw-r--r--test/wsdl/simpletype/simpletype.wsdl95
-rw-r--r--test/wsdl/simpletype/test_simpletype.rb99
-rw-r--r--test/wsdl/soap/soapbodyparts.wsdl103
-rw-r--r--test/wsdl/soap/test_soapbodyparts.rb79
-rw-r--r--test/wsdl/test_emptycomplextype.rb21
-rw-r--r--test/wsdl/test_fault.rb51
-rw-r--r--test/wsdl/test_multiplefault.rb39
-rw-r--r--test/xmlrpc/data/bug_bool.expected3
-rw-r--r--test/xmlrpc/data/bug_bool.xml8
-rw-r--r--test/xmlrpc/data/bug_cdata.expected3
-rw-r--r--test/xmlrpc/data/bug_cdata.xml8
-rw-r--r--test/xmlrpc/data/bug_covert.expected10
-rw-r--r--test/xmlrpc/data/bug_covert.xml6
-rw-r--r--test/xmlrpc/data/datetime_iso8601.xml8
-rw-r--r--test/xmlrpc/data/fault.xml16
-rw-r--r--test/xmlrpc/data/value.expected7
-rw-r--r--test/xmlrpc/data/value.xml22
-rw-r--r--test/xmlrpc/data/xml1.expected243
-rw-r--r--test/xmlrpc/data/xml1.xml1
-rw-r--r--test/xmlrpc/test_datetime.rb159
-rw-r--r--test/xmlrpc/test_features.rb48
-rw-r--r--test/xmlrpc/test_marshal.rb93
-rw-r--r--test/xmlrpc/test_parser.rb85
-rw-r--r--test/xmlrpc/test_webrick_server.rb98
-rw-r--r--test/xmlrpc/webrick_testing.rb37
-rw-r--r--test/xsd/codegen/test_classdef.rb214
-rw-r--r--test/xsd/noencoding.xml4
-rw-r--r--test/xsd/test_noencoding.rb32
-rw-r--r--test/xsd/test_xmlschemaparser.rb22
-rw-r--r--test/xsd/test_xsd.rb1511
-rw-r--r--test/xsd/xmlschema.xml12
-rw-r--r--test/yaml/test_yaml.rb1284
-rw-r--r--test/zlib/test_zlib.rb57
-rw-r--r--time.c1660
-rw-r--r--util.c752
-rw-r--r--util.h30
-rw-r--r--variable.c1282
-rw-r--r--version.c19
-rw-r--r--version.h23
-rw-r--r--vms/config.h102
-rw-r--r--vms/vms.h10
-rw-r--r--vms/vmsruby_private.c52
-rw-r--r--vms/vmsruby_private.h7
-rw-r--r--win32/Makefile.sub662
-rw-r--r--win32/README.win3215
-rw-r--r--win32/config.h.in59
-rw-r--r--win32/config.status.in66
-rwxr-xr-xwin32/configure.bat89
-rw-r--r--win32/dir.h39
-rwxr-xr-xwin32/ifchange.bat32
-rw-r--r--[-rwxr-xr-x]win32/mkexports.rb23
-rw-r--r--[-rwxr-xr-x]win32/resource.rb31
-rwxr-xr-xwin32/rm.bat8
-rw-r--r--win32/setup.mak189
-rw-r--r--win32/win32.c3733
-rw-r--r--win32/win32.h545
-rw-r--r--wince/Makefile.sub505
-rw-r--r--wince/README.wince121
-rw-r--r--wince/assert.c11
-rw-r--r--wince/assert.h6
-rwxr-xr-xwince/configure.bat102
-rw-r--r--wince/direct.c54
-rw-r--r--wince/direct.h22
-rw-r--r--wince/errno.c11
-rw-r--r--wince/errno.h55
-rw-r--r--wince/fcntl.h42
-rw-r--r--wince/io.h76
-rw-r--r--wince/io_wce.c230
-rw-r--r--wince/mkconfig_wce.rb7
-rw-r--r--wince/mkexports.rb35
-rw-r--r--wince/process.h46
-rw-r--r--wince/process_wce.c47
-rw-r--r--wince/resource.rb96
-rw-r--r--wince/setup.mak245
-rw-r--r--wince/signal.h71
-rw-r--r--wince/signal_wce.c26
-rw-r--r--wince/stddef.h5
-rw-r--r--wince/stdio.c36
-rw-r--r--wince/stdlib.c57
-rw-r--r--wince/string_wce.c89
-rw-r--r--wince/sys/stat.c102
-rw-r--r--wince/sys/stat.h68
-rw-r--r--wince/sys/timeb.c25
-rw-r--r--wince/sys/timeb.h26
-rw-r--r--wince/sys/types.h60
-rw-r--r--wince/sys/utime.c44
-rw-r--r--wince/sys/utime.h27
-rw-r--r--wince/time.h63
-rw-r--r--wince/time_wce.c301
-rw-r--r--wince/varargs.h34
-rw-r--r--wince/wince.c583
-rw-r--r--wince/wince.h191
-rw-r--r--wince/wincemain.c19
-rw-r--r--wince/wincon.h7
-rw-r--r--wince/winsock2.c338
2474 files changed, 48691 insertions, 492257 deletions
diff --git a/.cvsignore b/.cvsignore
index a72211d03f..35fff17b58 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,46 +3,18 @@
*.rej
*.sav
*~
-.*.list
-.*.time
-.ccmalloc
-.ppack
-.ext
-.git
-.svn
-.pc
-COPYING.LIB
-ChangeLog.pre-alpha
-ChangeLog.pre1_1
+.cvsignore
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
ppack
-preview
rbconfig.rb
-repack
-riscos
-rubicon
ruby
-ruby-man.rd.gz
-tmp
-web
-y.output
-y.tab.c
diff --git a/.document b/.document
deleted file mode 100644
index 230c50e387..0000000000
--- a/.document
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file determines which files in the
-# Ruby hierarchy will be processed by the RDoc
-# tool when it is given the top-level directory
-# as an argument
-
-# Process all the C source files
-*.c
-
-# the lib/ directory (which has its own .document file)
-
-lib
-
-
-# and some of the ext/ directory (which has its own .document file)
-
-ext
diff --git a/COPYING b/COPYING
index 9043404a83..eeb586b392 100644
--- a/COPYING
+++ b/COPYING
@@ -1,56 +1,340 @@
-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 GPL
-version 2 (see the file GPL), or the conditions below:
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
- 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.
+ 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.
- 2. You may modify your copy of the software in any way, provided that
- you do at least ONE of the following:
+ Preamble
- 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.
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+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 Library General Public License instead.) You can apply it to
+your programs, too.
- b) use the modified software only within your corporation or
- organization.
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
- d) make other distribution arrangements with the author.
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
- 3. You may distribute the software in object code or binary form,
- provided that you do at least ONE of the following:
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
- 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.
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
- b) accompany the distribution with the machine-readable source of
- the software.
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
- c) give non-standard binaries non-standard names, with
- instructions on where to get the original software distribution.
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- d) make other distribution arrangements with the author.
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
- 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.
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
- For the list of those files and their copying conditions, see the
- file LEGAL.
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
- 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.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
- 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.
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ 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
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+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
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+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
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+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
+
+ 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
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+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
+
+ 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
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ 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 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+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 Library General
+Public License instead of this License.
diff --git a/COPYING.ja b/COPYING.ja
deleted file mode 100644
index 933cc7cb9a..0000000000
--- a/COPYING.ja
+++ /dev/null
@@ -1,51 +0,0 @@
-本プログラムはフリ・踉札愁侫肇逅札Д△任后俳岬芭賠鈬鱇貅蝟昭粡竚癈鷭т繻Ь跚也竇銖紿または以王踉擦胞踉雑す魴錣破椒廛蹈哀薀爐鮑毒柯曚鹿粡寂蝟赱齠洲粤讌将きます.GPLについてはGPLファイルを参箸靴堂さい.
-
- 1. 複製は制限なく海任后鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将荻ぢ以王踉擦陸苳賜件のいずれかを満たす時に本プログラムのソ・踉札垢鹿粡寂蝟赱齠洲粤讌将ぢ海吠儿垢任泙后鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将瓸ぢネットニュ・踉札困縫櫂好箸靴燭蝓ず遉踉市に変更を送付する
- などの方法で,変更を公開する.
-
- (b) 変更した本プログラムを僚蠡阿垢訌反テ睇瑤世韻鹿粡寂蝟赱齠洲粤讌将ぢ使う瘢雹.
-
- (c) 変更点を明┐靴燭逅擦─ぅ愁侫肇逅札Д△量前を変更する.
- そのソフトウ瘢雹ェアを配布する時には変更前の本プログラ
- ムも同時に配布する.または変更前の本プログラムのソ・踉鹿粡寂蝟赱齠洲粤讌将ぢスの入衙,鯡畝踉雑する.
-
- (d) その側苳擦諒儿孔苳賜件を作圓塙膂佞垢襦鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将凱ぢ以王踉擦陸苳賜件のいずれかを満たす時に本プログラムをコンパイ
- ルしたオブジェクトコ・踉札匹筅踉斬行形阿任眷柯曚任泙后鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将瓸ぢバイナリを右踉肢った人がソ・踉札垢鯑踉至できるよう瘢雹に,
- ソ・踉札垢瞭踉至法を明┐垢襦鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将皎ぢ機械可読なソ・踉札好魁ドを添付する.
-
- (c) 変更を行ったバイナリは巳苳餐阿鯤儿垢靴燭逅擦─ぅ螢献鹿粡寂蝟赱齠洲粤讌将ぢルのソ・踉札好魁ドの入衙,鯡畝踉雑する.
-
- (d) その側苳擦稜柯昿苳賜件を作圓塙膂佞垢襦鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将堪ぢ側苳擦離廛蹈哀薀爐悗琉僂呂い覆詭榲任△讀踉捌由です.た
- だし,本プログラムに含まれる側苳擦虜遉踉市によるコ・踉札匹蓮い鹿粡寂蝟赱齠洲粤讌将ぢれう苳擦譴虜遉踉市の意向による制限が加えられる豺腓△蠅泙后鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将ぢそれらファイルの一覧とそれう苳擦譴稜柯昿苳賜件などに付いては
- LEGALファイルを参箸靴討世気ぁ鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将貴ぢ本プログラムへの入力となるスクリプトおよび,本プログラ
- ムからの出力の権利は本プログラムの作圓任呂覆い修譴
- れの入出力を生成した人に属します.また,本プログラムに
- 組み込まれるための拡張ライブラリについても同様です.
-
- 6. 本プログラムは無保擇任后ズ遉踉市は本プログラムをサポ・踉札鹿粡寂蝟赱齠洲粤讌将ぢする意志はありますが,プログラム箸離丱阿△襪い亘椒鹿粡寂蝟赱齠洲粤讌将ぢログラムの孫圓覆匹虍犬垢襪い覆訛山欧紡个靴討眄鹿粡寂蝟赱齠洲粤讌将ぢ任を持ちません.
diff --git a/ChangeLog b/ChangeLog
index 5dce6cf23a..2ba8c07285 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,19984 +1,10419 @@
-Sun Jun 8 04:16:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu May 24 16:08:21 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * eval.c (rb_alias): do not call hook functions until initialization
- finishes. [ruby-talk:279538]
+ * mkconfig.rb: autoconf 2.50 support.
-Sun Jun 8 04:14:16 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Thu May 24 14:23:35 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
+ * eval.c (rb_yield_0): need argument adjustment for C defined
+ blocks too.
-Sun Jun 8 03:59:31 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue May 22 17:10:35 2001 K.Kosako <kosako@sofnec.co.jp>
- * ext/curses/extconf.rb: check macro if cannot find func.
- [ruby-list:44224]
+ * variable.c (rb_alias_variable): should not allow variable
+ aliasing if $SAFE >= 4.
-Sun Jun 8 03:52:53 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon May 21 15:26:05 JST 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
- * lib/cgi/session.rb (CGI::Session::FileStore::restore): use
- lockfile for exclusive locks. a patch from <tommy AT tmtm.org>.
- [ruby-dev:32296]
+ * lib/irb/multi-irb.rb: delete japanese messages.
-Sun Jun 8 03:49:15 2008 Tanaka Akira <akr@fsij.org>
+Mon May 21 13:15:25 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * missing/isinf.c (isinf): don't define if the macro is defined.
+ * bignum.c (rb_big2str): t should be protected from GC.
-Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun May 20 00:28:43 2001 Akinori MUSHA <knu@iDaemons.org>
- * numeric.c (round): fallback definition.
+ * ext/socket/extconf.rb: do not clobber $CFLAGS when setting
+ -DSOCKS.
- * numeric.c (flo_divmod, flo_round): use round() always.
- [ruby-dev:32269]
+Fri May 18 05:42:28 2001 Akinori MUSHA <knu@iDaemons.org>
-Sun Jun 8 03:42:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/thread.rb: rescue ThreadError in case the thread is dead
+ just before calling Thread#run.
- * numeric.c (flodivmod): work around for infinity.
+Fri May 18 05:29:21 2001 Akinori MUSHA <knu@iDaemons.org>
- * numeric.c (flo_divmod): work around for platforms have no round().
- [ruby-dev:32247]
+ * lib/mkmf.rb (xsystem): make a temporary fix to get $(...) macros
+ properly expanded on a command execution.
-Sun Jun 8 03:42:10 2008 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
+Fri May 18 03:49:55 2001 Brian F. Feldman <green@FreeBSD.org>
- * numeric.c (flo_divmod): round to the nearest integer.
- [ ruby-Bugs-14540 ]
+ * lib/mkmf.rb: unbreak "make install". lib/* must be installed
+ under $rubylibdir, not under $libdir.
-Sun Jun 8 03:28:53 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu May 17 19:36:47 2001 Akinori MUSHA <knu@iDaemons.org>
- * lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
- nkf conversion. a patch from <moonwolf AT moonwolf.com>.
- [ruby-dev:32183]
+ * lib/shell.rb, lib/shell/process-controller.rb,
+ lib/shell/command-processor.rb: translate Japanese comments into
+ English.
-Sun Jun 8 03:07:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * doc/shell.rd.jp: RD'ify and make some fixes.
- * 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].
+ * doc/shell.rd: RD'ify, delete Japanese leftovers, make overall
+ English fixes, and sync with doc/shell.rd.jp.
-Sun Jun 8 03:04:38 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu May 17 19:34:11 2001 Akinori MUSHA <knu@iDaemons.org>
- * numeric.c (fix_pow): returns infinity for 0**-1. [ruby-dev:32084]
+ * doc/shell.rd*, lib/shell*: bring shell.rb 0.6 onto the ruby_1_6
+ branch.
-Sun Jun 8 02:58:19 2008 James Edward Gray II <jeg2@ruby-lang.org>
+Thu May 17 17:35:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- Merged 13781 from trunk.
+ * eval.c (rb_call0): address of local_vars might change during eval.
- * lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
- addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
+Thu May 17 07:30:15 2001 Akinori MUSHA <knu@iDaemons.org>
-Wed Oct 25 06:46:21 2007 James Edward Gray II <jeg2@ruby-lang.org>
+ * ext/md5/md5.txt, ext/md5/md5.txt.jp: s/SuperClass/Superclass/.
- Merged 13779 from trunk.
+Thu May 17 06:37:14 2001 Akinori MUSHA <knu@iDaemons.org>
- * lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
- pattern case insensitive. [ruby-Bugs-10746]
+ * ext/md5/md5.txt: make wording fixes.
-Sun Jun 8 02:55:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/md5/md5.txt.jp: ditto.
- * io.c (rb_io_tell, rb_io_seek): check errno too. [ruby-dev:32093]
+Thu May 17 05:23:52 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
+ * lib/irb.rb lib/irb/multi-irb.rb lib/irb/ruby-lex.rb lib/irb/version.rb
+ resolve ctrl-c problem
-Sun Jun 8 01:53:50 2008 James Edward Gray II <jeg2@ruby-lang.org>
+Tue May 15 17:46:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- Merged 13767, 13768, 13769, and 13770 from trunk.
+ * array.c (rb_ary_and): should not push frozen key string.
- * 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]
-
- * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
- the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
-
- * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
- message for Content-Type check failures. [ruby-core:12163]
-
- * lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
- Making Content-Type checks case insensitive. [ruby-Bugs-3367]
-
-Sun Jun 8 01:50:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_bytes0): refined length check. [ruby-dev:32059]
-
-Sun Jun 8 01:50:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * marshal.c (r_bytes0): check if source has enough data.
- [ruby-dev:32054]
-
-Sun Jun 8 01:41:19 2008 Tanaka Akira <akr@fsij.org>
-
- * ext/socket/socket.c (s_accept_nonblock): make accepted fd
- nonblocking. [ruby-talk:274079]
-
-Sun Jun 8 01:36:26 2008 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 Jun 8 01:31:17 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/mkexports.rb: deal with __fastcall name decorations.
- [ruby-list:44111]
-
-Sun Jun 8 01:27:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * {bcc,win}32/mkexports.rb: explicit data. [ruby-list:44108]
-
-Sun Jun 8 01:15:50 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/net/http.rb, lib/open-uri.rb: remove
- Net::HTTP#enable_post_connection_check. [ruby-dev:31960]
-
- * lib/net/imap.rb: hostname should be verified against server's
- indentity as persented in the server's certificate. [ruby-dev:31960]
-
- * ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
-
-Thu Jun 5 16:21:16 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (make_cmdvector): adjust escaped successive
- double-quote handling. (merge from trunk)
-
-Thu Jun 5 12:26:45 2008 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (init_env): initialize HOME and USER environment
- variables unless set. [ruby-core:12328] (merge from trunk)
-
- * win32/win32.c (NtInitialize, getlogin): ditto.
-
- * configure.in, win32/Makefile.sub (LIBS): need to link shell32
- library for SH* functions on mswin32 and mingw32.
-
-Thu Jun 5 12:22:28 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
- [ruby-dev:31911]
-
-Wed Jun 4 16:41:19 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
- objects. [ruby-Bugs-14228]
-
-Tue Jun 3 16:15:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yyerror): limit error message length. [ruby-dev:31848]
-
- * regex.c (re_mbc_startpos): separated from re_adjust_startpos.
-
-Tue Jun 3 15:45:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
- [ruby-dev:31810]
-
-Wed Jun 4 19:16:40 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (remove_method): should not remove undef place holder.
- [ruby-dev:31817]
-
-Tue Jun 3 15:22:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (struct rb_exec_arg): proc should be a VALUE.
-
- * process.c (rb_f_exec): suppress a warning.
-
- * process.c (rb_detach_process): cast for the platforms where size of
- pointer differs from size of int.
-
- * process.c (rb_f_exec, rb_f_system): should not exceptions after
- fork. [ruby-core:08262]
-
-Wed May 21 01:32:56 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::AbstracServlet#redirect_to_directory_uri):
- should escape the value of Location: header.
-
- * lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
- command line arguments.
-
-Sun May 18 01:57:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (isdirsep): backslash is valid path separator on cygwin too.
- backported from 1.8 HEAD.
-
-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 23:50:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (OpenFile): prevent conflict on Windows.
-
- * file.c (USE_NTFS): fixed merge miss.
-
-Sat May 17 12:36:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): rb_str_set_len is not backported.
-
-Sat May 17 12:15:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (file_expand_path): support for alternative data stream
- and ignored trailing garbages of NTFS.
-
- * file.c (rb_file_s_basename): ditto.
-
- * file.c (rb_file_s_extname): ditto.
-
-Mon Mar 3 23:34:13 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 Dec 3 08:13:52 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 Sep 23 21:57:25 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/net/http.rb: an SSL verification (the server hostname should
- be matched with its certificate's commonName) is added.
- 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 07:49:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c, intern.h, ext/thread/thread.c: should not free queue while
- any live threads are waiting. [ruby-dev:30653]
-
-Sun Sep 23 06:05:35 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]
-
-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.
-
-Wed Sep 19 11:13:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigtrunc): RBIGNUM(x)->len may be zero. out of bound
- access. [ruby-dev:31404]
-
-Mon Sep 17 05:24:13 2007 Sylvain Joyeux <sylvain.joyeux@m4x.org>
-
- * ext/thread/thread.c (lock_mutex): should take care of threads
- not waiting any longer; there cases of a thread raising
- exceptions. [ ruby-Bugs-11901 ]
-
- * test/thread/test_thread.rb (test_mutex_exception_handling):
- test for above.
-
-Mon Sep 17 05:01:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * runruby.rb: fix incomplete backport r12339.
-
-Mon Sep 17 04:56:28 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * test/thread/test_thread.rb (test_local_barrier),
- test/thread/lbtest.rb: test for [ruby-dev:30653].
-
-Mon Sep 17 04:52:21 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): -W should be allowed in RUBYOPT
- environment variable. [ruby-core:12118]
-
-Mon Sep 17 04:37:10 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): fixed integer overflow. [ruby-dev:31763]
-
-Fri Sep 7 17:06:16 2007 Vincent Isambart <vincent.isambart@gmail.com>
-
- * eval.c (rb_thread_start_0): should unset time_thread_alive_p.
- [ruby-talk:257219], [ruby-core:11542], [ruby-dev:31253]
-
-Fri Sep 7 16:39:23 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]
-
-Fri Sep 7 16:33:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * include/ruby/defines.h (flush_register_windows): call "ta 0x03"
- even on Linux/Sparc. [ruby-dev:31674]
-
-Fri Sep 7 16:09:39 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key,
- reg_get_val, ole_wc2mb): fix the bug. Thanks, arton.
- [ruby-dev:31576]
-
-Fri Sep 7 15:50:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (mnew): should preserve noex as safe_level.
-
- * eval.c (rb_call0): tighten security check condition..
-
-Fri Sep 7 15:43:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/tk/tcltklib.c (Init_tcltklib): use rb_set_end_proc().
-
-Fri Sep 7 15:42:07 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]
-
-Fri Sep 7 15:40:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
- comment lines first.
-
-Wed Aug 22 12:40:15 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]
-
-Sun Arg 12 03:56:30 2007 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug.
- the thread is started too early. [ruby-talk:264062]
-
- * test/rinda/test_rinda.rb: ditto.
-
-Wed Aug 22 12:31:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
- [ruby-Bugs-12859]
-
-Wed Aug 22 12:30:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
-
-Wed Aug 22 12:29:36 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/README: fixed a typo.
-
-Wed Aug 22 12:13: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.
-
-Wed Aug 22 11:49:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): should not check positional number as
- width. [ruby-core:11838]
-
-Wed Aug 22 11:47:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_aref): check for Bignum index range.
- [ruby-dev:31271]
-
-Wed Aug 22 11:41:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dln.c (conv_to_posix_path): removed.
-
- * 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.
-
-Wed Aug 22 11:39:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h (is_ruby_native_thread): removed since declared as an int
- function in ruby.h already.
-
-Wed Aug 22 11:00:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
-
-Wed Aug 22 10:57:50 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]
-
-Wed Aug 22 10:55:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (get_backtrace): check the result more.
- [ruby-dev:31261] [ruby-bugs-12398]
-
-Wed Aug 22 10:36:15 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 Aug 22 10:29:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_pow): refine overflow check. [ruby-dev:31242]
-
-Wed Aug 22 10:26:59 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]
-
-Wed Aug 22 10:24:00 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.
-
-Wed Aug 22 10:23:01 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/base64.rb (Base64::b64encode): should not specify /o option
- for regular expression. [ruby-dev:31221]
-
-Wed Aug 22 10:20:32 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]
-
-Wed Aug 22 10:13:45 2007 pegacorn <subscriber.jp AT gmail.com>
-
- * 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]
-
- * win32.h (rb_w32_getcwd): prototype added. [ruby-dev:31232]
-
-Wed Aug 22 10:11:59 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_cstr_to_inum): check leading non-digits.
- [ruby-core:11691]
-
-Wed Aug 22 10:07:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_neg): SIGNED_VALUE isn't in 1.8.
-
- * bignum.c (bigtrunc): do not empty Bignum. [ruby-dev:31229]
-
-Wed Aug 22 10:02:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_pow): 0**2 should not raise floating point
- exception. [ruby-dev:31216]
-
-Wed Aug 22 10:01:08 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]
-
-Wed Aug 22 09:58:30 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.
-
-Wed Aug 22 09:55:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * struct.c (rb_struct_init_copy): disallow changing the size.
- [ruby-dev:31168]
-
-Wed Aug 22 09:54:28 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * random.c: documentation fix. srand(0) initializes PRNG with '0',
- not with random_seed.
-
-Wed Aug 22 09:53:14 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
-
-Wed Aug 22 09:46:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): sign bit extension should not be done
- if FPLUS flag is specified. [ruby-list:39224]
-
-Wed Aug 22 09:41:56 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_initialize): should call rb_ary_modify() first.
- [ruby-core:11562]
-
-Wed Aug 22 09:40:25 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yylex): return non-valid token for an invalid
- instance/class variable name. a patch from from Yusuke ENDOH
- <mame AT tsg.ne.jp>. [ruby-dev:31095]
-
-Wed Aug 22 09:39:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (dsym): return non-null NODE even if yyerror(). based on a
- patch from from Yusuke ENDOH <mame AT tsg.ne.jp>. [ruby-dev:31085]
-
-Wed Aug 22 09:38:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_exec_v, rb_proc_exec): preserve errno.
-
-Wed Aug 22 09:00:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured
- in at_exit blocks. [ruby-core:11263]
-
-Wed Aug 22 08:52:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (rb_path2class): get rid of dangling pointer caused by
- optimized out value.
-
-Wed Aug 22 08:51:20 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
- fixed [ruby-bugs:PR#5489].
-
-Wed Aug 22 08:49:47 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (darwin): prohibit loading extension libraries to
- miniruby.
-
-Wed Aug 22 08:34:20 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_kill_thread): renamed in order to get rid of conflict
- with a BeOS system function. [ruby-core:10830]
-
-Wed Aug 22 08:32:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
- clash.
-Wed Aug 22 08:27:53 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (ResponseParser#next_token): fixed
- error message. (backported from HEAD)
-
- * lib/net/imap.rb (ResponseParser#parse_error): fixed
- the condition not to refer @token.symbol unexpectedly.
- Thanks, Dick Monahan. (backported from HEAD)
-
-Wed Aug 22 08:26:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_extended): erroneous check condition when dump
- method is defined. [ruby-core:10646]
-
-Mon Jun 18 11:29:49 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * intern.h, ext/thread/thread.c: moved prototype of rb_thread_status()
- to get rid of error in C++. [ruby-list:43615]
-
-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]
-
-Sat Jun 9 10:40:00 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * stable version 1.8.6-p36 released.
-
-Fri Jun 8 17:50:17 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (rb_thread_cancel_timer): fix undefined function
-
-Wed May 30 05:17:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
- [ruby-dev:30836]
-
-Wed May 30 04:29:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (thread_timer): timer thread should not receive any
- signals. submitted by Sylvain Joyeux. [ruby-core:08546]
-
-Wed May 30 04:18:37 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval_cmd): just return if no exceptions.
- [ruby-dev:30820]
-
-Tue May 29 11:01:06 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (rb_w32_opendir): store attributes of the second
- entries or later too.
-
- * win32/win32.c (rb_w32_opendir, rb_w32_readdir): eliminate magic
- numbers.
-
-Thu Jun 7 20:10:51 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c, intern.h, ext/thread/thread.c: should not free queue
- while any live threads are waiting.
- [ruby-dev:30653]
-
-Thu Jun 7 14:53:46 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * eval.c (method_inspect): show proper class name.
- [ruby-talk:248647], Thanks Calamitas.
-
-Sun May 27 05:24:56 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * runruby.rb: eliminate uninitialized variable.
- [ruby-core:11255]
-
-Sun May 27 05:19:03 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * eval.c (mnew): call of super via a method object should work again.
- [ruby-talk:248647], Thanks Calamitas.
-
- * test/ruby/test_method.rb (TestMethod::test_method_super): test for
- above fix.
-
-Wed May 23 07:29:53 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * process.c (proc_exec_v): terminate timer thread in advance.
- [ruby-dev:30581], Thanks H. Holon.
-
-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]
-
-Wed May 23 06:14:15 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (move_to_next_entry): loc also must move forward.
- [ruby-talk:251987]
-
-Wed May 23 05:55:04 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.
-
-Wed May 23 05:35:42 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
-
-Wed May 23 05:17:33 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
-
-Wed May 23 05:10:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_thread_priority): rdoc fix; the initial value is
- inherited from the creating thread. [ruby-core:10607]
-
-Wed May 23 04:22:57 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
- [ruby-talk:248288]
-
-Wed May 23 03:50:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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.
-
-Wed May 23 03:33:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
- ensures Thread.critical to be false. [ruby-talk:248300]
-
-Wed May 23 03:25:13 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (ruby_strtod): exponent is radix 10. [ruby-talk:248272]
-
-Wed May 23 03:12:17 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]
-
-Wed May 23 02:09:32 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): should not clear state on TAG_NEXT when
- it's invoked from within lambda body. [ruby-talk:248136]
-
- * eval.c (proc_invoke): handle TAG_NEXT which would be caused by
- next in the lambda body as well.
-
-Wed May 23 01:55:49 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().
-
-Wed May 23 01:42:29 2007 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (disconnect): call shutdown for
- SSLSocket. Thanks, Technorama Ltd.
-
-Wed May 23 01:28:14 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]
-
- * io.c (pipe_open): raise NotImplementedError for command "-" on
- platforms where fork(2) is not available. [ruby-dev:30681]
-
-Wed May 23 00:03:42 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]
-
-Sat Mar 24 23:40:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * node.h (struct rb_thread.locals): explicit as struct.
- [ruby-core:10585]
-
- * eval.c, node.h (enum rb_thread_status, struct rb_thread,
- rb_curr_thread, rb_main_thread): prefixed. [ruby-core:10586]
-
- * file.c (chompdirsep): made an unprefixed name static.
-
- * io.c (io_fread): ditto.
-
-Tue May 22 23:27:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
- block. [ruby-core:10609]
-
- * test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
- test for exit in END block. [ruby-core:10760]
-
- * test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
- test for signal in END block.
-
-Tue May 22 23:14:19 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_provided): check for extension library if SOEXT is
- explicitly given. [ruby-dev:30657]
-
-Tue May 22 21:29:08 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bignum.c (rb_big2str0): round up for the most significant digit.
- [ruby-core:10686]
-
-Tue May 22 20:53:02 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/thread.c (remove_one): Preserve List invariants;
- submitted by: MenTaLguY <mental AT rydia.net>
- in [ruby-core:10598] and [ruby-bugs:PR#9388].
-
-Tue Mar 20 15:37:24 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * distruby.rb: Add zip generation.
-
-Fri Mar 16 21:48:11 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
- submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
- in [ruby-dev:30554].
-
-Fri Mar 16 18:28:06 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
- always returning the (real) group entry of the running process;
- reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
- in [ruby-dev:30586].
-
-Fri Mar 16 16:33:58 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/thread.c (unlock_mutex_inner): Make sure that the
- given mutex is actually owned by the caller; submitted by:
- Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
-
-Fri Mar 16 16:21:35 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
- ConditionVariable#wait that occurs when two threads that are
- trying to access the condition variable are also in concurrence
- for the given mutex; submitted by: Sylvain Joyeux
- <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
- in [ruby-core:10598].
-
-Fri Mar 16 16:17:27 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * test/thread/test_thread.rb: Add a test script for the `thread'
- library. This should result in failure as of now with
- ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
- m4x.org> in [ruby-core:10598].
-
-Wed Mar 14 12:30:00 2007 Shigeo Kobayashi <shigeo@tinyforest.jp>
-
- * ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
- treated as ("-0.31") not as ("0.31").
-
-Tue Mar 13 04:04:04 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * stable version 1.8.6 released.
-
-Tue Mar 13 02:54:17 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 11:07:44 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
- externally defined modules; submitted by Technorama
- 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.
-
-Mon Mar 12 01:23:50 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
- This might not be very right but it is commonly used in other
- parts of the code; submitted by sheepman <sheepman AT
- sheepman.sakura.ne.jp> in [ruby-dev:30532].
-
- * ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
-
- * ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
- DL::Importable::Internal::callback): Avoid race condition for an
- instance variable; submitted by sheepman <sheepman AT
- sheepman.sakura.ne.jp> in [ruby-dev:30530].
-
-Sun Mar 11 19:04:29 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * misc/README: Add a note about ruby-electric.el.
-
- * misc/ruby-mode.el (ruby-non-block-do-re): Fix
- ruby-non-block-do-re. [ruby-core:03719]
-
- * misc/inf-ruby.el: Synchronize the comment section with trunk.
-
- * 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].
-
-Sun Mar 11 17:51:46 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
- function is found in the function table before trying to call
- it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
- in [ruby-dev:30524].
-
-Sun Mar 11 17:30:53 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (error_handle): no message when exiting by signal.
-
- * eval.c (ruby_cleanup): re-send signal. [ruby-dev:30516]
-
- * eval.c (rb_thread_interrupt): instantiate SignalException.
-
- * eval.c (rb_thread_signal_raise): now takes signal number instead
- of signal name.
-
- * 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_signal_exec, trap): handle SIGTERM. [ruby-dev:30505]
-
-Tue Mar 6 19:03:42 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
- Digest::MD5.
-
- * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
-
- * lib/shell/process-controller.rb: fix thread synchronization
- problem for [ruby-dev:30477].
-
- * ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
- Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
- moriq.com> in [ruby-dev:30500].
-
- * ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
-
- * time.c (time_to_s): Back out the format changes; discussed
- in [ruby-dev:30495].
-
- * ext/tk/sample/irbtkw.rbw: fails to exit process.
-
-Mon Mar 5 20:26:10 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * time.c (time_to_s): Correct the wrong format which did not
- really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
- iij.ad.jp> in [ruby-dev:30487].
-
-Sun Mar 4 23:53:27 2007 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mv): could not move a directory between
- different filesystems. [ruby-dev:30411]
-
-Sun Mar 4 23:46:40 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]
-
-Sun Mar 4 23:19:00 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * util.c (push_element): should return a int value.
-
-Sun Mar 4 01:06:55 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 21:41:31 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
- submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
- [ruby-list:43218].
- cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
-
-Sat Mar 3 19:07:05 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/thread.c (push_list): Use ALLOC().
-
- * ext/thread/thread.c (rb_mutex_alloc): Ditto.
-
- * ext/thread/thread.c (rb_condvar_alloc): Ditto.
-
-Sat Mar 3 18:56:40 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * NEWS: Add a note for String#intern.
-
-Sat Mar 3 18:36:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_provided): return true only for features loaded from
- .rb files, and not search actual library type. [ruby-dev:30414]
-
- * eval.c (rb_feature_p): check loading_tbl if the given ext is
- empty. [ruby-dev:30452]
-
- * eval.c (rb_feature_p): fix possible buffer overrun.
-
-Sat Mar 3 16:30:39 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
- local_tbl region from getting freed many times; submitted by
- Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in
- [ruby-dev:30460].
-
- * eval.c (proc_invoke): Ditto.
-
- * gc.c (obj_free): Ditto.
-
- * parse.y (top_local_setup_gen): Ditto.
-
-Sat Mar 3 16:09:27 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * object.c (rb_obj_ivar_set): RDoc updated according to a
- suggestion from Brian Candler <B.Candler AT pobox.com>.
- [ruby-core:10469]
-
-Sat Mar 3 15:41:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
- empty. [ruby-dev:30452]
-
-Thu Mar 1 04:08:30 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb (patchlevel): read from version.h.
-
-Thu Mar 1 03:42:09 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.
-
-Wed Feb 28 22:10:55 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0. This is way too old
- NEWS.
-
- * NEWS: Add NEWS, a document file to keep user visible feature
- changes between releases.
-
- * configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
-
- * missing/flock.c: workaround for MinGW.
-
- * 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]
-
- * 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]
-
- * test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
- target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
-
- * mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
-
- * common.mk: new target dist
-
- * distruby.rb: new file
-
- * configure.in (--enable-auto-image-base): avoid the neccessity to
- rebase the shared libs as much as possible;
- submitted by Corinna Vinschen <spam at vinschen.de> in
- [ruby-talk:240964].
-
-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]
-
-Tue Feb 27 21:50:10 2007 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
-
- * configure.in (ac_cv_func_setrlimit): workaround for djgpp.
-
-Tue Feb 27 20:49:19 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/base64.rb (Base64::b64encode): Fix documentation; submitted
- by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
-
- * regex.c (calculate_must_string, slow_search, re_search): Silence
- warnings regarding char * vs. unsigned char * mismatch;
- submitted by Lyle Johnson <lyle.johnson@gmail.com>
- in [ruby-core:10416].
-
- * ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto.
-
- * ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
-
- * ext/digest/rmd160/rmd160ossl.c (RMD160_Finish): Ditto.
-
- * ext/digest/digest.c (rb_digest_base_finish,
- rb_digest_base_update): Ditto.
-
- * ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
- rb_nkf_guess2): Ditto.
-
- * ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
- Eliminate rb_thread_critical switching where unnecessary;
- implied by shugo in [ruby-dev:30412].
-
- * ext/thread/thread.c (set_critical): Merge in
- thread_exclusive_ensure().
-
- * ext/thread/thread.c: Consistently use 0 and 1 for
- rb_thread_critical values.
-
- * ext/thread/thread.c: Use xmalloc()/xfree() instead of
- malloc()/free(); pointed out by shugo in [ruby-dev:30412].
-
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
- Initialize @workdir properly to silence a warning under -w.
- Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
-
-Sun Feb 25 02:50:51 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
- which is necessary for dir.c to compile on djgpp and emx.
-
-Sat Feb 24 17:04:01 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: updated based on date2 4.0.3.
-
-Sat Feb 24 17:01:02 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 16:53:09 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * signal.c (sighandler): need to tell to be interrupted to main
- context when handler is installed.
-
- * win32/win32.[ch] (rb_win32_interrupted): new function to listen
- interrupt.
-
- * win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
- workaround. [ruby-core:10259]
-
- * win32/win32.c (NtInitialize): call above function.
-
-Fri Feb 23 13:04:43 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
- suggested in
- http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
- [ruby-talk:240223]
-
-Fri Feb 23 12:47:13 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.
-
-Mon Feb 19 18:33:30 2007 Akinori MUSHA <knu@iDaemons.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]
-
-Mon Feb 19 18:27:42 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
- load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
- a bug where a statically linked extension cannot be autoloaded.
- [ruby-dev:30023] / [ruby-dev:30239]
-
-Thu Feb 15 20:31:07 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/uri/ftp.rb: Revert the previous change pending discussion.
-
-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 18:10:09 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * dir.c (glob_helper): Fix the function declaration.
-
-Thu Feb 15 16:55:33 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * version.h: Branch off ruby_1_8_6 from ruby_1_8 in preparation
- for the forthcoming 1.8.6 release.
-
-Thu Feb 15 16:44:14 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/uri/generic.rb (URI::Generic::userinfo): Considering how
- `scheme://user:@...', `scheme://:password@...' and
- `scheme://:@...' are parsed, an empty user name or password
- should be allowed and represented as it is.
-
-Thu Feb 15 11:46:05 2007 KIMURA Koichi <hogemuta@gmail.com>
-
- * dir.c, win32/win32.c, win32/dir.h, ruby.h, intern.h: Bring
- encoding aware globbing support in from trunk. Dir.[] and
- Dir.glob() can now take many patterns in an array. Minor fixes
- will follow.
-
-Thu Feb 15 11:00:26 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/uri/generic.rb (URI::Generic::userinfo): should support
- empty password. [ruby-core:10290]
-
- * lib/uri/generic.rb (URI::Generic::set_password): password can be
- cleared by nil. [ruby-core:10290]
-
- * lib/uri/common.rb (escape): regard second string argument as a
- character set properly. [ruby-dev:27692]
-
- * lib/uri/ftp.rb: Attempt to conform to RFC 1738 with regard to
- relative/absolute paths.
-
- * lib/uri: Lovely RDOC patches from mathew (metaATpoboxDOTcom).
-
-Thu Feb 15 10:57:38 2007 Tietew <tietew@tietew.net>>
-
- * 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]
-
-Thu Feb 15 10:48:40 2007 MenTaLguY <mental@rydia.net>
-
- * ext/thread/thread.c: Handle interrupted waits correctly.
- [ruby-bugs:PR#8663]
-
-Wed Feb 14 19:22:15 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.
-
-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]
-
-Sun Feb 11 07:46:45 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
- a quoted-string in a Content-Disposition value.
-
-Sun Feb 11 06:27:54 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in, ext/thread/extconf.rb, lib/thread.rb: Add a
- configure option `--disable-fastthread', to choose the original,
- pure ruby version of the "thread" library instead of the new,
- much faster implementation in ext/thread.
-
-Sun Feb 11 06:22:20 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/Setup: Add thread except for platforms without threads
- support.
-
-Sun Feb 11 06:15:16 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/lib/thread.rb: Add a replacement of thread.rb that
- loads this extension.
-
-Sun Feb 11 05:39:47 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/thread.rb: Remove an ineffective part of the code.
-
-Sun Feb 11 05:32:54 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/thread.c (rb_thread_exclusive): Implement
- Thread.exclusive.
-
-Sun Feb 11 05:26:51 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread/thread.c: Get rid of use of a dummy function.
-
-Sun Feb 11 01:45:31 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/thread/thread.c (Init_thread): Define missing aliases:
- Queue#enq and SizedQueue#enq.
-
-Sat Feb 10 09:27:35 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_variant2val): fix compile error
- on VC++.
-
-Sat Feb 10 07:41:52 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
- SAFEARRAY pointer is NULL.
-
-Sat Feb 10 00:13:11 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: fix typo (TkConfigMethod::__confinfo_cmd,
- __conv_keyonly_opts).
-
-Fri Feb 9 20:44:53 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread: Make style fixes (mostly de-K&R'ism) to match the
- rest of the source code.
-
- * ext/thread: Make USE_MEM_POOLS an extconf option.
-
-Fri Feb 9 20:43:01 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/thread: Import the "fastthread" implementation by MenTaLguY
- in the original form. This module is not hooked into the build
- yet since it needs some style fixes and adjustments.
-
-Fri Feb 9 15:46:09 2007 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/bigdecimal: Synchronize with trunk. Better function
- prototypes, removal of a useless method `!=', and document
- updates.
-
-Tue Feb 06 22:06:45 2007 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
- imported nkf 2007-01-28.
- * Fixed: can't decode MIME encode JIS string.
- * Fixed: Fullwitdh-halfwidth conversion.
- * Support DoCoMo's and Softbank's EMOJI
- * Support CP932, CP5022x, eucJP-ms UDC
- * Support UTF-32 encoding
- * Support beyond BMP
- [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]
-
-Wed Jan 31 14:52:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_iterate): need to PUSH_ITER in proper order.
- [ruby-core:10125]
-
- * test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
- add new test. [ruby-core:10125]
-
-Tue Jan 30 14:58:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * string.c (rb_str_sub_bang): calling rb_str_modify() should be just
- before actually modifying the string.
- fixed: [ruby-dev:30211] (originally reported by zunda)
-
-Tue Jan 30 12:05:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * mkconfig.rb: autoconf 2.61 support. [ruby-core:10016]
-
-Sat Jan 27 15:20:11 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (dyna_var_lookup): should not alter dvar->val not to
- destroy living value. [ruby-core:10076]
-
- * parse.y (dyna_init): 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].
-
-Wed Jan 24 18:05:39 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
- regexp font-lock bug. [ruby-talk:235758]
-
-Tue Jan 23 11:02:33 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest::read_line):
-
-Tue Jan 23 18:26:12 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): use == instead
- of ===. [ruby-dev:30176]
-
-Tue Jan 23 10:48:17 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c: added documentation for Hash about how it uses eql? and
- hash methods for the keys. [ruby-core:09995]
-
-Mon Jan 22 14:57:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c: fix errors in socket sample code.
- [ruby-core:09992]
-
-Sat Jan 13 23:54:48 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_free, ole_type_free,
- olemethod_free, olevariable_free, oleparam_free,
- ole_event_free): fix memory leak. [ruby-core:09846]
-
-Fri Jan 12 11:13:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
- convert uid/gid from VALUE. (backport of r11521)
-
-Wed Jan 10 18:57:57 2007 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c (strscan_do_scan): should set kcode option
- before match. [ruby-dev:29914]
-
- * test/strscan/test_stringscanner.rb: test it.
-
- * re.c: export kcode_set_option and kcode_reset_option (with "rb_"
- prefix).
-
- * intern.h: ditto.
-
-Tue Jan 9 17:45:17 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 03:54:38 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_upto): String#upto from empty string makes
- inifinite loop. [ruby-core:09864]
-
-Sun Jan 7 12:13:26 2007 Eric Hodel <drbrain@segment7.net>
-
- * 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:33:02 2007 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: updated based on date2 4.0.1.
-
-Wed Jan 3 11:36:51 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (ruby_dup): start GC on ENOMEM as well.
-
-Mon Jan 1 06:13:11 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/c_parser.rb: Make Rdoc accessible. Update constant
- value information.
-
-Mon Jan 1 06:13:11 2007 Eric Hodel <drbrain@segment7.net>
-
- * ext/bigdecimal/bigdecimal.c: Update constant comments to provide
- values for RDoc.
-
-Mon Jan 1 06:05:55 2007 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts):
- Allow RDoc comment to give friendly value for rb_define_const. Patch
- by Daniel Berger <djberg96 at gmail.com>, [ruby-patches-7499].
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts): Fix
- whitespace handling in constant comments.
-
-Sun Dec 31 00:31:16 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 4.0.
-
-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]
-
-Mon Dec 11 11:58:36 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha2/lib/sha2.rb: Moved one level up from under
- the superfluous subdirectory digest/.
-
-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): ues File.exist?
- instead of File.exists?. a patch from Yutaka Kanemoto
- <kinpoco at gmail.com> in [ruby-dev:30000].
-
-Thu Dec 7 09:29:02 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/weakref.rb (WeakRef::__setobj__): should support
- marshaling. [ruby-talk:228508]
-
- * lib/delegate.rb (Delegator::marshal_load): need to call
- __setobj__.
-
-Wed Dec 6 23:56:14 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.mk (NULLCMD): moved for platforms that empty
- command does not run. fixed: [ruby-dev:29994]
-
-Wed Dec 6 17:17:26 2006 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
- NetBSD. fixed: [ruby-dev:29358]
-
-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]
-
-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 10:43:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (dyna_init_gen): dvar initialization only if dvar is
- assigned inner block. [ruby-talk:227402]
-
-Mon Dec 4 08:32:49 2006 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
- boundary. JVN#84798830
-
-Sat Dec 2 07:09:04 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be
- subclass of OpenSSL::OpenSSLError. [ruby-dev:29980]
-
-Fri Dec 1 17:01:49 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
- merge from trunk.
-
-Fri Dec 1 16:31:53 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
- [ruby-talk: 227408]
-
-Mon Nov 27 17:18:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): need not to truncate string if no
- width specifier given for %s. [ruby-dev:29952]
-
-Sun Nov 26 16:36:46 2006 URABE Shyouhei <shyouhei@ruby-lang.org>
-
- * version.h: addition of RUBY_PATCHLEVEL.
- * version.c: ditto.
-
-Fri Nov 24 10:17:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bignorm): avoid segmentation. a patch from Hiroyuki
- Ito <ZXB01226@nifty.com>. [ruby-list:43012]
-
-Thu Nov 23 10:38:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_define_method): set implicit visibility only when
- it's called for the target class (ruby_cbase).
-
-Wed Nov 22 16:00:49 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: support --with-X11/--without-X11 option.
-
- * 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].
-
-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]
-
-Thu Nov 9 03:15:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (BEGIN_CALLARGS): ruby_block may be NULL even when
- ITER_PRE.
-
-Tue Nov 7 18:34:34 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac.rb: Keep this out of the 1.8 tree
- until we reach a consensus that HMAC should be put under Digest.
-
-Tue Nov 7 18:05:01 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/itemconfig.rb: minor bug fix.
-
-Mon Nov 6 20:11:20 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/0.9.rb (RSS::Rss): removed needless include.
-
-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.
-
-Sun Nov 5 19:53:49 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: updated based on date2 3.9.7.
-
-Sat Nov 4 13:13:57 2006 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
- (backported from HEAD)
-
-Fri Nov 3 00:16:37 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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 15:43:39 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y (primary): should set NODE even when compstmt is NULL.
- merge from trunk. fixed: [ruby-dev:29732]
-
-Thu Nov 2 14:48:30 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb (Set#^): Fix XOR operation against a container that
- holds duplicate values. [issue: #6444]
-
-Wed Nov 1 02:41:38 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]
-
- * test/ruby/test_super.rb: add tests to check above bug.
-
-Tue Oct 31 17:03:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_dup): duplicate the class of original time.
- [ruby-core:09357]
-
- * lib/time.rb (Time::make_time, Time::rfc2822, Time::httpdate):
- should respect subclasses. [ruby-core:09357]
-
-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:29:20 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 12:20:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big2str0): a bug in length adjustment.
-
-Mon Oct 30 11:15:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_str_format): should preserve leading zero
- information for negative %b and %x. [ruby-talk:221347]
-
-Thu Oct 26 21:05:58 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
- (fix http://bugs.debian.org/394336)
-
- * ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
-
-Thu Oct 26 15:21:10 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/digest/digest.c (Init_digest): typo.
-
-Wed Oct 25 17:23:28 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest, test/digest/test_digest.rb: Merge from trunk:
- - Introduce versioning in Digest::Base API, and prefix C
- constants with RUBY_ and C type names with rb_ to avoid name
- clash in writing extensions.
- - Introduce Digest::Class and Digest::Instance for ease of
- implementing subclasses and add-ons.
- - Digest::Instance module requires and assumes that any instance
- be resettable and clonable. An instance method #new() is
- added so digest instances work just like digest classes.
- - The constructor does no longer take an initial string to feed;
- digest() and hexdigest() now do, instead. This allows digest
- classes to take their own hashing parameters.
- - Make some changes to digest() and hexdigest() class methods,
- which now take extra arguments, which are passed through to
- the constructor in an internal call.
- - Add #digest_length/size/length() and #block_length(),
- - Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
- SHA384 and SHA512, hoping this module would make a decent
- example of a digest subclass written in Ruby.
- - Rip BubbleBabble support out of the base class and have a
- separate module named digest/bubblebabble.
- - Remove RD documents in favor of newly written and embedded
- RDoc documentation.
-
-Wed Oct 25 08:03:23 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: updated based on date2 3.9.6.
- [ruby-core:09323]
-
-Sun Oct 22 14:48:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (ruby_signal): don't set SA_RESTART. a backport from
- the HEAD. [ruby-talk:220937] [ruby-talk:147220]
-
- * signal.c (Init_signal): avoid duplicated installation of SIGCHLD
- handler.
-
-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 orignal
- string is tainted. fixed: [ruby-dev:29672]
-
-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]
-
-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 00:55:33 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_yylex): use particular enums. [ruby-core:09221]
-
-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.
-
-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]
-
- * 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:24:45 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/lib/digest/hmac: Back out the addition of digest/hmac
- for now because the API is too premature for a stable branch.
-
-Sat Oct 14 00:55:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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:50:43 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: updated based on date2 3.9.5.
-
-Fri Oct 13 22:33:28 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is
- default in Ruby 1.8. This line is wrongly removed in last commit.
-
-Fri Oct 13 18:19:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c: Class#inherited RDoc added. a patch from Daniel
- Berger <djberg96 at gmail.com> [ruby-core:08942]
-
-Fri Oct 13 02: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 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.
-
-Wed Oct 11 22:21:41 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest: Merge from trunk; metadata location changed,
- Digest::Base#reset() added, Digest::Base#equal() changed, and
- digest/hmac added with some modifications made for ruby 1.8.
-
-Tue Oct 10 17:24:12 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.
-
-Tue Oct 10 16:49:16 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new):
- Perform StringValue() checks properly.
-
- * ext/digest/digest.c: Use RSTRING_{PTR,LEN} macros.
-
-Tue Oct 10 13:49:53 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest: Merge from trunk; apply all changes since the
- initial import, except for the removal of compatibility stub
- libraries (md5.rb and sha1.rb).
-
-Mon Oct 9 23:46:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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 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.
-
-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 00:27:58 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_include_module): remove unnecessary check.
- [ruby-talk:218402]
-
-Fri Oct 6 04:30:30 2006 Akinori MUSHA <knu@iDaemons.org>
-
- * sample/openssl/c_rehash.rb: Use digest/md5 instead of obsolete md5.
-
-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 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 23:32:27 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/test/unit/testcase.rb (Test::Unit::TestCase.suite): test name
- must be string. fixed: [ruby-core:08978]
-
-Mon Oct 2 23:47:55 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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:49:19 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:12:25 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.4.
-
-Fri Sep 29 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:53:16 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/tmpdir.rb: use return value of getdir.call for length.
-
-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.
-
-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:31:26 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 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 (init_mkmf): set default $LDFLAGS. Patch by Michal
- Suchanek <hramrach at centrum.cz>. [ruby-talk:216256]
-
-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 22:28:20 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * runruby.rb: extension library scripts moved into common directory.
-
-Sun Sep 24 14:59:50 2006 Tanaka Akira <akr@fsij.org>
-
- * node.h (struct thread): ia64 support is broken by sandbox patch.
-
-Sun Sep 24 12:11:16 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
-
-Sat Sep 23 23:24:57 2006 why the lucky stiff <why@ruby-lang.org>
-
- * eval.c (rb_thread_save_context, rb_thread_restore_context):
- sandbox hook to save and restore sandbox state.
-
- * 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.
- [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 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:04:20 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.2.
-
-Fri Sep 22 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.
-
-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 13:55:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/etc/etc.c (etc_getpwuid): uid integer should be wraped in
- uid_t value. [ruby-core:08897]
-
- * ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
- 'int' type.
-
-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 09:53:38 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. (backported from HEAD)
-
-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 01:28:00 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: backport from HEAD (rev 1.71).
-
- * lib/fileutils.rb (FileUtils.cp_r): new option
- :remove_destination.
-
-Tue Sep 19 00:42:15 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_obj_ivar_defined, rb_mod_cvar_defined): new methods,
- 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.
-
-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.
-
-Sat Sep 16 23:14:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/pty/pty.c (establishShell): remove remaining unused line.
-
-Sat Sep 16 16:40:44 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, common.in, instruby.rb, ext/extmk.rb, lib/mkmf.rb:
- use instruby.rb to install extensions instead of ext/extmk.rb.
-
- * 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.
-
- * ext/pty/pty.c (get_device_once): removed garbage right brace.
-
- * lib/mkmf.rb (checking_for): improved the messages.
-
-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.
-
- * object.c (str_to_id): use rb_str_intern().
-
-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:21 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#getopts): works with pre-registered
- options. [ruby-core:08826]
-
-Sun Sep 10 20:27:13 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.9.1.
-
-Tue Jan 10 09:18:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (stack_extend): fixed prototype.
-
- * eval.c (rb_require_safe): prevent extension from loading twice.
- fixed: [ruby-dev:29523]
-
-Sat Sep 9 23:50:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_mul0): bignum multiplication without
- normalization.
-
- * bignum.c (rb_big_pow): use rb_big_mul0(). [ruby-dev:29547]
-
-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:54:42 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
-
- * mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
- warnings with $VERBOSE.
-
- * ext/extmk.rb: Proc#call does not pass the block in 1.8.
-
- * win32/resource.rb: add more info.
-
-Fri Sep 8 10:03:59 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookies): new
- method to parse multiple cookies per Set-Cookie header.
- 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 01:33:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (RSTRING_PTR): add migration macro.
-
- * ruby.h (RARRAY_PTR): ditto.
-
-Thu Sep 7 23:27:05 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (path_check_0, fpath_check): disable path check on cygwin.
- [ruby-talk:213074]
-
-Wed Sep 06 12:05:19 2006 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp
- [ruby-dev:29344]
-
- * ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505]
-
-Tue Sep 5 06:47:22 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_to_s): variable declaration after an execution
- statement.
-
-Tue Sep 5 05:56:51 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * numeric.c (flo_hash): improve collision. fixed: [ruby-dev:29352]
-
-Tue Sep 5 05:49:41 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (path_check_0): check if sticky bit is set on parent
- 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:42:35 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:29:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::out): specify -m0 -x option for nkf.
- [ruby-dev:29284]
-
-Mon Sep 4 16:13:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (pipe_open): command name should not contain null bytes.
- [ruby-dev:29421]
-
- * process.c (proc_spawn): ditto.
-
- * process.c (proc_spawn_n): ditto.
-
- * process.c (rb_f_system): ditto.
-
-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.
-
-Sun Sep 3 02:34:55 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/unix.rb (DRbUNIXSocket#close): don't get path if client mode.
- [ruby-dev:29417]
-
-Sun Sep 3 01:45:17 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/acl.rb (ACLEntry#initialize): examine whether '*' is
- included before IPAddr.new. [ruby-dev:29406]
-
-Sat Sep 2 13:23:01 2006 Tanaka Akira <akr@fsij.org>
-
- * common.mk (ia64.o): use the compiler driver to assemble ia64.s
- to use appropriate ABI.
-
-Sat Sep 2 03:36:22 2006 Tanaka Akira <akr@fsij.org>
-
- * common.mk, configure.in, defines.h, eval.c, gc.c, main.c,
- numeric.c, ruby.h, ia64.s: backport IA64 HP-UX support.
-
-Fri Sep 1 13:52:57 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work
- on Tcl/Tk8.x.
-
-Thu Aug 31 12:46:55 2006 why the lucky stiff <why@ruby-lang.org>
-
- * eval.c (ruby_init): rename top_cref to ruby_top_cref and export,
- along with ruby_cref, for use by the sandbox. [ruby-core:08762]
-
- * node.h: ditto.
-
-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:36:02 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_rb.rb: Fix typo. Submitted by
- <calamitas at gmail.com>. [ruby-core:08724]
-
-Mon Aug 28 07:53:44 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
- Submitted by Kent Sibilev <ksruby at gmail.com>. [ruby-core:08392].
-
-Mon Aug 28 07:25:45 2006 Eric Hodel <drbrain@segment7.net>
-
- * file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
- ruby-Bugs-5529. [ruby-core:08725]
-
-Sat Aug 26 08:07:13 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb: updated based on date2 3.8.2.
-
-Fri Aug 25 22:32:04 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]
-
-Fri Aug 25 17:15:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * stable version 1.8.5 released.
-
-Fri Aug 25 17:02:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_sweep): typo fixed.
-
-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].
-
-Sat Aug 19 14:15:02 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): include winsock2.h instead of
- winsock.h when --with-winsock2 is specified.
- fixed: [ruby-dev:29296]
-
-Sat Aug 19 11:28:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_s_rename): use errno if set properly.
- fixed: [ruby-dev:29293]
-
-Sat Aug 19 11:09:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (then): remove semicolon warning. [ruby-dev:29299]
-
-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]
-
-Thu Aug 17 00:39:05 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/rinda/ring.rb (do_reply): Fix for RingServer fails to find a
- TupleSpace when TupleSpace resides in the same ruby process with
- RingServer. a patch from Kent Sibilev. [ruby-core:08453]
-
-Wed Aug 16 11:45:36 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
- get rid of bogus implementations on Mac OS X.
-
-Tue Aug 15 19:10:18 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
- broken class-level documentation.
-
-Wed Aug 16 11:09:26 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (set_arg0): fill argv other than the first with an empty
- string instead of NULL.
-
-Wed Aug 16 11:08:00 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.h: removed an excess macro. fixed: [ruby-dev:29258]
-
-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 11:32:54 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * Makefile.in, common.mk, configure.in: fix for platforms without
- rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
- [ruby-dev:29215]
-
-Mon Aug 7 17:56:59 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
- ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
- incluion of config.h to pacify AIX. a patch from Yutaka
- Kanemoto <kinpoco at gmail.com>. [ruby-dev:29197]
-
-Mon Aug 7 15:55:08 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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, regex.c, ruby.h: shut up AIX alloca
- warning. a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
- [ruby-dev:29191]
-
-Sun Aug 6 20:40:41 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
-
-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:54:03 2006 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb (str[fp]time): "%\n" means "\n".
-
-Fri Aug 4 15:21:00 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib: Merge RDoc and .document from HEAD.
- * lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
-
-Fri Aug 4 19:13:41 2006 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
- [ruby-core: 7122].
-
-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]
-
-Tue Aug 1 17:44:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.c (init_stdhandle): assign standard file handles.
-
-Tue Aug 1 12:24:58 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (Init_Binding): fix old commit miss.
-
-Mon Jul 31 17:08:20 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (exit_handler): new function; release winsock and
- environment work area.
-
- * 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
- wheather 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 13:38:22 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
- for the value of IPv6 address in the Host: header field.
-
-Mon Jul 31 09:22:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h: use ifdef (or defined) for macro constants that may or
- may not be defined to shut up gcc's -Wundef warnings.
- [ruby-core:08447]
-
-Sun Jul 30 23:26:22 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_call0): trace call/return of method defined from block.
- fixed: [ruby-core:08329]
-
- * 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]
-
-Thu Jul 27 22:21:52 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * time.c (time_to_s): fixed format mismatch.
-
-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 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:49:01 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_to_s): use +0900 style timezone string for local time.
- [ruby-dev:29143]
-
-Thu Jul 27 16:41:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
- Solaris compiler. [ruby-core:08114]
-
-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 22:13:45 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: sync with HEAD (rev 1.132).
-
- * lib/net/http.rb (Net::HTTP#post, request_post, request): should
- set Content-Type: x-www-form-urlencoded by default.
-
- * 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:35:38 2006 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: sync with HEAD (rev 1.25).
-
- * ext/strscan/strscan.c (strscan_do_scan):
- StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
-
-Wed Jul 26 18:14:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/pty/pty.c (getDevice): retry once after GC on failure.
- [ruby-core:08282]
-
-Wed Jul 26 17:28:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
- but not "-". fixed: [ruby-core:08167]
-
-Wed Jul 26 16:39:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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 00:30:06 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
-
-Tue Jul 25 14:49:51 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): typo.
-
-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 17:55:55 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_f_system): add security check. [ruby-talk:202947]
-
- * process.c (rb_f_system): move signal right before fork to avoid
- signal handler intervention.
-
-Mon Jul 24 15:51:52 2006 Tanaka Akira <akr@fsij.org>
-
- * ext/readline/readline.c (readline_readline): rl_deprep_term_function
- 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 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 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.
-
-Thu Jul 20 15:07:14 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h: export classes/modules to implement sandbox.
- [ruby-core:08283]
-
-Thu Jul 20 00:06:29 2006 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/completion.rb: support for completion of numeric
- number. [ruby-dev: 29038]
-
-Wed Jul 19 23:53:05 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb, lib/rss/utils.rb: added documents.
-
-Tue Jul 18 22:10:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_f_system): block SIGCHLD during the process
- execution, like glibc system(3) does. [ruby-talk:202361]
-
-Tue Jul 18 23:12:14 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 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 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:29035]
-
-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 13:43:05 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (define_swapx): should not use plain malloc.
-
-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.
-
-Sat Jul 15 23:50:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_require_safe): wait for another thread requiring the same
- feature. fixed: [ruby-core:08229]
-
-Sat Jul 15 01:27:13 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (has_magic): glob names contain alphabets to enable case fold
- search also for directories. fixed: [ruby-talk:201917]
-
-Sat Jul 15 01:09:22 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * st.c (malloc): use xmalloc/xcalloc instead of plain
- malloc/calloc, to detect memory allocation failure. see
- <http://www.nongnu.org/failmalloc/>.
-
- * gc.c (rb_memerror): should not raise empty nomem_error.
-
-Fri Jul 14 13:08:13 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
-
- * 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 01:09:46 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (then): error in warning action.
-
-Fri Jul 14 00:10:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_pop): may cause realloc oscillation. a patch
- 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 20:32:19 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb: updated documents by a patch from
- Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
-
-Wed Jul 12 13:54:09 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (then): we'd like to reserve colon here for the future.
- warning added.
-
-Tue Jul 11 20:58:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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:33:39 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * string.c (rb_str_dump): need to extend len for \b.
-
-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 13:58:40 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * signal.c (ruby_nativethread_signal, posix_nativethread_signal,
- sigsend_to_ruby_thread, install_nativethread_sighandler):
- nativethread-support on signal handler. RE-backport from 1.9.
-
- * ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
-
- * eval.c (ruby_native_thread_kill): ditto.
-
-Mon Jul 10 10:54:14 2006 Ryan Davis <ryand@zenspider.com>
-
- * lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
- Morikawa including new file suffixes, function support, public
- 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.
-
-Mon Jul 10 09:29:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_clear_cache_for_undef): clear entries for included
- module. fixed: [ruby-core:08180]
-
-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 00:54:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (next_jump): deal with destination of next.
- fixed: [ruby-core:08169]
-
-Fri Jul 7 00:38:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_default): should not call default procedure if
- no key is given. [ruby-list:42541]
-
-Fri Jul 7 00:29:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_mload): a patch from Daniel Berger
- <Daniel.Berger at qwest.com>. [ruby-core:08128]
-
-Thu Jul 6 22:21:57 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
- HZ and CLK_TCK. fixed: [ruby-talk:200293]
-
-Thu Jul 6 22:17:21 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.
-
-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 definied 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 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:17:56 2006 Minero Aoki <aamine@loveruby.net>
-
- * ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
-
- * ext/racc/cparse/cparse.c: use rb_catch instead of rb_iterate.
- Giving a block to a Ruby-level method by rb_iterate is obsolete on
- Ruby 1.9. Note that current cparse.c still includes one
- rb_iterate call on Ruby 1.8, but it is not a problem (at least
- just now).
-
-Sat Jul 1 15:15:49 2006 Tanaka Akira <akr@m17n.org>
-
- * 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]
-
-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 15:47:14 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
- [ruby-core:08087]
-
-Wed Jun 28 19:04:34 2006 Tanaka Akira <akr@m17n.org>
-
- * test/socket/test_unix.rb: test_seqpacket_pair removed.
- [ruby-dev:28846]
-
-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 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]
-
-Mon Jun 26 13:37:27 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/rdoc: Merge from HEAD.
- Add options to limit the ri search path.
-
-Tue Jun 27 00:54:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.c (powersOf10): constified.
-
-Mon Jun 26 18:37:44 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
- deleted on callback.
-
-Mon Jun 26 10:47:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (pipe_open): avoid closing uninitialized file descriptors.
- a patch from <tommy at tmtm.org> [ruby-dev:28600]
-
-Mon Jun 26 09:56:22 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
-
-Sun Jun 25 23:02:12 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in, mkconfig.rb: catch-up for latest autoconf.
-
-Sat Jun 24 06:35:00 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * signal.c: revert last change.
-
- * ruby.h: ditto.
-
- * eval.c: ditto.
-
-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 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:28:32 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:32:31 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * signal.c (ruby_nativethread_signal, posix_nativethread_signal,
- sigsend_to_ruby_thread, install_nativethread_sighandler):
- nativethread-support on signal handler (backport from 1.9).
-
- * ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
-
- * eval.c (ruby_native_thread_kill): ditto.
-
-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 01:40:25 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (yylex, reswords): modifier token is no longer returned in
- fname state. [ruby-dev:28775]
-
-Wed Jun 21 01:12:46 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
- supported date type.
-
-Tue Jun 20 22:08:36 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_parser.rb: split parser tests into ...
- * test/rss/test_parser_1.0.rb: ... RSS 1.0 parsing tests and ...
- * test/rss/test_parser_2.0.rb: ... RSS 2.0 parsing tests.
-
-Tue Jun 20 21:19:06 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: provided default RSS::Element#children.
-
- * lib/rss/0.9.rb: used default RSS::Element#children.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
-
-Tue Jun 20 21:04:33 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: provided default RSS::Element#_tags.
-
- * lib/rss/0.9.rb: used default RSS::Element#_tags.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
-
-Tue Jun 20 20:47:07 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: hide RSS::Element.install_model.
- (RSS::Element.install_have_child_element,
- RSS::Element.install_have_children_element,
- RSS::Element.install_text_element,
- RSS::Element.install_date_element): call
- RSS::Element.install_model internally.
-
- * lib/rss/0.9.rb: followed new API.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/content.rb: ditto.
- * lib/rss/dublincore.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/syndication.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
- * lib/rss/trackback.rb: ditto.
-
-Tue Jun 20 20:18:05 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/lib/openssl/cipher.rb:
- - add constants AES128, AES192, AES256. [ruby-dev:28610]
- - reimplement without eval()
-
- * 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.
-
-Sat Jun 19 11:21:46 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/test/unit/assertions.rb: Merge RDoc from HEAD.
-
-Tue Jun 20 01:06:57 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb:
- - cleanup validation mechanism. Now, #XXX_validation is
- needless.
- - changed internal variable name RSS::Element::MODEL to
- RSS::Element::MODELS.
- - RSS::Element.install_model requires uri.
-
- * lib/rss/0.9.rb: followed new validation API.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/content.rb: ditto.
- * lib/rss/dublincore.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/syndication.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
- * lib/rss/trackback.rb: ditto.
-
-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 22:31:59 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb:
- - provided default #to_s as RSS::Element#to_s.
- - removed RSS::Element#other_element.
- - RSS::Element#tag requires attributes as Hash instead of Array.
-
- * lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
- * lib/rss/trackback.rb: ditto.
-
- * lib/rss/2.0.rb: removed #other_element.
-
-Mon Jun 19 22:09:16 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c(ole_invoke): support some kind of
- method of word. [ruby-Bugs#3237]
-
- * ext/win32ole/tests/test_word.rb: ditto.
-
- * ext/win32ole/tests/testall.rb: ditto.
-
-Mon Jun 19 00:02:17 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: automatically detected attributes.
-
- * lib/rss/0.9.rb: removed #_attrs.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
- * lib/rss/trackback.rb: ditto.
-
- * lib/rss/parser.rb: followed new internal API.
-
-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 22:36:13 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: RSS::Element#initialize accepts initial
- attributes.
- * lib/rss/0.9.rb: ditto.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
- * lib/rss/dublincore.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
- * lib/rss/trackback.rb: ditto.
-
- * lib/rss/utils.rb: added Utils.element_initialize_arguments? to
- detect backward compatibility initial arguments.
-
- * lib/rss/parser.rb: user initial attributes to initialize
- RSS::Element.
-
-Sun Jun 18 18:24:42 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/converter.rb: use NKF for Uconv fallback.
-
-Sun Jun 18 18:22:04 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_image.rb: shared name space configuration.
-
-Sun Jun 18 18:13:25 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: improved ignore_unknown_element
- handling. RSS::NotExpectedTagError provides tag URI.
- * lib/rss/parser.rb: ditto.
- * lib/rss/0.9.rb: ditto.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/content.rb: ditto.
- * lib/rss/dublincore.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/syndication.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
- * lib/rss/trackback.rb: ditto.
-
- * test/rss/rss-assertions.rb: checked URI of not expected tag too.
- * test/rss/test_parser.rb: ditto.
-
-Sun Jun 18 18:08:36 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: changed empty namespace URI representation to ""
- from nil.
- * lib/rss/parser.rb: ditto.
- * lib/rss/0.9.rb: ditto.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/2.0.rb: ditto.
-
-Sun Jun 18 18:03:50 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/parser.rb: removed a guard for requiring open-uri.
-
-Sun Jun 18 18:01:26 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: fixed typo: except -> expect
- * lib/rss/parser.rb: ditto.
- * test/rss/rss-assertions.rb: ditto.
- * test/rss/test_parser.rb: ditto.
-
-Sun Jun 18 17:52:39 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
- * lib/rss/0.9.rb: ditto.
- * lib/rss/1.0.rb: ditto.
- * lib/rss/image.rb: ditto.
- * lib/rss/taxonomy.rb: ditto.
- * lib/rss/trackback.rb: ditto.
-
- * test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
- * test/rss/test_2.0.rb: ditto.
-
-Sun Jun 18 00:49:11 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.
-
-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: backport from 1.9.
- (Kernel#Pathname): new method.
-
-Sat Jun 17 10:30:41 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
-
- * lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
- [ruby-talk:197284]
-
- We can convert RSS version easily like the following:
- rss10 = RSS::Parser.parse(File.read("1.0.rdf"))
- File.open("2.0.rss", "w") {|f| f.print(rss10.to_xml("2.0"))}
-
- * test/rss/test_1.0.rb: added #to_xml test.
- * test/rss/test_2.0.rb: ditto.
-
- * test/rss/rss-testcase.rb: added some helper methods that
- generates sample RSS 2.0.
-
- * sample/rss/convert.rb: added a sample script to convert RSS format.
-
-Sat Jun 17 10:23:22 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb (Kernel#funcall): removed.
- * lib/rss/parser.rb (Kernel.URI): removed.
-
- * lib/rss/maker/: supported
- xxx.new_yyy do |yyy|
- yyy.zzz = zzz
- ...
- end
- style and this style became the style of the recommendation.
-
- Old style
- yyy = xxx.new_yyy
- yyy.zzz = zzz
- ...
- is supported too but this style isn't recommended.
- [ruby-talk:197284]
-
- * test/rss/test_*maker*.rb: used new recommended style.
-
-Sat Jun 17 09:03:47 2006 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
-
- * lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
- * test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
-
- * lib/rss/trackback.rb: added TrackBack prefix.
- * lib/rss/maker/trackback.rb: ditto.
-
- * lib/rss/rss.rb : removed needless argument 'prefix'.
- * lib/rss/parser.rb: ditto.
-
- * lib/rss/1.0.rb: added rdf:Bag.
-
- * lib/rss/taxonomy.rb: implemented taxonomy module.
- * test/rss/test_taxonomy.rb: added tests for taxonomy support.
-
- * 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.
-
- * 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.
-
- * 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.
-
- * lib/rss/taxonomy.rb: changed class or module prefix to
- Taxonomy from Taxo.
- * lib/rss/maker/taxonomy.rb: ditto.
-
- * test/rss/test_taxonomy.rb: use #reject directory.
-
- * lib/rss/: use #__send__ instead of #send.
- * test/rss/: ditto.
-
- * 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.
-
- * 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.
-
- * lib/rss/image.rb: added Image prefix.
- * lib/rss/maker/image.rb: ditto.
-
- * 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.
-
- * 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 Jun 17 02:01:00 2006 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
- string.
-
-Sat Jun 17 00:23:58 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (reswords): kDO_BLOCK was missing. fixed: [ruby-core:7995]
-
-Sat Jun 17 00:02:15 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_propertyput): support
- PROPERTYPUTREF. [ruby-talk:183042]
-
- * ext/win32ole/tests/test_propertyputref.rb: ditto.
-
-Thu Jun 15 23:02:47 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.
-
- * ext/win32ole/tests/test_ole_methods.rb: ditto.
-
- * ext/win32ole/tests/testall.rb : ditto.
-
-Wed Jun 14 18:23:28 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 23:03:53 2006 Tanaka Akira <akr@m17n.org>
-
- * configure.in: check sizeof(rlim_t).
- check setrlimit.
-
- * process.c (proc_getrlimit): new method Process.getrlimit.
- (proc_setrlimit): new method Process.setrlimit.
-
- * ruby.h (NUM2ULL): new macro.
-
-Mon Jun 12 22:25:09 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): adjust precision length to prevent
- splitting multi-byte characters. [ruby-list:42389]
-
-Sun Jun 11 23:20:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
- parser.
-
-Sun Jun 11 10:00:57 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.h (write): not need to define on bcc.
-
-Sun Jun 11 08:30:33 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser#getopts): new methods.
-
-Sat Jun 10 18:02:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
- fixed: raize -> raise. [ruby-talk:196608]
-
-Thu Jun 8 14:19:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
- use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
-
-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 14:53:04 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (errmap): add some winsock errors.
-
-Wed Jun 7 11:34:38 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in: add new configure option `--with-winsock2' for mingw.
-
- * win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
- instead of in CPPFLAGS.
-
- * ext/socket/extconf.rb: determine whether to use winsock2 or not
- by using with_config.
-
-Wed Jun 7 10:45:10 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
- new configure option `--with-winsock2'.
-
- * win32/win32.c (StartSockets): ditto.
-
- * ext/socket/extconf.rb: ditto.
-
- * win32/win32.c (open_ifs_socket): new function.
-
- * win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
- instead of socket().
- ifs socket support is backported from trunk.
-
-Wed Jun 7 09:14:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): binding for the return event hook should have
- consistent scope. [ruby-core:07928]
-
- * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
- event_hooks. no guarantee for arbitrary hook deletion.
- [ruby-dev:28632]
-
-Mon Jun 5 18:12:12 2006 Tanaka Akira <akr@m17n.org>
-
- * 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]
-
-Fri Jun 2 22:08:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/forwardable.rb: RDoc typo fix from Jan Svitok
- <jan.svitok at gmail.com>. [ruby-core:07943]
-
-Fri Jun 2 19:02:09 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 16:14:41 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
- if the length of the cwd is longer than MAX_PATH.
- fixed [ruby-list:42335]
-
-Thu Jun 1 11:29:14 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_getcwd): set errno if not set.
- fixed [ruby-list:42346]
-
-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 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 03:10:48 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb
- (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
-
-Mon May 22 17:54:12 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
- instead of rb_io_read_pending.
- [ruby-dev:28663]
-
-Mon May 22 17:30:04 2006 Tanaka Akira <akr@m17n.org>
-
- * rubyio.h (rb_io_set_nonblock): declared.
-
- * 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
- (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]
-
-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 17:11:45 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::out): support utf-8. a patch from Fujioka
- <fuj at rabbix.jp>. [ruby-dev:28649]
-
-Thu May 18 00:42:12 2006 nobuyoshi nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
-
-Wed May 17 17:55:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (sys_warning): should not call a vararg function
- rb_sys_warning() indirectly. [ruby-core:07886]
-
-Wed May 17 08:17:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c (ruby_strtod): try to reduce errors using powersOf10
- table. [ruby-dev:28644]
-
-Tue May 16 15:34:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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 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]
-
-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]
-
-Fri Aug 11 15:39:25 2006 Eric Hodel <drbrain@segment7.net>
-
- * lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
- documented.
-
-Thu May 11 18:10:43 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c (ruby_strtod): should not raise ERANGE when the input
- string does not have any digits. [ruby-dev:28629]
-
-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 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 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 12:23:19 2006 <sinara@blade.nagaokaut.ac.jp>
-
- * numeric.c (num_div): use floor rather than rb_Integer().
- [ruby-dev:28589]
-
- * 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.
-
-Sat Apr 29 22:42:08 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
- flag. [ruby-core:07785]
-
-Fri Apr 28 10:53:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c (ruby_strtod): should not cut off 18 digits for no
- reason. [ruby-core:07796]
-
- * util.c (ruby_strtod): fixed wrong conversion.
-
-Thu Apr 27 01:38:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_fill): internalize local variable "beg" to
- 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]
-
-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]
-
-Tue Apr 25 00:08:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): should check if c is not a
- multibyte character. a patch from KIMURA Koichi
- <kimura.koichi at canon.co.jp>. [ruby-dev:28598]
-
-Fri Apr 21 15:19:13 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
- [ruby-core:07744] and memory leak.
-
-Fri Apr 21 12:14:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c: document update patch from Sam Roberts
- <sroberts at uniserve.com>. [ruby-core:07701]
-
-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 (list_concat): revert last change.
+ * array.c (rb_ary_or): ditto.
- * parse.y (arg): use NODE_ARGSCAT for placeholder.
+Mon May 14 13:50:22 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Apr 19 11:13:17 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_thread_schedule): should save context before raising
+ deadlock, saved context for current thread might be obsolete.
- * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
- mathew <meta at pobox.com>. [ruby-core:07738]
+ * time.c (make_time_t): non DST timezone shift supported (hopefully).
-Wed Apr 19 10:13:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon May 14 11:54:20 2001 Tanaka Akira <akr@m17n.org>
- * variable.c (rb_const_set): raise error when no target klass is
- supplied. [ruby-dev:28582]
+ * signal.c: SIGINFO added.
-Wed Apr 19 09:49:36 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon May 14 08:57:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * parse.y (list_concat): should not modify nodes other than
- NODE_ARRAY. [ruby-dev:28583]
+ * eval.c (rb_ensure): should not SEGV when prot_tag is NULL.
-Tue Apr 18 17:40:37 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sun May 13 23:49:25 2001 Usaku Nakamura <usa@osb.att.ne.jp>
- * ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
+ * win32/resource.rb: Modify copyright in resource script.
- * ext/tk/lib/tk.rb: update RELEASE_DATE.
+Fri May 11 23:51:54 2001 Usaku Nakamura <usa@osb.att.ne.jp>
- * ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
+ * process.c: silence VC++ warnings.
- * ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
+ * sprintf.c: ditto.
-Tue Apr 18 00:11:21 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri May 11 03:38:11 2001 Akinori MUSHA <knu@iDaemons.org>
- * eval.c: block_unique should be 1, not frame_unique.
- [ruby-dev:28577]
+ * README.EXT: Document find_library(), with_config() and
+ dir_config().
-Fri Aug 11 15:39:25 2006 Eric Hodel <drbrain@segment7.net>
+Fri May 11 03:37:53 2001 Akinori MUSHA <knu@iDaemons.org>
- * 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.
+ * README.EXT.jp: Remove the description of find_header() because
+ such a function does not actually exist.
+
+ * README.EXT.jp: Update the description of dir_config().
-Mon Apr 10 01:03:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri May 11 02:42:40 2001 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * prec.c (prec_prec_f): documentation patch from
- <gerardo.santana at gmail.com>. [ruby-core:07689]
+ * README, README.jp: Fix CVS access and mailing lists info.
-Sat Apr 8 02:34:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri May 11 02:00:44 2001 Ryo HAYASAKA <ryoh@jaist.ac.jp>
- * bignum.c (rb_big_pow): second operand may be too big even if
- it's a Fixnum. [ruby-talk:187984]
+ * bignum.c (bigdivrem): access boundary bug.
-Sat Apr 8 02:12:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue May 8 17:12:43 2001 K.Kosako <kosako@sofnec.co.jp>
- * README.EXT: update symbol description. [ruby-talk:188104]
+ * eval.c (is_defined): core dumped during instance_eval for
+ special constants.
-Thu Apr 6 23:28:47 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_eval): ditto.
- * COPYING: explicitly note GPLv2. [ruby-talk:187922]
+Tue May 8 08:59:01 2001 Akinori MUSHA <knu@iDaemons.org>
-Thu Apr 6 11:18:37 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * doc/forwardable.rd, doc/forwardable.rd.jp: Hit `=begin' and
+ `=end' in proper places so rd2 can format them without a problem.
- * ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
+ * doc/irb/irb-tools.rd.jp, doc/irb/irb.rd, doc/irb/irb.rd.jp:
+ ditto.
-Thu Apr 6 01:04:47 2006 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue May 8 08:56:05 2001 Akinori MUSHA <knu@iDaemons.org>
- * ext/tk/tcltklib.c: fix SEGV when embedding to an application.
- [ruby-core:7600]
+ * doc/forwardable.rd, doc/forwardable.rd.jp, lib/forwardable.rb:
+ Bring forwardable 1.1 onto the ruby_1_6 branch.
- * ext/tk/tcltklib.c: fix SEGV at exit. [ruby-talk:186489]
+Tue May 8 08:35:09 2001 Akinori MUSHA <knu@iDaemons.org>
- * ext/tk/tkutil/tkutil.c: follow to changing specification of
- instance_eval on ruby-1.9.x.
+ * doc/irb/irb-tools.rd.jp, doc/irb/irb.rd.jp: Convert from JIS to
+ EUC.
- * ext/tk/lib/tk.rb: ditto.
+Tue May 8 03:46:24 2001 Akinori MUSHA <knu@iDaemons.org>
- * ext/tk/lib/multi-tk.rb: ditto.
+ * sample/rbc.rb: Obsoleted by IRB.
- * ext/tk/lib/tk.rb: remove warning about redefinition of methods.
+Mon May 7 15:58:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
+ * parse.y (arg): "||=" should not warn for uninitialized instance
variables.
-Wed Mar 29 20:54:44 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
- multi arguments.
-
- * ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
-
-Wed Mar 29 10:07:44 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
- e2w_conv): support C90 compiler.
-
-Wed Mar 29 06:48:40 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (backtrace): reports aliased method names in a generated
- backtrace. a patch from "U.Nakamura" <usa at garbagecollect.jp>.
- [ruby-dev:28471]
-
-Mon Mar 27 22:19:09 2006 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c, config.h}: imported nkf 2.0.6.
- * Add --ic / --oc option and mapping tables.
- * Add fallback option.
- * Add --no-best-fit-chars option.
- * 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.
-
-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.
-
-Fri Mar 24 23:14:30 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (yield_under_i): pass self again for instance_eval().
- [ruby-dev:28466]
-
-Fri Mar 24 17:20:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_f_sleep): remove description about SIGALRM which
- is not valid on the current implementation. [ruby-dev:28464]
-
-Thu Mar 23 10:47:03 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (method_missing): should support argument splat in
- super. [ruby-talk:185438]
-
-Mon Mar 20 12:05:18 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: Solaris SunPro compiler -rapth patch from
- <kuwa at labs.fujitsu.com>. [ruby-dev:28443]
-
-Mon Mar 20 09:40:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: remove enable_rpath=no for Solaris.
- [ruby-dev:28440]
-
-Fri Mar 17 19:08:49 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
- [ruby-core:07571]
-
-Wed Mar 15 16:54:21 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): support libraries without *.so.
-
-Wed Mar 15 16:35:43 2006 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
- "rb_str_new(0, 0)" to make empty string.
-
-Sat Mar 11 14:24:06 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
- space before argument parenthesis. [ruby-talk:183630]
-
- * ruby.1: a clarification patch from David Lutterkort
- <dlutter at redhat.com>. [ruby-core:7508]
-
-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]
-
-Thu Mar 2 19:44:18 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 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 17:57:49 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
- [ruby-core:7474]
-
-Thu Mar 2 12:59:14 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
- stat() didn't treat daylight saving time property on WinNT.
- [ruby-talk:182100]
-
-Thu Mar 2 08:02:42 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (add_heap): heap_slots may overflow. a patch from Stefan
- Weil <weil at mail.berlios.de>.
-
-Wed Mar 1 00:24:31 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
- merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.
- [ruby-talk:181631] [ruby-dev:28404]
-
-Tue Feb 28 09:32:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/drb/extservm.rb (invoke_service_command): cannot invoke command
- if command name is quoted on mswin32. [ruby-dev:28400]
-
-Mon Feb 27 00:19:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (SYM2ID): should not cast to signed long.
- [ruby-core:07414]
-
-Fri Feb 24 20:07:23 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/drb/drbtest.rb (add_service_command): quote pathnames in the
- server's command line for space contained directory names.
- Thanks, arton. [ruby-dev:28386]
-
-Fri Feb 24 12:11:08 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
- It's for VC++8.
-
-Fri Feb 24 11:33:52 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
-
-Fri Feb 24 11:19:58 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * time.c (time_new_internal): add prototype to tell the compiler
- arugments types.
-
- * win32/win32.c (NtInitialize): need to set a handler for VC++8.
-
-Fri Feb 24 08:19:16 2006 NARUSE, Yui <naruse@ruby-lang.org>
-
- * test.rb: Removed. Obsolete by test/nkf.
-
- * ext/.document: enabled documents in nkf and kconv
-
- * ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
-
-Thu Feb 23 22:39:59 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
- memory manager cannot handle large memory block properly.
- ex: 10000.times { "" << "." * 529671; GC.start } # crash
- [ruby-dev:28230]
-
-Thu Feb 23 13:20:28 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
-
-Tue Feb 21 02:18:46 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in (mingw): have link. [ruby-list:41838]
-
- * win32/Makefile.sub (config.h): ditto.
-
-Tue Feb 21 02:07:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (f_arglist): should set command_start = Qtrue for
- command body. [ruby-talk:180648]
-
-Mon Feb 20 17:37:26 2006 Tanaka Akira <akr@m17n.org>
-
- * mkconfig.rb: alias RbConfig for Config.
-
-Mon Feb 20 12:27:53 2006 Kent Sibilev <ksruby@gmail.com>
-
- * lib/rational.rb (Integer::gcd): small typo fix.
- [ruby-core:07395]
-
-Mon Feb 20 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]
-
-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 12:18:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/fileutils.rb (FileUtils::fu_world_writable): make it
- private. [ruby-core:07383]
+ * eval.c (rb_eval): ditto.
-Sat Feb 18 00:22:39 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (eval): preserve and restore ruby_cref as well.
- * lib/tracer.rb: merged a minor clarification patch from Daniel
- Berger <Daniel.Berger at qwest.com>. [ruby-core:07376]
+Mon May 7 15:45:48 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-Fri Feb 17 11:18:42 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/ftools.rb (syscopy): chmod destination file only if
+ it does not exist.
- * util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
+Thu May 3 03:41:01 2001 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
- * pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4.
- [ruby-talk:180024]
+ * configure.in: get --enable-shared to work on MacOS X.
- * pack.c (pack_unpack): fixed integer overflow on template "w".
- [ruby-talk:180126]
+ * Makefile.in: make $(LIBRUBY_SO) depend on miniruby properly.
+ Now `make -jN' should work without a problem.
-Fri Feb 17 09:39:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed May 2 20:39:35 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * eval.c (rb_thread_wait_for): sleep should always sleep for
- specified amount of time. [ruby-talk:180067]
+ * dir.c (rb_glob, rb_iglob): remove unnecessary FNM_PATHNAME.
-Thu Feb 16 01:10:48 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed May 2 11:46:13 2001 K.Kosako <kosako@sofnec.co.jp>
- * eval.c (backtrace): frame->orig_func may not be initialized.
- [ruby-core:07367]
+ * eval.c (block_pass): should not downgrade safe level.
-Wed Feb 15 16:52:52 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue May 1 17:55:58 2001 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 (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
- * parse.y (arg): avoid unnecessary extra argument.
- [ruby-core:07366]
+Tue May 1 03:36:50 2001 Akinori MUSHA <knu@iDaemons.org>
- * eval.c (rb_eval): honor visibility on OP_ASGN1 and
- OP_ASGN2. [ruby-core:07366]
+ * sample/irb.rb, lib/irb.rb, lib/irb/*, doc/irb/*: Merge from irb
+ 0.7.3 and irb-tools 0.7.1.
-Wed Feb 15 10:09:51 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * instruby.rb: Install help-message's too.
- * eval.c (yield_under_i): should not pass self as an argument to
- the block for instance_eval. [ruby-core:07364]
+ * lib/irb/main.rb: This file is not needed anymore.
-Wed Feb 15 09:20:35 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Apr 26 22:36:11 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * eval.c (rb_obj_instance_eval): should be no singleton classes for
- true, false, and nil. [ruby-dev:28186]
+ * configure.in: don't use tzname on cygwin 1.3.1+.
-Tue Feb 14 18:48:33 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: add -mieee/-ieee to CFLAGS on OSF1/Alpha
+ to disable "DIVISION BY ZERO" exception.
- * eval.c (DMETHOD_P): accessing wrong frame. [ruby-dev:28181]
+Thu Apr 26 22:30:43 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (proc_invoke): preserve FRAME_DMETH flag.
+ * eval.c (rb_eval): should preserve value of ruby_errinfo.
-Tue Feb 14 15:13:51 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu Apr 26 10:36:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
+ * eval.c (rb_thread_schedule): infinite sleep should not cause
+ dead lock.
-Tue Feb 14 14:01:17 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Apr 25 16:40:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * time.c (search_time_t): support non 32bit time_t environments.
+ * array.c (rb_ary_flatten_bang): proper recursive detection.
- * win32/Makefile.sub (config.h): VC++8 has ``long long'' type.
+Wed Apr 25 15:36:15 2001 K.Kosako <kosako@sofnec.co.jp>
- * win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
+ * eval.c (yield_under): need not to prohibit at safe level 4.
- * win32/win32.c (rb_w32_utime): drop read-only attribute before
- changing file time.
+Tue Apr 24 16:03:25 2001 Hiroshi Igarashi <iga@ruby-lang.org>
- all changes are backported from CVS HEAD.
+ * ext/extmk.rb.in: add target `distclean' in Makefile for extlib.
+ target `clean' doesn't remove Makefile.
-Tue Feb 14 11:21:38 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Apr 24 15:57:45 2001 Akinori MUSHA <knu@iDaemons.org>
- * io.c (argf_forward): should not use frame->argv.
- [ruby-core:07358]
+ * ext/extmk.rb.in, lib/mkmf.rb: (dir_config) do not add the
+ specified include directory if already included in $CPPFLAGS.
-Mon Feb 13 18:08:12 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/extmk.rb.in, lib/mkmf.rb: (dir_config) return a more useful
+ value, [include_dir, lib_dir].
- * eval.c (rb_call0): argument update propagation. [ruby-dev:28044]
+Tue Apr 24 15:35:32 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * env.h: remove argv member from struct FRAME.
+ * ruby.c (set_arg0): wrong predicate when new $0 value is bigger
+ than original space.
-Mon Feb 13 13:27:00 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 23 14:43:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (eval): should push class from binding if supplied.
- [ruby-core:07347]
+ * gc.c (id2ref): should use NUM2ULONG()
-Mon Feb 13 00:04:00 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * object.c (rb_mod_const_get): check whether name is a class
+ variable name.
- * lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
- change <%='s behavior. (backported 1.15 - 1.16)
+ * object.c (rb_mod_const_set): ditto.
-Sat Feb 11 02:04:11 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * object.c (rb_mod_const_defined): ditto.
- * eval.c (eval): no need to push ruby_class. [ruby-dev:28176]
+Sun Apr 22 17:44:37 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-Sat Feb 11 01:57:44 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: add -mieee to CFLAGS on Linux/Alpha
+ to disable "DIVISION BY ZERO" exception.
- * 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]
+ * configure.in: remove -ansi on OSF/1.
-Tue Feb 7 23:03:24 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sat Apr 21 22:33:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/zlib/zlib.c: should not access ruby objects in finalizer.
- [ruby-dev:28286]
+ * marshal.c (w_float): precision changed to "%.16g"
-Mon Feb 6 16:02:51 2006 WATANABE Hirofumi <eban@ruby-lang.org>
+Sat Apr 21 22:07:58 2001 Guy Decoux <decoux@moulon.inra.fr>
- * file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
- In such situation, flock() should return 0.
+ * eval.c (rb_call0): wrong retry behavior.
-Mon Feb 6 00:41:08 2006 Tanaka Akira <akr@m17n.org>
+Fri Apr 20 19:12:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
- compatibility with ruby 1.9.
+ * numeric.c (fix_aref): a bug on long>int architecture.
-Sun Feb 5 21:05:34 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Apr 20 14:57:15 2001 K.Kosako <kosako@sofnec.co.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]
+ * eval.c (rb_eval_string_wrap): should restore ruby_wrapper.
-Sun Feb 5 18:55:08 2006 Minero Aoki <aamine@loveruby.net>
+Wed Apr 18 04:37:51 2001 Wakou Aoyama <wakou@fsinet.or.jp>
- * lib/net/http.rb: imported from trunk, rev 1.129
+ * lib/cgi.rb: CGI::Cookie: no use PATH_INFO.
- * lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
- compatibility.
+Wed Apr 18 00:24:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/net/https.rb: imported from trunk, rev 1.3.
+ * regex.c (re_compile_pattern): char class at either edge of range
+ should be invalid.
- * lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
+Tue Apr 17 16:54:39 2001 K.Kosako <kosako@sofnec.co.jp>
-Sun Feb 5 14:22:15 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * eval.c (safe_getter): should use INT2NUM().
- * lib/pstore.rb: should return default value if name is not found.
- [ruby-core:7304]
+Tue Apr 17 15:12:56 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/pstore.rb: should raise PStore::Error if not in transaction.
+ * bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long.
-Sat Feb 4 22:51:43 2006 Tanaka Akira <akr@m17n.org>
+Sat Apr 14 22:46:43 2001 Guy Decoux <decoux@moulon.inra.fr>
- * eval.c: apply the FreeBSD getcontext/setcontext workaround
- only before FreeBSD 7-CURRENT.
+ * regex.c (calculate_must_string): wrong length calculation.
-Sat Feb 4 21:19:23 2006 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Apr 14 13:33:32 2001 Usaku Nakamura <usa@osb.att.ne.jp>
- * win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
- In such situation, flock() should return 0.
+ * win32/config.status.in: no longer use missing/alloca.c.
-Sat Feb 4 15:56:37 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
- sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
-
-Fri Feb 3 15:06:50 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc
- even if skip == 0. This causes buffer overrun.
- (ex: YAML.load('--- "..' + '\x82\xA0' * 511 + '"'))
-
-Thu Feb 2 23:51:18 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
- emitter's marker. if marker points to the end of buffer, this causes
- buffer overrun. (ex: YAML.dump("." * 12288))
-
-Thu Feb 2 16:01:24 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (eval): need not to protect $SAFE value.
- [ruby-core:07177]
-
-Thu Feb 2 14:45:53 2006 Ville Mattila <ville.mattila@stonesoft.com>
-
- * configure.in: The isinf is not regognized by autoconf
- library guesser on solaris 10. [ruby-core:7138]
-
-Wed Feb 1 22:01:47 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
- where they are supported. modifing environ variable seems to
- segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
-
- * ruby.c (set_arg0): if use setenv(3), environ space cannot be used
- 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 00:10:26 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
- ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
-
-Sat Jan 28 07:56:57 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/rdoc/usage.rb: support "a:0:33" style caller[-1]. In this case
- file name is "a:0". I don't know this really happens though...
- [ruby-Bugs:3344]
-
-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]
-
-Sat Jan 21 00:36:47 2006 Tanaka Akira <akr@m17n.org>
-
- * eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
- before gcc 4.0.3.
- [ruby-dev:28247]
-
-Thu Jan 19 22:21:23 2006 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (mv): should remove file after copying.
- [ruby-dev:28223]
-
-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 11:32:46 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/setup.mak (MAKE): workaround for nmake 8.
-
-Tue Jan 17 11:10:21 2006 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
- for nmake 8.
-
-Mon Jan 16 10:26:23 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item):
- should output complex key mark even if map's key is empty seq/map.
- [ruby-core:7129]
-
-Sat Jan 14 05:37:06 2006 Tanaka Akira <akr@m17n.org>
-
- * io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
- for DragonFly BSD 1.4.0.
-
-Sat Jan 14 03:43:24 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
- sizeof(void*).
-
-Fri Jan 13 19:14:56 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 15:00:00 2006 Ville Mattila <mulperi@iki.fi>
-
- * io.c (READ_PENDING*): Support solaris 64-bit environments.
- Solaris defines a opaque FILE struct when compiling 64 bit
- binaries. This means that we dont have access to _ptr etc.
- members anymore. The solution by Steven Lumos is to define
- FILE64 that has needed members available. I've modified
- the origanal patch a bit so that it compiles both with gcc
- and now free sun studio 11 compiler and both amd64 and sparc.
- NOTE! We have to 64 bit solaris FILE structure time to time
- otherwise we'll get breakage.
- [ruby-core:7106]
-
-Tue Jan 10 19:42:33 2006 Tanaka Akira <akr@m17n.org>
-
- * gc.c (garbage_collect): mark ruby_current_node.
- if an exception is raised in a finalizer called written in C by
- rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
- collected ruby_current_node and mark_source_filename may corrupt
- memory.
-
-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]
-
-Mon Jan 9 19:54:35 2006 arton <artonx@yahoo.co.jp>
-
- * ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
- http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
-
-Mon Jan 9 14:17:12 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
- (VisualC++6) so use -O2b2xg- if $(MSC_VER) < 1400. [ruby-core:7040]
-
-Mon Jan 9 14:17:12 2006 Kero van Gelder <rubyforge @nospam@ kero.tmfweb.nl>
-
- * lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
-
-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]
-
-Fri Jan 6 10:16:20 2006 Steven Lumos <steven@lumos.us>
-
- * io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
- [ruby-core:7057]
- (READ_DATA_PENDING_COUNT): ditto.
- (READ_DATA_PENDING_PTR): ditto.
-
-Sun Jan 1 17:07:59 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_seekdir): should not segfault even if passed
- the location which rb_w32_telldir didn't return. [ruby-core:7035]
- (I think HEAD implementation is better. but binary compatibility)
-
- * 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]
-
-Fri Dec 30 18:22:42 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (garbage_collect): mark objects refered from aborting threads.
- [ruby-dev:28190]
-
- * win32/Makefile.sub: VC++8 support.
-
-Fri Dec 30 14:24:53 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dir.c (glob_helper): do not use TRUE for djgpp.
-
-Fri Dec 30 04:54:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (eaccess): workaround for VC++8 runtime.
-
- * win32/win32.c (ioinfo): VC++8 support.
-
-Thu Dec 29 23:59:37 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
- up alone, and mark threads in the loading table. [ruby-dev:28154]
-
- * eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
- 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]
-
-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 08:29:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
- treat wildcard character in commonName. [ruby-dev:28121]
-
-Mon Dec 26 22:32:47 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
- NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
- NODE_UNDEF and NODE_ALIAS.
- backported from trunk. fixed: [ruby-dev:28105]
-
-Mon Dec 26 08:50:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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]
-
-Sat Dec 24 18:58:14 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * stable version 1.8.4 released.
-
-Fri Dec 23 10:30:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/digest/sha2/sha2.c (ULL): support AIX C. a patch from
- Kailden <kailden at gmail.com>. [ruby-core:06984]
-
-Wed Dec 21 16:53:06 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * file.c (w32_io_info): should return handle because FileIndex is
- valid only while file is open. [ruby-dev:28088]
-
-Wed Dec 21 14:53:26 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (test_kernel_open): use File.identical?.
- [ruby-talk:171804]
-
-Tue Dec 20 22:41:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (eval_under_i): evaluate source in caller's frame.
- [ruby-dev:28076]
-
- * eval.c (rb_call_super): use original method name on exception.
- [ruby-dev:28078]
-
-Tue Dec 20 13:11:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
- [ruby-dev:27839]
-
- * ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
- NULL or not before S_FREE.
-
- * st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert
- in gram.c to insert node from rb_syck_bad_anchor_handler into
- SyckParser's hash table. if GC occurs in st_insert, it's not under
- SyckParser's mark system yet. so RString can be released wrongly.
- [ruby-dev:28057]
-
-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 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>
-
- * parse.y (rb_symname_p): fixed wrong validation. [ruby-dev:28047]
-
-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 00:54:06 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (Init_signal): revert C++ style comment.
- [ruby-dev:28041]
-
-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 12:11:46 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * test/gdbm/test_gdbm.rb: specify pid for the argument of
- Process.wait. workaround for Cygwin.
-
-Wed Dec 14 12:01:26 2005 Tanaka Akira <akr@m17n.org>
-
- * 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:54:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * test/openssl/test_ssl.rb (test_parallel): call GC.start to close
- unused files. [ruby-dev:27981]
-
-Mon Dec 12 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]
-
-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]
-
-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 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:37:57 2005 Yuya Nishida <yuya@j96.org>
-
- * eval.c (exec_under): avoid accessing ruby_frame->prev.
- [ruby-dev:27948]
-
-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 (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]
-
-Mon Nov 28 18:55:43 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/socket/socket.c (init_inetsock_internal): remove setting
- SO_REUSEADDR option on server socket on Cygwin.
- fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
-
-Mon Nov 28 13:08:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
- error message on bccwin32 + winsock)
-
-Mon Nov 28 09:21:49 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/mkmf.rb (create_makefile): should not change sodir with
- dir.gsub!. (bccwin32 failed to install third party exntesions)
- [ruby-dev:27834]
-
-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.
-
-Thu Nov 24 21:05:58 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in (AC_CHECK_FUNCS): need to check link().
- fixed: [ruby-dev:27814]
-
-Thu Nov 24 01:22:25 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * file.c (w32_io_info): CreateFile failed on Win9x if file was already
- opened. (FILE_SHARE_READ was needed, but actually I don't understand
- the flags of CreateFile well...)
-
-Wed Nov 23 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 modifires 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:55:31 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 03:40:49 2005 Guy Decoux <ts@moulon.inra.fr>
-
- * re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
- [ruby-core:06721]
-
-Wed Nov 23 11:01:33 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * intern.h, file.c: failed to compile on windows.
-
-Wed Nov 23 07:26:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
-
- * 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:46:57 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
-
- * test/ruby/test_path.rb (test_dirname, test_basename): follow new
- spec. and add new tests.
-
-Tue Nov 22 13:18:32 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
- p Dir.glob('*') should work on WinNT. (implemented our own
- 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 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 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 17:57:08 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (rb_file_s_dirname): should use skipprefix for UNC path.
- pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
-
-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 17:26:06 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (rb_file_s_dirname): added checks for some patterns with drive
- letter. fixed: [ruby-dev:27738]
-
- * test/ruby/test_path.rb (test_dirname): added tests for above
- patterns.
-
-Fri Nov 18 12:18:02 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
- returns true on VisualC++6.
-
-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.
-
-Tue Nov 15 23:46:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/find.rb (Find::find): should not ignore symbolic links to
- non-existing files. [ruby-talk:165866]
-
-Tue Nov 15 16:23:26 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
- potensially this would break some script. so I reverted behavior.
-
-Tue Nov 15 16:04:10 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * array.c (rb_ary_fill): tail elements were vanished when the middle
- part of array was filled. (ie: [0,1,2,3,4].fill(-1,2,1) => [0,1,-1])
-
- * 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].
-
-Fri Nov 11 10:31:44 2005 Zach Dennis <zdennis@mktec.com>
-
- * ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
-
-Fri Nov 11 08:20:56 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * Makefile.in (OUTFLAG): keep trailing spaces. [ruby-dev:27666]
-
- * mkconfig.rb: substitution refereces added.
-
-Fri Nov 11 07:44:18 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
- EINVAL, and this causes error in test/fileutils.)
-
- * file.c: overwride chown(2) and fchown(2) on BeOS. (these functions
- should not change user/group id if -1 is passed as corresponding
- argument, and this causes error in test/fileutils too)
- [ruby-dev:27672]
-
- * file.c (rb_file_s_link): checks HAVE_LINK.
-
-Tue Nov 8 15:32:27 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
- [ruby-dev:27560] [ruby-core:4627]
-
-Mon Nov 7 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:58 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:46:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
- interpreter after initialization is done. [ruby-dev:27638]
-
-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]
-
-Wed Nov 2 20:25:28 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
- for Win32.
-
-Wed Nov 2 20:14:53 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib: merge into ext/tk and remove.
-
-Wed Nov 2 19:03:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
- ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
-
- * ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
-
-Tue Nov 1 14:20:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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:50:17 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 11:27:22 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
- skip on Win32/DOS platforms.
-
-Mon Oct 31 05:49:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
- not be empty. [ruby-talk:161220]
-
- * test/openssl/test_cipher.rb: add test for Cipher#update("").
-
-Mon Oct 31 05:37:20 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 03:19:36 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/readline/readline.c (readline_readline): type check.
- [ruby-core:6089]
-
- * numeric.c (fix_rshift): RDoc fix. [ruby-core:6351]
-
- * util.h (strtod): add #undef for platforms defines strtod()
- macro. [ruby-dev:27563]
-
-Mon Oct 31 02:35:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/ruby/test_float.rb (test_precision): test by assert_in_delta.
- [ruby-dev:27575]
-
-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.
-
-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]
-
-Wed Oct 26 09:27:27 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/syck/implicit.c (syck_type_id_to_uri): should return
- newly allocated memory. otherwise, type_id will be freed
- twice. [ruby-dev:27384] [ruby-core:6385]
-
-Wed Oct 26 09:04:51 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
- values have VALUE type. there is an environment where sizeof(VALUE)
- != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
- and received by 64bit integer (VALUE), upper bits may have garbage value.
- [ruby-dev:27513]
-
-Wed Oct 26 01:58:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (RUBY_EXTERN): macro to export symbols in shared
- 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 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 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:27:35 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:49:45 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
- fixed: [ruby-list:40058], [ruby-dev:27479]
-
-Mon Oct 24 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]
-
-Sun Oct 23 21:50:15 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/enumerator/enumerator.c: applied documentation patch from
- James Edward Gray II <james@grayproductions.net>.
- [ruby-core:06348]
-
-Sun Oct 23 07:11:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
-
- * ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
- ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
- 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 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]
-
-Fri Oct 21 19:21:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
-
-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:27:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bignum.c (bignew_1): convertion from `int' to `char' discards
- upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
- 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 09:37:15 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/mkmf.rb (create_makefile): Borland make seems not to allow
- empty dependency list. If this change is not good, please correct
- 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]
-
-Thu Oct 20 00:13:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * rubysig.h (CHECK_INTS): fix typo.
-
-Wed Oct 19 23:58:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): do not create unnecessary empty
- directories. fixed: [ruby-dev:27451]
-
-Wed Oct 19 19:26:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
- fixed: [ruby-dev:27439]
-
-Wed Oct 19 08:28:32 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (rb_file_join): elements may contain null pointer strings.
- report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
-
-Wed Oct 19 02:34:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c, gc.c, time.c: made internal symbols static. [ruby-dev:27435]
-
-Wed Oct 19 01:27:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regex.c (re_compile_pattern): numeric literal inside character class
- disabled succeeding backtrack. fixed: [ruby-list:41328]
-
-Mon Oct 17 21:18:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * parse.y (parser_heap): byacc never free parser stack.
- fixed: [ruby-dev:27428]
-
-Mon Oct 17 16:04:47 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
-
-Sun Oct 16 22:16:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: omit non-existing directories.
-
-Sun Oct 16 14:30:05 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
- tuple. fixed: [ruby-list:41227]
-
- * 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]
-
-Sat Oct 15 19:56:38 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * bin/erb: typo fixed, again. thanks, Doug Kearns.
-
-Fri Oct 14 22:08:26 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (ioctl): should set errno.
-
-Fri Oct 14 16:57:32 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
- It is harmful to permit the access to ~/public_html by default.
- suggested by Hiroyuki Iwatsuki.
-
-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:52:57 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>
-
- * 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 20:04:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (Init_Binding): add Binding#dup method. [yarv-dev:666]
-
- * parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
- heap. [ruby-list:41199]
-
- * ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
-
-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 20:12:16 2005 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c (strscan_free): remove useless code.
- [ruby-dev:26368] [ruby-dev:27389]
- (backported from trunk, rev 1.22)
-
-Wed Oct 5 04:42:38 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
- servlet on "/".
-
-Wed Oct 5 03:59:09 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]
-
-Thu Sep 29 10:26:18 2005 Tanaka Akira <akr@m17n.org>
-
- * ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
- [ruby-dev:27317]
-
-Thu Sep 29 07:22:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * evalc. (rb_f_send): underscores need to be escaped.
- fixed by Doug Kearns. [ruby-core:06053]
-
-Thu Sep 29 00:57:35 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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:42:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * file.c (apply2files): add prototype.
-
- * file.c (rb_stat_inspect): constified.
-
- * class.c (rb_mod_init_copy, rb_class_init_copy), file.c (rb_stat_init_copy),
- numeric.c (num_init_copy), object.c (rb_obj_init_copy, Init_Object),
- re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
- undocumented.
-
-Wed Sep 28 23:09:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb: document update from James Edward Gray II
- <james@grayproductions.net>. [ruby-core:06027]
-
-Wed Sep 28 15:14:19 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
- refer 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/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
- [ruby-dev:27335].
-
-Wed Sep 28 08:12:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (read_buffered_data): check if reached EOF. fixed: [ruby-dev:27334]
-
-Wed Sep 28 07:56:52 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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:23:35 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.
-
-Sun Sep 25 12:05:10 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * bin/erb: typo fixed.
-
-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 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]
+ * win32/Makefile.sub: ditto.
- * misc/ruby-mode.el (ruby-calculate-indent): not to deepen indent
- level for continuous line inside parentheses.
- http://nabeken.tdiary.net/20050915.html#p02
+Fri Apr 13 12:40:48 2001 K.Kosako <kosako@sofnec.co.jp>
-Sun Sep 25 00:18:11 2005 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_thread_start_0): fixed memory leak.
- * eval.c (unknown_node): show more information. [ruby-dev:26196]
+Fri Apr 13 16:41:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Sep 24 08:56:01 2005 Minero Aoki <aamine@loveruby.net>
+ * parse.y (none): should clear cmdarg_stack too.
- * lib/fileutils.rb (cd): no longer accept :noop option, related
- code is useless (backported from trunk, rev 1.67).
- [ruby-core:05858] [ruby-Bugs:2494]
+Fri Apr 13 06:19:29 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
-Sat Sep 24 08:38:07 2005 Minero Aoki <aamine@loveruby.net>
+ * io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on
+ some platforms.
- * lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
- DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
+Wed Apr 11 23:36:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/fileutils/test_nowrite.rb: test it.
+ * file.c (rb_stat_dev): device functions should honor stat field
+ types (except long long such as dev_t).
- * test/fileutils/test_dryrun.rb: new file.
+Wed Apr 11 18:07:53 2001 K.Kosako <kosako@sofnec.co.jp>
- * test/fileutils/test_verbose.rb: new file.
+ * eval.c (rb_mod_nesting): should not push nil for nesting array.
-Sat Sep 24 02:40:20 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_mod_s_constants): should not search array by
+ rb_mod_const_at() for nil (happens for singleton class).
- * lib/delegate.rb: document update from James Edward Gray II
- <james@grayproductions.net>. [ruby-core:05942]
+Wed Apr 11 13:29:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Sep 22 23:36:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * class.c (rb_singleton_class_attached): should modify iv_tbl by
+ itself, no longer use rb_iv_set() to avoid freeze check error.
- * lib/mkmf.rb (find_executable0): default path if environment is not
- set. [ruby-dev:27281]
+ * variable.c (rb_const_get): error message "uninitialized constant
+ Foo at Bar::Baz" instead of "uninitialized constant Bar::Baz::Foo".
-Thu Sep 22 16:33:12 2005 Shugo Maeda <shugo@ruby-lang.org>
+Tue Apr 10 02:24:40 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * test/readline/test_readline.rb (TestReadline::replace_stdio):
- merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
+ * io.c (opt_i_set): should strdup() inplace_edit string.
-Wed Sep 21 23:30:44 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Apr 9 23:29:54 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mkmf.rb (configuration): generalized nmake dependent code.
+ * eval.c (exec_under): need to push cref too.
-Wed Sep 21 09:07:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 9 12:05:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * stable version 1.8.3 released.
+ * file.c (Init_File): should redifine "new" class method.
-Wed Sep 21 08:52:25 2005 why the lucky stiff <why@ruby-lang.org>
+Mon Apr 9 11:56:52 2001 Shugo Maeda <shugo@ruby-lang.org>
- * ext/syck/token.c: correctly compute identation of a block
- scalar's parent node. [ruby-talk:150620]
+ * lib/net/imap.rb: fix typo.
-Wed Sep 21 08:20:24 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 5 22:40:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * README.EXT, README.EXT.ja: add new features.
+ * variable.c (rb_const_get): no recursion to show full class path
+ for modules.
-Wed Sep 21 07:43:58 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_set_safe_level): should set safe level in curr_thread
+ as well.
- * lib/optparse.rb (default_argv, Arguable#options): defaults strings
- to be parsed to Arguable instance.
+ * eval.c (safe_setter): ditto.
-Wed Sep 21 02:44:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Apr 5 13:46:06 2001 K.Kosako <kosako@sofnec.co.jp>
- * file.c (path_check_0): disallow sticky world writable directory
- in PATH (and $LOAD_PATH). [ruby-dev:27226]
+ * object.c (rb_obj_is_instance_of): nil belongs to false, not true.
- * file.c (fpath_check): typo fixed.
+Thu Apr 5 02:19:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Sep 20 22:29:49 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * time.c (make_time_t): proper (I hope) daylight saving time
+ handling for both US and Europe. I HATE SUMMER TIME!
- * test/wsdl/simpletype/rpc/test_rpc.rb, test/wsdl/ref/test_ref.rb,
- test/wsdl/any/test_any.rb test/soap/wsdlDriver/test_calc.rb:
- suppress deliberate warnings with $VERBOSE = nil.
+ * eval.c (rb_thread_wait_for): non blocked signal interrupt should
+ stop the interval.
-Tue Sep 20 21:26:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 4 03:47:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
- is not available. fixed: [ruby-dev:27187]
+ * class.c (rb_mod_clone): should copy method bodies too.
-Tue Sep 20 18:23:04 2005 Tanaka Akira <akr@m17n.org>
+ * bignum.c (bigdivrem): should trim trailing zero bdigits of
+ remainder, even if dd == 0.
- * eval.c (thread_mark): mark th->last_status. [ruby-dev:27179]
+Tue Apr 3 15:29:10 2001 Akinori MUSHA <knu@iDaemons.org>
-Tue Sep 20 18:20:33 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * Makefile.in: Introduce MAINLIBS.
- * lib/yaml.rb: require 'yaml/constants'. [ruby-core:5776]
+ * configure.in: Link libc_r against the ruby executable on
+ FreeBSD, which is the first attempt to work around a certain
+ problem regarding pthread on FreeBSD. It should make ruby/libruby
+ happy when it loads an extention to a library compiled and linked
+ with -pthread. Note, however, that libruby is _not_ linked with
+ libc_r so as not to mess up pthread unfriendly stuff including
+ apache+mod_ruby and vim6+ruby_interp.
-Tue Sep 20 17:48:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Apr 3 09:56:20 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
- information to content-type header.[ruby-core:5127]
+ * ext/extmk.rb.in (create_makefile): create def file only if
+ it does not yet exist.
- * lib/xmlrpc/server.rb (CGIServer::serve): ditto.
+ * lib/mkmf.rb: ditto.
- * lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.
+Tue Apr 3 00:05:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
+ * time.c (make_time_t): remove HAVE_TM_ZONE code since it
+ sometimes reports wrong time.
-Tue Sep 20 17:34:46 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * time.c (make_time_t): remove unnecessary range check for
+ platforms where negative time_t is available.
- * 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]
+Mon Apr 2 14:25:49 2001 Shugo Maeda <shugo@ruby-lang.org>
-Tue Sep 20 17:10:38 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/monitor.rb (wait): ensure reentrance.
- * test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
- test_s_open_error test to detect duplicate open.
- [ruby-dev:27202]
+ * lib/monitor.rb (wait): fix timeout support.
-Tue Sep 20 17:08:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Apr 2 12:44:53 2001 Shugo Maeda <shugo@ruby-lang.org>
- * io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
- [ruby-dev:27185]
+ * lib/net/imap.rb: backport from ruby-1.7.
-Tue Sep 20 16:53:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 2 01:16:24 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/readline/test_readline.rb (TestReadline::replace_stdio):
- BSD seek support from [ruby-dev:25223]. fixed: [ruby-dev:27150]
+ * win32/win32.c: use ruby's opendir on mingw32.
-Tue Sep 20 15:39:40 2005 why the lucky stiff <why@ruby-lang.org>
+ * missing/dir.h, dir.c, Makefile: ditto.
- * ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
- appearing alone or at the end of plain scalars. [ruby-core:5826]
+Sun Apr 1 23:26:14 2001 TOYOFUKU Chikanobu <toyofuku@juice.or.jp>
- * ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
- as complex keys.
+ * numeric.c (flodivmod): a bug in no fmod case.
- * lib/syck.h: version 0.60.
+Sun Apr 1 18:36:14 2001 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
- key searches.
+ * process.c (pst_wifsignaled): should apply WIFSIGNALED for status
+ (int), not st (VALUE).
- * ext/syck/rubyext.c: loading of binary-typed nodes. prevent
- emission of plain strings that look like symbols, but which aren't.
+Sat Mar 31 03:24:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Sep 20 05:50:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * class.c (rb_include_module): module inclusion should be check
+ taints.
- * 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.
+Fri Mar 30 12:51:19 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Sep 20 00:34:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * class.c (rb_include_module): freeze check at first.
- * io.c (io_close): call rb_io_close() directly if io is a T_FILE
- object. [ruby-dev:27156]
+Thu Mar 29 17:05:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Sep 19 19:09:08 2005 Minero Aoki <aamine@loveruby.net>
+ * eval.c (rb_attr): sprintf() and rb_intern() moved into
+ conditional body.
- * file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
- (backport from trunk, rev 1.208)
+Wed Mar 28 23:43:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Mon Sep 19 18:35:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
+ rules for the mswin32 platforms.
- * ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
- [ruby-dev:27151]
+Wed Mar 28 19:29:21 2001 Akinori MUSHA <knu@iDaemons.org>
-Mon Sep 19 14:17:04 2005 Minero Aoki <aamine@loveruby.net>
+ * ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place.
- * ext/syck/emitter.c (syck_emit): passing an int* value to the
- long* parameter causes unaligned access on LP64 systems.
- [ruby-dev:27161]
+Wed Mar 28 17:39:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Sep 19 13:44:03 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * object.c (rb_str2cstr): warn if string contains \0 and length
+ value is ignored.
- * ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
- [ruby-dev:27133]
+Wed Mar 28 15:00:31 2001 K.Kosako <kosako@sofnec.co.jp>
-Mon Sep 19 10:36:06 2005 Minero Aoki <aamine@loveruby.net>
+ * class.c (rb_singleton_class_clone): should copy class constant
+ table as well.
- * lib/fileutils.rb (cp_r): default is :dereference_root=>true for
- backward compatibility. [ruby-dev:27145]
+Wed Mar 28 15:03:23 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/fileutils/test_fileutils.rb (test_cp_r): test it.
+ * class.c (rb_include_module): sometimes cache was mistakenly left
+ uncleared - based on the patch by K.Kosako.
-Mon Sep 19 09:57:39 2005 Minero Aoki <aamine@loveruby.net>
+Wed Mar 28 09:52:33 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/fileutils/test_fileutils.rb: backported from trunk (1.36).
- (again) [ruby-dev:27145]
+ * win32/Makefile.sub: disable global optimization.
-Mon Sep 19 07:45:37 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Mar 27 15:00:54 2001 K.Kosako <kosako@sofnec.co.jp>
- * 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.
+ * eval.c (rb_mod_define_method): should have clear method cache.
- * ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
- key flag.
+ * eval.c (rb_mod_define_method): should have raised exception for
+ type error.
-Mon Sep 19 06:41:32 2005 Minero Aoki <aamine@loveruby.net>
+Tue Mar 27 14:48:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/fileutils.rb: backported from trunk (rev 1.65):
+ * ruby.h: changed "extern INLINE" to "static inline".
- * lib/fileutils.rb (rm_r): new option :secure.
+Mon Mar 26 23:19:33 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/fileutils.rb (rm_rf): new option :secure.
+ * time.c (rb_strftime): check whether strftime returns empty string.
- * lib/fileutils.rb: new method #remove_entry_secure.
+Mon Mar 26 18:14:47 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/fileutils.rb (cd): remove option :noop.
+ * dir.c (rb_glob_helper): part of 1.7 globber backported to proper
+ following of symlinks.
- * lib/fileutils.rb (cp_r): new option :dereference_root.
+Mon Mar 26 17:21:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/fileutils.rb (cp_r): new option :dereference_root.
+ * eval.c: remove TMP_PROTECT_END to prevent C_ALLOCA crash.
- * lib/fileutils.rb: new method #remove_entry.
+Mon Mar 26 14:04:41 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/fileutils.rb: new method #chmod_R.
+ * ext/Win32API/Win32API.c: remove Init_win32api().
- * lib/fileutils.rb: new method #chown.
+Sat Mar 24 23:44:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/fileutils.rb: new method #chown_R.
+ * eval.c (ev_const_defined): should ignore toplevel cbase (Object).
- * lib/fileutils.rb: new method .commands.
+ * eval.c (ev_const_get): ditto.
- * lib/fileutils.rb: new method .options.
+Fri Mar 23 12:18:44 2001 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
- * lib/fileutils.rb: new method .have_option?.
+ * ext/curses/curses.c: curses on Mac OS X public beta does not
+ have _maxx etc.
- * lib/fileutils.rb: new method .options_of.
+Fri Mar 23 10:50:31 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/fileutils.rb: new method .collect_method.
+ * marshal.c (w_object): should truncate trailing zero short for
+ bignums.
- * lib/fileutils.rb: use module_function instead of single extend.
+Thu Mar 22 22:15:45 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+ * ext/Win32API/extconf.rb: add -fno-omit-frame-pointer.
-Mon Sep 19 03:17:48 2005 Tanaka Akira <akr@m17n.org>
+Thu Mar 22 17:43:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * file.c (rb_thread_flock): wrap the flock system call by
- TRAP_BEG/TRAP_END to enable signals. [ruby-dev:27122]
+ * ruby.h: better inline function support.
- * 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]
+ * configure.in (NO_C_INLINE): check if inline is available for the
+ C compiler.
- * io.c (rb_io_syswrite): wrap the write system call by
- TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
- full. [ruby-dev:27134]
+Wed Mar 21 23:07:45 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-Mon Sep 19 03:02:08 2005 Tanaka Akira <akr@m17n.org>
+ * win32/win32.c (win32_stat): WinNT/2k "//host/share" support.
- * io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
- enable signals when writing to a pipe which is full.
+Wed Mar 21 01:26:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sun Sep 18 02:10:47 2005 why the lucky stiff <why@ruby-lang.org>
+ * gc.c (id2ref): sometimes confused symbol and reference.
- * lib/yaml/rubytypes.rb: remove comments that are bungling up
- the rdoc and ri output. output symbols as plain scalars.
+Tue Mar 20 23:09:33 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/syck/rubyext.c (syck_emitter_reset): emit headless
- documents always.
+ * win32/win32.c (win32_stat): UNC support.
- * ext/syck/emitter.c (syck_scan_scalar): quote scalars with any
- kind of surrounding line space, tabs or spaces alike.
+ * dir.c (extract_path): fix "./*" problem.
- * ext/syck/token.c: accept tabs as whitespace, not for indentation,
- but strip from plain scalars.
+Mon Mar 19 19:14:47 2001 Guy Decoux <decoux@moulon.inra.fr>
- * test/yaml/test_yaml.rb: remove outdated tests.
+ * marshal.c (shortlen): shortlen should return number of bytes
+ written.
-Sat Sep 17 23:25:04 2005 sheepman <sheepman@sheepman.sakura.ne.jp>
+Mon Mar 19 18:56:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mathn.rb (Rational::inspect): should preserve original
- operand. [ruby-core:05806]
+ * stable version 1.6.3 released.
-Sat Sep 17 23:20:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Mar 19 16:52:23 2001 K.Kosako <kosako@sofnec.co.jp>
- * lib/cgi.rb (CGI::Cookie): should handle multiple values for a
- cookie name. [ruby-talk:156140]
+ * eval.c (ev_const_defined): need not to check if cbase->nd_class
+ is rb_cObject.
-Sat Sep 17 10:42:13 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (ev_const_get): ditto.
- * 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).
+Mon Mar 19 16:27:32 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Sep 17 09:45:26 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (THREAD_ALLOC): flags should be initialized.
- * string.c (rb_str_substr): should propagate taintness even for
- empty strings. [ruby-dev:27121]
+ * signal.c (rb_f_kill): should use FIX2INT, not FIX2UINT.
- * string.c (rb_str_aref): should infect result if range argument
- is tainted. [ruby-dev:27121]
+Mon Mar 19 11:03:10 2001 Koji Arai <JCA02266@nifty.ne.jp>
-Sat Sep 17 08:35:39 2005 Kouhei Sutou <kou@cozmixng.org>
+ * marshal.c (r_object): len calculation patch was wrong for
+ machines SIZEOF_BDIGITS == SIZEOF_SHORT.
- * lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
- strange RSS::Maker::Item#max_size behavior.
- Thanks to Kazuhiko <kazuhiko@fdiary.net>.
+ * gc.c: alloca prototype reorganized for C_ALLOCA machine.
- * test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
+Sun Mar 18 08:58:18 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-Fri Sep 16 23:09:20 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * lib/cgi.rb: // === '' --> //.match('')
- * ext/win32ole/win32ole.c (ole_search_event_at): bug fix
- in ext/win32ole/sample/ienavi.rb.
+ * lib/cgi.rb: cgi#header(): improvement for mod_ruby.
- * ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
+ * lib/cgi.rb: cgi#rfc1123date(): improvement.
+ thanks to TADA Tadashi <sho@spc.gr.jp>.
-Fri Sep 16 22:41:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/cgi.rb: cgi#rfc1123date(): document bug fix.
+ thanks to Kazuhiro NISHIYAMA <zn@mbf.nifty.com>.
- * file.c (rb_file_s_extname): empty string for path name ending with a
- period. fixed: [ruby-core:05651]
+ * lib/cgi.rb: cgi#header(): bug fix.
+ thanks to IWATSUKI Hiroyuki <don@na.rim.or.jp>.
- * file.c (rb_file_join): smarter behavior at edge cases.
- fixed: [ruby-core:05706]
+Fri Mar 16 17:21:25 2001 Akinori MUSHA <knu@iDaemons.org>
-Fri Sep 16 18:34:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: Set SOLIBS properly for all ELF and
+ FreeBSD/NetBSD/OpenBSD a.out platforms so that the shlib
+ dependencies are recorded in the libruby shlib.
- * 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]
+Wed Mar 14 16:41:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Sep 16 14:48:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (rb_thread_schedule): raise FATAL just once to
+ THREAD_TO_KILL.
- * ext/tk/lib/multi-tk.rb: fix typo on MultiTkIp#bg_eval_string
+Wed Mar 14 10:41:34 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Sep 16 12:02:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_yield_0): 0 (= Qfalse) is a valid value, so that
+ default self should be checked by klass == 0.
- * ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
- comment (//). [ruby-core:05793]
+ * bignum.c (rb_cstr2inum): should disallow '++1', '+-1', etc.
-Fri Sep 16 00:14:14 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Tue Mar 13 17:51:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/logger/test_logger.rb: unintentionally overwritten changes by
- Usa. reverted.
+ * eval.c (ev_const_defined): add new parameter self for special
+ const fallback.
-Fri Sep 16 00:06:18 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (ev_const_get): ditto.
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
- $stdout.binmode.
+Tue Mar 13 16:39:45 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-Thu Sep 15 23:25:21 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * dir.c (rb_glob_helper): fix drive letter handling on DOSISH.
- * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
+Tue Mar 13 15:01:12 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- #nnn is a ticket number at http://dev.ctor.org/soap4r
+ * lib/net/http.rb: add HTTPRequest#basic_auth.
- * SOAP
+ * lib/net/smtp.rb: raise if only account or password is given.
- * 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(...)
+ * lib/net/protocol.rb: WriteAdapter#<< returns self.
- * let SOAP request XML indent space configuable. see
- "soap.envelope.no_indent" option. (#130)
+Tue Mar 13 14:41:16 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * let external CES configuable.
- ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used
- by default. (#133)
- external CES ::= CES used in Ruby object of client and server
- internal CES ::= CES used in SOAP/OM
+ * io.c (argf_seek): wrong calling sequence of rb_io_seek().
- * add iso-8859-1 external CES support. (#106)
+Mon Mar 12 18:59:38 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * fixed illegal 'qualified' handling of elements. it caused
- ASP.NET inteoperability problem. (#144)
+ * lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
- * 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)
+Sun Mar 11 00:55:31 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * 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)
+ * lib/mkmf.rb (install_rb): fix handling of destination path.
- * out parameter of rpc operation did not work. (#132)
+Sat Mar 10 02:34:18 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * follow HTTP redirect only if using http-access2. (#125) (#145)
+ * math.c (math_log, math_log10): use nan() instead of 0.0/0.0 on Cygwin.
- * add a workaround for importing an WSDL whose path begins with
- drive letter. (#115)
+Thu Mar 8 17:43:59 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * WSDL
+ * lib/net/protocol.rb: one write(2) per one line.
- * SOAP Data which is defined as a simpletype was not mapped
- correctly to Ruby obj when using wsdl2ruby.rb generated classdef
- file. (#123)
+Wed Mar 7 14:26:11 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * rpc/literal support. (#118)
+ * math.c (math_log, math_log10): should return NaN if x < 0.0
+ on Cygwin.
- * re-implemented local element qualify/unqualify control. handles
- elementFormDefault and form in WSDL. (#119)
+Thu Mar 7 10:31:26 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * Array of an element which has simpleType causes a crash. (#128)
+ * parse.y (stmt): while/until modifier must work for empty body.
- * prarmeterOrder may not contain return part so it can be shorter
- than parts size. Thanks to Hugh. (#139)
+Tue Mar 6 22:53:58 2001 Kazuhiro Yoshida <moriq.kazuhiro@nifty.ne.jp>
- * Samples
+ * ruby.c (ruby_set_argv): clear ARGV contents before adding args.
- * added !BasicAuth client sample. (#117)
+Tue Mar 6 10:50:29 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * added Base64 client/server sample.
+ * parse.y (primary): rescue and ensure clauses should be allowed
+ to appear in singleton method body.
- * added Flickr SOAP interface client sample. (#122)
+Mon Mar 5 17:25:13 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * added !SalesForce client sample. (#135)
+ * eval.c (proc_eq): compare Procs using blocktag equality.
- * updated Thawte CA certificate for !GoogleAdWords sample.
+ * eval.c (proc_to_s): stringify according to block tag address.
- * updated a client script with the newer version made by Johan.
- thanks!
+Mon Mar 5 17:19:56 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * shortened long file names. (#120)
+ * win32/win32.c (gettimeofday): use GetLocalTime() instead of ftime()
+ for high-resolution timing.
- * fixed typo in authheader sample. (#129)
+Sun Mar 4 20:45:20 2001 Akinori MUSHA <knu@iDaemons.org>
- * updated deprecated method usage. (#138)
+ * ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
+ rules.
-Thu Sep 15 23:02:57 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Sun Mar 4 17:01:09 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * win32/win32.h (rb_w32_stat): added prototype.
+ * string.c (trnext): support backslash escape in String#tr.
-Thu Sep 15 22:35:55 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Feb 28 11:02:41 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/ruby/test_signal.rb (test_exit_action): skip the test using
- fork on fork-less platforms.
+ * string.c (rb_str_delete_bang): delete! should take at least 1
+ argument.
-Thu Sep 15 11:39:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Feb 27 16:38:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
- TkDialogObj#name raises an exception. [ruby-talk:156109]
+ * eval.c (ev_const_get): retrieve Object's caonstat if no current
+ class is available (e.g. defining singleton class for Fixnums).
-Thu Sep 15 01:39:19 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * eval.c (ev_const_defined): check Object's constant if no current
+ class is available (e.g. defining singleton class for Fixnums).
- * lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
- up method. Tabs converted to spaces.
+ * eval.c (proc_call): ignore block to `call' always, despite of
+ being orphan or not.
-Thu Sep 15 00:18:24 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Feb 27 10:16:32 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
- readpartial. [ruby-talk:127641]
+ * eval.c (rb_yield_0): should check based on rb_block_given_p()
+ and rb_f_block_given_p().
-Wed Sep 14 22:40:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 26 16:20:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * dir.c (ruby_glob): glob function not using ruby exception system.
+ * ruby.c (proc_options): call ruby_show_version() just once.
-Wed Sep 14 01:26:03 2005 Minero Aoki <aamine@loveruby.net>
+Mon Feb 26 00:04:52 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/net/https.rb: backported from trunk, rev 1.3.
- [ruby-dev:25673] (again), [ruby-dev:26617] (again),
- [ruby-dev:27062]
+ * eval.c (proc_call): should not modify ruby_block->frame.iter
+ based on ruby_frame->iter altered by PUSH_ITER().
- * ext/openssl/lib/net/https.rb: removed.
+Mon Feb 26 05:27:52 2001 Wakou Aoyama <wakou@fsinet.or.jp>
- * ext/openssl/lib/net/protocols.rb: removed.
+ * lib/net/telnet.rb: #telnetmode(), #binmode(): bug fix.
+ thanks to nobu.nakada@nifty.ne.jp.
- * lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
+Mon Feb 26 04:55:50 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-Tue Sep 13 22:09:40 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * lib/cgi.rb: CGI#form(): bug fix.
+ thanks to MoonWolf <moonwolf@moonwolf.com>.
- * 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/cgi.rb: CGI#rfc1123_date(): improvement.
+ thanks to Tomoyasu Akita <genzo-@dm4lab.to>.
- * lib/logger.rb (Logger): added VERSION constant.
+ * lib/cgi.rb: CGI#header(): improvement for mod_ruby.
+ thanks to Shugo Maeda <shugo@ruby-lang.org>.
- * lib/logger.rb: removed document for LogDevice. It is an
- implementation detail and is not a public interface.
+Sun Feb 25 02:45:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * test/logger/test_logger.rb: added tests.
+ * file.c (rb_file_s_rename): avoid Cygwin's bug.
-Tue Sep 13 21:47:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 24 23:32:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * eval.c (BEGIN_CALLARGS): pop halfly pushed status.
- fixed: [ruby-dev:26881]
+ * eval.c (rb_thread_fd_close): should save current context before
+ raising exception.
-Tue Sep 13 16:26:45 2005 Minero Aoki <aamine@loveruby.net>
+Sat Feb 24 22:14:00 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/net/http.rb: backported from trunk, rev 1.128.
- [ruby-dev:25673] [ruby-dev:26617]
+ * win32/win32.c (myrename): fix error handling.
- * lib/net/protocol.rb: backported from trunk, rev 1.78.
+Sat Feb 24 15:43:31 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/net/protocol.rb: new method #old_open to support net/smtp
- and net/pop.
+ * lib/net/protocol.rb: use net 1.2 for also ruby 1.6 branch.
- * lib/net/smtp.rb: use #old_open.
+ * lib/net/smtp.rb: ditto.
* lib/net/pop.rb: ditto.
-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 wih yaml_new, prepended
- a parameter, which is the klass. loaded nodes through GenericResolver show their style.
- new Resolver#tagurize converts type ids to taguris.
-
- * ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
-
- * 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.
-
-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_enctypt() (only if ext/openssl is
- compiled with OpenSSL-0.9.7d or earlier versions).
- http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
-
-Mon Sep 12 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]
-
-Mon Sep 12 10:45:58 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
- from Takahiro Kambe <taca at back-street.net>. [ruby-dev:27023]
-
-Sun Sep 11 22:05:51 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * bin/erb (ERB::Main#run): set ERB#filename so that it is used
- when reporting syntax/runtime errors. Tabs converted to spaces.
-
-Sat Sep 10 10:17:03 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_engine.c (ossl_engine_s_by_id):
- OpenSSL::Engine.by_id calls given block before calling
- ENGINE_init (block parameter is the return value of this method
- itself). this functionality is useful to load dynamic shared
- engines. the following code is a sample of loading a key using
- OpenSC PKCS #11 module.
-
- 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 returms engine command definitions.
-
-Sat Sep 10 10:09:47 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.
-
-Sat Sep 10 10:05:51 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
- the argument is a DER string if Base64 decoding failed.
-
- * ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
-
- * test/openssl/test_ns_spki.rb: add new file.
-
-Sat Sep 10 09:56:24 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
- these features are enabled if this library is compiled with
- OpenSSL 0.9.8 or later.
-
- * test/openssl/test_digest.rb: add test for new digests.
-
-Sat Sep 10 09:51:30 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
- to get last error on the current thread. And should report
- errors on the stack while OpenSSL.debug is true.
-
- * ext/openssl/ossl.c (ossl_get_errors): new method for debugging
- this library.
+ * lib/net/http.rb: ditto.
- * ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
+Fri Feb 23 16:36:09 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
- of unused variable.
+ * lib/net/http.rb: always close connection if body is not exist.
- * ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
- set @time to avoid warning.
+Fri Feb 23 13:27:05 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
- X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
- wrapped functions failed.
+ * lib/net/http.rb: keep-alive detection was incomplete.
- * test/openssl/test_x509store.rb: add test for errors.
+Fri Feb 23 08:24:53 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Fri Sep 9 22:13:19 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/protocol.rb: clear read buffer after reopen.
- * eval.c (rb_call0): prohibit calling tainted method (>2) when
- $SAFE == 0.
+ * lib/net/http.rb: update RD document.
-Fri Sep 9 16:45:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 20 16:37:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * string.c (rb_str_times): make empty strings to keep taintness,
- and a little improvement. [ruby-dev:26900]
+ * bignum.c (rb_big2long): should not raise RangeError for Bignum
+ LONG_MIN value.
- * ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
- characters in command line option. fixed: [ruby-talk:155369]
+Mon Feb 19 17:46:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Sep 8 14:58:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (rb_str_substr): "a"[1,2] should return ""; need
+ rubicon upgrade.
- * merged a patch from Takahiro Kambe <taca at back-street.net> to
- support DragonFly BSD. [ruby-dev:26984]
+Mon Feb 19 01:55:43 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Sep 7 12:55:08 2005 Tanaka Akira <akr@m17n.org>
+ * eval.c (secure_visibility): visibility check for untainted modules.
- * lib/open-uri.rb: abolish mod === tempfile to avoid a problem
- [ruby-dev:26967].
+Mon Feb 19 00:29:29 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Wed Sep 7 10:45:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * signal.c (sigpipe): sighandler which does nothing.
- * eval.c (rb_thread_switch): convert all exceptions to
- SystemExit. fixed: [ruby-core:05724]
+ * signal.c (trap): set sigpipe function for SIGPIPE.
- * eval.c (rb_thread_terminated): show backtrace before propagate
- exceptions to main thread.
+ * signal.c (Init_signal): default SIGPIPE handler should be
+ sigpipe function.
-Wed Sep 7 08:35:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Feb 18 15:42:38 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
- extension libraries.
+ * ext/curses/extconf.rb: add dir_config.
- * bignum.c (bignew_1, bigadd): K&R style argument actually can't be
- defined as char.
+ * missing/flock.c: use fcntl(2) instead of lockf(2).
- * missing/vsnprintf.c: ANSI compiler supports const keyword.
+Sun Feb 18 13:02:03 2001 Yasushi Shoji <yashi@yashi.com>
- * ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
- but no 64bit integer.
+ * array.c (rb_ary_subseq): wrong boundary check.
- * lib/mkmf.rb (what_type?): guesstimate type.
+Fri Feb 16 01:44:56 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
- char*. fixed: [ruby-core:05470]
+ * io.c (set_outfile): f should be the FILE* from the assigning value.
-Wed Sep 7 08:32:47 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Feb 15 11:33:49 2001 Shugo Maeda <shugo@ruby-lang.org>
- * object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
- sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
- description. [ruby-dev:26965]
+ * lib/cgi/session.rb (close): fixed reversed condition.
- * sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
- mode (-v/-w); backported from 1.9. [ruby-dev:26963]
+Wed Feb 14 17:28:24 2001 Shugo Maeda <shugo@ruby-lang.org>
-Mon Sep 5 17:03:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/imap.rb: supports unknown resp_text_code.
- * 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]
+Wed Feb 14 00:44:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Sep 5 07:01:12 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * dir.c (dir_s_glob): call rb_yield directly (via push_pattern) if
+ block is given to the method.
- * ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
- should clear data from the buffer which already been output.
+ * dir.c (push_pattern): do not call rb_ary_push; yield directly.
-Fri Sep 2 23:51:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 13 23:05:38 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib: do not use __send__ to access private methods. [ruby-dev:26935]
-
-Fri Sep 2 03:29:00 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
- [ruby-dev:26872], [ruby-dev: 26920]
-
- * lib/irb/locale.rb: support to print help message when OS locale is
- ja_JP.utf-8. [ruby-dev:26872]
-
-Thu Sep 1 17:11:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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:43:15 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (OPTFLAGS): default global optimization to
- disabled for all VC++ versions. fixed: [ruby-dev:26897]
-
-Wed Aug 31 11:35:43 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
- file.
-
-Wed Aug 31 10:30:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * process.c (proc_detach, proc_setmaxgroups): missing argument type
- declaration. (I recommend ANSI-style function)
-
-Tue Aug 30 23:20:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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]
-
-Mon Aug 29 19:54:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
-
- * lib/rdoc/usage.rb: support the case when non-ruby code exists before
- shebang. (this is needed when ri.bat is executed on windows)
-
-Mon Aug 29 17:48:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (method_arity): should return proper arity value.
- [ruby-dev:26390]
-
-Mon Aug 29 01:19:57 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/time.rb (Time.parse): extract fractional seconds using
- Date._parse. [ruby-talk:153859]
-
-Sat Aug 27 20:20:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
- by Reyn Vlietstra.
-
- * ext/curses/curses.c: chtype in curses is not `char', rahter `long'.
- [ruby-Bugs:2298]
-
- * ext/curses/view.rb: String =~ String is deprecated.
-
-Wed Aug 24 10:53:28 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/logger/test_logger.rb (test_shifting_size): should close log
- device before unlink, since some platform cannot unlink opened
- file.
-
-Sun Aug 21 00:13:27 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add
- a workaround for importing an WSDL whose path begins with drive
- letter. [ruby-dev:26242]
-
-Sat Aug 20 22: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 12:46:28 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
- I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
- [ruby-dev:26806]
-
- * win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
-
-Wed Aug 17 23:58:05 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * object.c (rb_to_integer): argument constified.
-
- * eval.c (terminate_process): take String message.
-
- * eval.c (rb_thread_switch): propagate the exception caused thread
- termination directly. fixed: [ruby-core:05552]
-
-Wed Aug 17 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.
-
-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.
-
-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
-
-Thu Aug 11 23:29:03 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (lstat): should use rb_sys_stat if lstat(2) is not
+ available.
- * ext/stringio/stringio.c: keep holding string after closed.
+Tue Feb 13 17:00:18 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu Aug 11 13:01:48 2005 Kouhei Sutou <kou@cozmixng.org>
+ * lib/net/http.rb: supports HTTP 1.0 server.
- * lib/rss: fixed sort bug. [ruby-list:41018]
+Tue Feb 13 01:13:43 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rss/1.0.rb (RSS::RDF::Channel#setup_maker_attributes):
- removed self.
+ * parse.y (primary): preserve and clear in_single and in_def using
+ stack to prevent nested method errors in singleton class bodies.
- * lib/rss/maker/base.rb (RSS::Maker::ItemsBase#<=>): use #date
- instead of @date.
- (RSS::Maker::Base::self.def_array_element): added #size.
+Sun Feb 11 16:00:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * 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.
+ * eval.c (stack_length): use __builtin_frame_address() only if
+ GCC and i386 CPU.
- * lib/rss/maker/dublincore.rb
- (RSS::Maker::ChannelBase, RSS::Maker::ItemsBase::ItemBase):
- fixed opposite alias.
+ * gc.c (rb_gc, Init_stack): ditto.
- * test/rss/test_setup_maker_1.0.rb
- (RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
- tests for RSS::Maker::ItemsBase#do_sort.
+ * configure.in: add ac_cv_func_getpgrp_void=yes on DJGPP.
-Wed Aug 10 10:29:40 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sat Feb 10 23:43:49 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
+ * hash.c (rb_any_hash): dumped core on machines sizeof(int) != sizeof(long).
- * ext/tk/lib/tk/itemconfig.rb: fix bug on handling
- __item_ruby2val_optkeys().
+Sat Feb 10 23:07:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys().
+ * regex.c (PREV_IS_A_LETTER): should not treat c>0x7f as a word
+ character if -Kn.
- * ext/tk/lib/tkextlib/blt/component.rb: ditto.
+Sat Feb 10 00:06:28 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Tue Aug 9 15:12:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * win32/win32.c (win32_stat): replace stat for enable when pathname
+ ends with '/' or '\' for mswin32 on Win9X / Win2k.
- * ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
+ * win32/win32.h: ditto.
- * ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
- help to convert option values between ruby and tcl.
+ * ruby.h: ditto.
- * ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
- __item_ruby2val_optkeys to help to convert option values between
- ruby and tcl.
+ * dir.c (rb_glob_helper): ditto.
- * ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
- option (for the reason of backward compatibility).
+ * file.c (rb_stat, rb_file_s_stat, eaccess, check3rdbyte): ditto.
- * ext/tk/lib/tk/composite.rb: clarify the arguments of super().
+Fri Feb 9 22:54:57 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tk/lib/tk/spinbox.rb: ditto.
+ * ruby.c (ruby_init_loadpath): convert '\\' to '/'
+ before finding executable file path.
- * ext/tk/lib/tk/text.rb: ditto.
+Fri Feb 9 17:41:53 2001 Triet H. Lai <thlai@mail.usyd.edu.au>
- * ext/tk/lib/tk/validation.rb: ditto.
+ * dir.c (rb_glob_helper): do not follow symbolic links.
- * ext/tk/lib/tkextlib/*: support to treat tkvariable-type
- configure options.
+Fri Feb 8 23:53:08 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-Tue Aug 9 20:30:19 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
+ * win32/config.h.in (inline): add inline definition.
- * bignum.c (rb_big_coerce): allow bignum x bignum coercing.
- [ruby-dev:26778]
+Thu Feb 8 21:27:24 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-Mon Aug 8 20:43:02 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * lib/mkmf.rb (install_rb): fix handling of relative path.
- * test/ruby/test_method.rb: added. [ruby-dev:26761]
+ * lib/mkmf.rb (create_makefile): add srcdir.
-Sun Aug 7 23:50:14 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Wed Feb 7 16:05:22 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
+ * parse.y (parse_quotedwords): %w should allow parenthesis escape.
-Sun Aug 7 01:31:15 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Wed Feb 7 00:57:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
- only one event handler.
+ * parse.y (parse_qstring): %q should allow terminator escape.
- * ext/win32ole/tests/testOLEEVENT.rb: ditto.
+Wed Feb 7 00:57:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
- test_ole_type_detail method.
+ * re.c (rb_reg_equal): all option flags should be same to be equal.
-Sat Aug 6 12:35:24 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Feb 6 21:01:29 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
- TkVariable if key name is 'variable' or 'textvariable'
- by default. [ruby-dev:26749]
+ * lib/net/protocol.rb: ignore EOFError on only specified case.
- * ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
- {variable,textvariable} function.
+ * lib/net/http.rb: take HTTP 1.0 server into account.
- * ext/tk/lib/tk/variable.rb: retains backward conpatibility.
+Mon Feb 5 00:39:06 2001 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
-Fri Aug 5 12:50:32 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * dir.c: use ISXXX() instead of isxxx().
- * ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
- exception. (copies argv into heap in tk_funcall instead of
- caller)
+ * dln.c (aix_loaderror): ditto.
-Fri Aug 5 12:42:57 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * file.c (rb_file_s_expand_path): ditto.
- * lib/mkmf.rb (create_makefile): need to convert path separetor
- before invoking install command.
+ * string.c (rb_str_upcase_bang): ditto.
-Fri Aug 5 00:27:04 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * win32/win32.c (do_spawn): ditto.
- * ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
- tcl object conversion as get_str_from_obj and get_obj_from_str.
+ * win32/win32.c (NtMakeCmdVector): ditto.
-Fri Aug 5 00:19:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/win32.c (opendir): ditto.
- * extmk.rb (extmake): needs to be wrapped in an Array.
+Fri Feb 3 00:48:50 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-Thu Aug 4 18:38:36 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * win32/win32.c (isInternalCmd): ignore case for shell's internal
+ command. (marge from HEAD)
- * ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
+Fri Feb 2 16:14:51 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tcltklib/tcltklib.c: add nativethread consistency check.
+ * eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
+ SCOPE_DONT_RECYCLE of ruby_scope is set.
- * ext/tcltklib/stubs.c: ditto.
+Wed Jan 31 22:27:29 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
- when Tcl is 7.6 or 8.0.
+ * configure.in: gcc-2.95.2-7(cygwin) support.
+ add -mwin32 if available.
- * ext/tk/lib/tk/wm.rb: support to make some methods as options of
- root or toplevel widget. [ruby-talk:150336]
+ * cygwin/GNUmakefile: ditto.
- * ext/tk/lib/tk/root.rb: ditto.
+Mon Jan 29 17:36:19 2001 TOYOFUKU Chikanobu <toyofuku@juice.or.jp>
- * ext/tk/lib/tk/toplevel.rb: ditto.
+ * eval.c (rb_eval): nd_iter evaluation should be wrapped by
+ BEGIN_CALLARGS and END_CALLARGS.
- * ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
+Mon Jan 29 01:40:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Aug 4 08:03:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (str_independent): should not clear str->orig here.
+ it's too early.
- * ext/extmk.rb (extmake): should not modify $mflags for each
- extentions.
+Wed Jan 24 01:45:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (POP_BLOCK_TAG): call rb_gc_force_recycle() if block has
+ not been objectified.
- * common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
- macro definitions.
+ * eval.c (rb_callcc): should nail down block->tag history to avoid
+ rb_gc_force_recycle().
- * bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
+Tue Jan 23 18:51:57 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * {win32,wince}/Makefile.sub: separate config.h for compiler versions.
+ * gc.c (rb_gc_call_finalizer_at_exit): should finalize objects in
+ deferred_final_list too.
-Wed Aug 3 21:59:16 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Jan 23 16:10:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
- TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
+ * gc.c (os_live_obj): do not list terminated object.
-Wed Aug 3 08:22:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * gc.c (os_obj_of): ditto.
- * ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
- changes at 2004-09-07. [ruby-dev:26656]
+ * gc.c (rb_gc_mark): support new T_BLKTAG tag.
-Tue Aug 2 10:20:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * gc.c (obj_free): ditto.
- * ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
- Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
+ * eval.c (new_blktag): creation of new block tag, which holds
+ destination of global jump and orphan status.
- * ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
- ip_{get,set,unset}_variable.
+ * eval.c (block_pass): break from orphan Proc object will raise a
+ LocalJumpError exception.
- * ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
+Mon Jan 22 16:33:16 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-Tue Aug 2 01:41:28 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * mkconfig.rb: autoconf 2.49 support.
- * lib/ping.rb (Ping.pingecho): should rescue StandardError.
- [ruby-dev:26677]
+Sat Jan 20 03:54:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Aug 1 19:09:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * parse.y (yylex): fixed serious syntax misbehavior. do's
+ preceding was too high. a block in `foo bar do .. end' should
+ be passed to `foo', not `bar'.
- * ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
- rb_ivar_get with single rb_attr_get call.
+ * parse.y (block_call): syntax restructure.
-Mon Aug 1 18:45:07 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Jan 19 04:04:31 2001 Akinori MUSHA <knu@iDaemons.org>
- * ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
- alternative macro on Tcl7.x or earlier.
+ * lib/irb/ruby-lex.rb: Merge from HEAD: rev.1.4
-Mon Aug 1 13:57:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jan 17 13:28:26 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
- deletion check. [ruby-dev:26664]
+ * configure.in: remove DEFS definition.
-Mon Aug 1 01:17:40 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * mkconfig.rb: ditto.
- * lib/drb/drb.rb (check_insecure_method): use private_methods and
- protected_methods instead of respond_to? to check method visibility.
- [ruby-dev:26616]
+ * win32/config.status.in: ditto.
- * test/drb/drbtest.rb: ditto.
+Tue Jan 16 16:59:14 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * test/drb/ut_drb.rb: ditto.
+ * lib/net/protocol.rb: ignore EOFError for read
-Mon Aug 1 00:07:32 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
- * lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
+Sun Jan 14 21:49:28 2001 Koji Arai <JCA02266@nifty.ne.jp>
-Fri Jul 29 09:59:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * sprintf.c (rb_f_sprintf): simple typo. binary base should be 2,
+ not '2'.
- * eval.c (rb_yield_0): push yielded node instead of yielding.
- fixed: [yarv-dev:549]
+Sun Jan 14 02:49:57 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu Jul 28 18:09:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/protocol.rb (adding): too few "yield" in case of arg is
+ not String/File.
- * ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
- routine creates a Tcl/Tk interpreter and deletes it. However,
- init cost of Tk's MainWindow is not so small. And that makes it
- impossible to use libraries written with Tcl functions only on
- an environment without a graphical display. This changes support
- delaying initalization of Tk_Stubs until the script needs Tk.
+Sat Jan 13 19:18:18 2001 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tcltklib/stubs.h: New file. Define prototypes and return
- codes of functions on stubs.c.
+ * re.c (rb_reg_desc): separate RE_OPTION_MULTILINE
- * ext/tcltklib/tcltklib.c: Support delaying initalization of
- Tk_Stubs until the script needs Tk.
+ * re.c (rb_reg_options): add RE_OPTION_{POSIXLINE,RE_OPTION_MULTILINE,
+ RE_OPTION_EXTENDED}
- * ext/tcltklib/tcltklib.c: Show friendly error messages for errors
- on initialization.
+Thu Jan 11 06:45:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
- exiting and $DEBUG is true. (Not fix. If you know the reason of
- why, please fix it.)
+ * object.c (rb_mod_dup): should propagate FL_SINGLETON.
- * ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
- encoding.
+ * object.c (inspect_obj): handles the case of no instance variable.
- * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
- don't work propery.
+Wed Jan 10 01:50:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * 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.
+ * string.c (rb_str_reverse_bang): forgot to call rb_str_modify().
-Wed Jul 27 23:23:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Jan 9 17:41:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * gc.c (obj_free): make message format consistent with one from
- gc_mark(). [ruby-talk:149668]
+ * object.c (rb_obj_taint): check frozen status before modifying
+ taint status.
-Wed Jul 27 22:11:37 2005 Kouhei Sutou <kou@cozmixng.org>
+ * object.c (rb_obj_untaint): ditto.
- * sample/rss/tdiary_plugin: removed. because the plugin
- is imported in the tDiary plugin packages.
+Mon Jan 8 21:35:10 2001 Guy Decoux <decoux@moulon.inra.fr>
-Wed Jul 27 10:59:02 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * file.c (path_check_1): should restore modified path.
- * dir.c (dir_each): rewinddir(3) before iteration.
- [ruby-talk:149628]
+Mon Jan 8 21:24:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Jul 26 12:57:49 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * bignum.c (bigdivrem): t2 might be too big for signed long; do
+ not use rb_int2big(), but rb_uint2big().
- * ext/openssl/openssl_missin.c: include <openssl/engine.h> before
- <openssl/x509_vfy.h> to avoid compilation error of mswin32.
- suggested by NAKAMURA Usaku.
+Mon Jan 8 03:09:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jul 25 21:30:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * error.c (rb_load_fail): new func to report LoadError.
- * {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
- source to XCFLAGS.
+ * ruby.c (load_file): use rb_load_fail.
-Mon Jul 25 13:45:18 2005 NAJIMA Hiroki <najima@mickey.ai.kyutech.ac.jp>
+Sat Jan 6 00:55:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c: check HAVE_SYS_IOCTL_H before including the header.
- [ruby-dev:26610]
+ * pack.c (pack_pack): template "m2" or "u2" caused inifinite loop.
-Mon Jul 25 14:10:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Fri Jan 5 01:02:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
+ * eval.c (ruby_finalize): should enclosed by PUSH_TAG/POP_TAG.
-Sat Jul 23 16:49:04 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sun Dec 31 01:39:16 2000 Guy Decoux <decoux@moulon.inra.fr>
- * ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
- OPENSSL_NO_STATIC_ENGINE.
+ * eval.c (rb_mod_define_method): wrong comparison for blocks.
-Fri Jul 22 21:06:08 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp>
+Sat Dec 30 19:28:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * bignum.c (rb_big_eq): reduce isnan(). [ruby-dev:26600]
+ * gc.c (id2ref): should handle Symbol too.
- * numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.
+ * gc.c (id2ref): should print original ptr value
-Fri Jul 22 15:02:39 2005 Kouhei Sutou <kou@cozmixng.org>
+Sat Dec 30 03:14:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rss/rss.rb: moved copyright description to lib/rss.rb.
+ * eval.c (rb_iterate): NODE_CFUNC does not protect its data
+ (nd_tval), so create new node NODE_IFUNC for iteration C
+ function.
- * lib/rss.rb: added for convenience.
+ * eval.c (rb_yield_0): use NODE_IFUNC.
- * sample/rss/re_read.rb: added #to_s sample.
+ * gc.c (rb_gc_mark): support NODE_IFUNC.
- * 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.
+Fri Dec 29 11:41:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7.
+ * gc.c (mem_error): prohibit recursive mem_error().
+ (ruby-bugs-ja:PR#36)
-Fri Jul 22 14:37:43 2005 Kouhei Sutou <kou@cozmixng.org>
+Fri Dec 29 11:05:41 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rss/parser.rb (RSS::Parser#initialize): accept HTTP/FTP
- URI and local file path too.
+ * eval.c (rb_thread_fd_writable): should not switch context if
+ rb_thread_critical is set.
- * test/rss/test_parser.rb (RSS::TestParser#test_parse): test
- for the above.
+ * eval.c (rb_thread_wait_fd): ditto.
-Fri Jul 22 07:01:42 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (rb_thread_wait_for): ditto.
- * ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
- and gc_disable when raise ArgumentError.
+ * eval.c (rb_thread_select): ditto.
- * ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
+ * eval.c (rb_thread_join): join during critical section causes
+ deadlock.
- * ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
+Tue Dec 26 18:46:41 2000 NAKAMURA Hiroshi <nakahiro@sarion.co.jp>
- * ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
+ * lib/debug.rb: Avoid thread deadlock in debugging stopped thread.
- * ext/tk/lib/multi-tk.rb: add MultiTkIp#has_mainwindow? method.
+ * lib/debug.rb: Uncleared 'finish' state.
- * ext/tk/lib/remote-tk.rb: add RemoteTkIp#has_mainwindow? method.
+Tue Dec 26 16:53:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/multi-tk.rb: slave IP fail to exit itself when $SAFE==4.
+ * eval.c (rb_yield_0): remove dvar node by rb_gc_force_recycle()
+ more eagerly.
- * ext/tk/lib/multi-tk.rb: remove constants from MultiTkIp module to
- avoid access from external.
+ * eval.c (rb_f_binding): recycling should be stopped for outer
+ scope too.
- * ext/tk/lib/multi-tk.rb: check_root flag is ignored on slave IPs'
- mainloop.
+ * eval.c (proc_new): ditto.
- * ext/tk/lib/multi-tk.rb: hang-up Tk.mainloop called on a slave IP
- with $SAFE==4.
+Tue Dec 26 15:45:35 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/multi-tk.rb: MultiTkIp#bg_eval_proc doesn't work
+ * string.c (rb_str_inspect): should treat multibyte chracters
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.
-
-Wed Jul 20 19:20:37 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (S_ISREG): need to define S_ISREG before it is used first.
-
-Wed Jul 20 18:40:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * io.c (wsplit_p): patch for the environment where
- fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
- 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
- teminating NUL. [ruby-dev:26581]
-
-Wed Jul 20 04:01:55 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
- so reverted.
-
- * ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
- on windows.
-
-Wed Jul 20 03:16:43 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/socket/socket.c: should not undef close() on win32.
- it's defined to rb_w32_close(), otherwise handle leaks.
- [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 16:39:46 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_inspect): replace sprintf() with "%s" format all
- over the place by snprintf() to avoid integer overflow.
-
-Tue Jul 19 14:08:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
-
- * ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
- NIL_P, so should assign Qnil instead of 0 (Qfalse).
-
- * ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
- ip is deleted.
-
-Tue Jul 19 13:19:46 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * 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:40:20 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * eval.c (rb_call0): make the pointer to NODE volatile
- instead of NODE itself.
-
-Mon Jul 18 14:32:21 2005 Tanaka Akira <akr@m17n.org>
-
- * eval.c (rb_call0): make body volatile to avoid 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. 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_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
- multi-threaded mode.
- [ruby-dev:26540]
-
-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.
-
-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 18:00:01 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
- failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
-
-Fri Jul 15 07:58:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
- sockets should be non-blocking mode. [ruby-dev:26405]
-
- * lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
-
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
- should call sock.read repeatedly until the preferred size data
- is obtained.
-
-Thu Jul 14 18:27:16 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_strerror): should return correct message
- for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
-
- * 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 19:37:47 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
- if file or directory already exists. (bcc32) [ruby-dev:26508]
-
- * 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/tcltklib/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 08:31:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * regex.c (read_special): fix parsing backslashes following \c in
- regexp. fixed: [ruby-dev:26500]
-
-Mon Jul 11 02:53:00 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
- mistook in merging the patch of [ruby-dev:26235] at
- revision 1.4.2.6.
-
-Sun Jul 10 23:58:04 2005 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
- avoid unlink a directory by root.
- cf. [ruby-dev:26237]
-
-Sun Jul 11 05:18:17 2005 Michael Neumann <mneumann@ruby-lang.org>
-
- * lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
- WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
- no further used by the XML-RPC library).
-
-Sun Jul 10 12:47:01 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/debug.rb (debug_command): added a deficient format specifier.
- fixed: [ruby-core:05419]
-
-Sat Jul 9 21:28:46 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
- in Ruby and C by INT2NUM and NUM2INT.
-
- * 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.
-
-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:51:35 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
-
- * ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
-
- * ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
- encoding_system, and so on.
-
- * ext/tcltklib/MANUAL.euc: ditto.
-
- * ext/tk/tkutil.c: fail to create a Tcl's list string from an
- array including multiple kind of encoded strings.
-
- * ext/tk/lib/tk.rb: ditto.
-
- * 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 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.
-
-Mon Jul 4 11:15:37 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
- which using fork on fork-less platforms.
-
-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.
-
-Fri Jul 1 17:48:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (get2comp): revert all prior changes, and calculate
- proper 2's complement for negative numbers. backported from
- HEAD.
-
-Fri Jul 1 15:50:12 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * 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 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 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]
-
-Tue Jun 28 21:59:29 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
- variable" [ruby-dev:26387]
-
-Sat Jun 25 17:15:23 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 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 15:49:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * enum.c (enum_min, enum_max): do not ignore nil as the first element.
-
-Sat Jun 25 14:40:17 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
- which contained each elements twice. [ruby-dev:26358]
-
-Fri Jun 25 05:06:47 2005 Michael Neumann <mneumann@ruby-lang.org>
-
- * lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
-
-Fri Jun 24 17:00:00 2005 Shigeo Kobayashi <shigeo@tinyforest.jp>
-
- * ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
- (u-tokyo.ac.jp) applied to fix rounding bug.
-
-Fri Jun 24 13:06:45 2005 akira yamada <akira@ruby-lang.org>
-
- * lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
- replaced some existent domain name with "example.com".
-
-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 16:48:36 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.
- fixed: [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 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]
-
-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:06:55 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
- was missing.
-
-Thu Jun 16 13:34:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * 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 08:29:22 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
- fixed memory leak. [ruby-Bugs-2034]
-
-Wed Jun 15 18:26:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * 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.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:01:05 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]
-
-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:26 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 11:55:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/delegate.rb (SimpleDelegator::__setobj__): need check for
- recursive delegation. [ruby-core:04940]
-
-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 11:11:34 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (get2comp): calculate proper 2's complement for
- negative numbers. a bug in normalizing negative numbers
- reported from Honda Hiroki <hhonda@ipflex.com>.
-
-Wed Jun 8 08:33:10 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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 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 at segment7.net> added. [ruby-core:05148]
-
-Tue Jun 7 18:30:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Dec 25 17:49:08 2000 K.Kosako <kosako@sofnec.co.jp>
- * lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
- fixed: [ruby-dev:26294]
+ * string.c (rb_str_replace_m): unexpected string share happens if
+ replace is done for associated (STR_NO_ORIG) string.
-Tue Jun 7 17:39:54 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Dec 26 15:01:53 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * object.c (rb_mod_cvar_get): Module#class_variable_get(): back
- ported from CVS HEAD. [ruby-talk:144741]
+ * io.c (rb_f_p): should not call rb_io_flush() if rb_defout is not
+ a IO (T_FILE).
- * object.c (rb_mod_cvar_set): Module#class_variable_set().
- [ruby-talk:144741]
+Mon Dec 25 15:52:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Jun 7 16:32:53 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * stable version 1.6.2 released.
- * sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
- not verbose mode (-v/-w). [ruby-core:05123]
+Mon Dec 25 05:11:04 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-Tue Jun 7 10:30:49 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/cgi.rb: version 2.1.2 (some bug fixes).
- * ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
- delegated by master-ip.
+ * lib/cgi.rb: Regexp::last_match[1] --> $1
-Sun Jun 5 23:00:35 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/telnet.rb: ditto.
- * ext/tk/lib/tk/console.rb: create console when required
+Mon Dec 25 04:43:02 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
+ * lib/net/http.rb: does not send HEAD on closing socket.
-Sat Jun 4 14:55:18 2005 Tanaka Akira <akr@m17n.org>
+Mon Dec 25 00:44:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
+ * hash.c (rb_any_cmp): should use rb_str_cmp() if TYPE == T_STRING
+ and CLASS_OF == rb_cString.
- * test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
+ * string.c (rb_str_new4): should copy class of original too.
- * test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
- modification to use test/unit.
+Mon Dec 25 00:04:54 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Fri Jun 3 14:06:12 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (rb_thread_schedule): initial value of `max' changed to -1.
- * ext/tk/lib/multi-tk.rb: fix typo.
+Mon Dec 25 00:16:14 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jun 1 11:32:42 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * string.c (rb_str_replace_m): copy-on-write replace.
- * bcc32/Makefile.sub: can use single quote character in DESTDIR.
- [ruby-dev:26205]
+ * parse.y (yylex): should handle => after identifier as well as ==
+ and =~.
-Mon May 30 23:48:29 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sat Dec 23 23:55:57 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
- Extension.
+ * bignum.c (rb_cstr2inum): Integer("") should not return 0.
- * ext/tk/lib/tk/msgcat.rb: ditto.
+Sat Dec 23 11:55:57 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/winpkg.rb: ditto.
+ * array.c (rb_ary_and): Array#& should preverve original order.
- * ext/tk/lib/tkextlib/*: ditto.
+Sat Dec 23 03:44:16 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Sat May 28 16:40:15 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * lib/net/protocol.rb: set @closed false in Socket#reopen.
- * test/openssl/test_x509store.rb: add test for expired CRL
- and refine some assertions.
+ * lib/net/pop.rb: add POP3.foreach, delete_all.
-Sat May 28 05:15:51 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * lib/net/pop.rb: add POP3#delete_all.
- * ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
- not set internal flag directry.
+ * lib/net/http.rb: add HTTP.version_1_1, version_1_2
-Sat May 28 02:00:11 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * lib/net/http.rb: refactoring.
- * 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 Dec 22 23:11:12 2000 Ueno Katsuhiro <unnie@blue.sky.or.jp>
-Fri May 27 16:32:04 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (rb_feature_p): ext might be null.
- * lib/mkmf.rb: use the semicolon as the path separator
- in the environment of MSYS. fixed: [ruby-dev:26232]
+Fri Dec 22 17:04:12 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Thu May 26 06:08:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * win32/win32.c (myselect): avoid busy loop by adjusting fd_count.
- * ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
+Fri Dec 22 15:07:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed May 25 22:52:42 2005 Shugo Maeda <shugo@ruby-lang.org>
+ * bignum.c (rb_cstr2inum): prefix like '0x' had removed too much.
- * lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
- (backported from HEAD)
+Thu Dec 21 13:01:46 2000 Tanaka Akira <akr@m17n.org>
-Wed May 25 21:55:40 2005 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/ftp.rb (makeport): don't use TCPsocket.getaddress.
- * ext/readline/readline.c: supported libedit. (backported from HEAD)
+Wed Dec 20 12:00:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/readline/extconf.rb: ditto.
+ * bignum.c (rb_big_lshift): should cast up to BDIGIT_DBL.
- * test/readline/test_readline.rb: ditto.
+ * parse.y (yylex): disallow trailing '_' for numeric litrals.
-Wed May 25 20:06:27 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * bignum.c (rb_cstr2inum): allow `_' within converting string.
- * 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.
+ * eval.c (specific_eval): should take no argument if block is
+ supplied.
- * ext/tk/lib/multi-tk.rb: modify to attend encoding.
+Tue Dec 19 13:44:50 2000 K.Kosako <kosako@sofnec.co.jp>
- * ext/tk/lib/remote-tk.rb: ditto.
+ * io.c (rb_f_p): should flush rb_defout, not stdout.
- * ext/tk/lib/tk/itemconfig.rb: ditto.
+Tue Dec 19 00:57:10 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/listbox.rb: ditto.
+ * time.c (time_minus): usec might overflow. (ruby-bugs-ja:PR#35)
- * 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 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 11:56:25 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/getopts.rb: should warn only if verbose mode.
- fixed: [ruby-dev:26201]
-
-Tue May 24 06:45:31 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
- literals to be matched non-greedy.
-
-Tue May 24 00:34:32 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/soap/calc: method name 'set' was able to crash with a class Set.
- [ruby-dev:26210]
-
- * test/wsdl/document/test_rpc.rb: dateTime comparison failed under
- TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
-
-Mon May 23 16:24:05 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
-
- * ext/tcltklib/README.1st: add description of Framework support options.
-
-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.
-
-Sat May 21 10:24:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * bcc32/Makefile.sub: tds files were not deleted when DESTDIR
- included '\' path delimiter. [ruby-dev:26193]
-
-Thu May 19 19:04:29 2005 speakillof <speakillof@yahoo.co.jp>
-
- * lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
- swapped. [ruby-core:4772]
-
-Wed May 18 23:42:25 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * error.c (exc_exception): reverted to call Exception#initialize
- directly. fixed: [ruby-dev:26177]
-
-Wed May 18 23:39:09 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (glob_helper): get rid of using String. [ruby-dev:26180]
-
- * dir.c (push_braces): should skip balanced braces.
-
- * eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
- intialization back. [ruby-dev:26180]
-
-Tue May 17 15:31:31 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
- break the loop if the socket reached to EOF. [ruby-talk:142285]
-
-Tue May 17 11:52:18 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (unixtime_to_filetime): use localtime() instead of
- gmtime() when using FileLocalTimeToFileTime().
-
-Mon May 16 22:28:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
- to get rid of redefinition warnings on mingw.
-
- * class.c (rb_class_init_copy): singleton class is disallowed to copy,
- from its definition. fixed: [ruby-talk:142749]
-
-Mon May 16 08:52:29 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:11:33 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:57:26 2005 Erik Huelsmann <ehuels@gmail.com>
-
- * configure.in: Check for the availability of pid_t, gid_t and uid_t and
- remove AC_TYPE_UID_T. fixed: [ruby-core:04745]
-
- * 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.
-
-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 17:54:39 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * variable.c (generic_ivar_get): rb_attr_get should not warn.
- [ruby-dev:26010]
-
-Fri May 13 12:28:43 2005 Daniel Berger <djberge@qwest.com>
-
- * array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
-
- * test/ruby/test_array.rb: add test for find_all.
-
-Fri May 13 11:29:00 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (unknown_node): add volatile directive to prototype.
-
-Thu May 12 17:08:48 2005 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
- (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
-
- * io.c (rb_io_eof, io_fread, appendline, swallow, rb_io_each_byte)
- (rb_io_getc, rb_getc): call clearerr before getc to avoid
- stdio incompatibility.
-
-Thu May 12 16:52:20 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/rdoc/parsers/parse_c.rb: more readability for mixing
- progress "c..." and warning message.
-
-Thu May 12 16:31:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
-
-Thu May 12 16:15:01 2005 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
- (swallow, rb_io_each_byte, rb_io_getc): don't rely EOF flag.
- [ruby-talk:141527]
-
-Thu May 12 15:56:20 2005 Tilman Sauerbeck <tilman@code-monkey.de>
-
- * lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
- [ruby-core:4341]
-
-Thu May 12 13:47:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/drb/test_drb{ssl,unix}.rb: can test drb
- before install. (backported from HEAD) [ruby-dev:26146]
-
-Thu May 12 09:53:57 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * version.c (ruby_show_version): flush for non-tty stdout.
-
-Thu May 12 09:07:07 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
- before install. (backported from HEAD) [ruby-Bugs-1672]
-
-Thu May 12 01:23:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
- parser. fixed: [ruby-dev:26113]
-
- * eval.c (unknown_node): ignore broken NODE to get rid of accessing
- possibly inaccessible address. fixed: [ruby-dev:26122]
- should emit more useful information like [ruby-dev:26126], though.
-
-Wed May 11 16:20:01 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
- and WEBrick::CGI#config. (backported from HEAD)
-
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
- not use String#split("/"). (backported from HEAD)
-
-Wed May 11 15:58:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (break_jump): break should not cross functions.
- [ruby-list:40818]
-
-Wed May 11 10:39:37 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 16:52:56 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
- [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
-
-Sat May 7 22:58:00 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (have_var): no libs argument is given.
-
-Sun May 1 09:58:11 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ruby.c (process_sflag): replace '-' in variable names with '_'.
- [ruby-dev:26107]
-
- * 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/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
- command when can't get information of target command.
-
-Mon Apr 25 01:18:43 2005 Tanaka Akira <akr@m17n.org>
-
- * regex.c: declare rb_warn to have variadic argument. [ruby-core:4751]
-
-Sat Apr 23 19:45:59 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
- via TclTkIp#_eval didn't work. [ruby-talk:139390]
-
-Fri Apr 22 16:41:50 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
-
- * ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
-
-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 depens 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 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.
-
-Wed Apr 20 04:15:27 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
-
- * lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
-
-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 00:06:20 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/extmk.rb: expand path for ext/**/extconf.rb.
-
-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:36:01 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.
-
-Thu Apr 14 19:18:30 2005 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (remove_file): ignore exceptions caused by
- chmod.
-
- * lib/fileutils.rb (remove_dir): try to get rights to rmdir.
- [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
-
-Thu Apr 14 16:57:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * bcc32/Makefile.sub: failed to remove debug information files.
- fixed: [ruby-dev:26034]
-
-Wed Apr 13 23:40:21 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * 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 21:20:35 2005 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (mingw32): extract msvcr*.dll from objdump result.
-
-Wed Apr 13 20:24:30 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (mingw32): use actual runtime DLL name as ruby DLL
- name and default load path.
-
- * win32/Makefile.sub, win32/setup.mak: ditto.
-
-Tue Apr 12 15:33:09 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
- previous commit [ruby-dev:26029].
-
-Tue Apr 12 12:38:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
- modifies the argument string to eval.
-
-Tue Apr 12 02:21:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
- Tcl commands before calling Tcl_GlobalEval().
-
-Mon Apr 11 23:47:21 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
- loaded, the object is tainted.
-
- * 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/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
- when exit on Tcl/Tk8.3.x.
-
-Mon Apr 11 15:26:25 2005 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
-
-Mon Apr 11 12:09:05 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * {bcc32,win32,wince}/Makefile.sub: ri data was not installed
- into correct path. [ruby-dev:26011]
-
- * bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
-
-Sun Apr 10 10:12:42 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
- to VT_EMPTY.
-
- * ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
- message string "Unknown" => "unknown".
-
-Sat Apr 9 18:20:31 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk/image.rb: support to create TkImage object without
- 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.
-
-Sat Apr 9 11:59:57 2005 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss: backoported from HEAD.
-
- * lib/rss: refactored.
- - gave a name to 'x'.
- - undef_method -> remove_method for avoiding a warning in ruby 1.6.
-
-
- * 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.
-
- * lib/rss/parser.rb
- (RSS::BaseListener.install_setter)
- (RSS::BaseListener.register_uri): changed fallback way.
-
- * 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/dublincore.rb: supported multiple Dublin Core items.
- * lib/rss/maker/dublincore.rb: ditto.
-
- * lib/rss/maker/image.rb: supproted new Dublin Core API.
-
-
- * lib/rss/maker/base.rb: added default current_element implementation.
-
-
- * lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
- moved to RSS::Utils.
-
- * 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/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.
-
- * test/rss/test_maker_dc.rb (test_date): added a test for #date=
- and #dc_date=.
-
-
- * sample/rss/tdiary_plugin/rss-recent.rb:
- new option: @options['rss-recent.use-image-link']:
- 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.
-
-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 18:26:56 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts.
- - SSLContext#client_cert_cb=(aProc). it is called when a client
- certificate is requested by a server and no certificate was not
- set for the SSLContext. it must return an Array which includes
- OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
- - SSLContext#tmp_dh_callback=(aProc). it is called in key
- exchange with DH algorithm. it must return an OpenSSL::PKey::DH
- object.
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
- argument if it's nil.
-
- * 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.
-
-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:43:25 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (rb_call0): "return" event hook should be always executed
- if event_hooks is set. fixed: [ruby-core:04662]
- (backported from HEAD)
-
-Mon Apr 4 23:17:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * 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.
-
-Sun Apr 3 17:16:33 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
- (backported from HEAD)
-
-Sat Apr 2 23:38:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * configure.in (CP, INSTALL): get rid of less portable options.
-
- * lib/mkmf.rb (configuration, create_makefile): correct configuration
- variable.
-
- * {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
- config.status for backward compatibility. fixed: [ruby-core:04649]
-
- * lib/mkmf.rb (create_makefile): ensure library directories get made
- before copying libraries there.
-
-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 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:15:44 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
- value. [ruby-dev:25971]
-
-Thu Mar 31 08:25:50 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.)
-
-Thu Mar 31 00:18:27 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * win32/ifchange.bat, win32/rm.bat: backported from HEAD.
-
-Wed Mar 30 23:44:50 2005 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * Makefile.in, */Makefile.sub, */configure.bat,
- cygwin/GNUmakefile.in, common.mk, configure.in, ext/extmk.rb,
- lib/mkmf.rb, instruby.rb, runruby.rb: backport extout.
- [ruby-dev:25963]
-
-Wed Mar 30 17:41:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
- create a Tcl/Tk's console window.
-
- * ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
-
- * 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:11:56 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
- [ruby-dev:25961]
-
-Mon Mar 28 23:40:40 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
- extract method DRbObject.prepare_backtrace. add DRb.regist_server,
- 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:43:34 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
-
-Mon Mar 28 08:39:49 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
- arguments. (pointed out by NaHi)
-
-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.
-
-Thu Mar 24 03:57:48 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/utils.rb (WEBrick::Utils.create_listeners):
- - should raise ArgumentError if no port is specified.
- - even if the specified port is 0, all TCPServers should be
- initialized with the port given to the first one.
-
- * lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
- parameter is 0, it should be updated with the port number which
- actually listened.
-
-Wed Mar 23 00:35:10 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * test/ruby/test_settracefunc.rb (test_event): added tests for
- "class" and "end" and "raise".
-
-Tue Mar 22 22:40:18 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (rb_call0): check event_hooks instead of trace_func.
-
-Tue Mar 22 17:30:44 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (rb_add_event_hook): new function to add a hook function for
- interpreter events. (backported form HEAD)
-
-Sun Mar 20 22:51:19 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (mkmf_failed): check if Makefile is created without
- 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:36:02 2005 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (rb_call0): call_cfunc() should be protected.
-
- * test/ruby/test_settracefunc.rb: added test for c-return.
-
-Wed Mar 16 22:20:25 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * object.c (str_to_id): fixed typo.
-
-Wed Mar 16 18:08:32 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): reorganize "return" event post.
-
-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 16:38:11 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/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): warn 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.
+ * eval.c (rb_obj_extend): Object#extend should take at least one
+ argument.
-Sun Mar 13 10:04:17 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * parse.y (mrhs_basic): should check value_expr($3), not $1.
- * test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
+Mon Dec 18 23:18:39 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-Thu Mar 10 19:12:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * util.c (mblen, __crt0_glob_function): add for multibyte
+ on DJGPP 2.03.
- * ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
- handler when exit from a recursive called eventloop
+Mon Dec 18 18:10:30 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
- realtime operation
+ * time.c (time_plus): usec might underflow (ruby-bugs-ja:#PR33).
- * ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
+Mon Dec 18 08:11:20 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/textmark.rb: move TkTextMark#+ and TkTextMark#- to
- TkText::IndexModMethods
+ * hash.c (rb_hash_set_default): should call rb_hash_modify().
- * ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
- add them to TkText::IndexModMethods module
+Sat Dec 16 02:58:26 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/sample/tktextio.rb: add test part of "seek by text index
- modifiers"
+ * eval.c (rb_eval): should clear ruby_errinfo on retry.
-Thu Mar 10 08:10:11 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_rescue2): ditto.
- * re.c (make_regexp): need to free internal regexp structure when
- compilation fails. [ruby-talk:133228]
+Thu Dec 14 13:06:18 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Wed Mar 9 20:25:58 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * class.c (rb_include_module): prohibit fronzen class/module.
- * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
- rb_sys_fail if errno isn't 0. [ruby-dev:25831]
+ * eval.c (rb_frozen_class_p): make external.
- * ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
+ * intern.h (rb_frozen_class_p): prototyped.
-Wed Mar 9 15:46:35 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * intern.h (rb_undef): prototyped not but rb_undef_method()
+ which is also in ruby.h.
- * lib/webrick/server.rb (WEBrick::GenericServer#start): should
- restore @token if accept failure. suggested by Dominique Brezinski.
- [ruby-core:04518]
+Thu Dec 14 09:20:26 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-Wed Mar 9 13:37:57 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/cgi.rb: support -T1 on ruby 1.6.2
- * ext/tk/sample/tktextio.rb: fix bug of handling 'end' position.
- support initial text, overwrite setting and pos_gravity control.
+ * lib/cgi.rb: $1 --> Regexp::last_match[1]
-Tue Mar 8 18:16:55 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/telnet.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).
+Wed Dec 13 23:27:06 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Mar 8 13:54:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_eval): handles case statement without expr, which
+ looks for any TRUE (non nil, non false) when expression.
- * ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
+ * parse.y (primary): case expression should not be compstmt, but
+ mere expr.
-Tue Mar 8 12:36:17 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (primary): case without following expression is now
+ separated rule.
- * ext/socket/socket.c: document from Sam Roberts
- <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
- [ruby-doc:824]
+Wed Dec 13 12:41:27 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-Tue Mar 8 01:27:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+ * ruby.c (proc_options): accept "--^M" for DOS line endings.
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
- fixed: [ruby-dev:25828]
+Tue Dec 12 15:45:42 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Mar 7 21:35:02 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * parse.y (newline_node): cancel newline unification.
- * sample/webrick/httpsd.rb: fix typo in comment. suggested by
- Kazuhiko Shiozaki.
+Mon Dec 11 23:01:57 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Mar 7 14:55:43 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (yylex): supports cases `?' precedes EOF and newline.
- * eval.c (block_pass): should not push unique number if a block is
- not an orphan. [ruby-dev:25808]
+Mon Dec 11 12:11:25 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Feb 16 02:55:21 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (call_end_proc): some frame members were left
+ uninitialized.
- * ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
- ossl_ssl_write):
- - need to set errno on Win32 platform.
- - should call rb_sys_fail instead of rasing SSLError if
- SSL_ERROR_SYSCALL occured.
- - should wait for that the underlying IO become readable or
- writable if the error was SSL_ERROR_WANT_READ or
- SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
+Mon Dec 11 01:14:58 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/openssl/lib/openssl/buffering.rb
- (Buffering#initialize): should set @eof and @rbuffer.
- (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
- (Buffering#consume_rbuf): pointless eof flag resetting is deleted.
- (Buffering#read): should return an empty string if the specified
- size is zero.
- (Buffering#readpartial): new method.
- (Buffering#readline): fix typo.
- (Buffering#getc): return the first character of string correctly.
- (Buffering#each): fix typo. suggested by Brian Ollenberger.
- (Buffering#readchar): fix typo.
- (Buffering#eof?): should read again it the input buffer is empty.
- (Buffering#do_write): should rescue Errno::EAGAIN.
- (Buffering#puts): use "\n" as the output field separator.
+ * io.c (rb_io_fptr_finalize): do not fclose stdin, stdout and
+ stderr at exit.
- * ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
- underlying IO.
+Sat Dec 9 17:34:48 2000 Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
- * ext/openssl/extconf.rb: get rid of GNUmakefile generation.
+ * time.c (time_cmp): should check with kind_of?, not instance_of?
- * text/openssl/test_pair.rb: test for IO like methods.
+ * time.c (time_eql): ditto.
- * test/ruby/ut_eof.rb: test about empty file.
+ * time.c (time_minus): ditto.
-Mon Mar 7 10:22:06 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+Fri Dec 8 17:23:25 2000 Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
- * lib/un.rb: should use OptionParser. (backported form HEAD)
+ * sprintf.c (rb_f_sprintf): proper string precision treat.
-Mon Mar 7 09:18:42 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Dec 8 10:44:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * string.c (rb_str_cmp_m): should not return false but nil.
- fixed: [ruby-dev:25811]
+ * variable.c (rb_mod_remove_cvar): Module#remove_class_variable
+ added.
-Mon Mar 7 01:22:14 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu Dec 7 17:35:51 2000 Shugo Maeda <shugo@ruby-lang.org>
- * ext/tk/tkutil.c: remove the some codes which depend on the
- difference between Ruby1.8 and 1.9, because st.c on Ruby1.9
- was changed.
+ * eval.c (stack_length): don't use __builtin_frame_address() on alpha.
-Mon Mar 7 00:01:04 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed Dec 6 18:07:13 2000 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
+ * djgpp/config.sed, win32/Makefile.sub: typo.
-Sun Mar 6 16:41:33 2005 Minero Aoki <aamine@loveruby.net>
+ * eval.c (rb_mod_define_method): avoid VC4.0 warnings.
- * lib/net/http.rb: HTTPHeader holds its header fields as an array
- (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
+Wed Dec 6 13:38:08 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/net/http/test_httpheader.rb: new file.
+ * array.c (rb_ary_and): tuning, make hash from shorter operand.
-Sun Mar 6 11:47:10 2005 Sam Roberts <sroberts@uniserve.com>
+Wed Dec 6 01:28:50 2000 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
- * lib/pp.rb: rdoced. [ruby-core:4490]
+ * gc.c (rb_gc): __builtin_frame_address() should not be used on
+ MacOS X.
-Sun Mar 6 11:36:37 2005 Tanaka Akira <akr@m17n.org>
+ * gc.c (Init_stack): ditto.
- * lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
- may return nil. [ruby-talk:129826]
- reported by Daniel Berger.
+Mon Dec 4 13:44:01 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-Sat Mar 5 18:06:21 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/jcode.rb: consider multibyte. not /n.
- * dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
- String#clear, so [ruby-dev:24749] didn't affect it)
+Mon Dec 4 09:49:36 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
+ * string.c (rb_str_inspect): output whole string contents. no more `...'
-Sat Mar 5 16:29:26 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * string.c (rb_str_dump): should propagate taintness.
- * ext/tk/lib/multi-tk.rb: freeze callback-entry objects
+ * hash.c (env_inspect): hash like human readable output.
- * ext/tk/lib/tkextlib/tile.rb: support tile-0.6
+ * variable.c (rb_ivar_get): prohibiting instance variable access
+ is too much restriction.
-Fri Mar 4 19:39:28 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * class.c (method_list): retrieving information should not be
+ restricted where $SAFE=4.
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
- also locally defined modules.
+ * class.c (rb_obj_singleton_methods): ditto.
- * ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
+ * eval.c (rb_thread_priority): ditto.
- * ext/strscan/strscan.c: moved misplaced rdoc.
+ * eval.c (rb_thread_local_aref): ditto.
-Fri Mar 4 15:58:12 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * variable.c (rb_obj_instance_variables): ditto.
- * lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
- getopts.rb, parsearg.rb, importenv.rb as well.
+ * variable.c (rb_mod_const_at): ditto.
-Fri Mar 4 11:17:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * variable.c (rb_mod_class_variables): ditto.
- * ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
- warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
+ * eval.c (rb_exec_end_proc): end_proc should be preserved.
- * ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
+Sat Dec 2 22:32:43 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Mar 4 10:15:30 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_yield_0): || should accept exactly zero argument.
- * lib/set.rb (SortedSet::setup): a hack to shut up warning.
- [ruby-talk:132866]
+ * parse.y (stmt): multiple right hand side for single assignment
+ (e.g. a = 1,2) is allowed.
-Fri Mar 4 07:07:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+Wed Nov 29 07:55:29 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
+ * marshal.c (w_long): dumping long should be smaller than 32bit max.
-Thu Mar 3 23:49:00 2005 NARUSE, Yui <naruse@ruby-lang.org>
+ * marshal.c (w_long): shorter long format for small integers(-123..122).
- * ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
+ * marshal.c (r_long): ditto.
-Thu Mar 3 11:49:51 2005 Kouhei Sutou <kou@cozmixng.org>
+Tue Nov 28 18:10:51 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * sample/rss/tdiary_plugin/rss-recent.rb: added site information.
+ * eval.c (rb_mod_define_method): quick hack to implement
+ on-the-fly method definition. experimental.
-Wed Mar 2 19:53:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 27 17:00:35 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/extmk.rb (parse_args): add DESTDIR only when not directed
- already. fixed: [ruby-dev:25781]
+ * eval.c (rb_eval): should not redefine builtin classes/modules
+ from within wrapped load.
-Wed Mar 2 17:14:18 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Nov 27 08:57:33 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
+ * eval.c (call_end_proc): should be isolated from outer block.
-Wed Mar 2 16:00:02 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Nov 27 00:10:08 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling
- to avoid SEGV trouble.
- [KNOWN BUG] When supports pthread and running multiple Tk
- interpreters, an interrupt signal causes SEGV frequently. That
- may be a trouble of Ruby's signal handler.
+ * io.c (rb_io_ctl): call ioctl/fcntl for fptr->f2 too.
- * ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
- to a Tcl's list string.
+ * process.c (rb_f_fork): call rb_thread_atfork() after creating
+ child process.
- * ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
- protect from namespace crash.
+ * eval.c (rb_thread_atfork): kill all other threads immediately,
+ then turn the current thread into the main thread.
- * ext/tk/lib/multi-tk.rb: enforce exception-handling.
+Sat Nov 25 23:12:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/multi-tk.rb: catch IRB_EXIT to work on irb.
+ * eval.c (ruby_run): move calling point of rb_trap_exit after
+ cleaning up threads.
- * ext/tk/lib/tk.rb: ditto.
+ * eval.c (ruby_finalize): new function to call EXIT trap, END
+ procs and GC finalizers.
- * ext/tk/tcltklib.c: add TclTkLib.mainloop_thread?
+ * eval.c (rb_exec_end_proc): prevent recursion.
- * ext/tk/lib/multi-tk.rb: (bug fix) callback returns a value.
+ * gc.c (rb_gc_call_finalizer_at_exit): ditto.
- * ext/tk/lib/tk/canvas.rb (delete): bug fix when multiple arguments.
+ * signal.c (rb_trap_exit): ditto. made static.
- * ext/tk/lib/clock.rb: fix 'no method error'.
+ * process.c (rb_f_fork): should swallow all exceptions from block
+ execution.
- * ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument.
+ * process.c (fork_rescue): should call ruby_finalize().
- * 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.
+ * parse.y (yycompile): rb_gc() removed. I don't remember why I put
+ this here. test code?
- * ext/tk/lib/tkextlib/tclx/tclx.rb: add Tk::TclX.signal to warn the
- risk of using TclX extension's 'signal' command.
+Fri Nov 24 22:03:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/sample/irbtk.rb: irb with Ruby/Tk.
+ * range.c (EXCL): exclusive infomation is now stored in an
+ instance variable. this enables proper marshal dump.
- * ext/tk/sample/demos-*/anilabel.rb: bug fix on 'show code'
+ * process.c (proc_waitpid): should clear rb_last_status ($?) if
+ no pid was given by waitpid(2).
- * ext/tk/sample/demos-*/aniwave.rb: new Ruby/Tk animation demo.
+Thu Nov 23 01:35:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/sample/demos-*/pendulum.rb: ditto.
+ * process.c (proc_waitpid2): returns nil if no pid found.
- * ext/tk/sample/demos-*/goldberg.rb: ditto.
+Wed Nov 22 23:45:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/sample/demos-*/widget: add entries of animation demos.
+ * range.c (range_eq): new method. Compares start and end of range
+ respectively.
-Tue Mar 1 00:47:43 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Nov 22 11:01:32 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/rinda/test_rinda.rb: backport from CVS_HEAD. use
- MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
+ * variable.c (rb_mod_class_variables): should honor singleton
+ class variable rule defined yesterday.
-Tue Mar 1 00:34:24 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Tue Nov 21 23:24:14 2000 Mitsuteru S Nakao <nakao@kuicr.kyoto-u.ac.jp>
- * lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
+ * numeric.c (flodivmod): missing second operand (typo).
- * test/rinda/test_rinda.rb: ditto.
+Tue Nov 21 03:39:41 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 28 11:42:23 2005 Ian Macdonald <ian@caliban.org>
+ * marshal.c (marshal_load): marshal format compatibility check
+ revised. greater minor revision is UPWARD compatibile;
+ downward compatibility is not assured.
- * exception error messages updated. [ruby-core:04497]
+ * eval.c (is_defined): clarify class variable behavior for
+ singleton classes. class variables within singleton class
+ should be treated like within singleton method.
-Mon Feb 28 09:03:09 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Nov 20 13:45:21 2000 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]
+ * eval.c (rb_eval): set ruby_sourceline before evaluating
+ exceptions.
-Wed Feb 23 15:04:32 2005 akira yamada <akira@ruby-lang.org>
+ * gc.c (gc_sweep): defer finalization in GC during compilation or
+ interrupt prohibit section.
- * lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
- and "pass". [ruby-dev:25667]
+ * gc.c (gc_sweep): mark all nodes before sweeping if GC happened
+ during compilation.
-Wed Feb 23 08:00:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_eval): should treat class variables specially in a
+ method defined in the singleton class.
- * array.c (rb_ary_s_create): no need for negative argc check.
- [ruby-core:04463]
+Mon Nov 20 10:20:21 2000 WATANABE Hirofumi <eban@ruby-lang.org>
- * array.c (rb_ary_unshift_m): ditto.
+ * dir.c, win32/win32.c, ruby.h: add rb_iglob().
-Wed Feb 23 01:57:46 2005 Shugo Maeda <shugo@ruby-lang.org>
+Mon Nov 20 00:18:16 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/net/imap.rb (initialize): handle certs correctly. Thanks,
- NABEYA Kenichi. (backported from CVS HEAD)
+ * array.c (rb_ary_subseq): should return nil for outbound start
+ index.
-Tue Feb 22 07:25:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (marshal_load): show format versions explicitly when
+ format version mismatch happens.
- * parse.y (parser_yylex): identfier after dot must not be a variable.
+Sun Nov 19 06:13:24 2000 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-Mon Feb 21 10:04:49 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * marshal.c: use long for string/array length.
- * {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
+ * pack.c (swaps): use bit-or(|) instead of plus(+).
- * win32/win32.[ch] (fcntl): ditto.
+ * pack.c (swapl): ditto.
- * win32/win32.c (rb_w32_connect): support nonblocking mode.
+Sat Nov 18 15:18:16 2000 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * ext/socket/socket.c (wait_connectable, ruby_connect): support
- nonblocking connect on various platforms.
- all changes are backported from CVS HEAD. [ruby-core:3154],
- [ruby-core:4364].
+ * array.c (rb_ary_replace): array size should be in long.
-Sun Feb 20 00:48:48 2005 Tanaka Akira <akr@m17n.org>
+ * array.c (rb_ary_concat): ditto.
- * lib/open-uri.rb (URI::FTP#buffer_open): access mechanism
- re-implemented according to RFC 1738.
- reported by Guillaume Marcais. [ruby-talk:131650]
+ * array.c (rb_ary_hash): ditto.
-Sat Feb 19 18:11:47 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Nov 18 14:07:20 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
- [ruby-dev:25722]
+ * lib/net/http.rb: Socket#readline() reads until "\n", not "\r\n"
- * test/drb/drbtest.rb: ditto.
+Fri Nov 17 14:55:18 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-Sat Feb 19 13:52:02 2005 Tanaka Akira <akr@m17n.org>
+ * string.c (rb_str_succ): output should be NUL terminated.
- * lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
- after connection is made.
+Fri Nov 17 02:54:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Feb 19 01:32:03 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * io.c (rb_io_close): need not to flush before closing.
- * ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
- [ruby-dev:25685]
+ * eval.c (rb_thread_join): should preserve last thread status when
+ THREAD_TO_KILL.
- * ext/bigdecimal/sample/linear.rb: ditto.
+ * eval.c (rb_thread_stop): ditto.
- * ext/bigdecimal/sample/nlsolve.rb: ditto.
+ * io.c (io_fflush): wrap fflush by TRAP_BEG, TRAP_END.
- * ext/bigdecimal/lib/bigdecimal/nlsolve.rb: removed because this file
- is sample script and same file exists in ext/bigdecimal/sample.
+ * eval.c (rb_eval): method defined within singleton class
+ definition should behave like singleton method about class
+ variables.
-Fri Feb 18 17:14:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (is_defined): ditto.
- * lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
- of StandardError class, not Exception class. [ruby-core:04429]
+Thu Nov 16 23:06:07 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu Feb 17 20:11:18 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/net/http.rb: can call {old,new}_implementation any times.
- * lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
+ * lib/net/http.rb: HTTP#connecting, receive ->
+ common_oper, connecting.
-Thu Feb 17 20:11:18 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/http.rb: output warning if u_header includes
+ duplicated header.
- * test/digest/test_digest.rb: separate test case for each algorithms.
- [ruby-dev:25412]
+ * lib/net/http.rb: not check Connection:/Proxy-Connection;
+ always read until eof.
-Thu Feb 17 11:54:00 2005 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * lib/net/protocol.rb: detects and catches "break" from block.
- * lib/test/unit/collector.rb (collect_file): now deletes paths added
- to $LOAD_PATH instead of restoring it verbatim.
+Thu Nov 16 16:32:45 2000 Masahiro Tanaka <masa@stars.gsfc.nasa.gov>
- * 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.
+ * bignum.c (bigdivrem): should have incremented ny first.
- * test/runner.rb: adjusted for new AutoRunner semantics.
+Thu Nov 16 14:58:00 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * lib/test/unit.rb: ditto.
+ * ext/socket/socket.c (sock_new): duplicates file descriptor
+ with myfddup() on mswin32/mingw32.
-Thu Feb 17 04:21:47 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * win32/win32.h: uses system original fdopen().
- * lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
- fixed: [ruby-core:04444]
+ * win32/win32.c (myfddup): newly added instead of myfdopen().
-Thu Feb 17 00:09:45 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * win32/win32.c (mybind, myconnect, mygetsockname, mygetsockopt,
+ mylisten, mysetsockopt): now accept file descriptor only, not
+ SOCKET.
- * test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
- [ruby-dev:25238]
+ * win32/win32.c (myaccept, mysocket): return file descriptor,
+ instead of SOCKET.
- * test/drb/test_drb.rb: add method DRbService.ext_service, move
- TestDRbReusePort to new file [ruby-dev:25238]
+Thu Nov 16 10:23:24 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/drb/test_drb.rb: ditto.
+ * eval.c (massign): too strict check for nameless rest argument.
- * test/drb/test_drbssl.rb: ditto.
+ * eval.c (method_arity): mere * should return -1.
- * test/drb/test_drbunix.rb: ditto.
+ * eval.c (intersect_fds): should check all FDs in the fd_set.
- * test/drb/ut_drb.rb: reduce sleep.
+Wed Nov 15 19:33:20 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Thu Feb 17 00:02:27 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_attr): should clear method cache before calling hook.
- * eval.c (is_defined): NODE_IASGN is an assignment.
+ * eval.c (rb_eval): ditto.
-Wed Feb 16 23:34:30 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * eval.c (rb_mod_modfunc): ditto.
- * lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
+Mon Nov 13 22:44:52 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/drb/extserv.rb: ditto.
+ * error.c (rb_bug): print version to stderr.
-Wed Feb 16 17:07:57 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Nov 13 19:02:08 2000 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tk/tkutil.c: Follow the change of st.c (st_foreach)
- [ruby-list:40623].
- Sometimes mis-convert from a Ruby's Array of SJIS Strings, which
- includes some kind of SJIS characters, to a Tcl's UTF8 list string.
+ * win32/win32.c, io.c, process.c: the exit status of program must be
+ multiplied 256 on mswin32 and msdosdjgpp(system(), ``).
-Mon Feb 14 23:58:17 2005 Kouhei Sutou <kou@cozmixng.org>
+Sat Nov 11 22:57:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
- fixed invalid namespace handling bug.
+ * parse.y (arg): uniformed treatment of -a**b, where a is a
+ number literal; hacky but behavior appears more consistent.
-Mon Feb 14 13:12:38 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * parse.y (newline_node): reduce newline node (one per line).
- * ext/openssl/lib/openssl/ssl.rb
- (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
+ * random.c (rb_f_srand): should be prohibited in safe level
+ greater than 4.
-Mon Feb 14 00:40:49 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Nov 11 22:37:36 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
+ * rubysig.h: do not use rb_trap_immediate on win32.
- * test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
+ * rubysig.h: new macros, ATOMIC_TEST, ATOMIC_SET, ATOMIC_INC,
+ ATOMIC_DEC, RUBY_CRITICAL and new definition of TRAP_BEG,
+ TRAP_END.
-Sun Feb 13 23:13:46 2005 Kouhei Sutou <kou@cozmixng.org>
+ * gc.c (ruby_xmalloc): should wrap malloc() by RUBY_CRITICAL.
- * lib/rss/dublincore.rb (RSS::DublicCoreModel#date{,=}): added
- convenient methods.
+ * signal.c (sighandle): better win32 sig handling.
- * lib/rss/0.9.rb (RSS::Rss::Channel#date{,=}): ditto.
+ * win32/win32.c (flock): better implementation.
- * lib/rss/2.0.rb (RSS::Rss::Channel::Item#date{,=}): ditto.
+ * win32/win32.c (myselect): ditto.
- * test/rss/: added tests for the convenient methods.
+ * win32/win32.c (myaccept): ditto.
-Sun Feb 13 22:43:03 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * win32/win32.c (waitpid): ditto.
- * lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
- config[:safe_level] ([druby-ja:120])
+ * win32/win32.c (myrename): ditto.
- * test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
+ * win32/win32.c (wait_events): support function for win32 signal
+ handling.
-Sun Feb 13 16:56:52 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat Nov 11 08:34:18 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
- to the value of status header field. ([ruby-dev:40617])
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.31.
-Sun Feb 13 00:52:33 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * lib/net/http.rb: initializes header in HTTP, not HTTPCommand.
- * lib/erb.rb (ERB::Util.h, u): make it module_function.
+ * lib/net/protocol.rb, http.rb: rewrites proxy code.
-Sat Feb 12 17:29:19 2005 Tanaka Akira <akr@m17n.org>
+Fri Nov 10 16:15:53 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/open-uri.rb (OpenURI.open_loop): send authentication only for
- the URI directly specified.
+ * numeric.c (rb_num2long): use to_int, not to_i.
-Sat Feb 12 15:07:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * error.c: T_SYMBOL was misplaced by T_UNDEF.
- * random.c (rand_init): suppress warning.
+ * parse.y (yylex): eval("^") caused infinite loop.
-Sat Feb 12 13:54:03 2005 Tanaka Akira <akr@m17n.org>
+Thu Nov 9 14:22:13 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/open-uri.rb: support https if the platform provides CA
- certificates.
+ * io.c (rb_io_taint_check): should check IO taintness; no
+ operation for untainted IO should be allowed in the sandbox.
-Sat Feb 12 06:18:28 2005 URABE Shyouhei <shyouhei@ice.uec.ac.jp>
+ * rubyio.h (GetOpenFile): check IO taintness inside using
+ rb_io_taint_check().
- * ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
- [ruby-dev:25675]
+Wed Nov 8 03:08:53 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Feb 11 17:40:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * io.c (io_fflush): ensure fflush(3) would not block by calling
+ rb_thread_fd_writable().
- * ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
- new method OpenSSL::X509::Store#set_default_paths.
+Tue Nov 7 20:29:56 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Fri Feb 11 11:33:53 2005 Tanaka Akira <akr@m17n.org>
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.30.
- * lib/open-uri.rb (URI::HTTP#proxy_open): new option supported:
- :http_basic_authentication.
- suggested by Kent Sibilev. [ruby-core:4392]
+ * lib/net/protocol.rb, smtp.rb: Command#critical_ok -> error_ok
-Fri Feb 11 06:30:07 2005 George Ogata <g_ogata@optushome.com.au>
+ * lib/net/http.rb: reads header when also "100 Continue".
- * misc/ruby-mode.el: ignore parenthesis inside heredoc.
- [ruby-core:04415]
+Tue Nov 7 04:32:19 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Feb 11 04:54:13 2005 Tilman Sauerbeck <tilman@code-monkey.de>
+ * bignum.c (bigdivrem): use bit shift to make y's MSB set.
- * lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
+Mon Nov 6 1:22:49 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rdoc/generators/ri_generator.rb: ditto.
+ * error.c (warn_print): do not use err_append(), to ensure output
+ to stderr.
-Thu Feb 10 11:14:17 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * error.c (rb_warn): use warn_print() instead of err_print().
- * win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
+ * error.c (rb_warning): ditto.
- * ext/socket/extconf.rb (sockaddr_storage): remove workaround for
- mswin32.
+ * error.c (rb_bug): ditto.
-Thu Feb 10 10:29:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_load): re-raise exceptions during load.
- * ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
- window_color_set().
+ * time.c (make_time_t): remove useless adjust
-Thu Feb 10 00:47:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Nov 2 18:01:16 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * struct.c (make_struct): fixed: [ruby-core:04402]
+ * random.c (rb_f_rand): half-baked float support fixed. This fix
+ was originally proposed by K.Kosako <kosako@sofnec.co.jp>.
-Wed Feb 9 08:07:08 2005 Paul Duncan <pabs@pablotron.org>
+Tue Oct 31 17:27:17 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/curses/curses.c (window_color_set): [ruby-core:04393]
+ * bignum.c: change digit size to `long|int' if long long is
+ available.
-Tue Feb 8 23:51:47 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * marshal.c (w_object): support `long|int' digits.
- * lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
- [druby-ja:117]
+ * marshal.c (r_object): ditto.
-Tue Feb 8 13:06:12 2005 Sam Roberts <sroberts@uniserve.com>
+Sat Oct 28 23:54:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
- [ruby-talk:130092]
+ * parse.y (yylex): allow =end at the end of file (without a
+ newline at the end).
-Tue Feb 8 09:30:01 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Oct 27 10:00:27 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
+ * bignum.c (rb_cstr2inum): should ignore trailing white spaces.
-Tue Feb 8 00:19:02 2005 Tanaka Akira <akr@m17n.org>
+ * bignum.c (rb_str2inum): string may not have sentinel NUL.
- * lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
- (Resolv::DNS::Name#inspect): ditto.
- Suggested by Sam Roberts. [ruby-talk:129086]
+Fri Oct 27 02:37:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Feb 7 10:06:30 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * bignum.c (rb_cstr2inum): wrongly assigned base to c before
+ badcheck check.
- * object.c: [ruby-doc:818]
+Thu Oct 26 02:42:50 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Mon Feb 7 01:56:20 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/net/protocol.rb: Command#critical_ok
- * instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
- rbconfig.rb. (backported from CVS HEAD)
+ * lib/net/smtp.rb: clear critical flag before go to SMTP
- * 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.
+Wed Oct 25 12:30:19 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mkmf.rb (create_makefile): should support header files in
- depend file.
+ * array.c (rb_ary_concat): replacing array might be the receiver
+ itself. do not call rb_ary_push_m.
-Mon Feb 7 01:21:50 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_replace): replacing array might be the receiver
+ itself. use memmove.
- * ext/socket/extconf.rb: check if getaddrinfo() works fine only when
- wide-getaddrinfo option is not given. fixed: [ruby-dev:25422]
+Fri Oct 20 07:56:23 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/mkmf.rb ($extmk): check if under ext directory.
+ * eval.c (rb_eval): ARGSPUSH should not modify args array.
- * lib/mkmf.rb (Logging.postpone): allow recursive operation.
+Thu Oct 19 14:58:17 2000 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * lib/mkmf.rb (try_constant): make sure if really a constant, reduce
- the number of times of compile.
+ * pack.c (NUM2U32): should use NUM2ULONG().
- * lib/mkmf.rb (have_macro, have_var, byte_order): new functions.
+Tue Oct 17 17:30:34 2000 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/mkmf.rb (find_library): allow directory list with separators.
+ * eval.c (error_print): ruby_sourcefile may be NULL.
- * lib/mkmf.rb (arg_config): manage provided configuration options.
+Tue Oct 17 16:36:28 2000 Wes Nakamura <wknaka@pobox.com>
- * lib/mkmf.rb (dir_config): accept arrays of directory names as
- default values.
+ * pack.c (NATINT_U32): wrong use of sizeof.
- * mkconfig.rb: no longer embed srcdir and compile_dir into
- rbconfig.rb.
+Tue Oct 17 12:48:20 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/mkmf.rb (create_makefile): fix unbalanced parens.
+ * eval.c (rb_abort): nil check against ruby_errinfo.
-Sun Feb 6 19:23:01 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_thread_schedule): use FOREACH_THREAD_FROM instead of
+ FOREACH_THREAD, since curr_thread may be removed from thread ring.
- * eval.c (stack_extend): add prototype because VC++8 doesn't
- accept __declspec(noinline) with K&R style function definitions.
- (backported from CVS HEAD)
+ * eval.c (THREAD_ALLOC): errinfo should be Qnil.
-Sun Feb 6 14:14:26 2005 Tadayoshi Funaba <tadf@dotrb.org>
+ * eval.c (rb_callcc): th->prev,th->next are now already
+ initialized in THREAD_ALLOC.
- * lib/date.rb (new_with_hash): changed messages of exception.
+Mon Oct 16 15:37:33 2000 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
- * lib/date/format.rb (str[fp]time): undocumented conversion
- specifications %[1-3] are now deprecated.
+ * eval.c (rb_thread_inspect): tag size was shorter than required.
-Sun Feb 6 12:20:11 2005 Akinori MUSHA <knu@iDaemons.org>
+ * object.c (rb_obj_inspect): ditto.
- * bignum.c (rb_big2ulong_pack): One too many arguments are passed
- to big2ulong().
+Mon Oct 16 14:25:18 2000 Shugo Maeda <shugo@ruby-lang.org>
- * re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
- arguments are passed to rb_reg_initialize().
+ * object.c (sym_inspect): used `name' before initialization.
-Sun Feb 6 03:24:20 2005 Tanaka Akira <akr@m17n.org>
+Mon Oct 16 14:06:00 2000 Yukihiro Matsumoto <matz@ruby-lang.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.
+ * pack.c (pack_pack): use NATINT_U32 for 'l', 'L', and 'N'.
-Fri Feb 4 00:30:45 2005 Kouhei Sutou <kou@cozmixng.org>
+ * pack.c (I32,U32): 32 bit sized integer.
- * lib/rss: supported Image module.
- http://web.resource.org/rss/1.0/modules/image/
+ * pack.c (OFF16,OFF32B): big endian offset for network byteorder.
-Thu Feb 3 23:42:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 16 06:39:32 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * 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/net/http.rb: hex-alpha is not [a-h] but [a-f].
- * ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
- extended portion. [ruby-dev:25626]
+Mon Oct 16 01:02:02 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Feb 2 23:52:53 2005 sheepman <sheepman@tcn.zaq.ne.jp>
+ * eval.c (rb_thread_start_0): should not abort on exception if
+ $SAFE >= 4.
- * ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
- part. [ruby-dev:25618]
+ * parse.y (sym): symbols for class variable names.
-Wed Feb 2 21:56:01 2005 Kouhei Sutou <kou@cozmixng.org>
+Sun Oct 15 01:49:18 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rss/rss.rb (RSS::Element#convert): added.
+ * file.c (rb_file_flock): should accept interrupt.
- * lib/rss/rss.rb: convert -> need_convert.
+ * process.c (rb_waitpid): ditto.
- * lib/rss/1.0.rb: ditto.
+ * process.c (rb_waitpid): ditto.
- * lib/rss/0.9.rb: ditto.
+ * process.c (proc_wait): ditto.
- * lib/rss/2.0.rb: ditto.
+ * process.c (proc_waitpid2): wrong recursion.
- * lib/rss/trackback.rb: ditto.
+Sat Oct 14 03:32:13 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Feb 1 22:48:48 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * eval.c (rb_thread_alloc): should not link a new thread in the
+ live thread ring before initialization.
- * lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
- _dump.
+Fri Oct 13 17:08:09 2000 Shugo Maeda <shugo@ruby-lang.org>
-Tue Feb 1 00:20:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/imap.rb: new file.
- * configure.in (aix): fix linker flags on AIX. [ruby-talk:125460]
+Thu Oct 12 18:56:28 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Mon Jan 31 13:33:21 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/pop.rb: POP3#reset
- * ext/tcltklib/tcltklib.c: add invalid namespace check
+ * lib/net/http.rb: a code for "Switch Protocol" was wrongly 100.
- * ext/tk/lib/multi-tk.rb: add invalid_namespace? method
+Thu Oct 12 01:23:38 2000 Wakou Aoyama <wakou@fsinet.or.jp>
- * ext/tk/lib/remote-tk.rb: ditto
+ * lib/cgi.rb: bug fix: CGI::html(): PRETTY option didn't work.
-Mon Jan 31 10:29:18 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Oct 12 00:03:02 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
+ * object.c (sym_inspect): should adjust string length.
-Sat Jan 29 09:42:12 2005 Sam Roberts <sroberts@uniserve.com>
+ * struct.c (rb_struct_to_s): ditto.
- * lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
- resource record for specifying location of services.
+ * struct.c (rb_struct_inspect): ditto.
-Fri Jan 28 17:16:55 2005 Tanaka Akira <akr@m17n.org>
+Wed Oct 11 22:15:47 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * 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.
+ * eval.c (rb_thread_inspect): should adjust string length.
-Thu Jan 27 13:18:03 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * object.c (rb_any_to_s): ditto.
- * st.c (st_foreach): report success/failure by return value.
- [ruby-Bugs-1396]
+ * object.c (rb_obj_inspect): ditto.
-Thu Jan 27 00:15:29 2005 Minero Aoki <aamine@loveruby.net>
+Wed Oct 11 18:13:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/fileutils/test_fileutils.rb (setup): support BSD-style
- directory group inheritance. (backport from HEAD, rev 1.32)
+ * eval.c (rb_thread_start_0): should check insecure exit.
- * test/fileutils/fileasserts.rb (assert_same_entry): show entry
- difference. (backport from HEAD, rev 1.4)
+Wed Oct 11 14:29:51 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Wed Jan 26 23:09:11 2005 Minero Aoki <aamine@loveruby.net>
+ * lib/net/protocol.rb: 2nd arg for ProtocolError#initialize is
+ optional.
- * lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
- prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
+ * lib/net/http.rb: code refining.
-Wed Jan 26 10:51:50 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Oct 11 11:13:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/win32.c (flock_winnt, flock_win95): unlock file even if
- LOCK_NB is specified. (backported from CVS HEAD)
+ * parse.y (primary): setter method (e.g. foo=) should always be
+ public.
-Tue Jan 25 17:11:51 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_thread_raise): should not raise SecurityError if
+ exception raised by the interpreter.
- * ruby.c (proc_options): correct -T option in RUBYOPT. (backported
- from CVS HEAD)
+ * eval.c (rb_thread_cleanup): skip all THREAD_KILLED threads
+ before FOREACH_THREAD.
-Tue Jan 25 14:05:52 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Oct 10 16:11:54 2000 WATANABE Hirofumi <eban@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]
+ * dln.c (dln_load): remove unused code for cygwin.
- * ext/tcltklib/extconf.rb: bug fix; TCL_ENABLE_THREAD flag is inverted
- [ruby-talk:126360]
+Tue Oct 10 09:49:23 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tcltklib/extconf.rb: add yet another native-thread check
+ * file.c (Init_File): FileTest.size should return 0 (not nil) for
+ empty files.
- * ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize
- Ruby interpreter
+Sun Oct 8 13:20:26 2000 Guy Decoux <decoux@moulon.inra.fr>
- * ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip frame
+ * eval.c (POP_SCOPE): not just set SCOPE_DONT_RECYCLE, but do
+ scope_dup().
- * ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag
- doesn't return the created object [ruby-dev:25479]
+Sat Oct 7 15:10:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
+ * string.c (rb_str_reverse_bang): unnecessary ALLOCA_N() was
+ removed.
- * ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
- a command argument [ruby-dev:25479]
+Fri Oct 6 14:50:24 2000 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/tk/lib/multi-tk.rb: ditto
+ * ext/extmk.rb.in, lib/mkmf.rb: remove "DESTDIR =".
- * ext/tk/lib/tk/*.rb: ditto
+ * Makefile.in, win32/Makefile.sub, ruby.1: renamed -X to -C.
- * ext/tk/lib/tkextlib/*.rb: ditto
+Fri Oct 6 12:50:52 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/sample/demos-jp/anilabel.rb: new demo script
+ * array.c (rb_ary_plus): use to_ary(), not Check_Type().
- * ext/tk/sample/demos-en/anilabel.rb: ditto
+ * array.c (rb_ary_concat): ditto.
- * ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
- [ruby-dev:25479]
+ * gc.c (rb_gc): use __builtin_frame_address() for gcc.
-Mon Jan 24 15:44:25 2005 Tilman Sauerbeck <tilman@code-monkey.de>
+ * eval.c (stack_length): ditto.
- * lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
- [ruby-core:4296]
+ * parse.y (assign_in_cond): stop warning till some better warning
+ condition will be found.
- * lib/rdoc/parsers/parse_simple.rb: adds support for private comments
- in the "simple" parser. [ruby-core:4301]
+Thu Oct 5 18:02:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 24 15:44:25 2005 Charles Mills <cmills@freeshell.org>
+ * object.c (rb_obj_dup): should have propagated taint flag.
+ (ruby-bugs:#PR64,65)
- * 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]
+Wed Oct 4 00:26:11 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 24 15:44:25 2005 Florian Gro <florgro@gmail.com>
+ * eval.c (proc_arity): proc{|a|}'s arity should be -1.
- * lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
- [ruby-core:4302]
+Mon Oct 2 05:28:58 2000 akira yamada <akira@ruby-lang.org>
-Mon Jan 24 15:44:25 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (trnext): minus at the end of pattern.
- * document updates - [ruby-core:04296], [ruby-core:04301],
- [ruby-core:04302], [ruby-core:04307]
+Sun Oct 1 00:43:34 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-Sun Jan 23 12:41:16 2005 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * configure.in: exp-name was wrong on cygwin and mingw32.
- * 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.
+Thu Sep 28 14:57:09 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- define capitalized method as well under that circumstance.
+ * regex.c (re_compile_pattern): should try must_string calculation
+ every time.
-Sun Jan 23 05:24:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Sep 19 23:47:44 2000 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
- * ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
- GetOCSPReq at first.
+ * configure.in, config.guess, config.sub: MacOS X support.
-Sat Jan 22 23:09:47 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Sep 27 18:40:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
+ * stable version 1.6.1 released.
-Sat Jan 22 22:35:03 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Sep 27 16:13:05 2000 WATANABE Hirofumi <eban@ruby-lang.org>
- * lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
+ * mkconfig.rb: variables should be expanded only if /\$\{?\w+\}?/.
-Fri Jan 21 23:58:42 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Sep 26 18:09:51 2000 WATANABE Hirofumi <eban@ruby-lang.org>
- * ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
- [ruby-talk:127511]
+ * string.c: include <math.h>
-Fri Jan 21 20:07:02 2005 Tanaka Akira <akr@m17n.org>
+Tue Sep 26 15:59:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
- reported by Sam Roberts. [ruby-talk:127133]
+ * object.c (rb_mod_dup): metaclasses of class/module should not be
+ cleared by rb_obj_dup.
-Fri Jan 21 16:58:10 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Sep 26 02:44:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * dir.c (rb_push_glob): should work for NUL delimited patterns.
+ * gc.c (GC_MALLOC_LIMIT): size extended.
-Fri Jan 21 13:58:37 2005 Shugo Maeda <shugo@ruby-lang.org>
+ * regex.c (DOUBLE_STACK): use machine's stack region for regex
+ stack if its size is small enough.
- * lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
- (backported from CVS HEAD)
+Mon Sep 25 18:13:07 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Jan 21 09:30:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regex.c: include <defines.h>.
- * rubyio.h (rb_eof_error): should mark as NORETURN. (backported
- from CVS HEAD)
+ * eval.c (rb_add_method): cache mismatch by method
+ definition. need to clear_cache_by_id every time.
-Fri Jan 21 00:31:36 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Mon Sep 25 13:31:45 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
- "local variable 'size' used without having been initialized".
+ * win32/win32.c (NtCmdGlob): substitute '\\' with '/'.
-Thu Jan 20 19:03:24 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Sep 25 00:35:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
+ * defines.h: #undef HAVE_SETITIMER on cygwin.
- * win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
- $EXTOBJS.
- fixed: [ruby-core:04290] (backported from CVS HEAD)
+Sun Sep 24 03:01:53 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu Jan 20 11:42:02 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/protocol.rb, http.rb: typo.
- * string.c (rb_str_new4): should propagate taintedness.
+Sat Sep 23 07:33:20 2000 Aleksi Niemela <aleksi.niemela@cinnober.com>
- * struct.c (rb_struct_set): use original method name, not callee
- name, to retrieve member slot. [ruby-core:04268]
+ * regex.c (re_compile_pattern): nicer regexp error messages for
+ invalid patterns.
- * time.c (time_strftime): protect from format modification from GC
- finalizers.
+Sat Sep 23 03:06:25 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Jan 19 18:06:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * variable.c (rb_autoload_load): should not require already
+ provided features.
- * lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
- (backported from CVS HEAD)
+Fri Sep 22 15:46:21 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
+ * lib/net/http.rb: too early parameter expansion in string.
- * lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
- domain and search directive without an argument.
- reported by Sam Roberts. [ruby-talk:126781]
+Fri Sep 22 13:58:51 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Tue Jan 18 15:03:05 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/extmk.rb.in: don't use default $:
- * lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
- of :SSLEnable is false.
+Fri Sep 22 13:42:50 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
- don't allow changing its mode.
+ * regex.c (PUSH_FAILURE_COUNT): avoid casting warning on alpha.
- * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
- should delete trailing LF from the result of pack("m*").
+ * regex.c (PUSH_FAILURE_POINT): ditto.
- * 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.
+Fri Sep 22 10:16:21 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
- refine regexp (and change the name of a local variable).
+ * win32/config.h.in: add HAVE_TELLDIR, HAVE_SEEKDIR
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
- new method to escape URI path component.
+Thu Sep 21 19:04:34 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
- escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
+ * ext/extmk.rb, lib/mkmf.rb (install_rb): check whether libdir is
+ directory or not.
- * test/webrick/*, sample/webrick/httpproxy.rb: add new file.
+Thu Sep 21 17:23:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 17 23:33:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (rb_file_s_symlink): use HAVE_SYMLINK.
- * configure.in (aix): fix typo. [ruby-talk:126401]
+ * file.c (rb_file_s_readlink): use HAVE_READLINK.
-Mon Jan 17 07:08:51 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (dir_tell): use HAVE_TELLDIR.
- * ext/readline/readline.c: suppress warnings.
+ * dir.c (dir_seek): use HAVE_SEEKDIR.
- * lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
- ditto.
+ * configure.in (AC_CHECK_FUNCS): lstat, symlink, readlink,
+ telldir, seekdir checks added.
- * lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
+ * file.c (lstat): should use stat(2) if lstat(2) is not
+ available.
- * lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
+Thu Sep 21 15:59:23 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/irb/locale.rb (IRB::Locale::real_load): ditto.
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.29.
- * lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
+ * lib/net/http.rb: HTTPReadAdapter -> HTTPResponseReceiver
-Mon Jan 17 00:09:42 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+ * lib/net/http.rb (connecting): response is got in receive()
- * lib/uri/common.rb (PORT): typo fix. fixed: [ruby-core:04256]
+Thu Sep 21 15:49:07 2000 Wayne Scott <wscott@ichips.intel.com>
-Sat Jan 15 14:57:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/find.rb (find): should not follow symbolic links;
+ tuned performance too.
- * ruby.c (proc_options): ignore trailing CRs at the end of short
- options as well as long options. fixed: [ruby-core:04232]
+Wed Sep 20 23:21:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jan 15 13:35:16 2005 Kouhei Sutou <kou@cozmixng.org>
+ * ruby.c (load_file): two Ctrl-D was required to stop ruby at the
+ beginning of stdin script read.
- * lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
+Wed Sep 20 14:01:45 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
+ * eval.c (rb_provided): detect infinite load loop.
-Thu Jan 13 04:48:53 2005 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_provided): too weak filename comparison.
- * io.c (io_fread): don't warn nonblocking behavior by default.
+ * eval.c (rb_thread_alloc): avoid recycling still referenced
+ dvar structures.
-Wed Jan 12 00:36:29 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_callcc): ditto.
- * object.c (rb_class_superclass): superclass of singleton class also
- should be a singleton class. fixed: [ruby-list:40519]
+ * eval.c (THREAD_ALLOC): fiil dyna_vars field by ruby_dyna_vars.
-Tue Jan 11 09:44:40 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Sep 19 17:47:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * numeric.c (Init_Numeric): turn off floating point exceptions
- on bcc32. "1e300".to_f had crashed by overflow.
+ * stable version 1.6.0 released.
-Tue Jan 11 03:10:10 2005 Minero Aoki <aamine@loveruby.net>
+Tue Sep 19 16:24:52 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/fileutils.rb (copy_entry): could not copy symbolic link.
- [ruby-talk:125733]
+ * marshal.c (Init_marshal): provide marshal.so no more.
- * lib/fileutils.rb (copy_stream): use read/write instead of
- sysread/syswrite.
+Tue Sep 19 14:01:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Mon Jan 10 23:08:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in, win32/setup.mak: include version number
+ in RUBY_SO_NAME.
- * variable.c (rb_autoload): hide internal data from ruby level.
- fixed: [ruby-dev:25435], [ruby-list:40498]
+Tue Sep 19 13:07:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 10 01:22:55 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (yylex): was confusing $~ and $_.
- * gc.c (rb_data_object_alloc): klass may be NULL.
- [ruby-list:40498]
+Tue Sep 19 13:06:53 2000 GOTOU YUUZOU <gotoyuzo@notwork.org>
-Sun Jan 9 03:12:58 2005 Tanaka Akira <akr@m17n.org>
+ * signal.c (rb_f_kill): signum may be a negative number, should be
+ treated by signed number.
- * io.c (io_fread): warn nonblocking behavior.
- (io_readpartial): new method IO#readpartial.
+Tue Sep 19 01:14:56 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jan 8 04:38:47 2005 why the lucky stiff <why@ruby-lang.org>
+ * eval.c (rb_provide): better feature handling.
- * lib/yaml.rb: Kernel#y requires an argument.
+ * eval.c (rb_f_require): loading ruby library may be partial
+ state. checks in rb_thread_loading is integrated.
-Fri Jan 7 21:12:29 2005 TAMURA Takashi <sheepman@tcn.zaq.ne.jp>
+ * eval.c (rb_provided): better thread awareness.
- * random.c (rand_init): use ALLOC_N instead of ALLOCA_N
- [ruby-dev:25426]
+ * lib/irb/frame.rb: 6 (not 5) parameters for trace_func proc.
-Fri Jan 7 18:03:35 2005 Tanaka Akira <akr@m17n.org>
+ * eval.c (error_print): should print error position even if
+ get_backtrace() failed.
- * gc.c (mark_locations_array): avoid core dump with -O3.
- [ruby-dev:25424]
+Sat Sep 16 03:29:59 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Jan 6 20:31:07 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_f_require): rb_provided() was called too early; does
+ not work well with threads.
- * ext/zlib/zlib.c (zstream_end): should return value. (backported
- from CVS HEAD)
+ * parse.y (ensure): should distinguish empty ensure and non
+ existing ensure.
-Thu Jan 6 19:55:13 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * file.c (Init_File): extending File by class of FileTest was
+ serious mistake.
- * win32/win32.c (rb_w32_close): didn't close socket handle.
- [ruby-dev:25414]
+Thu Sep 14 02:46:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
- never set EMFILE.
+ * eval.c (rb_thread_yield): array strip should be done in this
+ function.
-Thu Jan 6 17:14:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Sep 13 17:01:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * random.c (random_seed): O_NONBLOCK isn't defined on some
- platforms. [ruby-dev:25417]
+ * bignum.c (rb_big_eq): incomplete value comparison of bignums.
-Thu Jan 6 13:45:35 2005 Tanaka Akira <akr@m17n.org>
+Wed Sep 13 06:39:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/time.rb: recognize +00:00 and GMT as a localtime.
+ * variable.c (rb_mod_class_variables): Module#class_variables added.
-Thu Jan 6 07:58:28 2005 Dave Thomas <dave@pragprog.com>
+Wed Sep 13 06:09:26 2000 Wakou Aoyama <wakou@fsinet.or.jp>
- * lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
- in path names on DOS machines. (thanks to Johan Nilsson)
+ * lib/cgi.rb: bug fix: CGI::header(): output status header.
-Wed Jan 5 20:16:32 2005 Tanaka Akira <akr@m17n.org>
+Wed Sep 13 01:09:12 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
- [ruby-dev:25408]
+ * parse.y (yylex): allow global variables like '$__a'.
- * random.c (random_seed): refined.
+Tue Sep 12 22:28:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Wed Jan 5 12:49:39 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/extconf.rb: avoid using terrible <netinet/tcp.h>
+ on cygwin 1.1.5.
- * eval.c (rb_thread_initialize): Thread objects cannot be initialized
- again. fixed: [ruby-core:04067]
+Tue Sep 12 16:01:58 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Wed Jan 5 10:48:16 2005 NAKAMURA Usaku <usa@ruby-lang.org>
+ * array.c (rb_ary_unshift_m): typo.
- * dir.c (dir_s_mkdir): win32 special processing doesn't need any
- longer. (backported from CVS HEAD)
+Tue Sep 12 15:37:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
- interface. (backported from CVS HEAD)
+ * eval.c (rb_yield_0): stripped array too much, should remove just
+ for proc_call().
- * win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
- HEAD)
+Tue Sep 12 07:05:24 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-Wed Jan 5 02:30:11 2005 Tanaka Akira <akr@m17n.org>
+ * lib/cgi.rb: version 2.0.0: require ruby1.5.4 or later.
- * 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]
+ * lib/net/telnet.rb: version 1.6.0
-Tue Jan 4 23:25:29 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Sep 12 03:26:07 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * bignum.c (rb_big_rand): should return positive random number.
- [ruby-dev:25401]
+ * eval.c (massign): use to_ary to get an array if available.
-Tue Jan 4 11:15:29 2005 TAMURA Takashi <sheepman@tcn.zaq.ne.jp>
+ * object.c (rb_Array): ditto.
- * bignum.c (rb_big_rand): do not use rb_big_modulo to generate
- random bignums. [ruby-dev:25396]
+Mon Sep 11 14:24:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Jan 3 14:01:54 2005 Tanaka Akira <akr@m17n.org>
+ * hash.c (ruby_setenv): should not free the element of
+ origenvironment.
- * random.c (random_seed): don't use /dev/urandom if it is not
- character device.
+ * parse.y (command_call): kYIELD moved to this rule to allow
+ 'a = yield b'. (ruby-bugs-ja:#PR15)
-Mon Jan 3 11:37:42 2005 Tanaka Akira <akr@m17n.org>
+Mon Sep 11 01:27:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * random.c (random_seed): use /dev/urandom if available.
- [ruby-dev:25392]
+ * eval.c (rb_yield_0): proc#call([]) should pass single value to
+ the block.
-Mon Jan 3 07:46:42 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (callargs): reduce array allocation.
- * 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]
+ * eval.c (massign): precise check for argument number.
- * lib/webrick/httpauth/digestauth.rb
- (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
- This patch is contributed by sheepman. [ruby-list:40482]
+Fri Sep 8 10:05:17 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * 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]
+ * gc.c (STR_NO_ORIG): should be FL_USER2.
- * test/webrick/test_httpauth.rb: new file.
+Thu Sep 7 14:17:51 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jan 1 04:20:23 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * string.c (rb_str_cat): should work even for concatenating same
+ string.
- * ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
- StringValue before GetSPKI. fixed: [ruby-dev:25359].
+Wed Sep 6 17:06:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Sat Jan 1 01:13:28 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * variable.c (rb_cvar_declare): should check superclass's class
+ variable first.
- * variable.c (rb_autoload): [ruby-dev:25373]
+Wed Sep 6 10:42:02 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Dec 31 14:10:43 2004 Dave Thomas <dave@pragprog.com>
+ * misc/ruby-mode.el (ruby-calculate-indent): shift continuing line
+ if previous line ends with modifier keyword.
- * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
- if heading contains formatting.
+ * misc/ruby-mode.el (ruby-parse-region): should not give up if
+ modifiers are at the end of line.
-Thu Dec 30 00:41:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-expr-beg): indented wrongly if modified
+ statement was size 1.
- * eval.c (svalue_to_avalue): [ruby-dev:25366]
+Wed Sep 6 10:41:19 2000 Kenichi Komiya <kom@mail1.accsnet.ne.jp>
- * string.c (rb_str_justify): [ruby-dev:25367]
+ * misc/ruby-mode.el (ruby-parse-region): modifier was not handled
+ well on emacs19.
-Wed Dec 29 11:07:07 2004 Dave Thomas <dave@pragprog.com>
+Tue Sep 5 17:10:12 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/rdoc/generators/template/html/kilmer.rb: Update to use new
- sections.
+ * time.c (time_to_s): fixed zone string UTC for utc time object.
-Tue Dec 28 22:31:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Sep 5 00:26:06 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * string.c (rb_str_justify): create buffer string after argument type
- conversion. fixed: [ruby-dev:25341]
+ * regex.c (re_search): range worked wrongly on bm_search().
-Tue Dec 28 15:41:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Sep 4 13:40:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
- variables. fixed: [ruby-list:40445]
+ * configure.in: renamed libruby.a to libruby.{cygwin,mingw32}.a
+ on cygwin and mingw32.
-Tue Dec 28 15:25:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Sep 3 23:44:04 2000 Noriaki Harada <tenmei@maoh.office.ne.jp>
- * ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
- 0xfe.
+ * io.c (NO_SAFE_RENAME): for BeOS too.
- * ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
- properly.
+Sun Sep 3 11:31:53 2000 Takaaki Tateishi <ttate@jaist.ac.jp>
-Tue Dec 28 13:35:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (rescue): no assignment was done if rescue body was
+ empty.
- * ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
- freeing internal zstreams. fixed: [ruby-dev:25309]
+Sat Sep 2 10:52:21 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
+ * parse.y (call_args,aref_args): block_call can be the last
+ argument.
-Tue Dec 28 12:26:45 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * parse.y (COND_PUSH,COND_POP): maintain condition stack to allow
+ kDO2 in parentheses in while/until/for conditions.
- * win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
- install-nodoc, install-doc): rdoc support for mswin32.
+ * parse.y (yylex): generate kDO2 for EXPR_ARG outside of
+ while/until/for condition.
- * win32/configure.bat (--enable-install-doc, --disable-install-doc):
- ditto.
+Fri Sep 1 10:36:29 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Dec 27 20:02:14 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * parse.y (aref_args,opt_call_args): add block_call to allow a
+ method without parentheses and with block as a last argument.
- * ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
+ * hash.c (rb_hash_sort): should not return nil.
- * ext/tk/lib/multi-tk.rb: ditto
+ * re.c (match_aref): should use rb_reg_nth_match().
-Mon Dec 27 16:55:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (POP_SCOPE): recycled scopes too much
- * ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
- rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
+ * eval.c (Init_eval): extend room for stack allowance.
-Mon Dec 27 16:29:56 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (POP_SCOPE): frees scope too much.
- * string.c (rb_str_justify): [ruby-dev:25341]
+Thu Aug 31 14:28:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Dec 27 15:47:48 2004 Minero Aoki <aamine@loveruby.net>
+ * gc.c (rb_gc_mark): T_SCOPE condition must be more precise.
- * test/fileutils/fileasserts.rb: sync with HEAD.
+ * eval.c (scope_dup): should not make all duped scope orphan.
- * test/fileutils/test_fileutils.rb: ditto.
+Thu Aug 31 10:11:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * test/fileutils/test_nowrite.rb: ditto.
+ * parse.y (stmt): allow stmt_rhs to be right hand side of multiple
+ assignment.
-Mon Dec 27 15:21:07 2004 Minero Aoki <aamine@loveruby.net>
+ * time.c (rb_time_timeval): type error should not mention the word
+ 'interval'.
- * lib/fileutils.rb (mv): should raise error when moving a
- directory to the (empty) directory. [ruby-talk:124368]
- (backport from HEAD 1.48)
+Wed Aug 30 23:21:20 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
- platforms. (backport from HEAD 1.48)
+ * numeric.c (rb_num2long): use rb_Integer() instead of independent
+ convert routine.
-Sat Dec 25 11:11:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_rescue2): now takes arbitrary number of exception types.
- * stable version 1.8.2 released.
+ * object.c (rb_convert_type): use rb_rescue2 now to handle NameError.
-Sat Dec 25 04:23:49 2004 Minero Aoki <aamine@loveruby.net>
+ * object.c (rb_convert_type): better error message.
- * lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
- permission. (backportted from HEAD, 1.47)
+Wed Aug 30 17:09:14 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/fileutils.rb (traverse, remove_dir): untaint trasted
- objects. (backportted from HEAD, 1.46)
+ * ext/Win32API/Win32API.c (Win32API_initialize): AlphaNT support.
-Sat Dec 25 01:28:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Aug 30 14:19:07 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c: cancel io_reopen() change on Dec. 24th.
+ * parse.y (node_assign): should support NODE_CVASGN2 too.
- * dln.c: use <dlfcn.h> for NetBSD. [ruby-dev:25313]
+Wed Aug 30 11:31:47 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * io.c (rb_f_select): IO list could be altered. [ruby-dev:25312]
+ * ext/Win32API/Win32API.c (Win32API_initialize): add the
+ arguments checking.
-Fri Dec 24 23:51:48 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * ext/Win32API/Win32API.c (Win32API_initialize): add taint
+ checking. allow String object in the third argument.
- * bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
- [ruby-dev:25306]
+Wed Aug 30 10:29:40 2000 Masahiro Tomita <tommy@tmtm.org>
- * win32/win32.[ch]: ditto.
+ * io.c (rb_f_p): flush output buffer.
-Fri Dec 24 23:27:18 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Aug 29 16:29:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
+ * parse.y (assignable): remove NODE_CVASGN3.
-Fri Dec 24 18:39:25 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * parse.y (gettable): remove NODE_CVAR3.
- * win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
- [ruby-dev:25306]
+Tue Aug 29 02:02:14 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Fri Dec 24 02:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb (create_makefile): handles create_makefile("a/b").
- * io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
- special IO ports. [ruby-dev:25225]
+ * ext/extmk.rb.in (create_makefile): ditto
-Fri Dec 24 02:22:53 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Aug 28 18:43:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
+ * eval.c (is_defined): now handles class variables.
- * ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
+ * eval.c (rb_eval): class variable behavior revisited.
- * ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
- typing.
+ * parse.y (assignable): ditto.
- * ext/syck/rubyext.c (syck_parser_s_alloc, syck_parser_initialize):
- allocation framework.
+ * parse.y (gettable): ditto.
- * ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
- ditto.
+ * regex.c (PUSH_FAILURE_COUNT): push/pop interval count on failure
+ stack. this fix is inspired by the Emacs21 patch from Stefan
+ Monnier <monnier@cs.yale.edu>.
-Fri Dec 24 01:21:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Fri Aug 25 15:24:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tkextlib/blt.rb: add BLT extension support
+ * variable.c (rb_cvar_get): should not follow __attached__.
- * ext/tk/lib/tkextlib/blt/*.rb: ditto
+ * variable.c (rb_cvar_set): ditto.
- * ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
+ * variable.c (rb_cvar_declare): ditto.
-Thu Dec 23 23:36:28 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * variable.c (mod_av_set): second class variable assignment at the
+ toplevel should not give warning.
- * process.c (proc_setgroups): check if the argument lenght is
- modified. fixed: [ruby-dev:25285]
+Fri Aug 25 01:18:36 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Thu Dec 23 13:13:33 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * io.c (next_argv): prepare path for open file.
- * ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
- RELEASE_DATE
+ * string.c (rb_str_setter): moved from io.c.
- * ext/tcltklib/extconf.rb: ditto
+ * io.c (next_argv): filename should be "-" for refreshed ARGF.
- * ext/tk/tkutil.c: define TkUtil::RELEASE_DATE
+Thu Aug 24 15:27:39 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
+ * ext/socket/socketport.h: use `extern int h_errno' if needed.
-Thu Dec 23 09:38:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Aug 19 01:34:02 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * io.c (io_reopen): restore exact mode. fixed: [ruby-core:04003]
+ * ext/sdbm/_sdbm.c (sdbm_prep): flags should be or-ed by O_BINARY on
+ Win32 too.
-Thu Dec 23 00:16:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/sdbm/_sdbm.c (makroom): fill hole with 0 on Win32 too.
- * configure.in (bsdi): use $(CC) for LDSHARED. fixed [ruby-dev:25270]
+Fri Aug 18 13:23:59 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Wed Dec 22 11:14:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_eval): should preserve and clear $! value before
+ compilation.
- * io.c (rb_io_mode_modenum): replace O_ACCMODE with O_RDWR.
- fixed: [ruby-dev:25273]
+ * eval.c (eval): ditto.
-Wed Dec 22 08:34:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Aug 18 11:06:19 2000 Shugo Maeda <shugo@ruby-lang.org>
- * ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
- all argument conversion. fixed: [ruby-dev:25271]
+ * ext/socket/socket.c (s_accept): start GC on EMFILE/ENFILE.
-Wed Dec 22 00:08:01 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Thu Aug 17 16:04:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
+ * eval.c (is_defined): should clear ruby_errinfo.
-Tue Dec 21 22:07:33 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Aug 17 04:26:31 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
- ossl_asn1_decode_all): temporary value should be marked volatile.
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.27.
-Tue Dec 21 14:40:02 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * lib/net/protocol.rb: writing methods returns written byte size.
- * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
- ossl_asn1_decode_all): use rb_str_new4 to avoid SEGV.
- fix [ruby-dev:25261]
+ * lib/net/smtp.rb: send_mail accepts many destinations.
- * test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
+Wed Aug 16 00:43:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Dec 21 12:22:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_s_times): use CLK_TCK for HZ if it's defined.
- * io.c (io_reopen): keep duplex pipe in correct mode for exception
- safeness. fixed: [ruby-dev:25152]
+Tue Aug 15 17:30:59 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Tue Dec 21 12:10:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (frame_dup): should set flag FRAME_MALLOC after
+ argv allocation.
- * ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
+ * eval.c (blk_free): should not free argv if GC was called before
+ frame_dup.
-Tue Dec 21 00:53:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Aug 15 16:08:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
+ * configure.in: add ac_cv_func_times=yes for mingw32.
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
+ * win32/win32.c (mytimes): typo.
- * ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
+Tue Aug 15 01:45:28 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-Mon Dec 20 23:22:26 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * io.c (argf_eof): should return true at the end of ARGF without
+ checking stdout if arguments are given.
- * added files:
- * lib/soap/mapping/wsdl*.rb
- * lib/wsdl/soap/element.rb
- * lib/wsdl/xmlSchema/simpleContent.rb
+Mon Aug 14 10:34:32 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * modified files:
- * lib/soap/*
- * lib/wsdl/*
- * lib/xsd/*
- * test/soap/*
- * test/wsdl/*
- * test/xsd/*
- * sample/soap/*
- * sample/sdl/*
+ * eval.c (rb_thread_status): status should return false for normal
+ termination, nil for termination by exception.
- * summary
- * imported from the soap4r repository. Version: 1.5.3-ruby1.8.2
+Fri Aug 11 15:43:46 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * added several XSD basetype support: nonPositiveInteger,
- negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
- unsignedShort, unsignedByte, positiveInteger
+ * eval.c (rb_undef): give warning for undefining __id__, __send__.
- * HTTP client connection/send/receive timeout support.
+Thu Aug 10 08:05:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * HTTP client/server gzipped content encoding support.
+ * eval.c (rb_callcc): returned current thread instead of
+ continuation wrongly.
- * improved WSDL schema definition support; still is far from
- complete, but is making step by step improovement.
+Thu Aug 10 05:40:28 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Mon Dec 20 22:56:39 2004 Tanaka Akira <akr@m17n.org>
+ * ext/extmk.rb.in: $CPPFLAGS should be initialized.
- * gc.c (stack_end_address): gcc noinline attribute is available since
- gcc-3.1.
+ * ext/tcltklib/depend: add stubs.o.
-Mon Dec 20 14:07:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * ext/tcltklib/extconf.rb: use $CPPFLAGS instead of $CFLAGS.
- * ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2
+Wed Aug 9 16:31:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * ext/tk/lib/tk/clock.rb: ditto
+ * eval.c (rb_callcc): thread status for continuations must be
+ THREAD_KILLED, otherwise thread_free() breaks other threads.
- * ext/tk/lib/tk/text.rb: ditto
+Wed Aug 9 13:24:25 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk/panedwindow.rb: ditto
+ * win32/win32.[ch]: emulate rename(2).
-Mon Dec 20 12:47:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Aug 8 14:01:46 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
- doc and code about SSLContext#{key_file,cert_file}.
- fixed: [ruby-dev:25243]
+ * ext/tcltklib/tcltklib.c: support --enable-tcltk_stubs
-Mon Dec 20 12:42:17 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tcltklib/extconf.rb: ditto.
- * io.c (io_fwrite): workaround for MSVCRT's bug.
- fixed: [ruby-core:03982]
+ * ext/tcltklib/stubs.c: created. examine candidate shared libraries.
-Mon Dec 20 11:21:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Aug 7 13:59:12 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
- * io.c (rb_io_eof): check if closed before clearerr().
- fixed: [ruby-dev:25251]
+ * ruby.h (CLONESETUP): should copy flags before any potential
+ object allocation.
-Mon Dec 20 03:30:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_match): check for stack depth was needed.
- * lib/cgi/session.rb (CGI::Session#initialize): empty session id was
- used if request had no session key. fixed: [ruby-core:03981]
+Sat Aug 5 16:43:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Mon Dec 20 01:51:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * djgpp/*: convert DOS line endings to UNIX style.
- * struct.c (make_struct): [ruby-dev:25249]
+ * djgpp/config.status: rename to config.sed for SFN.
-Mon Dec 20 00:28:20 2004 Kouhei Sutou <kou@cozmixng.org>
+ * lib/ftools.rb (compare, safe_unlink, chmod): avoid warnings.
- * lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
+ * lib/ftools.rb (move): typo. not `tpath', but `to'.
- * lib/rexml/encodings/SHIFT_JIS.rb: ditto.
+Fri Aug 4 23:26:48 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Dec 19 17:19:48 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (proc_call): gives warning if a block is supplied.
- * ext/openssl/ossl_x509store.c
- (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
- (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
+ * eval.c (rb_eval): no warning for discarding if an alias for the
+ method is already made.
- * test/openssl/ossl_x509store.rb: test certificate validity times.
+Fri Aug 4 16:32:29 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
- second argument to specify the output format (see also
- X509_NAME_print_ex).
+ * array.c (rb_ary_reject_bang): returns nil if no element removed.
- * ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
- OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
- OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
+ * hash.c (rb_hash_reject_bang): returns nil if no element removed.
- * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
- new module to provide the parse for RFC2253 DN format.
+Thu Aug 3 19:44:26 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
- new method to parse RFC2253 DN format.
+ * eval.c (rb_thread_fd_writable): should return integer value.
- * test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
+ * array.c (rb_ary_assoc): search array element whose length is
+ longer than 0 (not 1).
- * text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
- while EADDRINUSE is raised.
+Wed Aug 2 18:27:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * all changes in this entry are backport from 1.9.
+ * eval.c (rb_thread_wait_fd): prohibit thread context switch
+ during compilation.
-Sun Dec 19 17:24:59 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_cont_call): prohibit Continuation#call across threads.
- * configure.in (enable_rpath): use rpath flag to embed the library
- path into extensions on ELF environment. [ruby-dev:25035]
+Wed Aug 2 08:22:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Dec 19 11:01:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (rb_gc): clear malloc_memories to zero, to avoid potential
+ super frequent GC invocation. (ruby-bugs:#PR48)
- * lib/test/unit.rb: use standalone runner for -e.
+ * gc.c (rb_gc): only add_heap() if GC trigger condition is
+ satisfied.
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept
- multiple -p and -x options.
+Tue Aug 1 16:41:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect):
- ditto.
+ * ruby.c (proc_options): global load path setting moved from
+ ruby_prog_init().
-Sat Dec 18 16:36:23 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c (incpush): renamed. push path entry at the END of the
+ load path array. This makes -I directories sorted in order in
+ the arguments.
- * ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
- disallow interrupt by type conversion. fixed: [ruby-dev:25226]
+Sat Jul 29 23:42:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Dec 18 15:16:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * dir.c (dir_each): should check whether dir is closed during the
+ block execution. (ruby-bugs:#PR47)
- * 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 Jul 29 21:57:30 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sat Dec 18 10:51:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ruby.c (rubylib_mangle): provide another buffer for the result.
- * dir.c (dir_open_dir): new function. [ruby-dev:25242]
+Wed Jul 26 10:09:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Dec 17 18:07:01 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * configure.in: set SOLIBS to LIBS on Cygwin.
- * test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
- fixed: [ruby-dev:25218]
+ * configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'.$target_os.dll
+ on cygwin and mingw32. ruby-cygwin.dll is bad. why?
-Fri Dec 17 16:28:12 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed Jul 26 10:04:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb: fix bug on setting up system encoding
+ * gc.c (gc_sweep): avoid full scan during compilation.
- * ext/tk/lib/tk/event.rb: fix error on require process
+ * gc.c (rb_gc): add heap during no gc period (including
+ compilation).
- * ext/tk/lib/tk/font.rb: fix abnormal termination error on Windows
+Tue Jul 25 19:03:04 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk/virtevent.rb: TkVirtualEvent::PreDefVirtEvent.new()
- accepts event-sequence arguments
+ * cygwin/GNUmakefile: use puts instead of print, because
+ Cygwin DLL's behavior is changed(or bug?).
- * ext/tk/lib/tk/text.rb: fail to dump embedded images
+ * configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'-$target_os.dll
+ on cygwin and mingw32.
- * ext/tk/lib/tk/text.rb: tag_nextrange and tag_prevrange returns wrong
- types of values
+ * cygwin/GNUmakefile: ditto.
- * ext/tk/lib/tk/texttag.rb: nextrange and prevrange returns wrong
- types of values
+ * Makefile.in: $(SOLIBS) should be put after dmyext.@OBJEXT@.
- * ext/tk/lib/tk/text.rb: add TkText::IndexModMethods module and
- TkText::IndexString class to treat text index modifiers
+ * instruby.rb: install $(LIBRUBY) to libdir
+ if $(LIBRUBY) != $(LIBRUBY_A_).
- * ext/tk/lib/tk/texttag.rb: use TkText::IndexModMethods module
+Tue Jul 25 15:16:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk/textmark.rb: ditto
+ * io.c (rb_p): redirect to $defout.
- * ext/tk/lib/tk/textimage.rb: ditto
+Mon Jul 24 18:52:55 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk/textwindow.rb: ditto
+ * win32/win32.c (win32_getenv): should remove `static'.
- * ext/tk/lib/tk/textimage.rb: wrong gravity of text mark for embedded
- image
+ * ruby.c (rubylib_mangle): support "/hoge;/foo"
- * ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
- embedded window
+Mon Jul 24 10:28:55 2000 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
-Fri Dec 17 13:50:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
+ * string.c (rb_str_count): raise exception if no argument is
+ given.
- * vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
- for VMS port are added.
+Sun Jul 23 12:55:04 2000 Dave Thomas <Dave@Thomases.com>
- * eval.c (ruby_init): change to call VMS private intialization routine.
+ * string.c (rb_str_rindex): Support negative end position.
-Fri Dec 17 13:33:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 21 17:35:01 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/cgi/session.rb (CGI::Session#initialize): control adding
- session_id hidden fields. fixed: [ruby-talk:123850]
+ * parse.y (aref_args): command_call now be permitted as
+ aref_args.
-Thu Dec 16 23:25:25 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * process.c (proc_getpriority): getpriority(2) may return valid
+ negative number. use errno to detect error.
- * lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
- [druby-ja:101]
+ * marshal.c (dump_ensure): dumped string should be tainted if
+ any among target objects is tainted.
- * test/drb/test_drb.rb: adjust and reduce sleep (backported from
- CVS HEAD.)
+ * marshal.c (r_regist): restored object should be tainted if and
+ only if the source is a file or a tainted string.
-Thu Dec 16 18:44:58 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Jul 19 15:14:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
- for reading request till data arrive. [ruby-talk:121068]
+ * bignum.c (bigdivrem): should use rb_int2big(), not rb_uint2big().
- * lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
- should log about all accepted socket. [ruby-core:03962]
+Tue Jul 18 14:58:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
- "%%" and "%u" are supported. [webricken:135]
+ * eval.c (ruby_options): should treat SystemExit etc. properly.
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#check_filename):
- :NondisclosureName is acceptable if it is Enumerable.
+ * parse.y (yycompile): should check compile_for_eval, not
+ ruby_in_eval.
- * lib/webrick/config.rb (WEBrick::Config::FileHandler):
- default value of :NondisclosureName is [".ht*", "*~"].
+Mon Jul 17 04:29:50 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu Dec 16 18:36:52 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * lib/mkmf.rb: converts extension of $objs into $OBJEXT.
- * ext/openssl/ossl.c (ossl_raise): refine message format.
+Sun Jul 16 03:02:34 2000 Dave Thomas <dave@thomases.com>
-Thu Dec 16 16:29:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/weakref.rb: Change to use new ObjectSpace calls.
- * ext/tk/sample/demos-en/widget: modify version check for
- supporting features
+Sat Jul 15 21:59:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 16 16:03:50 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (rb_eval): should not redefine __id__ nor __send__.
- * ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]
+ * gc.c (define_final): integrate final.rb features into the
+ interpreter. define_finalizer and undefine_finalizer was
+ added to ObjectSpace. plus, add_finalizer, remove_finalizer,
+ and call_finalizer are deprecated now.
- * ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
+Sat Jul 15 01:32:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb: add TkComm._callback_entry?()
+ * eval.c (rb_mod_method): implements unbound method.
- * ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
+ * eval.c (Init_eval): should prohibit `module_function' for class
+ Class.
- * ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
+Fri Jul 14 17:19:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk/canvastag.rb: ditto
+ * cygwin/GNUmakefile.in: use miniruby instead of sed.
- * ext/tk/lib/tk/dialog.rb: ditto
+Fri Jul 14 12:49:50 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk/optiondb.rb: ditto
+ * io.c (argf_eof): need to check stdin, when next_p == -1.
- * ext/tk/lib/tk/text.rb: ditto
+ * io.c (read_all): use io_fread() instead of fread(3).
- * ext/tk/lib/tk/texttag.rb: ditto
+ * io.c (io_reopen): should clearerr FILE if fd < 3.
- * ext/tk/lib/tk/textwindow.rb: ditto
+ * re.c (rb_reg_match_m): the result is exported, so it should be
+ declared as busy.
- * ext/tk/lib/tk/timer.rb: ditto
+ * eval.c (rb_eval): should preserve errinfo even if return, break,
+ etc. is called in rescue clause.
- * ext/tk/lib/tk/validation.rb: ditto
+ * instruby.rb: install irb too.
- * ext/tk/lib/tkextlib/*: ditto
+Wed Jul 12 15:32:57 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 16 03:14:28 2004 Minero Aoki <aamine@loveruby.net>
+ * variable.c (rb_const_get): constants for builtin classes must
+ have higher priority than constants from included modules at
+ Object class.
- * lib/net/http.rb (basic_encode): return value of pack('m') may
- include multiple CR/LFs. Backported from main trunk (rev 1.112).
- [ruby-dev:25212]
+ * bignum.c (bigdivrem): small embarrassing typo.
-Thu Dec 16 00:33:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jul 12 15:06:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * hash.c (Init_Hash): remove custom "hash" and "eql?".
+ * eval.c (rb_eval): use rb_const_get_at().
-Wed Dec 15 18:57:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * variable.c (top_const_get): retrieve toplevel constants only,
+ not ones of Object (and its included modules) in general.
- * lib/set.rb (Set::eql): wrong definition. [ruby-dev:25207]
+Wed Jul 12 15:04:11 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Wed Dec 15 18:48:42 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
- * ext/curses/curses.c (window_subwin): call NUM2INT() before
- GetWINDOW(). (backported from CVS HEAD)
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb:
+ add module Net::NetPrivate and its inner classes
+ {Read,Write}Adapter, Command, Socket,
+ SMTPCommand, POP3Command, APOPCommand, HTTPCommand
-Wed Dec 15 17:03:50 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jul 12 13:10:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
- isatty because it never sets errno. (backported from CVS HEAD)
+ * bignum.c (bigdivrem): defer bignorm().
-Wed Dec 15 15:39:32 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * bignum.c (bignorm): accepts accidental fixnums.
- * ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
- (rollback the previous commit).
+Tue Jul 11 16:54:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 15 16:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (yylex): `@<digit>' is no longer a valid instance
+ variable name.
- * object.c (rb_obj_id_obsolete): warn always.
+Tue Jul 11 01:51:50 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_enable_super): ditto.
+ * bignum.c (rb_big_divmod): should not use Integer(float) for
+ the right operand.
-Wed Dec 15 15:31:02 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * bignum.c (rb_big_remainder): ditto.
- * lib/set.rb (Set#==): [ruby-dev:25206]
+ * bignum.c (rb_big_modulo): ditto.
-Wed Dec 15 14:22:10 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Jul 10 15:27:16 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
- fixed: [ruby-core:03959]
+ * io.c (pipe_finalize): should set rb_last_status when pclose().
-Wed Dec 15 10:30:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Jul 10 09:07:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
+ * error.c (rb_bug): print version number and such too.
-Tue Dec 14 17:10:09 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Sat Jul 8 23:08:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * win32/win32.c (rb_w32_close): need to reset osfhnd().
+ * eval.c (rb_thread_start_0): should copy previous scopes to
+ prevent rb_gc_force_recycle().
-Tue Dec 14 14:03:57 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Jul 7 23:36:36 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
- [ruby-dev:25187]
+ * ext/socket/addrinfo.h: move IN_EXPERIMENTAL and IN_LOOPBACKNET
+ definitions to ext/socket/sockport.h.
-Tue Dec 14 12:36:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/socket/extconf.rb: add getservbyport() and arpa/inet.h check.
- * lib/cgi/session.rb (CGI::Session::initialize): generate new
- session if given session_id does not exist. [ruby-list:40368]
+ * ext/socket/getaddrinfo.c (getaddrinfo): SOCK_RAW may not be
+ defined (ex. BeOS, Palm OS 2.x or before).
-Mon Dec 13 18:13:52 2004 Tanaka Akira <akr@m17n.org>
+ * ext/socket/getnameinfo.c (getnameinfo): getservbyport() may not
+ exist (ex. BeOS, Palm OS).
- * gc.c (stack_end_address): new function to obtain stack end address.
- stack_end_address calls __builtin_frame_address(0) to obtain the
- frame pointer of a stack frame of stack_end_address. The address
- is the stack pointer of the caller's stack frame.
- (SET_STACK_END): use stack_end_address.
- This makes the conservative garbage collector to scan a stack frame
- of the garbage_collect function itself. This is required because
- callee-save registers may be stored in the frame.
- [ruby-dev:25158]
+ * ext/socket/sockport.h: add IN_EXPERIMENTAL, IN_CLASSA_NSHIFT,
+ IN_LOOPBACKNET, AF_UNSPEC, PF_UNSPEC and PF_INET.
-Mon Dec 13 00:58:02 2004 Tanaka Akira <akr@m17n.org>
+Fri Jul 7 03:30:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/pathname.rb (cleanpath_aggressive): make it private.
- (cleanpath_conservative): ditto.
- Suggested by Daniel Berger. [ruby-core:3914]
+ * parse.y (aref_args): should allow Hash[:a=>2] etc.
-Sun Dec 12 20:06:38 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * numeric.c (fix_aref): convert index by NUM2INT, not FIX2INT.
+ (ruby-bugs:#PR37)
- * lib/drb/drb.rb: backported from CVS HEAD.
+ * time.c (time_localtime): should prohibit for frozen time.
-Sun Dec 12 10:35:10 2004 Dave Thomas <dave@pragprog.com>
+ * time.c (time_gmtime): ditto.
- * lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't
- show an accessor's r/w flag if none was specified
+Thu Jul 6 19:12:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Dec 12 10:14:03 2004 Dave Thomas <dave@pragprog.com>
+ * io.c (rb_file_s_open): should not terminate fptr; just clear it.
- * lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
- explicitly given on the command line.
+ * ruby.c (proc_options): should not call require_libraries()
+ twice.
-Sun Dec 11 23:54:07 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * ruby.c (require_libraries): clear req_list_head.next after
+ execution.
- * ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
- (see ext/tk/ChangeLog.tkextlib).
+Thu Jul 6 13:51:57 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * ext/tk/sample/scrollframe.rb: add a new sample.
+ * object.c (rb_to_id): name may not be symbol nor fixnum.
-Sat Dec 11 20:12:21 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * struct.c (rb_struct_s_def): name may be nil.
- * lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
- [ruby-list:40390]
+Thu Jul 6 02:09:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/drb/drbtest.rb: ditto.
+ * bignum.c (bigdivrem): new function to return remainder.
- * test/drb/ut_drb.rb: ditto.
+ * numeric.c (fixdivmod): now returns modulo, not remainder.
-Sat Dec 11 15:38:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c (flodivmod): ditto.
- * lib/jcode.rb (String::succ): [ruby-dev:25156]
+ * bignum.c (bigdivmod): ditto.
-Sat Dec 11 12:41:55 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * numeric.c (num_modulo): new method; alias to '%'.
- * eval.c (run_trap_eval): prototype; avoid VC++ warnings.
+Thu Jul 6 00:51:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
+ * win32/win32.c (NtCmdGlob): patterns should be separated and
+ NUL terminated.
- * win32/win32.c: need to include dln.h.
+Wed Jul 5 22:27:56 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sat Dec 11 00:10:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * cygwin/GNUmakefile: use ruby.def to make rubycw.dll.
- * io.c (io_reopen): [ruby-dev:25150]
+ * ext/extmk.rb.in: create target.def.
-Fri Dec 10 08:39:27 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb: ditto.
- * ext/socket/socket.c (sock_listen): get OpenFile just before calling
- listen(2). fixed: [ruby-dev:25149]
+Wed Jul 5 09:47:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 9 17:00:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
+ * time.c (time_arg): Time::local, Time::gm now take 7th optional
+ argument for usec.
- * ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
+ * numeric.c (num_ceil, etc): default ceil, floor, round, truncate
+ implementation for Numeric, using `to_f'.
-Thu Dec 9 16:31:02 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * io.c (rb_io_reopen): clear fptr->path after free() to prevent
+ potential GC crash.
- * ext/sdbm/init.c (GetDBM): typo.
+ * io.c (rb_file_s_open): terminate fptr unless null.
-Thu Dec 9 16:05:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
+ * io.c (rb_file_initialize): ditto.
- * defines.h: change path of vms.h
- * vms/vms.h: delete reference for snprintf()
- * vms/config.h: new file
- * vms/config.h_in: deleted
+ * lib/tempfile.rb: specify FILE::CREAT|File::EXCL to open for
+ better security.
-Thu Dec 9 14:38:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (flo_truncate): new method.
- * string.c (rb_str_inspect): escape # which starts an expression
- substitution. fixed: [ruby-core:03922]
+Wed Jul 5 01:02:53 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * string.c (rb_str_dump): not escape # which isn't a substitution.
+ * ext/extmk.rb.in: join ' ' -> join(' ').
-Thu Dec 9 10:54:36 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/mkmf.rb: ditto.
- * ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
+Tue Jul 4 13:51:29 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/sdbm/init.c: ditto.
+ * ext/dbm/dbm.c: add methods added to Hash in 1.5.x.
* ext/gdbm/gdbm.c: ditto.
-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 21:56:31 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss, test/rss, sample/rss: backported from CVS HEAD.
-
-Wed Dec 8 14:31:36 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fwrite): change dereference for cosmetic reason.
-
- * sprintf.c (rb_f_sprintf): [ruby-dev:25104]
-
-Tue Dec 7 19:08:00 2004 Akiyoshi, Masamichi <akiyoshi@hp.com>
-
- * io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
-
-Tue Dec 7 00:27:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_setgroups): [ruby-dev:25081]
-
-Mon Dec 6 18:08:10 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_eqq): document fix. [ruby-talk:122541]
-
-Mon Dec 6 17:19:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
- (backported from CVS HEAD) [ruby-dev:24993]
-
-Mon Dec 6 10:18:17 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
- Oops - 1.8 doesn't have String#clear
-
-Mon Dec 6 09:59:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_connect): use rb_str_new4().
- [ruby-dev:25052]
-
-Mon Dec 6 01:42:08 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
- ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
- 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]
-
-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 14:54:52 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * eval.c (proc_invoke): use volatile `tmp' rather than `args'.
- [ruby-core:03882]
-
-Sat Dec 4 14:28:56 2004 Dave Thomas <dave@pragprog.com>
-
- * 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 03:33:45 2004 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
-
- * test/readline/test_readline.rb: added tests for readline.
- (backported from CVS HEAD)
-
-Sat Dec 4 02:24:00 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf.c: add constant NKF::VERSION
-
- * ext/nkf/nkf.c(guess): this becomes an alias of guess2
-
- * ext/nkf/test.rb(mime_out2): add --no-cp932
-
- * ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
-
-Sat Dec 4 00:35:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
-
-Fri Dec 3 18:57:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/ostruct.rb: 1.9 marshaling support back-ported.
- [ruby-core:03871]
-
-Fri Dec 3 13:45:20 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): copy arguments to frame.argv.
- [ruby-core:03861]
-
-Fri Dec 3 12:25:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * st.h: fix prototypes.
-
-Fri Dec 3 00:21:05 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (convert_type): use rb_respond_to() again.
- [ruby-dev:25021]
-
- * eval.c (rb_respond_to): funcall respond_to? if it's redefined.
- [ruby-dev:25021]
-
-Fri Dec 3 01:55:24 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * 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: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 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:06 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 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:38:18 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (io_fread): need not to null terminate. [ruby-dev:24998]
-
- * io.c (read_all): remove unnecessary rb_str_resize().
- [ruby-dev:24996] (backported from CVS HEAD)
-
- * io.c (io_readpartial): ditto.
-
- * io.c (io_read): ditto.
-
-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]
-
- * io.c (read_all): remove unnecessary rb_str_resize().
- [ruby-dev:24996]
-
- * io.c (io_read): ditto.
-
-Tue Nov 30 00:49:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_sysread): use temporary lock. [ruby-dev:24992]
-
-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 03:08:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (convert_type): direct call conversion methods for the
- performance. [ruby-core:03845]
-
- * eval.c (rb_funcall_rescue): new function.
-
- * object.c (rb_Array): avoid using rb_respond_to().
-
- * object.c (rb_Integer): ditto.
-
- * parse.y (reduce_nodes): empty body should return nil.
-
- * string.c (rb_str_aset): the original string should not be
- affected by modifying duplicated string. [ruby-dev:24981]
-
-Mon Nov 29 13:57:38 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (CreateChild): search executable file if no program
- name given. (backported from CVS HEAD)
-
-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:16:31 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 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]
-
-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 14:44:15 2004 Kent Sibilev <ksibilev@bellsouth.net>
-
- * lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
- now a instance method. [ruby-core:03832]
-
-Sat Nov 27 09:41:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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 13:49:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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 10:14:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (push_braces): do not reuse buffer strings. [ruby-core:03806]
-
-Thu Nov 25 07:59:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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): should not match words
- start with block keyword and underscore. [ruby-core:03719]
-
-Mon Nov 22 22:33:02 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
- of variables or constants when oarsing '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 accomodate. :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 13:26:03 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
-
-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: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 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 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(). [ruby-dev:24915]
-
-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:42:40 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/ruby/test_settracefunc.rb: added. [ruby-dev:24884]
-
-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:09:40 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
- before running test. [ruby-core:03756]
-
-Wed Nov 17 04:33:01 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * pack.c: all features are backport from 1.9. [ruby-dev:24826]
-
- * bignum.c (rb_big2ulong_pack): new function to pack Bignums.
-
-Wed Nov 17 03:42:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_splice): move rb_str_modify() after
- StringValue(), which may alter the receiver. [ruby-dev:24878]
-
-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 16:30:21 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
- config.status to force updating them.
-
-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 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 13:50:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_justify): typo fixed. [ruby-dev:24851]
-
-Mon Nov 15 11:50:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
- operator symbols. [ruby-talk:120177]
-
-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 08:51:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * test/logger/test_logger.rb: Logger just expects
- Logger#datetime_format to be used for Time#strftime independently of
- locale. [ruby-dev:24828]
-
-Fri Nov 12 15:03:26 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * eval.c (ruby_options): now we cannot call rb_glob() before
- ruby_init(), so call rb_w32_cmdvector() at ruby_options().
-
- * win32.{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:36:12 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * dir.c (rb_globi): also should call back via rb_glob_caller().
- [ruby-dev:24775]
-
-Thu Nov 11 16:47:21 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * test/ruby/test_file.rb (test_truncate_wbuf): we want to test
- only File#truncate, not behaviour of seek(2).
-
-Thu Nov 11 09:41:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (push_braces): was confusing VALUE and char*.
-
- * dir.c (rb_push_glob): Dir.glob should have called its block.
-
-Thu Nov 11 01:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * 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 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 14:27:18 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
-
-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:53:53 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * regex.c (slow_match): avoid GCC 3.4.x warnings.
-
-Tue Nov 9 00:50:06 2004 Dave Thomas <dave@pragprog.com>
-
- * lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
-
-Mon Nov 8 23:38:35 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
- [ruby-dev:24743]
-
-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 mignw32 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 14:58:44 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
- :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
- ruby 1.9 feature)
-
-Sat Nov 6 11:31:04 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 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: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]
-
-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 19:27:46 2004 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_f_open): fix typo.
-
-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:32:12 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * process.c: On NetBSD don't use setruid() and setrgid().
-
-Wed Nov 3 22:24:17 2004 Daigo Moriwaki <techml@sgtpepper.net>
-
- * lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
- 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:13:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * io.c (pipe_open): fix compile error
-
-Wed Nov 3 16:58:07 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: support to use different Tcl commands between
- configure and configinfo
-
- * 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 16:30:41 2004 NARUSE, Yui <naruse@ruby-lang.org>
-
- * ext/nkf: follow nkf 2.0.4
-
-Wed Nov 3 15:53:34 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * test/rss/test_maker_*.rb: added tests for RSS Maker.
-
- * lib/rss/maker.rb: added RSS Maker.
-
- * lib/rss/maker/*.rb: ditto.
-
-Tue Nov 2 16:35:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/enumerator/enumerator.c (each_cons_i): pass copy of an
- internal consequent array. [ruby-talk:118691]
-
-Tue Nov 2 16:05:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_f_fork): need to flush stdout and stderr before
- fork(2). [ruby-talk:117715]
-
-Tue Nov 2 01:20:09 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): nail down dyna_var node when Proc object
- or continuation is created. [ruby-dev:24671]
-
-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 01:14:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_open): create copy of popen specifier. [ruby-dev:24656]
-
-Mon Nov 1 00:36:48 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * main.c (_stklen): move to gc.c.
-
-Sun Oct 31 00:22:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/sdbm/init.c: ditto.
- * string.c (rb_str_locktmp): lock string temporarily.
+ * eval.c (proc_call): args may be Qundef (means no argument), do
+ not call TYPE() for args.
- * string.c (str_independent): add tmplock check.
+Tue Jul 4 13:20:56 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * io.c (io_write): lock output string temporarily.
- [ruby-dev:24649]
+ * ext/extmk.rb.in: make command line must be single-quoted.
+ $(RUBY_INSTALL_NAME) is command substitution in the POSIX sh.
- * io.c (io_write): use rb_str_locktmp().
+Tue Jul 4 13:16:02 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (read_all): ditto.
+ * util.c (rb_type): should add T_UNDEF.
-Sat Oct 30 06:53:24 2004 Peter Vanbroekhoven <peter.vanbroekhoven@cs.kuleuven.ac.be>
+Tue Jul 4 09:30:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_eval): NODE_XSTR should pass copy of literal string.
+ * parse.y (here_document): supports EOF right after terminator.
-Sat Oct 30 00:19:40 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * random.c (rb_f_rand): argument is now optional (rand(max=0)).
- * enum.c (enum_sort_by): protect continuation jump in.
- [ruby-dev:24642]
+Tue Jul 4 01:50:49 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Oct 29 21:27:51 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * win32/ruby.def: remove ruby_mktemp.
- * io.c (rb_io_check_initialized): new function to check uninitialized
- object. [ruby-talk:118234]
+Tue Jul 4 01:27:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
+ * eval.c (rb_rescue2): new function to rescue arbitrary exception.
-Fri Oct 29 10:00:30 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c (do_coerce): should catch NameError explicitly.
- * eval.c (rb_thread_start_0): forget to free some memory chunks.
- [ruby-core:03611]
+Tue Jul 4 00:15:23 2000 Dave Thomas <Dave@thomases.com>
- * eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
- should be wrapped by PUSH_TAG/POP_TAG(). [ruby-dev:24627]
+ * numeric.c (Init_Numeric): forgot to register Numeric#remainder.
-Thu Oct 28 08:42:02 2004 Tanaka Akira <akr@m17n.org>
+Mon Jul 3 23:46:56 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * io.c (argf_forward): use ANSI style.
- (argf_read): call argf_forward with argv argument.
- [ruby-dev:24624]
+ * win32/win32.c (myselect, myaccept): disable interrupt while
+ executing accept() or select() to avoid Ctrl-C causes
+ "unknown software exception (0xc0000029)".
-Thu Oct 28 23:32:54 2004 akira yamada <akira@ruby-lang.org>
+Mon Jul 3 18:35:41 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
- z->input isn't nil.
+ * lib/mkmf.rb: use null device if it exists for cross-compiling.
-Thu Oct 28 23:19:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Jul 3 18:19:51 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/extmk.rb: prefer relative path. [ruby-talk:93037]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
-Wed Oct 27 18:49:11 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/net/protocol.rb (finish): do nothing unless active.
- * gc.c: prototype; rb_io_fptr_finalize() doesn't return any value
- at this version.
+ * lib/net/http.rb: HTTP#{get,post}2 again (for new impl).
-Wed Oct 27 17:27:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Jul 3 16:47:22 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * gc.c (gc_sweep): recover ruby_in_compile variable.
+ * cygwin/GNUmakefile: librubys.a -> lib$(RUBY_INSTALL_NAME)s.a
-Wed Oct 27 09:17:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * configure.in: use AC_CANONICAL_{HOST,TARGET,BUILD}.
- * string.c (str_gsub): use a string object for exception safeness.
- [ruby-dev:24601]
+Mon Jul 3 13:15:02 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Oct 26 23:52:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (fix_divmod): x * d + m = y where d, m = x.divmod(y).
- * io.c (rb_io_getline): rs modification check should not interfere in the loop.
+ * bignum.c (rb_big_divmod): ditto.
-Tue Oct 26 23:30:39 2004 Dave Thomas <dave@pragprog.com>
+ * numeric.c (fixdivmod): does not depend C's undefined %
+ behavior. adopt to fmod(3m) behavior.
- * lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module):
- Restore correct :nopdoc: behavior with nested classes and modules.
+ * numeric.c (flo_mod): modulo now reserves fmod(3m) behavior.
-Tue Oct 26 18:21:29 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c (num_remainder): 'deprecated' warning.
- * string.c (RESIZE_CAPA): check string attribute before modifying
- capacity member of string structure. [ruby-dev:24594]
+Mon Jul 3 10:27:28 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Tue Oct 26 11:33:26 2004 David G. Andersen <dga@lcs.mit.edu>
+ * configure.in: use AC_CANONICAL_SYSTEM.
- * ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
- performance. [ruby-talk:117701]
+Sun Jul 2 21:17:37 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Tue Oct 26 10:56:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: support without --enable-shared for cygwin/mingw32.
- * sprintf.c (rb_f_sprintf): raise ArgumentError for extra
- arguments, unless (digit)$ style used.
+ * cygwin/GNUmakefile: ditto.
-Tue Oct 26 11:33:26 2004 David G. Andersen <dga@lcs.mit.edu>
+ * ext/extmk.rb.in: use null device if it exists for cross-compiling.
- * ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
- performance. [ruby-talk:117701]
+ * lib/mkmf.rb: ditto.
-Tue Oct 26 10:56:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * util.c (ruby_mktemp): remove unused ruby_mktemp().
- * sprintf.c (rb_f_sprintf): raise ArgumentError for extra
- arguments, unless (digit)$ style used.
+Sun Jul 2 14:18:04 2000 Koji Arai <JCA02266@nifty.ne.jp>
-Mon Oct 25 18:35:39 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (TMP_PROTECT_END): tmp__protect_tmp may be NULL.
- * win32/win32.c (isUNCRoot): should check NUL after '.'.
- [ruby-dev:24590]
+Sun Jul 2 03:37:50 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * win32/win32.c (isUNCRoot): fixed buffer overrun.
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.25.
-Mon Oct 25 08:03:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/protocol.rb (each_crlf_line): beg = 0 is needed in adding{}
- * eval.c (get_backtrace): ignore illegal backtrace. [ruby-dev:24587]
+ * lib/net/smtp.rb: allow String for to_addr of SMTP#sendmail
-Sun Oct 24 00:41:09 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jul 1 15:22:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_load, search_required, rb_require_safe, rb_require): use
- frozen shared string to avoid outside modification. [ruby-dev:24580]
+ * numeric.c (fix_rshift): should handle shift value more than
+ sizeof(long).
-Sat Oct 23 22:18:32 2004 Guy Decoux <ts@moulon.inra.fr>
+Sat Jul 1 15:22:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (frame_free): Guy Decoux solved the leak problem.
- Thanks. [ruby-core:03549]
+ * eval.c (rb_eval): the value from RTEST() is not valid Ruby
+ object. result should be either true or false.
-Sat Oct 23 00:20:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Jul 1 09:30:06 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/zlib/zlib.c (zstream_append_input): clear klass for z->input
- to avoid potential vulnerability.
+ * re.c (rb_reg_initialize): was freeing invalid pointer.
- * ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
- to avoid SEGV. [ruby-dev:24568]
+Sat Jul 1 03:25:56 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Oct 22 12:02:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (call_args): command_call can be the last argument of
+ call_args. It had to be the only argument.
- * eval.c (rb_alias): was warning for wrong condition.
- [ruby-dev:24565]
+ * re.c (rb_reg_s_quote): should not dump core even for unsane mbc
+ string.
-Fri Oct 22 10:36:37 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Fri Jun 30 01:36:20 2000 Aleksi Niemela <aleksi.niemela@cinnober.com>
- * lib/webrick/httprequest.rb (WEBrick::HTTPRequest#meta_vars):
- should check if path_info is not nil.
+ * parse.y (f_norm_arg): better, nicer error message.
-Fri Oct 22 00:22:31 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Jun 29 07:45:33 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/zlib/zlib.c (zstream_shift_buffer): should restore class
- field of a buffer. [ruby-dev:24562]
+ * ext/socket/socket.c (udp_send): destination may be packed
+ struct sockaddr.
-Fri Oct 22 00:20:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (rb_Integer): Integer(nil) should be invalid, on the
+ other hand, nil.to_i is OK.
- * string.c (rb_str_include): should not treat char as negative value.
- [ruby-dev:24558]
+Wed Jun 28 17:26:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 21 21:32:30 2004 IWATSUKI Hiroyuki <don@na.rim.or.jp>
+ * ext/socket/socket.c (ip_recvfrom): udp_recvfrom and tcp_recvfrom
+ is merged and moved to IPSocket#recvfrom.
- * lib/pstore.rb (PStore#transaction): Use the empty content when a
- file is not found. [ruby-dev:24561]
+ * ext/socket/socket.c (sock_s_getaddrinfo): family can be a
+ strings such as "AF_INET" etc.
-Thu Oct 21 19:06:15 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ruby.c (require_libraries): . and RUBYLIB added to $load_path
+ just before -r procedure.
- * lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
- ensure to close @body. (http://bugs.debian.org/277520)
+ * ruby.c (proc_options): -e, - did not exec -r.
-Thu Oct 21 00:36:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jun 28 14:52:28 2000 Koga Youichirou <y-koga@mms.mt.nec.co.jp>
- * eval.c (rb_alias): should warn on method discarding.
- [ruby-dev:24546]
+ * config.sub: NetBSD/hpcmips support.
- * ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
- string buffer by clearing klass. [ruby-dev:24548]
+Wed Jun 28 10:11:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 20 19:45:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * gc.c: gc trigger threshold changed; GC_NEWOBJ_LIMIT removed,
+ FREE_MIN is increased to 4096.
- * string.c (str_gsub): reentrant check. [ruby-dev:24432]
+Tue Jun 27 22:39:28 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * backport all SEGV bug fixes from CVS HEAD. [ruby-dev:24536]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.24.
-Wed Oct 20 04:17:55 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/protocol.rb: modified each_crlf_line again.
- * ext/dbm/dbm.c (fdbm_delete_if): should check if deleting element
- is a string. [ruby-dev:24490]
+ * lib/net/protocol.rb: do_write_beg,do_write_end -> writing{}
+ do_write_do -> do_write
- * ext/sdbm/init.c (fsdbm_delete_if): ditto.
+ * lib/net/http.rb: can make proxy connection by passing
+ addresses to HTTP.new, start.
-Wed Oct 20 01:37:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/http.rb: HTTP.new_implementation, old_implementation:
+ can use 1.2 implementation of head, get, post, put.
+ (see document)
- * array.c (rb_ary_times): Array#* should return an instance of
- the class of right operand. [ruby-dev:24526]
+Tue Jun 27 12:05:10 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/zlib/zlib.c (zstream_detach_buffer): should not expose
- class-less object to Ruby world. [ruby-dev:24530]
+ * win32.c (myfdclr): new function.
- * eval.c (proc_dup): provide Proc#dup as well. [ruby-talk:116915]
+ * win32.h: add FD_CLR.
- * eval.c (ruby_exec): stack marking position may be higher than
- expected. thanks to Guy Decoux. [ruby-core:03527]
+Mon Jun 26 23:41:41 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Tue Oct 19 22:43:12 2004 Dave Thomas <dave@pragprog.com>
+ * ruby.h: add cast for ANSI style.
- * 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.
+ * gc.c (rb_data_object_alloc): use RUBY_DATA_FUNC.
-Tue Oct 19 20:41:37 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Mon Jun 26 22:20:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/win32ole.c(ole_invoke): retrieve the result value when
- retrying the IDispatch::invoke.
+ * win32/win32.c (is_socket, extract_file_fd): New function.
-Tue Oct 19 17:24:11 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * win32/win32.c (myfdopen): use is_socket().
- * io.c (read_all): block string buffer modification during
- rb_io_fread() by freezing it temporarily. [ruby-dev:24479]
+ * win32/win32.c (myselect): return non socket files immediately
+ if file and socket handles are mixed.
- * dir.c (rb_push_glob): block call at once the end of method.
- [ruby-dev:24487]
+Mon Jun 26 16:21:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/enumerator/enumerator.c (enum_each_slice): remove
- rb_gc_force_recycle() to prevent potential SEGV.
- [ruby-dev:24499]
+ * eval.c (rb_thread_schedule): wait_for cleared too early.
- * ext/zlib/zlib.c (zstream_expand_buffer): hide internal string
- buffer by clearing klass. [ruby-dev:24510]
+Mon Jun 26 09:15:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Oct 19 16:12:18 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * pack.c: remove obsolete 'F', 'D' specifiers.
- * ext/tk/tkutil.c: backport from CVS HEAD
+Sun Jun 25 00:55:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Oct 19 08:54:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (sock_s_getnameinfo): `res' would not
+ be assigned if TYPE(sa) == T_STRING.
- * intern.h, object.c (rb_class_inherited_p): export.
+Sat Jun 24 14:36:29 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Tue Oct 19 08:46:57 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * config*.dj, configure.bat, top.sed: move to djgpp/.
- * string.c (rb_str_upto): method result must be checked. [ruby-dev:24504]
+Sat Jun 24 02:34:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (error_print): ditto. [ruby-dev:24519]
+ * ruby.c (load_file): call require_libraries() here to let
+ debug.rb work properly.
-Mon Oct 18 23:37:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 23 22:34:51 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * marshal.c (r_object0): check inheritance by the internal function.
- [ruby-dev:24515]
+ * bignum.c (rb_big_lshift): reorder xds assignment to avoid
+ reusing `x' as `len' by VC++ 6.0 SP3 compiler with -Ox switch.
-Mon Oct 18 15:58:01 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Jun 23 01:11:27 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * range.c (range_step, range_each): need cast.
+ * string.c (rb_str_substr): should return empty string (""),
+ if beg == str.size and len == zero, mostly for convenience and
+ backward compatibility.
-Fri Oct 29 16:34:19 2004 Daiki Ueno <ueno@unixuser.org>
+ * parse.y (new_super): should tweak block_pass node for super too.
- * misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
- line after opening heredoc identifier. [ruby-dev:24635]
+ * string.c (rb_str_split_m): last split element should not be nil,
+ but "" when limit is specified.
-Mon Oct 18 07:26:21 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Jun 22 17:27:46 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * file.c (rb_file_truncate): discard read buffer before truncation.
- [ruby-dev:24197]
+ * string.c (rb_str_substr): str[n,m] now returns nil when n equals
+ to str.size.
-Mon Oct 18 02:11:21 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Jun 22 13:49:02 2000 Uechi Yasumasa <uechi@ryucom.ne.jp>
- * lib/webrick/config.rb (WEBrick::Config::General): add default values:
- - WEBrick::Config[:DoNotReverseLookup]
- - WEBrick::Config[:RequestCallback] (it used as an alias of
- :RequestHandler in WEBrick::HTTPServer#run)
- - WEBrick::Config::FileHandler[:AcceptableLanguages]
+ * lib/net/ftp.rb: support resuming.
- * 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.
+Thu Jun 22 13:37:19 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
- search servlet correspond to the suffix of filename.
+ * eval.c (rb_thread_sleep_forever): merge pause() macro.
- * lib/webrick/httprequest.rb: add attributes access methods: accept,
- accept_charset, accept_encoding, accept_language, content_length
- and content_type.
+Wed Jun 21 08:49:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/httpresponse.rb: add attribute access methods:
- content_length, content_length=, content_type and content_type=.
+ * eval.c (rb_eval): should not raise exception just by defining
+ singleton class.
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
- use the second suffix to detect media type. (the first suffix
- may be a language name.)
+Wed Jun 21 01:18:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * ruby.h: two macros RUBY_DATA_FUNC and RUBY_METHOD_FUNC are added
+ to make writing C++ extensions easier.
-Mon Oct 18 02:04:11 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * array.c (rb_ary_dup): internal classes should not be shared by dup.
- * lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): new
- method to register virtual hosting servers.
+ * hash.c (rb_hash_dup): ditto.
- * lib/webrick/server.rb (WEBrick::GenericServer#accept): call
- do_not_reverse_lookup for each socket if :DoNotReverseLookup
- is set. [ruby-core:02357]
+ * object.c (rb_obj_dup): ditto.
-Mon Oct 18 00:42:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (rb_str_dup): ditto.
- * ext/socket/socket.c (sock_s_getservbyaname): protocol string
- might be altered. [ruby-dev:24503]
+ * error.c (Init_Exception): renamed NotImplementError to
+ NotImplementedError.
- * string.c (rb_str_upto): check if return value from succ is a
- string. [ruby-dev:24504]
+Tue Jun 20 16:22:38 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Oct 17 23:03:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * time.c (make_time_t): bug in DST boundary.
- * ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
+Tue Jun 20 10:54:19 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sun Oct 17 13:05:04 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * configure.in: add eval sitedir.
- * 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
+Tue Jun 20 06:14:43 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-Sat Oct 16 14:45:28 2004 Kouhei Sutou <kou@cozmixng.org>
+ * lib/cgi.rb: change: version syntax. old: x.yz, now: x.y.z
- * lib/rss/0.9.rb (RSS::Rss#to_s): removed garbage.
+ * lib/net/telnet.rb: ditto.
-Sat Oct 16 13:42:49 2004 Kouhei Sutou <kou@cozmixng.org>
+Tue Jun 20 00:37:45 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rss/: untabified.
- * test/rss/: untabified.
- * lib/rss/0.9.rb (RSS::Rss#to_s): inent -> indent.
+ * re.c (rb_reg_kcode_m): Regexp#kcode returns nil for code unfixed
+ regexp object.
-Sat Oct 16 13:34:56 2004 Kouhei Sutou <kou@cozmixng.org>
+ * bignum.c (bigdivmod): bignum zero check was wrong.
- * lib/rss: supported prety print.
- * test/rss/test_1.0.rb: added test for calculating default indent size.
+Mon Jun 19 10:48:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Oct 15 18:04:35 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * variable.c (rb_cvar_set): forgot to add security check for class
+ variable assignment.
- * ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
- acceptable. Add TkTimer.start ( == new + start ).
+Sun Jun 18 22:49:13 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Oct 15 12:43:09 2004 Tanaka Akira <akr@m17n.org>
+ * configure.in: single quoted sitedir.
- * eval.c (Init_stack): make prototype declaration consistent with
- the definition in gc.c.
+ * mkconfig.rb: add DESTDIR for cross-compiling.
-Thu Oct 14 14:34:01 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * lib/mkmf.rb: add DESTDIR.
- * io.c (MODE_BINMODE, MODE_BINARY): fixed reversed condition.
+ * ruby.c (load_file): force binmode if fname includes ".exe"
+ on DOSISH.
-Thu Oct 14 13:33:59 2004 Kouhei Sutou <kou@cozmixng.org>
+Sat Jun 17 23:22:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rss/rss.rb: added link to Tutorial.
+ * sprintf.c (rb_f_sprintf): should ignore negative precision given
+ by <%.*>.
-Mon Oct 11 13:48:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * sprintf.c (rb_f_sprintf): should allow zero precision.
- * ext/tk/lib/tk/*: untabify
+Sat Jun 17 03:13:29 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Oct 10 12:32:08 2004 Dave Thomas <dave@pragprog.com>
+ * time.c (time_localtime): avoid unnecessary call of localtime.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Allow 'require'
- to be used as a variable name
+ * time.c (time_gmtime): avoid unnecessary call of gmtime.
-Sat Oct 9 21:23:37 2004 Kouhei Sutou <kou@cozmixng.org>
+ * process.c (proc_wait2): new method.
- * lib/rss/converter.rb: changed to try to use Iconv for default
- conversion.
+ * process.c (proc_waitpid): second argument made optional.
- * lib/rss/rss.rb: 0.0.9 -> 0.1.0.
+ * process.c (proc_waitpid2): new method.
-Sat Oct 9 19:50:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jun 17 00:05:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_getline): should not treat char as negative value.
- [ruby-dev:24460]
+ * re.c (rb_reg_clone): should initialize member fields.
-Fri Oct 8 09:49:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Jun 16 22:49:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * pack.c (pack_pack): pointer modification check before each
- iteration. [ruby-dev:24445]
+ * io.c (rb_io_rewind): set lineno to zero.
-Fri Oct 8 01:13:05 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Fri Jun 16 22:47:47 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/lib/tk/optiondb.rb: make it more secure
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.23.
-Thu Oct 7 23:47:57 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/protocol.rb: too many CRLF in last line.
- * 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.
+Fri Jun 16 21:23:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Thu Oct 7 17:36:25 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * configure.in: add pause(2) checking.
- * 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.
+ * eval.c: define pause() if missing.
-Thu Oct 7 12:55:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Jun 16 18:41:58 2000 Koji Arai <JCA02266@nifty.ne.jp>
- * io.c (io_read): should freeze buffer before thread context
- switch. [ruby-dev:24442]
+ * process.c (proc_setsid): BSD-style setpgrp() don't return
+ process group ID, but 0 or -1.
- * pack.c (pack_unpack): string conversion should at the top of the
- method. [ruby-dev:24439]
+Fri Jun 16 16:23:35 2000 Koji Arai <JCA02266@nifty.ne.jp>
- * io.c (io_read): buffer should be frozen only after the length
- check. [ruby-dev:24440]
+ * file.c (rb_stat_inspect): gives detailed information;
+ compatibility with ruby-1.4.x.
-Thu Oct 7 02:56:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 16 05:18:45 2000 Yasuhiro Fukuma <yasuf@bsdclub.org>
- * ext/stringio/stringio.c: use FMODE_APPEND.
+ * configure.in: FreeBSD: do not link dummy libxpg4 which was
+ merged into libc.
-Thu Oct 7 01:05:33 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Fri Jun 16 03:17:36 2000 Satoshi Nojo <nojo@t-samukawa.or.jp>
- * ext/tk/lib/tk.rb: add Tk.errorInfo and Tk.errorCode
+ * ext/dbm/dbm.c (fdbm_length): use GetDBM. empty?, [] too.
-Thu Oct 7 00:08:37 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/gdbm/gdbm.c (fgdbm_length): ditto.
- * io.c (rb_io_s_sysopen): preserve path in the buffer allocated by
- ALLOCA_N() to prevent modification. [ruby-dev:24438]
+ * ext/sdbm/init.c (fsdbm_length): ditto.
-Wed Oct 6 09:21:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Jun 16 01:57:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_mode_flags): preserve append mode flag.
- [ruby-dev:24436]
+ * eval.c (rb_thread_sleep_forever): pause(2) instead of sleep(3).
- * io.c (rb_io_modenum_mode): do not use external output buffer.
+Thu Jun 15 10:46:36 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * string.c (rb_str_justify): differ pointer retrieval to prevent
- padding string modification. [ruby-dev:24434]
+ * string.c (rb_str_sub_bang): should probagate taintness from
+ replacement string.
- * range.c (range_each_func): allow func to terminate loop by
- returning RANGE_EACH_BREAK.
+Wed Jun 14 17:01:41 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]
+ * rubytest.rb: add CONFIG['EXEEXT'] to the executable file name.
-Mon Oct 4 14:04:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jun 14 14:50:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
- while GC. [ruby-dev:24408]
+ * string.c (rb_f_sub): assign to $_ only if modification happens.
-Mon Oct 4 12:53:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * string.c (rb_f_gsub): ditto.
- * ext/tk/lib/tk/optiondb.rb: support definition of command
- resources on widgets
+ * string.c (rb_f_chop): ditto.
- * ext/tk/lib/tk/image.rb: bug fix
+ * string.c (rb_f_chomp): ditto.
-Sun Oct 3 21:20:03 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * io.c (io_reopen): preserve file position by ftell/fseek, if io
+ is a seekable.
- * lib/net/imap.rb (TEXT_REGEXP): allow 8-bit characters for the german
- version of Microsoft Exchange Server. (backported from HEAD)
+ * eval.c (method_arity): wrong arity number for the methods with
+ optional arguments.
- * lib/net/imap.rb (RTEXT_REGEXP): ditto.
+ * time.c (make_time_t): opposite timezone shift (should be negative).
- * lib/net/imap.rb (CTEXT_REGEXP): ditto.
+Wed Jun 14 14:07:38 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sat Oct 2 20:34:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c: typo(ig/if).
- * node.h (NEW_DVAR): extra semicolon.
+ * re.c: typo(re/reg). add rb_reg_check().
-Sat Oct 2 00:42:20 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * time.c: remove unneeded declare(daylight, timezone).
- * marshal.c (r_byte): retrieve pointer from string value for each
- time. [ruby-dev:24404]
+ * configure.in: add include <time.h> when daylight checking.
- * marshal.c (r_bytes0): ditto.
+Wed Jun 14 11:36:52 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * enum.c (sort_by_i): re-entrance check added. [ruby-dev:24399]
+ * marshal.c (r_object): modified for symbols.
- * io.c (io_read): should freeze all reading buffer.
- [ruby-dev:24400]
+ * marshal.c (w_object): ditto.
- * string.c (rb_str_sum): should use bignums when bits is greater
- than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+Wed Jun 14 10:04:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (specific_eval): defer pointer retrieval to prevent
- unsafe sourcefile string modification. [ruby-dev:24382]
+ * re.c (rb_memcmp): should compare according to ruby_ignorecase.
- * eval.c (specific_eval): defer pointer retrieval to prevent
- unsafe sourcefile string modification. [ruby-dev:24382]
+ * string.c (rb_str_cmp): use rb_memcmp.
- * string.c (rb_str_sum): wrong cast caused wrong result.
- [ruby-dev:24385]
+ * string.c (rb_str_index): ditto.
- * enum.c (enum_sort_by): hide temporary array from
- ObjectSpace.each_object. [ruby-dev:24386]
+ * string.c (rb_str_rindex): ditto.
- * string.c (rb_str_sum): check was done with false pointer.
- [ruby-dev:24383]
+ * string.c (rb_str_each_line): ditto.
- * string.c (rb_str_sum): string may be altered. [ruby-dev:24381]
+Wed Jun 14 04:58:53 2000 Dave Thomas <dave@thomases.com>
-Mon Oct 11 17:51:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_io_set_lineno): should have returned VALUE, not
+ integer.
- * io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
- avoid mode string modification. [ruby-dev:24454]
+Wed Jun 14 09:29:42 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_getline_fast): should take delim as unsigned char to
- distinguish EOF and '\377'. [ruby-dev:24460]
+ * string.c (rb_str_dup): dup should always propagate taintness.
- * io.c (rb_io_getline): add check for RS modification.
- [ruby-dev:24461]
+Wed Jun 14 00:50:14 2000 Wakou Aoyama <wakou@fsinet.or.jp>
- * enum.c (enum_sort_by): use qsort() directly instead using
- rb_iterate(). [ruby-dev:24462]
+ * lib/cgi.rb: read_multipart(): if no content body then raise EOFError.
- * enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
- prevent access to recycled object (via continuation for
- example). [ruby-dev:24463]
+Tue Jun 13 11:46:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Oct 1 11:40:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * process.c (proc_setsid): try implement it using setpgrp() and
+ ioctl(fd, TIOCNOTTY, NULL).
- * eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
- sourcefile string modification. [ruby-dev:24373]
+ * re.c (rb_reg_prepare_re): magic variable $= should affect regex
+ pattern match.
- * io.c (io_read): block string buffer modification during
- rb_io_fread() by freezing it temporarily. [ruby-dev:24366]
+ * time.c (make_time_t): use tm.tm_gmtoff if possible.
- * io.c (rb_io_s_popen): mode argument may be altered.
- [ruby-dev:24375]
+ * time.c (time_zone): use tm.tm_zone if available.
- * file.c (rb_file_s_basename): ext argument may be altered.
- [ruby-dev:24377]
+Tue Jun 13 01:50:57 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * enum.c (enum_sort_by): use NODE instead of 2 element arrays.
- [ruby-dev:24378]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.22.
- * string.c (rb_str_chomp_bang): StringValue() may change the
- receiver. [ruby-dev:24371]
+ * lib/net/http.rb: HTTPResponse#body returns body.
-Fri Oct 1 11:25:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Jun 12 23:41:54 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk/grid.rb: revive TkGrid.grid
+ * configure.in (daylight): avoid GCC optimization.
- * ext/tk/lib/tk/pack.rb: revive TkPack.pack
+Mon Jun 12 19:02:27 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk/place.rb: revive TkPlace.place
+ * configure.in: cygwin has strange timezone.
-Thu Sep 30 00:50:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * time.c (time_zone): use tzname and daylight.
- * ext/tcltklib/tcltklib.c (ip_init): bug fix
+Sat Jun 10 23:10:32 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object
+ * io.c (rb_io_seek): whence is optional, default is SEEK_SET.
- * ext/tk/lib/multi-tk.rb: fix bug on 'exit' operation
+Fri Jun 9 17:00:29 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/lib/tk/text.rb: 'tksearch' accepts a Regexp object as a
- matting pattern argument
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.21.
-Wed Sep 29 10:58:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/net/http.rb: exception is raised with response object.
- * enum.c (sort_by_i): internally used object must not be changed
- outside. [ruby-dev:24368]
+Fri Jun 9 15:11:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Sep 27 13:46:45 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (make_time_t): supports daylight saving time.
- * intern.h, struct.c (rb_struct_s_members, rb_struct_members): public
- accessors. [ruby-dev:24342]
+ * eval.c (rb_thread_safe_level): should retrieve current $SAFE
+ value if a thread is the current thread.
- * marshal.c (w_object, r_object0): use accessors.
+Thu Jun 8 14:25:45 2000 Hiroshi Igarashi <iga@ruby-lang.org>
-Mon Sep 27 09:14:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/mkmf.rb: add target `distclean' in Makefile for extlib.
+ target `clean' doesn't remove Makefile.
- * ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
- [ruby-talk:113807]
+Thu Jun 8 13:34:03 2000 Dave Thomas <dave@thomases.com>
-Fri Sep 24 16:09:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c: add nan?, infinite?, and finite? to Float
- * eval.c (proc_invoke): propagate DVAR_DONT_RECYCLE on termination
- to avoid double call to rb_gc_force_recycle(). [ruby-dev:24311]
+Thu Jun 8 00:31:04 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Sep 24 08:29:45 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.h: export re_mbctab properly on cygwin.
- * array.c (rb_ary_subseq): original object might be modified after
- sharing data creation. [ruby-dev:24327]
+ * dln.c: use dlopen instead of LoadLibrary on cygwin.
- * array.c (rb_ary_replace): ditto.
+Thu Jun 8 13:41:34 2000 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * array.c (ary_make_shared): freeze shared array. [ruby-dev:24325]
+ * file.c (rb_file_s_basename): might dump core.
- * struct.c (struct_members): always check struct size and size of
- members list in the class. [ruby-dev:24320]
+Tue Jun 6 03:29:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Sep 23 09:29:14 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * dir.c (dir_foreach): now returns nil for consistency.
- * string.c (rb_str_sub_bang): check if string is not modified
- during iteration. [ruby-dev:24315]
+ * bignum.c (bigdivmod): modulo by small numbers was wrong.
- * hash.c (rb_hash_rehash): replace st_foreach() by its deep
- checking counterpart. [ruby-dev:24310]
+Mon Jun 5 00:18:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Wed Sep 22 13:38:12 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * bignum.c: avoid conflict with USHORT on mingw32.
- * hash.c (rb_hash_rehash): add iteration check. [ruby-dev:24301]
+Mon Jun 5 00:13:35 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * st.c (st_foreach): add deep check.
+ * eval.c (rb_thread_schedule): =/== typo.
-Wed Sep 22 13:06:14 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Sun Jun 4 03:17:36 2000 Wakou Aoyama <wakou@fsinet.or.jp>
- * win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
- merge from HEAD.
+ * lib/cgi.rb: improve: CGI::pretty()
-Wed Sep 22 00:11:12 2004 Dave Thomas <dave@pragprog.com>
+Sun Jun 4 02:01:10 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * process.c: Add documentation for fork()
+ * lib/mkmf.rb: do not need to add -L$(topdir) in --enable-shared case.
-Wed Sep 22 09:04:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Jun 3 13:50:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * array.c (rb_ary_collect_bang): element size might change during
- comparison. [ruby-dev:24300]
+ * parse.y (rb_id2name): should support constant attrset
+ identifiers.
- * array.c (rb_ary_reject_bang): ditto. [ruby-dev:24300]
+ * bignum.c (rb_big_eq): Bignum#== should not raise exception.
- * array.c (rb_ary_eql): ditto. [ruby-dev:24300]
+Fri Jun 2 11:24:48 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 21 18:29:49 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_io_popen): open with a block returns the value from the
+ block. old behavior was back.
- * array.c (rb_ary_equal): merge miss.
+Fri Jun 2 00:42:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * array.c (rb_ary_uniq_bang): element size might change during
- comparison. [ruby-dev:24298]
-Mon Sep 20 00:24:19 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_thread_cleanup): should clear priority for thread
+ termination.
- * enum.c (enum_sort_by): do not use qsort directly. use
- rb_ary_sort_bang() instead. [ruby-dev:24291]
+Thu Jun 01 22:39:41 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * enum.c (enum_sort_by): pedantic type check added.
- [ruby-dev:24291]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.20.
- * hash.c (rb_hash_foreach_iter): check iter_lev after each
- iteration. [ruby-dev:24289]
+ * lib/net/http.rb: wrongly closed the socket twice
+ when no Content-Length: was given.
- * array.c (rb_ary_and): element size might change during
- comparison. [ruby-dev:24290]
+Thu Jun 1 00:59:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * array.c (rb_ary_or): ditto. [ruby-dev:24292]
+ * eval.c (rb_yield_0): convert Qundef to [].
- * array.c (rb_ary_equal): wrong fix. [ruby-dev:24286]
+Wed May 31 20:45:59 2000 Dave Thomas <Dave@Thomases.com>
-Sat Sep 18 15:02:22 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (rb_str_slice_bang): wrong argument number.
- * array.c (rb_ary_equal): element size might change during
- comparison. [ruby-dev:24254]
+Wed May 31 12:37:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * array.c (rb_ary_diff): ditto. [ruby-dev:24274]
+ * eval.c (rb_exec_end_proc): print error message from END procs.
- * array.c (rb_ary_select): ditto. [ruby-dev:24278]
+Wed May 31 04:06:41 2000 Wakou Aoyama <wakou@fsinet.or.jp>
- * array.c (rb_ary_delete): ditto. [ruby-dev:24283]
+ * lib/cgi.rb: change: CGI#out() if "HEAD" == REQUEST_METHOD then
+ output only HTTP header.
- * array.c (rb_ary_rindex): ditto. [ruby-dev:24275]
+Wed May 31 01:54:21 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * array.c (rb_ary_initialize): element size might change during
- initializing block. [ruby-dev:24284]
+ * eval.c (rb_thread_schedule): set main_thread->status to
+ THREAD_TO_KILL, before raising deadlock error.
-Sat Sep 18 14:10:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_thread_deadlock): if curr_thread == main_thread, do
+ not call rb_thread_restore_context()
- * 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]
+Tue May 30 23:33:41 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Fri Sep 17 20:20:27 2004 Minero Aoki <aamine@loveruby.net>
+ * lib/mkmf.rb (create_makefile): add $(TARGET).ilk and *.pdb
+ to cleanup files for mswin32.
- * lib/fileutils.rb (mkdir_p): backport from CVS HEAD 1.45. [ruby-core:03420]
+Mon May 29 10:41:10 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Fri Sep 17 17:11:08 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * file.c (rb_file_s_basename): should propagate taintness.
- * array.c (rb_ary_delete): element comparison might change array
- size. [ruby-dev:24273]
+Sun May 28 21:37:13 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * file.c (rb_file_truncate): clear stdio buffer before truncating
- the file. [ruby-dev:24191]
+ * eval.c: bug fix: DLEXT2.
- * ext/digest/digest.c: use rb_obj_class() instead of CLASS_OF
- which might return singleton class. [ruby-dev:24202]
+Sun May 28 19:21:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Sep 17 16:07:09 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * win32/win32.c: use ruby's glob.
- * ext/tk/lib/multi-tk.rb: improve exit operation
+ * dir.c: "glob" exported and renamed to "rb_glob".
-Fri Sep 17 15:01:57 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * ruby.h: ditto.
- * ext/tcltklib/tcltklib.c: fix SEGV when (thread_)vwait or
- (thread_)tkwait
+ * main.c: turn off command line mingw32's globbing.
- * ext/tk/lib/tk.rb: add alias wait_window to wait_destroy
+Wed May 25 22:25:13 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * 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/extmk.rb.in: use "ftools" instead of "rm -f".
- * ext/tk/lib/remote-tk.rb: follow the changes of ext/tk/lib/multi-tk.rb
+ * lib/mkmf.rb: ditto.
- * ext/tk/sample/remote-ip_sample2.rb: ditto
+Thu May 25 22:01:32 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/tk/sample/tkoptdb-safeTk.rb: ditto
+ * defines.h: mswin32: remove obsolete USHORT definition.
-Thu Sep 16 18:12:32 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * re.h: mswin32: use EXTERN instead of extern.
- * lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
- to request.user attribute.
+ * regex.h: mswin32: export re_mbctab properly.
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::FileHandler#initialize): should expand
- the pathname of document root directory.
+ * win32/ruby.def: add ruby_ignorecase and regex.c's exports.
-Thu Sep 16 15:49:28 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu May 25 21:28:44 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * string.c (rb_str_intern): protect string argument from GC.
- [ruby-core:03411]
+ * re.c (rb_reg_expr_str): escape un-printable character.
-Wed Sep 15 20:22:23 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu May 25 01:35:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/sample/tkoptdb-safeTk.rb: fix a bug depend on the changes
- of MultiTkIp
+ * parse.y (tokadd_escape): forgot to add `\x' to hexadecimal
+ escape sequences.
-Tue Sep 14 23:54:11 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * object.c (rb_obj_dup): dup for normal object (T_OBJECT) copies
+ instance variables only.
- * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string was en-bugged by
- the previous changes.
+Wed May 24 23:49:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 14 23:45:44 2004 Dave Thomas <dave@pragprog.com>
+ * object.c (rb_mod_initialize): should provide initialize.
- * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::TextFormatter.for):
- Add Eric Hodel's simpleformatter.
+Wed May 24 23:17:50 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Sep 14 16:59:37 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * win32/Makefile: remove unnecessary mv and rm command call.
- * ext/tcltklib/tcltklib.c: fix SEGV
+Wed May 24 21:01:04 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/tk/lib/multi-tk.rb: improve safe-level handling of argument proc
+ * ext/pty/pty.c: use "" instead of <> to include ruby.h and rubyio.h
+ for BeOS (PowerPC).
- * ext/tk/sample/multi-ip_sample.rb: rename of old 'safe-tk.rb'
+ * file.c (rb_find_file): should check dln_find_file() result.
- * ext/tk/sample/safe-tk.rb: new sample script
+ * win32/ruby.def: add rb_block_given_p.
-Tue Sep 14 00:15:15 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Wed May 24 16:32:45 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/zlib/zlib.c: backported from HEAD.
+ * io.c (rb_io_popen): popen does not take 3rd argument anymore.
-Mon Sep 13 19:16:33 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * re.c (rb_reg_desc): re may be zero, check before dereferencing.
- * eval.c (blk_copy_prev): need frame_dup(). [ruby-dev:24103]
+Wed May 24 16:03:06 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-Mon Sep 13 16:23:27 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/cgi.rb: bug fix: CGI::escape(), CGI::Cookie::new()
- * ext/tk/lib/multi-tk.rb: MultiTkIp.new_master and new_slave accept
- safe-level value argument
+ * lib/net/telnet.rb: improve: binmode(), telnetmode() interface
-Mon Sep 13 10:20:45 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed May 24 13:12:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c (nil_inspect): fix typo.
+ * misc/ruby-mode.el (ruby-parse-region): support `while .. do'
+ etc. But corresponding keywords must be at the beginning of
+ line.
-Mon Sep 13 01:03:02 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue May 23 23:50:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tcltklib/tcltklib.c: improve control of preserv/release tcltkip
+ * re.c (rb_reg_initialize_m): wrong kcode value.
- * ext/tcltklib/tcltklib.c: store original 'exit' command
+ * re.c (rb_reg_s_new): forgot to initialize re->ptr.
- * ext/tk/tkutil.c: fix(?) SEGV
+Tue May 23 08:36:24 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Sep 12 23:46:23 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * regex.c (re_compile_pattern): forgot to restore old option
+ status by (?ix-ix).
- * util.c (ruby_strdup): remove unnecessary code. (xmalloc never
- returns NULL.)
+ * regex.c (re_compile_fastmap): anychar may match newline if
+ RE_OPTION_MULTILINE or RE_OPTION_POSIXLINE is set.
- * util.c (ruby_getcwd): fix memory leak on failure.
+Mon May 22 22:45:06 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Sun Sep 12 02:41:58 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.19.
- * ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and
- allow_ruby_exit=
+ * lib/net/http.rb: do not use Regexp "p" option.
+Mon May 22 21:56:43 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * ext/tk/lib/multi-tk.rb: ditto.
+ * struct.c (rb_struct_getmember): should use ID2SYM, not INT2NUM.
- * ext/tk/lib/remote-tk.rb: ditto.
+Mon May 22 15:07:37 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tcltklib/MANUAL.euc: ditto.
+ * file.c (rb_find_file): should check if the file really exists.
- * ext/tcltklib/MANUAL.eng: ditto.
+Mon May 22 09:08:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tcltklib/tcltklib.c: fix some reasons of SEGV
+ * io.c (rb_io_popen): _exit(0) after processing block under the
+ child process.
- * ext/tk/tkutil.c: ditto.
+ * io.c (rb_io_popen): flush stdout/stderr before subprocess
+ termination.
- * ext/tk/lib/multi-tk.rb: ditto.
+ * eval.c (rb_check_safe_str): insert rb_secure(4); operation
+ requires untainted string should be prohibited in level 4.
- * ext/tk/lib/tk/timer.rb: ditto.
+Sun May 21 21:17:00 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sat Sep 11 16:09:46 2004 Dave Thomas <dave@pragprog.com>
+ * configure.in: add Setup.dj for djgpp cross-compiling.
- * lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging.
+ * Setup.dj: add readline.
-Fri Sep 10 20:20:53 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * instruby.rb: copy win32/win32.h to archlibdir on mingw32.
- * ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
- pointer conversion.
+Sun May 21 20:58:08 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Fri Sep 10 02:43:54 2004 Dave Thomas <dave@pragprog.com>
+ * pack.c: fix OFF16 and OFF32 definitions for Alpha and IRIX64.
- * lib/rdoc/generators/template/kilmer.rb: James Buck's
- patch for call-seq.
+Sun May 21 17:31:37 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Thu Sep 9 13:58:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * instruby.rb: support "make install" for cross-compiling.
- * ext/tcltklib/tcltklib.c (ip_init): change flag value for setting
- 'argv' and 'argv0' variable
+ * ext/extmk.rb.in: ditto.
- * ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb
+Sun May 21 14:22:49 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Thu Sep 9 11:46:18 2004 Dave Thomas <dave@pragprog.com>
+ * Makefile.in: rename prep.rb to fake.rb.
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow
- spaces aroun parameter to define_method_under (James Buck)
+ * configure.in: ditto.
-Wed Sep 8 18:44:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat May 20 23:29:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/stringio/stringio.c (strio_write): zero fill a gap if exsts.
- [ruby-dev:24190]
+ * dir.c (dir_s_new): does not take block; "open" does.
-Wed Sep 8 15:19:49 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * io.c (rb_io_s_new): ditto.
- * ext/tcltklib/tcltklib.c (ip_init): cannot create a IP at level 4
+Fri May 19 07:44:26 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/multi-tk.rb: improve 'exit' operation, security check,
- and error treatment
+ * dir.c (dir_s_open): Dir#open does not returns closed Dir if a
+ block is given to the method.
- * ext/tk/lib/multi-tk.rb: allow a trusted slave IP to create slave IPs
+ * re.c (rb_reg_initialize_m): Regexp::new calls initialize now.
- * ext/tk/lib/tk/listbox.rb: add TkListbox#value, value=, clear, and
- erase
+ * string.c (Init_String): String#delete_at removed.
- * ext/tk/lib/tk/text.rb: add TkText#clear and erase
+ * string.c (rb_str_aset_m): should have checked argc != 2.
-Tue Sep 7 15:17:49 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_thread_schedule): select(2) was called too many.
- * ext/socket/socket.c (ruby_connect): break immediately if a
- socket is non-blocking. [ruby-talk:111654]
+ * regex.c (re_compile_pattern): a bug in (?m) support. Pointed
+ out by Dave Thomas <Dave@thomases.com>.
-Mon Sep 6 11:08:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Thu May 18 23:55:26 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
+ * dln.c (search_undef): st_lookup()'s 3rd parameter should be
+ a pointer of the variable which has the same size and alignment
+ as `char *'.
-Mon Sep 6 11:00:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * marshal.c (w_symbol, w_object): ditto.
- * 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]
+ * parse.y (rb_intern): ditto.
-Mon Sep 6 07:51:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu May 18 18:00:35 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * eval.c (cvar_cbase): singletons should refer outer cvar scope.
- [ruby-dev:24223]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.18.
- * eval.c (rb_load): should preserve previous ruby_wrapper value.
- [ruby-dev:24226]
+ * lib/net/protocol.rb: Net::Version was removed.
-Sat Sep 4 01:14:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/smtp.rb: use Socket.gethostname to get local host name.
- * eval.c (cvar_cbase): class variables cause SEGV in
- instance_eval() for fixnums and symbols. [ruby-dev:24213]
+Thu May 18 13:34:57 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 3 17:47:58 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/socket/socket.c (ruby_connect): should not have replaced
+ thread_write_select() by rb_thread_fd_writable().
- * struct.c (make_struct): remove redefining constant when
- conflict. [ruby-dev:24210]
+Thu May 18 09:01:25 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Fri Sep 3 11:31:44 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * configure.in, ext/extmk.rb.in, lib/mkmf.rb: remove BeOS R3 support.
+ Make a shared library (libruby.so) only if the --enable-shared
+ option is specified.
- * ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow
- [ruby-dev:24207]
+ * instruby.rb: no longer use libruby.so.LIB and import.h.
-Fri Sep 3 02:12:48 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * io.c: fix READ_DATA_PENDING definition for BeOS (PowerPC).
- * ext/tcltklib/tcltklib.c: fix typo [ruby-talk:111266]
+Wed May 17 14:14:23 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk/text.rb: fix typo
+ * re.c (rb_reg_new_1): use /m instead of /p.
- * ext/tk/lib/multi-tk.rb: improve safe-level treatment on slave IPs
+Wed May 17 02:22:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 3 01:54:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_thread_polling): wait 0.06 second to let other
+ processes run.
- * ext/extmk.rb: already built-in libraries satisfy dependencies.
- [ruby-dev:24028]
+ * process.c (rb_waitpid): avoid busy wait using rb_thread_polling.
-Thu Sep 2 11:36:20 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * file.c (rb_thread_flock): ditto.
- * eval.c (rb_obj_instance_eval): backported from HEAD.
+ * parse.y (expr): avoid calling value_expr() twice.
-Wed Sep 1 21:18:25 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed May 17 00:45:57 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/lib/tk/spinbox.rb: fix typo
+ * io.c (rb_io_binmode): should check PLATFORMs, not O_BINARY, sigh...
-Tue Aug 31 18:24:04 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed May 17 00:40:15 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/tk/tkutil.c (cbsubst_init): fix memory leak
+ * win32/config.h: add DLEXT2, now DLEXT on mswin32 is "so".
- * ext/tk/tkutil.c (cbsubst_get_all_subst_keys): fix SEGV
+ * win32/config.status: ditto.
-Tue Aug 31 16:04:22 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * win32/ruby.def: add symbol "rb_big_divmod".
- * ext/tcltklib/tcltklib.c (ip_delete): when a tcltkip is deleted,
- destroy its root widget
+Tue May 16 19:45:32 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Aug 31 12:30:36 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * intern.h: use EXTERN instead of extern.
- * ext/tcltklib/tcltklib.c (del_root): fix SEGV
+ * win32/ruby.def: add rb_defout, rb_stdout, ruby_errinfo,
+ ruby_sourceline, ruby_sourcefile to work with eruby
+ reported by Hiroshi Saito <HiroshiSaito@pob.org>.
+ Export both ruby_xmalloc and xmalloc etc.
-Mon Aug 30 23:11:06 2004 Dave Thomas <dave@pragprog.com>
+Tue May 16 17:00:05 2000 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
- * lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
- if it finds the same class in multiple places.
+ * eval.c (rb_thread_select): should check whether fds are null.
-Mon Aug 30 22:40:30 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue May 16 11:51:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments
+ * io.c (pipe_open): synchronize subprocess stdout/stderr.
-Mon Aug 30 21:50:14 2004 Dave Thomas <dave@pragprog.com>
+Mon May 15 15:38:09 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c: Add RDoc for Module.included.
+ * ruby.h: exported symbols should be for xmalloc etc. are now
+ prefixed by 'ruby_', e.g. ruby_xmalloc().
-Mon Aug 30 15:10:46 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (rb_thread_select): remove busy wait for select.
- * configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
+ * dir.c (glob): trailing path may be null, e.g. glob("**").
-Mon Aug 30 11:29:35 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon May 15 14:48:41 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143]
- merge from HEAD.
+ * io.c (rb_io_pid): new method; returns nil if no process attached
+ to the IO.
-Sun Aug 29 14:08:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon May 15 01:18:20 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
+ * io.c (rb_io_s_popen): _exit after Proc execution.
- * ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work
+Sun May 14 18:05:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sat Aug 28 23:04:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * Makefile.in: missing/nt.c -> win32/win32.c
- * bignum.c (rb_big_and): protect parameters from GC.
- [ruby-talk:110664]
+ * configure.in: bug fix; static linking on mingw32.
-Thu Aug 26 04:38:29 2004 Dave Thomas <dave@pragprog.com>
+ * cygwin/GNUmakefile.in: remove VPATH.
- * eval.c (return_jump): Minor typo in error message. Now reads
- "return can't jump across threads".
+ * ext/extmk.rb.in: Makefile set binmode with mingw32 on cygwin32.
-Tue Aug 24 17:30:00 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/mkmf.rb: ditto.
- * lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
- use a session id as a filename. (backported from HEAD)
+ * win32/config.h: undef HAVE_SYS_FILE_H.
- * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
+Sun May 14 02:02:48 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
- Dir::tmpdir. (backported from HEAD)
+ * lib/irb/ruby-lex.rb: '/' should be escaped in character class.
-Tue Aug 24 14:40:16 2004 Shugo Maeda <shugo@ruby-lang.org>
+Sun May 14 00:54:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
- session id after check. (backported from HEAD)
+ * configure.in, ...: support mingw32.
-Tue Aug 24 09:09:01 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * defines.h: ditto. undef EXTERN for tcl/tk on cygwin.
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
- functions may replace the pointer indicated by the first argument.
+ * ext/*/extconf.rb: replace PLATFORM with RUBY_PLATFORM.
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+ * ext/socket/sockport.h: define IN_MULTICAST for missing IN_MULTICAST.
- * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
+ * ext/tcltklib/tcltklib.c: remove declaration of rb_argv0.
-Mon Aug 23 14:04:51 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * file.c: should check S_IXGRP, S_ISGID, not NT.
- * 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]
+ * io.c (rb_io_binmode): should check _IOBIN, O_BINARY, not PLATFORMs.
- * ext/openssl/ossl_ssl.c (ossl_ssl_write):
- - call underlying IO's syswrite if SSL session is not started.
+Sat May 13 14:21:15 2000 Koji Arai <JCA02266@nifty.ne.jp>
- * ext/openssl/ossl_ssl.c (ossl_ssl_pending): new method
- OpenSSL::SSL#pending.
+ * io.c (rb_io_s_popen): should check whether a block is given.
- * ext/openssl/lib/openssl/buffering.rb: should not use select.
+Fri May 12 17:33:44 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Aug 23 12:40:56 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regex.c (re_compile_pattern): charset_not should not exclude
+ newline from matching set.
- * lib/resolv.rb (Config.default_config_hash): when multiple domains
- are set, Win32::Resolv.get_resolv_info returns Array.
+Thu May 11 22:51:05 2000 Ryunosuke Ohshima <ryu@jaist.ac.jp>
-Sun Aug 22 01:15:31 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * pack.c (pack_pack): Bignum support.
- * lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
- should call :ProxyContentHandler before finishing CONNECT.
+ * pack.c (pack_unpack): ditto.
-Sat Aug 21 06:41:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu May 11 21:19:29 2000 Hiroshi Igarashi <iga@ruby-lang.org>
- * ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
+ * intern.h: add missing declarations of ruby API functions.
- * lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
- uniformly. [ruby-dev:24118]
+ * ruby.h: fix function name in declarations.
-Thu Aug 19 16:29:45 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu May 11 22:29:25 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
+ * ext/md5/depend: add $(topdir)/config.h dependency to md5c.o.
- * ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
+ * ext/md5/extconf.rb: new file to add -DHAVE_CONFIG_H flag for Alpha.
- * ext/tk/lib/menu.rb: typo bug.
+Thu May 11 10:55:52 2000 Ryunosuke Ohshima <ryu@jaist.ac.jp>
-Thu Aug 19 15:15:24 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * pack.c (pack_pack): packing BER compressed integer by `w'.
- * dir.c (free_dir): fix memory leak. reported by yamamoto
- madoka.
+ * pack.c (pack_unpack): unpacking BER.
-Thu Aug 19 11:00:00 2004 Akiyoshi, Masamichi <masamichi.akiyoshi@hp.com>
+Thu May 11 00:37:55 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * dln.c (dln_load): Modify to call lib$find_image_symbol for VMS.
- * io.c (rb_io_fwrite): Use fputc() for VMS non-stream file.
+ * parse.y (parse_regx): remove in_brack.
-Thu Aug 19 06:07:45 2004 why the lucky stiff <why@ruby-lang.org>
+Wed May 10 12:51:18 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * ruby.c (proc_options): move adding RUBYLIB and "." to the load
+ path after #! line parsing.
- * lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
- fixed problem with extra line feeds at end of folding, whitespace
- opening scalar blocks.
+ * parse.y (parse_regx): should parse backslash escape like `\c['
+ here to avoid causing `unterminated regexp' error.
- * lib/yaml/rubytypes.rb: subtelties in handling strings with
- non-printable characters and odd whitespace patterns.
+Wed May 10 00:19:53 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Wed Aug 18 23:41:33 2004 Minero Aoki <aamine@loveruby.net>
+ * MANIFEST, beos/GNUmakefile.in, configure.in: no longer need
+ beos/GNUmakefile.in to support BeOS R4.5.2 (Intel) as a result
+ of eban's Makefile.in change.
- * lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
- buffer, select(2) might not work. [ruby-dev:24072]
+ * io.c: NOFILE is already defined on BeOS R4.5 (Intel) or later.
-Wed Aug 18 17:10:12 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * lib/matrix.rb: remove debug print.
- * ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
- Tcl_FindExecutable() for Tcl/Tk 8.4.
+ * regex.c: don't use nested comment.
-Wed Aug 18 12:52:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue May 9 17:08:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_obj_instance_eval): evaluates under special singleton
- classes as for special constants.
+ * eval.c (massign): no longer convert nil into empty array.
-Tue Aug 17 17:20:59 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_io_s_popen): optional 3rd argument to give proc, which
+ will be executed in spawned child process.
- * io.c (rb_io_reopen): should clear allocated OpenFile. pointed
- out by Guy Decoux. [ruby-core:03288]
+Mon May 8 23:47:39 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Aug 17 01:36:32 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (rb_callcc): prev & next should be initialized to zero.
- * lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
- parsing so RDoc::usage plays better with OptionParser.
+Mon May 8 23:17:36 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Aug 14 13:09:10 2004 Minero Aoki <aamine@loveruby.net>
+ * dln.c (dln_init): remove possible buffer overrun. This is
+ suggested by Aleksi Niemela <aleksi.niemela@cinnober.com>.
- * lib/fileutils.rb: backport from CVS HEAD (rev1.44).
+ * dln.c (init_funcname): ditto.
- * lib/fileutils.rb: cp_r should copy symlink itself, except cp_r
- root.
+Sat May 6 23:35:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb: new option mv :force.
+ * parse.y (lhs): should allow `obj.Attr = 5' type expression.
- * lib/fileutils.rb: new module FileUtils::DryRun.
+Sat May 6 15:46:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sat Aug 14 02:48:16 2004 Dave Thomas <dave@pragprog.com>
+ * ext/socket/extconf.rb: add a new configure option to force use
+ of the WIDE Project's getaddrinfo(): --enbale-wide-getaddrinfo.
- * lib/rdoc/usage.rb: Added. Allows command line programs
- to report usage using their initial RDoc comment.
+Fri May 5 21:19:22 2000 MOROHOSHI Akihiko <moro@remus.dti.ne.jp>
-Fri Aug 13 13:23:17 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * parse.y (yylex): allow '$1foo' and such.
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
- fix regex for range-spec.
+Fri May 5 17:57:24 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/webrick/httpservlet/filehandler.rb
- (WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
- multipart/byteranges response was broken.
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.17.
- * lib/webrick/httpservlet/erbhandler.rb
- (WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
- by suffix of script filename.
+ * lib/net/http.rb: write also port number in Host: field.
- * lib/xmlrpc/server.rb: refine example code.
+ * lib/net/http.rb: see Proxy-Connection: to decide socket connection.
-Wed Aug 11 17:17:50 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Fri May 5 03:25:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
+ * regex.c (re_compile_fastmap): charset_not for multibyte
+ characters excluded too many characters.
-Sun Aug 8 00:43:31 2004 why the lucky stiff <why@ruby-lang.org>
+Tue May 2 13:23:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/implicit.c: added sexagecimal float#base60.
+ * eval.c (rb_thread_schedule): little bit more impartial context
+ switching.
- * ext/syck/rubyext.c (yaml_org_handler): ditto.
+Tue May 2 09:50:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/token.c: indentation absolutely ignored when processing flow
- collections. plain scalars are trimmed if indentation follows in
- an ambiguous flow collection.
+ * configure.in: add DLDLIBS to set platform specific library
+ for extensions.
-Sat Aug 7 00:50:01 2004 Tanaka Akira <akr@m17n.org>
+ * ext/extmk.rb.in: use @DLDLIBS@ instead of RUBY_PLATFORM choice.
- * ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
+ * lib/mkmf.rb: use CONFIG["DLDLIBS"] instead of RUBY_PLATFORM choice.
-Tue Aug 3 13:49:20 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * config_s.dj: add @DLDLIBS@.
- * ext/tk/lib/tk/namespace.rb: bug fix
+ * win32/config.status: ditto.
- * ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
+ * win32/ruby.def: regular maintenance.
-Mon Aug 2 18:04:21 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon May 1 23:42:44 2000 WATANABE Hirofumi <eban@os.rim.or.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.)
+ * configure.in, eval.c: add DLEXT2. now DLEXT on Cygwin is "so".
-Mon Aug 2 11:53:06 2004 Dave Thomas <dave@pragprog.com>
+ * defines.h: use dllimport, dllexport for Cygwin 1.1.x.
- * lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
- looking up some top level symbols (batsman)
+ * ruby.h: ditto.
-Mon Aug 2 11:48:29 2004 Dave Thomas <dave@pragprog.com>
+ * cygwin/GNUmakefile.in: ditto.
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Allow '.'s in
- variable names to support SWIG generated files (Hans Fugal)
+ * ext/Win32API/Win32API.c: directly "call" in asm statement for
+ gcc 2.95.x or newer.
-Sat Jul 31 17:40:16 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Apr 29 04:58:12 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * 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.
+ * array.c (rb_ary_unshift_m): performance improvement.
-Sat Jul 31 05:47:37 2004 why the lucky stiff <why@ruby-lang.org>
+Fri Apr 28 00:19:22 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
+ * array.c (rb_ary_unshift_m): takes items to push.
- * lib/yaml/rubytypes.rb: exceptions were using an older
- YAML.object_maker. [ruby-core:03080]
+Wed Apr 26 15:23:02 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * string.c (rb_str_succ): insert carrying character just before
+ the leftmost alpha numeric character.
- * ext/syck/token.c: re2c compiled with bit vectors now.
- * ext/syck/implicit.c: ditto.
- * ext/syck/bytecode.c: ditto.
+ * string.c (rb_str_succ): proper behavior for "".succ and "\377".succ.
-Fri Jul 30 16:10:54 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * string.c (rb_str_succ): use realloc and memmove.
- * ext/tcltklib/tcltklib.c (lib_fromUTF8_core): raise ArgumentError when
- the unknown encoding name is given.
+Tue Apr 25 18:28:45 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tcltklib/tcltklib.c (lib_toUTF8_core): ditto.
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.16.
- * ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertfrom): bug fix.
+ * lib/net/smtp.rb: add SMTP AUTH
- * ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertto): ditto.
+Tue Apr 25 14:30:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jul 28 18:59:17 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_io_gets_internal): shortcut when rs == rb_default_rs.
- * lib/cgi.rb (CGI::initialize): remove at_exit code for CGI_PARAMS
- and CGI_COOKIES. they will no longer be used.
+Sat Apr 22 23:14:41 2000 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-Wed Jul 28 01:04:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: MacOS X support.
- * gc.c (run_final): wrong order of data. [ruby-dev:23984]
+Sat Apr 22 16:37:10 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Tue Jul 27 07:05:04 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.15.
- * eval.c (rb_eval): copy on write for argument local variable
- assignment.
+ * lib/net/http.rb: closing socket by watching both
+ user header and server response
- * eval.c (assign): ditto.
+Fri Apr 21 21:44:34 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * eval.c (rb_call0): update ruby_frame->argv with the default
- value used for the optional arguments.
+ * io.c (rb_io_s_pipe): should set FMODE_SYNC.
- * object.c (Init_Object): "===" calls rb_obj_equal() directly.
- [ruby-list:39937]
+Thu Apr 20 16:59:22 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Mon Jul 26 11:22:55 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (massign): `*lvalue = false' should assign `[false]' to
+ lvalue.
- * lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
- escape space.
+Wed Apr 19 08:35:08 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Jul 25 11:05:21 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * class.c (rb_singleton_class): generate singleton class for
+ special constants: nil, true, false.
- * 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]
+Wed Apr 19 02:09:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Jul 24 13:32:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * class.c (rb_singleton_class): singleton method for nil, true,
+ false is possible now.
- * range.c (rb_range_beg_len): returns Qnil only when "beg" points
- outside of a range. No boundary check for "end".
+ * eval.c (rb_eval): ditto.
-Fri Jul 23 16:40:25 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Apr 18 18:54:25 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * gc.c (define_final): should not disclose NODE* to Ruby world.
- [ruby-dev:23957]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.14.
-Fri Jul 23 09:03:16 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/http.rb: new method HTTP#head2.
- * lib/net/imap.rb (disconnected?): new method. (backported from HEAD)
+ * lib/net/http.rb: get2/post2 does not raise exceptions.
-Thu Jul 22 16:41:54 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Apr 17 15:16:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/cgi/session.rb (CGI::Session::FileStore#update): sets the
- permission of the session data file to 0600.
+ * io.c (rb_io_close): to detect some exceptional status, writable
+ IO should be flushed before close;
- * lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
- ditto.
+Sat Apr 15 18:29:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Jul 22 00:02:21 2004 Masahiro Kitajima <katonbo@katontech.com>
+ * array.c (rb_ary_collect_bang): Array#filter renamed.
- * process.c (rb_f_system): not need to call last_status_set() any
- longer on _WIN32.
+Fri Apr 14 19:47:11 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Tue Jul 20 09:15:17 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.13.
- * test/fileutils/test_fileutils.rb: File.link raises EINVAL on BeOS.
+ * lib/net/pop.rb: accept illegal timestamp
-Mon Jul 19 01:15:07 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * lib/net/http.rb: when body was chunked, does not set Content-Length:
- * lib/webrick/httpservlet/cgihandler.rb
- (WEBrick::HTTPServlet::CGIhandler#do_GET): set SystemRoot environment
- variable to CGI process on Windows native platforms. [ruby-dev:23936]
+Tue Apr 11 21:14:42 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/webrick/httpservlet/cgihandler.rb
- (WEBrick::HTTPServlet::CGIhandler#do_GET): use $?.exitstatus and
- refine log message.
+ * config_s.dj: add @sitedir@.
+ * configure.in: add --with-sitedir=DIR option.
+ * instruby.rb: use CONFIG["sitedir"].
+ * lib/mkmf.rb: support 'make site-install'.
+ * win32/config.status: add @sitedir@.
-Sun Jul 18 16:14:29 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Apr 11 16:25:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
- ( wrong number of argument )
+ * bignum.c (rb_big_2comp): unnecessary lvalue cast removed.
-Sun Jul 18 08:13:58 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Apr 11 02:25:53 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * sprintf.c (rb_f_sprintf): remove extra sign digit.
+ * hash.c (env_fetch): new method.
-Sun Jul 18 03:21:42 2004 Akinori MUSHA <knu@iDaemons.org>
+ * marshal.c (marshal_dump): accepts depth = nil for unlimited depth.
- * dir.c (range): use NULL instead of 0.
+Sun Apr 9 20:49:19 2000 Dave Thomas <Dave@Thomases.com>
- * dir.c (range): get rid of a gcc 3.4 warning.
+ * parse.y (str_extend): Allow class variables to be expanded.
-Sun Jul 18 03:12:11 2004 Shugo Maeda <shugo@ruby-lang.org>
+Fri Apr 7 02:03:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/net/imap.rb (receive_responses): return if a LOGOUT response
- received. (backported from HEAD)
- * lib/net/imap.rb (send_string_data): wait command continuation
- requests before sending octet data of literals. (backported from HEAD)
+ * error.c (rb_sys_fail): escape non-printable characters.
-Sat Jul 17 23:54:59 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu Apr 6 20:10:47 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/tk/lib/tk/variable.rb: TkVariable#ref returns a TkVariable object
+ * ext/extmk.rb.in (create_makefile): BeOS --program-suffix support.
+ * lib/mkmf.rb (create_makefile): ditto.
-Sat Jul 17 22:04:44 2004 akira yamada <akira@ruby-lang.org>
+Thu Apr 6 09:55:26 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/uri/ldap.rb: method hierarchical? should be in URI::LDAP.
+ * error.c (rb_sys_fail): need rb_exc_new2() call on BeOS.
-Sat Jul 17 18:29:07 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Apr 3 17:22:27 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * parse.y (stmt): not to show same error messages twice.
+ * io.c (rb_io_reopen): support tempfile.
-Sat Jul 17 13:13:32 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (catch_i): should supply argument.
- * lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not
- process expression interpolation. [ruby-talk:106691]
+Sat Apr 1 22:50:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Jul 17 05:26:27 2004 Dave Thomas <dave@pragprog.com>
+ * marshal.c (r_object): wrong symbol restoration.
- * lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
- client-side imagemao patch
+Sat Apr 1 21:30:53 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sat Jul 17 01:57:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c(rb_io_printf, rb_f_printf): should use rb_io_write.
- * eval.c (THREAD_ALLOC): th->thread should be initialized to NULL.
- [ruby-talk:106657] The solution was found by Guy Decoux.
+Sat Apr 1 00:16:05 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Jul 16 22:30:28 2004 Michael Neumann <mneumann@ntecs.de>
+ * gc.c (rb_gc_call_finalizer_at_exit): should be clear flags
+ before calling finalizers.
- * file.c (rb_stat_dev_major): new methods File::Stat#dev_major and
- #dev_minor. [ruby-core:03195]
+ * eval.c (specific_eval): can be called without SecurityError, if
+ $SAFE >= 4.
-Fri Jul 16 15:23:53 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (sym_inspect): inspect gives ":sym", to_s gives "sym".
- * eval.c (return_jump, break_jump): raise unexpceted local jump
- exception directly. [ruby-dev:23740]
+Fri Mar 31 22:07:04 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/base64.rb (Deprecated): super in bound method calls original
- name method in stable version. [ruby-dev:23916]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.12.
-Fri Jul 16 11:31:49 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/net/protocol.rb: update Net::Protocol::Proxy#connect
- * lib/test/unit/ui/{fox,gtk,gtk2}/testrunner.rb: remove
- garbage (patch from akira yamada) [ruby-dev:23911]
+ * lib/net/protocol.rb: ReplyCode is not a class
-Fri Jul 16 11:20:00 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * lib/net/http.rb: header value format was change:
+ values do not include header name
- * sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
- "%f" or etc on MSVCRT platforms. (backported from HEAD)
+ * lib/net/http.rb: header is not a Hash, but HTTPResponse
-Fri Jul 16 11:17:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 30 12:19:44 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
- [ruby-dev:23913]
+ * enum.c (enum_find): rb_eval_cmd() should be called with array.
- * error.c (exit_success_p): new method SystemExit#success?.
- [ruby-dev:23912]
+Tue Mar 28 13:57:05 2000 Clemens Hintze <c.hintze@gmx.net>
- * error.c (syserr_initialize): initialization for subclasses.
- [ruby-dev:23912]
+ * ext/dbm/dbm.c (fdbm_invert): should return new hash.
-Thu Jul 15 23:53:38 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/gdbm/gdbm.c (fgdbm_invert): ditto.
- * lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception
- no longer has to_str method.
+Tue Mar 28 00:58:03 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu Jul 15 22:59:48 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.11.
- * ext/readline/extconf.rb: added dir_config for curses, ncurses,
- termcap. (backported from HEAD)
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: does not
+ dispatch any commands while dispatching command.
-Thu Jul 15 20:29:15 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * lib/net/protocol.rb: failed to get error class of
+ inherited ReplyCode
- * class.c, error.c, eval.c, intern.h, object.c, variable.c:
- do not set path if it is a singleton class. [ruby-dev:22588]
- (backport from 1.9)
+ * lib/net/http.rb: change feature of "get2", "post2"
-Thu Jul 15 10:15:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Mar 27 01:34:58 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/, ext/tcltklib/: bug fix
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.10.
- * 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.
+ * lib/net/http.rb: return value of 'head' was wrong.
- * ext/tk/lib/tk/validation.rb: add Tk::ValidateConfigure.__def_validcmd
- to define validatecommand methods easier
+Sun Mar 26 17:47:35 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/lib/tk.rb (_genobj_for_tkwidget): support autoload Tk ext
- classes
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.9.
- * 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.
+ * lib/net/smtp.rb: SMTP#do_ready wrongly took no arguments
- * ext/tk/lib/tkextlib/: add Iwidget and TkTable extension support
+Sat Mar 25 23:21:10 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/sample/tkextlib/: add samples of Iwidget and TkTable
+ * marshal.c (w_object): symbols should be converted to ID before
+ dumping out.
+Sun Mar 25 16:52:48 2001 Koji Arai <JCA02266@nifty.ne.jp>
-Wed Jul 14 18:08:37 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * file.c (rb_file_flock): do not trap EINTR.
- * ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
- argument. [ruby-dev:23891]
+ * missing/flock.c (flock): returns the value from lockf(2)
+ directly.
- * test/openssl/test_x509store.rb: prune tests for CRL checking
- unless X509::V_FLAG_CRL_CHECK is defined.
+Fri Mar 24 18:26:51 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jul 14 12:29:07 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * file.c (test_check): should have checked exact number of arguments.
- * 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]
+Fri Mar 24 21:02:11 2000 Koji Arai <JCA02266@nifty.ne.jp>
- * test/ruby/test_float.rb (test_strtod): add test for bug fix.
+ * signal.c (trap): should treat some symbols as the signal.
-Wed Jul 14 00:31:15 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Mar 24 06:58:03 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * array.c: rdoc patch. merged patch from Johan Holmberg
- <holmberg@iar.se> [ruby-core:3170]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.8.
-Tue Jul 13 19:39:12 2004 akira yamada <akira@ruby-lang.org>
+ * lib/net/http.rb: post, get2, post2, get_body
- * 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]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: separate
+ Command/Socket documentation.
- * test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
+Thu Mar 23 02:26:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Jul 13 15:51:45 2004 Akinori MUSHA <knu@iDaemons.org>
+ * io.c (rb_io_fptr_finalize): fptr may be null.
- * lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
- extmk mode.
+ * io.c (rb_io_s_new): now calls `initialize'.
- * lib/mkmf.rb (dir_config): Prepend a new library path instead of
- appending so it is tried first.
+ * io.c (rb_io_initialize): actual open done in this method.
-Tue Jul 13 00:50:48 2004 Dave Thomas <dave@pragprog.com>
+ * io.c (rb_file_initialize): ditto.
- * lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
+ * eval.c (rb_eval): class variables in singleton class definition
+ is now handled properly (I hope).
-Mon Jul 12 21:20:36 2004 Dave Thomas <dave@pragprog.com>
+Wed Mar 22 21:49:36 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * html_generator.rb: Support hyperlinks of the form {any text}[xxx]
- as well as stuff[xxx]
+ * st.c (st_delete_safe): skip already deleted entry.
-Sat Jul 10 09:30:24 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * hash.c (rb_hash_delete): modify brace miss.
- * test/soap/marshal/test_struct.rb: use qualified build-tin class name
- (::Struct) to avoid name crash.
+Wed Mar 22 08:53:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Jul 10 04:21:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (exec_under): do not push cbase if ruby_cbase == under.
- * 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.
+ * node.h (NEW_CREF0): preserve cbase nesting.
- * ext/tk/lib/tk/validation.rb (__def_validcmd): add a module
- function of Tk::ValidateConfigure to define validatecommand
- methods easier
+Tue Mar 21 12:57:50 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Jul 9 22:36:36 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * object.c (rb_class_s_new): Class::new should call `inherited'.
- * array.c, enum.c, pack.c: rdoc patch from Johan Holmberg
- <holmberg@iar.se> [ruby-core:3132] [ruby-core:3136]
+Sat Mar 18 12:36:09 2000 Nobuyoshi Nakada <nobu.nokada@softhome.net>
- * numeric.c: rdoc patch.
+ * eval.c (rb_backtrace, make_backtrace): removed unused variable
+ `lev'.
-Fri Jul 9 19:26:39 2004 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_attr): calls `method_added' at attribute definition.
- * lib/open-uri.rb (URI::HTTPS#proxy_open): raise ArgumentError to
- notice https is not supported.
+ * eval.c (rb_mod_modfunc): calls `singleton_method_added' while
+ `module_function'.
-Fri Jul 9 14:28:54 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_eval): parameter to `method_added' and
+ `singleton_method_added' is Symbol.
- * 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]
+ * eval.c (Init_eval): caches IDs for `method_added' and
+ `singleton_method_added'.
-Fri Jul 9 01:47:08 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sat Mar 18 11:25:10 2000 Yukihiro Matsumoto <matz@netlab.co.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]
+ * parse.y (rescue): allows `rescue Error in foo'. experimental.
+ which is better this or preparing alias `exception' for `$!'?
-Thu Jul 8 22:52:19 2004 Kouhei Sutou <kou@cozmixng.org>
+Fri Mar 17 15:02:45 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * variable.c (rb_autoload_id): defining new autoload should be
+ prohibited for $SAFE > 4.
-Thu Jul 8 00:05:23 2004 akira yamada <akira@ruby-lang.org>
+ * variable.c (rb_autoload_load): autoload should be possible for
+ $SAFE > 4.
- * lib/tempfile.rb (Tempfile::initialize): got out code of
- generating tmpname. [ruby-dev:23832][ruby-dev:23837]
+ * eval.c (call_trace_func): should handle T_ICLASS properly.
-Wed Jul 7 15:53:14 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Mar 17 14:34:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * string.c (rb_str_match): raise TypeError when both arguments are
- strings. [ruby-dev:22869] (backported from HEAD)
+ * string.c (str_gsub): forgot to initialize str->orig.
- * string.c (rb_str_match2): removed.
+Fri Mar 17 01:24:59 2000 Dave Thomas <Dave@thomases.com>
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
- wince/Makefile.sub (string.c): now not depend on version.h.
+ * string.c (rb_str_clone): forgot to copy str->orig if STR_NO_ORIG
+ is set by Array#pack.
-Wed Jul 7 00:48:34 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Wed Mar 15 21:25:04 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * ext/tk/lib/tkextlib/tktrans.rb,
- ext/tk/lib/tkextlib/treectrl.rb: fix syntax errors.
+ * array.c (rb_ary_join): 'result' is always duplicated
+ before concat string.
-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:27:32 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
-
- * lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
- the socket whose last-access-time is oldest. (and add new one)
- [ruby-dev:23860]
-
-Sun Jul 4 12:24:50 2004 Kouhei Sutou <kou@cozmixng.org>
-
- * lib/rss/rss.rb: added copyright header.
-
-Sun Jul 4 00:24:40 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * added files
- * lib/soap/attachment.rb
- * lib/soap/header
- * lib/soap/mimemessage.rb
- * lib/soap/rpc/httpserver.rb
- * lib/wsdl/soap/cgiStubCreator.rb
- * lib/wsdl/soap/classDefCreator.rb
- * 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/soap/calc/samplehttpd.conf
- * sample/soap/exchange/samplehttpd.conf
- * sample/soap/sampleStruct/samplehttpd.conf
- * sample/wsdl/raa2.4
- * sample/wsdl/googleSearch/samplehttpd.conf
- * test/openssl/_test_ssl.rb
- * test/soap/header
- * test/soap/ssl
- * test/soap/struct
- * test/soap/swa
- * test/soap/wsdlDriver
- * test/wsdl/multiplefault.wsdl
- * test/wsdl/simpletype
- * test/wsdl/test_multiplefault.rb
-
- * modified files
- * lib/soap/baseData.rb
- * lib/soap/element.rb
- * lib/soap/generator.rb
- * lib/soap/marshal.rb
- * lib/soap/netHttpClient.rb
- * lib/soap/parser.rb
- * lib/soap/processor.rb
- * lib/soap/property.rb
- * lib/soap/soap.rb
- * lib/soap/streamHandler.rb
- * 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/element.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/calc/httpd.rb
- * sample/soap/exchange/httpd.rb
- * sample/soap/sampleStruct/httpd.rb
- * sample/soap/sampleStruct/server.rb
- * sample/wsdl/amazon/AmazonSearch.rb
- * sample/wsdl/amazon/AmazonSearchDriver.rb
- * sample/wsdl/googleSearch/httpd.rb
- * test/soap/test_basetype.rb
- * test/soap/test_property.rb
- * test/soap/test_streamhandler.rb
- * test/soap/calc/test_calc.rb
- * test/soap/calc/test_calc2.rb
- * test/soap/calc/test_calc_cgi.rb
- * test/soap/helloworld/test_helloworld.rb
- * test/wsdl/test_emptycomplextype.rb
- * test/wsdl/axisArray/test_axisarray.rb
- * test/wsdl/datetime/test_datetime.rb
- * test/wsdl/raa/test_raa.rb
- * test/xsd/test_xmlschemaparser.rb
- * test/xsd/test_xsd.rb
-
- * summary
- * add SOAP Header mustUnderstand support.
-
- * 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.
-
- * add SOAP with Attachment support.
-
-Sat Jul 3 17:19:44 2004 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/tk/lib/tkextlib/tkDND.rb: fix syntax error.
-
-Thu Jul 1 23:15:29 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/pstore.rb (transaction): safer backup scheme. [ruby-list:39102]
-
- * lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
- [ruby-dev:23157]
-
- * lib/pstore.rb (transaction): allow overriding dump and load.
- [ruby-dev:23567]
-
- * lib/pstore.rb (PStore#transaction): get rid of opening in write mode
- when read only transaction. [ruby-dev:23842]
-
- * lib/yaml/store.rb: follow lib/pstore.rb's change.
+Wed Mar 15 17:26:05 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Jul 1 18:36:08 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * hash.c (rb_hash_s_create): unexpected recursive call removed.
+ this bug was found by Satoshi Nojo <nojo@t-samukawa.or.jp>.
- * ext/tk/lib/tcltklib : bug fix
+Wed Mar 15 13:12:39 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries
+ * eval.c (Init_Thread): Thread.join removed finally.
-Thu Jul 1 11:59:45 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * string.c (rb_str_chomp_bang): forgot to call rb_str_modify().
- * 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.
+Mon Mar 13 16:12:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/openssl_missing.c (EVP_CIPHER_CTX_copy): new function.
+ * eval.c (block_pass): distinguish real orphan block and still
+ on-stack block passed by block argument.
- * 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.
+Mon Mar 13 00:20:25 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
- re-implemnt (the arguments for this method is ).
+ * parse.y (f_norm_arg): proper error message when constant comes
+ in formal argument list. this message is suggested by Muvaw
+ Pnazte <bugathlon@yahoo.com>.
- * ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
- OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
+ * eval.c (rb_f_raise): proper error message when the first
+ argument is not an exception class/object.
- * ext/openssl/ossl_cipher.c (ossl_cipher_alloc, ossl_cipher_initialize,
- ossl_cipher_copy, ossl_cipher_reset ossl_cipher_final,
- ossl_cipher_set_key, ossl_cipher_set_iv): replace all EVP_CipherInit
- and EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
- and EVP_CIPHER_CTX_init should only be called once.
+ * string.c (rb_str_dup): dup now postpone buffer copy as long as
+ possible. performance improved by lazy copying.
- * ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
- OpenSSL::Cipher::Cipher#key_len=.
+Sun Mar 12 13:58:52 2000 Koji Arai <JCA02266@nifty.ne.jp>
- * ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new
- finction; print warning for Cipher#<<.
+ * signal.c (rb_f_kill): should treat some symbols as the signal.
- * 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.
+Sat Mar 11 22:03:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_digest.c (digest_final): should call
- EVP_MD_CTX_cleanup to avoid memory leak.
+ * string.c (rb_str_gsub): performance tune by avoiding buffer copy.
- * 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.
+ * eval.c (rb_f_missing): check if argv[0] is ID.
- * ext/openssl/ossl_hmac.c (hmac_final): should call
- HMAC_CTX_cleanup to avoid memory leak.
+Sat Mar 11 15:49:41 2000 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * test/openssl/test_cipher.rb, test/openssl/test_digest.rb,
- test/openssl/test_hmac.rb: new file.
+ * struct.c (rb_struct_aref): struct aref by symbol.
-Thu Jul 1 04:08:30 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Sat Mar 11 05:07:11 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
- workaround for the versions earlier than OpenSSL-0.9.7.
+ * process.c (proc_setpriority): should return 0, not nil.
-Thu Jul 1 03:33:55 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * process.c (proc_setpgid): ditto.
- * ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
- empty pkey object if no argument is passed. [ruby-talk:103328]
+Fri Mar 10 18:14:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
+ * file.c (path_check_1): confusing buf and path. this bug found
+ by <decoux@moulon.inra.fr>.
- * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
+Fri Mar 10 09:37:49 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * 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=.
+ * MANIFEST: add beos/GNUmakefile.in.
+ * configure.in: support BeOS R4.5.2 (Intel).
+ * beos/GNUmakefile.in: new file to support BeOS R4.5.2 (Intel).
- * ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
- OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
- OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
- OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
- OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
+Thu Mar 9 11:13:32 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Jul 1 03:16:09 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * regex.c (re_compile_fastmap): fixed embarrassing brace bug.
- * ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
- to specify a string to be written.
+Thu Mar 9 01:36:32 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
- take optional second argument to specify a string to be written.
+ * missing/flock.c: emulate missing flock() with fcntl().
- * ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
- refine regexp for end-of-line.
+Thu Mar 9 00:29:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/opnessl/lib/openssl/ssl.rb
- (OpenSSL::SSL::SocketForwarder#listen): fix typo.
+ * object.c (sym_to_s): returns ":sym".
-Wed Jun 30 11:38:51 2004 Mikael Brockman <phubuh@phubuh.org>
+ * object.c (sym_id2name): separated from to_s; returns "sym".
- * parse.y (primary): should not be NULL. [ruby-core:03098]
+Wed Mar 8 19:16:19 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Wed Jun 30 02:53:24 2004 why the lucky stiff <why@ruby-lang.org>
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.7.
- * ext/syck/rubyext.c (syck_emitter_new): set buffer after
- Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
+ * lib/net/http.rb (connecting): returns header
-Tue Jun 29 10:31:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Mar 8 02:08:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_eval_cmd, rb_thread_trap_eval): restore safe level.
+ * parse.y: escape expansion too early.
- * gc.c (define_final, run_final): preserve and restore safe level for
- finalizers. [ruby-core:03058]
+ * string.c (rb_f_scan): Kernel#scan added.
- * signal.c (signal_exec, rb_trap_exit, trap): preserve and restore
- safe level for signal handlers. [ruby-dev:23829]
+ * regex.c (re_compile_pattern): support \cX et al.
-Mon Jun 28 14:57:56 2004 Jeff Mitchell <quixoticsycophant@yahoo.com>
+Tue Mar 7 01:44:27 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
- DOSISH compilers. [ruby-core:03107]
+ * io.c (set_stdin): simplified procedure, allows $stdin = DATA;
+ experimental.
-Mon Jun 28 00:30:19 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * io.c (set_outfile): ditto.
- * sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
+ * re.c (Init_Regexp): new method Regexp#last_match added; it's an
+ alternative for $~.
-Sun Jun 27 22:39:51 2004 Kouhei Sutou <kou@cozmixng.org>
+ * configure.in (DEFAULT_KCODE): KCODE_NONE should be the default.
- * sample/rss/tdiary_plugin/rss-recent.rb: supported Hiki.
+ * dir.c (dir_s_rmdir): should return 0 on success.
-Sun Jun 27 12:19:46 2004 Kouhei Sutou <kou@cozmixng.org>
+ * signal.c: remove CWGUSI support.
- * {lib,sample,test}/rss: added RSS Parser. [ruby-dev:23780]
+Mon Mar 6 12:28:37 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Jun 26 11:07:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * marshal.c (w_symbol): support symbol object.
- * configure.in (aix): -b must come at the start of the command line,
- and -e must not appear while testing libraries. [ruby-talk:104501]
+ * util.c: make symbol as separated class.
- * lib/mkmf.rb (dir_config): quote directory names if necessary.
- [ruby-talk:104505]
+ * error.c (Init_Exception): new exception RangeError.
-Fri Jun 25 15:33:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (ip_addrsetup): should check length of hostname.
- * ext/iconv/extconf.rb: check stricter. [ruby-talk:104501]
+ * ext/socket/socket.c (ip_addrsetup): check newline at the end of
+ hostname. These fixes suggested by Muvaw Pnazte <bugathlon@yahoo.com>.
- * ext/iconv/extconf.rb: include iconv.h for libiconv. [ruby-dev:22715]
+Sun Mar 5 20:35:45 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Jun 25 08:31:29 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/Win32API/Win32API.c (Win32API_initialize): should call
+ LoadLibrary() everytime and should assign the hdll to Win32API
+ object(protect the hdll from GC).
- * eval.c (rb_thread_atfork): remove "fork terminates thread"
- warning. [ruby-dev:23768]
+Sun Mar 5 18:49:06 2000 Nakada.Nobuyoshi <nobu.nokada@softhome.net>
- * object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
- [ruby-core:02786][ruby-core:03067]
+ * misc/ruby-mode.el (ruby-parse-region): not treat method `begin'
+ and `end' as reserved words.
- * ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
- should give us packed address, not struct sockaddr.
- [ruby-core:03053]
+ * misc/ruby-mode.el (ruby-font-lock-docs): ignore after `=begin'
+ and `=end'.
-Fri Jun 25 02:04:23 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
+ added `yield' to keywords.
- * {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
- including version.h. [ruby-talk:104456] (backported from HEAD)
+ * misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
+ matches keywords at end of buffer.
-Thu Jun 24 14:23:29 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 5 18:08:53 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * io.c (rb_io_fread): return already read data when system call is
- interrupted. [ruby-talk:97206]
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.6.
-Thu Jun 24 01:32:43 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * lib/net/http.rb: allow to omit 'start'
- * version.h: added declarations of ruby_version,
- ruby_release_date, ruby_platform.
- (backported from HEAD)
+Tue Feb 29 01:08:26 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jun 23 22:23:37 2004 Dave Thomas <dave@pragprog.com>
+ * range.c (range_initialize): initialization done in `initialize';
+ `initialize' should not be called more than once.
- * ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem
- with OS X not returning 'from' parameter to recvfrom for
- connection-oriented sockets.
+ * object.c (Init_Object): default `initialize' should take zero
+ argument.
-Wed Jun 23 01:45:27 2004 Dave Thomas <dave@pragprog.com>
+ * time.c (time_s_new): call `initialize' in Time::new.
- * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
- Fix problem with the 'r' being dropped from %r{xxx}
+Sat Feb 26 22:39:31 2000 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-Wed Jun 23 00:20:20 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * string.c (rb_str_times): fix String#* with huge string.
- * ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
- CRs and LFs. (doesn't depend on CR+LF) [ruby-dev:23749]
+Sat Feb 26 00:14:59 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jun 23 00:00:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (dir_s_new): call `initialize' in Dir::new.
- * io.c (rb_io_initialize): should check fcntl result. [ruby-dev:23742]
+Fri Feb 25 23:01:49 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Jun 22 21:11:36 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * ruby.h: export ruby_safe_level by EXTERN for mswin32.
+ * win32/ruby.def: regular maintenance.
- * ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
- dLibraries().
+Fri Feb 25 22:12:46 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/win32ole/win32ole.c (ole_event_free): ditto.
+ * io.c (rb_io_reopen): IO#reopen should accept path as well.
- * ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
- before CR.
+ * string.c (rb_str_s_new): call `initialize' in String::new.
-Tue Jun 22 16:47:42 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * hash.c (rb_hash_s_new): call `initialize' in Hash::new.
- * lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
- Thanks, Rutger Nijlunsing.
+ * array.c (rb_ary_s_new): call `initialize' in Array::new.
-Mon Jun 21 10:19:23 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Feb 25 12:50:20 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * win32/win32.c (rb_w32_opendir): use FindFirstFile()/FindNextFile()/
- FindClose() instead of _findfirst()/_findnext()/_findclose().
- merge from HEAD.
+ * eval.c (rb_thread_start_timer): interval changed to 10ms from 50ms.
-Sat Jun 19 13:24:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Feb 25 06:42:26 2000 GOTOU YUUZOU <gotoyuzo@notwork.org>
- * eval.c (method_call): allow changing $SAFE. [ruby-dev:23713]
+ * ext/socket/socket.c (ip_addrsetup): hostp should remain NULL if
+ host is nil.
-Fri Jun 18 23:12:22 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 24 16:53:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
- safe level.
+ * eval.c (rb_thread_schedule): priority check for sleep expired
+ threads needed.
-Wed Jun 16 23:05:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Feb 23 14:22:32 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c (rb_mod_freeze): prepare string representation before
- freezing. [ruby-talk:103646]
+ * array.c (rb_ary_join): forgot to initialize a local variable
+ `taint'.
-Wed Jun 16 16:04:40 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 22 07:40:55 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c (rb_mod_le): singleton class inherits Class rather than its
- object's class. [ruby-dev:23690]
+ * re.c (Init_Regexp): renamed to MatchData, old name MatchingData
+ remain as alias.
-Wed Jun 16 16:01:17 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 22 00:20:21 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * gc.c (stack_grow_direction): memoize the direction.
+ * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.5.
- * gc.c (Init_stack): should always move to end of VALUE.
+ * lib/net/session.rb: rename to protocol.rb
-Tue Jun 15 12:10:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/protocol.rb: ProtocolSocket -> Net::Socket
- * ext/tk/lib/tk.rb: bug fix (TkWindow#grab)
+ * lib/net/protocol.rb: Net::Socket#write, write_pendstr
+ can take block
-Mon Jun 14 18:23:27 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/smtp.rb: new methods SMTP#ready SMTPCommand#write_mail
- * ext/tk/lib/remote-tk.rb: bug fix
+ * lib/net/pop.rb: POPMail#pop can take block
-Sun Jun 13 00:23:04 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sat Feb 19 23:58:51 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tcltklib/extconf.rb: [EXPERIMENTAL] MacOS X (darwin) support
+ * regex.c (re_match): pop_loop should not pop at forward jump.
- * ext/tcltklib/tcltklib.c: fix thread trouble on callback proc, and
- eliminate warning about instance variable access
+Fri Feb 18 17:15:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk/menubar.rb: improve supported menu_spec
+ * eval.c (method_clone): method objects are now clonable.
- * ext/tk/lib/tk/menuspec.rb: [add] menu_spec support library
+Fri Feb 18 00:27:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk/root.rb: add menu_spec support
+ * variable.c (rb_shared_variable_declare): shared variable (aka
+ class/module variable) introduced. prefix `@@'. experimental.
- * ext/tk/lib/tk/text.rb: bug fix
+ * class.c (rb_scan_args): new format char '&'.
- * ext/tk/lib/tk/toplevel.rb: add menu_spec support
+Thu Feb 17 19:09:05 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/tk/sample/menubar?.rb: [add] sample of menu_spec usage
+ * win32/win32.c (mypopen): don't close handle if it is not assigned.
+ * win32/win32.c (my_open_osfhandle): support O_NOINHERIT flag.
+ * win32/win32.c (win32_getcwd): rename getcwd to win32_getcwd
+ in order to avoid using the C/C++ runtime DLL's getcwd.
+ Use CharNext() to process directory name.
+ * win32/win32.h: map getcwd to win32_getcwd.
-Sat Jun 12 11:15:53 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Wed Feb 16 00:32:49 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in (target_os): strip -gnu suffix on Linux.
+ * eval.c (method_arity): nd_rest is -1 for no rest argument.
-Fri Jun 11 17:08:21 2004 Akinori MUSHA <knu@iDaemons.org>
+ * process.c (proc_waitpid): returns nil when waitpid(2) returns 0.
- * config.guess: Restore a wrongly removed hyphen.
+Tue Feb 15 01:47:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Jun 11 14:30:08 2004 Akinori MUSHA <knu@iDaemons.org>
+ * process.c (rb_f_waitpid): pid_t should be signed.
- * config.guess: Attempt to avoid system name change on
- Darwin platforms also.
+Mon Feb 14 13:59:01 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Jun 11 14:22:45 2004 Akinori MUSHA <knu@iDaemons.org>
+ * parse.y (yylex): yylex yields wrong tokens for `:foo=~expr'.
- * config.guess, config.sub: Attempt to avoid system name change on
- Linux platforms. We have been using "linux" instead of
- "linux-gnu" on this branch.
+ * ruby.c (load_file): exit if reading file is empty.
-Thu Jun 10 19:19:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Feb 14 03:34:52 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
- [ruby-talk:103062]
+ * parse.y (yylex): `foo.bar=1' should be <foo><.><bar><=><1>,
+ not <foo><.><bar=><1>.
-Wed Jun 9 18:04:14 2004 akira yamada <akira@ruby-lang.org>
+ * eval.c (rb_thread_restore_context): process according to
+ RESTORE_* is moved after longjmp().
- * lib/uri/generic.rb (URI::Generic::merge,
- URI::Generic::route_from): accepts non-hierarchical URI.
- [ruby-dev:23631]
+ * eval.c (thread_switch): new function to process RESTORE_*.
- * test/uri/test_generic.rb (TestGeneric::test_route,
- TestGeneric::test_merge): added tests for above changes.
+Sun Feb 13 16:19:49 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Wed Jun 9 17:39:37 2004 Akinori MUSHA <knu@iDaemons.org>
+ * ruby.c (require_libraries): don't access freed memory.
- * config.guess, config.sub: Update to a more recent version as of
- 2004-01-20.
+ * ruby.c (add_modules): ditto.
- * configure.in: Add support for DragonFly BSD.
+Fri Feb 11 12:06:22 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jun 2 20:16:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (parse_quotedwords): %w() need to split not only by mere
+ spaces, but by all whitespaces.
- * string.c (str_new4): should share shared instance if it already
- exists. [ruby-dev:23665]
+Thu Feb 10 02:12:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jun 2 12:41:53 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (rb_str_index_m): did not support negative offset.
- * io.c (rb_io_gets_m): set lastline ($_) even when read line is
- nil. [ruby-dev:23663]
+Wed Feb 9 21:54:26 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Fri May 28 11:20:31 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/getaddrinfo.c: gcc --traditional support.
+ Rearrange headers to work AC_C_CONST.
+ * ext/socket/getnameinfo.c: ditto.
+ * ext/socket/socket.c: mswin32: use double instead of long long.
- * eval.c (rb_eval): bad influence on frame node.
+Wed Feb 9 16:30:41 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (eval): reverted wrongly removed condition. [ruby-dev:23638]
+ * numeric.c (num_coerce): should return [y, x].
-Thu May 27 23:15:18 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Wed Feb 9 11:07:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/logger.rb: leading 0 padding of timestamp usec part.
+ * ruby.c (ruby_prog_init): loadpath structure changed.
- * 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']]
+Tue Feb 8 02:07:33 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/csv.rb: CSV::Row and CSV::Cell are deprecated. these classes
- are removed in the future. in the new csv.rb, row is represented
- as just an Array. since CSV::Row was a subclass of Array, it won't
- hurt almost all programs except one which depended CSV::Row#match.
- and a cell is represented as just a String or nil(NULL). this
- change will cause widespread destruction.
+ * regex.c (re_search): optimize for \G at top.
- CSV.open("foo.csv", "r") do |row|
- row.each do |cell|
- if cell.is_null # using Cell#is_null
- p "(NULL)"
- else
- p cell.data # using Cell#data
- end
- end
- end
+ * regex.c (re_compile_pattern): \G introduced.
- must be just;
+ * regex.c (re_match): ditto.
- CSV.open("foo.csv", "r") do |row|
- row.each do |cell|
- if cell.nil?
- p "(NULL)"
- else
- p cell
- end
- end
- end
+ * string.c (str_sub_bang): old behavior restored: bang method
+ returns nil if string not changed.
- * 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.
+ * regex.c (re_compile_pattern): support independent subexpression
+ `(?>pattern)'.
- 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".
+ * regex.c (re_match): ditto.
- setting mode properly is user's responsibility now.
+Mon Feb 7 15:51:08 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/csv.rb: accepts String as a fs (field separator/column separator)
- and rs (record separator/row separator)
+ * regex.c (re_match): now understands interrupts under Ruby.
- * lib/csv.rb (CSV.read, CSV.readlines): added. works as IO.read and
- IO.readlines in CSV format.
+Mon Feb 7 07:51:52 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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?
+ * array.c (rb_ary_uniq_bang): always return an Array.
- * test/csv/test_csv.rb: updated.
+ * array.c (rb_ary_compact_bang): ditto.
- * test/ruby/test_float.rb: added test_strtod to test Float("0").
+ * array.c (rb_ary_flatten_bang): ditto.
-Thu May 27 21:37:50 2004 Tanaka Akira <akr@m17n.org>
+ * hash.c (rb_hash_reject): returns a Hash, not an Array.
- * lib/pathname.rb (Pathname#initialize): refine pathname initialization
- by pathname.
+ * hash.c (env_reject): ditto.
-Thu May 27 20:22:05 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Fri Feb 4 10:20:25 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
+ * string.c (scan_once): scan now leaves information about the last
+ successful pattern match in $&.
-Thu May 27 14:53:13 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * io.c (rb_io_close): should not check closed IO.
- * io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
- add errno checking. [ruby-dev:23627]
+Fri Feb 4 05:44:01 2000 Kentaro Inagaki <inagaki@tg.rim.or.jp>
-Wed May 26 14:19:42 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c (s_recv): TRAP_BEG after retry entry.
- * eval.c (rb_eval, eval): make line number consistent on eval with
- Proc. [ruby-talk:101253]
+Wed Feb 2 22:33:45 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Wed May 26 13:59:17 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (rb_thread_start): receives argument from outside, like
+ `Thread::start(1,2,3){|a,b,c| ... }'.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for
- 'do' after for statement
+Wed Feb 2 22:14:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed May 26 13:56:03 2004 Dave Thomas <dave@pragprog.com>
+ * re.c (rb_reg_regsub): should check regs->num_regs.
- * lib/rdoc/generators/html_generator.rb (Generators::MarkUp::style_url): Fix
- relative path to code CSS file
+ * re.c (rb_reg_search): remove matchcache, use static struct
+ re_register instead.
-Wed May 26 13:14:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (match_getter): avoid cloning match data.
- * io.c (rb_io_init_copy): copy also positions. [ruby-talk:100910]
+Wed Feb 2 17:12:15 2000 Dave Thomas <Dave@Thomases.com>
-Wed May 26 00:00:00 2004 why the lucky stiff <why@ruby-lang.org>
+ * samples/eval.rb: Rescue new ScriptError exception
- * ext/syck/syck.c (syck_new_parser): clear parser on init.
- thanks, ts. [ruby-core:02931]
+Wed Feb 2 02:06:07 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/token.c (sycklex_yaml_utf8): buffer underflow.
- thanks, ts. [ruby-core:02929]
+ * string.c (str_gsub_bang): gsub! now leaves information about the
+ last successful pattern match in $&.
- * lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
+Mon Jan 31 15:24:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/yaml.rb: added rdoc to beginning of lib.
+ * string.c (str_sub_bang): bang method returns string always.
+ experimental.
-Mon May 24 10:46:26 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+Sun Jan 30 17:58:09 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers
- must be absolute URIs
+ * eval.c: arrange to use setitimer(2) for BOW, DJGPP
-Sat May 22 12:00:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * defines.h: ditto. use random(3) on cygwin b20.1.
- * MANIFEST: add new encodings in rexml.
+Sun Jan 30 17:20:16 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/tk/MANIFEST: add recent files.
+ * eval.c: use getrlimit(2) on DJGPP.
-Sat May 22 05:37:11 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu Jan 27 01:27:10 2000 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
- * ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
- on the other processes by Tcl/Tk's 'send' command
+ * dir.c (glob): glob pattern "/*" did not match.
-Fri May 21 09:22:05 2004 Dave Thomas <dave@pragprog.com>
+Wed Jan 26 22:30:47 2000 Shigeo Kobayashi <shigeo@tinyforest.gr.jp>
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_parameters):
- Add ()'s around parameters that don't have them
+ * numeric.c (flo_modulo): wrong result for negative modulo.
-Thu May 20 17:02:03 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jan 26 02:01:57 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (check_sizeof): define result size. [ruby-core:02911]
+ * file.c (test_c): should use S_ISCHR.
- * lib/mkmf.rb (create_header): macro name should not include equal
- sign.
+ * file.c (rb_stat_c): ditto.
-Thu May 20 15:59:50 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * string.c (rb_str_each_line): should propagate tainting.
- * ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
+Tue Jan 25 04:01:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu May 20 14:35:52 2004 Tanaka Akira <akr@m17n.org>
+ * object.c (rb_obj_freeze): all objects made freezable.
- * ext/socket/socket.c: check SCM_RIGHTS macro addition to
- the msg_control field to test existence of file descriptor passing
- by msg_control.
+Tue Jan 25 00:37:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-Thu May 20 12:38:06 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: use AC_CHECK_TOOL for cross compiling.
- * numeric.c (flo_eq): always check if operands are NaN.
- [ruby-list:39685]
+Mon Jan 24 19:01:54 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Thu May 20 12:34:39 2004 Dave Thomas <dave@pragprog.com>
+ * array.c (rb_protect_inspect): should be checked by id of
+ objects; not by object themselves.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
- At Ryan Davis' suggestion, honor visibility modifers if guarded by a
- statement modifier
+Mon Jan 24 18:48:08 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu May 20 12:22:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_eval): too many warnings; warned on every method
+ overriding. should be on method discarding.
- * lib/mkmf.rb (have_type): do not check pointer to incomplete type,
- which always get compiled. [ruby-list:39683]
+Mon Jan 24 02:56:44 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed May 19 11:09:00 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * parse.y (yylex): -2.abs should be `(-2).abs' to accomplish the
+ principle of less surprise. `+2' too.
- * ext/tk/lib/tk.rb: change permition of TkObject#tk_send from
- private to public
+ * eval.c (rb_eval): when defining class is already there, and
+ superclass differ, throw away the old class.
-Tue May 18 14:00:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * variable.c (rb_const_set): gives warning again on constant
+ redefinition.
- * node.h (NEW_DSTR): adjust list length.
+ * error.c (Init_Exception): SyntaxError, NameError, LoadError and
+ NotImplementError are subclasses of ScriptError<Exception, not
+ StandardError. experimental.
- * parse.y (literal_concat): ditto.
+Sat Jan 22 00:00:41 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon May 17 16:14:25 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * parse.y (parse_quotedwords): no longer use `String#split'.
+ and enable space escape within quoted word list.
+ e.g. %w(a\ b\ c abc) => ["a b c", "abc"].
- * numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
- instead of "0.0e+00". [ruby-dev:23480]
+ * string.c (rb_str_slice_bang): new method `slice!'.
- * 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)
+Fri Jan 21 21:56:08 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Mon May 17 10:13:33 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.4.
- * ext/socket/socket.c (setup_domain_and_type): honor duck typing.
- [ruby-dev:23522]
+ * lib/net/http.rb: can receive messages which have
+ no Content-Length:.
- * ext/socket/socket.c (sock_s_getnameinfo): ditto.
+Fri Jan 21 16:15:59 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon May 17 01:15:23 2004 why the lucky stiff <why@ruby-lang.org>
+ * eval.c (thgroup_s_new): new class ThreadGroup.
- * lib/yaml.rb: removed fallback to pure Ruby parser.
+Tue Jan 18 12:24:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/yaml/baseemitter.rb (indent_text): was forcing a mod value
- of zero at times, which kept some blocks from getting indentation.
+ * struct.c (Init_Struct): remove Struct's own hash and eql?.
- * lib/yaml/baseemitter.rb (node_text): rewriting folded scalars.
+Sat Jan 15 22:21:08 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * ext/syck/syck.h: reports style of scalars now, be they plain, block
- single-, or double-quoted.
+ * eval.c (search_method): argument klass may be 0.
- * ext/syck/syck.c: ditto.
+Sat Jan 15 15:03:46 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/gram.c: ditto.
+ * enum.c (enum_index): remove this method.
- * ext/syck/node.c: ditto.
+ * enum.c: remove use of pointers to local variables. find,
+ find_all, min, max, index, member?, each_with_index,
- * ext/syck/token.c: ditto.
+ * eval.c (massign): multiple assignment does not use to_a anymore.
+ experimental.
- * ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
- if scalar style is plain.
+Fri Jan 14 12:22:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/rubyext.c (yaml_org_handler): some empty strings were
- loaded as symbols.
+ * string.c (rb_str_replace): use memmove instead of memcpy for
+ overwrapping strings (e.g. a[1] = a).
- * test/yaml/test_yaml.rb (test_perl_regexp): updated test to
- match new regexp serialization.
+Thu Jan 13 11:12:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon May 17 00:03:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * parse.y (arg_add): use new node, ARGSPUSH.
- * lib/drb/drb.rb: Cosmetic documentation changes.
+Mon Jan 10 18:32:28 2000 Koji Arai <JCA02266@nifty.ne.jp>
-Sun May 16 22:36:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * marshal.c (w_object): forgot an argument to call w_ivar().
- * lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
- RDoc operation), and added file-level comment.
+Sun Jan 9 18:13:51 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Sun May 16 20:55:49 2004 Tanaka Akira <akr@m17n.org>
+ * random.c: first was not defined unless HAVE_RANDOM.
- * 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 Jan 8 19:02:49 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun May 16 13:10:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * io.c (rb_io_sysread): raise IOError for buffered IO.
- * lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
- generating warnings, many were on private methods).
+ * ext/socket/socket.c (s_recv): ditto.
-Sat May 15 01:41:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Jan 7 00:59:29 2000 Masahiro Tomita <tommy@tmtm.org>
- * eval.c (eval): forgot to restore $SAFE value before evaluating
- compiled node. [ruby-core:02872]
+ * io.c (io_fread): TRAP_BEG/TRAP_END added around getc().
-Sat May 15 01:33:12 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Jan 6 00:39:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * range.c (range_each_func): terminates loop if generating value
- is same to @end. [ruby-talk:100269]
+ * random.c (rb_f_rand): should be initialized unless srand is
+ called before.
-Fri May 14 22:08:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jan 5 16:59:34 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * string.c (rb_str_new4): should not reuse frozen shared string if
- the original is not an instance of String. [ruby-talk:100193]
+ * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.3.
-Fri May 14 18:39:25 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * lib/net/session.rb: Session -> Protocol, ...
- * 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')
+ * lib/net/http.rb: HTTPCommand implementation was changed.
-Fri May 14 12:11:43 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Jan 5 02:14:46 2000 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
- [ruby-dev:23498]
+ * parse.y: Fix SEGV on empty parens with UMINUS or UPLUS.
-Thu May 13 15:47:30 2004 akira yamada <akira@ruby-lang.org>
+Tue Jan 4 22:25:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/net/telnet.rb (Net::Telnet::login): "options" can specify
- regexps for login prompt and/or password prompt.
+ * parse.y (stmt): `() while cond' dumped core.
-Thu May 13 14:23:45 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Tue Jan 4 06:04:14 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
- * hash.c (delete_if_i): use st_delete_safe() (via
- rb_hash_delete()) instead of returning ST_DELETE.
- backport from HEAD. [ruby-dev:23487]
+ * configure.in: modify for cross-compiling.
+ use target_* instead of host_*.
+ use AC_CANONICAL_TARGET.
-Thu May 13 13:01:30 2004 akira yamada <akira@ruby-lang.org>
+ * Makefile.in: ditto.
- * lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
+ * cygwin/GNUmakefile.in: ditto.
-Thu May 13 11:04:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jan 1 13:26:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * pack.c (pack_pack): always add with null for 'Z'.
+ * eval.c (rb_yield_0): force_recycle ruby_dyna_vars to gain
+ performance.
- * pack.c (pack_unpack): terminated by null for 'Z'. [ruby-talk:98281]
+ * array.c (rb_ary_delete_at_m): takes same argument pattern with
+ rb_ary_aref.
-Wed May 12 19:59:43 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Jan 1 10:12:26 2000 Nobuyoshi Nakada <nobu.nokada@softhome.net>
- * lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
- [ruby-talk:99788]
+ * ruby.h,util.c (rb_special_const_p): peep hole optimization.
-Wed May 12 17:41:42 2004 Tanaka Akira <akr@m17n.org>
+ * ruby.h,util.c (rb_test_false_or_nil): removed.
- * lib/resolv.rb (Resolv::DNS::Config): make it configurable without
- external file such as /etc/resolv.conf.
+ * ruby.h (RTEST, SPECIAL_CONST_P): peep hole optimization.
-Wed May 12 14:37:27 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ruby.h (FL_ABLE, FL_SET, FL_UNSET, FL_REVERSE): made expressions
+ not statements.
- * ext/openssl/ossl_x509name.c: attribute value of DC (short name of
- domainComponent) should be IA5String.
+ * ruby.h (OBJ_INFECT): newly added macro which copies taint from
+ `s' to `x'.
-Wed May 12 13:20:19 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sat Jan 1 02:04:18 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk/composite.rb: improve configure methods (based on
- the proposal of [ruby-talk:99671]).
+ * eval.c (rb_thread_safe_level): new method.
-Wed May 12 11:51:08 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (rb_yield_0): recycle dyna_var_map to reduce object
+ allocation.
- * class.c (rb_obj_singleton_methods): fix rdoc
+Fri Dec 31 00:52:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon May 10 21:44:42 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c: thread independent trace_func not needed.
- * lib/rdoc/generators/html_generator.rb: Change scheme for
- looking up symbols in HTML generator.
+Thu Dec 30 14:47:31 1999 akira yamada <akira@ruby-lang.org>
-Mon May 10 16:45:21 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: specifies -soname in LIBRUBY_DLDFLAGS on linux
+ platforms.
- * eval.c (eval): warning during eval should not cause deadlock.
- [ruby-talk:98651]
+Thu Dec 30 10:51:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_eval): raise TypeError exception for superclass
- mismatch. [ruby-list:39567]
+ * array.c,io.c,hash,c,re.c,string.c: `_m' suffix instead of
+ `_method' for wrapper functions to implement method,
+ e.g. `rb_str_join_m()'.
-Mon May 10 12:11:37 2004 Dave Thomas <dave@pragprog.com>
+Thu Dec 30 02:08:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/generators/html_generator.rb: Hack to search parents
- for unqualified constant names.
+ * bignum.c (rb_cstr2inum): non-numeric format check added.
+ currently it works only with base == 0 (i.e. Integer()).
-Mon May 10 12:11:37 2004 Dave Thomas <dave@pragprog.com>
+ * bignum.c (rb_str2inum): now takes VALUE to 1st argument. null
+ byte check added.
- * lib/rdoc/generators/html_generator.rb: Hack to search parents
- for unqualified constant names.
+ * array.c (rb_ary_replace): unless replacement is an array,
+ replacement shall be converted to array by `[replacement]', not
+ by `replacement.to_a'.
-Sun May 9 22:37:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * array.c (rb_ary_plus): right operand must be an array.
- * lib/net/ftp.rb: improved documentation
- * lib/net/imap.rb: ditto
- * lib/net/pop.rb: ditto
- * lib/net/smtp.rb: ditto
- * lib/net/telnet.rb: ditto
+ * array.c (rb_ary_concat): argument must be an array.
-Fri May 7 21:50:21 2004 Dave Thomas <dave@pragprog.com>
+Mon Dec 27 12:35:47 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
- multiple arguments to 'include'
+ * ext/socket/socket.c (sock_finalize): mswin32: fix socket handle leak.
-Fri May 7 21:31:56 2004 Minero Aoki <aamine@loveruby.net>
+ * win32/win32.c (myfdclose): ditto.
- * lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
- [ruby-core:02843]
+Sun Dec 26 23:15:13 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Fri May 7 11:25:53 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * win32/win32.c (mypopen): raise catchable error instead of rb_fatal.
+ * win32/win32.c (mypclose): fix process handle leak.
- * 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]
+Sun Dec 26 16:17:11 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Fri May 7 10:00:05 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * ext/Win32API/Win32API.c (Win32API_initialize): use UINT2NUM
+ instead of INT2NUM to set __dll__ and __proc__.
- * ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
+Sat Dec 25 00:08:59 1999 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
-Thu May 6 22:13:17 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * ext/Win32API/Win32API.c (Win32API_Call): remove 'dword ptr'
+ from _asm.
- * ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
- hostname.
+Fri Dec 24 10:26:47 1999 Koji Oda <oda@bsd1.qnes.nec.co.jp>
-Thu May 6 14:22:29 2004 why the lucky stiff <why@ruby-lang.org>
+ * win32/win32.h: use "C++" linkage.
- * lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
- for Ranges, Strings, Structs, Regexps.
+Fri Dec 24 02:00:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
- String's flow style.
+ * eval.c (THREAD_ALLOC): should initialize th->trace.
- * lib/yaml.rb (YAML::object_maker): now uses Object.allocate.
+Fri Dec 24 00:43:39 1999 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
- * ext/syck/gram.c: fixed transfer methods on structs, broke it
- last commit.
+ * io.c (pipe_open): check for `fptr->f == NULL'.
+ * win32/win32.c (mypopen): STDERR does not work during ` function.
-Thu May 6 11:40:28 2004 Shugo Maeda <shugo@ruby-lang.org>
+Wed Dec 22 22:50:40 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/net/imap.rb (string): accept NIL.
+ * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.2.
- * lib/net/imap.rb (body_type_basic): allow body-fields omissions.
+ * lib/net/http.rb: HTTP support is enhanced a little
-Thu May 6 01:59:04 2004 Dave Thomas <dave@pragprog.com>
+ * lib/net/http.rb: support proxy
- * lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
- Don't include the &block parameter if we have explicit
- yield parameters.
+Tue Dec 21 17:21:28 1999 Koji Oda <oda@bsd1.qnes.nec.co.jp>
-Wed May 5 03:40:29 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * ext/socket/socket.c (sock_finalize): mswin32: fix FILE* leak.
- * lib/rinda/ring.rb: use recv instead of recvfrom.
+Tue Dec 21 05:33:56 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Tue May 4 23:52:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.1.
- * lib/gserver.rb: documented
+ * lib/net/http.rb: support HTTP chunk
-Tue May 4 23:46:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Mon Dec 20 19:08:12 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * lib/xmlrpc/README.txt: introduced for documentation purposes
+ * file.c (rb_file_s_expand_path): handle dir separator correctly.
-Mon May 3 09:47:24 2004 Dave Thomas <dave@pragprog.com>
+Sun Dec 19 22:56:31 1999 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
- Fix parsing bug if yield called within 1 line block
+ * lib/find.rb: support dosish root directory.
+ * win32/Makefile: ditto.
+ * win32/config.status: ditto.
+ * win32/win32.c (opendir): ditto.
+ * win32/win32.c (opendir): use CharPrev() to get last character
+ of the directory name.
-Sun May 2 01:04:38 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sat Dec 18 03:00:01 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tcltklib, ext/tk: renewal Ruby/Tk
+ * file.c (path_check_1): check should be done by absolute path.
-Fri Apr 30 20:08:41 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * marshal.c (r_ivar): should restore generic_ivar too.
- * time.c (SIZEOF_TIME_T): support SIZEOF_TIME_T == SIZEOF_INT.
+ * marshal.c (w_ivar): should dump generic_ivar too.
-Tue Apr 27 13:12:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Dec 17 22:46:46 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * eval.c (rb_eval): too many line trace call. (ruby-bugs PR#1320)
+ * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.0.
-Tue Apr 27 08:41:28 2004 why the lucky stiff <why@ruby-lang.org>
+ * lib/net/http.rb: test release
- * lib/yaml/rubytypes.rb: passing Range tests.
+ * lib/net/session.rb: support class swapping
- * ext/syck/syck.h: version 0.44.
+ * lib/net/session.rb: Socket#flush_rbuf
- * ext/syck/gram.c: transfers no longer open an indentation.
- fixed transfers which precede blocks.
+ * lib/net/session.rb: doquote -> Net.quote
- * ext/syck/token.c: ditto.
+Fri Dec 17 19:27:43 1999 IWAMURO Motonori <iwa@mmp.fujitsu.co.jp>
- * ext/syck/syck.c: fixed segfault if an anchor has been released already.
+ * eval.c (rb_load): should initialize ruby_frame->last_class.
- * ext/syck/node.c (syck_free_members): organized order of free'd nodes.
+Wed Dec 15 01:35:29 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/rubyext.c (syck_emitter_write_m): test for proper string with
- StringValue.
+ * ruby.c (proc_options): option to change directory changed to
+ `-C' like tar.
-Mon Apr 26 23:56:54 2004 Daniel Kelley <news-1082945587@dkelley.gmp.san-jose.ca.us>
+ * ruby.c (proc_options): argv boundary check for `-X'.
- * README.EXT, README.EXT.ja: fixed wrong function signature.
- [ruby-talk:98349]
+Mon Dec 13 15:15:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Apr 26 21:40:09 2004 Dave Thomas <dave@pragprog.com>
+ * regex.c (re_adjust_startpos): separate startpos adjustment
+ because of major performance drawback.
- * lib/rdoc/code_objects.rb (RDoc::Context::add_alias): Only alias
- to instance methods.
+ * class.c (rb_singleton_class): tainted status of the singleton
+ class must be synchronized with the object.
-Sat Apr 24 10:38:31 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (rb_thread_schedule): implement thread priority.
- * lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
- Fix bug where consecutive headings are merged.
+Sat Dec 11 03:34:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Apr 23 23:26:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (mark_hashentry): key should be VALUE, not ID.
- * lib/mkmf.rb: $hdrdir should not contain macros for backward
- compatibility. [bruby-dev:28]
+ * io.c (argf_eof): should check next_p too.
- * version.c (ruby_show_copyright): obtain copyright year from
- RUBY_RELEASE_YEAR.
+Thu Dec 9 18:09:13 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * win32/resource.rb: ditto.
+ * error.c (exc_set_backtrace): forgot to declare a VALUE argument.
- * win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
- include them.
+Thu Dec 9 14:19:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * win32/resource.rb: include winver.h for older WindowsCE.
+ * object.c (rb_obj_taint): explicit tainting must be prohibited at
+ level 4 to prevent polluting trusted object by untrusted code.
-Fri Apr 23 16:38:46 2004 Tanaka Akira <akr@m17n.org>
+ * file.c: file operations (stat, lstat, chmod, chown, umask,
+ truncate, flock) are prohibited in level 2 (was level 4).
- * lib/pathname.rb: sync taint/freeze flag between
- a pathname object and its internal string object.
+Wed Dec 8 11:48:23 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Apr 23 14:52:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_f_require): prohibiting require() in the secure mode
+ cause serious autoloading error.
- * parse.y (stmt, arg, aref_args): should not make sole splat into
- array, in aref_args other than aref with op_asgn.
+ * variable.c (rb_obj_instance_variables): don't need to prohibit
+ to get list of instance variable names of untainted objects.
-Fri Apr 23 14:14:38 2004 Tanaka Akira <akr@m17n.org>
+ * variable.c (rb_ivar_get): don't need to prohibit to get instance
+ variables of untainted objects.
- * lib/resolv.rb: don't use Regexp#source to embed regexps.
- [ruby-dev:23432]
+ * variable.c (rb_mod_remove_const): should prohibit constant
+ removals too.
-Thu Apr 22 04:15:36 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Dec 8 09:23:01 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * parse.y (aref_args): should pass expanded list. [ruby-core:02793]
+ * eval.c (rb_eval): should try autoloading before defining
+ class/module at the toplevel.
-Thu Apr 22 01:12:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Dec 7 22:15:30 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * numeric.c (flo_to_s): tweak output string based to preserve
- decimal point and to remove trailing zeros. [ruby-talk:97891]
+ * configure.in: Modified rb_cv_rshift_sign detect routine and
+ more simple/fast RSHIFT() for hpux-10.x.
- * string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
- search. [ruby-talk:97342]
+Tue Dec 7 11:16:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Apr 21 22:57:27 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * eval.c (Init_eval): calculate stack limit from rlimit where
+ getrlimit(2) is available.
- * lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
+Tue Dec 7 09:57:33 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Wed Apr 21 20:05:00 2004 Tanaka Akira <akr@m17n.org>
+ * file.c (rb_file_ftype): should have removed mode_t.
- * lib/open-uri.rb (URI::HTTP#proxy_open): set Host: field explicitly.
- [ruby-list:39542]
+Mon Dec 6 15:55:30 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-Mon Apr 19 18:11:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c (fix_rshift): Fix -1 >> 32 returned 0 (should be -1).
- * hash.c (rb_hash_equal): returns true if two hashes have same set
- of key-value set. [ruby-talk:97559]
+ * numeric.c (fix_rshift): Fix 1 >> -1 returned 0 (should be 2).
- * hash.c (rb_hash_eql): returns true if two hashes are equal and
- have same default values.
+Mon Dec 6 11:47:23 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Apr 19 08:19:58 2004 Doug Kearns <djkea2@mugca.its.monash.edu.au>
+ * sprintf.c (rb_f_sprintf): formatted string must be tainted if
+ any of parameters is a tainted string.
- * dln.c, io.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb, lib/date.rb,
- lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb, lib/matrix.rb,
- lib/monitor.rb, lib/set.rb, lib/thwait.rb, lib/timeout.rb,
- lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb, lib/net/ftp.rb,
- lib/net/http.rb, lib/net/imap.rb, lib/net/telnet.rb,
- lib/racc/parser.rb, lib/rinda/rinda.rb, lib/rinda/tuplespace.rb,
- lib/shell/command-processor.rb, lib/soap/rpc/soaplet.rb,
- lib/test/unit/testcase.rb, lib/test/unit/testsuite.rb: typo fix.
+ * file.c (rb_file_s_expand_path): expanded file path need not to
+ be tainted always.
-Mon Apr 19 08:14:18 2004 Dave Thomas <dave@pragprog.com>
+Sun Dec 5 20:25:29 1999 Katsuhiro Ueno <unnie@blue.sky.or.jp>
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
- #ifdef HAVE_PROTOTYPES
+ * eval.c (Init_Proc): simple typo.
-Fri Apr 16 22:33:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * gc.c (add_heap): sizeof(RVALUE*), not sizeof(RVALUE).
- * ext/iconv/iconv.c: nearly finished RDoc comments.
+Sat Dec 4 01:40:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Apr 16 17:04:07 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_search): adjust startpos for multibyte match unless
+ the first pattern is forced byte match.
- * string.c (rb_str_equal): always returns true or false, never
- returns nil. [ruby-dev:23404]
+ * bignum.c (rb_big_rand): should not use rand/random where drand48
+ may be available. RANDOM_NUMBER should be provided from outside.
-Fri Apr 16 08:27:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Dec 3 09:54:59 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/extmk.rb: skip linking when libraries to be preloaded not
- compiled. [ruby-list:39561]
+ * ruby.c (moreswitches): there may be trailing garbage at #!
+ line.
-Thu Apr 15 23:21:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_f_require): should check require 'feature.o' too.
- * process.c (pst_success_p): new method Process::Status#success?.
- [ruby-dev:23385]
+Thu Dec 2 11:58:15 1999 Koji Arai <JCA02266@nifty.ne.jp>
-Thu Apr 15 17:12:13 2004 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_thread_loading): should maintain loading_tbl.
- * ext/gdbm/gdbm.c (Init_gdbm): define GDBM::READER, GDBM::WRITER,
- GDBM::WRCREAT and GDBM::NEWDB.
- (fgdbm_initialize): use specified read/write flag.
+Thu Dec 2 10:21:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Apr 14 11:29:56 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (rb_thread_loading_done): wrong parameter to st_delete().
- * numeric.c (flo_eq): workaround for bcc32's bug.
- (ruby-bugs-ja:PR#594)
+Wed Dec 1 11:24:06 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Wed Apr 14 13:06:35 2004 Doug Kearns <djkea2@mugca.its.monash.edu.au>
+ * ruby.c (process_sflag): process -s properly (should not force `--').
- * 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 Dec 1 09:47:33 1999 Kazunori NISHI <kazunori@swlab.csce.kyushu-u.ac.jp>
-Wed Apr 14 11:06:38 2004 Dave Thomas <dave@pragprog.com>
+ * string.c (rb_str_split_method): should increment end too.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::scan): Changed
- behavior of :enddoc: -- it now unconditionally terminates
- processing of the current file.
+Tue Nov 30 18:00:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Apr 14 11:03:22 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * marshal.c: MARSHAL_MINOR incremented; format version is 4.2.
- * defines.h: include <net/socket.h> to get fd_set definition in BeOS.
+ * marshal.c (w_object): distinguish class and module.
-Tue Apr 13 23:06:30 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * marshal.c (w_object): save hash's default value.
- * lib/rinda/rinda.rb: change pattern matching.
- a === b -> a == b || a === b. [druby-ja:98]
+ * marshal.c (r_object): restore hash's default value.
- * test/rinda/test_rinda.rb: ditto.
+Tue Nov 30 01:46:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Apr 13 19:54:29 2004 Minero Aoki <aamine@loveruby.net>
+ * re.c (rb_reg_source): generated source string must be tainted if
+ regex is tainted.
- * lib/net/http.rb: should not overwrite HTTP request header.
- [ruby-list:39543]
+ * file.c (rb_file_s_basename): basename should not be tainted
+ unless the original path is tainted.
-Tue Apr 13 01:30:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * file.c (rb_file_s_dirname): ditto.
- * ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
- * ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
+Mon Nov 29 20:42:13 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-Mon Apr 12 19:11:29 2004 Eric Hodel <drbrain@segment7.net>
+ * file.c (stat_new): Struct::Stat -> File::Stat; Stat is no longer
+ a Struct.
- * gc.c (rb_gc_copy_finalizer): typo. [ruby-core:02774]
+Mon Nov 29 15:28:52 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Apr 12 18:52:32 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * variable.c (rb_path2class): evaluated value from path should be
+ module or class.
- * ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
- a value.
+Fri Nov 26 18:12:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Apr 12 10:43:47 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * eval.c (rb_exec_end_proc): should remove only end_procs defined
+ within load wrapper.
- * dir.c (rb_glob2, rb_glob, rb_globi, push_globs, push_braces,
- rb_push_glob): fix memory leak. (leaked when block was interrupted)
+ * eval.c (rb_load): save and restore ruby_wrapper around loading.
-Mon Apr 12 10:27:37 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * eval.c (rb_mark_end_proc): mark end procs registered by END{} or
+ at_exit{}.
- * bcc32/Makefile.sub: backport SIZEOF_TIME_T definition from 1.9.
+ * eval.c (rb_set_end_proc): should not call rb_global_variable()
+ on heap address; it crashed mod_ruby.
- * win32/Makefile.sub: ditto.
+Mon Nov 22 14:07:24 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * wince/Makefile.sub: ditto.
+ * ruby.c (proc_options): variable e_script should be visited by
+ garbage collector.
-Sun Apr 11 19:12:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Nov 20 10:10:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ruby.c (require_libraries): restore source file/line after
- statically linked extensions initialized. [ruby-dev:23357]
+ * hash.c (inspect_i): value may be nil, check revised.
-Sun Apr 11 10:47:04 2004 Dave Thomas <dave@pragprog.com>
+Fri Nov 19 18:06:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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:)
+ * dir.c (glob): recursive wildcard match by `**' ala zsh.
-Sat Apr 10 23:51:13 2004 Dave Thomas <dave@pragprog.com>
+Fri Nov 19 11:44:26 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
- made one too many assumptions...
+ * variable.c: was returning void value.
-Sat Apr 10 00:00:19 2004 Dave Thomas <dave@pragprog.com>
+Fri Nov 19 03:57:22 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * lib/rdoc/markup/simple_markup/inline.rb: Fix problem
- with \_cat_<b>dog</b>
+ * file.c: add methods Stat struct class to reduce stat(2).
-Wed Apr 7 00:19:50 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Thu Nov 18 16:18:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rinda/rinda.rb: fix hash tuple bug.
+ * lib/pstore.rb: mutual lock by flock(2).
- * lib/rinda/tuplespace.rb: ditto.
+Thu Nov 18 11:44:13 1999 Masahiro Tomita <tommy@tmtm.org>
- * test/rinda/test_rinda.rb
+ * io.c (read_all): should check bytes too.
-Tue Apr 6 18:24:18 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Nov 17 02:40:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_reopen): should use rb_io_check_io().
+ * io.c (Init_IO): $defout (alias of $>) added.
-Tue Apr 6 16:46:09 2004 Tanaka Akira <akr@m17n.org>
+Tue Nov 16 09:47:14 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in: check the size of time_t.
+ * lib/pstore.rb: add mutual lock using symlink.
- * time.c (time_add): new function.
- (time_plus): use time_add.
- (time_minus): use time_add.
+Mon Nov 15 16:50:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Apr 6 13:21:30 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * enum.c (enum_grep): non matching grep returns an empty array, no
+ longer returns nil.
- * ext/socket/socket.c (make_hostent): must return value.
+ * enum.c (enum_grep): grep with block returns collection of
+ evaluated values of block over matched elements.
-Tue Apr 6 00:05:30 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Mon Nov 15 04:50:33 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/rinda/rinda.rb: add require 'drb/drb'
+ * re.c (rb_reg_source): should not call rb_reg_expr_str()
+ everytime.
-Mon Apr 5 08:18:23 2004 Dave Thomas <dave@pragprog.com>
+Sat Nov 13 07:34:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
- references work properly.
+ * variable.c (rb_mod_constants): traverse superclasses to collect
+ constants.
-Sun Apr 4 20:33:42 2004 Minero Aoki <aamine@loveruby.net>
+ * eval.c (assign): modified for shared variables.
- * eval.c (Init_load): make $LOADED_FEATURES built-in.
- [ruby-dev:23299]
+ * eval.c (rb_eval): search nested scope, then superclasses to
+ assign shared variables within methods.
- * ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
+ * eval.c (rb_eval): remove warnings from constants modification,
+ because they are no longer constants.
- * lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
+ * parse.y (node_assign): modified for shared variables.
-Sun Apr 4 14:01:20 2004 Dave Thomas <dave@pragprog.com>
+ * parse.y (assignable): allow constant assignment in methods;
+ constants should be called `shared variable'.
- * lib/rdoc/options.rb (Options::parse): Allow multiple -x options to RDoc.
- Fix bug where files weren't being excluded properly
+Fri Nov 12 23:52:19 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Sat Apr 3 17:11:05 2004 why the lucky stiff <why@ruby-lang.org>
+ * process.c (rb_f_system): argument check for NT, __EMX__, DJGPP.
- * ext/syck/syck.h: version 0.43.
+Wed Nov 10 21:54:11 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * ext/syck/lib/gram.c: allow root-level inline collections.
- [ruby-talk:94922]
+ * hash.c (rb_any_cmp): Fixed return without value.
- * lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
- [ruby-talk:94930]
+Wed Nov 10 17:57:06 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/bytecode.c: turn off default implicit typing.
+ * sprintf.c: incorporate <yasuf@big.or.jp>'s sprintf patch at
+ [ruby-dev:7754].
- * ext/syck/implicit.c: detect base60 integers.
+Wed Nov 10 08:28:53 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/rubyext.c: handle base60, as well as hex and octal
- with commas. implicit typing of ruby symbols.
+ * eval.c (rb_call0): supply class parameter for each invocation.
-Fri Apr 2 17:27:17 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Nov 9 13:21:04 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * 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]
+ * configure.in: AC_MINIX move to before AC_EXEEXT and AC_OBJEXT.
-Fri Apr 2 15:13:44 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Nov 8 19:52:29 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * 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]
+ * configure.in: Renamed AC_CHAR_UNSIGNED to AC_C_CHAR_UNSIGNED.
-Fri Apr 2 14:35:26 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * configure.in: Added default to AC_CHECK_SIZEOF().
- * eval.c (block_pass): should generate unique identifier of the
- pushing block. [ruby-talk:96363]
+Mon Nov 8 14:28:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Apr 2 07:31:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (stmt): rescue modifier added to the syntax.
- * ext/socket/socket.c (make_hostent): fix memory leak, based on
- the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.
+ * keywords: kRESCUE_MOD added.
-Thu Apr 1 22:55:33 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (rb_f_eval): fake outer scope when eval() called without
+ bindings.
- * lib/rdoc/parsers/parse_rb.rb: Allow rdoc comments in
- =begin rdoc/=end
+ * eval.c (rb_f_binding): should copy last_class in the outer frame too.
- * lib/rdoc/parsers/parse_rb.rb: Fix problem with comment in
- top-level method being taken as file comment.
+Sun Nov 7 18:31:04 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-Thu Apr 1 22:55:04 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (is_defined): last_class may be 0.
- * lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
+Sat Nov 6 19:26:55 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-Thu Apr 1 19:58:37 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * Makefile.in: Added depend entry make parse.@OBJEXT@ from parse.c
+ for UCB make
- * 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.
+Thu Nov 4 17:41:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/xsd/datatypes.rb: check the smallest positive non-zero
- single-precision float exactly instead of packing with "f".
- [ruby-talk:88822]
+ * regex.c (re_compile_pattern): \< (wordbeg), \> (wordend) disabled.
- * lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
- [ruby-dev:22588]
- c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
+Wed Nov 3 08:52:57 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-Wed Mar 31 19:06:23 2004 Tanaka Akira <akr@m17n.org>
+ * io.c (Init_IO): forgot to use INT2FIX() around SEEK_SET, etc.
- * time.c (year_leap_p): new function.
- (timegm_noleapsecond): ditto.
- (search_time_t): use timegm_noleapsecond instead of
- mktime for first guess.
+Wed Nov 3 00:25:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Mar 31 12:04:04 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_split_method): use mbclen2() to handle kcode
+ option of regexp objects.
- * lib/delegate.rb (DelegateClass): define internal methods of the
- result class, but not metaclass of the caller. [ruby-talk:96156]
+Mon Nov 1 14:22:15 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * intern.h: provide proper prototypes. [ruby-core:02724]
+ * eval.c (rb_eval): reduce recursive calls to rb_eval()
+ case of ||= and &&= .
- * ruby.h: missing.h is now prerequisite to intern.h.
+Sun Oct 31 13:12:42 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-Tue Mar 30 20:25:34 2004 Tanaka Akira <akr@m17n.org>
+ * regex.c (re_compile_pattern): wrong [\W] match.
- * time.c (search_time_t): limit guess range by mktime if it is
- available. [ruby-dev:23274]
+Fri Oct 29 16:57:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Mar 28 14:16:59 2004 Minero Aoki <aamine@loveruby.net>
+ * ext/nkf/lib/kconv.rb: new String methods (kconv, tojis, toeuc,
+ tosjis).
- * lib/net/pop.rb (auth): failed when account/password include "%".
- [ruby-talk:95933]
+ * time.c (time_s_at): now accepts optional second argument to
+ specify micro second.
-Sat Mar 27 21:40:41 2004 Tanaka Akira <akr@m17n.org>
+Thu Oct 28 13:35:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/open-uri.rb: permit extra semicolon in content-type field.
+ * string.c (rb_str_split_method): should be mbchar aware with
+ single char separators.
-Sat Mar 27 10:40:48 2004 Tanaka Akira <akr@m17n.org>
+Wed Oct 27 12:57:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods
- instead of PrettyPrint.
+ * random.c (rb_f_srand): random seed should be unsigned.
-Thu Mar 25 23:28:52 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Oct 26 23:58:15 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * time.c (time_overflow_p): backport 1.9 usec overflow function.
- (ruby-bugs PR#1307)
+ * array.c (rb_ary_collect): collect for better performance.
-Thu Mar 25 23:15:24 2004 Dave Thomas <dave@pragprog.com>
+Tue Oct 26 19:20:54 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
- Add --version option
+ * marshal.c (r_object): should register class/module objects.
-Thu Mar 25 04:16:18 2004 Dave Thomas <dave@pragprog.com>
+Sat Oct 23 15:59:39 1999 Takaaki Tateishi <ttate@jaist.ac.jp>
- * lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
- which dumps our all known names
+ * process.c (rb_f_system): should require at least one argument.
-Thu Mar 25 03:57:47 2004 Dave Thomas <dave@pragprog.com>
+Sat Oct 23 12:42:44 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * lib/rdoc/ri/ri_util.rb (NameDescriptor::initialize): No longer
- allow nested classes to be designated using "."--you must
- now use "::"
+ * enum.c (enum_collect): collect without block will collect
+ elements in enumerable.
-Thu Mar 25 02:00:18 2004 Dave Thomas <dave@pragprog.com>
+Thu Oct 21 16:14:19 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/generators/template/html/one_page_html.rb (Page):
- Fix to work with C modules.
+ * ruby.c (moreswitches): function to process string option;
+ the name is stolen from perl (not implementation).
-Wed Mar 24 21:17:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * ruby.c (proc_options): use RUBYOPT environment variable to
+ retrieve the default options.
- * 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.
- (All backported from 1.9)
+ * dir.c (fnmatch): use eban's fnmatch; do not depend on system's
+ fnmatch (which may have portability problem) anymore.
-Wed Mar 24 18:48:26 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 20 15:14:24 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
- DESTDIR after installed.
+ * marshal.c (marshal_load): should protect the generated object
+ table (arg->data) from GC.
- * lib/mkmf.rb (RUBY): / is not recognized as path separator on
- nmake/bmake. [ruby-list:39388]
+Mon Oct 18 16:15:52 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
+ * ext/nkf/nkf.c (rb_nkf_kconv): output should be NUL terminated.
-Wed Mar 24 12:32:56 2004 Dave Thomas <dave@pragprog.com>
+Mon Oct 18 09:03:01 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * 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/net/session.rb, smtp.rb, pop.rb: 1.0.3
- * 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.
+ * lib/net/pop.rb: new methods POP3Command#uidl, POPMail#uidl.
-Wed Mar 24 11:11:26 2004 Dave Thomas <dave@pragprog.com>
+Sun Oct 17 03:35:33 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
- * lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
- Allow non-RDoc templates by putting a slash in the template name
+ * array.c (rb_ary_pop): forgot some freeze checks.
-Mon Mar 22 16:19:57 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Sat Oct 16 12:57:53 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * ruby.1: add -width option to .Bl for old groff.
+ * array.c (rb_ary_sort): always returns the copied array.
-Sun Mar 21 21:11:16 2004 Keiju Ishitsuka <keiju@ishitsuka.com>
+Fri Oct 15 22:50:41 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/shell/*: bug fix for Shell#system(command_line_string).
+ * error.c (sys_nerr): on CYGWIN, it is _sys_nerr.
-Sat Mar 20 20:57:10 2004 David Black <dblack@wobblini.net>
+Fri Oct 15 01:32:31 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
- * lib/scanf.rb: Backported 1.9 branch
- modifications/corrections to 1.8 branch
+ * io.c (rb_io_ctl) :need to use NUM2ULONG, not NUM2INT.
-Sat Mar 20 23:51:03 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * ext/Win32API/Win32API.c (Win32API_Call): need to use NUM2ULONG,
+ not NUM2INT.
- * eval.c (rb_require_safe): preserve old ruby_errinfo.
- [ruby-talk:95409]
+Fri Oct 15 00:22:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_f_raise): should not clear backtrace information if
- exception object already have one.
+ * re.c (Init_Regexp): super class of the MatchingData, which was
+ Data, to be Object.
-Sat Mar 20 15:25:36 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (ruby_run): evaluate required libraries before load &
+ compiling the script.
- * lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
- page background to white.
+ * parse.y (lex_getline): retrieve a line from the stream, saving
+ lines in the table in debug mode.
-Sat Mar 20 09:52:33 2004 Tadayoshi Funaba <tadf@dotrb.org>
+ * eval.c (call_trace_func): treat the case ruby_sourcefile is null.
- * lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
- part of second minute that follows a comma or a full stop.
+Thu Oct 14 02:00:10 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Mar 19 01:55:57 2004 Mauricio Fernandez <batsman.geo@yahoo.com>
+ * parse.y (string): compile time string concatenation.
- * io.c (rb_io_sync): need not to check writable. [ruby-core:02674]
+Wed Oct 13 07:28:09 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Thu Mar 18 21:44:38 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * lib/net/session.rb, smtp.rb, pop.rb: 1.0.2
- * lib/drb/drb.rb: backport drb.rb 1.16.
+ * lib/net/session.rb: new method Session#set_pipe.
-Fri Mar 18 17:49:51 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/net/session.rb, smtp.rb, pop.rb: add RD documentation.
- * struct.c (make_struct): allow const_id for accessor names.
- [ruby-core:04585]
+Wed Oct 13 02:17:05 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * eval.c (rb_attr): check if attribute name is local_id or
- const_id.
+ * array.c (rb_ary_plus): remove recursion.
-Thu Mar 18 16:22:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (rb_ary_sort_bang): detect modify attempt.
- * eval.c (proc_eq): avoid false positive by using scope and
- dyna_vars. no longer use frame.uniq.
+Wed Oct 13 02:17:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Mar 17 14:44:43 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * eval.c (block_pass): should copy block to prevent modifications.
+ tag in the structure should be updated from latest prot_tag.
- * dir.c (range): fix possible "\0" overrun. (in case of "\0-")
+ * eval.c (proc_s_new): tag in struct BLOCK should not point into
+ unused stack.
-Mon Mar 15 07:39:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * dir.c (dir_s_glob): iterate over generated matching filenames if
+ the block is given to the method.
- * eval.c (rb_yield_0): should not re-submit TAG_BREAK if this
- yield is not break destination. [ruby-dev:23197]
+ * array.c (rb_ary_at): new methods; at, first, last.
-Sat Mar 13 14:28:16 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * hash.c (rb_hash_fetch): raises exception unless the default
+ value is supplied.
- * test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main
- trunk)
+ * hash.c (rb_hash_s_create): need not remove nil from value.
- * test/drb/test_drbunix.rb: ditto.
+ * hash.c (rb_hash_aset): setting value to nil does not remove key
+ anymore.
-Wed Mar 10 22:28:09 2004 Minero Aoki <aamine@loveruby.net>
+Tue Oct 12 22:29:04 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (remove_dir): should handle symlink correctly.
- This patch is contributed by Christian Loew. [ruby-talk:94635]
- (Backport from main trunk)
+ * io.c (io_read): length may be 0 or negative.
-Wed Mar 10 16:28:42 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Oct 12 13:26:27 1999 Jun-ichiro itojun Hagino <itojun@itojun.org>
- * eval.c (return_jump): set return value to the return
- destination. separated from localjump_destination().
+ * signal.c (posix_signal): RETSIGTYPE may be void.
- * eval.c (break_jump): break innermost loop (or thread or proc).
+Tue Oct 12 03:28:03 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * eval.c (rb_yield_0): set exit_value for block break.
+ * array.c (rb_ary_delete_at): allows negative position.
-Wed Mar 10 15:58:43 2004 Ryan Davis <ryand@zenspider.com>
+Mon Oct 11 17:42:25 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * eval.c (eval): Only print backtrace if generating the backtrace
- doesn't generate an exception. [ruby-core:02621]
+ * parse.y (rb_intern): should generate distinct ID_ATTRSET symbols
+ for the name with multiple `='s at the end.
-Tue Mar 9 13:04:26 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * Makefile.in (CPPFLAGS): separate cpp flags from CFLAGS.
- * io.c (rb_io_ungetc): raise IOError instead of calling
- rb_sys_fail(). [ruby-talk:23181]
+Mon Oct 11 07:27:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Mar 8 19:32:28 2004 akira yamada <akira@ruby-lang.org>
+ * eval.c (rb_eval): should not execute the `else' clause on the
+ case the exceptions are handled by the `rescue' clause.
- * lib/uri/common.rb (URI::REGEXP::PATTERN::HOSTPORT): (?:#{PORT})
- -> (?::#{PORT}). [ruby-dev:23170]
+ * signal.c (Init_signal): ignore SIGPIPE by default.
-Mon Mar 8 15:31:41 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Oct 6 17:13:19 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * dir.c (range): treat incomplete '[' as ordinary character (like
- has_magic does).
+ * ruby.c (addpath): rubylib_mangled_path() modified.
- * dir.c (range): Cancel above change. More discussion is needed.
+Mon Oct 4 12:42:32 1999 Kazuhiko Izawa <izawa@erec.che.tohoku.ac.jp>
-Sun Mar 7 22:37:46 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * pack.c (pack_unpack): % in printf format should be %%.
- * test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
+Mon Oct 4 10:01:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/drb/ut_eval.rb: ditto.
+ * variable.c (rb_obj_instance_variables): should always return
+ array for all object can have instance variables now.
- * test/drb/ut_large.rb: ditto.
+Mon Oct 4 00:08:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/drb/ut_safe1.rb: ditto.
+ * pack.c (OFF16): need to adjust pointer address to pack/unpack on
+ 64bit machines.
- * test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
+Sun Oct 03 03:05:59 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-Sun Mar 7 16:22:26 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * time.c (time_arg): mktime y2k problem.
- * Makefile.in (lex.c): use $? instead of $<.
+Sun Sep 26 16:54:45 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Mar 5 00:54:14 2004 Dave Thomas <dave@pragprog.com>
+ * parse.y (here_document): `\r' handling for here documents.
- * lib/test/unit.rb: MOve RDoc documentation so that you can
- now say 'ri Test::Unit'
+Wed Sep 22 09:20:11 1999 Masahiro Tomita <tommy@tmtm.org>
-Tue Mar 2 12:32:59 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/socket.c: SOCKS5 support.
- * win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
- defined? NORETURN. [ruby-dev:23100]
+Wed Sep 22 07:33:23 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Mon Mar 1 12:24:10 2004 Dave Thomas <dave@pragprog.com>
+ * lib/net/session.rb, smtp.rb, pop.rb: 1.0.1
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
- Allow aliases to have parentheses
+ * lib/net/pop.rb: APOP did not work.
-Sun Feb 29 23:14:53 2004 Dave Thomas <dave@pragprog.com>
+ * lib/net/pop.rb: modify the way to make APOP challenge.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
- Handle :nodoc: on singleton classes.
+Wed Sep 22 00:35:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Feb 28 10:58:49 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * string.c (rb_str_include): should return boolean value.
- * MANIFEST: add test_erb.rb
+ * regex.c (re_compile_fastmap): wrong comparison with mbc.
- * lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
- if both filename and safe_level given. [ruby-dev:23050]
+ * eval.c (specific_eval): default sourcefile name should be
+ "(eval)" for module_eval etc.
-Fri Feb 27 01:00:09 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Wed Sep 22 00:06:07 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default
+ * win32/Makefile: update rules.
-Wed Feb 25 21:16:25 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (io_fread): should not assign in char, it maybe -1.
- * instruby.rb (with_destdir): should return the given argument if no
- DESTDIR is given.
+Tue Sep 21 23:57:54 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * instruby.rb: use path name expansion of cmd.exe.
+ * eval.c (call_trace_func): should not propagate retval in
+ trace_func.
-Wed Feb 25 09:35:22 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Sep 20 21:35:39 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * error.c (NameError::Message): new class for lazy evaluation of
- message to ensure replaced before marshalling. merge from HEAD.
- (ruby-bugs-ja:PR#588)
+ * win32/win32.c (myselect): assume non socket files are always
+ readable/writable.
- * eval.c (rb_method_missing): use NameError::Message. merge from
- HEAD. (ruby-bugs-ja:PR#588)
+Mon Sep 20 01:08:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Feb 24 18:59:37 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * io.c (io_fread): should not block other threads.
- * dir.c (glob_helper): '**/' should not match leading period
- unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
+ * io.c (rb_io_synchronized): renamed from rb_io_unbuffered(); do
+ not call setbuf(NULL) anymore.
-Tue Feb 24 13:22:21 2004 Dave Thomas <dave@pragprog.com>
+Sat Sep 18 13:45:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * stable version 1.4.2 released.
-Tue Feb 24 07:23:30 2004 Dave Thomas <dave@pragprog.com>
+Fri Sep 17 23:24:17 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * 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).
+ * eval.c (rb_f_missing): dumped core if no argument given.
-Tue Feb 24 06:40:14 2004 Dave Thomas <dave@pragprog.com>
+Fri Sep 17 23:21:06 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
- class variables in code listings
+ * win32/win32.c (myselect): translate WSAEINTR, WSAENOTSOCK into
+ UNIX errno constants.
-Tue Feb 24 06:40:14 2004 Dave Thomas <dave@pragprog.com>
+Fri Sep 17 00:52:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
- class variables in code listings
+ * parse.y (arg): assignable() may return 0.
-Tue Feb 24 06:32:27 2004 Dave Thomas <dave@pragprog.com>
+Thu Sep 16 20:46:23 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle
- aliases in C files.
+ * eval.c (rb_eval): was doubly evaluating the return expression.
-Tue Feb 24 06:16:22 2004 Dave Thomas <dave@pragprog.com>
+Thu Sep 16 18:40:08 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/rdoc.rb (RDoc::RDoc::document): Now create op dir _before_
- parsing files.
+ * stable version 1.4.1 released.
-Tue Feb 24 06:08:47 2004 Dave Thomas <dave@pragprog.com>
+Thu Sep 16 11:33:22 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * 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 '='
+ * string.c (rb_str_match): should return nil.
-Tue Feb 24 06:08:25 2004 Dave Thomas <dave@pragprog.com>
+Wed Sep 15 22:46:37 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/generators/html_generator.rb: Escape contant values.
+ * re.c (rb_reg_s_quote): should quote `-' too.
-Tue Feb 24 03:45:06 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Sep 14 15:23:22 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
- * ext/openssl/ossl_config.c (ossl_config_each): add new method
- OpenSSL::Config#each. it iterates with section name, field name
- and value.
+ * parse.y (yylex): no need to ignore `\r' here.
- * ext/openssl/ossl_config.c (Init_ossl_config): include Enumerable.
+ * parse.y (nextc): strip `\r' from text.
-Mon Feb 23 09:16:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (nextc): support `__END__\r\n' type terminator.
- * instruby.rb (DOSISH): embedded path in batch files should not be
- prefixed by DESTDIR. [ruby-core:02186]
+Mon Sep 13 10:49:19 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Sun Feb 22 09:54:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * eval.c (rb_eval): needless RTEST(ruby_verbose) removed.
- * re.c: corrected documentation format (again)
+Mon Sep 13 09:10:11 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Sun Feb 22 09:43:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * lib/net/session.rb, smtp.rb, pop.rb: 1.0.0
- * re.c: corrected documentation format (rb_reg_initialize_m)
+Wed Sep 8 11:37:38 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Sat Feb 21 22:36:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * time.c (make_time_t): bit more strict comparison.
- * ext/zlib/zlib.c: documented, but needs more effort.
+Tue Sep 7 00:50:56 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Feb 21 11:12:15 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * range.c (range_each): use rb_str_upto() for strings.
- * missing/os2.c, missing/x68.c: typo fix. pointed out by greentea.
+ * string.c (rb_str_upto): set upper limit by comparing curr <= end.
-Fri Feb 20 18:59:47 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * range.c (range_each): should check equality to handle magic
+ increment.
- * lib/irb/init.rb (IRB::IRB.parse_opts): add -I option to
- irb. [ruby-dev:39243]
+Mon Sep 6 22:43:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Feb 19 23:24:16 2004 Dave Thomas <dave@pragprog.com>
+ * eval.c (rb_eval): break/next/redo available within -n/-p loop.
- * lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
- Support visibility modifiers for attributes
+Fri Sep 3 11:14:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Feb 19 23:24:16 2004 Dave Thomas <dave@pragprog.com>
+ * compar.c (cmp_equal): should not raise exception; protect by
+ rb_rescue().
- * lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
- Support visibility modifiers for attributes
+Thu Sep 2 05:23:05 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-Thu Feb 19 22:39:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * file.c (rb_file_s_expand_path): use dirsep, instead of character
+ literal '/'.
- * test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
- DRb.start_service could handle this.
+ * file.c (rb_file_s_expand_path): reduce multiple dirsep at the top.
-Thu Feb 19 22:19:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Wed Sep 1 00:28:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/ostruct.rb: documented
+ * eval.c (rb_call): call rb_undefined() if a method appears not to
+ be exist explicitly from cache.
-Thu Feb 19 21:28:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * eval.c (rb_method_boundp): check method cache before calling
+ rb_get_method_body().
- * ext/strscan/strscan.c: improved documentation
+ * eval.c (rb_get_method_body): store method non-existence
+ information in the cache.
-Thu Feb 19 03:10:52 2004 Minero Aoki <aamine@loveruby.net>
+ * random.c (rb_f_srand): use getpid(2) to generate seed.
- * ext/strscan/strscan.c: synchronized with main trunk (rev 1.11).
+ * regex.c (re_match): do not apply partial mbc match for
+ charset_not.
-Thu Feb 19 02:30:34 2004 Minero Aoki <aamine@loveruby.net>
+ * regex.c (re_compile_pattern): put extended literal prefix (0xff)
+ only before numeric literals, not before all >0x80 char.
- * ext/strscan/strscan.c: documentation checked.
+ * regex.c (re_compile_pattern): put numeric literal in extended
+ charset region, not normal charset bits.
-Thu Feb 19 00:11:05 2004 Dave Thomas <dave@pragprog.com>
+ * regex.c (re_compile_fastmap): calculate fastmap for charset and
+ charset_not to treat numeric literal (e.g. \246) specially.
- * lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
- Strip extraneous space from filenames in :include:
+Fri Aug 28 17:32:55 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-Wed Feb 18 22:52:00 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * eval.c (rb_eval): should set return value (nil) explicitly if a
+ value is omitted for return statement.
- * lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
+Thu Aug 26 15:06:11 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-Wed Feb 18 22:47:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * gc.c (rb_gc): local variables may be placed beyond stack_end, so
+ use an address from alloca(1) on non C_ALLOCA platforms.
- * ext/strscan/strscan.c: documented
+Thu Aug 26 01:24:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Feb 18 22:03:11 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * sprintf.c (rb_f_sprintf): "%%" is legal, but "%3.14%" is not.
- * test/*: should not depend on $KCODE.
+Mon Aug 23 00:00:54 1999 Tsukada Takuya <tsukada@fminn.nagano.nagano.jp>
-Wed Feb 18 17:18:01 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * regex.c (re_compile_fastmap): wrong macro caused memory leak.
- * ext/win32ole/win32ole.c: need to include <olectl.h> on Cygwin.
+Sat Aug 21 11:30:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Feb 18 10:40:38 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (ADJ): should not adjust addresses to data on heap.
- * sprintf.c (rb_f_sprintf): do not prepend dots for negative
- numbers if FZERO is specified. [ruby-list:39218]
+Fri Aug 20 20:50:58 1999 Kenji Nagasawa <kenn@hma.att.ne.jp>
-Tue Feb 17 23:40:34 2004 Guy Decoux <ts@moulon.inra.fr>
+ * defines.h (PATH_SEP): path separator is ";" for OS/2.
- * sprintf.c (rb_f_sprintf): preserve original val for
- format_integer. [ruby-talk:92975]
+Thu Aug 19 10:50:43 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-Tue Feb 17 23:28:45 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * gc.c (rb_gc): add volatile to avoid GCC optimize bug(?).
- * test/ruby/marshaltestlib.rb: common marshal testcase added.
+Wed Aug 18 23:48:10 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/ruby/test_marshal.rb: use above testsuite.
+ * due to disk trouble, some change records were lost. several
+ modification made to eval.c, gc.c, io.c, pack.c,
+ ext/extmk.rb.in, and lib/mkmf.rb.
- * test/soap/marshal/test_marshal.rb: ditto.
+Fri Aug 13 15:41:39 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/soap/marshal/cmarshal.rb: removed (not used).
+ * stable version 1.4.0 released.
-Tue Feb 17 10:51:23 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Fri Aug 13 03:16:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
+ * io.c (argf_forward): since $stdout may be non-IO, ARGF.file is
+ not guaranteed to be IO. check and forwarding added to every ARGF
+ method.
-Tue Feb 17 01:35:28 2004 Tanaka Akira <akr@m17n.org>
+ * io.c (set_outfile): $stdout/$stderr may not be IO now.
- * eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
- to NODE_LIT. [ruby-dev:22920]
+ * io.c (set_stdin): $stdin may not be IO now.
-Tue Feb 17 01:24:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * range.c (rb_range_beg_len): round `end' to length as documented.
- * bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
- STACK_GROW_DIRECTION. [ruby-dev:22910]
+ * io.c (Init_IO): preserve original stdin/stdout/stderr.
- * bcc32/Makefile.sub (config.h): add newer checks.
+Thu Aug 12 13:44:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
+ * eval.c (Init_load): require receives 1 argument.
-Tue Feb 17 00:38:10 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * eval.c (frame_dup): should clear tmp to avoid dangling
+ references.
- * lib/rinda/tuplespace.rb: TupleSpace#initialize, stop doubling timeout
+Wed Aug 11 13:33:13 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Feb 17 00:18:03 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * eval.c (rb_eval): no automatic aggregate initialization.
- * test/rinda/test_rinda.rb: import test_rinda.rb
+ * eval.c (module_setup): ditto.
-Tue Feb 17 00:14:30 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Wed Aug 11 18:18:41 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * bcc32/Makefile.sub: avoid warning "Redefinition of macro
- 'HAVE_GETLOGIN'".
+ * eval.c (yield_under_i): automatic aggregate initialization is an
+ ANSI feature.
- * vms/config.h_in: ditto.
+Wed Aug 11 10:10:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Feb 16 23:28:14 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * parse.y (yylex): parse `[].length==0' as `([].length)==0', not
+ `([].length=)=0'
- * lib/csv.rb: document reduction. [ruby-core:02429]
+ * parse.y (yylex): parse `[].length!=0' as `([].length)!=0', not
+ `([].length!)=0'
-Mon Feb 16 22:08:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * parse.y (peek): peek-in lexical buffer.
- * lib/generator.rb: corrected doc format
- * lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
- * lib/rinda/tuplespace.rb: ditto
+Wed Aug 11 00:34:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Feb 16 20:41:32 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * regex.c (re_match): bug on backward jump adjustment concerning
+ stop_paren.
- * bcc32/Makefile.sub: show more warnings. (refering to mingw)
+Tue Aug 10 14:54:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * bcc32/setup.mak: ditto.
+ * ext/nkf/nkf.c (rb_nkf_guess): binary detection was wrong.
-Mon Feb 16 13:39:44 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+Tue Aug 10 00:07:36 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * dir.c (rb_glob, rb_globi): add const.
+ * io.c (rb_io_clone): should use CLONESETUP().
- * ruby.h: ditto.
+Mon Aug 9 23:57:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Feb 16 02:16:33 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * ruby.h (CLONESETUP): should have copied generic instance
+ variables too.
- * bcc32/Makefile.sub: should warn suspicious pointer conversion.
+Mon Aug 9 10:46:54 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * bcc32/setup.mak: ditto.
+ * ext/socket/extconf.rb: add check for <arpa/nameser.h> and
+ <resolv.h>.
-Sun Feb 15 19:06:42 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Sat Aug 7 13:19:06 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * lib/rinda/tuplespace.rb: TupleSpace#read(tpl, 0), raise
- RequestExpiredError if not found.
+ * numeric.c (flo_cmp): comparing NaN should not return value.
+ raises FloatDomainError.
-Sun Feb 15 15:56:46 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+Sat Aug 7 03:09:08 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
- Thanks, arton.
+ * eval.c (blk_free): free copied frames too.
-Sun Feb 15 01:46:05 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (frame_dup): should copy previous frames from stack to
+ heap to preserve frame information.
- * lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
- [ruby-dev:22870]
+Fri Aug 6 15:01:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Feb 14 11:29:41 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * version 1.3.7 - version 1.4 beta
- * sample/drb/*: import lib/drb/sample
+ * ext/socket/socket.c (s_recv): UDPsocket#recvfrom now returns
+ IPsocket#addr information.
-Sat Feb 14 11:08:23 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * array.c (rb_ary_subary): ary[-3,3] should not return nil.
- * lib/drb/drb.rb: add pretty_print, thanks gotoken.
+Thu Aug 5 10:58:01 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Feb 13 12:35:08 2004 Minero Aoki <aamine@loveruby.net>
+ * eval.c (thread_mark): protect old ruby_frame from GC during it
+ replaced by eval().
- * test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
- EACCES on Windows.
+ * eval.c (eval): do not modify frame.prev; binding should preserve
+ information about calling() too.
-Thu Feb 12 21:45:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * eval.c (rb_yield_0): no arity check for mere yield; but only for
+ Proc#call.
- * lib/ftools.rb: documented
+Tue Aug 3 22:07:13 1999 Kazuhiro HIWADA <hiwada@kuee.kyoto-u.ac.jp>
-Thu Feb 12 21:25:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * object.c (rb_mod_clone): should check if iv_tbl, m_tbl are
+ initialized.
- * lib/base64.rb: backported from HEAD (modularised and documented)
+Tue Aug 3 19:03:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Feb 12 20:31:48 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (rb_any_cmp): use rb_with_disable_interrupt() to ensure
+ clearance of rb_prohibit_interrupt even on failure.
- * lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
- directives in DOS line-ending files at all.
+ * eval.c (rb_with_disable_interrupt): new function added.
-Thu Feb 12 02:23:56 2004 Tanaka Akira <akr@m17n.org>
+Sat Jul 31 23:23:44 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/pathname.rb: use assert_raise instead of assert_raises.
+ * eval.c (rb_thread_create_0): set THREAD_RAISED flag on thread
+ termination by exception.
- * lib/pp.rb: ditto.
+ * eval.c (rb_thread_join): `$!' may not be nil for the threads
+ created in rescue clause.
- * lib/time.rb: ditto.
+ * eval.c (rb_thread_status): ditto.
- * lib/tsort.rb: ditto.
- use TSortHash and TSortArray instead of Hash and Array in test.
+ * eval.c (rb_thread_join): should re-raise exception for already
+ dead threads too.
-Wed Feb 11 20:01:12 2004 akira yamada <akira@ruby-lang.org>
+Fri Jul 30 17:56:54 1999 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
- * test/ruby/test_file.rb (TestFile::test_fnmatch): added tests for
- File.fnmatch. [ruby-dev:22815][ruby-dev:22819]
+ * object.c (rb_mod_ge): wrong comparison.
- * test/ruby/test_proc.rb (TestProc::test_eq): added a
- test. [ruby-dev:22599]
+Fri Jul 30 12:15:44 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * test/ruby/test_proc.rb (TestProc::test_eq): added tests for
- Proc#==. [ruby-dev:22592], [ruby-dev:22601]
+ * ext/tcltklib/extconf.rb: win32 support.
-Tue Feb 10 16:43:56 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/mkmf.rb: use append_library().
- * eval.c (umethod_bind): purge unused check. [ruby-dev:22850]
+ * ext/extmk.rb.in: ditto.
-Mon Feb 9 17:16:00 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Fri Jul 30 02:11:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
+ * array.c (rb_ary_delete): should return nil for deleting non
+ existing item.
-Mon Feb 9 13:00:55 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+ * io.c (rb_io_close): call rb_sys_wait() on explicit close.
- * dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
- [ruby-dev:22815]
+ * io.c (rb_io_fptr_close): do not call rb_sys_wait() on finalize.
- * dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
- [ruby-dev:22819]
+ * eval.c (yield_under_i): cbase context should be maintained for
+ Module#module_eval(). suggested by <inaba@st.rim.or.jp>.
-Sun Feb 8 16:46:13 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jul 28 01:18:28 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
- sign for higher heap areas.
+ * Makefile.in: add -I$(hdrdir)/lib to install using ftools.
-Fri Feb 6 22:48:16 2004 Dave Thomas <dave@pragprog.com>
+ * util.c: use HAVE_FCNTL_H, not HAVE_FCNTL
- * lib/rdoc/generators/html_generator.rb (gen_url): Support
- https in RDoc hyperlinks
+Wed Jul 28 18:24:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Feb 6 22:41:22 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * version 1.3.6 - version 1.4 alpha
- * lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
- commit. [ruby-dev:22813]
+Tue Jul 27 09:38:08 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-Fri Feb 6 22:22:50 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * eval.c (rb_eval): reduce recursive rb_eval() calls by
+ NODE_BLOCKs.
- * lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
- variable which is defined in the test.
+Tue Jul 27 01:20:40 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Fri Feb 6 00:48:37 2004 Tanaka Akira <akr@m17n.org>
+ * file.c (rb_file_s_expand_path): drive letter patch.
- * lib/prettyprint.rb (PrettyPrint#first?): obsoleted.
+Mon Jul 26 02:36:31 1999 Shugo Maeda <shugo@netlab.co.jp>
-Thu Feb 5 23:56:55 2004 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_load): should clear ruby_nerr.
- * lib/prettyprint.rb (PrettyPrint#seplist): added.
+ * eval.c (rb_thread_join): oldbt should not be empty to unshift.
- * lib/pp.rb (PPMethods#pp_object): use seplist.
- (PPMethods#pp_hash): ditto.
- (Array#pretty_print): ditto.
- (Struct#pretty_print): ditto.
- (MatchData#pretty_print): ditto.
+Sun Jul 25 12:09:16 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/set.rb (Set#pretty_print): use seplist.
+ * dir.c (push_braces): should treat nested braces.
-Wed Feb 4 02:12:06 2004 Tanaka Akira <akr@m17n.org>
+Fri Jul 23 02:49:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * hash.c (rb_hash_clear): dummy argument added; suggested by
+ <eguchi@shizuokanet.ne.jp>. thanks.
-Tue Feb 3 08:04:57 2004 Tanaka Akira <akr@m17n.org>
+Thu Jul 22 19:37:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
+ * eval.c (rb_thread_join): get_backtrace() may return Qnil.
+ typecheck added.
-Mon Feb 2 19:33:49 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Tue Jul 20 14:36:43 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * configure.in: backport from 1.9 for Interix.
+ * range.c (range_each): do not treat String specially (for future
+ override).
- * dln.c (dln_load): ditto.
+Tue Jul 20 02:28:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Feb 2 13:31:51 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * io.c (rb_gets): $_ should be nil, when get returns nil.
- * lib/net/http.rb (canonical_each): fix merge miss.
+ * io.c (rb_f_gets): ditto.
-Mon Feb 2 01:54:00 2004 Tanaka Akira <akr@m17n.org>
+Mon Jul 19 17:13:09 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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]
+ * regex.c (re_compile_fastmap): should continue fastmap compile
+ for anychar_repeat, for it's repeat anyway.
- * lib/open-uri.rb (URI::Generic#find_proxy): return nil on loopback
- address.
+Mon Jul 26 13:33:45 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * 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.
+ * lib/jcode.rb: replaced by faster code.
-Sun Feb 1 18:17:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+Mon Jul 19 01:57:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/net/http.rb: merged coding style changes from HEAD.
+ * lib/mkmf.rb: no longer use install program.
-Sun Feb 1 16:15:00 2004 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * ext/extmk.rb.in: use miniruby to install programs.
- * lib/test/unit.rb: rearranged documentation for RDoc's sake.
- * lib/matrix.rb: improved documentation.
- * lib/net/http.rb: slight documentation formatting improvement.
+Sat Jul 17 00:06:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Feb 1 05:30:06 2004 Tanaka Akira <akr@m17n.org>
+ * ext/socket/socket.c (ipaddr): don't do reverse lookup if
+ attribute do_not_reverse_lookup is set for socket classes.
+ Experimental. Note this is a global attribute.
- * 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]
+Fri Jul 16 22:18:29 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Jan 31 09:20:32 2004 NAKAMURA, Hiroshi <nakahiro@sairon.co.jp>
+ * io.c (rb_io_eof): use feof() to check EOF already met.
- * sample/openssl/gen_csr.rb: wrong usage string.
+ * io.c (read_all): should return nil at EOF.
-Sat Jan 31 01:00:32 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Fri Jul 16 13:39:42 1999 Wakou Aoyama <wakou@fsinet.or.jp>
- * lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
- "parts" attribute of soap:body element in WSDL.
+ * lib/telnet.rb: version 0.231.
- * lib/wsdl/xmlSchema/schema.rb: friendly warning message for
- simpleType element which is not supported for now.
+Fri Jul 16 10:58:22 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * lib/soap/mapping/factory.rb: deleted unused methods.
+ * regex.c (re_match): debug print removed.
- * lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
- string <-> Ruby class name matching.
+Fri Jul 16 09:58:15 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
- files.
+ * many files: clean up unused variables found by gcc -Wall.
-Thu Jan 29 23:56:00 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * lib/mkmf.rb: better cygwin support etc.
- * util.c (mblen): fix overrun. [ruby-dev:22672]
+ * ext/extmk.rb.in: ditto.
-Thu Jan 29 22:41:53 2004 Dave Thomas <dave@pragprog.com>
+ * instruby.rb: ditto.
- * lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
- THis means you can write "see f1[link:files/f1_rb.html]".
+Fri Jul 16 01:37:50 1999 Koji Arai <JCA02266@nifty.ne.jp>
-Thu Jan 29 15:33:23 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * string.c (rb_str_squeeze_bang): the type of local variable `c'
+ should be int, not char.
- * ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
- second argument. it expected to be a Hash not an Integer.
+ * string.c (rb_str_reverse): should always return copy.
- * ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
- function for OpenSSL::X509::Name#add_entry.
+Thu Jul 15 23:25:57 1999 NAKAMURA Hiroshi <nakahiro@sarion.co.jp>
- * ext/openssl/ossl_x509name.c (ossl_x509name_to_a): append ASN.1
- tag number to each element of return value.
+ * lib/debug.rb: better display & frame treatment.
- * ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
- OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
+Thu Jul 15 21:16:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
- second argument takes OBJECT_TYPE_TEMPLATE by default.
+ * array.c (rb_ary_each): returns self for normal termination;
+ returns nil for break.
- * sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
+ * string.c: non bang methods (e.g. String#sub) should always
+ return copy of the receiver.
-Wed Jan 28 04:29:41 2004 Eric Schwartz <emschwar@fc.hp.com>
+Thu Jul 15 21:09:15 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
- * lib/cgi/session.rb: use LOCK_SH to read, and a few other
- improvements. [ruby-core:02328]
+ * eval.c (find_file): do not add empty string to the path.
-Tue Jan 27 11:09:29 2004 FUKUMOTO Atsushi <fukumoto@nospam.imasy.or.jp>
+ * configure.in (with-search-path): should not add empty string if
+ the option is not supplied.
- * ext/socket/socket.c (s_recvfrom): sending length should be an
- invariant while retrying on EAGAIN. [ruby-talk:89962]
+Thu Jul 15 17:49:08 1999 Ryo HAYASAKA <hayasaka@univ21.u-aizu.ac.jp>
-Tue Jan 27 10:35:18 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/tcltklib/tcltklib.c: move `#include "ruby.h"' forward.
- * ext/win32ole/win32ole.c (set_argv): fix condition.
+Thu Jul 15 16:54:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Jan 27 02:26:31 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * version 1.3.5 - version 1.4 alpha
- * lib/webrick/httputils.rb (WEBrick:HTTPUtils::parse_header):
- refine regex for header-name.
+Wed Jul 14 23:45:33 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Jan 27 00:30:11 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (ruby_init): initialize for the first time only.
- * win32/Makefile.sub: rollback.
+Tue Jul 13 00:15:19 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Jan 26 22:53:04 2004 Dave Thomas <dave@pragprog.com>
+ * hash.c (rb_hash_index): re-defined; method to retrieve a key
+ from the value.
- * io.c: Remove documentation references to $defout.
+ * hash.c (Init_Hash): member? should be re-defined for Hash.
-Mon Jan 26 15:11:47 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Jul 12 13:54:51 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * sample/exyacc.rb: escape '}' to avoid warning.
+ * io.c (rb_file_sysopen): wrong number of argument.
-Mon Jan 26 14:41:46 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Jul 12 11:52:35 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/delegate.rb (Delegator::initialize): preserve
- singleton_method_added method [ruby-dev:22685]
+ * eval.c (rb_f_missing): class name included in message.
- * lib/delegate.rb (Delegator::initialize): use Kernel::raise
- instead of mere raise. [ruby-dev:22681]
+ * eval.c (print_undef): better error message.
-Mon Jan 26 12:47:17 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sun Jul 11 05:36:17 1999 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
- * ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
+ * lib/debug.rb: patch to show proper position.
-Mon Jan 26 11:35:23 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 9 23:56:14 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
- * ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
- (ruby-bugs:PR#1256)
+ * dln.c (dln_find_1): path conv. moved to conv_to_posix_path.
- * ext/win32ole/win32ole.c (set_argv): set real arguments to
- WIN32OLE::ARGV. [ruby-list:39073]
+ * dln.c (conv_to_posix_path): path conv. should be done.
-Thu Jan 22 22:54:53 2004 Shugo Maeda <shugo@ruby-lang.org>
+Fri Jul 9 10:26:47 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * 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.
+ * random.c (RANDOM_NUMBER): should place parentheses.
-Thu Jan 22 16:21:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jul 8 11:00:51 1999 Shugo Maeda <shugo@netlab.co.jp>
- * parse.y (string_content): reset lexical states at the beginning of
- string contents. [ruby-list:39061]
+ * numeric.c (fix_div): division may be out of fixnum range.
-Wed Jan 21 21:55:51 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * bignum.c (bigdivmod): proper sign calculation to result.
- * lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
- * lib/drb/extserv.rb: typo
+Wed Jul 7 18:27:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jan 21 17:57:56 2004 Shugo Maeda <shugo@ruby-lang.org>
+ * st.c (st_delete_safe): was modifying wrong slot.
- * 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.
+Mon Jul 5 13:17:46 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jan 21 16:44:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (rb_gc_call_finalizer_at_exit): close all files at exit.
- * lib/mkmf.rb (merge_libs): squeeze successive same libraries.
- [ruby-dev:22652]
+Fri Jul 2 18:00:21 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-Wed Jan 21 16:01:37 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/Mail/README: Mail-0.3.0 added to the distribution.
- * ext/digest/rmd160/extconf.rb: have_library appends found library.
+Fri Jul 2 01:45:32 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jan 21 11:36:00 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_compile_fastmap): avoid allocation of register
+ variables for each invocation of re_match(). Suggested by
+ Zasukhin Ruslan <ruslan@paradigmasoft.com>. Thanks.
- * parse.y (block_append): update nd_end for "real" head node.
- [ruby-list:39058]
+Tue Jun 29 20:39:24 1999 Koji Arai <JCA02266@nifty.ne.jp>
-Tue Jan 20 14:48:13 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/tk/lib/tk.rb (TkVariable): bug fix; should value type check
+ be added?
- * ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
- of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
+ * string.c (rb_str_each_line): a bug in paragraph mode.
-Tue Jan 20 14:43:17 2004 Dave Thomas <dave@pragprog.com>
+ * ruby.c (load_file): shifted too much to skip #!.
- * lib/base64.rb: Add RDoc
+Tue Jun 29 06:50:21 1999 Wakou Aoyama <wakou@fsinet.or.jp>
-Tue Jan 20 14:25:51 2004 Dave Thomas <dave@pragprog.com>
+ * lib/CGI.rb: 0.30 - cleanup release, incompatible.
- * lib/abbrev.rb: Add RDoc
+ * lib/telnet.rb: 0.22 - timeout added.
-Tue Jan 20 13:22:39 2004 Dave Thomas <dave@pragprog.com>
+Tue Jun 29 10:49:25 1999 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
- * lib/rdoc/generators/html_generator.rb: Document aliases at
- top-most level.
+ * configure.in: better Rhapsody support.
- * lib/English.rb: Document English.rb.
+ * lib/mkmf.rb: Rhapsody/NEXTSTEP support.
-Tue Jan 20 02:49:22 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Jun 29 01:42:13 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/extconf.rb: add check for OpenSSL version.
- [ruby-list:39054]
+ * ext/pty/pty.c (chld_changed): should use POSIX.1 style wait.
-Tue Jan 20 02:38:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Jun 28 21:07:36 1999 KIMURA Koichi <kbk@kt.rim.or.jp>
- * marshal.c (w_class): should not dump singleton class.
- [ruby-dev:22631]
+ * ext/extmk.rb.nt: wrong result for have_library().
-Tue Jan 20 01:31:36 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+Mon Jun 28 15:24:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (lineno): typo fix(FIX2INT -> INT2FIX).
+ * missing/isinf.c: OSF/1 raises SIGFPE on one()/zero().
-Mon Jan 19 21:53:38 2004 akira yamada <akira@ruby-lang.org>
+ * regex.c (re_search): should search til EOS, for patterns may
+ match beyond the end of range.
- * io.c, re.c, string.c, time.c: fixed up positions of RDocs.
+Mon Jun 28 12:49:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Jan 19 07:09:20 2004 Tadayoshi Funaba <tadf@dotrb.org>
+ * io.c (rb_f_select): should not accept Time objects as an
+ argument for it is time interval.
- * lib/date.rb: zone was wrong when it was behind UTC.
- Thanks Mark J. Reed.
+ * process.c (rb_f_sleep): ditto.
- * lib/date/format.rb: %z is now always replaced by four digits
- with a leading plus or minus sign.
+ * file.c (test_s): should return nil for false condition.
- * sample/cal.rb: added a class, anyway.
+Mon Jun 28 12:23:52 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Sun Jan 18 20:47:35 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * bignum.c (rb_dbl2big): typo.
- * ruby.c: use translate_char() on Cygwin.
+ * file.c (rb_f_test): ditto.
-Sun Jan 18 02:33:26 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * string.c (rb_str_crypt): wrong message.
- * defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
+Sun Jun 27 19:50:11 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Sun Jan 18 00:23:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_f_exit): should have treat signed integer status, not
+ VALUE.
- * marshal.c (class2path): check anonymous class/module before
- checking referable, and allow singleton classes.
+ * process.c (rb_f_exit_bang): should work like exit().
-Fri Jan 16 14:33:35 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 27 16:21:32 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
- * marshal.c (class2path): get class path and check referable.
- [ruby-dev:22588]
+ * string.c (rb_str_rindex): wrong position to search.
-Fri Jan 16 09:52:23 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Jun 26 04:05:30 1999 Takaaki Tateishi <ttate@jaist.ac.jp>
- * eval.c (proc_eq): Proc with empty body may not be equal.
- [ruby-dev:22590]
+ * configure.in (configure_args): --with-search-path to specify
+ additional ruby search path.
-Thu Jan 15 13:03:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c (ruby_prog_init): additional search path.
- * io.c (argf_read): do not append EOF. (ruby-bugs-ja:PR#585)
+Fri Jun 25 13:09:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_fwrite): ad-hockery hack to get rid of HP-UX stdio
- weird behavior. [ruby-dev:22424]
+ * pack.c (pack_unpack): needed to initialize natint.
-Wed Jan 14 13:31:06 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_compile_pattern): add start_paren to avoid too much
+ finalization on maybe_finalize_jump.
- * ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
+Fri Jun 25 13:07:20 1999 Koji Oda <oda@bsd1.qnes.nec.co.jp>
-Tue Jan 13 18:54:28 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * missing/isinf.c: include "config.h" added.
- * lib/logger.rb(Logger#msg2str): no special treatment for the object
- which responds to :to_str. commited at 2004-01-11T21:46:27 by
- gsinclair.
+Fri Jun 25 07:25:05 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/logger.rb(LogDevice#initialize): remove type checking if the
- given object is a String. Kernel.open handles it correctly.
- commited at 2004-01-11T21:46:27 by gsinclair.
+ * lib/mkmf.rb: initialize $(topdir).
- * test/logger/test_logger.rb: follow above change (ArgumentError ->
- TypeError.) follow above commit.
+ * ext/extmk.rb.in (install_rb): install lib/*.rb properly.
-Tue Jan 13 14:27:13 2004 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+ * configure.in (linux): specifies -rpath on --enable-shared.
- * lib/test/unit/ui/testrunnerutilities.rb (TestRunnerUtilities):
- moved run method which allows output level. [ruby-dev:22554]
+ * configure.in (aix): ruby.imp must reside in $(topdir).
-Tue Jan 13 04:29:52 2004 Dave Thomas <dave@pragprog.com>
+Thu Jun 24 19:11:29 1999 Yoshida Masato <yoshidam@yoshidam.net>
- * lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff):
- Show fully-qualified class names in class list.
+ * parse.y (rb_str_extend): multi-byte identifier in expression
+ interpolation in strings.
-Tue Jan 13 01:04:37 2004 Dave Thomas <dave@pragprog.com>
+ * parse.y (yylex): support multi-byte char identifiers.
- * lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
- incorporating DESTDIR in the rdoc installation.
+Thu Jun 24 15:27:13 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Jan 12 23:27:19 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (f_arg): check duplicate argument names.
- * parse.y (primary): fix position after FCALL. [ruby-dev:22574]
+ * gc.c (rb_gc_mark): marking wrong member for NODE_ARGS.
-Mon Jan 12 12:07:22 2004 Dave Thomas <dave@pragprog.com>
+ * string.c (rb_str_rindex): POSITION specifies start point, not
+ end point.
- * 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.
+Thu Jun 24 13:00:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c: Remove spurious space in TrueClass documentation.
+ * regex.c (print_mbc): wrong boundary.
- * 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.
+ * pack.c (uv_to_utf8): raises ArgError for too big value.
- * lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
- HTML formats need explicit line breaks.
+Thu Jun 24 11:02:51 1999 Yoshida Masato <yoshidam@yoshidam.net>
-Mon Jan 12 11:46:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * pack.c (uv_to_utf8): mask needed.
- * configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
- quotes. [ruby-dev:22564]
+Wed Jun 23 21:03:56 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * lib/mkmf.rb (libpathflag): do not enclose with quotes always.
+ * ruby.h (struct RFile): remove iv_tbl from struct. instance
+ variables are handled as generic ivs.
- * {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
+Wed Jun 23 22:06:26 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Mon Jan 12 02:24:07 2004 Dave Thomas <dave@pragprog.com>
+ * pack.c (utf8_to_uv): pack to 7 bytes sequence.
- * lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
- generation support to ri (Elliot Hughes)
+ * pack.c (uv_to_utf8): wrong boundary.
-Mon Jan 12 02:24:07 2004 Dave Thomas <dave@pragprog.com>
+ * pack.c (pack_unpack): should treat as unsigned long.
- * lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
- generation support to ri (Elliot Hughes)
+Wed Jun 23 15:10:11 1999 Inaba Hiroto <inaba@sdd.tokyo-sc.toshiba.co.jp>
-Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
+ * parse.y (parse_string): failed to parse nested braces.
- * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
- Also accept command line options via the 'RI' environment variable.
+ * parse.y (parse_regx): nested braces within #{} available.
-Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
+Wed Jun 23 11:18:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
- Also accept command line options via the 'RI' environment variable.
+ * regex.c (slow_search): wrong shift width for mbcs.
-Sat Jan 10 21:27:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_thread_save_context): should not clear th->locals.
- * eval.c (eval): need to add message delimiter. [ruby-dev:22561]
+Wed Jun 23 02:06:14 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Jan 10 01:54:50 2004 Eric Sunshine <sunshine@sunshineco.com>
+ * parse.y (yylex): UMINUS binds too tight with digits. changed so
+ that -2**2 => -4.
- * 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).
+ * parse.y (close_paren): `do' for expr termination now works it
+ used to be.
- * 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).
+Wed Jun 22 18:26:42 1999 Koji Arai <JCA02266@nifty.ne.jp>
-Fri Jan 9 10:05:14 2004 Siena. <siena@faculty.chiba-u.jp>
+ * pack.c (pack_pack): should initialize local variable `j'.
- * lib/mkmf.rb (libpathflag): use single quotes. [ruby-dev:22440]
+Wed Jun 22 15:24:59 1999 Koji Arai <JCA02266@nifty.ne.jp>
-Thu Jan 8 23:49:21 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * parse.y (here_document): a bug for multiline heredoc.
- * configure.in (RDOCTARGET): new macro. if you want to install
- rdoc documentation, you need to run configure with
- --enable-install-doc.
+Tue Jun 22 15:06:36 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Thu Jan 8 21:29:43 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/socket/socket.c (ruby_socket): forgot to return fd
+ explicitly.
- * ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
- public key only.
+Tue Jun 22 13:34:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_pkey_dh.c (ossl_dh_to_der): new function for
- OpenSSL::PKey::DH#to_der.
+ * rubyio.h (MakeOpenFile): should initialize member `iv_tbl'.
- * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_to_der): new function for
- OpenSSL::PKey::DSA#to_der.
+Wed Jun 22 10:35:51 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
- OpenSSL::PKey::RSA#to_der.
+ * io.c (rb_io_gets_internal): getc(3) may not set errno on
+ interrupt.
-Thu Jan 8 16:51:04 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Mon Jun 21 22:39:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
- dumps "E" at month-end.
+ * eval.c (call_required_libraries): ruby_sourceline should be
+ cleared before loading libraries.
-Thu Jan 8 11:20:01 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+ * io.c (set_stdin): do not use reopen(), so that we don't need to
+ dup original stdin before assigning $stdin.
- * eval.c, object.c, process.c, re.c: don't use C++ style comments.
+Mon Jun 21 18:04:27 1999 Ryo HAYASAKA <hayasaka@univ21.u-aizu.ac.jp>
-Thu Jan 8 04:36:21 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/dbm/dbm.c: include <cdefs.h> for solaris 2.6.
- * lib/webrick/cgi.rb (WEBrick::CGI#initialize): should create
- @config[:Logger] if it was not given.
+Mon Jun 21 15:59:47 1999 Nobuyoshi Nakada <nobu.nokada@softhome.net>
- * sample/webrick/*: new files.
+ * ext/socket/socket.c (ip_addrsetup): forgot to put `else'.
- * MANIFEST: add sample/webrick/*
+Mon Jun 21 15:38:37 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Jan 7 13:00:18 2004 Dave Thomas <dave@pragprog.com>
+ * io.c (fptr_finalize): remove rb_syswait() invocation to avoid
+ wait4(2) within GC. rb_syswait() moved to rb_io_fptr_close().
- * 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)
+Mon Jun 21 12:05:59 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Wed Jan 7 12:35:41 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * dir.c (dir_s_glob): remove MAXPATHLEN restriction.
- * lib/debug.rb: revert command parse regexps. [ruby-list:39014] by
- Shirai,Kaoru.
+ * ext/md5/md5init.c (md5_hexdigest): should have used "%02x".
-Wed Jan 7 08:21:04 2004 Dave Thomas <dave@pragprog.com>
+Sun Jun 20 19:50:38 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/rdoc/parsers/parserfactory.rb: Check for shebang
- line in files that would otherwise be treated as
- plain text.
+ * string.c (rb_str_each_line): should have checked string
+ boundary.
-Tue Jan 6 22:13:34 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Jun 19 22:24:12 1999 Kenji Nagasawa <kenn@hma.att.ne.jp>
- * eval.c (rb_mod_modfunc): should break if m has no super class.
- [ruby-dev:22498]
+ * OS/2 patch improved.
-Tue Jan 6 21:55:02 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jun 18 08:30:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (fptr_finalize): should save errno just after failure.
- [ruby-dev:22492]
+ * marshal.c (r_byte): add data length check.
-Tue Jan 6 14:53:14 2004 Dave Thomas <dave@pragprog.com>
+ * ext/tcltklib/tcltklib.c (_timer_for_tcl): was doing busy-wait.
- * bin/ri: split out the display side, making it pluggable. Added
- new ri_driver and ri_display files in lib/rdoc/ri.
+Tue Jun 15 10:01:21 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-Tue Jan 6 06:37:53 2004 Dave Thomas <dave@pragprog.com>
+ * configure.in: remove trailing slash from interpreter embedded
+ shared library path.
- * bin/rdoc: Add --ri-system switch
+ * configure.in (INSTALL_DLLIB): install shared lib with 0555.
- * lib/.document: Update with list of files that seem to have
- documentation
+ * instruby.rb: changed mode for shared library into 0555.
- * lib/test/unit.rb: Reorder comment to make it RDoc friendly.
+Fri Jun 11 23:27:00 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * Makefile.in: add install-nodoc target, and make it
- generate RDoc on default install.
+ * ext/etc/etc.c (etc_passwd): should return nil, not exception for
+ call after last passwd entry.
- * lib/rdoc/ri/ri_options.rb (RI::Options::parse): Add
- --doc-dir option to ri.
+Fri Jun 11 15:21:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Jan 6 00:04:40 2004 Dave Thomas <dave@pragprog.com>
+ * gc.c (rb_gc_mark_locations): add safety margin 1.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
- fix parsing if there are braces in a method parameter list
+ * eval.c (ruby_run): should protect toplevel node tree.
-Fri Jan 2 14:54:11 2004 Dave Thomas <dave@pragprog.com>
+ * ext/etc/etc.c (etc_group): dumps core if there's no more group.
- * bin/ri: Add new --classes option, and arrange for
- help messages to be paged too.
+Fri Jun 11 01:50:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * bin/rdoc: Add statistics.
+ * eval.c (ruby_run): Init_stack() was called too late; local
+ variables happened to be higher (or lower) than stack_start.
- * process.c: (MG) Added Process documentation
+Thu Jun 10 16:41:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/ri/ri_formatter.rb (RI::AttributeFormatter::wrap):
- Fix problem with labels not displaying in RI labeled
- lists using BS and ANSI modes.
+ * io.c: do not call `initialize' for IO objects. So with Array,
+ Hash, Range, and Time objects.
-Fri Jan 2 01:50:13 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/curses/curses.c (curses_getch): made thread aware using
+ rb_read_check().
- * io.c (argf_eof): ARGF.eof? should not have any side effect.
- [ruby-dev:22469]
+ * ext/curses/curses.c (window_getch): ditto.
-Wed Dec 31 17:25:17 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/curses/curses.c (curses_getstr): made (partially) thread
+ aware using rb_read_check().
- * io.c (argf_each_byte): should return self. [ruby-dev:22465]
+ * ext/curses/curses.c (window_getstr): ditto.
-Wed Dec 31 11:20:34 2003 Dave Thomas <dave@pragprog.com>
+ * io.c (rb_read_check): new function to help making something
+ (like extension libraries) thread aware.
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Make
- file referenced in "// in sss.c" relative to current file.
+ * eval.c (is_defined): `defined? super' should be true even for
+ private superclass methods.
-Wed Dec 31 11:17:37 2003 Dave Thomas <dave@pragprog.com>
+Fri Jun 10 13:42:10 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * 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.
+ * pack.c (pack_pack): template `Z' should be allowed.
-Wed Dec 31 01:33:05 2003 Dave Thomas <dave@pragprog.com>
+Wed Jun 9 13:26:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * eval.c (rb_thread_loading): modified to avoid nested race
+ condition of require().
-Tue Dec 30 19:39:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/tcltklib/tcltklib.c (ip_invoke): queue invocation on non
+ main threads.
- * io.c (rb_f_readline): should raise EOFError at the end of
- files. [ruby-dev:22458]
+ * ext/tcltklib/tcltklib.c (lib_mainloop): flush invocation
+ queues periodically.
- * io.c (argf_read): should concatenate input files when length
- argument is nil. [ruby-dev:22450]
+ * version.c (ruby_show_version): now print the message to stdout.
- * io.c (argf_read): should update supplied string buffer (2nd
- argument) even when IO#read is called multiple times.
+ * version.c (ruby_show_copyright): ditto.
- * io.c: should initialize lineno by zero. [ruby-dev:22460]
+Tue Jun 8 00:00:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Dec 30 12:30:30 2003 Dave Thomas <dave@pragprog.com>
+ * pack.c (pack_unpack): append sentinel (NUL) to the string.
- * 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'.
+ * ext/md5/md5init.c (md5_hexdigest): new method to obtain
+ printable hash string.
+ * ext/md5/md5init.c (md5_update): should return self.
-Tue Dec 30 08:32:32 2003 Dave Thomas <dave@pragprog.com>
+ * pack.c (pack_pack): undocumented template 'U' for UTF8.
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
- Handle undoing nesting of yield parameters correctly for:
+ * pack.c (pack_unpack): ditto.
- def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
+ * marshal.c (r_byte): should replace getc() with rb_getc().
+ * io.c (rb_getc): getc() replacement uses READ_DATA_PENDING() and
+ rb_thread_wait_fd().
-Tue Dec 30 08:32:32 2003 Dave Thomas <dave@pragprog.com>
+Mon Jun 7 23:23:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
- Handle undoing nesting of yield parameters correctly for:
+ * object.c (rb_mod_clone): should call CLOSESETUP().
- def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
+ * eval.c (bind_clone): should call CLONESETUP() for new clone.
-Mon Dec 29 12:51:02 2003 Dave Thomas <dave@pragprog.com>
+Sat Jun 5 10:32:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c: Add RDoc for Kernel global functions.
+ * string.c (rb_str_oct): binary (e.g. 0b10111) support.
-Mon Dec 29 11:00:16 2003 Dave Thomas <dave@pragprog.com>
+ * variable.c (rb_const_set): raise warning, not exception.
- * array.c: Tidy up RDoc loose ends.
+ * parse.y (yycompile): initialize parser internal variables.
-Mon Dec 29 05:05:51 2003 Dave Thomas <dave@pragprog.com>
+ * parse.y (close_paren): set lex_state to EXPR_PAREN after closing
+ parenthesis.
- * struct.c, random: Add RDoc comments
+ * parse.y (yylex): returns kDO for `do' right after method_call.
-Mon Dec 29 02:20:54 2003 Dave Thomas <dave@pragprog.com>
+Thu Jun 3 11:05:30 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * eval.c: Add RDoc for class Proc, Method, UnboundMethod
+ * regex.c (read_backslash): should decode \b within class.
-Mon Dec 29 00:41:44 2003 Dave Thomas <dave@pragprog.com>
+Thu Jun 3 01:06:18 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * math.c: Add RDoc comments
+ * dln.c (dln_load): AIX improvement (aix_findmain removed).
-Sun Dec 28 20:19:11 2003 Tanaka Akira <akr@m17n.org>
+Wed Jun 2 00:41:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/stringio/stringio.c (strio_sysread): StringIO.new.sysread didn't
- raise EOFError.
+ * pack.c (pack_unpack): new undocumented template Z which strips
+ stuff after first null.
- * ext/zlib/zlib.c (gzreader_gets): don't increment lineno when
- gzfile_read_all returns "".
+ * pack.c (pack_pack): should preserve specified length of the
+ resulting string.
-Sun Dec 28 15:25:08 2003 Dave Thomas <dave@pragprog.com>
+Tue Jun 1 15:29:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * class.c,object.c,parse.y,sprintf.c,variable.c: Document classes
- Object, Module, etc...
+ * ext/socket/socket.c (ruby_socket): retry after GC, if socket(2)
+ failed on EMFILE or ENFILE.
-Sun Dec 28 11:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ext/socket/socket.c (sock_s_socketpair): ditto.
- * test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
- [ruby-talk:88852]
+ * eval.c (module_setup): need to add PUSH_VAR/POP_VAR to clear
+ dyna vars link list.
- * test/csv/{bom.csv,mac.csv}: removed.
+ * version.h (RUBY_RELEASE_CODE): integer macro constant for source
+ version detection.
-Sun Dec 28 08:56:51 2003 Dave Thomas <dave@pragprog.com>
+Sun May 30 22:19:12 1999 Kenji Nagasawa <kenn@tcp-ip.or.jp>
- * eval.c: Thead[Group] RDoc (thanks to MG)
+ * ext/socket/socket.c: emx/gcc 0.9d now fixes things about
+ AF_UNIX.
-Sun Dec 28 03:50:05 2003 Dave Thomas <dave@pragprog.com>
+ * process.c: OS/2 EMX kludge.
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_override_comment):
- Escape method names used in regexp
+ * Makefile.in (strncasecmp.o): added dependency.
-Sun Dec 28 01:46:02 2003 Dave Thomas <dave@pragprog.com>
+Mon May 31 16:06:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
- Add support for rules in 'ri' output.
+ * version 1.3.4 - preliminary release for 1.4
-Sun Dec 28 01:35:35 2003 Dave Thomas <dave@pragprog.com>
+Mon May 31 15:57:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * io.c (rb_io_fptr_close): close on IO which main_thread is
+ waiting cause serious exception, that vanishes the actual fd
+ closing. Invocation of rb_thread_fd_close() is deferred
+ a little.
-Sun Dec 28 01:05:31 2003 Dave Thomas <dave@pragprog.com>
+Sat May 29 18:27:13 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * marshal.c, signal.c: RDoc collemts added by Elliott Hughes
+ * regex.c (re_match): stack boundary check needed.
-Sun Dec 28 00:48:47 2003 Dave Thomas <dave@pragprog.com>
+Sat May 29 12:27:00 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
- Some source files use lower case class or module names
- when naming the Init_XXX function in C.
+ * ext/tcltklib/tcltklib.c (ip_invoke): proper ref count management
+ to avoid leak. I HATE REF COUNTING!!
-Sat Dec 27 23:41:46 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (ruby_run): moved ruby_require_libraries() to handle `-r'
+ from ruby_options() to avoid stack corruption for threads
+ created in libraries.
- * configure.in: fix "test: too many arguments" error.
+Sat May 29 02:22:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Dec 27 15:32:19 2003 Dave Thomas <dave@wireless_3.local.thomases.com>
+ * eval.c (rb_yield_0): when `for' appeared in blocks, it
+ introduced new scope for local variables.
- * time.c: RDoc comments added
+Fri May 28 17:16:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Dec 27 15:07:57 2003 Dave Thomas <dave@pragprog.com>
+ * string.c (rb_str_squeeze_bang): squeeze AND of the arguments.
+ UNDOCUMENTED.
- * object.c: Add RDoc comments for Symbol class.
+ * string.c (rb_str_count): new UNDOCUMENTED method.
-Sat Dec 27 14:42:30 2003 Dave Thomas <dave@pragprog.com>
+ * string.c (rb_str_delete_bang): delete AND of the arg ranges.
+ UNDOCUMENTED FEATURE for 1.3.x.
- * numeric.c: Add RDoc comments.
+ * ext/socket/socket.c (setipaddr): re-wrote using ip_addrsetup().
-Sat Dec 27 00:44:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/socket/socket.c (ip_addrsetup): decode symbolic address
+ <broadcast>.
- * io.c (next_argv): warn always for stdin on inplace edit mode.
+Thu May 27 12:27:42 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (read_all): need to check string value.
+ * string.c (tr_trans): should handle NUL (\0) within strings.
- * io.c (argf_read): allow ARGF.read(nil). [ruby-dev:22433]
+Tue May 25 16:45:11 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Dec 26 23:02:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_f_syscall): syscall may return values other than zero
+ on success.
- * io.c (rb_f_backquote): need not to check nil result.
- [ruby-core:02078]
+ * regex.c (re_match): handle empty loop properly (hopefully).
- * io.c (rb_io_getline): should return nil when read_all gives
- empty string, even when nil rs is specified. [ruby-core:02077]
+ * regex.c (re_match): remove empty group check, because it does
+ not help non-grouping parentheses (?:..).
-Fri Dec 26 18:50:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_compile_fastmap): treating try_next, finalize_push
+ wrong way.
- * configure.in: check if getcontext and setcontext are available.
+ * regex.c: remove some obsolete functions such as
+ group_match_null_string_p().
- * eval.c: use presence of getcontext/setcontext.
+Mon May 24 14:47:54 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Dec 26 16:40:53 2003 Tanaka Akira <akr@m17n.org>
+ * regex.c (read_backslash): read backslash by regex.
- * lib/pathname.rb (PathnameTest#test_plus): add 2 assertions.
+Sun May 23 19:44:58 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-Fri Dec 26 09:26:58 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/pty/pty.c (getDevice): portability patch.
- * pack.c (pack_pack): add sign check for 'i', and 'l'.
- [ruby-dev:22427]
+Fri May 21 23:01:26 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * bignum.c (rb_quad_pack): add range check for 'quad int'.
+ * ext/socket/getaddrinfo.c (GET_AI): should set error code.
-Thu Dec 25 22:39:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu May 20 03:43:44 1999 Jun-ichiro itojun Hagino <itojun@itojun.org>
- * string.c (rb_str_update): don't return any value.
+ * ext/socket/socket.c: you should use sockaddr_storage to handle
+ IPv6 addresses.
-Thu Dec 25 15:30:17 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/socket/getaddrinfo.c (getaddrinfo): prevent retrieving
+ AF_INET6 address if hints.ai_flags == AI_PASSIVE.
- * string.c (rb_str_update): call rb_str_modify().
+Wed May 19 12:27:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 25 05:08:09 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (exec_end_proc): should protect exceptions.
- * eval.c (search_required): search actual file name once when no
- extension specified.
+ * gc.c (run_final): ditto.
-Thu Dec 25 04:00:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (f_rest_arg): allow just * for rest arg.
- * stable version 1.8.1 released.
+ * parse.y (mlhs_basic): allow * without formal argument.
-Thu Dec 25 00:17:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_match): the variable `part' should be initialized.
- * configure.in: check for nanosleep, -lrt if required.
- [ruby-core:02059]
+Tue May 18 15:25:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (thread_timer): use select(2) if nanosleep(2) is not
- available.
+ * regex.c (re_search): a bug in range adjustment.
- * eval.c: check __stub_getcontext for glibc on some platforms.
- [ruby-list:38984]
+Tue May 18 11:35:59 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Dec 24 23:48:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * dln.c (conv_to_posix_path): path_len argument added.
- * 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]
+Mon May 17 12:26:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 24 23:29:30 2003 Tanaka Akira <akr@m17n.org>
+ * numeric.c (fix_rev): should treat Fixnum as signed long.
- * lib/tsort.rb (test_orphaned_break): removed.
+ * eval.c (massign): add strict number check for yield (and call).
-Wed Dec 24 20:53:06 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (proc_arity): new method to return number of arguments.
- * ext/tk/sample/tkmulticolumnlist.rb: new sample
+ * eval.c (method_arity): new method to return number of arguments.
- * ext/tk/sample/tkmultilistframe.rb: bug fix
+ * parse.y (read_escape): char may be unsigned.
-Wed Dec 24 20:37:37 2003 Eric Sunshine <sunshine@sunshineco.com>
+ * string.c (rb_str_succ): ditto.
- * configure.in (LDSHARED): Fixed typographical error in assignment of
- LDSHARED for Rhapsody which caused linking of extension modules to
- fail.
+ * string.c (tr_trans): ditto.
-Wed Dec 24 17:51:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * object.c (Init_Object): methods `&', `|', `^' are added to nil.
- * file.c (rb_thread_flock): enable thread support again.
+ * range.c (rb_range_beg_len): it should be OK for [0..-len-1].
-Wed Dec 24 16:46:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_search): search for byte literal within mbcs.
- * 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.
+ * regex.c (is_in_list): parsh
- * eval.c (thread_timer): do not post signal unless it is
- absolutely necessary.
+ * regex.c (re_compile_fastmap): should have not alter the loop
+ variable `j' if TRASLATE_P().
- * rubysig.h (TRAP_END): add CHECK_INTS to switch thread.
+ * regex.c (re_compile_pattern): escaped characters should be read
+ by PATFETCH_RAW(c).
- * regex.c (re_compile_pattern): check if nextp is smaller than
- pend. [ruby-dev:22372]
+Sat May 15 11:23:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (umethod_bind): remove method overridden check.
- [ruby-dev:22366]
+ * regex.c (re_match): endline2 (\Z) should not match at the point
+ between a newline and end-of-line, like endline ($).
-Wed Dec 24 16:13:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * class.c (include_class_new): should initialize iv_tbl to share
+ between module and iclass.
- * ext/openssl/ossl_ssl.c (ossl_ssl_read): should check for error
- status by SSL_get_error().
+Fri May 14 08:50:27 1999 Akira Endo <akendo@t3.rim.or.jp>
- * ext/openssl/ossl_ssl.c (ossl_ssl_write): ditto.
+ * regex.c (re_compile_fastmap): it should be k != 0 to skip.
-Wed Dec 24 14:23:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri May 14 12:46:56 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/stringio/stringio.c (strio_read): clear the buffer argument
- when returning nil. [ruby-dev:22363]
+ * time.c (time_load): a bug in old marshal format support.
- * test/ruby/ut_eof.rb (TestEOF::test_eof_0, TestEOF::test_eof_1):
- add buffer argument tests.
+ * instruby.rb: make site_ruby directory.
-Wed Dec 24 14:07:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri May 14 10:18:02 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * lib/test/unit/assertions.rb: Modules are allowed to rescue.
+ * regex.c (re_match): a bug in inline `.*' etc.
- * lib/test/unit/autorunner.rb: show output_level in order.
+Fri May 14 09:58:46 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
- * lib/test/unit/collector/dir.rb: get rid of successive same
- directories in load path.
+ * ruby.c (addpath): should have specified string length.
- * test/testunit/test_assertions.rb (test_assert_nothing_raised,
- test_assert_raise): test for modules.
+Thu May 13 10:40:44 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 24 13:43:34 2003 Shugo Maeda <shugo@ruby-lang.org>
+ * eval.c (rb_eval_string_wrap): new function.
- * lib/net/imap.rb (authenticate): remove "\n" from base64 encoded
- strings.
+ * regex.c (re_compile_pattern): POSIX line match should alter
+ behavior for `^' and `$' to begbuf and endbuf2 respectively.
-Wed Dec 24 11:26:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/pty/pty.c: un-ANSI-fy function arguments.
- * test/fileutils/test_fileutils.rb: should not create any
- files or directories in current directory. [ruby-talk:88724]
+Wed May 12 14:19:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 24 10:29:53 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * struct.c (iv_get): in case of inheritance of generated struct
+ class, __member__ and __size__ should also be inherited.
+ Thanks for Pros Yeboah <yeboah@tu-harburg.de>.
- * ext/stringio/stringio.c (strio_read): never return nil at
- unlimited read. [ruby-dev:22334]
+ * io.c (rb_f_gets_internal): should check number of arguments
+ before checking rb_rs == rb_default_rs. Thanks for Koji Arai
+ <JCA02266@nifty.ne.jp>.
- * ext/stringio/stringio.c (strio_read): support second
- argument. [ruby-dev:22350]
+Tue May 11 08:29:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 24 09:38:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_compile_pattern): .?, .+ did not work.
- * parse.y (arg): should return 0 after error. [ruby-dev:22360]
+Mon May 10 00:59:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 24 00:56:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * lib/jcode.rb: forgot to squeeze on reverse (complement) case.
- * io.c (read_all): do not return nil at the end of file.
- [ruby-dev:22334]
+ * string.c (tr_squeeze): should not set modify flag to be honest,
+ if the string is not modified.
- * io.c (argf_read): do not depend on nil at eof behavior of
- IO#read().
+ * signal.c (Init_signal): SIGTERM should not be handled.
- * eval.c (rb_thread_join): dup exception before re-raising it.
+ * regex.c (re_match): seeking for longest match is now optional,
+ which can be set using RE_OPTION_POSIXMATCH. This satisfies
+ POSIX longest match as much as Emacs's posix-* functions, which
+ are known to be incomplete.
- * 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]
+Sun May 9 13:04:01 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * pack.c (OFF16): get offset for big endian machines.
+ * ext/socket/socket.c (sock_s_getaddrinfo): conversion from
+ Fixnums to C integers needed.
- * pack.c (pack_pack): use OFF16 instead of OFF16B.
- [ruby-dev:22344]
+Sun May 9 11:51:43 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * pack.c (pack_unpack): ditto.
+ * range.c (range_eqq): reverse condition.
-Tue Dec 23 22:47:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * range.c (range_s_new): default should be end inclusive.
- * io.c (rb_io_check_readable): set FMODE_RBUF always, even if
- NEED_IO_SEEK_BETWEEN_RW is not defined. [ruby-dev:22340]
+Sat May 8 03:27:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_check_writable): clear FMODE_RBUF before writing
- something.
+ * ext/socket/socket.c (thread_connect): replace nasty
+ rb_thread_fd_writable() with rb_thread_select().
-Tue Dec 23 22:25:00 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
+Fri May 7 20:49:00 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/optparse.rb: incomplete RDoc documentation added in place of
- existing RD comments. Tabs converted to spaces.
+ * ext/socket/getaddrinfo.c (inet_pton): wrong parameter to
+ inet_aton().
-Tue Dec 23 19:44:47 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ext/socket/addrinfo.h (__P): silly cut and paste typo.
- * 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.
+Fri May 7 17:03:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Dec 23 19:42:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (glob): removed GPL'ed glob.c completely.
- * io.c (rb_io_ungetc): raise an exception at unread stream to
- avoid unspecified behavior. [ruby-dev:22330]
+Fri May 7 08:17:19 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/ruby/test_system.rb (test_syntax): glob relatively from
- __FILE__.
+ * ext/sdbm/extconf.rb: sdbm extension added to the distribution.
-Tue Dec 23 18:09:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri May 7 01:42:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * pack.c (pack_pack): remove unnecessary negative value check.
- [ruby-dev:22329]
+ * ext/socket/socket.c (tcp_s_gethostbyname): avoid using struct
+ sockaddr_storage.
-Tue Dec 23 17:26:55 2003 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
+Thu May 6 13:21:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * bcc32/Makefile.sub (config.h): bcc has finite(). [ruby-list:38940]
+ * array.c (rb_ary_indexes): should not use rb_ary_concat().
-Tue Dec 23 16:08:16 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Thu May 4 12:34:18 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/rexml/encodings/US-ASCII.rb: typo. [ruby-talk:88650]
+ * parse.y (parse_string): there should be newline escape by
+ backslashes in strings.
- * test/ruby/test_system.rb: num of asserts depended on running dir.
+ * parse.y (parse_qstring): ditto.
- * test/xsd/test_noencoding.rb: rexml + without iconv/uconv cannot
- handle euc-jp. install iconv, uconv or xmlscan.
+Mon May 3 04:37:20 1999 Koji Arai <JCA02266@nifty.ne.jp>
-Tue Dec 23 14:13:51 2003 akira yamada <akira@ruby-lang.org>
+ * ext/tcltklib/extconf.rb: better search for libX11.
- * lib/uri/generic.rb (URI::Generic::check_userinfo,
- URI::Generic::check_user, URI::Generic::check_password): tests
- conflicts/depends with other components closely.
+ * range.c (range_s_new): embarrassing =/== typo.
- * test/uri/test_generic.rb (TestGeneric::test_set_component):
- added tets.
+ * re.c (Init_Regexp): failed to set default kcode.
-Tue Dec 23 11:08:34 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Mon May 3 02:39:55 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * 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]
+ * ext/socket/socket.c (open_inet): typo (res and res0).
-Tue Dec 23 06:10:31 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue May 4 02:07:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/cgi.rb (CGI): add support for mod_ruby.
+ * mkconfig.rb: leave undefined $(VARIABLE) unexpanded in the
+ Config::CONFIG hash table.
- * lib/webrick/cgi.rb (CGI::Socket): add check for existence of
- OpenSSL module in all HTTPS related methods.
+Mon May 3 09:37:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/cgi.rb (CGI::Socket#cipher): should create similar
- value to OpenSSL::SSLSocket#cipher.
+ * regex.c (re_compile_pattern): expand exactn{n} at compile time.
+ handles stop_paren specially.
- * lib/webrick/httpresponse.rb (HTTPResponse#setup_header): should
- set "connection: close" if @keep_alive is false.
+ * regex.c (re_compile_pattern): expand x{n} at compile time.
- * lib/webrick/https.rb (HTTPrequest#meta_vars): add supprt for
- SSL_PROTOCOL, SSL_CIPHER_USEKEYSIZE and SSL_CIPHER_ALGKEYSIZE.
+ * regex.c (re_search): posix line match should be checked.
-Mon Dec 22 23:00:05 2003 akira yamada <akira@ruby-lang.org>
+ * regex.c (re_search): a bug in anchor condition.
- * lib/uri/generic.rb (URI::Generic::check_opaque): fixed typo.
+Fri Apr 30 18:57:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Dec 22 21:59:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * version 1.3.3
- * ext/iconv/iconv.c (map_charset): always ensure code is a String.
+ * string.c (rb_str_rindex): position should be END point, not
+ START point.
-Mon Dec 22 21:15:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (rb_reg_search): pos means end point on reverse now.
- * class.c (rb_mod_init_copy): always copy singleton class.
- [ruby-dev:22325]
+ * array.c (rb_ary_s_create): should clear ary->ptr to avoid
+ potential gc crash.
-Mon Dec 22 20:44:36 2003 akira yamada <akira@ruby-lang.org>
+Fri Apr 30 15:24:58 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
- has no host-part.
+ * ext/socket/addrinfo.h: compatibility hack for ipv4.
- * test/uri/test_generic.rb (TestGeneric::test_route): added a test.
+ * ext/socket/socket.c: itojun's ipv6 patches applied.
-Mon Dec 22 20:38:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/extconf.rb: detect ipv6 features based on itojun's
+ ipv6 patches.
- * lib/cgi.rb: reduce eval.
+ * ext/extmk.rb.in (enable_config): can handle --enable-xxx now.
- * lib/cgi.rb (CGI::QueryExtension::read_multipart): alias path to
- local_path. [ruby-list:38883]
+ * lib/mkmf.rb (enable_config): ditto.
-Mon Dec 22 20:09:31 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Fri Apr 30 05:22:23 1999 Shugo Maeda <shugo@netlab.co.jp>
- * test/soap/test_property.rb: remove duplicated test method.
+ * string.c (rb_str_aset): last index should not append.
-Mon Dec 22 18:22:04 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Apr 29 18:55:31 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
- * bcc32/Makefile.sub, win32/Makefile.sub (config.h): remove
- HAVE_ISINF definition to follow previous commits of missing.h
- and win32/win32.h.
+ * dln.c (conv_to_posix_path): remove const from args.
-Mon Dec 22 17:23:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.c (rubylib_mangle): remove Fatal(), the obsolete function.
- * configure.in (ac_cv_func_setitimer): moved from defines.h
+Tue Apr 27 14:11:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * defines.h, rubysig.h, signal.c: removed macro handling which
- should be done in configure.
+ * parse.y (fname): lazy workaround for keywords did not work well.
- * configure.in (intrinsics.h): check if present.
+ * ext/extmk.rb.in: `--with-xxx=yyy' argument configuration.
- * ruby.h: include intrinsics.h if available.
+ * lib/mkmf.rb: ditto.
- * bignum.c, marshal.c: include ieeefp.h if available.
+ * misc/ruby-mode.el: forgot to handle $`.
- * missing.h (isinf): define as a macro if finite() and isnan()
- are available. [ruby-core:02032]
+ * ext/extmk.rb.in: better AIX link support proposed by
+ <komatsu@sarion.co.jp>.
-Mon Dec 22 17:07:31 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Mon Apr 26 16:46:59 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in (mingw): set isnan, finite and isinf to yes.
+ * ext/extmk.rb.in: AIX shared library support modified.
-Mon Dec 22 13:40:19 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ext/aix_mksym.rb: ditto.
- * lib/soap/property.rb: passing block by reference.
+ * configure.in: ditto.
-Mon Dec 22 00:32:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * sprintf.c (rb_f_sprintf): should allocate proper sized buffer
+ for float numbers.
- * eval.c (rb_with_disable_interrupt): use ENABLE_INTS instead of
- ALLOW_INTS which may switch context. [ruby-dev:22319]
+Sat Apr 24 00:00:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/emitter.c (syck_emitter_write): str bigger than
- e->bufsize causes buffer overflow. [ruby-dev:22307]
+ * parse.y (operation): syntax like `a.[]=(1,2)' is allowed.
-Sun Dec 21 17:29:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 23 23:54:09 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * class.c (rb_check_inheritable): new function. [ruby-dev:22316]
+ * io.c (argf_binmode): binmode method added to ARGF.
- * intern.h: add prototype.
+Fri Apr 23 13:55:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (superclass): use rb_check_inheritable().
+ * string.c (rb_f_chomp): should assign the result to $_. or maybe
+ sub/gsub/chop/chomp should NOT assign $_ altogether.
- * object.c (rb_class_initialize): check argument validity.
+Thu Apr 22 16:50:54 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Dec 21 16:25:10 2003 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_callcc): call scope_dup() for all scopes in
+ the interpreter stack.
- * 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#+.
+Tue Apr 20 11:24:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Dec 21 00:12:37 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * string.c (rb_str_dump): `#' should be escaped.
- * ext/tk/lib/tk.rb: add new methods (TkScrollbar#assign, assign_list)
+Tue Apr 20 02:32:42 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/sample/tkmultilistframe.rb: use TkScrollbar#assign method
+ * parse.y (parse_regx): option /p for posix match added.
-Sat Dec 20 21:59:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * re.c (rb_reg_desc): did not print options properly.
- * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): refine regexp.
+ * io.c (rb_file_s_open): initialize was called twice.
- * lib/webrick/cgi.rb (CGI#start): NPH scripts return status line
- instead of Status: header field.
+Mon Apr 19 18:56:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/cgi.rb (CGI::Socket): refine some coditions.
+ * configure.in (DEFAULT_KCODE): can specify default code for
+ $KCODE by --with-default-kcode=(euc|sjis|utf8|none).
-Sat Dec 20 16:07:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (IS_A_LETTER): a byte sequence shorter than mbc should
+ not match with \w etc.
- * lib/optparse.rb (OptionParser::Completion::complete): wrong
- Regexp for word boundary. pointed out by Gavin Sinclair.
+Mon Apr 19 13:49:11 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/optparse.rb (OptionParser::make_switch): [no-] prefix was
- missing.
+ * eval.c (eval): should restore ruby_dyna_vars.
-Sat Dec 20 11:40:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Apr 16 21:40:43 1999 Nobuyoshi Nakada <gea02117@nifty.ne.jp>
- * lib/yaml.rb (YAML::YAML): adjust Marshal version.
+ * io.c (f_backquote): pipe_open may return nil.
-Sat Dec 20 03:56:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (f_open): rb_io_open may return nil.
- * eval.c (rb_with_disable_interrupt): prohibit thread context
- switch during proc execution. [ruby-dev:21899]
+ * io.c (io_s_foreach): ditto.
-Sat Dec 20 02:41:02 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * io.c (io_s_readlines): ditto.
- * lib/webrick/cgi.rb: add file. (yet another CGI library)
+ * io.c (io_defset): wrong message.
- * MANIFEST: add lib/webrick/cgi.rb.
+Fri Apr 16 15:09:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Dec 20 02:18:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * bignum.c (rb_str2inum): strtoul() returns long, not int.
- * misc/ruby-mode.el (ruby-calculate-indent): proper indentation
- inside of parentheses. [ruby-dev:22308]
+ * eval.c (rb_load): size of VALUE and ID may be different.
-Fri Dec 19 21:24:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * util.c (mmprepare): int is too small to cast from pointers.
- * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): should not set
- HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH.
+ * config.guess: avoid 'linux-gnu' for alpha-unknown-linux.
- * lib/webrick/https.rb (HTTPRequest#parse): should check presence
- of cert() method to detect SSLSocket.
+Thu Apr 15 23:46:20 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Fri Dec 19 22:56:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ruby.c (rubylib_mangle): mangle path by RUBYLIB_PREFIX.
- * lib/soap/property.rb (SOAP::Property#load): new method for loading
- property value into existing property tree.
+Wed Apr 14 23:52:51 1999 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
- * test/soap/test_property.rb: add test.
+ * node.h (NODE_LMASK): should be long to avoid overflow.
-Fri Dec 19 19:21:49 2003 akira yamada <akira@ruby-lang.org>
+Wed Apr 14 13:14:35 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
- * lib/runit/cui/testrunner.rb (RUNIT::CUI::TestRunner::run):
- should use Test::Unit::UI::{PROGRESS_ONLY,VERBOSE}.
+ * dln.c: AIX dynamic link.
-Fri Dec 19 17:36:49 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * ext/aix_ld.rb: ditto.
- * ext/tk/sample/tkmultilistbox.rb: bug fix
+Wed Apr 14 12:19:09 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/sample/tkmultilistframe.rb: new sample script
+ * lib/thread.rb: Queue#{enq,deq} added.
-Fri Dec 19 03:44:27 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Apr 13 17:43:56 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/httputils.rb (parse_form_data): should return an
- empty Hash if the body is empty.
+ * hash.c (rb_hash_s_create): Hash::[] acts more like casting.
-Thu Dec 18 21:47:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Tue Apr 13 00:33:52 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (create_makefile): should remove deffile if it's
- made by miniruby. based on nobu's patch.
+ * io.c (rb_io_stdio_set): warning for assignment to the variables
+ $std{in,out,err}.
-Thu Dec 18 21:44:21 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Apr 12 23:12:32 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (stack_extend): ignore inline optimization on VC7.
+ * io.c (rb_io_reopen): check for reopening same IO.
- * win32/Makefile.sub (OS, RT): can override.
+Fri Apr 9 17:45:11 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * win32/Makefile.sub (LDFLAGS): ditto. shouldn't use pdb:none
- option. based on Tietew's patch [ruby-dev:22289]
+ * parse.y (rb_compile_string): bug for nested eval().
-Thu Dec 18 16:38:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_match): should pop non-greedy stack items on
+ failure, after best_regs are fixed.
- * dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never
- return NULL.
+Thu Apr 8 17:30:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 18 15:27:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * pack.c (PACK_LENGTH_ADJUST): need to adjust for `*' length.
- * lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch.
- [ruby-dev:21678]
+Tue Apr 6 23:28:44 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 17 15:15:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (void_check): add void context checks.
- * lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
- String#[] if more than one arguments are specified.
+Mon Apr 5 12:23:42 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/delegate.rb: avoid using common instance name as "@obj".
+ * time.c (time_s_at): should copy gmt-mode.
- * lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer
- subclass of String, but DelegateClass(String).
+ * eval.c (eval_node): preserve ruby_eval_tree.
- * ext/curses/extconf.rb: restore function check for init_color.
- [ruby-list:38905]
+Fri Apr 2 14:00:34 1999 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
- * Makefile.in: need to specify $(MAINLIBS) for the miniruby
- generation rule.
+ * lib/debug.rb: wrong command interpreting.
- * configure.in: better FreeBSD -lc_r support.
+Fri Apr 2 11:46:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 17 00:16:14 2003 Minero Aoki <aamine@loveruby.net>
+ * version 1.3.2
- * ext/strscan/strscan.c: new method
- StringScanner#beginning_of_line? (alias #bol?)
+Fri Apr 2 10:40:04 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/strscan/strscan.c: new method StringScanner#concat and #<<.
+ * io.c (rb_io_s_pipe): forgot to define IO::pipe.
- * ext/strscan/strscan.c: StringScanner#new(str) does not duplicate
- nor freeze STR (allow destructive modification).
+Thu Apr 1 14:40:46 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/strscan/test_stringscanner.rb: test new methods above.
+ * eval.c (assign): modified for rhs change.
- * test/strscan/test_stringscanner.rb: test destructive string
- modification.
+ * parse.y (stmt): unparenthesisized method calls can be right hand
+ side expression of the assignment.
-Tue Dec 16 21:20:47 2003 Tanaka Akira <akr@m17n.org>
+Sat Mar 27 22:42:47 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/pp.rb: don't use local variable `pp'.
+ * ext/nkf/nkf.c (rb_nkf_kconv): check size output_ctr before
+ decrement.
- * lib/prettyprint.rb: ditto.
+Thu Mar 25 09:11:03 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Dec 16 13:20:43 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * time.c (time_s_at): preserve gmt-mode for result.
- * ext/tk/lib/tk.rb: condition bug of if statement on
- {pack,grid}_propagate methods
+ * parse.y (rb_compile_string): do not use cur_mid, use
+ compile_for_eval instead.
-Tue Dec 16 03:17:29 2003 why the lucky stiff <why@ruby-lang.org>
+ * st.c (PTR_NOT_EQUAL): wrong logical condition.
- * lib/yaml/rubytypes.rb: comments in strings. [ruby-talk:88012]
+Wed Mar 24 13:06:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/yaml/test_yaml.rb: add test.
+ * parse.y (yycompile): should clear cur_mid after compilation.
-Tue Dec 16 01:14:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (next_argv): need to check type for ARGV.shift.
- * eval.c (catch_timer): check rb_thread_crtical in main native
- thread.
+ * eval.c (blk_copy_prev): need to preserve outer scope as well as
+ outer frames.
- * eval.c (thread_timer): just sends signals periodically, to
- prevent main native thread from receiving them in critical
- section. [ruby-core:01959]
+ * parse.y (rb_compile_string): return can appear within eval().
-Mon Dec 15 13:32:22 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 23 10:15:07 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * dir.c (check_dirname): check string safety and remove extraneous
- trailing directory separators. [ruby-dev:22279]
+ * configure.in: AC_C_CONST check added.
- * file.c: renamed and externalized rb_path_next,
- rb_path_skip_prefix, rb_path_last_separator, rb_path_end.
+Tue Mar 23 02:07:35 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * intern.h: prototypes for rb_path_next, rb_path_skip_prefix,
- rb_path_last_separator, rb_path_end.
+ * time.c (time_plus): preserve gmt-mode for result.
-Mon Dec 15 09:27:46 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Mon Mar 22 01:32:37 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): first argument
- of rb_protect should take an argument of VALUE.
+ * eval.c (rb_eval): adjust line numbers before expression
+ interpolation within strings.
-Sun Dec 14 18:46:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (rb_eval): defined? returns nil for false condition.
- * ext/socket/socket.c (Init_socket): IPv6 is not supported although
- AF_INET6 is defined on MinGW.
+ * numeric.c (num_nonzero_p): returns nil for false condition.
- * lib/ipaddr.rb (AF_INET6): workaround in the environment which does
- not support IPv6.
+Sat Mar 20 13:07:43 1999 Keiju Ishitsuka <keiju@rational.com>
-Sat Dec 13 18:55:16 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * lib/weakref.rb: avoid leak for two weakrefs for one object.
- * ext/iconv/charset_alias.rb: preserve original order.
+Fri Mar 19 11:26:45 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/iconv/extconf.rb: remove wrapper file at clean.
+ * eval.c (ruby_run): needed to eval END{} on exit.
-Sat Dec 13 18:09:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_exit): ditto.
- * eval.c (thread_timer): use timer by sub-thread and nanosleep.
- [ruby-talk:87519]
+Fri Mar 19 02:17:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * gc.c (Init_stack): no stack adjustment for THREAD_SAFE.
+ * signal.c (Init_signal): handles terminating signals HUP, TERM,
+ QUIT, PIPE, etc.
-Sat Dec 13 17:17:59 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 18 15:47:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (proc_alloc): cache the created object at first time.
- [ruby-talk:61288], [ruby-dev:22240]
+ * bignum.c (rb_big_and): bug in sign calculation.
-Sat Dec 13 09:01:23 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * bignum.c (rb_big_or): ditto.
- * configure.in: check ucontext.h.
+ * io.c (rb_f_select): forgot to use to_io to retrieve IO, after
+ calling select(2).
- * eval.c: use getcontext/setcontext() instead of setjmp/longjmp()
- on ia64 or with native thread enabled. [ruby-core:01932]
+Tue Mar 16 19:54:31 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Sat Dec 13 03:09:14 2003 why the lucky stiff <why@ruby-lang.org>
+ * ext/extmk.rb.in: static linking cause infinite make loop.
- * lib/yaml/rubytypes.rb: anonymous struct fix. [ruby-core:01946]
+Tue Mar 16 18:50:04 1999 Yoshida Masato <yoshidam@yoshidam.net>
- * test/yaml/test_yaml.rb: add test.
+ * ext/socket/socket.c (tcp_s_gethostbyname): typo, not NUM2INT(),
+ but INT2NUM().
-Fri Dec 12 22:36:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ext/socket/socket.c (mkhostent): ditto.
- * lib/csv.rb: add Cell#to_str and Cell#to_s for /.../ =~ aCell,
- "#{aCell}" and so on.
+Tue Mar 16 12:31:44 1999 Ryo HAYASAKA <hayasaka@cheer.u-aizu.ac.jp>
- * test/csv/test_csv.rb: add tests.
+ * file.c (utime_internal): suppress warning by const.
-Fri Dec 12 19:33:06 2003 Minero Aoki <aamine@loveruby.net>
+ * time.c (time_gmtime): ditto.
- * lib/fileutils.rb (mkdir): remove trailing `/' from pathes.
+Tue Mar 16 10:23:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (rmdir): ditto. [ruby-dev:22238]
+ * time.c (time_clone): Time object can be cloned.
- * lib/fileutils.rb (rmdir_r): ditto.
+Tue Mar 16 03:13:10 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/fileutils.rb (fu_copy_dir): check if it is a directory after
- mkdir(2).
+ * ruby.c (load_file): argv[argc] should be NULL.
-Fri Dec 12 06:06:09 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 15 22:12:08 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * eval.c (proc_invoke): fix class name in warning message for
- define_method. [ruby-dev:22235]
+ * sprintf.c (rb_f_sprintf): typo in arg_num check at exit.
-Thu Dec 11 21:24:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Mar 15 16:42:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_pkcs12.[ch]: new files. add OpenSSL::PKCS12.
+ * array.c (rb_ary_dup): dup2 should copy class too.
- * ext/openssl/ossl.[ch]: ditto.
+Mon Mar 15 15:12:53 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
- * ext/openssl/MANIFEST: add ossl_pkcs12.[ch].
+ * lib/mkmf.rb: install program relative path check.
-Thu Dec 11 20:54:28 2003 Minero Aoki <aamine@loveruby.net>
+Mon Mar 15 14:05:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (mkdir_p): remove trailing `/' befere mkdir(2).
- mkdir("nonexistdir/") does not work on NetBSD/Alpha 1.6.1.
+ * re.c (rb_reg_s_new): 2nd argument is now option.
+ Regexp::EXTENDED can be specified.
- * lib/fileutils.rb (fu_list): call to_str for all arguments.
+Fri Mar 12 10:47:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 11 20:07:01 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * string.c (rb_str_index): str.index("") should always match at
+ offset point.
- * lib/ftools.rb (makedirs): sync with fileutils.
+ * string.c (rb_str_upto): can specify end point exclusion.
-Thu Dec 11 19:53:03 2003 Minero Aoki <aamine@loveruby.net>
+ * string.c (rb_str_index): negative offset.
- * lib/fileutils.rb (mkdir_p): catch all SystemCallErrors.
- (mkdir("C:\") causes EACCESS on Windows 2000/NTFS)
+ * regex.c (re_match): begline should not match at the point
+ between a newline and end-of-string. endline neither.
-Thu Dec 11 19:08:02 2003 Minero Aoki <aamine@loveruby.net>
+ * regex.c (re_compile_pattern): context_indep_anchors .
- * 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)
+ * parse.y (parse_regx): need not to push backslashes before
+ escaped characters.
-Thu Dec 11 18:49:30 2003 Minero Aoki <aamine@loveruby.net>
+ * eval.c (rb_thread_join): re-raises exception within target.
- * lib/fileutils.rb: def m( arg ) -> def m(arg).
+Fri Mar 12 01:09:36 1999 Koji Arai <JCA02266@nifty.ne.jp>
-Thu Dec 11 11:39:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/readline/readline.c (readline_s_vi_editing_mode): wrong
+ number of arguments.
- * configure.in (ieeefp.h), numeric.c: needed for finite() on
- Solaris. [ruby-core:01921]
+Fri Mar 12 02:12:50 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * file.c (rb_stat_inspect): adjust format specifier.
+ * pack.c (PACK_ITEM_ADJUST): "a".unpack("C3") => [97, nil, nil]
- * parse.c (arg_prepend): nodetype() is for debug use.
+Thu Mar 11 18:23:50 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * ruby.h (ISASCII, etc): cast to int to get rid of warning.
+ * ext/socket/socket.c (Init_socket): UDPsocket was omitted.
- * ruby.h (alloca.h): include even in GCC. [ruby-core:01925]
+Thu Mar 11 16:43:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/bigdecimal/bigdecimal.c (GetVpValue): adjust format
- specifier.
+ * pack.c (PACK_LENGTH_ADJUST): push fixed number of items per
+ template to result array.
- * ext/bigdecimal/bigdecimal.c (BigDecimal_prec, BigDecimal_coerce,
- BigDecimal_divmod): use rb_assoc_new() to suppress memory usage.
+ * pack.c (pack_unpack): I/N/C etc. push nil in the array for "".
- * ext/bigdecimal/bigdecimal.c (BigDecimal_split): ditto.
+Tue Mar 9 00:19:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/dl/sym.c (rb_dlsym_guardcall): guard itself should be
- volatile.
+ * hash.c (ruby_unsetenv): use ruby_setenv(name, 0).
- * ext/iconv/iconv.c (iconv_convert): ensure actual parameter with
- format specifier.
+ * hash.c (env_delete): ditto.
- * ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): do not
- define unless used.
+ * string.c (rb_str_upto): do not check `beg<end' to generate
+ strings for the pattern like "a".upto("#a").
- * ext/pty/pty.c (getDevice): get rid of warning.
+ * range.c (range_each): treat strings as special case.
- * ext/socket/socket.c (port_str, sock_s_getaddrinfo,
- sock_s_getnameinfo): FIX2INT() now returns long.
+ * range.c (range_each): no longer use upto for generic cases.
- * ext/socket/socket.c (init_inetsock_internal): uninitialized
- variable.
+Sun Mar 7 14:21:32 1999 IKARASHI Akira <ikarashi@itlb.te.noda.sut.ac.jp>
- * ext/syck/rubyext.c (syck_parser_assign_io): add prototype.
+ * string.c (rb_str_index): wrong end point calculation.
- * 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.
+Sat Mar 6 02:19:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 10 19:28:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (match_index): MatchingData#index(n) added.
- * ext/stringio/stringio.c (strio_read): set EOF flag at short read.
- [ruby-dev:22223], [ruby-dev:22224]
+ * array.c (rb_ary_subseq): ary[n..-1] returns an sub-array unless
+ n is too small negative index.
-Wed Dec 10 18:07:25 2003 Minero Aoki <aamine@loveruby.net>
+ * re.c (rb_reg_match_method): Regexp#match(str) added.
- * lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
+ * array.c (rb_ary_indexes): understands ranges as indexes.
-Wed Dec 10 17:54:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (match_size): MatchingData#size added.
- * ext/stringio/stringio.c (strio_read): do not set EOF flag when
- requested length is zero. [ruby-dev:22214]
+Fri Mar 5 01:04:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 10 17:17:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (rb_ary_fill): modified for range.
- * io.c (read_all): should return given string even if data read is
- empty. [ruby-dev:22207]
+ * array.c (rb_ary_aset): a[n..m] revisited.
-Wed Dec 10 17:16:06 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Mar 4 14:23:29 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/stringio/stringio.c (strio_read): adjust behavior at reading
- beyond EOF to IO. [ruby-dev:22205]
+ * string.c (rb_str_subseq): a[n..m] revisited.
- * test/ruby/ut_eof.rb (TestEOF::Seek): test behaviors at reading
- beyond EOF.
+ * parse.y (method_call): allow Const::method{}.
- * test/ruby/test_file.rb, test/stringio/test_stringio.rb: include
- TestEOF::Seek test case.
+ * array.c (rb_ary_replace_method): should replace original array.
-Wed Dec 10 15:01:19 2003 Shugo Maeda <shugo@ruby-lang.org>
+Thu Mar 4 02:30:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/monitor/test_monitor.rb (test_cond): use Queue#deq
- instead of sleep.
+ * configure.in: remove --disable-thread, thread feature is no
+ longer optional.
-Wed Dec 10 14:45:39 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Thu Mar 4 00:32:17 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
- * 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)
+ * parse.y (read_escape): wrong arguments for scan_oct,scan_hex.
- * ext/pty/pty.c (establishShell): should close descriptors if fork
- failed.
+Wed Mar 3 11:51:53 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Dec 10 12:53:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * ext/socket/socket.c (Init_socket): rename class names as
+ TCPsocket -> TCPSocket etc.
- * win32/win32.h: define execv() using do_aspawn().
+Tue Mar 2 19:46:42 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * process.c (proc_exec_v): remove #ifdef's which stopped needing.
+ * configure.in (LDSHARED): use gcc -Wl,-G for solaris with gcc.
-Tue Dec 9 23:32:23 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Mar 2 17:04:19 1999 Yukihiro Matsumoto <matz@netlab.co.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'
+ * parse.y (yylex): backslashes do not concatenate comment lines
+ anymore.
-Tue Dec 9 19:53:02 2003 akira yamada <akira@ruby-lang.org>
+Mon Mar 1 14:05:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/uri/generic.rb (URI::Generic#route_from0): make case insensitive
- for host-part.
+ * eval.c (rb_call0): adjust argv for optional arguments. super
+ without arguments emit superclass method with the value from
+ optional arguments. enabled as experiment.
- * test/uri/test_generic.rb (test_route): added tests for the above
- change.
+Sun Feb 28 14:04:07 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-Tue Dec 9 14:10:48 2003 Tanaka Akira <akr@m17n.org>
+ * parse.y (nextc): backslash at the eof cause infinite loop
- * 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.
+Sun Feb 28 11:01:26 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Tue Dec 9 02:53:55 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * time.c (make_time_t): month range check added.
- * ext/tk/sample/tkalignbox.rb: new sample script
+Sat Feb 27 02:36:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Dec 9 00:45:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * re.c (Init_Regexp): add escape as alias of quote.
- * lib/test/unit/assertions.rb: renamed #assert_raises to #assert_raise
- and made the former call the latter. [ruby-core:01890]
+ * re.c (rb_reg_s_quote): char-code can be specified now.
- * test/testunit/test_assertions.rb: ditto.
+Fri Feb 26 18:45:36 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-Tue Dec 9 00:07:35 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * eval.c (error_print): bug for error message with newlines.
- * lib/soap/rpc/standaloneServer.rb: add 'shutdown' and 'status'
- methods as delegates to WEBrick.
+Fri Feb 26 12:00:04 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * time.c (make_time_t): future check modified to allow 1969-12-31
+ at certain timezone.
-Mon Dec 8 22:48:03 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_arg): year >= 1000 should be past.
- * lib/test/unit/autorunner.rb: remove dependency to a particular
- runner. [ruby-core:01901], [ruby-list:38869]
+ * version.c (Init_version): constant RELEASE_DATE added.
- * lib/test/unit/ui/testrunnerutilities.rb: moved output level
- constants from Console.
+Fri Feb 26 01:08:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/test/unit/ui/console/testrunner.rb: ditto.
+ * string.c (rb_str_substr): returns nil for out-of-range access.
- * lib/test/unit/ui/{fox,gtk,gtk2,tk}/testrunner.rb (initialize):
- accept output_level.
+ * array.c (rb_ary_subseq): returns nil for out-of-range access.
-Mon Dec 8 15:03:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (rb_ary_store): negative index message has changed.
- * ext/syck/syck.c (syck_io_str_read): get rid of buffer overflow.
+ * string.c (rb_str_aset): reallocation needed.
-Mon Dec 8 13:02:11 2003 Minero Aoki <aamine@loveruby.net>
+ * string.c (rb_str_aset): allow char append to the string.
- * lib/uri/common.rb: new method URI.regexp. [ruby-dev:22121]
+Thu Feb 25 23:30:17 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * test/uri/test_common.rb: add test for URI.regexp.
+ * time.c (time_load): tm_year should be packed in 17 bits, not 18.
-Mon Dec 8 12:44:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Feb 25 12:50:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * pack.c: define swap16 and swap32 only if they are not
- defined. OpenBSD defines these macros. [ruby-dev:22181]
+ * missing/dup2.c: replaced by public domain version.
-Sun Dec 7 20:54:17 2003 Tanaka Akira <akr@m17n.org>
+ * time.c (make_time_t): add `future check' in loops.
- * 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.
+ * object.c (rb_num2dbl): forbid implicit conversion from nil, or
+ strings. thus `Time.now + str' should raise error.
-Sat Dec 6 22:58:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * object.c (rb_Float): convert nil into 0.0.
- * 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.
+ * object.c (rb_Integer): conversion method improved.
- * ext/openssl/ossl_ssl.c (ossl_ssl_connect): call ossl_start_ssl.
+Thu Feb 25 03:27:50 1999 Shugo Maeda <shugo@netlab.co.jp>
- * ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto.
+ * eval.c (rb_call): should handle T_ICLASS properly.
- * ext/openssl/ossl_ssl.c (ossl_ssl_read): allow signal traps.
+Thu Feb 25 00:04:00 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Dec 6 21:45:10 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * error.c (Init_Exception): global function Exception() removed.
- * io.c (flush_before_seek): flush before seek on any platform.
+ * variable.c (rb_class2name): returns "nil"/"true"/"false" for them.
- * configure.in: ditto.
+ * time.c (time_dump): time marshaling format compressed size from
+ 11 bytes to 8 bytes. thanx to tadf@kt.rim.or.jp.
-Sat Dec 6 17:23:00 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * eval.c (rb_obj_call_init): should specify arguments explicitly.
- * lib/soap/soap.rb(SOAP::Env.getenv): allow upcase environment variable
- as well as downcase one.
+Wed Feb 24 15:43:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/soap/netHttpClient.rb(SOAP::NetHttpClient#proxy=): check URI.
+ * parse.y (yylex): comment concatenation requires preceding space
+ before backslash at the end of line.
-Fri Dec 5 23:22:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (rb_f_pipe): global pipe is obsolete now.
- * 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.
+ * object.c (Init_Object): remove true.to_i, false.to_i.
- * test/testunit/test_assertions.rb (test_assert_raises): test for
- multiple exception list. [ruby-core:01891]
+Tue Feb 23 14:21:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/testunit/test_assertions.rb (test_assert_nothing_raised): test
- for non-exception classes.
+ * parse.y (yylex): warn if identifier! immediately followed by `='.
-Fri Dec 5 22:23:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Tue Feb 23 12:32:41 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * lib/soap/netHttpClient.rb: proxy support did not work. fixed.
+ * eval.c (rb_load): tilde expansion moved to find_file.
- * lib/soap/property.rb: add class methods for loading property from
- stream/file/propertyfile. propertyfile is a file which is located at
- somedir in $:.
+ * eval.c (find_file): tilde expansion added.
- * 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.
+Tue Feb 23 10:50:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/soap/test_property.rb, test/soap/test_streamhandler.rb: new file.
+ * eval.c (require_method): require can handle multiple fnames.
-Fri Dec 5 17:26:23 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (rb_hash_foreach_iter): hash key may be nil.
- * eval.c (rb_exec_end_proc): maintain tmp_end_procs.
- [ruby-dev:22154]
+Mon Feb 22 17:44:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Dec 5 13:36:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_match): should not pop failure point on success for
+ non-greedy matches.
- * eval.c (rb_exec_end_proc): should not clear end_procs and
- ephemeral_end_procs before execution. [ruby-dev:22144]
+ * io.c (Init_IO): remove global_functions getc, readchar, ungetc,
+ seek, tell, rewind.
- * eval.c (rb_obj_extend): call Module#extended hook after
- extended_object. [ruby-list:38866]
+Sat Feb 20 22:54:26 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c (Init_Object): Module#extended defined.
+ * numeric.c (rb_num2long): no implicit conversion from boolean.
-Fri Dec 5 13:17:30 2003 Tanaka Akira <akr@m17n.org>
+Sat Feb 20 09:58:42 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * test/ruby/test_pipe.rb: use IO.pipe instead of IO.popen.
+ * numeric.c (flo_to_s): portable Infinity and NaN support.
-Fri Dec 5 11:54:45 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 20 07:13:31 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * ext/stringio/stringio.c (strio_read): follow IO#read.
+ * io.c (rb_file_sysopen): forgot to initialize a local variable.
- * test/ruby/ut_eof.rb, test/ruby/test_file.rb, test/ruby/test_pipe.rb,
- test/stringio/test_stringio.rb: add EOF test.
+Fri Feb 19 23:05:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Dec 5 02:49:35 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_subseq): range check changed.
- * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):
- allow multiple exception list. [ruby-core:01884]
+ * marshal.c: increment MARSHAL_MINOR for Time format change.
- * lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
- check whether arguments are subclass of Exception.
+ * time.c (time_old_load): support old marshal format.
-Thu Dec 4 23:54:00 2003 Rick Ohnemus <rick.ohnemus@systemware.com>
+ * time.c (time_load): changed for new format Y/M/D/h/m/s/usec.
- * dln.c (aix_loaderror): should not use member named 'errno' which
- might be a macro (e.g. on AIX).
+ * time.c (time_dump): marshal dump format has changed.
-Thu Dec 4 23:32:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Feb 19 00:25:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (read_all): do not depend on lseek position.
- [ruby-dev:22026]
+ * time.c (time_arg): should reject "sep\0" and such.
-Thu Dec 4 22:37:26 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * time.c (time_plus): Time#+ should not receive Time object
+ operand.
- * eval.c (rb_eval): preserve $! value when retry happens in the
- rescue clause. [ruby-talk:86697]
+ * string.c (rb_str_substr): negative length raises exception now.
-Thu Dec 4 21:50:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (beg_len): if end == -1, it points end of the array.
- * lib/drb/drb.rb (DRb::DRbMessage::send_request, send_reply):
- should rescue errors and re-raise DRbConnError on write too.
- [ruby-dev:22132]
+ * array.c (rb_ary_subseq): negative length raises exception now.
-Thu Dec 4 16:41:17 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Feb 18 20:57:04 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * parse.y (exc_list): allow expanding list. [ruby-dev:22134]
+ * time.c (rb_strftime): strftime() may return 0 on success too.
-Thu Dec 4 14:09:24 2003 Minero Aoki <aamine@loveruby.net>
+ * time.c (time_strftime): `\0' within format string should not be
+ omitted in the result.
- * 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.
+ * time.c (rb_strftime): zero length format.
-Thu Dec 4 13:24:13 2003 Shugo Maeda <shugo@ruby-lang.org>
+ * time.c (time_to_a): yday start with 1 now.
- * lib/monitor.rb: use Object#__send__ instead of Object#send.
+ * time.c (time_zone): support for long timezone name.
-Thu Dec 4 13:17:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * time.c (time_yday): yday start with 1 now.
- * lib/soap/streamHandler.rb: support latest released version of
- http-access2.
+ * time.c (time_minus): minus calculation was wrong.
-Thu Dec 4 13:04:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * time.c (time_minus): sec, usec should be at least `long', maybe
+ they should be `time_t'.
- * lib/soap/soap.rb: add SOAP::Env module for environment repository
- such as HTTP_PROXY.
+ * time.c (time_plus): addition with float was wrong.
- * lib/soap/property.rb: property implementation.
+ * time.c (time_to_s): support for long timezone name.
- * lib/soap/streamHandler.rb, lib/soap/wsdlDriver.rb,
- lib/soap/rpc/driver.rb: use soap/property.rb.
+ * time.c (time_gm_or_local): too far future check moved.
- * lib/wsdl/importer.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb:
- use SOAP::Env.
+ * time.c (time_arg): treat 2 digit year as 69-99 => 1969-1999,
+ 00-68 => 2000-2068
- * lib/soap/netHttpClient.rb: add basic_auth, ssl_config, and cookie
- management interface, but ignored for now.
+Thu Feb 18 03:56:47 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * missing/fnmatch.c: moved to missing directory.
-Thu Dec 4 10:43:58 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Feb 17 16:22:26 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/dl/sym.c (rb_dlsym_guardcall): __declspec(noinline) is VC7
- feature.
+ * struct.c (rb_struct_alloc): actual initialization now be done in
+ `initialize'.
-Thu Dec 4 10:27:12 2003 Minero Aoki <aamine@loveruby.net>
+Wed Feb 17 09:47:15 1999 okabe katsuyuki <hgc02147@nifty.ne.jp>
- * lib/net/http.rb: update hyperlink to the Japanese document.
+ * regex.c (re_search): use mbclen() instead of ismbchar().
-Thu Dec 4 09:12:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * re.c (rb_reg_s_quote): should handle mbchars properly.
- * ext/openssl/ossl_asn1.c (asn1time_to_time): should check that
- the underlying value of ASN1_TIME isn't NULL. [ruby-core:01881]
+Wed Feb 17 01:25:26 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 4 08:29:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * parse.y (yylex): stop comment concatenation by backslash follows
+ after >= 0x80 char. may cause problem with Latin chars.
- * lib/webrick/server.rb (GenericServer#start): should rescue
- Exception to avoid unexpected aborting. [ruby-core:01853]
+ * eval.c (error_print): exception in rb_obj_as_string() caused
+ SEGV. protect it by PUSH_TAG/POP_TAG.
- * lib/webrick/server.rb (GenericServer#start_thread): should check
- that peeraddr isn't nil before printing.
+ * error.c (exc_exception): `Exception#exception' should return self.
- * lib/webrick/httpresponse.rb (HTTPResponse#start_thread): should
- rescue Exception to avoid unexpected aborting of thread.
+Wed Feb 17 01:12:22 1999 Hirotaka Ichikawa <hirotaka.ichikawa@tosmec.toshiba.co.jp>
-Thu Dec 4 03:48:59 2003 Tanaka Akira <akr@m17n.org>
+ * configure.in: BeOS patch.
- * lib/pathname.rb (Pathname#link, Pathname#symlink): obsoleted.
- (Pathname#make_link, Pathname#make_symlink): new method.
+Tue Feb 16 14:25:00 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Dec 4 01:45:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_compile_pattern): should reallocate mbc space for
+ character class unless current_mbctype is ASCII.
- * io.c (argf_read): should not terminate on empty string; wait
- until real EOF. [ruby-dev:21969]
+Mon Feb 15 15:48:30 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * io.c (argf_read): should adjust length to read, when length is
- specified and read spans command line argument files.
+ * configure.in: specify `-Wl,-E' only for GNU ld.
-Wed Dec 3 19:38:36 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+Mon Feb 15 11:43:22 1999 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
- * lib/drb/drb.rb: correct fcntl parameter. [ruby-dev:22120]
+ * array.c (rb_inspecting_p): should return Qfalse.
-Wed Dec 3 13:49:07 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Sun Feb 14 22:36:40 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * ext/tk/lib/tk.rb: 'format'==>'Kernel.format' (avoid override trouble)
+ * sprintf.c (rb_f_sprintf): `%G' was omitted.
- * ext/tk/lib/tkafter.rb: ditto.
+Sun Feb 14 12:47:48 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * ext/tk/lib/tkcanvas.rb: ditto.
+ * numeric.c (Init_Numeric): allow divide by zero on FreeBSD.
- * ext/tk/lib/tkdialog.rb: ditto.
+ * numeric.c (Init_Numeric): FloatDomainError added.
- * ext/tk/lib/tktext.rb: ditto.
+ * configure.in (AC_REPLACE_FUNCS): add checks for functions
+ isinf, isnan, and finite.
-Wed Dec 3 13:28:13 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 13 01:24:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * Makefile.in (lex.c): try gperf first, and copy from the source
- directory if failed. [ruby-dev:22123]
+ * eval.c (rb_thread_create_0): should protect th->thread.
- * ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
+Fri Feb 12 16:16:47 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
- * lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
+ * string.c (rb_str_inspect): wrong mbc position.
-Tue Dec 2 23:18:12 2003 Minero Aoki <aamine@loveruby.net>
+Fri Feb 12 16:21:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/net/http.rb: wrote the warning about HTTP_PROXY environment
- variable.
+ * eval.c (rb_thread_fd_close):
-Tue Dec 2 21:31:42 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (rb_io_fptr_close): tell scheduler that fd is closed.
- * bin/testrb: new test runner. [ruby-core:01845]
+ * io.c (rb_io_reopen): ditto.
- * lib/test/unit/autorunner.rb (Test::Unit::AutoRunner.run,
- Test::Unit::AutoRunner#process_args): take test list to run and
- options.
+ * io.c (READ_CHECK): check if closed after thread context switch.
- * 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/socket.c (bsock_close_read): do not check
+ the return value from shutdown(2).
- * lib/test/unit.rb: ditto.
+ * ext/socket/socket.c (bsock_close_write): ditto.
- * test/runner.rb: exit with the test result.
+ * ext/socket/socket.c (sock_new): need to dup(fd) for close_read
+ and close_write.
-Tue Dec 2 20:18:48 2003 Eric Sunshine <sunshine@sunshineco.com>
+ * parse.y (here_document): handle newlines within #{}.
- * configure.in (AC_PROG_YACC): AC_DEFINE(OLD_YACC) if Yacc is found
- instead of Bison or byacc.
+ * regex.h: should replace symbols for ruby.
- * 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.
+Fri Feb 12 00:46:28 1999 Shugo Maeda <shugo@netlab.co.jp>
-Tue Dec 2 20:03:20 2003 Minero Aoki <aamine@loveruby.net>
+ * marshal.c (r_object): should update the method name in message.
- * test/fileutils/test_fileutils.rb: check if Pathnames are usable
- for arguments.
+ * marshal.c (w_object): limit should be converted into Fixnum.
-Tue Dec 2 04:22:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+Wed Feb 10 15:20:03 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/test/unit/assertions.rb: fixed #assert_no_match message.
+ * regex.c (re_match): empty pattern should not cause infinite
+ pattern match loop.
- * test/testunit/test_assertions.rb: ditto.
+ * regex.c (re_compile_pattern): RE_OPTIMIZE_ANCHOR for /.*/, not
+ for /(.|\n)/.
-Tue Dec 2 00:43:00 2003 why the lucky stiff <why@ruby-lang.org>
+ * numeric.c (fix_pow): `fixnum**nil' should raise TypeError.
- * ext/syck/syck.c: string buffering bug. decrementing by full
- max_size now. [ruby-core:01834]
+ * bignum.c (rb_big_pow): need to normalize results.
-Mon Dec 1 21:33:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Feb 10 01:42:41 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * numeric.c (num_sadded): prohibit singleton method definition for
- Numerics. fill yet another gap between Fixnum and Bignum.
+ * numeric.c (fix_pow): `(5**1).type' should be Integer.
-Mon Dec 1 17:33:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Feb 9 01:22:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * pack.c (htov16): converts endian using swap16. htov32(), hton16,
- hton32 as well. [ruby-talk:85377]
+ * parse.y (yylex): do not ignore newlines in mbchars.
- * pack.c (swap16): swap 2 bytes no matter how big short is on the
- platform. swap32() is also prepared.
+ * io.c (rb_file_s_open): mode can be specified by flags like
+ open(2), e.g. File::open(path, File::CREAT|File::WRONLY).
- * numeric.c (rb_num2int): returns long to preserve information.
- rb_fix2int(), rb_num2uint(), rb_fix2uint() as well.
- [ruby-talk:85377]
+ * io.c (rb_f_open): bit-wise mode flags for pipes
- * numeric.c (rb_num2uint): should not check for value range if the
- source value is negative.
+ * io.c (Init_IO): bit flags for open.
-Mon Dec 1 17:14:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sat Feb 6 22:56:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * sample/optparse/opttest.rb: added.
+ * string.c (rb_str_sub_bang): should not overwrite match data by
+ regexp match within the block.
-Mon Dec 1 16:10:52 2003 Dave Thomas <dave@pragprog.com>
+ * string.c (rb_str_gsub_bang): ditto.
- * lib/rdoc/rdoc.rb: (etc) initial merge into main tree.
+Sat Feb 6 03:06:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Dec 1 14:17:49 2003 Minero Aoki <aamine@loveruby.net>
+ * re.c (match_getter): accessing $~ without matching caused SEGV.
- * lib/fileutils.rb (fu_each_src_dest0): call #to_str to allow
- Pathname for arguments. [ruby-core:01795]
+Fri Feb 5 22:11:08 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * test/fileutils/test_fileutils.rb: does much strict test on
- "same" files detecting.
+ * parse.y (yylex): binary literal support, like 0b01001.
-Mon Dec 1 09:28:14 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * parse.y (yylex): octal numbers can contain `_'s.
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (XCFLAGS): re-export $(XCFLAGS).
+ * parse.y (yylex): warns if non-octal number follows immediately
+ after octal literal.
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (ARCH_FLAG): export $(ARCH_FLAG) (perhaps empty value).
+ * parse.y (yylex): now need at least one digit after prefix such
+ as 0x, or 0b.
-Mon Dec 1 01:03:27 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * bignum.c (rb_str2inum): recognize binary numbers like 0b0101.
- * lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS
- and ARCH_FLAG. [ruby-dev:22085]
+Fri Feb 5 03:26:56 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-Sun Nov 30 20:18:07 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * ruby.c (proc_options): -e without program prints error.
- * configure.in: keep ARCH_FLAG separate. export ARCH_FLAG.
- [ruby-core:01819]
+Fri Feb 5 00:01:50 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * Makefile.in: add ARCH_FLAG to CFLAGS.
+ * parse.y (terms): needed to clear heredoc_end.
- * Makefile.in: add @CPPFLAGS@ to CPPFLAGS.
+ * numeric.c (flo_div): allow float division by zero.
- * lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG.
+Thu Feb 4 11:56:24 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (configuration): add ARCH_FLAG to DLDFLAGS.
+ * missing/strtod.c: for compatibility.
- * Makefile.in: add ARCH_FLAG to DLDFLAGS.
+ * configure.in (strtod): add strtod compatible check.
- * configure.in: should put getcwd in AC_CHECK_FUNCS, not
- AC_REPLACE_FUNCS. [ruby-core:01826]
+ * numeric.c (rb_num2long): missing/vsnprintf.c does not support
+ floating points.
-Sun Nov 30 18:22:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * numeric.c (flo_to_s): ditto.
- * configure.in: do not override CCDLDFLAGS, LDFLAGS, XLDFLAGS,
- DLDFLAGS and LDSHARED.
+Wed Feb 3 23:02:12 1999 Yoshida Masato <yoshidam@yoshidam.net>
- * configure.in: XCFLAGS for compiling ruby itself. ARCH_FLAG is
- reflected in CFLAGS.
+ * regex.c (re_compile_pattern): use ismbchar() to get next char.
- * lib/mkmf.rb: ditto. do not import XCFLAGS from config.status.
+ * regex.c (re_search): wrong mbchar shift.
-Sun Nov 30 17:37:36 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * re.c (rb_reg_search): needed to reset $KCODE after match.
- * ext/tk/lib/tk.rb: bug fix [ruby-talk:86746]
+ * regex.c (re_compile_fastmap): mbchars should match with \w.
-Sun Nov 30 13:02:00 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Wed Feb 3 22:35:12 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * lib/soap/encodingstyle/soapHandler.rb: refactoring - Simplifying
- Conditional Expressions.
+ * parse.y (yylex): too big float raise warning, not error.
- * lib/wsdl/soap/definitions.rb: refactoring - Move Method.
+Tue Feb 2 23:41:42 1999 Yoshida Masato <yoshidam@yoshidam.net>
- * test/xsd/{test_noencoding.rb,noencoding.xml}: new files. test for
- encoding unspecified XML file parsing.
+ * regex.c (re_match): wrong boundary.
- * test/wsdl/{test_fault.rb,map,datetime}: new files. test of
- SOAPFault, dateTime and Apache's Map.
+ * regex.c (IS_A_LETTER): re_mbctab[c] may not be 1 for mbc.
-Sun Nov 30 09:35:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_search): mbchar support for shifting ranges.
- * string.c (rb_str_update): get rid of SEGV at just allocated String.
- [ruby-core:01812]
+ * regex.c (MBC2WC): wrong conversion.
-Fri Nov 28 23:19:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Feb 3 15:03:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * gc.c (gc_mark): explicitly check mark recursion levels, instead
- of unreliable stack length.
+ * parse.y (parse_regx): need to escape parens if terminators are
+ not any kind of parenthesis.
-Fri Nov 28 22:49:56 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * parse.y (parse_qstring): ditto.
- * lib/rinda/rinda.rb: fix TupleSpaceProxy#read, read_all.
+ * parse.y (parse_string): ditto.
-Fri Nov 28 21:44:40 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Tue Feb 2 17:11:26 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * test/fileutils/test_fileutils.rb (test_ln_s): should be a file, not
- a directory for FreeBSD.
+ * string.c (rb_str_gsub_bang): too small realloc condition.
-Fri Nov 28 19:37:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Feb 1 10:01:17 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * hash.c (env_has_value, env_index): must match exactly.
+ * parse.y (yylex): range check for the float literal.
- * test/ruby/test_env.rb (test_has_value, test_index): condition for
- aboves.
+Sat Jan 30 18:34:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Nov 28 17:59:20 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ruby.c (usage): -h option to show brief command description.
- * test/ruby/test_env.rb: add tests for ENV.
+Sat Jan 30 08:45:16 1999 IKARASHI Akira <ikarashi@itlb.te.noda.sut.ac.jp>
-Fri Nov 28 17:47:46 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * lib/cgi-lib.rb: cookie support added.
- * lib/drb/drb.rb (DRbMessage#load): rescue Errno::* and raise
- DRbConnError.
+Sat Jan 30 13:38:24 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Nov 28 15:41:15 2003 Tanaka Akira <akr@m17n.org>
+ * regex.c (re_compile_pattern): mbchars should match with \w
+ within character class. Was matching with \W.
- * lib/pathname.rb (Pathname#realpath): obsolete the force_absolute
- argument.
+ * regex.c (re_match): \w should match with multi byte characters,
+ not its first byte.
-Fri Nov 28 14:41:52 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sat Jan 30 10:06:41 1999 Yoshida Masato <yoshidam@yoshidam.net>
- * lib/soap/streamHandler.rb: drop unused http parameters.
+ * re.c (rb_reg_s_new): UTF-8 flag handle (/u, /U).
- * 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.
+ * re.c (rb_kcode): $KCODE handle for UTF-8.
- * test/wsdl/raa/*: add tests.
+Sat Jan 30 01:51:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * array.c (rb_ary_delete_if): RTEST() missing.
- * test/soap/test_basetype.rb, test/xsd/test_xsd.rb: add tests.
+ * hash.c (delete_if_i): ditto.
-Fri Nov 28 04:15:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * enum.c (Init_Enumerable): select (=find_all), detect (=find)
+ added as aliases.
- * eval.c (method_arity): used wrong Proc object. [ruby-talk:86504]
+Fri Jan 29 21:32:19 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-Fri Nov 28 00:47:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (rb_f_setenv): SEGV caused by small typo.
- * eval.c (rb_f_exit), process.c (rb_f_exit_bang): treat true as
- success, false as failure. [ruby-dev:22067]
+Fri Jan 29 00:15:58 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_f_abort, rb_thread_switch), process.c (rb_f_system): use
- ANSI macro instead of hard coded value.
+ * lib/parsedate.rb (parsedate): support date format like
+ 23-Feb-93, which is required by HTTP/1.1.
- * eval.c (rb_f_exit), process.c (rb_f_exit_bang): use VALUEs not but
- TYPEs.
+ * variable.c (find_class_path): avoid calling rb_iv_set().
-Thu Nov 27 22:05:48 2003 Akinori MUSHA <knu@iDaemons.org>
+ * eval.c (backtrace): do not need to modify $SAFE internally.
- * 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>]
+ * variable.c (classname): inline __classid__ access.
-Thu Nov 27 17:36:42 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (THREAD_ALLOC): needed to initialize wrapper.
- * 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.
+ * lib/ftools.rb (makedirs): allows slash at the end of the path.
-Thu Nov 27 16:58:48 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * numeric.c (rb_fix_induced_from): ensure result to be Fixnum.
- * win32/win32.c (rb_w32_stat): remove _fullpath() for NUL: device.
+Thu Jan 28 17:31:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Nov 26 15:38:47 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * numeric.c (flo_to_s): float format changed to "%16.10g".
- * test/fileutils/test_fileutils.rb (test_ln_s): should take the
- existing symbolic link for OpenBSD.
+Thu Jan 28 02:13:11 1999 Yoshinori Toki <toki@freedom.ne.jp>
-Wed Nov 26 04:48:42 2003 why the lucky stiff <why@ruby-lang.org>
+ * array.c (rb_ary_store): expand allocated buffer by 3/2.
- * ext/syck/token.c: removed YYTOKTMP references which
- were causing buffer overflows on large block scalars,
- comments, quoted scalars and plain scalars.
+Wed Jan 27 17:50:02 1999 Kazuhiro HIWADA <hiwada@kuee.kyoto-u.ac.jp>
- * ext/syck/rubyext.c: dynamic changing of buffer size.
+ * bignum.c (dbl2big): raised error if double is too big to cast
+ into long. check added.
- * ext/syck/syck.h: default buffer size of 4k.
+Wed Jan 27 03:16:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Nov 26 00:55:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * variable.c (rb_mod_const_at): can't list constants of the
+ untainted objects in safe mode.
- * lib/webrick/httpresponse.rb: add HTTPResponse#keep_alive=.
+ * class.c (method_list): can't list methods of untainted objects
+ in safe mode.
- * lib/webrick/httpserver.rb (HTTPServer#run): should pass the
- request's keep_alive flag to the response.
+Tue Jan 26 02:40:41 1999 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
-Tue Nov 25 21:41:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * prec.c: Precision support for numbers.
- * defines.h (ENV_IGNORECASE): should define when DOSISH without
- human68k. [ruby-dev:22047]
+Thu Jan 21 19:08:14 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * hash.c (env_has_value, env_index): don't ignore case of value.
- [ruby-dev:22048]
+ * eval.c (rb_f_raise): calls `exception' method, not `new'.
-Tue Nov 25 21:39:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * error.c (exc_exception): renamed from `new'.
- * file.c (path_check_1): honor sticky bits always.
- [ruby-talk:86273]
+Wed Jan 20 03:39:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 25 20:02:14 2003 Minero Aoki <aamine@loveruby.net>
+ * parse.y (yycompile): rb_in_compile renamed to ruby_in_compile.
- * test/fileutils/test_fileutils.rb: do test in more deep
- directory.
+ * ruby.c (load_file): define DATA if __END__ appeared in script.
- * test/fileutils/test_nowrite.rb: ditto.
+Tue Jan 19 14:57:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 25 19:04:23 2003 Tanaka Akira <akr@m17n.org>
+ * parse.y (here_document): need to protect lex_lastline.
- * lib/open-uri.rb (URI::Generic#find_proxy): ENV case sensitivity test
- refined.
+ * parse.y (yylex): disable %//, %'', %``.
-Tue Nov 25 18:13:30 2003 Minero Aoki <aamine@loveruby.net>
+Tue Jan 19 05:01:16 1999 Koji Arai <JCA02266@nifty.ne.jp>
- * test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each
- test. [ruby-dev:22045]
+ * array.c (beg_len): round range value too much.
- * test/fileutils/test_nowrite.rb: ditto.
+Mon Jan 18 13:02:27 1999 Kuroda Jun <jkuro@dwe.co.jp>
-Tue Nov 25 17:52:11 2003 Tanaka Akira <akr@m17n.org>
+ * hash.c (env_keys): strchr() may return NULL.
- * lib/open-uri.rb (URI::Generic#find_proxy): use http_proxy under CGI
- if the environment variable is case sensitive.
+Mon Jan 18 17:51:47 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 25 16:41:33 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * instruby.rb (wdir): install libruby.a in archdir.
- * test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb:
- removed. this test requires extra libraries in soap4r/1.5.*.
+ * lib/ftools.rb (install): removes file before installing.
-Tue Nov 25 16:24:42 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Mon Jan 18 16:55:31 1999 MAEDA shugo <shugo@aianet.ne.jp>
- * lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license;
- GPL2 -> Ruby's.
+ * eval.c (rb_callcc): experimental continuation support.
- * lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb,
- lib/soap/streamHandler.rb: add interface to streamhandler.
+Sun Jan 17 19:45:37 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * lib/soap/marshal.rb: raise error if parse fails.
+ * pack.c (pack_pack): nil packing caused SEGV.
- * lib/soap/netHttpClient.rb: add https support. Patched by
- Oliver M. Bolzer.
+Sat Jan 16 13:18:03 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
+ * string.c (rb_str_concat): character (fixnum) can be append to
+ strings
- * 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.
+ * array.c (rb_ary_unshift): unshift returns array.
- * lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half
- typed multi-ref array.
+Sat Jan 16 01:39:19 1999 Yoshida Masato <yoshidam@tau.bekkoame.ne.jp>
- * lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map
- SOAPStruct which has multi-accessors which name are the same, to an
- array.
+ * string.c (rb_str_split_method): UTF-8 support.
- * lib/soap/rpc/element.rb: fixed illegal parameter order.
+ * regex.c: UTF-8 support.
- * lib/soap/rpc/element.rb: element name of response message could have
- the name other than 'return'.
+Thu Jan 14 00:42:55 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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]
+ * string.c (rb_str_gsub_bang): forget to add offset for null match.
- * test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add
- test for above fix.
+ * eval.c (rb_thread_local_aset): can't modify in tainted mode.
- * lib/wsdl/soap/complexType.rb: support WSDL array definition with
- maxOccures="unbound".
+ * hash.c (env_each_key): avoid generating temporary array.
- * lib/xsd/charset.rb: use cp932 under emx. Patched by
- Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
+Wed Jan 13 23:58:50 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means
- 'follow encoding declaration in XML'.
+ * hash.c (rb_f_setenv): name and value can be tainted.
- * 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]
+Wed Jan 6 02:42:08 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb:
- simplify the test case.
+ * bignum.c (Init_Bignum): forgot to define Bignum#===.
- * test/wsdl/axisArray/*: add tests for axis's array encoding.
+ * gc.c (gc_sweep): if add_heap() is called during GC, objects on
+ allocated heap page(s) are not marked, should not be recycled.
-Tue Nov 25 16:15:29 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * gc.c (gc_sweep): should refer latest freelist.
- * ruby.h: don't treat Cygwin as Windows.
+ * gc.c (id2ref): modified to support performance patch.
-Tue Nov 25 15:18:28 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * object.c (rb_obj_id): performance patch (no bignum for id).
- * configure.in: change default value of --enable-pthread (default: no)
+Tue Jan 5 01:56:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 25 07:31:16 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * config.guess: merge up-to-date from autoconf 2.12.
- * parse.y (primary): allow newlines just before right argument
- parenthesis. (ruby-bugs:PR#1221)
+ * array.c (rb_ary_join): avoid calling rb_protect_inspect() till
+ it is really needed.
-Mon Nov 24 23:32:06 2003 Tanaka Akira <akr@m17n.org>
+ * object.c (rb_obj_inspect): show detailed information for the
+ instance variables (infinite loop can avoid now).
- * 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.
+ * struct.c (rb_struct_inspect): avoid infinite loop.
-Mon Nov 24 19:59:48 2003 Tanaka Akira <akr@m17n.org>
+Sun Jan 3 01:37:58 1999 Takao KAWAMURA <kawamura@ike.tottori-u.ac.jp>
- * lib/open-uri.rb (URI::Generic#find_proxy): use CGI_HTTP_PROXY
- instead of HTTP_PROXY in the CGI environment.
+ * misc/ruby-mode.el (ruby-end-of-defun): moved too much.
-Mon Nov 24 19:32:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * misc/ruby-mode.el (ruby-mode-variables): set paragraph-separator
+ for the mode.
- * ext/etc/extconf.rb: check for pw_passwd in struct passwd and
- gr_passwd in struct group for DJGPP.
+ * misc/ruby-mode.el: proper font-lock for `def' and `nil' etc.
- * ext/etc/etc.c: ditto.
+Sat Jan 2 17:09:06 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/Setup.dj: support for curses, etc, zlib.
+ * eval.c (rb_jump_tag): new api to invoke JUMP_TAG. tag values
+ can obtained from rb_eval_string_protect()/rb_load_protect().
-Mon Nov 24 17:00:00 2003 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_rescue): now catches all exceptions but SystemExit.
- * lib/open-uri.rb: validate option names.
- :content_length_proc and :progress_proc option implemented.
+ * eval.c (rb_eval_string_protect): eval string with protection.
-Mon Nov 24 14:53:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_load_protect): load file with protection.
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (XCFLAGS): output empty value instead of `-DRUBY_EXPORT'.
+ * io.c (rb_io_puts): avoid infinite loop for cyclic arrays.
-Sat Nov 22 23:09:45 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (rb_thread_local_aref): thread local hash tables.
- * configure.in: set enable_pthread to no on MinGW.
+ * object.c (rb_equal): check exact equal before calling `=='.
-Sat Nov 22 22:56:20 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu Dec 31 22:28:53 1998 MAEDA shugo <shugo@aianet.ne.jp>
- * configure.in: add --enable-pthread option (default: yes)
+ * eval.c (rb_f_require): feature names should be provided with
+ DLEXT extension.
-Sat Nov 22 22:48:46 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * marshal.c (Init_marshal): need to provide `marshal.so'.
- * ext/tk/lib/tk.rb: add Tk.grab_release and fix bug of TkComposite
+Wed Dec 30 02:29:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tkafter.rb: bug fix of TkAfter#start
+ * variable.c (classname): do not call rb_ivar_set().
- * ext/tk/sample/tkcombobox.rb: new sample script
+ * eval.c (ruby_run): finalizers were called too early.
- * ext/tcltklib/tcltklib.c: add native thread check
+Fri Dec 25 12:19:30 1998 Fukuda Masaki <fukuda@wni.co.jp>
-Sat Nov 22 18:49:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * gc.c (rb_gc_mark): should not return on FL_EXIVAR.
- * ext/curses/curses.c (window_nodelay): nodelay() of NetBSD's
- libcruses returns no value, just like keypad().
+Fri Dec 25 11:56:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Nov 22 17:36:36 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * gc.c (gc_mark): proper scanning for temporary region.
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (HAVE_GETCWD): output to config.h.
+ * eval.c (TMP_ALLOC): protection for C_ALLOCA was broken.
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (XCFLAGS): output to config.status.
+Thu Dec 24 18:26:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Nov 22 13:10:10 2003 Minero Aoki <aamine@loveruby.net>
+ * development version 1.3 released.
- * lib/fileutils.rb (have_st_ino?): djgpp has valid st_ino.
+Thu Dec 24 00:17:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Nov 22 11:28:48 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_load): top self should be set properly.
- * gc.c (Init_stack): stack region is far smaller than usual if
- pthread is used.
+ * variable.c (classname): check __classpath__ if it is defined.
-Sat Nov 22 07:30:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * variable.c (classname): invalid warning at -v with static linked
+ ruby interpreter.
- * lib/test/unit/util/backtracefilter.rb: fixed a bug that occurred
- when an exception had no backtrace.
+ * eval.c (is_defined): modified for expr::Const support.
- * test/testunit/util/test_backtracefilter.rb: ditto.
+ * eval.c (rb_eval): invoke method expr::Const if expr is not class
+ nor module.
-Fri Nov 21 16:44:18 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * parse.y (primary): enable expr::identifier as method
+ invocation.
- * ext/tk/lib/tkentry.rb: fix the encoding trouble of percent
- substitutions on validatecommand option of TkEntry widget
+Wed Dec 23 03:04:36 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb: fix bug on {pack|grid}_propagate() method
+ * regex.c (re_match): avoid too many loop pops for (?:..).
-Fri Nov 21 16:12:11 2003 Akinori MUSHA <knu@iDaemons.org>
+Tue Dec 22 18:01:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ruby.1: Fix markups and grammar.
+ * experimental version 1.1d1 released.
-Fri Nov 21 14:49:42 2003 Minero Aoki <aamine@loveruby.net>
+Mon Dec 21 01:33:03 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ruby.1: wrote about ruby related environment variables.
+ * eval.c (TMP_PROTECT): add volatile to ensure GC protection.
-Fri Nov 21 12:28:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (rb_str_gsub_bang): calculate buffer size properly.
- * marshal.c (w_extended): singleton methods should not be checked
- when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
+ * parse.y (lex_get_str): needed to return Qnil at EOS.
-Fri Nov 21 01:40:00 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * eval.c (find_file): check policy modified, raise exception
+ immediately for tainted load_path.
- * configure.in: check <pthread.h>
+ * hash.c (rb_f_setenv): do not depend on setenv() nor putenv().
- * ruby.h: include pthread.h if existence.
- define is_ruby_native() macro when not HAVE_NATIVETHREAD
+Thu Dec 17 06:29:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c: undef is_ruby_native() function when not HAVE_NATIVETHREAD
+ * ext/tk/tkutil.c (tk_s_new): use rb_obj_instance_eval(), instead
+ of rb_yield_0().
-Fri Nov 21 00:43:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * eval.c (rb_f_require): forgot to call find_file in some cases.
- * lib/test/unit/assertions.rb: use #__send__ instead of #send.
+ * eval.c (rb_f_require): `require "feature.so"' to load dynamic
+ libraries. old `require "feature.o"' is still OK.
- * lib/test/unit/testcase.rb: ditto.
+ * eval.c (rb_eval): yield without value dumped core.
-Thu Nov 20 19:19:22 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Wed Dec 16 16:28:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in: don't find the Cygwin's pthread library on MinGW.
+ * experimental version 1.1d0 (pre1.2) released.
-Thu Nov 20 19:15:50 2003 Minero Aoki <aamine@loveruby.net>
+Wed Dec 16 10:43:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (have_st_ino?): emx (OS/2 with EMX) does not
- have st_ino (always 0). [ruby-dev:21972]
+ * regex.c (re_search): bound check before calling re_match().
- * lib/fileutils.rb (rename_cannot_overwrite_file?): emx does not
- allow overwriting files by rename(2).
+Tue Dec 15 13:59:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/fileutils/test_fileutils.rb: windows? ->
- have_drive_letter?, have_file_perm?
+ * error.c (exc_to_s): returns class name for unset mesg.
-Thu Nov 20 17:50:58 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * error.c (exc_initialize): do not initialize @mesg by "".
- * ext/tk/sample/tkballoonhelp.rb: new sample script
+ * parse.y (nextc): __END__ should handle CR+LF newlines.
- * ext/tk/sample/tkmultilistbox.rb: ditto
+Wed Dec 9 13:37:12 1998 MAEDA shugo <shugo@aianet.ne.jp>
- * ext/tk/sample/tktextframe.rb: ditto
+ * pack.c (encodes): use buffering for B-encoding.
-Thu Nov 20 13:37:34 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * pack.c (pack_pack): Q-encoding by 'M'.
- * ruby.h: define is_ruby_native_thread() for no native thread
- environment
+Tue Dec 8 14:10:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c: ditto
+ * variable.c (generic_ivar_get): any object can have instance
+ variables now. great improvement.
-Thu Nov 20 12:42:47 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * variable.c (rb_name_class): do not set __classpath__ by default,
+ use __classid__ instead.
- * configure.in: always check existence of the pthread library
+Mon Dec 7 22:08:22 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ruby.h: define macros for ruby's native thread check
+ * ruby.h (struct RFile): IO objects can have instance variables now.
- * eval.c: add ruby's native thread check
+ * parse.y (primary): allows `def obj::foo; .. end'.
- * gc.c: ditto
+Mon Dec 7 18:24:50 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
-Wed Nov 19 14:45:18 2003 Minero Aoki <aamine@loveruby.net>
+ * ruby.c (set_arg0): $0 support for HP-UX.
- * lib/net/http.rb (to_ary): print more friendly warning message.
+Mon Dec 7 01:30:28 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Nov 19 14:32:08 2003 Minero Aoki <aamine@loveruby.net>
+ * dln.c (dln_strerror): better error messages on win32.
- * lib/fileutils.rb (fu_same?): add djgpp and wince.
+Sat Dec 5 23:27:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (cannot_overwrite_file?): add wince.
+ * parse.y (here_document): indentable here-doc delimiter by
+ `<<-'. Proposed by Clemens <c.hintze@gmx.net>. Thanks.
-Wed Nov 19 11:04:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Thu Dec 3 16:50:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32
- is same as mswin32.
+ * ext/extmk.rb.in (realclean): trouble on install.
-Wed Nov 19 07:54:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+Sun Nov 29 22:25:39 1998 Takaaki Tateishi <ttate@jaist.ac.jp>
- * lib/test/unit.rb: do not run tests if $! is set.
+ * process.c (f_exec): check number of argument.
- * lib/test/unit/assertionfailederror.rb: extend StandardError instead
- Exception (irb catches the former but not the latter).
+Thu Nov 26 17:27:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 18 23:31:36 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * version 1.1c9 released.
- * missing/memmove.c (memmove): take void *, not char *.
+Wed Nov 25 13:07:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * missing.h (memmove): ditto.
+ * string.c (rb_str_dup): do not copy additional data (STR_NO_ORIG).
- * missing.h (strchr, strrchr): return char *, not int.
+ * parse.y (yycompile): reduce known memory leak (hard to remove).
-Tue Nov 18 22:20:10 2003 Minero Aoki <aamine@loveruby.net>
+Wed Nov 25 03:41:21 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (fu_same?): temporal fix for windows.
+ * st.c (st_init_table_with_size): round size up to prime number.
-Tue Nov 18 19:05:04 2003 Minero Aoki <aamine@loveruby.net>
+Sat Nov 21 23:27:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (fu_same?): check by inode instead of path
- name, to detect two hard links pointing to the same content.
+ * hash.c (rb_hash_aset): reduce copying key strings.
- * test/fileutils.rb: did not create correctly looped symlinks.
+ * gc.c (looks_pointerp): declare as inline function if possible.
-Tue Nov 18 18:23:05 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * st.c (PTR_NOT_EQUAL): compare hash values first before calling
+ comparing function.
- * ext/stringio/stringio.c (strio_read): behave as IO at empty string.
- [ruby-dev:21939], [ruby-dev:21941]
+ * st.c (ADD_DIRECT): save hash value in entries to reduce hash
+ calculation.
- * ext/stringio/stringio.c (strio_getc, strio_getline): set EOF flag.
+ * string.c (rb_str_gsub_bang): avoid rb_scan_args() to speed-up.
- * ext/stringio/stringio.c (strio_rewind, strio_seek, strio_ungetc):
- clear EOF flag.
+ * string.c (rb_str_sub_bang): ditto.
- * test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
+Sat Nov 21 18:44:06 1998 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-Tue Nov 18 14:06:35 2003 Minero Aoki <aamine@loveruby.net>
+ * time.c (time_s_now): had memory leak.
- * lib/fileutils.rb (fu_each_src_dest): raise if src==dest.
- [ruby-talk:85344] [ruby-core:01699]
+ * ext/md5/md5init.c (md5_new): had memory leak.
- * lib/fileutils.rb: use Object#is_a? instead of Class#=== to allow
- e.g. remote objects for receivers.
+ * ext/md5/md5init.c (md5_clone): ditto.
- * lib/fileutils.rb: FileTest -> File.
+Fri Nov 20 23:23:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb: put parentheses for arguments of File.xxxx?
+ * lib/delegate.rb: do not propagate hash and eql?.
- * test/fileutils/test_fileutils.rb (test_cp): test "cp a a".
+Thu Nov 19 01:40:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/fileutils/test_fileutils.rb (test_mv): test "mv a a".
+ * sample/ruby-mode.el (ruby-expr-beg): failed to find reserved
+ word boundary.
- * test/fileutils/test_fileutils.rb (test_ln): test "ln a a".
+ * eval.c (rb_eval): avoid calling `concat' method. calls
+ rb_ary_concat() directly for efficiency.
- * test/fileutils/test_fileutils.rb (test_ln_s): test "ln_s a a".
+ * eval.c (rb_eval): actual rest arguments extended arrays too much.
- * test/fileutils/test_fileutils.rb (test_install): test "install a a".
+Wed Nov 18 14:30:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/fileutils/fileasserts.rb: new method assert_symlink.
+ * class.c (rb_define_global_function): global functions now be
+ module function of the Kernel.
- * test/fileutils/fileasserts.rb: assert_is_directory -> assert_directory.
+Wed Nov 18 10:48:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Nov 17 19:38:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (read_all): SEGV on large files.
- * file.c (getcwdofdrv): avoid using getcwd() directly, use
- my_getcwd() instead.
+Tue Nov 17 18:11:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
- <sunshine@sunshineco.com>. [ruby-core:01596]
+ * version 1.1c8 released.
-Mon Nov 17 10:50:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 17 16:58:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/optparse.rb (OptionParser::Completion::complete): allow least
- common completion for three or more candidates.
+ * parse.y (arg): assignment to attribute name start with capital
+ should be allowed.
-Mon Nov 17 09:41:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (thread_alloc): needed to mark terminated threads too.
- * lib/test/unit/ui/tk/testrunner.rb,
- lib/test/unit/ui/gtk/testrunner.rb:
- run GUI main loop in sub thread.
+Tue Nov 17 12:33:48 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
- * lib/test/unit/ui/gtk2/testrunner.rb: imported from rough.
+ * ext/extmk.rb.in (create_makefile): Set `libdir' to `@libdir@',
+ Set `pkglibdir' to `$libdir/$(RUBY_INSTALL_NAME)'.
- * lib/test/unit/autorunner.rb (keyword_display): sort keywords.
+Tue Nov 17 10:30:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Nov 16 18:10:57 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * sprintf.c (f_sprintf): %l%%c -> %%l%c
- * eval.c (rb_eval): iterator should return value from next inside
- begin/rescue/end. (ruby-bugs:PR#1218)
+Tue Nov 17 01:08:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Nov 16 13:26:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (ret_args): distinguish `a' and `*a' for the arguments
+ of yield and return.
- * 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): flip3 should work like sed.
- * eval.c (rb_eval): call "inherited" only when a new class is
- generated; not on reopening.
+ * eval.c (rb_eval): flip{2,3} now have independent state for each
+ scope to work fine with thread.
- * eval.c (eval): prepend error position in evaluating string to
- "mesg" attribute string only when it's available and is a
- string.
+Mon Nov 16 23:26:29 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Nov 16 12:16:10 2003 Minero Aoki <aamine@loveruby.net>
+ * parse.y (primary): exec else clause if no exception raised.
- * lib/net/protocol.rb: logging response body. [experimental]
- [ruby-list:38800]
+Sun Nov 15 15:44:07 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Sun Nov 16 10:49:38 2003 Gavin Sinclair <gsinclair@soyabean.com.au>
+ * ext/extmk.rb.in (install): bug in target.
- * lib/thread.rb (Thread.exclusive): wrap method definition in
- class Thread to enable rdoc to process.
+Sat Nov 14 11:02:05 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
-Sun Nov 16 09:45:23 2003 Minero Aoki <aamine@loveruby.net>
+ * Makefile.in (install): Give the argument `$(DESTDIR)' to
+ `instruby.rb'.
- * lib/net/http.rb (set_debug_output): warn if method is called
- after #start. [ruby-dev:38798]
+ * instruby.rb: Recognize ARG[0] as `destdir'.
-Sun Nov 16 04:41:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * instruby.rb: Give the argument `destdir' to `extmk.rb'.
- * eval.c (eval): do not re-raise exception to avoid unnecessary
- exception copying, instead modify exception and internal
- information to adjust eval().
+ * ext/extmk.rb.in: Recognize ARG[1] as `$destdir'.
- * eval.c (backtrace): can return the current frame information
- only if lev < -1.
+ * instruby.rb: Create the installation directories (bindir, libdir,
+ archdir, pkglibdir, archdir, and mandir) under `destdir', and
+ install all files under there.
-Sat Nov 15 22:16:42 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/extmk.rb.in: Likewise.
- * /ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext):
- refine error message.
+Sat Nov 14 10:56:55 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
-Sat Nov 15 10:05:40 2003 Tanaka Akira <akr@m17n.org>
+ * instruby.rb: Add the variable `pkglibdir'.
- * lib/open-uri.rb (OpenURI.open_loop, OpenURI::HTTP#proxy_open):
- refactored to support options.
- (Buffer): maintain size by this class.
+ * instruby.rb: Set the variable `libdir' to `$(libdir)', not
+ `$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB'
+ are installed at `libdir'.
-Sat Nov 15 07:40:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'.
- * eval.c (rb_method_node): new API to retrieve method body.
+Fri Nov 13 19:43:29 1998 KIMURA Koichi <kbk@kt.rim.or.jp>
-Fri Nov 14 13:21:30 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * missing/nt.c (SafeFree): wrong free offset.
- * ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07)
+Thu Nov 12 20:11:53 1998 Koji Arai <JCA02266@nifty.ne.jp>
- * ext/tk/lib/tkdialog.rb: TkDialog.new accepts a parent widget
- argument [ruby-talk:85066]
+ * sample/ruby-mode.el: wrong highlight.
-Thu Nov 13 20:53:35 2003 Tanaka Akira <akr@m17n.org>
+ * parse.y (parse_regx): newline in regexp was ignored.
- * lib/open-uri.rb (Kernel[#.]open): hard coded URI schemes removed.
- [ruby-ext:02251]
+Wed Nov 11 10:54:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Nov 13 19:17:00 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * parse.y (here_document): <<'FOO' should not escape anything.
- * lib/test/unit/ui/tk/testrunner.rb: use grid and panedwindow
- (if available)
+ * parse.y (here_document): bare << here-doc available, even though
+ it's deprecated.
-Thu Nov 13 17:56:41 2003 Tanaka Akira <akr@m17n.org>
+ * file.c (rb_file_s_readlink): return value should be tainted.
- * lib/open-uri.rb (OpenURI.open_uri): use File::RDONLY.
- reported by Take_tk <ggb03124@nifty.ne.jp>.
- [ruby-ext:02245]
+ * ext/etc/etc.c (setup_passwd): information (eg. GCOS name) should
+ be tainted (modified at Perl Conference).
-Thu Nov 13 16:45:53 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Nov 10 00:22:11 1998 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * ext/openssl/ossl_x509req.c (ossl_x509req_to_der): add function for
- X509::Request#to_der.
+ * configure.in: elf support for FreeBSD 3.x
-Thu Nov 13 11:31:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Nov 10 00:05:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/optparse.rb (OptionParser::Completion#complete): prior shorter
- name to containing longer name.
+ * parse.y (yylex): here document available in eval.
-Thu Nov 13 06:08:54 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Mon Nov 9 17:55:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb: stop freezing some classes
+ * version 1.1c7 released.
- * ext/tk/lib/multi-tk.rb: ditto.
+Fri Nov 6 19:25:27 1998 Takao KAWAMURA <kawamura@ike.tottori-u.ac.jp>
-Wed Nov 12 17:32:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * sample/ruby-mode.el: font-lock patch.
- * lib/test/unit/assertions.rb (assert_throws, assert_nothing_thrown):
- uncaught throw in sub thread raises ThreadError.
+Thu Nov 5 15:42:22 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/test/unit/ui/tk/testrunner.rb (setup_ui): "expand" is not
- necessary.
+ * sample/README, lib/README: simple description for each file.
-Wed Nov 12 14:09:43 2003 Shugo Maeda <shugo@ruby-lang.org>
+Wed Nov 4 18:14:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/monitor/test_monitor.rb: fix the timing problem by Queue.
+ * eval.c (assign): attribute assignment should be called as public.
-Wed Nov 12 12:59:44 2003 Shugo Maeda <shugo@ruby-lang.org>
+Tue Nov 3 23:36:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/monitor/test_monitor.rb: added.
+ * string.c (rb_str_dump): dumps core for negative char value.
-Wed Nov 12 10:14:28 2003 Shugo Maeda <shugo@ruby-lang.org>
+ * regex.c (re_compile_pattern): out of boundary access for empty
+ regexp.
- * lib/monitor.rb: refactored. Thanks, Gennady Bystritsky.
+Mon Nov 2 22:54:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Nov 12 06:11:39 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * string.c (rb_str_aset): `str[str]' replaces first match.
- * ext/openssl/ossl.c (ossl_x509_sk2ary, ossl_x509crl_sk2ary):
- add functions to convert STACK into Array.
+Mon Nov 2 18:24:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl.h: add prototypes.
+ * eval.c (thread_create): was accessing modified status.
- * 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.
+Sun Nov 1 01:18:52 1998 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-Wed Nov 12 00:47:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * gc.c (xrealloc): size 0 needs round up to 1.
- * lib/test/unit/ui/testrunnermediator.rb: should require 'test/unit'.
+Sat Oct 31 23:18:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 11 23:54:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * string.c (rb_str_split_method): negative LIMIT means number of
+ split fields are unlimited, as in perl.
- * lib/test/unit/ui/gtk/testrunner.rb: added a rescue clause to handle
- the case when the requested font is not available.
+ * string.c (rb_str_split_method): if LIMIT is unspecified,
+ trailing null fields are stripped.
-Tue Nov 11 22:44:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Oct 31 04:16:14 1998 Inaba Hiroto <inaba@st.rim.or.jp>
- * io.c (appendline): file may not end with newline. a bug if
- READ_DATA_PENDING_PTR is defined. [ruby-talk:84925]
+ * string.c (str_aref): regexp index SEGVed.
-Tue Nov 11 10:42:41 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Fri Oct 30 14:33:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb: raise an exception when creating TkWindow
- object, because TkWindow class is an abstract class.
+ * re.c (reg_match): returns nil for unmatch.
-Tue Nov 11 03:30:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * dir.c (dir_entries): new method.
- * lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil
- if the specified value doesn't exist.
+ * eval.c (block_pass): do not push block, substitute it.
- * lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
- a empty hash if the specified section doesn't exist.
+Fri Oct 30 01:28:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Nov 10 11:40:29 2003 Shugo Maeda <shugo@ruby-lang.org>
+ * range.c (range_check): avoid <=> check for Fixnums.
- * lib/monitor.rb (wait): return true on signal/broadcastfalse and
- false on timeout. Thanks Gennady Bystritsky.
+ * array.c (rb_ary_aset): accept negative index.
-Mon Nov 10 00:07:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Oct 28 22:00:54 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * parse.y (primary): primary_value may be 0 when syntax error.
- [ruby-talk:84893]
+ * regex.c (re_match): access out of boundary fixed.
-Sun Nov 9 02:05:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+Wed Oct 28 11:37:42 1998 TAMITO <tommy@valley.ne.jp>
- * lib/test/unit/assertions.rb: un-deprecated #assert_not_nil to
- maintain symmetry with #assert_nil. Also added better output for
- #assert_kind_of.
+ * io.c (f_select): fd number comparison bug.
- * test/testunit/tc_assertions.rb: ditto.
+Tue Oct 27 23:07:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Nov 8 18:50:20 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * sample/ruby-mode.el (ruby-parse-region): forgot to support %w()
+ style array literal.
- * test/wsdl/raa/*: add new testcase for WSDL loading, parsing and
- reading.
+ * eval.c (rb_eval): unused block raises warning.
- * test/soap/marshal/*: backport from soap4r/1.5.1. all differences are
- for ruby/1.6.
+Mon Oct 26 09:37:53 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/soap/*: backport from soap4r/1.5.1. all differences are for
- ruby/1.6.
+ * eval.c (dvar_asgn_push): dvar pushed too many times if
+ variable-in-block first appear in loops.
- * lib/wsdl/data.rb, lib/wsdl/xmlSchema/data.rb: move definition of
- ArrayTypeAttrName from ::WSDL::XMLSchema::* to ::WSDL::*.
- [ruby-talk:84813]
+Sun Oct 25 22:59:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/wsdl/soap/definitions.rb: element name typo in custom exception
- struct definition which is needed for wsdlDriver; camelCase ->
- underscore_name.
+ * regex.c (set_list_bits): was using wrong offset.
-Sat Nov 8 13:49:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu Oct 22 00:07:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in: improvement of pthread check
+ * eval.c (rb_obj_method): method retrieved from tainted object
+ should be tainted too.
-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.
+ * eval.c (method_call): safe_level should be restored during
+ Method#call.
-Sat Nov 8 06:19:38 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Wed Oct 21 14:21:06 1998 Yukihiro Matsumoto <matz@netlab.co.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).
+ * io.c (Init_IO): new constants IO::SEEK_{SET,CUR,END}.
- * ext/tcltklib/README.1st: edit the description of '--with-pthread-ext'
+ * io.c (rb_f_ungetc): ungetc pushes a char back into STDIN.
-Fri Nov 7 23:23:04 2003 Tanaka Akira <akr@m17n.org>
+Mon Oct 19 11:50:00 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
- * 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.
+ * ext/extmk.rb: Load '@top_srcdir@/lib/find.rb', not
+ '../lib/find.rb'.
-Fri Nov 7 10:23:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/extmk.rb: Distinguish between `top_srcdir' and `topdir'.
- * ext/socket/socket.c (make_hostent): get rid of SEGV on aliases
- lookup failure. (ruby-bugs:PR#1215)
+ * Makefile.in (CFLAGS): Add `-I.'.
-Fri Nov 7 04:08:05 2003 UENO Katsuhiro <katsu@blue.sky.or.jp>
+ * Makefile.in (lex.c): Give `@srcdir@/keywords' to gperf, not
+ `keywords'.
- * ext/zlib/zlib.c (Init_zlib): define Zlib::GzipReader#each_line as
- an alias of Zlib::GzipReader#each.
+ * instruby.rb: Use `CONFIG["bindir"]', instead of `prefix + "/bin"'.
-Fri Nov 7 01:03:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * instruby.rb: Use `CONFIG["libdir"]', instead of `prefix + "/lib"'.
- * eval.c (rb_load): save and restore rb_prohibit_interrupt.
- [ruby-dev:21857]
+ * instruby.rb Use `CONFIG["mandir"]', instead of `prefix + "/man"'.
-Thu Nov 6 18:05:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * instruby.rb (wdir): Add the variable to preserve the current
+ working directory.
- * io.c (rb_io_inspect): show the path also at a closed file.
- [ruby-dev:21851]
+ * instruby.rb: Chdir to wdir before install `config.h' and
+ `rbconfig.rb'.
-Thu Nov 6 11:42:07 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Oct 19 10:07:01 1998 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
- * ext/stringio/stringio.c (strio_set_string, strio_reopen): check
- tainted.
+ * eval.c (rb_eval): reduce recursive calls to rb_eval().
- * ext/stringio/stringio.c (strio_copy, strio_ungetc, strio_write,
- strio_putc): add infection.
+Fri Oct 16 15:31:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/stringio/stringio.c (strio_path): just nil. [ruby-dev:21846]
+ * time.c (time_new_internal): timeval must be positive.
- * ruby.c (proc_options): reserve searched script path in the
- source file name table. [ruby-list:38765]
+Thu Oct 15 13:54:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/optparse.rb (OptionParser::Completion#complete): default not to
- ignore case on completion. [ruby-talk:84726]
+ * parse.y (arg): local variables can be accessed within right side
+ expression in assignment, notably in blocks.
- * win32/win32.c (make_cmdvector): process backslashes even if a quote
- is not enclosed.
+Wed Oct 14 00:18:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Nov 5 23:49:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * array.c (Init_Array): Array#=== is now for equal check, not
+ inclusion check.
- * sample/openssl/gen_csr.rb: there (at least) is a CA which does not
- accept DN in UTF8STRING format. it's a sample.
+ * parse.y (when_args): `when a, *b' style new syntax for array
+ expansion in `case'.
-Wed Nov 5 22:55:16 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Tue Oct 13 14:30:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in, eval.c, signal.c: : add '--with-pthread-ext'
- option to fix the pthread trouble on 'tcltklib'
+ * object.c (rb_obj_untaint): taint marks can be unset.
- * ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
+ * eval.c (rb_eval): taint propagation for embedded strings.
- * 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
+Mon Oct 12 13:27:15 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb : add TkMenu#set_focus support Tcl/Tk's
- tk_menuSetFocus
+ * eval.c (rb_call0): check stack depth more frequently.
-Wed Nov 5 17:33:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Oct 12 08:08:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_load): allow interrupt during loaded program
- evaluation. [ruby-dev:21834]
+ * io.c (rb_p): can print even in secure mode.
- * hash.c (rb_hash_fetch): always warn if default argument and a
- block are supplied at the same time. [ruby-dev:21842]
+Sun Oct 11 22:50:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * hash.c (env_fetch): ditto.
+ * variable.c (rb_const_set): taint check for modification.
- * array.c (rb_ary_fetch): ditto.
+ * variable.c (rb_ivar_set): taint check for modification.
-Wed Nov 5 19:08:47 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (rb_str_modify): taint check for modification.
- * lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
- do not remove next argument if empty value is placed.
+ * hash.c (rb_hash_modify): taint check for modification.
- * test/optparse: added.
+ * array.c (rb_ary_modify): taint check for modification.
-Wed Nov 5 17:05:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ruby.h (FL_TAINT): taint for all objects, not only strings.
- * lib/test/unit/ui/gtk/testrunner.rb: typo.
+Fri Oct 9 17:01:14 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Nov 5 11:13:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * io.c (read_all): read() returns "" at immediate EOF.
- * string.c: add #include "version.h". this file still depends on it.
+ * io.c (io_read): read(nil) read all until EOF.
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
- wince/Makefile.sub: add version.h dependency to string.c.
+Thu Oct 8 13:32:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Nov 5 09:14:23 2003 Shugo Maeda <shugo@ruby-lang.org>
+ * time.c (time_dump): marshal can dump Time object now.
- * lib/monitor.rb: revert to the previous revision.
+ * marshal.c (Init_marshal): rename marshal methods `_dump_to' to
+ `_dump', `_load_from' to `_load'.
-Wed Nov 5 08:39:51 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * parse.y (rb_intern): "+=".intern generates proper symbol.
- * lib/webrick/https.rb (HTTPRequest#parse): set @client_cert_chain.
+Mon Oct 5 18:31:53 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/https.rb (HTTPRequest#meta_vars): create
- SSL_CLIENT_CERT_CHAIN_n from @client_cert_chain.
+ * version 1.1c6 released.
- * ext/openssl/ossl_ssl.c (ossl_ssl_get_peer_cert_chain): return nil
- if no cert-chain was given.
+Fri Oct 2 14:22:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 4 23:44:48 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regex.c (re_search): `/\s*(--)$/ =~ "- --"' did not match,
+ because of wrong optimize condition.
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
- remove needless version.h dependency.
+Mon Oct 1 01:55:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Nov 4 23:38:43 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * parse.y (rb_intern): should not raise exceptions.
- * class.c, hash.c, string.c: remove #include "version.h".
+ * parse.y (yylex): symbol like `:foo?=' should not be allowed.
- * Makefile.in: remove needless version.h dependency.
+ * ext/extmk.rb.in: makes *.a for static link modules.
-Tue Nov 4 06:54:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Sep 30 14:13:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (read_all): fptr->f may be NULL, if IO is closed in the
- signal handler.
+ * eval.c (rb_thread_start): supports making a subclass of the
+ Thread class.
- * io.c (io_read): ditto.
+Tue Sep 29 17:46:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * string.c (get_pat): remove 1.8.0 warning code.
+ * eval.c (rb_thread_join): join is now an instance method.
- * string.c (rb_str_match): extend warning until 1.8.2.
+Fri Sep 25 12:01:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * string.c (rb_str_match2): ditto.
+ * parse.y (yylex): `@foo!' should be an error.
- * class.c (class_instance_method_list): remove 1.8.0 warnings.
- method_list now recurs. [ruby-dev:21816]
+Thu Sep 24 14:55:06 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
- * class.c (rb_obj_singleton_methods): ditto.
+ * ext/etc/etc.c (Init_etc): wrong field definition.
- * array.c (rb_ary_select): remove select with block.
- [ruby-dev:21824]
+Thu Sep 17 17:09:05 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * hash.c (rb_hash_select): ditto.
+ * io.c (io_reopen): was creating FILE* for wrong fd.
- * hash.c (env_select): ditto.
+Tue Sep 15 05:28:11 1998 Koji Arai <JCA02266@nifty.ne.jp>
- * re.c (match_select): ditto.
+ * regex.c (re_compile_pattern): forgot to fixup for the pattern
+ like (?=(A)|(B)).
- * struct.c (rb_struct_select): ditto.
+Tue Sep 15 01:06:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Nov 3 22:53:21 2003 Minero Aoki <aamine@loveruby.net>
+ * io.c (rb_io_gets_internal): do not set $_ by default, only
+ gets/readline set the variable.
- * lib/racc/parser.rb: synchronize with Racc 1.4.4.
+ * eval.c (rb_f_load): load toplevel class is set to anonymous
+ module if safe_level >= 5, to encapsulate modification.
- * ext/racc/cparse/cparse.c: ditto.
+ * eval.c (rb_f_load): set frame properly.
- * ext/racc/cparse/cparse.c (parse_main): should abort when
- the length of LR state stack <=1, not ==0.
+ * string.c (rb_str_each_line): do not set $_.
-Mon Nov 3 08:50:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Sep 14 14:42:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * process.c (check_uid_switch): remove duplicated error messages.
+ * regex.c (re_match): beginning and end of the string, do not
+ automatically match `\b'.
- * process.c (check_gid_switch): ditto.
+ * string.c (scan_once): consume at least on character.
-Sun Nov 2 02:28:33 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * regex.c (re_search): wrong behavior for negative range.
- * lib/webrick/ssl.rb: new option :SSLExtraChainCert.
+Sat Sep 12 21:21:26 1998 Koji Arai <JCA02266@nifty.ne.jp>
-Sun Nov 2 01:02:04 2003 Akinori MUSHA <knu@iDaemons.org>
+ * regex.c (re_search): range value should be maintained.
- * string.c (rb_str_hash): Update the HASH_PERL alternative hash
- algorithm in sync with Perl 5.8.
+Thu Sep 10 10:55:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * st.c (strhash): Ditto.
+ * parse.y (backref_error): yyerror does not understand formats.
-Sat Nov 1 18:21:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Sep 8 18:05:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_ssl.c (ossl_ssl_peer_cert_chain): add new method
- SSLSocket#peer_cert_chain.
+ * version 1.1c5 released.
- * ext/openssl/ossl_x509req.c (GetX509ReqPtr): new function
- which returns underlying X509_REQ.
+Tue Sep 8 10:03:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * string.c (str_each_line): wrong line splitting with newline at
+ top of the string.
-Sat Nov 1 01:49:03 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * string.c: non bang methods return copied string.
- * 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.
+ * eval.c (f_END): needed to initialize frame->argc;
- * test/soap/marshal/test_marshal.rb: add tests for self referencing
- immutable objects.
+Fri Sep 4 11:27:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/soap/calc/test_calc_cgi.rb: fix test name.
+ * bignum.c (bigadd): proper sign combination.
-Fri Oct 31 22:26:29 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+ * regex.c (re_search): wrong return value for \A.
- * wince/string_wce.c (strrchr): should decrement pointer.
+Thu Sep 3 14:08:14 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * wince/Makefile.sub: correct a range of isdigit().
+ * version 1.1c4 released.
-Fri Oct 31 12:55:24 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Tue Sep 1 10:47:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD.
- [ruby-dev:21791]
+ * regex.c (slow_search): do not compare llen and blen. llen may
+ be longer than blen, if little contains 0xff.
- * bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
+ * regex.c (mbctab_euc): set 0x8e as multibyte character.
-Fri Oct 31 01:38:14 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * string.c (str_inspect): mask character for octal output.
- * 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)
+Mon Aug 31 15:32:41 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Oct 31 01:02:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_search): use calculated offset if exactn is the
+ first opcode in the compiled regexp.
- * compar.c (cmp_equal): protect exceptions from <=> comparison
- again. returns nil if any exception or error happened during
- comparison.
+ * regex.c (bm_search): use Boyer-Moore search for simple search.
- * eval.c (search_required): should update *featurep when DLEXT2 is
- defined. (ruby-bugs-ja:PR#581)
+ * regex.c (must_instr): wrong length check if pattern includes
+ byte escape by 0xff.
-Thu Oct 30 23:41:04 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * regex.c (re_compile_pattern): need not to check current_mbctype.
- * lib/drb/drb.rb: add DRbArray
+Sat Aug 29 16:31:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/drb/invokemethod.rb: fix Hash#each problem. [ruby-dev:21773]
+ * eval.c (rb_check_safe_str): avoid calling rb_id2name() in normal
+ cases to speed-up.
- * lib/drb/unix.rb: add LoadError. [ruby-dev:21743]
+ * eval.c (thread_raise): do not save context of terminated thread.
-Thu Oct 30 23:19:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * regex.c (re_compile_pattern): mask \nnn over 256.
- * lib/soap/generator.rb: better XML pretty printing.
+Sat Aug 29 02:09:46 1998 Koji Arai <JCA02266@nifty.ne.jp>
- * lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace
- assignment in the element which has "encodingStyle" attribute, and
- add necessary namespace assignment for "arrayType" attribute.
+ * sprintf.c (f_sprintf): wrong buffer size check.
- * test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process
- through CGI.
+Fri Aug 28 01:57:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 30 22:59:39 2003 why the lucky stiff <why@ruby-lang.org>
+ * regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
- * ext/syck/yaml2byte.c: HASH const too long. Thanks, matz.
+Fri Aug 28 12:25:33 1998 Hiroshi Igarashi <igarashi@ueda.info.waseda.ac.jp>
-Thu Oct 30 19:13:53 2003 Akinori MUSHA <knu@iDaemons.org>
+ * ruby.c (ruby_require_modules): load modules in appearing order.
- * ext/syck/MANIFEST: Add yamlbyte.h.
+Fri Aug 28 01:57:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 30 14:25:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
- * io.c (READ_DATA_BUFFERED): new macro to detect whether stdio
- buffer filled.
+Thu Aug 27 12:54:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * io.c (rb_io_fptr_cleanup): move path deallocation to
- rb_io_fptr_finalize (finalizer called by GC).
+ * version 1.1c3 released.
-Thu Oct 30 13:23:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Aug 26 14:40:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * parse.y (logop): left may be NULL. [ruby-talk:84539]
+ * eval.c (rb_eval): check whether ruby_class is properly set,
+ before accessing it.
- * eval.c (rb_eval): NODE_CASE nd_head may be NULL.
+ * eval.c (rb_obj_instance_eval): ruby_class should be Qnil for
+ special objects like Fixnums.
-Thu Oct 30 10:14:51 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ext/tkutil/tkutil.c (Init_tkutil): removes calls to
+ rb_yield_0(). used instance_eval() instead in the tk.rb.
- * lib/test/unit/autorunner.rb: make fox runner work.
+Wed Aug 26 11:47:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 30 09:32:26 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regex.c (re_match): pop non-greedy stack elements on success.
- * process.c (rb_f_system): fixed lack of security check before
- calling do_spawn() on win32. [ruby-talk:84555]
+Wed Aug 26 09:25:35 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Thu Oct 30 02:46:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ruby.h: add #define environ for cygwin32.
- * 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]
+Tue Aug 25 08:57:41 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 30 02:25:48 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * array.c (rb_ary_sort_bang): temporarily freeze sorting array.
- * ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
- add new method to inherit @sync from @io.sync.
+Mon Aug 24 18:46:44 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): no need to
- set sync flag explicitly.
+ * dln.c (dln_find_1): path check was too strict.
- * ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): call super.
+Mon Aug 24 15:28:11 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): set extra chain
- certificates in @extra_chain_cert.
+ * parse.y (f_arglist): opt_nl added after f_args.
-Wed Oct 29 22:02:04 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Fri Aug 21 01:06:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
- interpreter to exec, instead of test/ruby/envutil.rb,
+ * ext/socket/socket.c: grand renaming on socket.c.
-Wed Oct 29 19:58:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * ext/socket/socket.c (inet_aton): supply inet_aton for those
+ systems that do not have it.
- * ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
- defined and TCL_MAJOR_VERSION >= 8.
+ * ext/socket/socket.c (setipaddr): use inet_aton instead of
+ inet_addr.
- * ext/tcltklib/tcltklib.c (VwaitVarProc, WaitVariableProc,
- rb_threadVwaitProc): use CONST84 instead of CONST.
+ * ext/socket/socket.c (tcp_s_gethostbyname): new method: works
+ like Socket.gethostbyname but returning array contains ip-addrs
+ as octet decimal string format like "127.0.0.1".
- * ext/tcltklib/tcltklib.c (ip_rbTkWaitCommand,
- ip_rb_threadTkWaitCommand): use CONST84 always.
+ * ext/socket/socket.c (mkhostent): return format changed to
+ [host, aliases, type, ipaddr..] as documented.
-Wed Oct 29 17:27:05 2003 Tanaka Akira <akr@m17n.org>
+Wed Aug 19 00:31:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * re.c (rb_reg_s_union, Init_Regexp): new method `Regexp.union'.
+ * io.c (io_ctl): forgot to place TRAP_END at right position.
- * lib/pathname.rb (realpath): examine Dir.pwd because it may have
- symlinks.
+Fri Aug 14 11:01:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 29 17:16:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (call_trace_func): save __FILE__, __LINE__ before
+ executing trace_func, since trace function should not corrupt
+ line number information.
- * eval.c (rb_longjmp): must not disturb original jump.
- [ruby-dev:21733]
+Thu Aug 13 15:09:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 29 15:28:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * array.c (ary_s_new): was marking unallocated region on GC.
- * eval.c (Init_Proc): taint preallocated exception object
- sysstack_error. [ruby-talk:84534]
+Tue Aug 11 11:57:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 29 11:27:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * version 1.1c2 released.
- * parse.y (ret_args): node may be NULL. [ruby-talk:84530]
+Mon Aug 10 14:05:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Oct 28 15:20:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * process.c (f_system): removed fflush(stdin).
- * 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.
+Fri Aug 7 17:44:44 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 27 19:19:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * error.c (err_snprintf): replace sprintf for fixed sized buffer,
+ with snprintf to avoid buffer over-run. For systems which does
+ dot provide snprintf, missing/snprintf.c added.
- * eval.c (rb_longjmp): ignore reentering error while warning.
- [ruby-dev:21730]
+Wed Aug 5 00:47:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 27 00:23:50 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * re.c (rb_reg_search): recycle match object.
- * ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when
- calling 'exit' in the Tk callback procedure. [ruby-list:38656]
+Mon Aug 3 09:17:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 25 09:18:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (rb_str_gsub_bang): do not allocate temporary string.
- * eval.c (rb_method_missing): protect exception from within
- "inspect". (ruby-bugs:PR#1204)
+ * string.c (rb_str_sub_bang): use inline replace.
-Fri Oct 24 23:26:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Jul 29 00:36:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * hash.c (rb_hash_each): Hash#each should yield single value.
- [ruby-talk:84420]
+ * hash.c (hash_s_new): the default value can be specified.
- * hash.c (env_each): ditto for ENV.each.
+ * hash.c (hash_default): method to set the default value.
-Thu Oct 23 20:25:32 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * hash.c (hash_aref): now returns the default value.
- * lib/webrick/server.rb (GenericServer#start): should rescue
- IOError from IO::accept. [ruby-dev:21692]
+Tue Jul 28 13:03:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 23 17:59:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (ary_s_new): argument to specify initial value is added.
- * eval.c (ruby_cleanup): initialize stack bottom for embedding.
- [ruby-dev:21686]
+ * array.c (ary_s_new): specifies size, not capacity.
- * ext/dl/extconf.rb: move list of files to clean from DEPEND file,
- to get rid of macro redefinitions.
+Mon Jul 27 12:39:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 23 13:44:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (str_replace): zero fill for expansion gap.
- * parse.y: integrate operations for stack_type. [ruby-dev:21681]
+ * regex.c (mbctab_euc): set flags on for 0xA1-0xFE. suggested by
+ <inaba@st.rim.or.jp>.
-Thu Oct 23 00:41:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * string.c (str_inspect): consider current_mbctype.
- * test/soap/calc/*, test/soap/helloworld/*: set logging threshold
- to ERROR.
+Sun Jul 26 15:37:11 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Wed Oct 22 12:53:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (ary_s_new): Array.new(1<<30) dumps core.
- * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
- ignore tests which raised LoadError.
+Fri Jul 24 13:40:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/drb/drbtest.rb, test/ruby/test_beginendblock.rb,
- test/ruby/test_system.rb: avoid requiring same file twice.
+ * version 1.1c1 released.
- * 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.
+Fri Jul 24 02:10:22 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 22 02:31:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * marshal.c (r_bytes2): allocated buffer size was too short.
- * eval.c (ruby_cleanup): should not ignore exit_value in END
- execution. [ruby-dev:21670]
+ * marshal.c (w_object): saves all options, not only casefold flag.
-Tue Oct 21 23:16:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * re.c (reg_clone): now copies options properly.
- * eval.c (ruby_cleanup): call finalizers and exit procs before
- terminating threads.
+ * re.c (reg_get_kcode): code number was wrong.
- * eval.c (ruby_cleanup): preserve ruby_errinfo before ruby_finalize_0().
+Thu Jul 23 13:11:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Oct 21 15:57:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_attr): argument should be symbol or string.
- * lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
- prepend the directory of target file to the load path.
+Wed Jul 22 11:59:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Oct 21 15:08:53 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regex.c (calculate_must_string): wrong offset added.
- * win32/win32.c (do_spawn, do_aspawn): should wait child process even
- if callded with P_OVERLAY.
+Wed Jul 22 11:59:59 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * win32/win32.c (do_spawn, do_aspawn): should return child's exit
- status to parent.
+ * st.c (rehash): still had a GC problem. fixed.
-Tue Oct 21 00:35:02 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Tue Jul 21 13:19:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/soap/calc/*, test/soap/helloworld/*: catch the exception from
- test server thread and recover.
+ * eval.c (gc_mark_threads): crashed on GC before thread allocation.
-Tue Oct 21 00:22:57 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * st.c (rehash): GC during rehash caused SEGV.
- * test/drb/*: import drb/runit.
+Tue Jul 21 01:25:10 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 20 23:55:47 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * sprintf.c (f_sprintf): integer formatter totally re-written.
- * eval.c (rb_eval): set current node after arguments evaluation.
- [ruby-dev:21632]
+ * sprintf.c (remove_sign_bits): support uppercase hexadecimal.
- * eval.c (rb_yield_0): set current node and keep it at local jump.
+Sat Jul 18 00:14:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 20 22:01:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * sprintf.c (f_sprintf): proper sign position for %X and %O.
- * eval.c (rb_thread_cleanup): keep thread group for main thread.
- [ruby-dev:21644]
+Fri Jul 17 14:10:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 20 18:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * version 1.1c0 released.
- * eval.c (rb_catch): backout.
+Fri Jul 17 08:01:49 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Mon Oct 20 17:31:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * process.c (f_exec): Check_SafeStr() added.
- * eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
- destination.
+ * process.c (f_system): Check_SafeStr() moved before fork().
- * eval.c (localjump_destination): use unique number in ruby_frame
- for localjump destination.
+Thu Jul 16 22:58:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 20 11:31:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (scan_once): substrings to the block should not be
+ tainted. use reg_nth_match(), not str_substr().
- * test/ruby/test_signal.rb (test_signal): restore old trap.
+ * string.c (str_substr): needed to transfer taint.
-Mon Oct 20 11:00:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Jul 16 16:15:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * gc.c (gc_sweep): loosen page free condition to avoid add_heap()
- race condition. [ruby-dev:21633]
+ * gc.c (xmalloc): object allocation count added to GC trigger.
- * gc.c (gc_sweep): do not update malloc_limit when malloc_increase
- is smaller than malloc_limit.
+ * eval.c (thread_save_context): avoid marking uninitialized stack
+ in thread_mark. GC may be triggered by REALLOC_N().
-Mon Oct 20 09:45:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jul 15 15:11:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/debug.rb (debug_command): remove debug print.
+ * experimental release 1.1b9_31.
-Wed Oct 20 00:25:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Jul 15 15:05:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (search_required): required name must not be changed before
- loading. [ruby-dev:24492]
+ * eval.c (thread_create): exit() and abort() in threads now
+ forwarded to main_thread.
-Sun Oct 19 13:12:30 2003 Tanaka Akira <akr@m17n.org>
+Tue Jul 14 14:03:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
+ * variable.c (obj_instance_variables): list names that is not
+ instance variables.
-Sun Oct 19 00:14:22 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * gc.c (GC_MALLOC_LIMIT): choose smaller limit value.
- * test/soap/calc/*, test/soap/helloworkd/*: changed port# of test
- server. (17171)
+Mon Jul 13 12:39:38 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 18 23:01:32 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * object.c (str2cstr): should not return NULL.
- * missing/acosh.c (DBL_MANT_DIG): typo fix(ifdef -> ifndef).
+Fri Jul 10 11:51:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 18 05:48:59 2003 why the lucky stiff <why@ruby-lang.org>
+ * parse.y (gettable): needed to add dyna_in_block() check.
- * ext/syck/rubyext.c: YAML::Syck::compile method.
+Thu Jul 9 17:38:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/syck.c: Buffer edge bug.
+ * experimental release 1.1b9_30.
- * ext/syck/yaml2byte.c: YAML to bytecode converter.
+Thu Jul 9 16:01:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/yamlbyte.h: Ditto.
+ * sprintf.c (fmt_setup): format specifier for long needed.
- * ext/syck/bytecode.c: Bytecode parser fixes to empty collections
- and empty strings.
+ * sprintf.c (f_sprintf): ditto.
- * ext/syck/token.c: Ditto.
+ * numeric.c (fix2str): ditto.
-Fri Oct 17 23:07:38 2003 Akinori MUSHA <knu@iDaemons.org>
+ * eval.c (thread_create): no more ITIMER_REAL.
- * 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.
+ * eval.c (thread_create): thread finalization needed before
+ aborting thread if thread_abort is set.
-Fri Oct 17 23:00:30 2003 Akinori MUSHA <knu@iDaemons.org>
+Wed Jul 8 18:17:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/generator.rb: Add rdoc documentation.
+ * bignum.c (big_pow): abandon power by bignum (too big).
-Fri Oct 17 22:16:42 2003 Akinori MUSHA <knu@iDaemons.org>
+Tue Jul 7 13:58:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/set.rb: Reword and fix Overview.
+ * eval.c (rb_catch): add C level catch/throw feature.
- * lib/set.rb: It is not necessary to require
- 'test/unit/ui/console/testrunner'.
+Mon Jul 6 15:18:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Oct 17 11:15:22 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * parse.y (arg): proper return values for `||=' and `&&='.
- * test/ruby/test_range.rb: added.
+Fri Jul 3 16:05:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * MANIFEST: add test/ruby/test_range.rb.
+ * experimental release 1.1b9_29.
-Fri Oct 17 03:21:23 2003 William Sobel <will.sobel@barra.com>
+Fri Jul 3 11:20:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/socket/socket.c (make_hostent): h_aliases may be NULL.
- (ruby-bugs:PR#1195)
+ * marshal.c (r_byte): byte should not extend sign bit.
- * ext/socket/socket.c (sock_s_gethostbyaddr): ditto.
+ * numeric.c (fix_mul): use FIX2LONG() instead of FIX2INT() for
+ 64bit architectures.
-Fri Oct 17 00:12:41 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * marshal.c (r_bytes): remove weird casting between pointer and int.
- * ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
- without initializing on TkComposite module.
+ * process.c (proc_setsid): new method Process#setsid().
-Thu Oct 16 23:51:04 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+Thu Jul 2 12:49:21 1998 Yukihiro Matsumoto <matz@netlab.co.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.
+ * marshal.c (w_object): remove `write_bignum' label for 64bit
+ architectures.
-Thu Oct 16 17:09:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * marshal.c (r_bytes): needs int, not long.
- * lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
- debug_silent_eval() when $1 is not set. (ruby-bugs:PR#1194)
+Wed Jul 1 14:21:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 16 16:54:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c (flo_plus): should not allow addition with strings.
- * string.c (rb_str_upto): ("a"..."a").to_a should return [].
- [ruby-core:01634]
+Wed Jul 1 13:09:01 1998 Keiju ISHITSUKA <keiju@rational.com>
-Thu Oct 16 16:40:51 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * numeric.c (num_uminus): wrong coerce direction.
- * ext/tk/lib/tk.rb:
- Add Tk::EncodedString and Tk::UTF8_String class to support
- characters using the \uXXXX escape to the UNICODE string.
+Tue Jun 30 10:13:44 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/sample/{demos-en,demos-jp}/unicodeout.rb
- new demo-scripts (samples of Tk::UTF8_String)
+ * io.c (f_p): accepts arbitrary number of arguments.
- * ext/tk/sample/{demos-en,demos-jp}/widget
- add entries for 'unicodeout.rb'
+ * eval.c (rb_yield_0): there's some case that iterator_p() returns
+ true even if the_block was not set. check added.
-Thu Oct 16 08:38:06 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 30 01:05:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/digest/test_digest.rb (test_eq): show failed class.
+ * eval.c (BEGIN_CALLARGS): adjust the_block before evaluating the
+ receiver's value and the arguments.
- * test/ruby/test_iterator.rb (test_break, test_return_trace_func):
- test localjump destination.
+Fri Jun 26 18:02:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 15 20:22:31 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * experimental release 1.1b9_28.
- * lib/soap/netHttpClient.rb: use URI::HTTP#request_uri instead of
- instance_eval('path_query'). [ruby-list:38575]
+Fri Jun 26 11:01:26 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Oct 15 17:24:45 2003 URABE Shyouhei <root@mput.dip.jp>
+ * string.c (str_aset_method): needed to convert to string.
- * lib/cgi.rb (CGI::Cookie): tiny typo fix.
+Thu Jun 25 02:05:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 15 15:00:54 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_search): optimize for `.*' at beginning of the
+ pattern.
- * eval.c (ruby_run): just return FAILURE instead of parse error
- count. [ruby-list:38569]
+ * regex.c (re_search): optimize for character class repeat at
+ beginning of the pattern.
-Wed Oct 15 13:17:02 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * regex.c (re_compile_pattern): detect optimization potential for
+ the compiled patterns.
- * ext/digest/digest.c (rb_digest_base_alloc): need to initialize
- buffer. [ruby-dev:21622]
+Thu Jun 25 00:02:26 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Oct 15 11:23:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * re.c (reg_s_new): flag value was wrong.
- * marshal.c (w_object): dump extended modules as well.
+Wed Jun 24 23:45:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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>.
+ * regex.c (re_search): wrong anchor handling for reverse search.
-Wed Oct 15 09:30:34 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+Wed Jun 24 02:18:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
+ * parse.y (mlhs): `((a,b)),c = [[1,2]],3' assigns a=1,b=2,c=3.
- * ext/syck/syck.h: include stdio.h for definition of FILE.
+Tue Jun 23 11:46:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 15 08:09:07 2003 why the lucky stiff <why@ruby-lang.org>
+ * parse.y (yylex): `&&=' and `||=' added.
- * ext/syck/bytecode.c: Checkin of YAML bytecode support.
+Sat Jun 20 02:53:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/gram.c: Ditto.
+ * parse.y (assignable): nesting local variables should have higher
+ priority than normal local variables for assignment too.
- * ext/syck/syck.c: Ditto.
+Fri Jun 19 18:28:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/token.c: Ditto.
+ * experimental release 1.1b9_27.
- * ext/syck/handler.c: Ditto.
+Fri Jun 19 14:34:49 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/handler.c: Now using 'tag' rather than 'taguri' in type URIs.
+ * eval.c (assign): support hack for nested multiple assignment.
- * ext/syck/rubyext.c: Ditto (on both counts).
+ * parse.y (mlhs): nested multiple assignment.
-Wed Oct 15 05:05:53 2003 Akinori MUSHA <knu@iDaemons.org>
+ * eval.c (rb_eval): in-block variables now honors static scope.
- * lib/generator.rb: A new library which converts an internal
- iterator to an external iterator.
+ * configure.in: RSHIFT check moved to configure.
- * lib/abbrev.rb: A new library which creates an abbreviation table
- from a list.
+Thu Jun 18 16:46:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 15 04:31:51 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * experimental release 1.1b9_26.
- * ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
- new demo-scripts
+Thu Jun 18 13:37:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
- add entries for 'entry3.rb'
+ * file.c (file_s_ftype): uses lstat(2) instead of stat(2).
-Wed Oct 15 04:31:47 2003 Akinori MUSHA <knu@iDaemons.org>
+ * dir.c (dir_s_glob): there can be buffer overrun, check added.
- * test/digest/test_digest.rb: Moved from ext/digest/test.rb.
+ * eval.c (f_binding): handles in-block variables declared after
+ binding's generation.
-Wed Oct 15 03:53:20 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * numeric.c (flo_floor): floor, ceil, round added to Float.
- * ext/tk/lib/tk.rb: fixed trouble on auto-load Tcl commands (enbug
- on the last commit).
+Wed Jun 17 11:20:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 15 00:25:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (gettable): nesting local variables should have higher
+ priority than normal local variables.
- * parse.y (yylex): argument parentheses preceded by spaces should
- be warned; not error. [ruby-talk:84103]
+Tue Jun 16 12:30:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 15 00:20:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * bignum.c (str2inum): handles `+ddd'.
- * ext/tcltklib/tcltklib.c: replace Tcl/Tk's vwait and tkwait to
- switch on threads smoothly and avoid seg-fault.
+ * struct.c (make_struct): name parameter can be nil for unnamed
+ structures.
- * 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.)
+Mon Jun 15 16:30:10 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/multi-tk.rb: support TclTkIp._thread_vwait and
- _thread_tkwait.
+ * object.c (class_s_inherited): prohibiting to make subclass of
+ class Class.
- * 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).
+ * object.c (module_s_new): support for making subclass of Module.
- * 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.
+ * parse.y (yycompile): clear eval_tree before compiling.
- * ext/tk/lib/tk.rb: improve of accessing Tcl/Tk's special variables.
+Fri Jun 12 17:58:18 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tkafter.rb: support 'wait on a thread' and 'wait on
- an eventloop'.
+ * eval.c (eval): write back the_dyna_var into the block.
-Wed Oct 15 00:10:24 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Thu Jun 11 18:19:18 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/soap/baseData.rb: Introduce SOAPType as the common ancestor of
- SOAPBasetype and SOAPCompoundtype.
+ * experimental release 1.1b9_25.
- * lib/soap/generator.rb, lib/soap/element.rb, lib/soap/encodingstyle/*:
- Encoding methods signature change. Pass SOAPGenerator as a parameter.
+ * eval.c (dvar_add_compiling): register dyna_var at compile time.
- * 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. :-)
+ * regex.c (re_compile_pattern): RE_DUP_MAX iteration is too big.
- * lib/soap/rpc/standaloneServer.rb: Set severity threshould to INFO.
- DEBUG is too noisy.
+Wed Jun 10 15:12:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/xsd/datatypes.rb: DateTime#of is obsoleted. Use DateTime#offset.
+ * io.c (io_eof): do not block other threads.
- * test/wsdl/emptycomplextype.wsdl, test/xsd/xmlschema.xml: Avoid
- useless warning.
+ * signal.c (trap): reserve SIGALRM for thread.
-Tue Oct 14 19:09:35 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (thread_create): use ITIMER_REAL also to avoid system
+ call blocking.
- * eval.c (ruby_finalize_0): return the given exit status unless
- SystemExit got raised.
+ * io.c (f_syscall): add TRAP_BEG, TRAP_END around system calls.
-Tue Oct 14 11:53:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (io_ctl): add TRAP_BEG, TRAP_END around system calls.
- * intern.h (ruby_stop): never return.
+ * enum.c (enum_collect): did not collect false values.
- * ruby.h (ruby_run): ditto.
+ * array.c (ary_new2): forgot to initialize capa field.
-Tue Oct 14 04:43:55 2003 Tanaka Akira <akr@m17n.org>
+Tue Jun 9 18:36:15 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * lib/pathname.rb (realpath): make ELOOP check bit more robust.
- (children): prepend self by default.
- (chroot): obsoleted.
+ * string.c (str_split_method): split dumped core for "\xff".
-Tue Oct 14 02:29:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 9 16:22:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_require_safe): segfault after loading .so.
+ * experimental release 1.1b9_24.
-Tue Oct 14 02:05:23 2003 Akinori MUSHA <knu@iDaemons.org>
+Tue Jun 9 16:04:07 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/Setup*, ext/enumerator/*: Add ext/enumerator, a helper
- module for the Enumerable interface.
+ * ext/kconv/kconv.c (kconv_guess): more precise decision for EUC,
+ using jless algorithm (3 sequential EUC hiragana characters).
-Mon Oct 13 23:55:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Tue Jun 9 15:12:44 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
- not "ruby".
+ * ext/kconv/kconv.c (kconv_guess): wrong guess for EUC as SJIS in
+ some cases (0xe0 - 0xef).
-Mon Oct 13 23:57:29 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * gc.c (xmalloc): insert size check for big (negative in signed)
+ allocation size.
- * eval.c (rb_feature_p): match by classified suffix.
+Tue Jun 9 02:54:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_require_safe): require library in the specified safe
- level.
+ * lib/parsedate.rb: wday moved to the last in the return values.
- * variable.c (rb_autoload, rb_autoload_load): restore safe level
- when autoload was called. [ruby-dev:21338]
+Mon Jun 8 10:40:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * intern.h: prototypes; rb_require_safe.
+ * string.c (str_split_method): split dumped core for "\0".
- * test/runner.rb: accept non-option arguments.
+Sat Jun 6 22:50:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 13 20:49:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (calculate_must_string): wrong condition for
+ {start,stop}_nowidth.
- * string.c (str_new4): should not preserve FL_TAINT status in the
- internal shared string. [ruby-dev:21601]
+ * regex.c (re_match): various features imported from GNU regex.c
+ 0.12, such as nested grouping, avoiding infinite loop with empty
+ match, etc.
- * string.c (rb_str_new4): ditto.
+ * regex.c (register_info_type): now use union.
- * eval.c: use EXIT_SUCCESS and EXIT_FAILURE for exit values.
+ * regex.c (re_search): more precise anchor(^) check.
- * process.c: ditto. [ruby-list:38521]
+Wed Jun 3 18:07:54 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 13 19:51:02 2003 Koji Arai <jca02266@nifty.ne.jp>
+ * re.c (reg_raise): check rb_in_compile, not rb_in_eval.
- * lib/debug.rb (debug_command): should enter emacs mode when
- assigned any value to the environment variable "EMACS".
- On Meadow, (getenv "EMACS") is "meadow".
+Mon Jun 1 05:26:06 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
-Sun Oct 12 14:45:03 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * string.c (trnext): casting to signed char* needed.
- * ext/win32ole/extconf.rb: check "windows.h", not "windows".
- [ruby-talk:84051]
+Tue Jun 2 16:00:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 11 20:41:03 2003 Corinna Vinschen <corinna@vinschen.de>
+ * ext/socket/socket.c (udp_addrsetup): error check enhanced.
- * file.c (eaccess): Use access(2) on Cygwin.
+ * ext/socket/socket.c (sock_s_getservbyaname): use strtoul(), if
+ possible.
-Sat Oct 11 17:09:21 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Sat May 30 07:10:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/rexml/quickpath.rb (REXML::QuickPath::match):
- escape '[' to avoid warning.
+ * re.c (reg_prepare_re): no more needless regular expression
+ recompile on casefold conditions.
-Sat Oct 11 16:08:41 2003 Tanaka Akira <akr@m17n.org>
+Thu May 28 18:02:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/pathname.rb (realpath): check existence of the file.
+ * object.c (nil_plus): no more `+' method for nil.
- * lib/pathname.rb (realpath): re-implemented.
- (realpath_root?, realpath_rec): removed
+Wed May 27 17:33:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 11 10:19:39 2003 Shugo Maeda <shugo@ruby-lang.org>
+ * hash.c (hash_fetch): new method.
- * lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
- Bystritsky.
+ * regex.c (re_search): check whether translate table is set.
-Fri Oct 10 07:50:54 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue May 26 11:39:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (is_defined): inheritance line adjustment as like as
- rb_call_super().
+ * experimental release 1.1b9_23.
-Fri Oct 10 01:19:00 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * parse.y (yylex): no UPLUS/UMINUS for 1st argument if
+ parenthesises are omitted.
- * 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.
+Tue May 26 01:09:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
+ * regex.c (re_compile_pattern): (?XI) for turns off the
+ corresponding option.
-Thu Oct 9 23:50:21 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon May 25 12:38:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_thread_start_0): prevent thread from GC.
- [ruby-dev:21572]
+ * regex.c (re_compile_pattern): inline i option (?i).
-Thu Oct 9 19:11:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_compile_pattern): inline x option (?x).
- * eval.c (rb_thread_start_0): non-volatile should be restored from
- volatile.
+ * regex.c (re_compile_pattern): x option for regexp.
-Thu Oct 9 17:43:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * dir.c (dir_s_open): returns block's evaluated value.
- * eval.c (proc_save_safe_level, proc_get_safe_level,
- proc_set_safe_level): save/restore safe level 1..4.
+ * io.c (f_open): returns block's evaluated value.
-Thu Oct 9 16:33:23 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/curses/curses.c (curses_addstr): nil argument caused SEGV.
- * marshal.c (r_object0): remove unnecessary iv restoration for
- USRMARSHAL. [ruby-dev:21582]
+Fri May 22 11:52:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * marshal.c (w_object): dump generic instance variables from
- a string from '_dump'.
+ * regex.c (re_compile_pattern): push mark on (?:), so that
+ laststart check for {a,b} can be done.
- * variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
- is not set.
+Thu May 21 17:31:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * time.c (time_dump): copy instance variables to dumped string, to
- be included in the marshaled data.
+ * regex.c (re_match): wrong match (too non-greedy) for `{a,b}?'.
- * bignum.c (rb_big2ulong): add range check to ensure round trip.
+ * io.c (io_lineno): new method IO#lineno, IO#lineno=.
-Thu Oct 9 15:45:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed May 20 06:04:43 1998 MAEDA shugo <shugo@aianet.ne.jp>
- * pack.c (uv_to_utf8): change message to "out of range", since
- negative values are not "too big". [ruby-dev:21567]
+ * BeOS patch.
-Thu Oct 9 14:05:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed May 20 16:32:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
- [ruby-dev:21557]
+ * bignum.c (BIGDN): use RSHIFT(), instead of mere `>>'.
-Thu Oct 9 10:51:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue May 19 16:36:26 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_yield_0): no error if block is empty.
+ * experimental release 1.1b9_22.
-Thu Oct 9 06:43:33 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue May 19 16:31:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (localjump_error): id should be ID.
+ * parse.y (assignable): specification changed for in-block
+ variable definition.
- * eval.c (rb_eval): nd_rval is set in copy_node_scope().
+ * eval.c (dyna_var_asgn): error in in-block variables' compile
+ time definition.
- * eval.c (rb_yield_0): unused variable.
+ * parse.y (str_extend): wrong nesting detection.
- * eval.c (rb_yield_0): nothing to do for empty node.
+Tue May 19 09:47:55 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * eval.c (call_end_proc, proc_invoke): adjust backtrace in END.
- [ruby-dev:21551]
+ * numeric.c (num2int): re-defined (extensions may use this).
- * eval.c (rb_thread_start_0): set the value by break as the result.
- [ruby-dev:21552]
+Mon May 18 16:40:50 1998 MAEDA shugo <shugo@aianet.ne.jp>
- * eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
- variables across THREAD_SAVE_CONTEXT.
+ * error.c (get_syserr): BeOS support.
-Thu Oct 9 12:05:46 2003 Eric Sunshine <sunshine@sunshineco.com>
+ * configure.in: modified for BeOS.
- * 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.
+ * string.c (str_dump): do not call isascii().
- * 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.
+ * sprintf.c (remove_sign_bits): forgot to initialize end pointer.
- * 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.
+ * glob.c: #include <alloca.h> added.
- * 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.
+Mon May 18 14:52:21 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * experimental release 1.1b9_21.
- * main.c: also create hard reference to objc_msgSend() on NeXT
- platforms (in addition to Apple platforms).
+Mon May 18 03:27:57 1998 MAEDA shugo <shugo@aianet.ne.jp>
- * 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').
+ * file.c (file_s_expand_path): optional second argument
+ `default_directory' added.
- * 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()
+Sat May 16 22:06:52 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * 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.
+ * error.c (RAISE_ERROR): wrong error message
- * 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.
+Fri May 15 14:43:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
- platforms such as NextStep and OpenStep which lack strdup().
+ * experimental release 1.1b9_20.
- * 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.
+Thu May 14 14:44:21 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * 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.
+ * sun4 cc patches for intern.h and regex.h.
- * ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
- platforms such as NextStep and OpenStep which lack strdup().
+Thu May 14 14:03:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 8 22:19:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * random.c (RANDOM_MAX): guessing proper maximum value for random
+ numbers.
- * lib/test/unit.rb: removed installation instructions.
+ * random.c (f_rand): use drand48 if possible.
- * lib/test/unit/ui/testrunnermediator.rb: moved the run flag to a more
- central location.
+Wed May 13 19:05:20 1998 MAEDA shugo <shugo@aianet.ne.jp>
- * lib/test/unit.rb: ditto.
+ * BeOS patches for io.c, error.c and config.guess.
- * lib/test/unit.rb: extracted the running code in to AutoRunner.
+Wed May 13 14:56:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/test/unit/autorunner.rb: added.
+ * experimental release 1.1b9_19.
- * lib/test/unit/collector/objectspace.rb: extracted common test
- collection functionality in to a module.
+ * most of the Mac and BeOS patches merged, except path separators.
- * lib/test/unit/collector.rb: ditto; added.
+ * error.c (err_append): generated SyntaxError was String.
- * test/testunit/collector/test_objectspace.rb: ditto.
+ * ruby.h: xxx2INT, xxx2UINT checks values as int, not long.
- * lib/test/unit/collector/dir.rb: added. Supports collecting tests out
- of a directory structure.
+ * ruby.h: remove typedef's. INT, UINT, UCHAR, USHORT.
- * test/testunit/collector/test_dir.rb: added.
+Tue May 12 17:38:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/runner.rb: simplified to use the new capabilities.
+ * experimental release 1.1b9_18.
-Tue Oct 7 15:23:09 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Tue May 12 11:38:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/ruby/test_beginendblock.rb: add tests for nested BEGIN/END.
+ * error.c (syserr_errno): returns errno of the SystemCallError.
- * test/ruby/beginmainend.rb: add tests for nested BEGIN/END.
+ * error.c (rb_sys_fail): saves errno in the Exception.
- * test/ruby/endblockwarn.rb: new file added to test of END-in-method
- warning.
+ * error.c (set_syserr): no need to protect syserr_list.
-Tue Oct 7 12:23:47 2003 Tanaka Akira <akr@m17n.org>
+ * error.c (rb_sys_fail): no more bufsize limit.
- * ext/fcntl/fcntl.c (Init_fcntl): define Fcntl::O_ACCMODE.
+ * error.c (set_syserr): integer value of errno can be accessed by
+ Errno::EXXX::Errno.
- * ext/socket/extconf.rb: useless assignment removed.
+Sun May 10 03:10:33 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
-Tue Oct 7 09:13:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (io_tell etc.): moved from File class to IO class.
- * test/ruby/test_beginendblock.rb (test_endinmethod): END{} is now
- allowed in eval.
+Fri May 8 12:26:37 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Oct 7 04:15:25 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * pack.c (pack_unpack): should be unsigned int (was signed int).
- * parse.y (stmt): should not expand mrhs if lhs is solely starred.
+Thu May 7 16:34:10 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Oct 7 02:57:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * pack.c (pack_pack): `V', `N' uses newly created NUM2UINT().
- * parse.y (stmt): rhs of multiple assignment should not be
- expanded using "to_a". [ruby-dev:21527]
+ * ruby.h (NUM2UINT): new macro.
-Tue Oct 7 01:42:34 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * bignum.c (big2uint): try to convert bignum into UINT.
- * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): use appropriate
- free function for ASN1_OBJECT.
+ * re.c (reg_match): needed to return false for match with nil.
- * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_sn): add new function for
- ASN1::ObjectId#sn; it returns short name text representation of OID.
+ * gc.c (obj_free): wrong condition to free string.
- * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_ln): add new function for
- ASN1::ObjectId#ln; it returns long name text representation of OID.
+Wed May 6 21:08:08 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/ossl_asn1.c (ossl_asn1obj_get_oid): add new function for
- ASN1::ObjectId#oid; it returns numerical representation of OID.
+ * ruby.c (ruby_process_options): modified for DJGPP.
-Mon Oct 6 22:59:46 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Wed May 6 15:48:03 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * experimental release 1.1b9_17.
- * test/csv/test_csv.rb: add tests for above change.
+Wed May 6 01:37:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Oct 5 23:27:09 2003 Tanaka Akira <akr@m17n.org>
+ * eval.c: remove global variable `errat'.
- * ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
+ * eval.c (rb_longjmp): embed error position information in the
+ exception object.
- * ext/socket/socket.c (thread_read_select): restored.
+Sat May 2 12:20:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 6 16:23:38 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (reg_search): supports reverse search.
- * marshal.c (w_object): wrong method name in the message.
+ * string.c (str_index_method): does update $~ etc.
-Mon Oct 6 16:02:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (f_load): needed to clear the_dyna_vars.
- * parse.y (stmt): END in method should cause warning.
- [ruby-dev:21519]
+ * eval.c (dyna_var_asgn): do not push dyna_var, which is id == 0.
-Mon Oct 6 15:17:23 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * error.c (Init_Exception): NotImplementError is no longer
+ StandardError, which is not handled by default rescue.
- * test/ruby/test_iterator.rb (test_block_argument_without_paren):
- added. (follows sample/test.rb)
+Fri May 1 00:35:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Oct 6 11:57:06 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ruby.c (proc_options): `-d' turns on verbose flag too.
- * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
- test for eval-ed BEGIN END order.
+ * error.c (exception): last argument may be the superclass of the
+ defining exception(s).
-Mon Oct 6 09:19:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (Init_IO): EOFError is now subclass of the IOError.
- * marshal.c (w_object): should pass "weak" value to next level.
- [ruby-dev:21496]
+ * io.c (Init_IO): forgot to define IOError.
- * eval.c (proc_alloc): should not use cached object if klass is
- different. [ruby-talk:83685]
+ * error.c (Init_Exception): old Exception class renamed to
+ StandardError. Exception now replaces old GlobalExit.
-Sun Oct 5 23:27:09 2003 Tanaka Akira <akr@m17n.org>
+ * error.c (Init_Exception): Exception is now the root of the
+ Global Exits. There's no longer GlobalExit class.
- * lib/pathname.rb: version information is added in document.
+ * util.c (ruby_mktemp): check TMP, TMPDIR first.
-Sun Oct 5 23:07:03 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Apr 30 01:08:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_f_END): block should be given. [ruby-dev:21497]
+ * lib/tk.rb: call 'unknown', if proc not defined.
-Sun Oct 5 22:51:23 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (handle_rescue): default rescue handles `Exceptional' not
+ only the instance of the `Exception's.
- * lib/ext/openssl/extconf.rb: add check for some engine functions
- unavailable in OpenSSL-0.9.6.
+ * eval.c (f_raise): exception can be any object.
- * lib/ext/openssl/ossl_engine.c: ditto.
+ * time.c (time_gm_or_local): call time_gmtime or time_localtime.
-Sun Oct 5 17:56:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (f_raise): raises TypeError if the class which is not a
+ subclass of String is specified (checked in exc_new()).
- * eval.c (rb_eval): fix evaluation order. [ruby-list:38431]
+ * error.c (exc_new): need to check whether invalid class (not a
+ subclass of String) is specified.
-Sun Oct 5 15:05:06 2003 akira yamada <akira@ruby-lang.org>
+Wed Apr 29 21:05:44 1998 WATANABE Hirofumi <eban@os.rim.or.jp>
- * test/uri/*: translated RUNIT to Test::Unit.
+ * ruby.c (proc_options): option '-e' via tempfile.
-Sun Oct 5 14:37:39 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Tue Apr 28 15:27:58 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/xsd/datatypes.rb: Rational -> Decimal string bug fix.
+ * experimental release 1.1b9_16.
- * test/soap/marshal/test_marshal.rb: ditto.
+Tue Apr 28 00:07:38 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEEXT"] to
- RUBYBIN.
+ * eval.c (obj_is_proc): type check predicate.
-Sun Oct 5 13:47:22 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * eval.c (obj_is_block): ditto.
- * test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests
- about scope, order and allowed syntax.
+Mon Apr 27 16:59:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Oct 5 11:54:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ext/gtk/gtk.c (Init_gtk): use timeout, not idle to avoid
+ consuming CPU too much.
- * test/ruby/envutil.rb: added. split "rubybin" from test_system.rb.
+ * lib/tk.rb: use tcltklib#_invoke instead of `_eval'.
- * test/ruby/test_system.rb: use envutil.rb
+Mon Apr 27 16:59:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/ruby/test_beginendblock.rb: added.
+ * array.c (ary_sort): use dup, not clone.
- * test/ruby/beginmainend.rb: added. used in test_beginendblock.rb.
+Mon Apr 27 13:46:27 1998 Tadahiro Maebashi <maebashi@iij.ad.jp>
-Sun Oct 5 11:23:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * ext/tcltklib/tcltklib.c (ip_invoke): invoke tcl command
+ directly. need not worry about escaping tcl characters.
- * test/testunit/runit/test_testresult.rb: removed some unnecessary
- cruft.
+Mon Apr 27 12:04:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Oct 5 11:14:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * random.c (f_rand): do not call srand() implicitly.
- * lib/rubyunit.rb: aliasing TestCase into the top level is
- problematic.
+Fri Apr 24 14:35:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/runit/assert.rb: fixed a couple of bugs caused by recent
- refactoring in Test::Unit.
+ * experimental release 1.1b9_15.
- * test/testunit/runit/*: added.
+ * parse.y (assignable): dyna_var_asgn actually defines nested
+ local variables in outer context.
-Sun Oct 5 10:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * random.c (f_rand): call srand(), if it has not called yet.
- * lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
- work. [ruby-dev:21484]
+ * random.c (f_srand): use tv_usec as the default seed.
-Sun Oct 5 09:52:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * eval.c (rb_eval): values of nested local variables should be
+ independent.
- * lib/test/unit/assertions.rb: will use pp for output if available.
- Can be disabled by setting Assertions.use_pp = false.
+ * eval.c (rb_yield_0): local variables wrong nested conditions.
- * test/testunit/test_assertions.rb: made a small change to exception
- formatting.
+Wed Apr 22 23:27:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Oct 5 07:42:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * io.c (select_get_io): get IO object by `to_io'.
- * lib/test/unit/assertions.rb: made small improvements to assertion
- messages. Deprecated Assertions#assert_not_nil; use #assert instead.
+ * io.c (io_to_io): method to retrieve IO object, from delegating
+ object for example.
- * test/testunit/test_assertions.rb: ditto.
+Wed Apr 22 16:52:37 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/testunit/util/test_procwrapper.rb: use #assert instead of
- #assert_not_nil.
+ * experimental release 1.1b9_14.
-Sun Oct 5 04:10:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * string.c (str_modify): check for embedded pointer reference.
- * lib/test/unit/assertions.rb: refactored message building.
+ * gc.c (obj_free): ditto.
-Sun Oct 5 03:40:22 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * pack.c (pack_pack): p/P template to embed pointers.
- * ext/openssl/ossl_asn1.h: global symbols should be declared
- as external.
+Wed Apr 22 00:07:10 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Sun Oct 5 03:03:20 2003 akira yamada <akira@ruby-lang.org>
+ * array.c (ary_rindex): embarrassing typo.
- * test/ruby/test_exception.rb (test_else): added.
+Tue Apr 21 12:31:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Oct 5 02:12:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * experimental release 1.1b9_13.
- * lib/test/unit/assertions.rb: changed assertion messages to rely more
- heavily on #inspect. Added backtrace filtering for exceptions in
- assertion messages.
+ * configure.in (RUBY_LIB): supports --program-{prefix,suffix}.
- * test/testunit/test_assertions.rb: ditto.
+ * array.c (ary_rindex): new method.
-Sun Oct 5 02:12:00 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+ * io.c (io_binmode): should return self.
- * lib/drb/acl.rb, lib/drb/ssl.rb: added.
+Tue Apr 21 08:23:04 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * lib/drb/drb.rb: exit from a thread using 'break'.
+ * parse.y (here_document): calling parse_string with wrong
+ arguments.
-Sat Oct 4 21:49:14 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * struct.c (struct_aset): problem member assignment with name.
- * gc.c (Init_stack): the type of space is changed to unsigned int
- from double. [ruby-dev:21483]
+Mon Apr 20 14:47:49 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 4 17:52:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * experimental release 1.1b9_12.
- * 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")
+ * time.c (time_arg): args may be string (support for reduced
+ implicit type conversion).
- * lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
+ * lib/base64.rb: changed to use pack/unpack with `m' template.
- * test/runner.rb: give testsuite name.
+Mon Apr 20 06:23:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 4 15:16:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * variable.c (mod_remove_const): new method.
- * 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.
+Sat Apr 18 03:53:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * gc.c (Init_stack): cast "space" (doble value) into unsigned
- int. should run on PowerPC.
+ * hash.c (hash_each_with_index): removed. use Enumerable's
+ each_with_index instead.
- * eval.c (rb_eval): should not execute else part if any exception
- is caught. [ruby-dev:21482]
+ * class.c (rb_include_module): check for super modules, since
+ module's included modules may be changed.
- * parse.y (f_args): should allow unparenthesized block argument.
+Fri Apr 17 21:50:47 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * parse.y (f_rest_arg): should allow unparenthesized rest
- argument.
+ * marshal.c (r_long): r_byte() may return signed byte.
-Sat Oct 4 14:59:51 2003 Tanaka Akira <akr@m17n.org>
+Fri Apr 17 11:58:30 1998 NAGAI Hidetoshi <nagai@dumbo.ai.kyutech.ac.jp>
- * 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.
+ * ext/tcltklib/tcltklib.c (lib_mainloop): thread and interrupt check.
-Sat Oct 4 12:58:48 2003 akira yamada <akira@ruby-lang.org>
+Fri Apr 17 11:06:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/uri/* (6 files): added.
+ * eval.c (find_file): try to fopen() to check whether file exists.
-Sat Oct 4 12:44:45 2003 akira yamada <akira@ruby-lang.org>
+ * ruby.c (load_file): ditto.
- * lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
+ * struct.c (struct_aset): struct member can be set by member name.
-Sat Oct 4 07:33:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+Fri Apr 17 00:47:19 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * lib/test/unit/testsuite.rb: changed #<< to return self, and added
- #delete.
+ * ext/extmk.rb.in: added m68k-human support
- * test/testunit/test_testsuite.rb: ditto. Also slightly refactored
- #test_size.
+ * file.c (LOCK_SH): defines moved.
- * lib/test/unit/collector/objectspace.rb: collector now preserves the
- hierarchy of suites.
+ * array.c (ary_flatten_bang): simplified loop.
- * test/testunit/collector/test_objectspace.rb: ditto.
+Thu Apr 16 16:52:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Oct 4 04:48:49 2003 why the lucky stiff <why@ruby-lang.org>
+ * experimental release 1.1b9_11.
- * ext/syck/rubyext.c: default keys handled.
+ * lib/tk.rb: thread support (experimental - maybe slow).
- * ext/syck/syck.h: lowered default buffer size to 16k for increased
- performance.
+ * eval.c (rb_longjmp): trace event on exception in raising
+ context, just before raising exception.
- * test/yaml: checkin of basic unit tests.
+ * struct.c (struct_s_members): forgot to check singletons.
-Sat Oct 4 04:24:19 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * struct.c (struct_aref): members can be accessed by names too.
- * ext/openssl/extconf.rb: add check for X509V3_set_nconf.
+ * array.c (ary_flatten): new method.
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
- cannot implement if X509V3_set_nconf doesn't exist.
+ * eval.c (rb_longjmp): prints exception information with `-d'.
-Sat Oct 4 02:12:44 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * object.c (any_to_s): remove class name restriction.
- * lib/xsd/datatypes.rb: dump sign by itself. under the problematic
- platform, sprintf("%+.10g", -0.0) => +0. sigh.
+Thu Apr 16 01:38:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * sample/wsdl/amazon/*: update schema ver2 to ver3.
+ * file.c (thread_flock): do not block other threads.
-Sat Oct 4 01:33:46 2003 Tanaka Akira <akr@m17n.org>
+ * eval.c (thread_trap_eval): signals are now delivered to the
+ current thread again. In case that the current thread is dead,
+ signals are forwarded to the main thread.
- * lib/pathname.rb (initialize): duplicate and freeze argument.
- (to_s): return duplicated string.
- (children): new method.
- (each_line): new alias to foreachline.
+ * string.c (str_new4): need not to duplicate frozen strings.
-Fri Oct 3 16:13:19 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Apr 15 08:33:47 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * ext/openssl/ossl_asn1.c: add DER encoder and decoder.
+ * struct.c (struct_inspect): remove restriction for struct names.
- * ext/openssl/ossl_asn1.h: add OpenSSL::ASN1 module.
+Wed Apr 15 02:55:02 1998 Kazuya 'Sharl' Masuda <sharl@www.ufo.co.jp>
- * ext/openssl/ossl.c (Init_openssl): call Init_ossl_asn1.
+ * x68 patches to config.sub, ext/extmk.rb.in
- * ext/openssl/extconf.rb: check if X509_ATTRIBUTE has field "single".
+Wed Apr 15 01:22:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): accept
- DER encoded data argument.
+ * string.c (str_dup_frozen): do not duplicate frozen strings.
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
- DER encoded data in OpenSSL::ASN1 types.
+ * parse.y (yylex): allow nested parenthesises.
-Fri Oct 3 13:02:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * io.c (obj_displayln): prints newline after `display'ing the
+ receiver.
- * lib/test/unit.rb: refactored to use optparse.
+ * io.c (io_puts): avoid generating "\n" each time. use RS_default
+ instead.
- * lib/test/unit.rb: added support for selecting the output
- level from the command-line.
+ * io.c (f_p): ditto.
- * lib/test/unit.rb: added a command-line switch to stop processing
- the command-line, allowing arguments to be passed to tests.
+Tue Apr 14 22:18:17 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * lib/test/unit.rb: changed the method for specifying a runner or a
- filter from the command-line.
+ * struct.c (struct_aref): should not subtract negative index.
- * lib/test/unit/collector/objectspace.rb: fixed a bug causing all
- tests to be excluded when the filter was set to an empty array.
+Tue Apr 14 11:34:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/testunit/collector/test_objectspace.rb: ditto.
+ * experimental release 1.1b9_10.
-Fri Oct 3 08:14:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y: token names prefixed by `t'.
- * lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
- 'class ::Foo' syntax. [ruby-talk:83514]
+ * struct.c (struct_s_def): supports subclassing of Struct.
-Fri Oct 3 08:01:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * io.c (io_s_new): supports subclassing of IO.
- * lib/test/unit/assertions.rb: added a default message for #assert,
- #assert_block, and #flunk.
+Mon Apr 13 11:07:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/testunit/test_assertions.rb: ditto.
+ * eval.c (f_binding): need to restore method name.
- * lib/test/unit/failure.rb: failures now show a better trace of where
- they occurred.
+ * eval.c (rb_call0): raises SystemStackError, not Fatal.
- * test/testunit/test_failure.rb: ditto (added).
+ * io.c (obj_display): same as `print self'.
- * lib/test/unit/testcase.rb: ditto.
+ * io.c (f_p): can now be called in the method form.
- * test/testunit/test_testcase.rb: ditto.
+ * re.c (reg_regsub): needed to be mbchar aware.
- * lib/test/unit/util/backtracefilter.rb: added.
+Mon Apr 13 13:18:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/testunit/util/test_backtracefilter.rb: added.
+ * eval.c (thread_trap_eval): all signals delivered to main_thread.
- * lib/test/unit/error.rb: changed to use BacktraceFilter and improved
- output.
+Mon Apr 13 12:47:03 1998 TAKAHASHI Masayoshi <maki@inac.co.jp>
- * test/testunit/test_error.rb: ditto.
+ * re.c (kcode_set_option): did not set SJIS on SJIS condition.
-Thu Oct 2 20:33:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Apr 12 22:14:07 1998 Kazunori NISHI <kazunori@swlab.csce.kyushu-u.ac.jp>
- * ext/iconv/iconv.c (iconv_failure_initialize): conform with
- orthodox initialization method.
+ * array.c (ary_uniq_bang): should be `==', not `='. embarrassing.
- * ext/iconv/iconv.c (iconv_fail): initialize exception instance
- from the class, and do not share instance variables with the
- others. [ruby-dev:21470]
+Sat Apr 11 02:13:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 2 18:20:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (ary_subseq): SEGVed for `[][1,1]'.
- * time.c (Init_Time): define initialize. [ruby-dev:21469]
+Fri Apr 10 21:29:06 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-Thu Oct 2 17:39:38 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * array.c (ary_subseq): add check for beg larger than array length.
- * ext/openssl/ossl_engine.c: add a new module OpenSSL::Engine.
- it supports OpenSSL hardware cryptographic engine interface.
+Wed Apr 8 17:24:11 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
- * ext/openssl/ossl_engine.h: ditto.
+ * dir.c (dir_s_open): can be called with block (like IO#open).
- * ext/openssl/MANIFEST: add ossl_engine.c and ossl_engine.h.
+ * dir.c (dir_s_chdir): print directory path on error.
- * ext/openssl/extconf.rb: add check for openssl/engine.h.
+ * dir.c (dir_s_chroot): ditto
- * ext/openssl/ossl.c: call Init_ossl_engine().
+ * dir.c (Init_Dir): needed to override `new'.
- * ext/openssl/ossl.h: include openssl/engine.h.
+Thu Apr 9 18:24:58 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_pkey_{rsa,dsa,dh}.c: check if underlying
- EVP_PKEY referes engine.
+ * experimental release 1.1b9_09.
-Thu Oct 2 17:22:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (str_cmp): do not depend on sentinel at the end of the
+ strings.
- * time.c (time_load): restore instance variables (if any) before
- loading from marshaled data.
+ * string.c (str_chomp_bang): forgot to set the sentinel.
-Thu Oct 2 14:19:15 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Apr 8 00:59:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/iconv/iconv.c (iconv_fail): now yield erred substring, and
- set error object to $!.
+ * bignum.c (big2int): converted int may be too big to fit in
+ signed int.
- * ext/iconv/iconv.c (iconv_convert): error handler block should
- return appended part and the rest. if rest is nil, the
- conversion stops.
+ * parse.y (arg): `foo += 1' should not cause an error.
-Thu Oct 2 12:00:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * variable.c (rb_const_defined): returned false even if the
+ constant is defined at the top level.
- * variable.c (rb_const_defined_0): look up constants in Object as
- well. [ruby-dev:21458]
+ * eval.c (f_local_variables): dyna_var->id may be null. should
+ have checked before calling str_new2().
- * test/ruby/test_defined.rb (TestDefined::test_defined): test for
- constants.
+Tue Apr 7 01:15:15 1998 Kaneko Naoshi <wbs01621@mail.wbs.or.jp>
-Thu Oct 2 11:17:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * re.c (reg_regsub): need to check string boundary.
- * lib/test/unit/assertions.rb: should not capture an
- AssertionFailedError unless explicitly requested.
+Tue Apr 7 19:19:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/testunit/test_assertions.rb: ditto.
+ * string.c (str_cmp): returns either 1, 0, -1.
- * 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]
+ * array.c (ary_cmp): should check array length, too
- * lib/test/unit/testcase.rb: ditto.
+Tue Apr 7 18:50:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/test/unit/testsuite.rb: ditto.
+ * experimental release 1.1b9_08.
- * lib/test/unit/collector/objectspace.rb: ditto.
+Tue Apr 7 18:31:27 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Thu Oct 2 03:25:01 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * instruby.rb (mandir): dll installation for cygwin32
- * eval.c (rb_thread_raise): prototype; avoid VC++ warning.
+Tue Apr 7 01:16:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Oct 2 01:37:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * config.sub (maybe_os): TOWNS support?
- * time.c (time_mdump): new marshal dumper. _dump is still
- available for compatibility.
+ * config.guess: too strict check for libc versions on linuxes.
- * time.c (time_mload): new marshal loader.
+ * experimental release 1.1b9_07.
- * marshal.c (w_object): preserve instance variables for objects
- with marshal_dump.
+ * array.c (ary_cmp): compare each element using `<=>'.
- * marshal.c (r_object0): restore instance variables before calling
- marshal_load.
+ * hash.c (hash_each_with_index): yields [value, key] pair.
- * error.c (rb_warn_m): always return nil.
+ * class.c (class_protected_instance_methods): list protected
+ method names.
-Thu Oct 2 01:32:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * class.c (ins_methods_i): exclude protected methods.
- * eval.c (rb_f_block_given_p): real required condition is
- ruby_frame->prev->iter == ITER_CUR.
+ * eval.c (PUSH_BLOCK): dynamic variables can be accessed from
+ eval() with bindings.
- * eval.c (rb_block_given_p): ditto.
+Mon Apr 6 14:49:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (block_pass): update ruby_frame->iter only when previous
- value is ITER_NOT.
+ * eval.c (thread_yield): must return evaluated value.
-Thu Oct 2 01:02:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Fri Apr 3 13:07:29 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * variable.c (rb_const_defined_at): should exclude constants from
- Object when TYPE(klass) == T_MODULE *and* exclude is on.
- [ruby-dev:21458]
+ * eval.c (thread_schedule): context switch bypassed on wrong
+ conditions.
- * variable.c (rb_const_get_0): do not lookup constants from Object
- when TYPE(klass) == T_MODULE *and* exclude is on.
+ * variable.c (rb_name_class): set classname by id before String
+ class is initialized (1.0 behavior restored).
-Thu Oct 2 00:21:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Fri Apr 3 11:25:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/logger/test_logger.rb: unlinking file before close causes
- problem under win32 box.
+ * numeric.c (num2int): no implicit conversion from string.
- * 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.
+ * numeric.c (num2int): check whether `to_i' returns an Integer.
- * test/xsd/test_xsd.rb, test/soap/test_basetype.rb: follow above change.
+ * numeric.c (num_zero_p): new method.
- * test/soap/calc/*: give httpd config param "CGIInterpreter".
- "/usr/bin/env ruby" thing does not work under non-Unix boxes.
+ * numeric.c (num_nonzero_p): new method. returns the receiver if
+ it's not zero.
-Sat Oct 2 00:42:20 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (obj_instance_eval): the_class should be the object's
+ singleton class.
- * marshal.c (r_byte): retrieve pointer from string value for each
- time. [ruby-dev:24404]
+ * error.c (exc_s_new): message is converted into a string.
- * marshal.c (r_bytes0): ditto.
+Thu Apr 2 18:31:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * enum.c (sort_by_i): re-entrance check added. [ruby-dev:24399]
+ * eval.c (obj_call_init): every object call `initialize'.
- * io.c (io_read): should freeze all reading buffer.
- [ruby-dev:24400]
+Wed Apr 1 08:51:53 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * string.c (rb_str_sum): should use bignums when bits is greater
- than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
+ * parse.y (stmt): UNTIL_MOD should be for stmt, not only for expr.
- * eval.c (specific_eval): defer pointer retrieval to prevent
- unsafe sourcefile string modification. [ruby-dev:24382]
+Wed Apr 1 01:20:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * string.c (rb_str_sum): wrong cast caused wrong result.
- [ruby-dev:24385]
+ * object.c (true_and): boolean operators &, | and ^.
- * enum.c (enum_sort_by): hide temporary array from
- ObjectSpace.each_object. [ruby-dev:24386]
+Tue Mar 31 13:23:58 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * string.c (rb_str_sum): check was done with false pointer.
- [ruby-dev:24383]
+ * array.c (ary_compact_bang): returns nil, if it does not modify
+ the array like String's bang methods.
- * string.c (rb_str_sum): string may be altered. [ruby-dev:24381]
+ * array.c (ary_uniq_bang): new method to remove duplicate items.
-Thu Oct 2 00:25:21 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (bind_s_new): new method.
- * signal.c (ruby_signal_name): adjust to the prototype.
+ * numeric.c (num2int): raise exception if Fixnums too big to
+ convert into `int' in case that sizeof(int) < sizeof(INT).
- * process.c (pst_inspect): ditto.
+ * string.c (str_center): SEGV on negative width.
- * ext/etc/etc.c (etc_getgrent, Init_etc): typo.
+ * eval.c (eval): forgot to set sourcefile.
-Wed Oct 1 20:49:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 30 11:12:29 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * gc.c (heaps): manage slots and limits together. [ruby-dev:21453]
+ * file.c (f_test): raises exception for unknown command.
- * gc.c (add_heap): should not clear heaps slot even if realloc()
- failed.
+ * eval.c (Init_eval): `class_eval': alias to the module_eval.
-Wed Oct 1 20:36:49 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Mon Mar 30 18:50:42 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * MANIFEST: add wince/mkconfig_wce.rb.
+ * string.c (str_capitalize_bang): did not check string modification.
-Wed Oct 1 17:22:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (str_delete_bang): wrong conversion.
- * ext/etc/etc.c: add new functions: setpwent, getpwent, endpwent,
- setgrent, getgrent, endgrent.
+ * string.c (str_intern): typo in error message.
- * ext/socket/socket.c (sock_s_gethostbyname): do not reverse lookup.
+Mon Mar 30 01:44:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 1 17:01:30 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (obj_instance_eval): accepts block as evaluation body.
+ No compilation needed each time.
- * eval.c (rb_load): Object scope had priority over required file
- scope. [ruby-dev:21415]
+ * eval.c (mod_module_eval): ditto
-Wed Oct 1 14:09:53 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+ * file.c (file_s_umask): umask did not return old values, if no
+ argument given.
- * wince/mkconfig_wce.rb: sorry, forget to commit.
+Sun Mar 29 00:54:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Oct 1 10:08:42 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+ * eval.c (f_throw): nil returned always.
- * wince/setup.mak: add sigmarionIII SDK support.
+Sat Mar 28 20:40:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * wince/Makefile.sub: ditto.
+ * experimental release 1.1b9_06.
- * wince/mkexports.rb: fix linker error in SH4.
+Sat Mar 28 16:07:11 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
+ * io.c (io_closed): should not cause exception for closed IO.
-Wed Oct 1 08:02:52 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
+ * string.c (str_tr): returned nil for success.
- * wince/time_wce.c (time): add zero check.
+Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 30 16:11:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (f_local_variables): new method to return an array of
+ local variable names.
- * Makefile.in: copy lex.c from $(srcdir) if it's not the current
- directory. [ruby-dev:21437]
+ * variable.c (obj_instance_variables): now returns an array of
+ variable names, as described in the reference.
-Tue Sep 30 11:29:23 2003 Tanaka Akira <akr@m17n.org>
+ * eval.c (rb_attr): honors default method visibility of the
+ current scope.
- * process.c (pst_inspect): describe stopped process "stopped".
+Fri Mar 27 13:49:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 30 09:31:56 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * experimental release 1.1b9_05.
- * test/runner.rb: glob for directories.
+ * ruby.c (ruby_prog_init): `site_ruby' added to load_path.
-Tue Sep 30 09:11:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ruby.c (ruby_prog_init): load-path order changed. Paths in
+ the RUBYLIB environment variable comes first in non-tainted
+ mode.
- * eval.c (rb_eval): while/until should not capture break unless
- they are destination of the break.
+Thu Mar 26 11:51:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 30 03:12:02 2003 Minero Aoki <aamine@loveruby.net>
+ * eval.c (rb_call): new feature: `protected' methods.
- * lib/net/http.rb (finish): revert to 1.93.
+ * string.c (str_dump): new method.
- * lib/net/pop.rb (finish): revert to 1.60.
+ * eval.c (block_pass): block argument can be nil, which means no
+ block is supplied for the method.
- * lib/net/smtp.rb (finish): revert to 1.67.
+Wed Mar 25 21:20:13 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * lib/net/http.rb (do_start): ensure to close socket if failed to
- start session.
+ * string.c (str_reverse_bang): string copied to wrong place.
- * lib/net/pop.rb (do_start): ditto.
+Wed Mar 25 08:12:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/net/smtp.rb (do_start): ditto.
+ * numeric.c (flo_modulo): caused SEGV if left operand is not a
+ float value.
- * lib/net/smtp.rb: SMTP#started? wrongly returned false always.
+ * eval.c (f_eval): optional third and fourth argument to specify
+ file-name and line-number.
-Tue Sep 30 02:54:49 2003 Minero Aoki <aamine@loveruby.net>
+ * eval.c (eval): file-name and line-number set properly.
- * test/ruby/test_iterator.rb: new test
- test_break__nested_loop[123].
+ * parse.y (assign_in_cond): literal assignment is now warning, not
+ compile error.
-Mon Sep 29 23:39:13 2003 Minero Aoki <aamine@loveruby.net>
+ * error.c (Warn): Warn() always print message, OTOH Waring()
+ prints when verbose flag is set.
- * lib/net/http.rb (finish): does not raise IOError even if
- !started?, to allow closing socket which was opened before
- session started.
+Tue Mar 24 12:50:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/net/pop.rb (finish): ditto.
+ * ruby.c (ruby_prog_init): `.' should come last in the load-path.
- * lib/net/smtp.rb (finish): ditto.
+ * eval.c (Init_eval): `__send__', alias for `send'.
-Mon Sep 29 19:06:51 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Mon Mar 23 12:44:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/win32ole/extconf.rb: add windows.h checking.
- (ruby-bugs:PR#1185)
+ * string.c (str_chomp_bang): now takes `rs' as an argument.
-Mon Sep 29 16:18:30 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * eval.c (thread_free): main_thread should not be freed.
- * lib/logger.rb: check if the given logdevice object respond_to :write
- and :close, not is_a? IO. duck duck.
+Fri Mar 20 16:40:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/logger/test_logger.rb: self IO.pipe reading/writing may be
- locked by the flood. use tempfile.
+ * string.c (str_chomp_bang): chomp! (and other ! methods) returns
+ nil if it does not modify the string.
- * lib/wsdl/xmlSchema/data.rb: wrong constant reference.
+ * string.c (str_sub_iter_s): should check last pattern since it
+ may be matched to null.
-Mon Sep 29 16:11:23 2003 Minero Aoki <aamine@loveruby.net>
+Thu Mar 19 13:48:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/fileutils/test_fileutils.rb: clean up temporary symlink.
- Patched by NaHi. [ruby-dev:21420]
+ * experimental release 1.1b9_04.
-Mon Sep 29 11:16:55 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (yylex): `10e0.9' should cause syntax error.
- * eval.c (rb_thread_atfork): wrong format specifier.
- [ruby-dev:21428]
+Wed Mar 18 17:46:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * process.c (pst_inspect): better description.
+ * ruby.c (load_file): new file object constant DATA. Only
+ available for the script from the file.
-Mon Sep 29 02:31:44 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * regex.c (re_match): forwarding failure point popped too much.
- * lib/webrick/utils.rb (Utils::su): use setgid and setuid to
- set real and effective IDs. and setup group access list by
- initgroups.
+Tue Mar 17 18:23:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Sep 28 11:14:19 2003 Koji Arai <jca02266@nifty.ne.jp>
+ * math.c (math_frexp): newly added.
- * ext/digest/digest.c (Init_digest): `copy_object' was deprecated.
- `initialize_copy' should be defined.
+ * math.c (math_ldexp): ditto.
- * ext/stringio/stringio.c (Init_stringio): ditto.
+ * bignum.c (bigdivmod): calculates modulo.
-Sat Sep 27 18:25:13 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * numeric.c (fix_remainder): returns reminder, formerly introduced
+ as modulo.
- * lib/xsd/charset.rb: XSD::Charset.is_ces did return always true under
- $KCODE = "NONE" environment. check added.
+ * numeric.c (fix_modulo): calculates proper `modulo'.
- * test/xsd/test_xsd.rb: add tests for above fix.
+ * bignum.c (bigdivmod): wrong sign for reminder.
-Sat Sep 27 15:58:50 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Mon Mar 16 17:07:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
+ * experimental release 1.1b9_03.
- * lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
- a chance to reset logging severity threshold.
+Mon Mar 16 16:33:53 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
- silent.
+ * io.c (pipe_finalize): needed to add pipe_finalize to pipes on
+ cygwin32.
-Sat Sep 27 09:44:18 2003 Minero Aoki <aamine@loveruby.net>
+Mon Mar 16 14:11:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/fileutils/test_fileutils.rb: clear all errors on Windows.
- [ruby-dev:21417]
+ * class.c (ins_methods_i): needed to consider NOEX_UNDEF.
- * test/fileutils/test_nowrite.rb: ditto.
+Mon Mar 16 13:23:53 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Mon Sep 27 09:14:03 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (io_check_closed): check for `fptr->f2 == NULL'.
- * array.c (rb_ary_delete): comparison may change the capacity.
- [ruby-dev:24348]
+ * io.c (io_fptr_close): ditto.
- * array.c (rb_ary_fill): fill should honor length argument.
- [ruby-dev:24346]
+Mon Mar 16 11:49:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * array.c (rb_ary_replace): should not use ptr from shared array.
- [ruby-dev:24345]
+ * io.c (pipe_atexit): free()ing referencing pipe_list.
- * ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
- [ruby-talk:113807]
+ * range.c (range_length): returns zero, if the first is greater
+ than the last.
-Sat Sep 27 04:57:07 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * signal.c (trap_restore_mask): restore signal mask before raising
+ exceptions and throws.
- * test/ruby/test_file.rb: new file. only asserts unlink-before-close
- behaviour now.
+Fri Mar 13 13:49:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/soap/marshal/test_digraph.rb: should close before unlink.
- unlink-before-close pattern is not needed here.
+ * experimental release 1.1b9_02.
-Sat Sep 27 03:32:37 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * object.c (mod_clone): need to dups constants and instance
+ variables.
- * 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.
+ * eval.c (rb_eval): forgot to initialize body for NODE_DEFS.
-Sat Sep 27 01:30:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * eval.c (rb_eval): retrieve self from calling frame, since self
+ changes sometimes.
- * ext/socket/socket.c (ruby_connect): on win32, type of the 4th
- argument of getsockopt is char *.
+ * env.h (FRAME): need to save self in the calling frame.
-Fri Sep 26 18:35:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (f_gets_method): rs should be initialized by RS.
- * lib/resolv-replace.rb: 1.8 compliance. [ruby-talk:82946]
+Thu Mar 12 15:33:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 26 17:39:27 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * experimental release 1.1b9_01.
- * test/ruby/test_marshal.rb: add test for ruby's objects.
+ * range.c (range_s_new): check values by `first <= last'.
-Fri Sep 26 09:52:44 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (lastline_set): fixed offset for $_ and $~ in the local
+ variable space.
- * defines.h (flush_register_windows): use volatile only for gcc on
- Solaris. [ruby-dev:21403]
+Wed Mar 11 02:14:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (xsystem): use system directly to honor shell meta
- charaters.
+ * io.c (io_gets): handle normal case specially for speed.
-Fri Sep 26 00:10:13 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * eval.c (rb_disable_super): function to disable superclass's
+ method explicitly.
- * lib/README: updated.
+ * eval.c (rb_eval): inherits previous method definition's
+ NOEX_UNDEF-ness, if exists.
-Thu Sep 25 17:48:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * class.c (rb_define_method): disables superclass's overriding
+ method by default.
- * ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
- rb_protect.
+Wed Mar 11 01:40:48 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
- * ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
- value.
+ * numeric.c (flo_gt,etc.): do not depend on `<=>', to handle NaN.
-Thu Sep 25 09:00:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+Tue Mar 10 00:03:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/ostruct.rb: Added OpenStruct#==.
+ * ruby.c (load_file): understands multiple options in #! line.
- * test/ostruct/test_ostruct.rb: Added.
+ * regex.c (re_compile_pattern): support for [:alpha:] etc.
-Thu Sep 25 07:55:26 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Mar 9 16:53:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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)
+ * io.h (GetOpenFile): embed io_check_closed in GetOpenFile.
-Thu Sep 25 00:23:22 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * sprintf.c (f_sprintf): zero padding failed for negative
+ integers.
- * MANIFEST: add SOAP4R.
+ * sprintf.c (remove_sign_bits): failed to remove some bits.
-Thu Sep 25 00:13:15 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sat Mar 7 21:51:46 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
- * lib/soap/* (29 files): SOAP4R added.
+ * class.c (ins_methods_i): body may be NULL for some case.
- * lib/wsdl/* (42 files): WSDL4R added.
+Fri Mar 6 17:23:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/xsd/* (12 files): XSD4R added.
+ * regex.c (mbcinit): table driven mbchar detection.
- * test/soap/* (16 files): added.
+ * object.c (obj_alloc): check for allocating instance for the
+ primitive classes (mostly perfect).
- * test/wsdl/* (2 files): added.
+ * ext/curses/curses.c (curses_finalize): restore original state at
+ interpreter termination.
- * test/xsd/* (3 files): added.
+ * ext/curses/curses.c (curses_addstr): forgot to check argument
+ type (caused SEGV). now uses STR2CSTR() macro.
- * sample/soap/* (27 files): added.
+Thu Mar 5 13:47:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * sample/wsdl/* (13 files): added.
+ * eval.c (block_pass): accepts method object as block args.
-Wed Sep 24 02:08:11 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (f_missing): use any_to_s() for stringify.
- * lib/webrick/httpservlet/cgihandler.rb: conform to mswin32.
- [ruby-talk:82735], [ruby-talk:82748], [ruby-talk:82818]
+Wed Mar 4 01:39:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 23 23:10:16 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * parse.y (block_arg): new syntax - block argument in the
+ calling arglist.
- * lib/logger.rb: add Logger#<<(msg) for writing msg without any
- formatting.
+ * eval.c (rb_call): no module search. simplified a lot.
- * test/logger/test_logger.rb: ditto.
+ * eval.c (rb_eval): block arg support.
-Tue Sep 23 20:47:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (f_block_arg): new syntax - block argument in the
+ formal arglist.
- * error.c (rb_warn_m): should not warn if -W0 is specified.
- [ruby-talk:82675]
+Tue Mar 3 14:20:15 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Sep 22 21:28:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (obj_method): returns bound method object.
- * MANIFEST: updated.
+ * eval.c (rb_call): argument check for empty methods.
-Mon Sep 22 19:22:26 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ruby.h (NUM2CHR): new macro, originally from curses module.
- * configure.in (AC_CHECK_FUNCS): add setuid and setgid.
+Tue Mar 3 13:03:35 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
-Mon Sep 22 12:34:55 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (io_putc): new method.
- * util.c (ruby_strtod): skip preceding zeros before counting
- digits in the mantissa. (ruby-bugs:PR#1181)
+Tue Mar 3 11:21:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Sep 21 04:12:36 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * string.c (str_inspect): more strict charcode detection.
- * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
- should be a String.
+ * eval.c (thread_stop): stopping only thread raises ThreadError
+ exception.
- * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
+Tue Mar 3 08:04:56 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
- * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
+ * struct.c (struct_alloc): incomplete struct initialization made
+ GC to access unallocated addresses.
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+Mon Mar 2 16:28:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
+ * eval.c (thread_stop_method): remove Thread#stop.
-Sat Sep 20 11:49:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Fri Feb 27 18:16:26 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/logger.rb: typo fixed.
+ * version 1.1b9 released.
- * test/logger/test_logger.rb: new file.
+Fri Feb 27 09:36:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 19 11:39:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * hash.c (hash_delete_nil): needed to compare value to nil, since
+ nil is the valid key for hashes.
- * test/testunit/*: Added.
+ * hash.c (hash_foreach_iter): rehashing causes IndexError.
- * lib/test/unit.rb: Documentation update.
+ * hash.c (hash_foreach_iter): rehash check by pointer comparison.
- * lib/test/unit/ui/console/testrunner.rb (TestRunner#initialize):
- Ditto.
+Thu Feb 26 17:22:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/test/unit.rb: Factored out an ObjectSpace collector.
+ * parse.y (fname): convert reswords into symbols.
- * lib/test/unit/collector/objectspace.rb: Ditto.
+ * parse.y (reswords): reserved words are now embedded in the
+ syntax (sigh).
- * sample/testunit/*: Added.
+ * parse.y: now reserved words can be method names safely.
-Fri Sep 19 01:00:48 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Feb 25 15:50:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/log.rb (BasicLog#log): get rid of as ineffectual
- condition.
+ * eval.c (mod_module_eval): clear the_scope's PRIVATE flag before
+ calling eval().
- * lib/webrick/log.rb (BasicLog#format): add "\n" to message.
+ * gc.c (gc_call_finalizer_at_exit): run finalizers before any data
+ object being freed.
-Thu Sep 18 22:43:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_eval): needed to keep prot_tag->retval before
+ evaluating the ensure clause.
- * eval.c (proc_invoke): should push PROT_PCALL tag for orphans.
+Tue Feb 24 11:16:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (proc_invoke): should update "result" for orphans.
+ * parse.y (yylex): reserved words can be appear as method names at
+ right after 'def' and `.'(dot), like foo.next.
-Thu Sep 18 20:33:03 2003 Tietew <tietew-ml-ruby-list@tietew.net>
+ * eval.c (return_check): checks for return out of thread (formerly
+ done in return_value).
- * parse.y (str_xquote): do not prepend escapes in
- backqoute literals. [ruby-list:38409]
+ * eval.c (POP_TAG): copy retval to outer level.
-Thu Sep 18 20:30:17 2003 Tanaka Akira <akr@m17n.org>
+ * eval.c (return_value): just set retval, no check, no unwinding.
- * lib/pathname.rb: update document.
+ * parse.y (nextc): line continuation by backslash at end of line.
-Thu Sep 18 15:27:05 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * regex.c (re_compile_pattern): forgot to clear pending_exact on
+ closing parentheses.
- * lib/logger.rb: new file. Logger, formerly called devel-logger or
- Devel::Logger.
+ * parse.y (assignable): should not assign dyna_var to true, if it
+ is already defined.
- * sample/logger/*: new file. samples of logger.rb.
+Mon Feb 23 14:35:03 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Sep 17 23:41:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * object.c (obj_is_kind_of): no longer accepts true/false/nil.
- * eval.c (localjump_destination): should not raise ThreadError
- exception for "break". [ruby-dev:21348]
+ * object.c ({true,false,nil}_to_i): can be converted into integers.
- * eval.c (proc_invoke): use result instead of prot_tag->retval.
- retval is no longer propagated to the ancestors.
+Mon Feb 23 12:11:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Sep 17 20:34:00 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (reg_s_quote): needed to be mbchar aware.
- * parse.y (tokadd_string, parse_string, yylex): escaped terminator
- is now interpreted as is. [ruby-talk:82206]
+ * eval.c (proc_s_new): wrong iter mark.
-Wed Sep 17 18:52:36 2003 Minero Aoki <aamine@loveruby.net>
+Sat Feb 21 22:59:30 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
- * test/fileutils/fileassertions.rb: new file.
+ * io.c (f_syscall): no argument check.
- * test/fileutils/test_fileutils.rb: new file.
+Fri Feb 20 10:17:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/fileutils/test_nowrite.rb: new file.
+ * version 1.1b8 released.
-Wed Sep 17 18:51:02 2003 Minero Aoki <aamine@loveruby.net>
+ * ext/kconv/kconv.c (kconv_kconv): default output code now be
+ determined according to the value of $KCODE.
- * test/strscan/test_stringscanner.rb: require test/unit.
+ * re.c (rb_get_kcode): can retrieve $KCODE from C code.
-Wed Sep 17 18:35:34 2003 Minero Aoki <aamine@loveruby.net>
+ * parse.y (stmt): if/unless modifiers returns nil, if condition is
+ not established.
- * test/strscan/test_stringscanner.rb: new file.
+Thu Feb 19 11:06:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Sep 17 18:03:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ext/kconv/kconv.c (kconv_kconv): charcode can be specified by
+ code name (JIS, SJIS, EUC like value of $KCODE).
- * ext/openssl: all files are reviewed to simplify and avoid memory leak.
+ * regex.c (re_compile_pattern): forgot to fixup_jump for (?:..).
- * ext/openssl/extconf.rb: add check for assert.h.
+ * regex.c (re_compile_pattern): needed to clear pending_exact on
+ non-registering grouping (?:...).
- * ext/openssl/ossl.c (ossl_buf2str): new function to convert
- C buffer to String and free buffer.
+Wed Feb 18 19:54:21 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
- Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
+ * parse.y (here_document): needed to set lex_state to EXPR_END.
- * ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
- functions to convert object to DER string.
+Wed Feb 18 18:45:10 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/ossl.h: ditto.
+ * patches for cygwin32 applied.
- * ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
- BIO to String object and free BIO.
+Wed Feb 18 00:41:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_bio.h: ditto.
+ * string.c (str_sub_s): needed to be mbchar aware to increment one
+ character.
- * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
+ * regex.c (re_match): \Z matches newline just before the end of
+ the string.
- * ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
+Tue Feb 17 00:04:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
+ * time.c (time_arg): Time.gm and Time.local now understands
+ Time#to_a format.
- * ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
- and reimplement in openssl/x509.rb.
+ * string.c (str_sub_s): replace happened twice for null pattern.
- * 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.
+ * regex.c (re_search): null pattern should not match after newline
+ at the end of string.
- * ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
- unused code.
+ * time.c (time_isdst): now returns boolean value.
- * ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
+ * error.c (rb_check_type): treat special constants in messages.
-Tue Sep 16 22:25:06 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * parse.y (yylex): new form `::Const' to see toplevel constants.
- * test/csv/test_csv.rb: add negative tests of row_sep.
+ * parse.y (cond): SEGV on `if ()'.
-Tue Sep 16 18:02:36 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * gc.c (obj_free): some data needed explicit free().
- * regex.c (re_compile_pattern): should not translate character
- class range edge. [ruby-list:38393]
+Mon Feb 16 23:55:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 16 16:47:56 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * eval.c (blk_free): release duplicated block informations.
- * MANIFEST: add test/csv/mac.csv.
+ * eval.c (blk_copy_prev): duplicate outer block information into
+ the heap, when proc/binding created.
- * win32/Makefile.sub, bcc32/Makefile.sub (test): add phony NUL target.
+Mon Feb 16 14:38:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Sep 15 19:02:52 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * time.c (time_mon): now 1 for January and so on.
- * 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".
+ * time.c (time_year): year in 19xx (no + 1900 needed anymore).
- * test/csv/test_csv.rb: add tests for above feature.
+Mon Feb 16 13:28:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/csv/mac.csv: added. Sample CR separated CSV file.
+ * regex.c (re_compile_pattern): need to fetch mbchar's second byte
+ without translation.
-Fri Sep 12 22:41:48 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+Mon Feb 16 12:29:27 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
- * ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
+ * eval.c (f_pass_block): pass iterator block to other method.
- * ext/openssl/ossl.c: move BIO stuff to ossl_bio.[ch]
+Fri Feb 13 08:16:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_asn1.[ch]: new files
+ * parse.y (parse_regx): handle \s before read_escape().
- * ext/openssl/ossl_bio.[ch]: new files
+ * parse.y (read_escape): `\s' in strings as space.
-Fri Sep 12 12:30:41 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 10 17:29:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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]
+ * version 1.1b7 released.
-Fri Sep 12 12:09:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * string.c (str_aset): string insertion by `str[n] = str2'.
- * bignum.c (rb_big_and): convert argument using 'to_int'.
+ * string.c (str_oct): does recognize `0x'.
- * bignum.c (rb_big_or): ditto.
+ * sprintf.c (f_sprintf): use base 10 for conversion from string to
+ integer.
- * bignum.c (rb_big_xor): ditto.
+Mon Feb 9 14:51:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 12 07:06:14 2003 David Black <dblack@superlink.net>
+ * numeric.c (do_coerce): proper error message.
- * lib/scanf.rb: Took out useless @matched_item variable; some small
- refactoring.
+ * string.c (str_sum): bug - masked by wrong value. (sigh..)
-Thu Sep 11 08:43:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Feb 7 15:11:14 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
- name is not tainted.
+ * string.c (str_empty): new method
- * lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
- Supports StringIO.
+Fri Feb 6 01:42:15 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Sep 10 22:47:30 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * time.c (time_asctime): use asctime(3), not strftime(3).
- * ext/openssl/ossl.h: add a workaround for win32 platform.
- libeay32.dll doesn't export functions defined in conf_api.h.
+Thu Feb 5 18:58:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_config.c (ossl_config_initialize): ditto.
+ * io.c (io_fptr_close): do not free path on close().
- * ext/openssl/ossl_config.c (ossl_config_add_value): ditto.
+ * array.c (ary_filter): new method.
- * ext/openssl/ossl_config.c (set_conf_section_i): should check
- if the argument is Array.
+ * enum.c (enum_each_with_index): new method.
-Wed Sep 10 22:41:54 2003 Tietew <tietew@tietew.net>
+Thu Feb 5 14:10:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (win32_get_exception_list): avoid VC7 warning.
- [ruby-win32:577]
+ * parse.y (primary): singleton class def can be appeared inside
+ method bodies.
-Tue Sep 9 10:39:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * hash.c (hash_replace): replace content.
- * eval.c (struct tag): dst should be VALUE.
+ * string.c (str_replace_method): replace content.
-Tue Sep 9 10:39:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (ary_replace_method): replace elements.
- * eval.c (localjump_destination): stop at the scope where the current
- block was created. [ruby-dev:21353]
+ * string.c (str_succ_bang): String#succ!
-Tue Sep 9 05:17:04 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Feb 5 18:20:30 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
+ * string.c (str_upcase_bang): multi byte character support.
-Tue Sep 9 02:41:35 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+Wed Feb 4 13:55:26 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_config.c: Refine compatibility.
+ * array.c (ary_reverse): SEGV on empty array reverse.
-Tue Sep 9 01:50:45 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Tue Feb 3 12:24:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
- the message.
+ * re.c (match_to_a): non matching element should be nil.
- * lib/webrick/log.rb (BasicLog#log): add "\n" only if needed.
+ * ruby.c (ruby_load_script): load script after all initialization.
-Mon Sep 8 22:15:33 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * bignum.c (str2inum): need to interpret prefix `0' of `0x'.
- * ext/tk/lib/multi-tk.rb: modify security check at creating
- a new interpreter
+Tue Feb 3 10:00:18 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Mon Sep 8 20:00:12 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * numeric.c (fix_rshift): use `sizeof(INT)*8' instead of 32.
- * lib/optparse.rb, lib/optparse/version.rb: search also all
- capital versions.
+Mon Feb 2 14:09:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Mon Sep 8 19:26:33 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * ruby.c (set_arg0): grab environment region too.
- * ext/openssl/ossl.h: include openssl/conf.h and openssl/conf_api.h.
+Thu Jan 29 18:36:25 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/ossl_config.c: refine all with backward compatibility.
+ * process.c (rb_proc_exec): check `sh' to be exist.
- * ext/openssl/ossl_config.h: export GetConfigPtr() and DupConfigPtr().
+Thu Jan 29 18:18:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * io.c (io_stdio_set): assignment to $stdin or $stdout does
+ reopen() as well as $stderr.
- * ext/openssl/ossl_x509ext.c (ossl_x509extfactory_free): don't free
- the members of the struct. it's left to GC.
+Thu Jan 29 14:18:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_x509ext.c (ossl_x509_set_config): add for config=.
+ * class.c (mod_ancestors): should not include singleton classes.
- * ext/openssl/ossl_x509ext.c (Xossl_x509extfactory_initialize):
- add attr readers: issuer_certificate, subject_certificate,
- subject_request, crl and config.
+ * object.c (obj_type): should not return internal class.
-Mon Sep 8 18:26:41 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * io.c (io_reopen): unwillingly closes stdio streams.
- * lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
- instead of config[:Port] or req.request_uri.port.
+Thu Jan 29 11:50:35 1998 Toshihiko SHIMOKAWA <toshi@csce.kyushu-u.ac.jp>
- * lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
+ * ext/socket/socket.c (udp_addrsetup): forgot to use htons().
- * lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
+Tue Jan 27 23:15:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/config.rb: :Listen option never be used.
+ * keywords: __FILE__, __LINE__ are available again.
- * lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
- option and add warning message.
+Fri Jan 23 14:19:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
+ * version 1.1b6 released.
- * lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
+ * object.c (mod_to_s): need to duplicate classpath.
-Sun Sep 7 16:08:28 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * error.c (exc_inspect): need to duplicate classpath.
- * ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
+Thu Jan 22 00:37:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
+ * ruby.h (STR2CSTR): new macro to retrieve char*.
-Sat Sep 6 02:26:34 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * class.c (rb_define_method): `initialize' should always be
+ private, even if it defined by C extensions.
- * test/ruby/test_*.rb: assert_same, assert_match, and so on.
+ * eval.c (rb_eval): `initialize' should always be private.
-Sat Sep 6 18:45:46 2003 Mauricio Fernandez <batsman.geo@yahoo.com>
+Thu Jan 22 16:21:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * parse.y (assignable): call rb_compile_error(), not rb_bug().
- [ruby-core:01523]
+ * eval.c (rb_eval): some singleton class def cause SEGV.
-Sat Sep 6 17:40:41 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (TMP_ALLOC): replace ALLOCA_N, where thread context
+ switch may happen.
- * ext/openssl/ruby_missing.c: rid of unnecessary backward
- compatibility stuff. and remove DEFINE_ALLOC_WRAPPER from
- all sources.
+Wed Jan 21 01:43:42 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_x509ext.c (X509::Extension.new): new method.
+ * eval.c (PUSH_FRAME): do not use ALLOCA_N(). crash on some
+ platforms that use missing/alloca.c.
- * ext/openssl/ossl_x509ext.c (X509::Extension#oid=): new method.
+ * regex.c (re_compile_pattern): too many pops for non register
+ subexpr.
- * ext/openssl/ossl_x509ext.c (X509::Extension#value=): new method.
+ * parse.y (yylex): open parentheses after identifiers are argument
+ list, even if whitespaces have seen.
- * ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
+Tue Jan 20 15:19:59 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Sep 6 01:23:22 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * parse.y (terms): quoted word list by %w(a b c).
- * win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
+ * ext/tcltklib/extconf.rb: more accurate check for tcl/tk libs.
- * win32/win32.c (CreateChild): fix condition about whether to call
- shell or not.
+ * file.c (rb_stat): most of the FileTest methods (and function
+ `test') accept File objects as the argument.
-Sat Sep 6 00:36:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+Tue Jan 19 18:19:24 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * Makefile.in (test): phony target.
+ * ext/extmk.rb.in (install): there should be no newline after install:
- * lib/mkmf.rb (have_library, find_library): configure by library
- name.
+ * re.c (MIN): renamed from min(). there's a local variable named
+ min in the file, so that some cpp will raise an error.
- * lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
- array as argument.
+Mon Jan 19 16:30:05 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/ruby/test_*.rb: moved invariants to left side in
- assert_equal, and use assert_nil, assert_raises and so on.
+ * version 1.1b5 released.
- * win32/win32.c (isInternalCmd): distinguish command.com and
- cmd.exe.
+ * process.c (rb_syswait): no exception raised.
- * win32/win32.c (make_cmdvector): a character just after wildcard
- was ignored. [ruby-core:01518]
+Fri Jan 16 00:43:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 5 20:27:08 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ruby.h (CLONESETUP): copies its singleton classes too.
- * test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
+ * class.c (singleton_class_attached): saves binded object in the
+ singleton classes.
-Fri Sep 5 18:00:51 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * eval.c (rb_eval): calls singleton_method_added even in the
+ singleton class clauses.
- * ext/openssl/lib/openssl/x509.rb: new method X509::Name::parse.
+Fri Jan 15 23:22:43 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/ossl_digest.c: add ossl_digest_new().
+ * ruby.c (proc_options): -S does not recognize PATH.
- * ext/openssl/ossl_digest.h: ditto.
+Thu Jan 15 02:03:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_cipher.c: add ossl_cipher_new().
+ * eval.c (rb_clear_cache_by_id): clear only affected cache
+ entries.
- * ext/openssl/ossl_cipher.h: ditto.
+Wed Jan 14 02:14:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 5 15:32:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/socket/socket.c: new UDP/IP socket classes.
- * misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): should not
- search delimiter forward if found in backward.
+Tue Jan 13 10:00:18 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 5 13:32:48 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (str_cmp): ignorecase($=) works wrong.
- * test/runner.rb: arguments should be keys.
+Fri Jan 9 13:19:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Sep 5 12:09:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * version 1.1b4 released.
- * test/ruby/test_system.rb (test_system): check existence of ruby
- interpreter.
+ * eval.c (f_missing): class name omitted from the error message.
-Fri Sep 5 11:32:17 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * error.c (exc_inspect): description changed.
- * lib/optparse.rb (--version): fix assignment/reference order.
+ * string.c (Init_String): GlobalExit's superclass did not filled,
+ since GlobalExit created earlier than String.
- * lib/optparse.rb (OptionParser#help): new; OptionParser#to_s may
- be deprecated in future.
+Thu Jan 8 12:10:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/optparse/version.rb (OptionParser#show_version): hide Object.
+ * parse.y (aryset): expr in the brackets can be null.
- * test/runner.rb: fix optparse usage.
+Wed Jan 7 21:13:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/runner.rb: glob all testsuits if no tests given.
+ * io.c (io_reopen): keep stderr unclosed.
-Fri Sep 5 10:42:58 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * io.c (io_errset): keep stderr unclosed.
- * test/runner.rb: added. gets testcases from command line and runs it.
+Tue Jan 6 00:27:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/ruby/test_gc.rb: remove useless part which was for dumping test
- result.
+ * parse.y: syntax modified for `while expr do .. end' etc.
-Fri Sep 5 09:28:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * process.c (f_exec,f_system): can supply arbitrary name for the
+ new process.
- * 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.
+Mon Jan 5 16:59:13 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Fri Sep 5 03:00:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * file.c (file_s_basename): removes any extension by ".*".
- * test/ruby/test_iterator.rb (test_block_in_arg): add no block
- given tests.
+Sun Jan 4 19:36:22 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * test/ruby/test_iterator.rb (test_ljump): uncomment LocalJumpError
- test.
+ * parse.y (yylex): needed to update lex_p (reading point).
-Fri Sep 5 01:10:11 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Sat Jan 3 19:14:14 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * test/ruby: tests for ruby itself.
+ * class.c,object.c: duplicate defines mKernel and cFinxnum.
- * test/ruby/test_*.rb: split sample/test.rb into 28 test/unit testcases.
- some tests could not be translates... search '!!' mark to see it.
+Fri Jan 2 20:38:59 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
- * test/csv/test_csv.rb: should require 'csv', not '../lib/csv'. test
- runner should set load path correctly.
+ * ext/curses/curses.c (NUM2CHAR): uses the first character for
+ string arguments.
-Fri Sep 5 01:03:59 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * array.c (ary_fill): did not extend array for ranges.
- * test/csv/test_csv.rb: close opened files for CSV::IOBuf explicitly.
- opened file cannot be removed under win32 box.
+ * array.c (beg_len): did not return end pos bigger than size.
-Thu Sep 4 23:59:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Jan 2 02:09:16 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * parse.y (tokadd_string): newlines have no special meanings in
- %w/%W, otherwise they are ignored only when interpolation is
- enabled. [ruby-dev:21325]
+ * dir.c (dir_s_chdir): bug in nil check.
-Thu Sep 4 19:38:25 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * array.c (ary_fill): bug in nil check.
- * ext/io/wait/.cvsignore: added.
+Tue Dec 30 11:46:23 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/.cvsignore: added.
+ * hash.c (env_path_tainted): checks directories in PATH
+ environment variable are not world writable.
-Thu Sep 4 19:28:24 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * ruby.c (load_file): invoke specified interpreter if the #! line
+ does not contain the word `ruby'.
- * sample/openssl: added. Sample of standard distribution library
- should be locate in sample/{module_name}/*.
+Fri Dec 26 03:26:41 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/sample/*: removed. move to sample/openssl/*.
+ * string.c (uscore_get): type information included in the error
+ message.
-Thu Sep 4 18:02:15 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * variable.c (f_untrace_var): does not free trace-data within
+ trace procedure.
- * test/csv/test_csv.rb: use remove_const to reduce warnings. use
- Dir.tmpdir to locate working files.
+Thu Dec 25 02:50:29 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Sep 4 17:41:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * version 1.1b3 released.
- * misc/ruby-mode.el (ruby-here-doc-beg-re): underscore also is
- valid delimiter.
+ * ruby.h: inlining some functions on gcc 2.x
- * misc/ruby-mode.el (ruby-here-doc-end-match): must quote
- arbitrary string to use as regexp.
+Tue Dec 23 02:47:33 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * eval.c (rb_eval): public/private information kept in the current
+ scope, to remove undesired state from the class/module.
-Thu Sep 4 15:40:07 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+ * time.c (time_strftime): remove hidden limit of 100 bytes of
+ result string, using malloc'ed buffer.
- * test/csv/test_csv.rb: run on test/unit original layer.
+ * hash.c (hash_update): merges the contents of another hash,
+ overriding existing keys.
-Thu Sep 4 12:54:50 2003 why the lucky stiff <why@ruby-lang.org>
+ * regex.c (must_instr): totally re-written.
- * ext/syck/token.c: headerless documents with root-level spacing now
- honored.
+ * io.c (read_all): try to allocate proper sized buffer using
+ fstat(2) for speedup.
-Thu Sep 4 00:06:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Sat Dec 20 00:27:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (mark_frame_adj): need to adjust argv pointer if using
- system's alloca. [ruby-core:01503]
+ * regex.c (must_instr): need to skip 2 bytes for mbchars.
-Wed Sep 3 21:33:20 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+Fri Dec 19 01:18:29 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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.
+ * version 1.1b2 released.
- * test/csv/*: add testcase for lib/csv.rb.
+ * eval.c (check_errat): check and convert (if necessary) traceback
+ information before assigning to the variable $@.
-Wed Sep 3 01:37:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (f_raise): optional third argument to specify traceback
+ information.
- * io.c (rb_f_gets): should call next_argv() before type check
- current_file. [ruby-list:38336]
+ * io.c (f_open): prevent infinite recursive call.
-Tue Sep 2 20:37:15 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Thu Dec 18 19:33:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): warning
- for skipping server verification.
+ * string.c (str_rindex): now accepts regexp as index.
-Tue Sep 2 23:36:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Dec 18 18:42:50 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * eval.c (proc_invoke): should retrieve retval when pcall is true.
+ * ext/socket/extconf.rb: modified to detect win32 socket lib.
-Tue Sep 2 14:09:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Dec 18 00:25:03 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX).
- the patch is submitted by nmu <nmu@users.sourceforge.jp>.
+ * re.c (reg_equal): checks for source and casefold and kcode matching.
- * ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on
- some platforms.
+ * marshal.c: became built-in module.
- * ext/socket/getnameinfo.c (getnameinfo): ditto.
+ * ext/marshal/marshal.c (r_object): displays struct name for
+ non-compatible struct.
-Tue Sep 2 14:02:19 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * string.c (str_index_method): now searches character (fixnum) in
+ the string.
- * ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
+ * string.c (str_include): redefine `include?'.
- * ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
- bug fix and improvement of font control
+ * regex.c (re_match): start_nowidth saves current stack position
+ to stop_nowidth.
-Tue Sep 2 09:51:36 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * regex.c (re_compile_pattern): add space to stop_nowidth to save
+ runtime stack position.
- * eval.c (rb_eval): should not handle exceptions within rescue
- argument. [ruby-talk:80804]
+Tue Dec 16 14:57:43 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 2 00:44:37 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * string.c (scan_once): wrong exception for regexp that match with
+ null string (use substr instead of subseq).
- * re.c (rb_memsearch): fix overrun. [ruby-talk:80759]
+Sat Dec 13 00:13:32 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Sep 2 00:41:27 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (expr): remove bare assocs from expr rule.
- * ext/iconv/iconv.c (map_charset): use lower case keys.
+ * rbconfig.rb: renamed from config.rb (it was too generic name).
- * ext/iconv/iconv.c (iconv_fail): just yield error and return the
- result if a block is given.
+Fri Dec 12 00:50:25 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/iconv/iconv.c (iconv_convert): yield error and append the
- result if a block is given.
+ * parse.y (expr): warns if BEGIN or END appear in the method
+ bodies.
- * ext/iconv/charset_alias.rb (charset_alias): optional third
- argument.
+ * string.c (str_match): calls y =~ x if y is neither String nor
+ Regexp so that eregex.rb works.
- * ext/iconv/charset_alias.rb (charset_alias): use CP932 instead of
- SHIFT_JIS on cygwin.
+ * eval.c (f_at_exit): to register end proc.
-Mon Sep 1 18:34:25 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * class.c (rb_define_module_function): define 'function' method
+ for the Module, not private method.
- * eval.c (rb_eval): make tail recursion in ELSE clause of
- RESCUE a jump.
+ * class.c (rb_define_function): function to define `function' method.
-Mon Sep 1 18:00:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (rb_eval): inherit visibility from superclass's method
+ except when it is set to `function'
- * parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
- Dave Butcher.
+ * eval.c (rb_eval): new visibility status `function'.
- * eval.c (Init_Thread): protect thgroup_default. suggested by Guy
- Decoux in [ruby-talk:80623]
+ * parse.y (yycompile): do not clear eval_tree. thus enable multiple
+ command line script by option `-e'.
-Mon Sep 1 16:59:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (rb_eval): END execute just once.
- * eval.c (rb_thread_switch): add RESTORE_EXIT; exit by another
- thread termination.
+ * parse.y (expr): BEGIN/END built in the syntax.
- * 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]
+Thu Dec 11 13:14:35 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sun Aug 31 22:46:55 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * object.c (mod_le): Module (or Class) comparison.
- * eval.c (TAG_DST()): take no argument.
+ * eval.c (rb_remove_method): raises NameError if named method does
+ not exist.
- * process.c (p_gid_sw_ensure): return VALUE.
+ * ext/curses/curses.c: remove CHECK macro for BSD curses.
-Sun Aug 31 22:27:10 2003 Hidetoshi NAGAI <nagai@dumbo.ai.kyutech.ac.jp>
+Thu Dec 11 12:44:01 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * process.c (p_gid_sw_ensure): lack of function type
+ * pack.c: sun4 cc patch
-Sun Aug 31 12:25:06 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+Wed Dec 10 15:21:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/optparse.rb: --version takes an optional argument; "all" or
- a list of package names.
+ * ext/marshal/marshal.c (marshal_load): can supply evolution proc
+ object as optional second argument.
-Sun Aug 31 10:17:02 2003 Tadayoshi Funaba <tadf@dotrb.org>
+ * re.c (reg_source): get source string of the regular expression.
- * lib/date/format.rb: yyyy/mm is not an acceptable format.
+Tue Dec 9 10:05:17 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/time.rb: follow above.
+ * version 1.1b1 released.
-Sat Aug 30 14:25:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (tokadd): token buffer overrun.
- * eval.c (rb_iter_break): should not call TAG_JUMP directly.
+ * ruby.c (ruby_prog_init): forgot to protect rb_argv0 from gc.
-Sat Aug 30 03:58:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (ruby_run): call finalizers at process termination.
- * eval.c (struct BLOCK): remove BLOCKTAG, use scope instead.
+ * gc.c (gc_call_finalizer_at_exit): call free proc for every Data
+ Wrapper, and finalizer for specified objects at termination.
- * eval.c (POP_TAG): no longer propagate retval. retval is now set
- directly by localjump_destination().
+ * version.c (show_version): version format changed.
- * eval.c (localjump_destination): new function to cast
- return/break local jump.
+ * regex.c (re_match): wrong match with non-greedy if they appear
+ more than once in regular expressions.
- * eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
+ * sample/ruby-mode.el (ruby-expr-beg): forgot to handle modifiers.
-Fri Aug 29 22:35:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+Mon Dec 8 19:00:15 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
- then result will be the same as +,-,*,/ respectively.
+ * io.c (io_puts): just put a newline if no argument given.
-Fri Aug 29 17:30:15 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+ * ext/tcltklib/tcltklib.c (lib_mainloop): thread-aware tk handle
+ when $tk_thread_safe is set.
- * process.c: bug fix
+ * ext/tcltklib/tcltklib.c (lib_mainloop): use Tcl_DoOneEvent()
+ instead of Tk_MainLoop().
- * process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
+Mon Dec 6 07:11:16 1997 MAEDA shugo <shugo@po.aianet.ne.jp>
- * process.c: deny handling IDs during evaluating the block given to
- the Process::{UID,GID}.switch method
+ * io.c (io_puts): core dumped without any argument.
- * ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
+Fri Dec 5 18:17:17 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tcltklib/tcltklib.c : can create a interpreter without Tk
+ * eval.c (mod_remove_method): remove (not undef) a method from the
+ class/module.
- * ext/tcltklib/tcltklib.c : bug fix on handling exceptions
+ * variable.c (obj_remove_instance_variable): method to remove
+ instance variables.
- * ext/tcltklib/MANUAL.euc : modify
+Thu Dec 4 13:50:29 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb : freeze some core modules
+ * version 1.1b0 released.
- * ext/tk/lib/multi-tk.rb : more secure
+ * string.c (str_aref): called str_index for regexp.
- * ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
- Tk's list
+Mon Dec 1 15:24:41 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tk.rb: improve accessibility of TkVariable object
+ * compar.c (cmp_between): wrong comparison made.
- * 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
+Wed Nov 26 18:18:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
+ * lib/mkmf.rb: generate Makefile for extension modules out of ruby
+ source tree. use like `ruby -r mkmf extconf.rb'.
-Thu Aug 28 22:07:12 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * numeric.c (fix2str): enlarge buffer to prevent overflow on some
+ machines.
- * variable.c (rb_autoload_load): call const_missing if autoloading
- constant is not defined to allow hook.
+ * parse.y (here_document): wrong line number generated after here-doc.
- * eval.c (rb_eval): use rb_const_get_from() instead of
- rb_const_get_at().
+Fri Nov 21 13:17:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (is_defined): forgot to check NODE_COLON3.
+ * parse.y (yylex): skip multibyte characters in comments.
-Thu Aug 28 17:30:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Nov 19 17:19:20 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * variable.c (rb_const_get_0): should check constants defined in
- included modules, if klass is Object. [ruby-talk:79302]
+ * object.c (nil_to_a): nil.to_a => [].
- * 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]
+ * parse.y (call_args): wrong node generation.
-Thu Aug 28 05:02:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Tue Nov 18 10:13:08 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * parse.y (singleton): typo fixed (ruby-bugs-ja:PR#562)
+ * array.c (Init_Array): Array#=== works as Array#include?
-Thu Aug 28 02:37:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_compile_pattern): insert initialize code for jump_n,
+ before entering loops.
- * eval.c (rb_eval): *a = [1,2] now assigns [[1,2]] to a.
- consistent with *a = [1], which set [[1]] to a.
+ * re.c (reg_search): does not save registers unless $& etc appear
+ in the script.
- * node.h: merge NODE_RESTARY to NODE_SPLAT.
+Mon Nov 17 13:01:43 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * parse.y: rules simplified a bit by removing NODE_RESTARY.
+ * eval.c (is_defined): add defined? check for receivers and
+ arguments for calls.
- * sample/test.rb: updated for new assignment behavior.
+ * re.c (reg_search): cache last match object.
-Wed Aug 27 22:33:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * re.c (match_aref): $[0] etc. are available.
- * error.c (rb_bug): should not use other methods; this function is
- not for ordinary use. [ruby-dev:21259]
+Sat Nov 15 00:11:36 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Aug 27 15:07:57 2003 Minero Aoki <aamine@loveruby.net>
+ * io.c (io_s_popen): "rb" detection
- * lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
- response. [ruby-list:38279]
+Fri Nov 14 18:28:40 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Aug 27 05:10:15 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * string.c (scan_once): returns whole match if the pattern does
+ not contain any parentheses.
- * win32/win32.c (map_errno): support winsock error.
+Thu Nov 13 14:39:06 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * 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().
+ * string.c (str_sub): returns copy of the receiver string, even if
+ any substitution occurred.
- * 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().
+ * regex.c (re_compile_pattern): no-width match by (?=..), (?!..).
- * win32/win32.h: add winsock errors.
+Wed Nov 12 13:44:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Aug 26 23:53:23 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * time.c: remove coerce from Time class.
- * lib/ostruct.rb (OpenStruct::method_missing): prohibit modifying
- frozen OpenStruct. [ruby-talk:80214]
+ * regex.c (re_match): non-greedy match by ??, *? +?, {n,m}?.
-Tue Aug 26 20:03:50 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Nov 10 11:24:51 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (create_tmpsrc): add the hook for source.
- [ruby-list:38122]
+ * regex.c (re_compile_pattern): non-registering parens (?:..).
-Tue Aug 26 15:59:53 2003 why the lucky stiff <why@ruby-lang.org>
+ * regex.c (re_compile_pattern): new meta character \< (wordbeg)
+ and \> (wordend).
- * implicit.c (syck_type_id_to_taguri): corrected detection of
- x-private types.
+ * regex.c (re_compile_pattern): embedded comment for regular
+ expression by (?#...).
-Sun Aug 24 01:02:48 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Fri Nov 7 16:58:24 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * file.c (file_expand_path): performance improvement.
- [ruby-talk:79748]
+ * regex.c (re_compile_pattern): perl5 regxp \A and \Z available.
-Sat Aug 23 23:41:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * regex.c (re_compile_pattern): can expand compile stack dynamically.
- * file.c (rb_file_s_expand_path): avoid calling rb_scan_args() for
- apparent cases. [ruby-talk:79748]
+ * regex.c (PUSH_FAILURE_POINT): wrong compare condition.
-Sat Aug 23 18:56:53 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 2 16:00:00 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * 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]
+ * string.c (str_sub_s): "".sub! "", "" => "\000"
-Sat Aug 23 16:48:41 2003 Keiju Ishitsuka <keiju@ishitsuka.com>
+Fri Oct 31 15:52:10 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
+ * parse.y (assoc): keyword assoc like {fg->"black"}.
-Sat Aug 23 15:59:58 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Oct 30 17:33:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_eval, rb_iterate, block_pass): reduce PUSH/POP_TAG and
- EXEC_TAG() for retry. [ruby-dev:21216]
+ * io.c (io_println): print with newline, which is not affected by
+ the values of $/ and $\.
-Sat Aug 23 02:32:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Thu Oct 30 16:54:01 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * eval.c (rb_yield_splat): should check if "values" is array.
+ * string.c (str_chop_bang): "".chop caused SEGV.
- * enum.c (each_with_index_i): typo.
+ * string.c (str_chomp_bang): method to chop out last newline.
-Fri Aug 22 17:07:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Mon Oct 27 13:49:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * enum.c (inject_i): use rb_yield_values.
+ * ext/extmk.rb.in: library may have pathname contains `.'
- * enum.c (each_with_index_i): ditto.
+ * eval.c (rb_rescue): should not protect SystemError.
- * eval.c (rb_yield_splat): new function to call "yield *values".
+Fri Oct 24 10:58:53 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * string.c (rb_str_scan): use rb_yield_splat().
+ * io.c (io_s_with_open_stream): ensures to close stream.
-Fri Aug 22 06:13:22 2003 why the lucky stiff <why@ruby-lang.org>
+Thu Oct 23 11:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/rubyext.c: refactoring of the transfer method
- dispatch. added yaml_org_handler for faster dispatch of
- transfers to base types.
+ * io.c (io_errset): value of $stderr can be changed (to any IO
+ object).
- * lib/yaml/rubytypes.rb: removed handling of builtins from
- Ruby library.
+ * io.c (next_argv): $< can be anything that responds to `write'.
- * ext/syck/token.c: quoted and block scalars are now implicit !str
+ * file.c (file_s_with_open_file): ensures to close file.
- * ext/syck/implicit.c: empty string detected as !null.
+ * error.c (exception): create error under the current class/module.
-Fri Aug 22 01:00:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * range.c (range_eqq): fixnum check for last needed too.
- * eval.c (block_pass): improve passing current block.
+Wed Oct 22 12:52:30 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Aug 22 00:13:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+ * ext/socket/socket.c: Socket::Constants added.
- * ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
- fixed, and VpNmlz() speed up.
+ * file.c: File::Constants added for inclusion.
-Wed Aug 20 16:44:49 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * array.c (ary_join): call ary_join() recursively for the 1st
+ array element.
- * ext/socket/socket.c (ruby_connect): many systems seem to have
- a problem in select() after EINPROGRESS. [ruby-list:38080]
+Mon Oct 20 12:18:29 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Aug 20 01:31:17 2003 why the lucky stiff <why@ruby-lang.org>
+ * ruby.c (load_file): wrong condition for #! check with -x.
- * ext/syck/syck.h: Parser definition problems on HP-UX.
- [ruby-talk:79389]
+ * file.c (file_s_dirname): did return "" for "/a".
- * ext/syck/handler.c (syck_hdlr_get_anchor): Memory leak.
+Fri Oct 17 14:29:09 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/syck/syck.s (syck_io_file_read): Bad arguments to fread.
+ * ruby.c: now works on alpha-linux.
- * ext/syck/rubyext.c: Tainting issues.
+ * bignum.c (bigadd): some undefined side effect order assumed.
-Tue Aug 19 23:20:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+Wed Oct 15 17:49:24 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/bigdecimal/bigdecimal.c .h .html: to_s("+") implemented.
+ * intern.h: function prototypes added.
- * ext/bigdecimal/lib/bigdecimal/math.rb: E implemented.
+Mon Oct 13 16:54:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Aug 19 07:47:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * class.c (rb_define_class_id): call superclass's `inherited'
+ method when making subclasses.
- * lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
+ * parse.y (nextc): clear lex_lastline at the end of file.
- * lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb.
+ * object.c (Init_Object): need to undef Class#append_features.
- * lib/webrick/compat.rb (File::fnmatch): remove old migration code.
+ * eval.c (rb_eval): no warning on extending classes or modules.
- * lib/webrick/httpserver.rb (HTTPServer#run): ditto.
+Thu Oct 9 11:17:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/webrick/server.rb (GenericServer#listen): the body of this
- method is pull out as Utils::create_lisnteners.
+ * eval.c (error_print): the exception name follows after the error
+ message.
- * lib/webrick/utils.rb (Utils::create_lisnteners): new method.
+ * eval.c (compile_error): error message slightly changed.
- * lib/webrick/server.rb (GenericServer#start): should rescue
- unknown errors. and refine comments.
+ * parse.y (nextc): script parsing will be terminated by __END__ at
+ beginning of line.
- * ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
- socket if SSLSocket raises error.
+ * eval.c (compile_error): `__END__' is no longer a keyword.
-Tue Aug 19 11:19:33 2003 Shugo Maeda <shugo@ruby-lang.org>
+ * parse.y (nextc): protect lastline read from script stream.
- * io.c (next_argv): should not call GetOpenFile() if rb_stdout is
- not a IO (T_FILE).
+Tue Oct 7 14:06:06 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Aug 19 07:47:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * version 1.1 alpha9 released.
- * ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
- a builtin.
+ * eval.c (mod_append_features): renamed from extend_class.
- * ext/openssl/lib/openssl/buffering.rb (Buffering#close): ditto.
+ * eval.c (rb_eval): defining method calls `method_added'.
- * ext/openssl/lib/openssl/buffering.rb (Buffering#puts): should
- add a return to the tails of each line.
+ * eval.c (ruby_options): exception while processing options must
+ terminate the interpreter.
- * ext/openssl/lib/openssl/ssl.rb: new class OpenSSL::SSL::SSLServer.
+ * error.c (Init_Exception): wrong method configuration. `new'
+ should have been a singleton method.
- * ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): use sync_close.
+Mon Oct 6 18:55:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/sample/echo_svr.rb: use SSLServer.
+ * ext/kconv/kconv.c (kconv_guess): code to guess character code
+ from string.
- * ext/openssl/sample/echo_cli.rb: add example of SSLSocket#sync_close.
+Mon Oct 6 18:38:17 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Tue Aug 19 01:24:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * pack.c: now encode/decode base64 by `m' template.
- * ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): Mac OS X standard
- headers are inconsistent at this macro. [ruby-core:01432]
+Fri Oct 3 10:51:10 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/curses/extconf.rb: check if _XOPEN_SOURCE_EXTENDED breaks.
+ * MANIFEST: needed to include lex.c in the distribution.
- * ext/tcltklib/stubs.c: Status macro in X11/Xthreads.h bothers
- winspool.h
+ * eval.c (ruby_options): f_require() called too early.
- * instruby.rb: make list at first instead of iterator.
- [ruby-talk:79347]
+ * eval.c (rb_provide): module extensions should always be `.o'.
-Mon Aug 18 11:23:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Thu Oct 2 11:38:31 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * dir.c (glob_helper): preserve raw order for **.
+ * version 1.1 alpha8 released.
-Sun Aug 17 23:39:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/marshal/marshal.c (r_object): remove temporal regist for
+ structs. (caused problem if structs form cycles.)
- * ext/openssl/extconf.rb (HAVE_VA_ARGS_MACRO): need to compile.
+ * parse.y (match_gen): static binding for match(=~) calls
+ with regexp literals.
-Sun Aug 17 17:10:03 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Wed Oct 1 15:26:55 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/lib/openssl/ssl.rb (SSLSocket#sync_close=): add a
- method to specify if the underlying IO will be closed in
- SSLSocket#close.
+ * eval.c: protect retval in struct tag from GC for C_ALLOCA.
- * ext/openssl/lib/openssl/buffering.rb: add forwarders to
- setsockopt, getsockopt and fcntl.
+ * eval.c: no more pointer value from setjmp/longjmp.
- * ext/openssl/lib/net/protocols.rb: enable sync for SSLSocket.
+Wed Oct 1 14:01:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Sun Aug 17 11:32:04 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * ext/marshal/marshal.c (w_byte): argument must be char.
- * ext/extmk.rb (extmake): should not force to remake Makefile when
- installation and so on.
+Wed Oct 1 10:30:22 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Sat Aug 16 23:58:18 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * variable.c (mod_const_at): global constants now belongs to the
+ class Object.
- * marshal.c (w_symbol, w_object): get rid of warnings.
+ * object.c (Init_Object): new global constant NIL.
- * re.c (rb_memsearch): ditto.
+ * ext/marshal/marshal.c (marshal_dump): try to set binmode.
- * time.c (time_dump): ditto.
+ * ext/marshal/marshal.c (r_object): forgot to re-regist structs in
+ the object table.
- * ext/extmk.rb (extmake): not continue making when extconf.rb
- failed.
+ * eval.c (ruby_options): call Init_ext() before any require()
+ calls by `-r'.
- * ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
+Fri Sep 30 14:29:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * ext/openssl/ossl.h: remove version.h dependency.
+ * ext/marshal/marshal.c (w_object): marshal dumped core.
- * ext/openssl/ruby_missing.h: ditto.
+Tue Sep 30 10:27:39 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (pkg_config): use --libs output except with
- only-L for other options. [ruby-list:38099]
+ * sample/test.rb: bignum test suits added.
- * lib/mkmf.rb (create_makefile): separate rule for static
- library from shared object.
+ * eval.c (rb_eval): new pseudo variable `true' and `false'.
- * win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
- define exec_prefix and libdir.
+ * parse.y: new keywords `true' and `false' added.
-Fri Aug 15 23:15:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+Mon Sep 29 13:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/bigdecimal/bigdecimal.c .h: Bug in combination of limit & div
- method fixed.
+ * ruby.c (forbid_setid): forbid some options in suid mode.
- * ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
+ * ruby.h (NUM2DBL): new macro to convert into doubles.
-Fri Aug 15 12:01:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Mon Sep 27 09:53:48 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
- * 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
+ * bignum.c: modified for speeding.
- * error.c (syserr_eqq): errno might exceed Fixnum limit.
+Fri Sep 26 18:27:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
- * error.c (Init_Exception): moved base initialization from
- init_syserr().
+ * sample/from.rb: some extensions.
- * inits.c (rb_call_inits): postpone initializing errnos until
- Bignum is available.
+Mon Sep 29 13:15:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Aug 15 12:01:43 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
- * ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): needed to let
- keyname() and so on be declared.
+Fri Sep 26 14:41:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/curses/curses.c (curses_resizeterm, window_resize):
- arguments conflicted with macros in term.h.
+ * eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
- * ext/curses/curses.c (Curses module methods): ensure
- initialized. [ruby-dev:21191]
+Fri Sep 26 13:27:24 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Fri Aug 15 02:08:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (io_isatty): forgot to return TRUE value.
- * gc.c (id2ref): recycle check should be done by klass == 0.
- [ruby-core:01408]
+Fri Sep 25 11:10:58 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
-Fri Aug 15 01:34:23 2003 Michal Rokos <m.rokos@sh.cvut.cz>
+ * eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
+ platforms.
- * ext/openssl/ossl_pkey.c: move generate_cb here
+Wed Sep 24 17:43:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/ossl_pkey_{dh|dsa|rsa}.c: adapt to this cb
+ * string.c (Init_String): String#taint and String#taint? added.
- * ext/openssl/openssl_missing.[ch]: add (0.9.6x, x<j) missing BN funcs
+ * class.c (mod_ancestors): ancestors include the class itself.
- * ext/openssl/ossl_bn.c: use supplied funcs from openssl_missing.c
+Wed Sep 24 00:57:00 1997 Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
-Fri Aug 15 00:38:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+ * X68000 patch.
- * ext/bigdecimal/bigdecimal.c: Bug in div method fixed.
+Tue Sep 23 20:42:30 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
- * ext/bigdecimal/lib/bigdecimal/math.rb: Newly added.
+ * parse.y (node_newnode): SEGV on null node setup.
- * ext/bigdecimal/sample/pi.rb: Changed so as to use math.rb.
+Mon Sep 22 11:22:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Aug 14 21:19:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ruby.c (ruby_prog_init): wrong safe condition check.
- * eval.c (Init_Thread): Continuation#[] added. [ruby-talk:79028]
+Sun Sep 21 14:46:02 1997 MAEDA shugo <shugo@po.aianet.ne.jp>
-Thu Aug 14 20:03:34 2003 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+ * error.c (exc_inspect): garbage added to classpath.
- * ext/win32ole/win32ole.c (OLE_FREE): should not call
- ole_message_loop.
+Fri Sep 19 11:49:23 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/win32ole/win32ole.c (ole_event_free): ditto.
+ * parse.y (newtok): forgot to adjust buffer size when shrinking
+ the token buffer.
- * ext/win32ole/win32ole.c (ole_initialize): stop calling
- OleUninitialize at exit.
+ * enum.c (enum_find): rb_eval_cmd() does not return value.
-Thu Aug 14 11:27:37 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
+ no longer used.
- * gc.c (rb_data_object_alloc): check type of 1st argument.
- [ruby-dev:21192]
+Tue Sep 16 17:54:25 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Aug 14 00:21:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * file.c (f_test): problem if wrong command specified.
- * parse.y (mlhs_node): should allow "::Foo" (colon3) as lhs.
+ * ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
- * parse.y (lhs): ditto.
+ * ruby.c (ruby_prog_init): should not add path from environment
+ variable, if ruby is running under setuid.
- * parse.y (yylex): should return tCOLON3 right after kCLASS.
- [ruby-talk:78918]
+ * process.c (init_ids): check suid check for setuid/seteuid etc.
- * error.c (exc_initialize): was converting argument to string too
- eagerly. Only check was needed. [ruby-talk:78958]
+Mon Sep 15 00:42:04 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Aug 13 23:31:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+ * regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
- * ext/bigdecimal/bigdecimal.c .h .html: Ambiguity of
- BigDecimal::limit removed.
+Thu Sep 11 10:31:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Aug 13 19:21:34 2003 Christian Neukirchen <chneukirchen@yahoo.de>
+ * version 1.1 alpha7 released.
- * lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
- to SSLSocket. [ruby-talk:78919]
+ * ext/socket/socket.c (sock_new): no setbuf() for NT.
-Wed Aug 13 18:13:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
- * eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
+Wed Sep 10 15:55:31 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (proc_invoke): unpack return/break destination when block
- is already left.
+ * ext/marshal/marshal.c (r_bytes0): extra big length check.
-Wed Aug 13 15:58:31 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c (rb_class_s_alloc): add function prototype to avoid VC++
- warning.
+ * io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
-Wed Aug 13 13:50:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * error.c (set_syserr): some system has error code that is bigger
+ than sys_nerr. grrr.
- * ext/Win32API/Win32API.c (Win32API_initialize): should pass some
- class to first argument of Data_Wrap_Struct(). (ruby-bugs:PR#1109)
+Mon Sep 8 18:33:33 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Aug 12 16:55:11 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * io.c (io_s_new): dereferenced nil for optional mode.
- * Makefile.in: static link libraries to LIBRUBY_SO with static linked
- ext. [ruby-dev:21157]
+Fri Sep 5 10:26:03 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/extmk.rb (extmake): sort extension library initialization order.
+ * class.c (class_instance_methods): do not include methods which
+ are changed to private in subclasses.
- * ext/extmk.rb (extmake): compact $extlibs.
+Thu Sep 4 12:38:53 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Aug 12 02:48:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * variable.c (f_global_variables): list name of the global
+ variables.
- * eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the
- flag before calling getcontext(2).
+ * object.c (obj_id): returns unique integer.
- * eval.c (struct thread): add member to save backing store on
- IA64. (ruby-bugs PR1086)
+Wed Sep 3 14:05:16 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (thread_mark): mark IA64 backing store region.
+ * version 1.1 alpha6 released.
- * eval.c (thread_free): free saved IA64 backing store.
+ * eval.c (mod_s_constants): context sensitive constant list.
- * eval.c (rb_thread_save_context): save IA64 backing store as well.
+ * variable.c (mod_constants): no more `all' option.
- * eval.c (rb_thread_restore_context): restore IA64 backing store.
+ * variable.c (mod_const_of): the values for autoload classes are
+ their name strings.
- * eval.c (THREAD_ALLOC): initialize IA64 members.
+ * class.c (class_instance_methods): no special treatment for
+ singleton classes.
-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>.
+ * object.c (obj_singleton_methods): returns list of singleton
+ method names.
- * lib/debug.rb(debug_command): incomplete regexp.
+ * parse.y (yylex): no here document after `class' keyword.
-Mon Aug 11 17:33:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (f_load): expand path if fname begins with `~'.
- * eval.c (rb_call_super): do not use rb_block_given_p() for
- check. [ruby-talk:78656]
+Tue Sep 2 13:19:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
+ * class.c (ins_methods_i): do not list undef'ed methods.
-Sun Aug 10 10:43:05 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+Mon Sep 1 13:42:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
- from 1k to 16k bytes. [ruby-talk:78603]
+ * version 1.1 alpha5 released.
- * ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
- partial write to allow interruption in SSLSocket#write.
+ * object.c (mod_attr_reader): create methods to define attribute
+ reader/write/accessor.
-Sun Aug 10 00:34:16 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * class.c (rb_define_attr): always defines accessors.
- * cygwin/GNUmakefile: remove unnecessary '--drive-name=$(CC)'
- for ccache.
+ * eval.c (rb_call): alias occurred in the module body caused SEGV.
-Sat Aug 9 10:36:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y: did not generate here document strings properly.
- * marshal.c (w_object): do not dump generic instance variable when
- marshal_dump is defined.
+Mon Sep 1 11:43:57 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Sat Aug 9 00:35:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+ * parse.y (yylex): heredoc dropped an extra character.
- * 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 29 11:10:21 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Fri Aug 8 12:33:17 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+ * class.c (class_instance_methods): same method names should not
+ appear more than once.
- * bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
- add the -aa option to WLDFLAGS.
+ * parse.y (yylex): spaces can follow =begin/=end.
-Fri Aug 8 11:29:26 2003 Koji Arai <jca02266@nifty.ne.jp>
+ * variable.c (find_class_path): look for class_tbl also for
+ unnamed fundamental classes, such as Object, String, etc.
- * marshal.c (w_object): should set `c_arg' at first.
+ * variable.c (rb_name_class): can't name class before String class
+ is initialized.
-Fri Aug 8 03:22:28 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+ * inits.c (rb_call_inits): unrecognized dependency from GC to
+ Array.
- * lib/webrick/httputils.rb (FormData#list): should not take
- a side effect for the receiver.
+ * variable.c (find_class_path): could not find class if Object's
+ iv_tbl is NULL.
-Thu Aug 7 14:40:37 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Thu Aug 28 13:12:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * cygwin/GNUmakefile: better --disbale-shared option support.
+ * version 1.1 alpha4 released.
- * cygwin/GNUmakefile: add forwarding DLL target for cygwin.
+ * variable.c (mod_constants): wrong condition for singleton
+ class.
-Thu Aug 7 14:21:05 2003 Corinna Vinschen <vinschen@redhat.com>
+ * parse.y (yylex): revised `=begin' skip code.
- * configure.in: Fix Cygwin specific naming of libraries to
- be net distribution compliant. (ruby-bugs:PR#1077)
- cygwin-ruby18.dll -> cygruby18.dll
+ * parse.y (here_document): forgot to free(eos).
-Thu Aug 7 12:51:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (yylex): spaces after `<<' prohibited for here
+ documents to avoid confusing with operator `<<'.
- * eval.c (rb_f_at_exit): should not be called without a block.
- block_given check added.
+ * eval.c (is_defined): separated from rb_eval().
-Thu Aug 7 06:46:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+Wed Aug 27 11:32:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_call0): forgot to pop ruby_class.
+ * version 1.1 alpha3 released.
- * eval.c (rb_call0): update ruby_class as well as ruby_cref.
- (ruby-bugs-ja:PR#540)
+ * variable.c (mod_name): returns name of the class/module.
-Thu Aug 7 04:52:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (here_document): finally here document available now.
- * eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
- ruby_cref. [ruby-talk:78141]
+ * variable.c (fc_i): some classes/modules does not have iv_tbl.
-Thu Aug 7 04:19:15 2003 Akinori MUSHA <knu@iDaemons.org>
+ * variable.c (find_class_path): avoid infinite loop.
- * 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.
+Tue Aug 26 13:43:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Thu Aug 7 00:15:00 2003 Shigeo Kobayashi <shigek@ruby-lang.org>
+ * eval.c (rb_eval): undef'ing non-existing method will raise
+ NameError exception.
- * ext/bigdecimal.c: Comparison results adjusted to Float's.
- * ext/bigdecimal.c: Use rb_num_coerce_????(x,y) instead of own.
+ * object.c (class_s_new): needed to create metaclass too.
-Wed Aug 6 22:58:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+ * eval.c (error_print): no class name print for anonymous class.
- * lib/test/unit/testcase.rb: Added equality checking.
- * lib/test/unit/testsuite.rb: Added equality checking.
- * lib/test/unit/assertions.rb: Fixed a warning.
+ * eval.c (rb_longjmp): proper exception raised if raise() called
+ without arguments, with $! or $@ set.
-Wed Aug 6 17:28:10 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * object.c (Init_Object): superclass()'s method argument setting
+ was wrong again.
- * ext/extmk.rb (extmake): pass LIBPATH to make ruby. [ruby-dev:21137]
+ * class.c (mod_ancestors): list superclasses and included modules
+ in priority order.
- * ext/extmk.rb (extmake): set library name as source file name in
- Init_ext(). [ruby-dev:21137]
+Mon Aug 25 11:53:11 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/mkmf.rb (Logging::postpone): postpone logging messages after
- heading message as the result of the block.
+ * version 1.1 alpha2 released.
- * lib/mkmf.rb (macro_defined?): append newline to src unless ended
- with it.
+ * sample/ruby-mode.el (ruby-parse-region): auto-indent now
+ supports "\\" in the strings.
- * lib/mkmf.rb (have_library): treat nil function name as "main".
- (ruby-bugs:PR#1083)
+ * struct.c (struct_getmember): new API to get member value from C
+ language side.
- * lib/mkmf.rb (pkg_config): should append additional libraries to
- $libs but not $LIBS. [ruby-dev:21137]
+Sat Aug 23 21:39:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * ext/io/wait/extconf.rb: check DOSISH macro instead of platform.
+ * parse.y (assignable): remove unnecessary local variable
+ initialize by nil.
- * ext/digest/sha1/extconf.rb: have_library already appends library
- name.
+Fri Aug 22 14:26:40 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Aug 6 17:23:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * eval.c (error_print): modified exception print format.
- * eval.c: initialize /* OK */ variables by Qnil to stop warnings.
+Thu Aug 21 16:10:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Wed Aug 6 04:58:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+ * sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
+ calculated with keyword operators.
- * ext/Setup*: add io/wait and openssl.
+Thu Aug 21 11:36:58 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Wed Aug 6 01:13:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * parse.y (arg): ary[0] += 1 cause SEGV
- * eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
+Wed Aug 20 17:28:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * eval.c (rb_f_autoload_p): ditto.
+ * ruby.c (ruby_process_options): require() all modules after
+ processing all options
- * class.c (rb_mod_init_copy): no longer implements independent
- clone and dup methods. override "initialize_copy" instead.
- [ruby-core:01352]
+ * process.c (rb_proc_exec): more security checks added.
- * object.c (rb_class_s_alloc): define Class allocation function.
- this makes Classes to follow clone framework that uses
- initialize_copy.
+ * process.c (rb_proc_exec): insecure path on exec.
- * object.c (rb_class_initialize): separate instantiation and
- initialization.
+ * hash.c (f_getenv): PATH modification security check.
- * object.c (rb_obj_alloc): prohibit instantiation from
- uninitialized class.
+Tue Aug 19 00:15:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * object.c (rb_class_superclass): check uninitialized class.
+ * version 1.1 alpha1 released.
- * array.c (rb_ary_fill): wrong index processing with block. this
- fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
+ * eval.c (mod_eval): work as normal eval() if second binding
+ argument given.
- * marshal.c (w_object): should preserve generic ivar for nil,
- true, false, symbols, and fixnums.
+ * eval.c (rb_call): did not raise ArgumentError if too many
+ arguments more than optional arguments (without rest arg).
- * marshal.c (w_uclass): base_klass check should be done after
- rb_class_real().
+ * eval.c (rb_eval): did not work well for op_asgn2 (attribute
+ self assignment).
-Wed Aug 6 01:18:50 2003 Minero Aoki <aamine@loveruby.net>
+ * eval.c (Init_Thread): returns main thread.
- * lib/net/http.rb: update document.
+Mon Aug 18 09:25:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/net/pop.rb: ditto.
+ * object.c (inspect_i): did not display T_DATA instance variables.
- * lib/net/protocol.rb: ditto.
+ * parse.y: provides more accurate line number information.
-Wed Aug 6 00:48:37 2003 Koji Arai <jca02266@nifty.ne.jp>
+ * eval.c (thread_value): include value's backtrace information in
+ the variable `$@'.
- * marshal.c (w_object): should recommend marshal_dump rather than
- _dump_data.
+ * eval.c (f_abort): print backtrace and exit.
-Tue Aug 5 17:58:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+Sat Aug 16 00:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
- * lib/fileutils.rb (install): should preserve timestamp only.
+ * eval.c (class_new_instance): do not make instance from virtual
+ classes.
-Tue Aug 5 17:31:59 2003 Ian Macdonald <ian@caliban.org>
+ * object.c (class_s_new): do not make subclass of singleton class.
- * lib/shell/command-processor.rb (Shell::CommandProcessor::rmdir):
- simple typo.
+Fri Aug 15 15:49:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-Tue Aug 5 15:47:34 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+ * eval.c (call_trace_func): block context switch in the trace
+ function.
- * eval.c (rb_load): should preserve current source file/line.
+ * eval.c (rb_eval): clear method cache at class extension.
-Tue Aug 5 10:04:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * object.c (obj_type): returns object's class even if it defines
+ singleton methods.
- * string.c (str_new4): ptr may refer null_str.
+Fri Aug 15 19:40:43 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-Mon Aug 4 17:25:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+ * ext/socket/socket.c (Init_socket): small typo caused SEGV.
- * stable version 1.8.0 released.
+Wed Aug 13 17:51:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
+ * version 1.1 alpha0 released.
-Local variables:
-add-log-time-format: (lambda ()
- (let* ((time (current-time))
- (diff (+ (cadr time) 32400))
- (lo (% diff 65536))
- (hi (+ (car time) (/ diff 65536))))
- (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/GPL b/GPL
deleted file mode 100644
index 5b6e7c66c2..0000000000
--- a/GPL
+++ /dev/null
@@ -1,340 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- 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
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-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 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
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-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
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- 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
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-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
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-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
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-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
-
- 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
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-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
-
- 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
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- 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 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-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 Library General
-Public License instead of this License.
diff --git a/LEGAL b/LEGAL
deleted file mode 100644
index 908eb270f5..0000000000
--- a/LEGAL
+++ /dev/null
@@ -1,370 +0,0 @@
-LEGAL NOTICE INFORMATION
-------------------------
-
-All the files in this distribution are covered under either the Ruby's
-license (see the file COPYING) or public-domain except some files
-mentioned below.
-
-regex.[ch]:
-
- These files are under LGPL. Treat them as LGPL says. (See the file
- LGPL for details)
-
- Extended regular expression matching and search library.
- Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file LGPL. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
- Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
- Last change: May 21, 1993 by t^2
- removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp>
- Perl5 extension added by matz <matz@caelum.co.jp>
- UTF-8 extension added Jan 16 1999 by Yoshida Masato <yoshidam@tau.bekkoame.ne.jp>
-
-configure:
-
- This file is free software.
-
- Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-config.guess:
-config.sub:
-parse.c:
-
- As long as you distribute these files with the file configure, they
- are covered under the Ruby's license.
-
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
- Free Software Foundation, Inc.
-
- This file is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by Autoconf, you may include it under
- the same distribution terms that you use for the rest of that program.
-
-util.c (partly):
-win32/win32.[ch]:
-
- You can apply the Artistic License to these files. (or GPL,
- alternatively)
-
- Copyright (c) 1993, Intergraph Corporation
-
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the perl README file.
-
-random.c
-
- This file is under the new-style BSD license.
-
- A C-program for MT19937, with initialization improved 2002/2/10.
- Coded by Takuji Nishimura and Makoto Matsumoto.
- This is a faster version by taking Shawn Cokus's optimization,
- Matthe Bellew's simplification, Isaku Wada's real version.
-
- Before using, initialize the state by using init_genrand(seed)
- or init_by_array(init_key, key_length).
-
- Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
-
- Any feedback is very welcome.
- http://www.math.keio.ac.jp/matumoto/emt.html
- email: matumoto@math.keio.ac.jp
-
-st.[ch]:
-x68/*:
-missing/alloca.c:
-missing/dup2.c:
-missing/finite.c:
-missing/hypot.c:
-missing/isinf.c:
-missing/isnan.c:
-missing/memcmp.c:
-missing/memmove.c:
-missing/strcasecmp.c:
-missing/strchr.c:
-missing/streror.c:
-missing/strftime.c:
-missing/strncasecmp.c:
-missing/strstr.c:
-missing/strtol.c:
-ext/digest/sha1/sha1.[ch]:
-
- These files are all under public domain.
-
-missing/strtod.c:
-
- This file will not be used on most platforms depending on how the
- configure script results. In any case you must not receive any fee
- with the file itself.
-
- Copyright (c) 1988-1993 The Regents of the University of California.
- Copyright (c) 1994 Sun Microsystems, Inc.
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies. The University of California
- makes no representations about the suitability of this
- software for any purpose. It is provided "as is" without
- express or implied warranty.
-
-missing/strtoul.c:
-
- This file will not be used on most platforms depending on how the
- configure script results. In any case you must not receive any fee
- with the file itself.
-
- Copyright 1988 Regents of the University of California
-
- Permission to use, copy, modify, and distribute this
- software and its documentation for any purpose and without
- fee is hereby granted, provided that the above copyright
- notice appear in all copies. The University of California
- makes no representations about the suitability of this
- software for any purpose. It is provided "as is" without
- express or implied warranty.
-
-missing/erf.c:
-missing/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) 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.
-
-ext/digest/md5/md5.[ch]:
-
- These files are under the following license. Ruby uses modified
- versions of them.
-
- Copyright (C) 1999, 2000 Aladdin Enterprises. All rights reserved.
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- L. Peter Deutsch
- ghost@aladdin.com
-
-ext/digest/rmd160/rmd160.[ch]:
-
- These files have the following copyright information, and by the
- author we are allowed to use it under the new-style BSD license.
-
- AUTHOR: Antoon Bosselaers, ESAT-COSIC
- (Arranged for libc by Todd C. Miller)
- DATE: 1 March 1996
-
- Copyright (c) Katholieke Universiteit Leuven
- 1996, All Rights Reserved
-
-ext/digest/rmd160/rmd160hl.c:
-ext/digest/sha1/sha1hl.c:
-
- These files are under the beer-ware license.
-
- "THE BEER-WARE LICENSE" (Revision 42):
- <phk@login.dkuug.dk> wrote this file. As long as you retain this notice you
- can do whatever you want with this stuff. If we meet some day, and you think
- this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
-
-ext/digest/sha2/sha2.[ch]:
-ext/digest/sha2/sha2hl.c:
-
- These files are under the new-style BSD license.
-
- Copyright 2000 Aaron D. Gifford. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- 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 copyright holder nor the names of contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- 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.
-
-ext/nkf/nkf-utf8/config.h:
-ext/nkf/nkf-utf8/nkf.c:
-ext/nkf/nkf-utf8/utf8tbl.c:
-
- These files are under the following license. So to speak, it is
- copyrighted semi-public-domain software.
-
- Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
- Everyone is permitted to do anything on this program
- including copying, modifying, improving,
- as long as you don't try to pretend that you wrote it.
- i.e., the above copyright notice has to appear in all copies.
- Binary distribution requires original version messages.
- You don't have to ask before copying, redistribution or publishing.
- THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
-
-ext/socket/addrinfo.h:
-ext/socket/getaddrinfo.c:
-ext/socket/getnameinfo.c:
-
- These files are under the new-style BSD license.
-
- Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
- 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 project 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 PROJECT 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 PROJECT 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.
-
-ext/win32ole/win32ole.c:
-
- You can apply the Artistic License to this file. (or GPL,
- alternatively)
-
- (c) 1995 Microsoft Corporation. All rights reserved.
- Developed by ActiveWare Internet Corp., http://www.ActiveWare.com
-
- Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
- <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
-
- 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 Perl distribution.
diff --git a/LGPL b/LGPL
deleted file mode 100644
index b1e3f5a263..0000000000
--- a/LGPL
+++ /dev/null
@@ -1,504 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 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.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes 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
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; 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.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000000..17e8924bb7
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,251 @@
+COPYING
+COPYING.LIB
+ChangeLog
+MANIFEST
+Makefile.in
+README
+README.jp
+README.EXT
+README.EXT.jp
+ToDo
+array.c
+bignum.c
+class.c
+compar.c
+configure
+configure.in
+config.guess
+config.sub
+defines.h
+dir.c
+dln.c
+dln.h
+dmyext.c
+enum.c
+env.h
+error.c
+eval.c
+file.c
+gc.c
+hash.c
+inits.c
+install-sh
+instruby.rb
+intern.h
+io.c
+keywords
+lex.c
+main.c
+marshal.c
+math.c
+mkconfig.rb
+node.h
+numeric.c
+object.c
+pack.c
+parse.c
+parse.y
+prec.c
+process.c
+random.c
+range.c
+re.c
+re.h
+regex.c
+regex.h
+ruby.1
+ruby.c
+ruby.h
+rubyio.h
+rubysig.h
+rubytest.rb
+signal.c
+sprintf.c
+st.c
+st.h
+string.c
+struct.c
+time.c
+util.h
+util.c
+variable.c
+version.c
+version.h
+djgpp/README.djgpp
+djgpp/config.hin
+djgpp/config.sed
+djgpp/configure.bat
+djgpp/mkver.sed
+cygwin/GNUmakefile.in
+ext/Setup
+ext/Setup.dj
+ext/Setup.emx
+ext/Setup.x68
+ext/aix_mksym.rb
+ext/configsub.rb
+ext/extmk.rb.in
+lib/English.rb
+lib/Env.rb
+lib/README
+lib/base64.rb
+lib/cgi.rb
+lib/cgi/session.rb
+lib/cgi-lib.rb
+lib/complex.rb
+lib/date.rb
+lib/date2.rb
+lib/debug.rb
+lib/delegate.rb
+lib/e2mmap.rb
+lib/eregex.rb
+lib/find.rb
+lib/final.rb
+lib/finalize.rb
+lib/ftplib.rb
+lib/ftools.rb
+lib/getopts.rb
+lib/getoptlong.rb
+lib/importenv.rb
+lib/irb/completion.rb
+lib/irb/frame.rb
+lib/irb/input-method.rb
+lib/irb/irb.rb
+lib/irb/loader.rb
+lib/irb/main.rb
+lib/irb/multi-irb.rb
+lib/irb/ruby-lex.rb
+lib/irb/ruby-token.rb
+lib/irb/slex.rb
+lib/irb/version.rb
+lib/irb/workspace-binding-2.rb
+lib/irb/workspace-binding.rb
+lib/irb/xmp.rb
+lib/jcode.rb
+lib/mailread.rb
+lib/mathn.rb
+lib/matrix.rb
+lib/mkmf.rb
+lib/monitor.rb
+lib/mutex_m.rb
+lib/net/ftp.rb
+lib/net/http.rb
+lib/net/imap.rb
+lib/net/pop.rb
+lib/net/protocol.rb
+lib/net/smtp.rb
+lib/net/telnet.rb
+lib/observer.rb
+lib/open3.rb
+lib/ostruct.rb
+lib/parsearg.rb
+lib/parsedate.rb
+lib/ping.rb
+lib/profile.rb
+lib/pstore.rb
+lib/rational.rb
+lib/readbytes.rb
+lib/shellwords.rb
+lib/singleton.rb
+lib/sync.rb
+lib/telnet.rb
+lib/tempfile.rb
+lib/thread.rb
+lib/thwait.rb
+lib/timeout.rb
+lib/tracer.rb
+lib/weakref.rb
+misc/README
+misc/inf-ruby.el
+misc/ruby-mode.el
+misc/rubydb2x.el
+misc/rubydb3x.el
+missing/alloca.c
+missing/crypt.c
+missing/dir.h
+missing/dup2.c
+missing/file.h
+missing/finite.c
+missing/flock.c
+missing/isinf.c
+missing/isnan.c
+missing/memcmp.c
+missing/memmove.c
+missing/mkdir.c
+missing/os2.c
+missing/strcasecmp.c
+missing/strncasecmp.c
+missing/strchr.c
+missing/strdup.c
+missing/strerror.c
+missing/strftime.c
+missing/strstr.c
+missing/strtod.c
+missing/strtol.c
+missing/strtoul.c
+missing/vsnprintf.c
+missing/x68.c
+sample/README
+sample/biorhythm.rb
+sample/cal.rb
+sample/cbreak.rb
+sample/clnt.rb
+sample/dbmtest.rb
+sample/dir.rb
+sample/dualstack-fetch.rb
+sample/dualstack-httpd.rb
+sample/eval.rb
+sample/export.rb
+sample/exyacc.rb
+sample/fact.rb
+sample/fib.awk
+sample/fib.pl
+sample/fib.py
+sample/fib.rb
+sample/fib.scm
+sample/freq.rb
+sample/from.rb
+sample/fullpath.rb
+sample/getopts.test
+sample/goodfriday.rb
+sample/irb.rb
+sample/less.rb
+sample/list.rb
+sample/list2.rb
+sample/list3.rb
+sample/mine.rb
+sample/mkproto.rb
+sample/mpart.rb
+sample/mrshtest.rb
+sample/observ.rb
+sample/occur.pl
+sample/occur.rb
+sample/occur2.rb
+sample/philos.rb
+sample/pi.rb
+sample/rename.rb
+sample/rcs.awk
+sample/rcs.dat
+sample/rcs.rb
+sample/regx.rb
+sample/sieve.rb
+sample/svr.rb
+sample/test.rb
+sample/time.rb
+sample/trojan.rb
+sample/tsvr.rb
+sample/uumerge.rb
+win32/Makefile.sub
+win32/README.win32
+win32/config.h.in
+win32/config.status.in
+win32/configure.bat
+win32/mkexports.rb
+win32/resource.rb
+win32/setup.mak
+win32/win32.c
+win32/win32.h
+win32/winmain.c
+x68/fconvert.c
+x68/select.c
+x68/_dtos18.c
+x68/_round.c
diff --git a/Makefile.in b/Makefile.in
index 314e1ed256..37f644d786 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,4 @@
SHELL = /bin/sh
-NULLCMD = :
#### Start of system configuration section. ####
@@ -11,50 +10,24 @@ YACC = @YACC@
PURIFY =
AUTOCONF = autoconf
@SET_MAKE@
-MKFILES = @MAKEFILES@
prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-sbindir = @sbindir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
-arch = @arch@
-sitearch = @sitearch@
-sitedir = @sitedir@
-
-TESTUI = console
-TESTS =
-RDOCTARGET = @RDOCTARGET@
-
-EXTOUT = @EXTOUT@
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-
-empty =
-OUTFLAG = @OUTFLAG@$(empty)
-CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
+CFLAGS = @CFLAGS@
+CPPFLAGS = -I. -I$(srcdir) -I@includedir@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
-EXTLDFLAGS =
-XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
+XLDFLAGS = @XLDFLAGS@
EXTLIBS =
LIBS = @LIBS@ $(EXTLIBS)
MISSING = @LIBOBJS@ @ALLOCA@
LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
+DLDFLAGS = @LIBRUBY_DLDFLAGS@
SOLIBS = @SOLIBS@
MAINLIBS = @MAINLIBS@
-MINIOBJS = @MINIOBJS@
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
RUBY_SO_NAME=@RUBY_SO_NAME@
EXEEXT = @EXEEXT@
PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-RUBY = $(RUBY_INSTALL_NAME)
-MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@
#### End of system configuration section. ####
@@ -67,114 +40,238 @@ LIBRUBY_SO = @LIBRUBY_SO@
LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
LIBRUBY = @LIBRUBY@
LIBRUBYARG = @LIBRUBYARG@
-LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
-LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
-PREP = @PREP@
-ARCHFILE = @ARCHFILE@
-SETUP =
-EXTSTATIC = @EXTSTATIC@
-
-RM = rm -f
-NM = @NM@
-AR = @AR@
-ARFLAGS = rcu
-RANLIB = @RANLIB@
-AS = @AS@
-ASFLAGS = @ASFLAGS@
+EXTOBJS =
+
+MAINOBJ = main.@OBJEXT@
+
+OBJS = array.@OBJEXT@ \
+ bignum.@OBJEXT@ \
+ class.@OBJEXT@ \
+ compar.@OBJEXT@ \
+ dir.@OBJEXT@ \
+ dln.@OBJEXT@ \
+ enum.@OBJEXT@ \
+ error.@OBJEXT@ \
+ eval.@OBJEXT@ \
+ file.@OBJEXT@ \
+ gc.@OBJEXT@ \
+ hash.@OBJEXT@ \
+ inits.@OBJEXT@ \
+ io.@OBJEXT@ \
+ marshal.@OBJEXT@ \
+ math.@OBJEXT@ \
+ numeric.@OBJEXT@ \
+ object.@OBJEXT@ \
+ pack.@OBJEXT@ \
+ parse.@OBJEXT@ \
+ process.@OBJEXT@ \
+ prec.@OBJEXT@ \
+ random.@OBJEXT@ \
+ range.@OBJEXT@ \
+ re.@OBJEXT@ \
+ regex.@OBJEXT@ \
+ ruby.@OBJEXT@ \
+ signal.@OBJEXT@ \
+ sprintf.@OBJEXT@ \
+ st.@OBJEXT@ \
+ string.@OBJEXT@ \
+ struct.@OBJEXT@ \
+ time.@OBJEXT@ \
+ util.@OBJEXT@ \
+ variable.@OBJEXT@ \
+ version.@OBJEXT@ \
+ $(MISSING)
+
+all: miniruby$(EXEEXT) @PREP@ rbconfig.rb $(LIBRUBY)
+ @@MINIRUBY@ -Cext extmk.rb @EXTSTATIC@
+
+miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) dmyext.@OBJEXT@
+ @rm -f $@
+ $(PURIFY) $(CC) $(LDFLAGS) $(MAINOBJ) dmyext.@OBJEXT@ $(LIBRUBY_A) $(LIBS) -o $@
+
+$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(EXTOBJS)
+ @rm -f $@
+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
+
+$(LIBRUBY_A): $(OBJS) dmyext.@OBJEXT@
+ @AR@ rcu $@ $(OBJS) dmyext.@OBJEXT@
+ @-@RANLIB@ $@ 2> /dev/null || true
+
+$(LIBRUBY_SO): $(OBJS) dmyext.@OBJEXT@ miniruby$(EXEEXT)
+ $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.@OBJEXT@ $(SOLIBS) -o $@
+ @-@MINIRUBY@ -e 'ARGV.each{|link| File.delete link if File.exist? link; \
+ File.symlink "$(LIBRUBY_SO)", link}' \
+ $(LIBRUBY_ALIASES) || true
-OBJEXT = @OBJEXT@
-MANTYPE = @MANTYPE@
+install: rbconfig.rb
+ @MINIRUBY@ $(srcdir)/instruby.rb $(DESTDIR)
-INSTALLED_LIST= .installed.list
-#### End of variables
+clean:; @rm -f $(OBJS) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES) $(MAINOBJ) rbconfig.rb
+ @rm -f ext/extinit.c ext/extinit.@OBJEXT@ dmyext.@OBJEXT@
+ @-@MINIRUBY@ -Cext extmk.rb clean 2> /dev/null || true
+ @rm -f $(PROGRAM) miniruby$(EXEEXT)
-all:
+distclean: clean
+ @rm -f Makefile ext/extmk.rb config.h
+ @rm -f ext/config.cache config.cache config.log config.status
+ @rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp
-.DEFAULT: all
+realclean: distclean
+ @rm -f parse.c
+ @rm -f lex.c
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
+test: miniruby$(EXEEXT)
+ @./miniruby$(EXEEXT) $(srcdir)/rubytest.rb
-miniruby$(EXEEXT):
- @$(RM) $@
- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
-
-$(PROGRAM):
- @$(RM) $@
- $(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) $@
- $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
- @-$(RANLIB) $@ 2> /dev/null || true
-
-$(LIBRUBY_SO):
- @-$(PRE_LIBRUBY_UPDATE)
- $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
- @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
- File.symlink "$(LIBRUBY_SO)", link}' \
- $(LIBRUBY_ALIASES) || true
+rbconfig.rb: miniruby$(EXEEXT) $(srcdir)/mkconfig.rb config.status
+ @@MINIRUBY@ $(srcdir)/mkconfig.rb rbconfig.rb
-fake.rb: Makefile
+fake.rb: miniruby$(EXEEXT)
@echo ' \
class Object; \
- CROSS_COMPILING = RUBY_PLATFORM; \
remove_const :RUBY_PLATFORM; \
- remove_const :RUBY_VERSION; \
RUBY_PLATFORM = "@arch@"; \
- RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
- end; \
- if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
- class File; \
- remove_const :ALT_SEPARATOR; \
- ALT_SEPARATOR = "\\"; \
+ if defined? PLATFORM; \
+ remove_const :PLATFORM; \
+ PLATFORM = "@arch@"; \
end; \
- end; \
+ CROSS_COMPILING = true; \
+ end \
' > $@
-Makefile: $(srcdir)/Makefile.in
-
-$(MKFILES): config.status $(srcdir)/common.mk
- MAKE=$(MAKE) $(SHELL) ./config.status
- @{ \
- echo "all:; -@rm -f conftest.mk"; \
- echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
- echo ".force:"; \
- } > conftest.mk || exit 1; \
- $(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
- { echo "Makefile updated, restart."; exit 1; }
-
config.status: $(srcdir)/configure
- MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
+ $(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in
cd $(srcdir) && $(AUTOCONF)
+.c.@OBJEXT@:
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
lex.c: keywords
- @-$(RM) $@
- gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@ || \
- cp "$(srcdir)/$@" .
+ gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $(srcdir)/keywords > lex.c
-.y.c:
+parse.c: parse.y
$(YACC) $<
- sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
- rm -f y.tab.c
+ mv -f y.tab.c parse.c
-.c.@OBJEXT@:
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+parse.@OBJEXT@: parse.c
+
+alloca.@OBJEXT@: $(srcdir)/missing/alloca.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/alloca.c
+
+crypt.@OBJEXT@: $(srcdir)/missing/crypt.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/crypt.c
+
+dup2.@OBJEXT@: $(srcdir)/missing/dup2.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dup2.c
+
+finite.@OBJEXT@: $(srcdir)/missing/finite.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/finite.c
+
+flock.@OBJEXT@: $(srcdir)/missing/flock.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/flock.c
-.s.@OBJEXT@:
- $(AS) $(ASFLAGS) -o $@ $<
+isinf.@OBJEXT@: $(srcdir)/missing/isinf.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isinf.c
-clean-local::
- @$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+isnan.@OBJEXT@: $(srcdir)/missing/isnan.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isnan.c
-distclean-local::
- @$(RM) ext/config.cache $(RBCONFIG)
+fnmatch.@OBJEXT@: $(srcdir)/missing/fnmatch.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fnmatch.c
-ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
- $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
+memcmp.@OBJEXT@: $(srcdir)/missing/memcmp.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memcmp.c
+
+memmove.@OBJEXT@: $(srcdir)/missing/memmove.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memmove.c
+
+mkdir.@OBJEXT@: $(srcdir)/missing/mkdir.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/mkdir.c
+
+vsnprintf.@OBJEXT@: $(srcdir)/missing/vsnprintf.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/vsnprintf.c
+
+strcasecmp.@OBJEXT@: $(srcdir)/missing/strcasecmp.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strcasecmp.c
+
+strncasecmp.@OBJEXT@: $(srcdir)/missing/strncasecmp.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strncasecmp.c
+
+strchr.@OBJEXT@: $(srcdir)/missing/strchr.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strchr.c
+
+strerror.@OBJEXT@: $(srcdir)/missing/strerror.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strerror.c
+
+strftime.@OBJEXT@: $(srcdir)/missing/strftime.c
+ $(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strftime.c
+
+strstr.@OBJEXT@: $(srcdir)/missing/strstr.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strstr.c
+
+strtod.@OBJEXT@: $(srcdir)/missing/strtod.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtod.c
+
+strtol.@OBJEXT@: $(srcdir)/missing/strtol.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtol.c
+
+strtoul.@OBJEXT@: $(srcdir)/missing/strtoul.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtoul.c
+
+x68.@OBJEXT@: $(srcdir)/missing/x68.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/x68.c
+
+os2.@OBJEXT@: $(srcdir)/missing/os2.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/os2.c
+
+dl_os2.@OBJEXT@: $(srcdir)/missing/dl_os2.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dl_os2.c
+
+win32.@OBJEXT@: $(srcdir)/win32/win32.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -I$(srcdir)/missing -c $(srcdir)/win32/win32.c
+
+# Prevent GNU make v3 from overflowing arg limit on SysV.
+.NOEXPORT:
+###
+parse.@OBJEXT@: parse.y ruby.h config.h defines.h intern.h env.h node.h st.h regex.h util.h lex.c
+###
+array.@OBJEXT@: array.c ruby.h config.h defines.h intern.h util.h st.h
+bignum.@OBJEXT@: bignum.c ruby.h config.h defines.h intern.h
+class.@OBJEXT@: class.c ruby.h config.h defines.h intern.h rubysig.h node.h st.h
+compar.@OBJEXT@: compar.c ruby.h config.h defines.h intern.h
+dir.@OBJEXT@: dir.c ruby.h config.h defines.h intern.h
+dln.@OBJEXT@: dln.c config.h defines.h dln.h
+dmyext.@OBJEXT@: dmyext.c
+enum.@OBJEXT@: enum.c ruby.h config.h defines.h intern.h node.h
+error.@OBJEXT@: error.c ruby.h config.h defines.h intern.h env.h version.h
+eval.@OBJEXT@: eval.c ruby.h config.h defines.h intern.h node.h env.h rubysig.h st.h dln.h
+file.@OBJEXT@: file.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h dln.h
+gc.@OBJEXT@: gc.c ruby.h config.h defines.h intern.h rubysig.h st.h node.h env.h re.h regex.h
+hash.@OBJEXT@: hash.c ruby.h config.h defines.h intern.h st.h rubysig.h util.h
+inits.@OBJEXT@: inits.c ruby.h config.h defines.h intern.h
+io.@OBJEXT@: io.c ruby.h config.h defines.h intern.h rubyio.h rubysig.h env.h util.h
+main.@OBJEXT@: main.c ruby.h config.h defines.h intern.h
+marshal.@OBJEXT@: marshal.c ruby.h config.h defines.h intern.h rubyio.h st.h
+prec.@OBJEXT@: prec.c ruby.h config.h defines.h intern.h
+math.@OBJEXT@: math.c ruby.h config.h defines.h intern.h
+numeric.@OBJEXT@: numeric.c ruby.h config.h defines.h intern.h
+object.@OBJEXT@: object.c ruby.h config.h defines.h intern.h st.h
+pack.@OBJEXT@: pack.c ruby.h config.h defines.h intern.h
+process.@OBJEXT@: process.c ruby.h config.h defines.h intern.h rubysig.h st.h
+random.@OBJEXT@: random.c ruby.h config.h defines.h intern.h
+range.@OBJEXT@: range.c ruby.h config.h defines.h intern.h
+re.@OBJEXT@: re.c ruby.h config.h defines.h intern.h re.h regex.h
+regex.@OBJEXT@: regex.c config.h regex.h
+ruby.@OBJEXT@: ruby.c ruby.h config.h defines.h intern.h dln.h node.h util.h
+signal.@OBJEXT@: signal.c ruby.h config.h defines.h intern.h rubysig.h
+sprintf.@OBJEXT@: sprintf.c ruby.h config.h defines.h intern.h
+st.@OBJEXT@: st.c config.h st.h
+string.@OBJEXT@: string.c ruby.h config.h defines.h intern.h re.h regex.h
+struct.@OBJEXT@: struct.c ruby.h config.h defines.h intern.h
+time.@OBJEXT@: time.c ruby.h config.h defines.h intern.h
+util.@OBJEXT@: util.c ruby.h config.h defines.h intern.h util.h
+variable.@OBJEXT@: variable.c ruby.h config.h defines.h intern.h env.h node.h st.h
+version.@OBJEXT@: version.c ruby.h config.h defines.h intern.h version.h
diff --git a/NEWS b/NEWS
deleted file mode 100644
index de1dafb533..0000000000
--- a/NEWS
+++ /dev/null
@@ -1,115 +0,0 @@
-= NEWS
-
-This document is a list of user visible feature changes made between
-releases excluding 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 with Ruby 1.8.5
-
-=== New platforms/build tools support
-
-* IA64 HP-UX
-
-* Visual C++ 8 SP1
-
-* autoconf 2.6x
-
-=== Library updates (outstanding ones only)
-
-* date
-
- * Updated based on date2 4.0.3.
-
-* digest
-
- * New internal APIs for C and Ruby.
-
- * Support for autoloading.
-
- * See below for new features and compatibility issues.
-
-* nkf
-
- * Updated based on nkf as of 2007-01-28.
-
-* tk
-
- * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
- (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
- but it is an alias name.
-
- * Updated Tile extension support based on Tile 0.7.8.
-
- * Support --without-X11 configure option for non-X11 versions of
- Tcl/Tk (e.g. Tcl/Tk Aqua).
-
- * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
- about STDIN blocking on Windows.
-
-=== New methods and features
-
-* builtin classes
-
- * New method: Kernel#instance_variable_defined?
-
- * New method: Module#class_variable_defined?
-
- * New feature: Dir::glob() can now take an array of glob patterns.
-
-* digest
-
- * New digest class methods: file
-
- * New digest instance methods: clone, reset, new,
- inspect, digest_length (alias size or length),
- block_length()
-
- * New library: digest/bubblebabble
-
- * New function: Digest(name)
-
-* fileutils
-
- * New option for FileUtils.cp_r(): :remove_destination
-
-* thread
-
- * Replaced with much faster mutex implementation in C.
- The former implementation is available with a
- configure option `--disable-fastthread'.
-
-* webrick
-
- * New method: WEBrick::Cookie.parse_set_cookies()
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* builtin classes
-
- * String#intern now raises SecurityError when $SAFE level is greater
- than zero.
-
-* fileutils
-
- * A minor implementation change breaks Rake <=0.7.1.
- Updating Rake to 0.7.2 fixes the problem.
-
-* digest
-
- * The constructor does no longer take an initial
- string to feed; digest() and hexdigest() now do,
- instead. The following examples show how to
- migrate:
-
- # Before
- md = Digest::MD5.new("string")
- # After (works with any version)
- md = Digest::MD5.new.update("string")
-
- # Before
- hd = Digest::MD5.new("string").hexdigest
- # After (works with any version)
- hd = Digest::MD5.hexdigest("string")
diff --git a/README b/README
index cf836415ad..760291d1ba 100644
--- a/README
+++ b/README
@@ -5,7 +5,6 @@ easy object-oriented programming. It has many features to
process text files and to do system management tasks (as in
Perl). It is simple, straight-forward, and extensible.
-
* Features of Ruby
+ Simple Syntax
@@ -19,35 +18,18 @@ Perl). It is simple, straight-forward, and extensible.
+ Highly Portable(works on many UNIX machines, and on DOS,
Windows, Mac, BeOS etc.)
-
* How to get Ruby
-The Ruby distribution files can be found in the following FTP site:
-
- ftp://ftp.ruby-lang.org/pub/ruby/
-
-The latest source code of this version series can be checked out
-through SVN with the following command:
-
- $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
-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
-
-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/
+The Ruby distribution can be found on:
+ ftp://ftp.netlab.co.jp/pub/lang/ruby/
-* Ruby home-page
-
-The URL of the Ruby home-page is:
-
- http://www.ruby-lang.org/
+You can get it by anonymous CVS. How to check out is:
+ $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
+ (Logging in to anonymous@cvs.ruby-lang.org)
+ CVS password: anonymous
+ $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:/src checkout ruby
* Mailing list
@@ -60,7 +42,6 @@ e.g.
in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
-
* How to compile and install
This is what you need to do to compile and install Ruby:
@@ -70,7 +51,7 @@ This is what you need to do to compile and install Ruby:
2. Run ./configure, which will generate config.h and Makefile.
- 3. Edit defines.h if you need. Usually this step will not be needed.
+ 3. Edit defines.h if you need. Probably this step will not need.
4. Remove comment mark(#) before the module names from ext/Setup (or
add module names if not present), if you want to link modules
@@ -94,18 +75,78 @@ 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.
-
* Copying
-See the file COPYING.
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@zetabits.com>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING file), 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
+ 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) rename any non-standard executables so the names do not conflict
+ with standard executables, which must also be provided.
+
+ d) make other distribution arrangements with the author.
+
+ 3. You may distribute the software in object code or executable
+ form, provided that you do at least ONE of the following:
+
+ a) distribute the executables 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 executables 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 this terms.
+
+ They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+ files under the ./missing directory. See each file for the copying
+ condition.
+
+ 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.
+
+* Ruby home-page
+
+The URL of the Ruby home-page is:
+
+ http://www.ruby-lang.org/
* The Author
Feel free to send comments and bug reports to the author. Here is the
author's latest mail address:
- matz@netlab.jp
+ matz@zetabits.com
-------------------------------------------------------
created at: Thu Aug 3 11:57:36 JST 1995
diff --git a/README.EXT b/README.EXT
index 2fc2fd606a..f3db6fa45b 100644
--- a/README.EXT
+++ b/README.EXT
@@ -5,23 +5,23 @@ This document explains how to make extension libraries for Ruby.
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
-types, so data will need to be converted between the languages.
+Ruby variables do not have static type and data themselves have
+types. So, data need to be converted across the languages.
-Data in Ruby are represented by the C type `VALUE'. Each VALUE data
-has its data-type.
+Data in Ruby represented C type `VALUE'. Each VALUE data have its
+data-type.
-To retrieve C data from a VALUE, you need to:
+To retrieve an C data from the VALUE, you need to:
- (1) Identify the VALUE's data type
- (2) Convert the VALUE into C data
+ (1) Identify VALUE's data type
+ (2) Convert VALUE into C data
-Converting to the wrong data type may cause serious problems.
+Converting to wrong data type may cause serious problems.
1.1 Data-types
-The Ruby interpreter has the following data types:
+Ruby interpreter has data-types as below:
T_NIL nil
T_OBJECT ordinary object
@@ -35,13 +35,12 @@ The Ruby interpreter has the following data types:
T_HASH associative array
T_STRUCT (Ruby) structure
T_BIGNUM multi precision integer
- T_FILE IO
T_TRUE true
T_FALSE false
T_DATA data
T_SYMBOL symbol
-In addition, there are several other types used internally:
+Otherwise, there are several other types used internally:
T_ICLASS
T_MATCH
@@ -54,9 +53,9 @@ Most of the types are represented by C structures.
1.2 Check Data Type of the VALUE
-The macro TYPE() defined in ruby.h shows the data type of the VALUE.
+The macro TYPE() defined in ruby.h shows data-type of the VALUE.
TYPE() returns the constant number T_XXXX described above. To handle
-data types, your code will look something like this:
+data-types, the code will be like:
switch (TYPE(obj)) {
case T_FIXNUM:
@@ -74,13 +73,13 @@ data types, your code will look something like this:
break;
}
-There is the data-type check function
+There is the data-type check function.
void Check_Type(VALUE value, int type)
-which raises an exception if the VALUE does not have the type specified.
+It raises an exception, if the VALUE does not have the type specified.
-There are also faster check macros for fixnums and nil.
+There are faster check-macros for fixnums and nil.
FIXNUM_P(obj)
NIL_P(obj)
@@ -90,43 +89,29 @@ There are also faster check macros for fixnums and nil.
The data for type T_NIL, T_FALSE, T_TRUE are nil, true, false
respectively. They are singletons for the data type.
-The T_FIXNUM data is a 31bit length fixed integer (63bit length on
-some machines), which can be converted to a C integer by using the
-FIX2INT() macro. There is also NUM2INT() which converts any Ruby
-numbers into C integers. The NUM2INT() macro includes a type check, so
-an exception will be raised if the conversion failed. NUM2DBL() can
-be used to retrieve the double float value in the same way.
-
-In version 1.7 or later it is recommended that you use the new macros
-StringValue() and StringValuePtr() to get a char* from a VALUE.
-StringValue(var) replaces var's value with the result of "var.to_str()".
-StringValuePtr(var) does same replacement and returns char*
-representation of var. These macros will skip the replacement if var is
-a String. Notice that the macros take only the lvalue as their
-argument, to change the value of var in place.
-
-In version 1.6 or earlier, STR2CSTR() was used to do the same thing
-but now it is deprecated in version 1.7, because STR2CSTR() has a risk
-of a dangling pointer problem in the to_str() impliclit conversion.
+The T_FIXNUM data is the 31bit length fixed integer (63bit length on
+some machines), which can be convert to the C integer by using
+FIX2INT() macro. There also be NUM2INT() which converts any Ruby
+numbers into C integer. The NUM2INT() macro includes type check, so
+the exception will be raised if conversion failed.
Other data types have corresponding C structures, e.g. struct RArray
-for T_ARRAY etc. The VALUE of the type which has the corresponding structure
+for T_ARRAY etc. VALUE of the type which has corresponding structure
can be cast to retrieve the pointer to the struct. The casting macro
-will be of the form RXXXX for each data type; for instance, RARRAY(obj).
-See "ruby.h".
+RXXXX for each data type like RARRAY(obj). see "ruby.h".
-For example, `RSTRING(str)->len' is the way to get the size of the
+For example, `RSTRING(size)->len' is the way to get the size of the
Ruby String object. The allocated region can be accessed by
-`RSTRING(str)->ptr'. For arrays, use `RARRAY(ary)->len' and
+`RSTRING(str)->ptr'. For arrays, `RARRAY(ary)->len' and
`RARRAY(ary)->ptr' respectively.
Notice: Do not change the value of the structure directly, unless you
-are responsible for the result. This ends up being the cause of interesting
+are responsible about the result. It will be the cause of interesting
bugs.
1.4 Convert C data into VALUE
-To convert C data to Ruby values:
+To convert C data to the values of Ruby:
* FIXNUM
@@ -136,25 +121,25 @@ To convert C data to Ruby values:
cast to VALUE.
-You can determine whether a VALUE is pointer or not by checking its LSB.
+You can determine whether VALUE is pointer or not, by checking 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
+Notice Ruby does not allow arbitrary pointer value to be VALUE. They
+should be pointers to the structures which Ruby knows. The known
structures are defined in <ruby.h>.
-To convert C numbers to Ruby values, use these macros.
+To convert C numbers to Ruby value, use these macros.
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.
+INT2NUM() converts integers into Bignums, if it is out of FIXNUM
+range, but bit slower.
-1.5 Manipulating Ruby data
+1.5 Manipulate Ruby data
-As I already mentioned, it is not recommended to modify an object's internal
-structure. To manipulate objects, use the functions supplied by the Ruby
-interpreter. Some (not all) of the useful functions are listed below:
+As I already told, it is not recommended to modify object's internal
+structure. To manipulate objects, use functions supplied by Ruby
+interpreter. Useful functions are listed below (not all):
String functions
@@ -164,40 +149,40 @@ interpreter. Some (not all) of the useful functions are listed below:
rb_str_new2(const char *ptr)
- Creates a new Ruby string from a C string. This is equivalent to
+ Creates a new Ruby string from 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.
+ should be tainted.
rb_tainted_str_new2(const char *ptr)
- Creates a new tainted Ruby string from a C string.
+ Creates a new tainted Ruby string from C string.
rb_str_cat(VALUE str, const char *ptr, long len)
- Appends len bytes of data from ptr to the Ruby string.
+ Appends len bytes data from ptr to the Ruby string.
Array functions
rb_ary_new()
- Creates an array with no elements.
+ Creates an array with no element.
rb_ary_new2(long len)
- Creates an array with no elements, allocating internal buffer
+ Creates an array with no element, with allocating internal buffer
for len elements.
rb_ary_new3(long n, ...)
- Creates an n-element array from the arguments.
+ Creates an n-elements array from arguments.
rb_ary_new4(long n, VALUE *elts)
- Creates an n-element array from a C array.
+ Creates an n-elements array from C array.
rb_ary_push(VALUE ary, VALUE val)
rb_ary_pop(VALUE ary)
@@ -205,14 +190,14 @@ interpreter. Some (not all) of the useful functions are listed below:
rb_ary_unshift(VALUE ary, VALUE val)
Array operations. The first argument to each functions must be an
- array. They may dump core if other types are given.
+ array. They may dump core if other types given.
-2. Extending Ruby with C
+2. Extend Ruby with C
-2.1 Addding new features to Ruby
+2.1 Add new features to Ruby
You can add new features (classes, methods, etc.) to the Ruby
-interpreter. Ruby provides APIs for defining the following things:
+interpreter. Ruby provides the API to define things below:
* Classes, Modules
* Methods, Singleton Methods
@@ -220,22 +205,22 @@ interpreter. Ruby provides APIs for defining the following things:
2.1.1 Class/module definition
-To define a class or module, use the functions below:
+To define class or module, use functions below:
VALUE rb_define_class(const char *name, VALUE super)
VALUE rb_define_module(const char *name)
These functions return the newly created class or module. You may
-want to save this reference into a variable to use later.
+want to save this reference into the variable to use later.
-To define nested classes or modules, use the functions below:
+To define nested class or module, use functions below:
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 Method/singleton method definition
-To define methods or singleton methods, use these functions:
+To define methods or singleton methods, use functions below:
void rb_define_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
@@ -244,19 +229,19 @@ To define methods or singleton methods, use these functions:
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.
+which must be less than 17. But I believe you don't need that much. :-)
-If `argc' is negative, it specifies the calling sequence, not number of
+If `argc' is negative, it specifies calling sequence, not number of
the arguments.
-If argc is -1, the function will be called as:
+If argc is -1, the function will be called like:
VALUE func(int argc, VALUE *argv, VALUE obj)
where argc is the actual number of arguments, argv is the C array of
the arguments, and obj is the receiver.
-If argc is -2, the arguments are passed in a Ruby array. The function
+if argc is -2, the arguments are passed in Ruby array. The function
will be called like:
VALUE func(VALUE obj, VALUE args)
@@ -264,15 +249,15 @@ will be called like:
where obj is the receiver, and args is the Ruby array containing
actual arguments.
-There are two more functions to define methods. One is to define
-private methods:
+There're two more functions to define method. One is to define
+private method:
void rb_define_private_method(VALUE klass, const char *name,
VALUE (*func)(), int argc)
-The other is to define module functions, which are private AND singleton
-methods of the module. For example, sqrt is the module function
-defined in Math module. It can be called in the following way:
+The other is to define module function, which is private AND singleton
+method of the module. For example, sqrt is the module function
+defined in Math module. It can be call in the form like:
Math.sqrt(4)
@@ -281,29 +266,20 @@ or
include Math
sqrt(4)
-To define module functions, use:
+To define module function
void rb_define_module_function(VALUE module, const char *name,
VALUE (*func)(), int argc)
-Oh, in addition, function-like methods, which are private methods defined
-in the Kernel module, can be defined using:
+Oh, in addition, function-like method, which is private method defined
+in Kernel module, can be defined using:
void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
-To define an alias for the method,
+To define alias to the method,
void rb_define_alias(VALUE module, const char* new, const char* old);
-To define and undefine the `allocate' class method,
-
- void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
- void rb_undef_alloc_func(VALUE klass);
-
-func have to take the klass as the argument and return a newly
-allocated instance. This instance should be empty as possible,
-without any expensive (including external) resources.
-
2.1.3 Constant definition
We have 2 functions to define constants:
@@ -311,62 +287,49 @@ We have 2 functions to define constants:
void rb_define_const(VALUE klass, const char *name, VALUE val)
void rb_define_global_const(const char *name, VALUE val)
-The former is to define a constant under specified class/module. The
-latter is to define a global constant.
+The former is to define constant under specified class/module. The
+latter is to define global constant.
2.2 Use Ruby features from C
There are several ways to invoke Ruby's features from C code.
-2.2.1 Evaluate Ruby Programs in a String
+2.2.1 Evaluate Ruby Program in 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:
+Easiest way to call Ruby's function from C program is to evaluate the
+string as Ruby program. This function will do the job.
VALUE rb_eval_string(const char *str)
-Evaluation is done under the current context, thus current local variables
+Evaluation is done under current context, thus current local variables
of the innermost method (which is defined by Ruby) can be accessed.
2.2.2 ID or Symbol
-You can invoke methods directly, without parsing the string. First I need
-to explain about ID. ID is the integer number to represent Ruby's
-identifiers such as variable names. The Ruby data type corresponding to ID
-is Symbol. It can be accessed from Ruby in the form:
+You can invoke methods directly, without parsing the string. First I
+need to explain about symbols (which data type is ID). ID is the
+integer number to represent Ruby's identifiers such as variable names.
+It can be accessed from Ruby in the form like:
:Identifier
-You can get the ID value from a string within C code by using
+You can get the symbol value from string within C code, by using
rb_intern(const char *name)
-You can retrieve ID from Ruby object (Symbol or String) given as an
-argument by using
-
- rb_to_id(VALUE symbol)
-
-You can convert C ID to Ruby Symbol by using
-
- VALUE ID2SYM(ID id)
-
-and to convert Ruby Symbol object to ID, use
-
- ID SYM2ID(VALUE symbol)
-
2.2.3 Invoke Ruby method from C
To invoke methods directly, you can use the function below
VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
-This function invokes a method on the recv, with the method name
-specified by the symbol mid.
+This function invokes the method of the recv, which name is specified
+by the symbol mid.
2.2.4 Accessing the variables and constants
-You can access class variables and instance variables using access
-functions. Also, global variables can be shared between both environments.
+You can access class variables, and instance variables using access
+functions. Also, global variables can be shared between both worlds.
There's no way to access Ruby's local variables.
The functions to access/modify instance variables are below:
@@ -384,14 +347,14 @@ See 2.1.3 for defining new constant.
3. Information sharing between Ruby and C
-3.1 Ruby constants that C can be accessed from C
+3.1 Ruby constant that C can be accessed from C
-The following Ruby constants can be referred from C.
+Following Ruby constants can be referred from C.
Qtrue
Qfalse
-Boolean values. Qfalse is false in C also (i.e. 0).
+Boolean values. Qfalse is false in the C also (i.e. 0).
Qnil
@@ -399,16 +362,16 @@ Ruby nil in C scope.
3.2 Global variables shared between C and Ruby
-Information can be shared between the two environments using shared global
+Information can be shared between two worlds, using shared global
variables. To define them, you can use functions listed below:
void rb_define_variable(const char *name, VALUE *var)
-This function defines the variable which is shared by both environments.
-The value of the global variable pointed to by `var' can be accessed
+This function defines the variable which is shared by the both world.
+The value of the global variable pointed by `var', can be accessed
through Ruby's global variable named `name'.
-You can define read-only (from Ruby, of course) variables using the
+You can define read-only (from Ruby, of course) variable by the
function below.
void rb_define_readonly_variable(const char *name, VALUE *var)
@@ -426,17 +389,17 @@ works just like rb_define_variable().
void rb_define_virtual_variable(const char *name,
VALUE (*getter)(), void (*setter)())
-This function defines a Ruby global variable without a corresponding C
+This function defines the Ruby global variable without corresponding C
variable. The value of the variable will be set/get only by hooks.
-The prototypes of the getter and setter functions are as follows:
+The prototypes of the getter and setter functions are as following:
(*getter)(ID id, void *data, struct global_entry* entry);
(*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
-3.3 Encapsulate C data into a Ruby object
+3.3 Encapsulate C data into Ruby object
-To wrap and objectify a C pointer as a Ruby object (so called
+To wrapping and objectify the C pointer as Ruby object (so called
DATA), use Data_Wrap_Struct().
Data_Wrap_Struct(klass, mark, free, ptr)
@@ -444,9 +407,8 @@ DATA), use Data_Wrap_Struct().
Data_Wrap_Struct() returns a created DATA object. The klass argument
is the class for the DATA object. The mark argument is the function
to mark Ruby objects pointed by this data. The free argument is the
-function to free the pointer allocation. If this is -1, the pointer
-will be just freed. The functions mark and free will be called from
-garbage collector.
+function to free the pointer allocation. The functions, mark and
+free, will be called from garbage collector.
You can allocate and wrap the structure in one step.
@@ -457,23 +419,23 @@ the structure, which is also allocated. This macro works like:
(sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
-Arguments klass, mark, and free work like their counterparts in
-Data_Wrap_Struct(). A pointer to the allocated structure will be
-assigned to sval, which should be a pointer of the type specified.
+Arguments, klass, mark, free, works like their counterpart of
+Data_Wrap_Struct(). The pointer to allocated structure will be
+assigned to sval, which should be the pointer to the type specified.
To retrieve the C pointer from the Data object, use the macro
Data_Get_Struct().
Data_Get_Struct(obj, type, sval)
-A pointer to the structure will be assigned to the variable sval.
+The pointer to the structure will be assigned to the variable sval.
-See the example below for details.
+See example below for detail.
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/
+OK, here's the example to make extension library. This is the
+extension to access dbm. The full source is included in ext/
directory in the Ruby's source tree.
(1) make the directory
@@ -482,17 +444,25 @@ directory in the Ruby's source tree.
Make a directory for the extension library under ext directory.
-(2) design the library
+(2) create MANIFEST file
+
+ % cd ext/dbm
+ % touch MANIFEST
+
+There should be MANIFEST file in the directory for the extension
+library. Make empty file now.
+
+(3) design the library
You need to design the library features, before making it.
-(3) write C code.
+(4) 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
+preferred. On the other hand, in case your library has plural source
files, avoid choosing ``LIBRARY.c'' for a file name. It may conflict
-with an intermediate file ``LIBRARY.o'' on some platforms.
+with intermediate file ``LIBRARY.o'' on some platforms.
Ruby will execute the initializing function named ``Init_LIBRARY'' in
the library. For example, ``Init_dbm()'' will be executed when loading
@@ -517,13 +487,10 @@ Init_dbm()
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.
+The dbm extension wrap dbm struct in C world using Data_Make_Struct.
--
struct dbmdata {
@@ -535,11 +502,10 @@ struct dbmdata {
obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
--
-This code wraps the dbmdata structure into a Ruby object. We avoid wrapping
+This code wraps dbmdata structure into Ruby object. We avoid wrapping
DBM* directly, because we want to cache size information.
-To retrieve the dbmdata structure from a Ruby object, we define the
-following macro:
+To retrieve dbmdata structure from Ruby object, we define the macro below:
--
#define GetDBM(obj, dbmp) {\
@@ -548,11 +514,11 @@ following macro:
}
--
-This sort of complicated macro does the retrieving and close checking for
+This sort of complicated macro do the retrieving and close check for
the DBM.
-There are three kinds of way to receive method arguments. First,
-methods with a fixed number of arguments receive arguments like this:
+There are three kind of way to receiving method arguments. First, the
+methods with fixed number of arguments receives arguments like this:
--
static VALUE
@@ -566,7 +532,7 @@ fdbm_delete(obj, keystr)
The first argument of the C function is the self, the rest are the
arguments to the method.
-Second, methods with an arbitrary number of arguments receive
+Second, the methods with arbitrary number of arguments receives
arguments like this:
--
@@ -584,15 +550,15 @@ fdbm_s_open(argc, argv, klass)
}
--
-The first argument is the number of method arguments, the second
-argument is the C array of the method arguments, and the third
+The first argument is the number of method arguments. the second
+argument is the C array of the method arguments. And the third
argument is the receiver of the method.
You can use the function rb_scan_args() to check and retrieve the
-arguments. For example, "11" means that the method requires at least one
+arguments. For example "11" means, the method requires at least one
argument, and at most receives two arguments.
-Methods with an arbitrary number of arguments can receive arguments
+The methods with arbitrary number of arguments can receives arguments
by Ruby's array, like this:
--
@@ -609,82 +575,86 @@ 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
+GC should know about global variables which refers Ruby's objects, but
+not exported to the Ruby world. You need to protect them by
void rb_global_variable(VALUE *var)
-(4) prepare extconf.rb
+(5) prepare extconf.rb
-If the file named extconf.rb exists, it will be executed to generate
-Makefile.
+If there exists the file named extconf.rb, it will be executed to
+generate Makefile. If not, compilation scheme try to generate
+Makefile anyway.
-extconf.rb is the file for checking compilation conditions etc. You
+The extconf.rb is the file to check compilation condition etc. You
need to put
require 'mkmf'
-at the top of the file. You can use the functions below to check
-various conditions.
+at the top of the file. You can use the functions below to check the
+condition.
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.
+The value of variables below will affect Makefile.
- $CFLAGS: included in CFLAGS make variable (such as -O)
- $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D)
+ $CFLAGS: included in CFLAGS make variable (such as -I)
$LDFLAGS: included in LDFLAGS make variable (such as -L)
- $objs: list of object file names
-
-Normally, the object files list is automatically generated by searching
-source files, but you must define them explicitly if any sources will
-be generated while building.
-If a compilation condition is not fulfilled, you should not call
-``create_makefile''. The Makefile will not be generated, compilation will
+If compilation condition is not fulfilled, you do not call
+``create_makefile''. Makefile will not generated, compilation will
not be done.
-(5) prepare depend (optional)
+(6) prepare depend (optional)
If the file named depend exists, Makefile will include that file to
-check dependencies. You can make this file by invoking
+check dependency. You can make this file by invoking
% gcc -MM *.c > depend
-It's harmless. Prepare it.
+It's no harm. Prepare it.
-(6) generate Makefile
+(7) put file names into MANIFEST (optional)
-Try generating the Makefile by:
+ % find * -type f -print > MANIFEST
+ % vi MANIFEST
+
+Append file names into MANIFEST. The compilation scheme requires
+MANIFEST only to be exist. But, you'd better take this step to
+distinguish required files.
+
+(8) generate Makefile
+
+Try generate Makefile by:
ruby extconf.rb
-You don't need this step if you put the extension library under the ext
+You don't need this step, if you put extension library under ext
directory of the ruby source tree. In that case, compilation of the
interpreter will do this step for you.
-(7) make
+(9) make
Type
make
-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.
+to compile your extension. You don't need this step neither, if you
+put extension library under ext directory of the ruby source tree.
-(8) debug
+(9) 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.
+You may need to rb_debug the extension. The extensions can be linked
+statically by adding directory name in the ext/Setup file, so that you
+can inspect the extension with the debugger.
-(9) done, now you have the extension library
+(10) 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.
+will not claim any restriction about your code depending Ruby API.
Feel free to use, modify, distribute or sell your program.
Appendix A. Ruby source files overview
@@ -745,7 +715,7 @@ Appendix B. Ruby extension API reference
VALUE
-The type for the Ruby object. Actual structures are defined in ruby.h,
+The type for 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).
@@ -767,11 +737,10 @@ const: false object
Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *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.
+Wrap C pointer into Ruby object. If object has references to other
+Ruby object, they should be marked by using mark function during GC
+process. Otherwise, mark should be 0. When this object is no longer
+referred by anywhere, the pointer will be discarded by free function.
Data_Make_Struct(klass, type, mark, free, sval)
@@ -783,75 +752,54 @@ sval, and returns the DATA encapsulating the pointer to memory region.
This macro retrieves the pointer value from DATA, and assigns it to
the variable sval.
-** Checking data types
-
-TYPE(value)
-FIXNUM_P(value)
-NIL_P(value)
-void Check_Type(VALUE value, int type)
-void Check_SafeStr(VALUE value)
-
-** Data type conversion
-
-FIX2INT(value)
-INT2FIX(i)
-NUM2INT(value)
-INT2NUM(i)
-NUM2DBL(value)
-rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
-rb_str_new2(s)
-
** defining class/module
VALUE rb_define_class(const char *name, VALUE super)
-Defines a new Ruby class as a subclass of super.
+Defines new Ruby class as subclass of super.
VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
-Creates a new Ruby class as a subclass of super, under the module's
+Creates new Ruby class as subclass of super, under the module's
namespace.
VALUE rb_define_module(const char *name)
-Defines a new Ruby module.
+Defines new Ruby module.
- VALUE rb_define_module_under(VALUE module, const char *name)
+ VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
-Defines a new Ruby module under the module's namespace.
+Defines new Ruby module, under the module's namespace.
void rb_include_module(VALUE klass, VALUE module)
Includes module into class. If class already includes it, just
-ignored.
+ignore.
void rb_extend_object(VALUE object, VALUE module)
-Extend the object with the module's attributes.
+Extend the object with module's attribute.
** Defining Global Variables
void rb_define_variable(const char *name, VALUE *var)
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,
+contains the character which is not allowed to be part of the symbol,
it can't be seen from Ruby programs.
void rb_define_readonly_variable(const char *name, VALUE *var)
Defines a read-only global variable. Works just like
-rb_define_variable(), except the defined variable is read-only.
+rb_define_variable(), except defined variable is read-only.
void rb_define_virtual_variable(const char *name,
VALUE (*getter)(), VALUE (*setter)())
-Defines a virtual variable, whose behavior is defined by a pair of C
+Defines a virtual variable, whose behavior is defined by 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:
+referred. The setter function is called when the value is set to the
+variable. The prototype for getter/setter functions are:
VALUE getter(ID id)
void setter(VALUE val, ID id)
@@ -861,16 +809,16 @@ The getter function must return the value for the access.
void rb_define_hooked_variable(const char *name, VALUE *var,
VALUE (*getter)(), VALUE (*setter)())
-Defines hooked variable. It's a virtual variable with a C variable.
-The getter is called as
+Defines hooked variable. It's virtual variable with C variable. The
+getter is called as
VALUE getter(ID id, VALUE *var)
-returning a new value. The setter is called as
+returning new value. The setter is called as
void setter(VALUE val, ID id, VALUE *var)
-GC requires C global variables which hold Ruby values to be marked.
+GC requires to mark the C global variables which hold Ruby values.
void rb_global_variable(VALUE *var)
@@ -884,7 +832,7 @@ Defines a new constant under the class/module.
void rb_define_global_const(const char *name, VALUE val)
-Defines a global constant. This is just the same as
+Defines global constant. This is just work as
rb_define_const(cKernal, name, val)
@@ -894,8 +842,8 @@ Defines a global constant. This is just the same as
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
+3 arguments argc, argv, and self. if argc is -2, the function will
+receive 2 arguments, self and args, where args is the Ruby array of
the method arguments.
rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
@@ -912,26 +860,26 @@ Defines a singleton method. Arguments are same as rb_define_method().
Retrieve argument from argc, argv. The fmt is the format string for
the arguments, such as "12" for 1 non-optional argument, 2 optional
arguments. If `*' appears at the end of fmt, it means the rest of
-the arguments are assigned to the corresponding variable, packed in
-an array.
+the arguments are assigned to corresponding variable, packed in
+array.
** Invoking Ruby method
VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
-Invokes a method. To retrieve mid from a method name, use rb_intern().
+Invokes the method. To retrieve mid from method name, use rb_intern().
VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
-Invokes a method, passing arguments by an array of values.
+Invokes method, passing arguments by array of values.
VALUE rb_eval_string(const char *str)
-Compiles and executes the string as a Ruby program.
+Compiles and executes the string as Ruby program.
ID rb_intern(const char *name)
-Returns ID corresponding to the name.
+Returns ID corresponding the name.
char *rb_id2name(ID id)
@@ -970,7 +918,7 @@ Evaluates the block with value val.
VALUE rb_rescue(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
-Calls the function func1, with arg1 as the argument. If an exception
+Calls the function func1, with arg1 as the argument. If 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.
@@ -978,32 +926,29 @@ exception occurs, from func2 otherwise.
VALUE rb_ensure(VALUE (*func1)(), void *arg1, void (*func2)(), void *arg2)
Calls the function func1 with arg1 as the argument, then calls func2
-with arg2 if execution terminated. The return value from
+with arg2, whenever execution terminated. The return value from
rb_ensure() is that of func1.
** Exceptions and Errors
void rb_warn(const char *fmt, ...)
-Prints a warning message according to a printf-like format.
+Prints warning message according to the printf-like format.
void rb_warning(const char *fmt, ...)
-Prints a warning message according to a printf-like format, if
+Prints warning message according to the printf-like format, if
$VERBOSE is true.
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
-
-Raises RuntimeError. The fmt is a format string just like printf().
-
void rb_raise(VALUE exception, const char *fmt, ...)
-Raises a class exception. The fmt is a format string just like printf().
+Raises an exception of class exception. The fmt is the format string
+just like printf().
void rb_fatal(const char *fmt, ...)
-Raises a fatal error, terminates the interpreter. No exception handling
-will be done for fatal errors, but ensure blocks will be executed.
+Raises fatal error, terminates the interpreter. No exception handling
+will be done for fatal error, but ensure blocks will be executed.
void rb_bug(const char *fmt, ...)
@@ -1011,9 +956,9 @@ 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.
-** Initialize and Start the Interpreter
+** Initialize and Starts the Interpreter
-The embedding API functions are below (not needed for extension libraries):
+The embedding API are below (not needed for extension libraries):
void ruby_init()
@@ -1031,112 +976,40 @@ Starts execution of the interpreter.
Specifies the name of the script ($0).
-** Hooks for the Interpreter Events
-
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events)
-
-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
-
-The definition of rb_event_hook_func_t is below:
-
- typedef void (*rb_event_hook_func_t)(rb_event_t event, NODE *node,
- VALUE self, ID id, VALUE klass)
-
- int rb_remove_event_hook(rb_event_hook_func_t func)
-
-Removes the specified hook function.
-
-Appendix C. Functions Available in extconf.rb
+Appendix B. Functions Available in extconf.rb
These functions are available in extconf.rb:
- have_macro(macro, headers)
-
-Checks whether macro is defined with header. Returns true if the macro
-is defined.
-
have_library(lib, func)
-Checks whether the library exists, containing the specified function.
+Checks whether library which contains specified function exists.
Returns true if the library exists.
find_library(lib, func, path...)
-Checks whether a library which contains the specified function exists in
+Checks whether library which contains specified function exists in
path. Returns true if the library exists.
have_func(func, header)
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().
-
- have_var(var, header)
-
-Checks whether var exists with header. Returns true if the variable
-exists. To check variables in an additional library, you need to
+exists. To check functions in the additional library, you need to
check that library first using have_library().
have_header(header)
Checks whether header exists. Returns true if the header file exists.
- find_header(header, path...)
-
-Checks whether header exists in path. Returns true if the header file
-exists.
-
- have_struct_member(type, member, header)
-
-Checks whether type has member with header. Returns true if the type
-is defined and has the member.
-
- have_type(type, header, opt)
-
-Checks whether type is defined with header. Returns true if the type
-is defined.
-
- check_sizeof(type, header)
-
-Checks the size of type in char with header. Returns the size if the
-type is defined, otherwise nil.
-
create_makefile(target)
Generates the Makefile for the extension library. If you don't invoke
this method, the compilation will not be done.
- find_executable(bin, path)
-
-Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories. If path is nil or omitted, environment varialbe PATH
-will be used. Returns the path name of the command if it is found,
-otherwise nil.
-
with_config(withval[, default=nil])
Parses the command line options and returns the value specified by
--with-<withval>.
- enable_config(config, *defaults)
- disable_config(config, *defaults)
-
-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.
-
dir_config(target[, default_dir])
dir_config(target[, default_include, default_lib])
@@ -1146,12 +1019,6 @@ 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]).
- pkg_config(pkg)
-
-Obtains the information for pkg by pkg-config command. The actual
-command name can be overriden by --with-pkg-config command line
-option.
-
/*
* Local variables:
* fill-column: 70
diff --git a/README.EXT.ja b/README.EXT.jp
index 30c4d520ba..07a9e8b39d 100644
--- a/README.EXT.ja
+++ b/README.EXT.jp
@@ -1,4 +1,4 @@
-.\" README.EXT.ja - -*- Text -*- created at: Mon Aug 7 16:45:54 JST 1995
+.\" README.EXT - -*- Text -*- created at: Mon Aug 7 16:45:54 JST 1995
Ruby
@@ -104,19 +104,10 @@ FIXNUMNIL
FIXNUMRuby
NUM2INT()
(
-)double
-NUM2DBL()
-
-char* version 1.6 STR2CSTR()
- to_str()
- GC version 1.7
-obsolete StringValue() StringValuePtr()
-StringValue(var) var String
- var var.to_str()
-StringValuePtr(var) var
- var char* var
-var lvalue
-
+)
+
+double
+NUM2DBL()char*STR2CSTR()
C
VALUE()
@@ -331,17 +322,6 @@ private
void rb_define_alias(VALUE module, const char* new, const char* old);
-allocate
-
-
- void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
- void rb_undef_alloc_func(VALUE klass);
-
-func
-
-
-
-
2.1.3
@@ -380,8 +360,7 @@ CRuby
Ruby
ID
-IDRubyID
-(Symbol)
+IDRuby
:
@@ -394,14 +373,6 @@ IDRubyID
rb_to_id(VALUE symbol)
-ID
-
- VALUE ID2SYM(ID id)
-
-ID
-
- ID SYM2ID(VALUE symbol)
-
2.2.3 CRuby
CRuby
@@ -522,8 +493,7 @@ CmarkRuby
#
free
--1
-
+
CData
@@ -562,14 +532,28 @@ Ruby 1.1
-(2)
+(2) MANIFEST
+
+ % cd ext/dbm
+ % touch MANIFEST
+
+MANIFEST
+
+
+
+MANIFESTmake
+
+
+
+
+(3)
-(3) C
+(4) C
CC
.cC
@@ -712,7 +696,7 @@ CRuby
void rb_global_variable(VALUE *var)
-(4) extconf.rb
+(5) extconf.rb
Makefileextconf.rb
extconf.rb
@@ -730,20 +714,14 @@ Makefileextconf.rb
- $CFLAGS: (-O)
- $CPPFLAGS: (-I-D)
+ $CFLAGS: (-I)
$LDFLAGS: (-L)
- $objs:
-
-
-make
-
create_makefileMakefile
-(5) depend
+(6) depend
depend
Makefile
@@ -752,7 +730,18 @@ Makefile
-(6) Makefile
+(7) MANIFEST
+
+ % find * -type f -print > MANIFEST
+ % vi MANIFEST
+
+*.o, *~MANIFEST
+makeMANIFEST
+
+
+
+
+(8) Makefile
Makefile
@@ -768,7 +757,7 @@ Makefile
extRubymake
Makefile
-(7) make
+(9) make
make
make install
@@ -786,13 +775,13 @@ extconf.rbMakefile
.rb
-(8)
+(10)
ext/Setup
-(9)
+(11)
Ruby
@@ -917,9 +906,7 @@ NUM2INT(value)
INT2NUM(i)
NUM2DBL(value)
rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
+STR2CSTR(value)
rb_str_new2(s)
** /
@@ -937,7 +924,7 @@ VALUE rb_define_module(const char *name)
Ruby
-VALUE rb_define_module_under(VALUE module, const char *name)
+VALUE rb_define_module_under(VALUE module, const char *name, VALUE super)
Rubymodule
@@ -1146,17 +1133,11 @@ void ruby_script(char *name)
Ruby($0)
-Appendix C. extconf.rb
+Appendix B. extconf.rb
extconf.rb
-have_macro(macro, headers)
-
- headermacro
- true
-
-
have_library(lib, func)
funclib
@@ -1174,67 +1155,21 @@ have_func(func, header)
have_library
true
-have_var(var, header)
-
- headervar
- var
- have_library
- true
-
have_header(header)
true
-find_header(header, path...)
-
- header -Ipath
- true
-
-have_struct_member(type, member, header)
-
- headertypemember
- typemember
- true
-
-have_type(type, header, opt)
-
- headertype
- typetrue
-
-check_sizeof(type, header)
-
- headertypechar
- type
- nil
-
create_makefile(target)
Makefile
target
-find_executable(command, path)
-
- commandFile::PATH_SEPARATOR
- pathpathnil
- PATH
- nil
-
with_config(withval[, default=nil])
--with-<withval>
-enable_config(config, *defaults)
-disable_config(config, *defaults)
-
- --enable-<config>
- --disable-<config>
- --enable-<config>true
- --disable-<config>false
-
- *defaultsyield*defaults
-
dir_config(target[, default_dir])
dir_config(target[, default_include, default_lib])
@@ -1245,12 +1180,6 @@ dir_config(target[, default_include, default_lib])
include lib
([include_dir, lib_dir])
-pkg_config(pkg)
-
- pkg-configpkg
- pkg-config--with-pkg-config
-
-
/*
* Local variables:
* fill-column: 60
diff --git a/README.ja b/README.jp
index df8cfc03f4..9af1f15bb5 100644
--- a/README.ja
+++ b/README.jp
@@ -26,25 +26,18 @@ RubyPerl
*
-** FTP
+** ftp
- ftp://ftp.ruby-lang.org/pub/ruby/
+ ftp://ftp.netlab.co.jp/pub/lang/ruby/
-** Subversion
+** CVS
-Ruby
-
- $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
-
-
- $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-
-
- $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+ $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
+ (Logging in to anonymous@cvs.ruby-lang.org)
+ CVS password: anonymous
+ $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:src checkout ruby
*
@@ -147,12 +140,63 @@ UNIXconfigure
*
-COPYING.ja
+GPL(the GNU General
+Public License)
+GPLCOPYING
+
+ 1.
+
+ 2.
+
+
+ (a)
+
+
+ (b)
+
+
+ (c)
+
+
+
+
+ (d)
+
+ 3.
+
+
+ (a)
+
+
+ (b)
+
+ (c)
+
+
+ (d)
+
+ 4.
+
+
+
+ gc.c()util.c()st.[ch]regex.[ch]
+ ./missing
+
+
+
+ 5.
+
+
+
+ 6.
+
+
+
*
- matz@netlab.jp
+ matz@zetabits.com
-------------------------------------------------------
created at: Thu Aug 3 11:57:36 JST 1995
Local variables:
diff --git a/ToDo b/ToDo
index b55e399edf..5f67a42b25 100644
--- a/ToDo
+++ b/ToDo
@@ -1,7 +1,12 @@
Language Spec.
-- Class#allocate - basicNew
-- class Foo::Bar<Baz .. end, module Boo::Bar .. end
+- def foo; .. rescue .. end
+- compile time string concatenation, "hello" "world" => "helloworld"
+- rescue modifier; a rescue b => begin a rescue; b end
+- %w(a\ b\ c abc) => ["a b c", "abc"]
+- objectify symbols
+- class variable (prefix @@)
+- rescue RuntimeError => err
* operator !! for rescue. ???
* objectify characters
* ../... outside condition invokes operator method too.
@@ -12,35 +17,27 @@ Language Spec.
* multiple return values, yield values. maybe incompatible ???
* cascading method invocation ???
* def Class#method .. end ??
+* class Foo::Bar<Baz .. end, module Boo::Bar .. end
* def Foo::Bar::baz() .. end ??
* I18N (or M17N) script/string/regexp
* Fixnum 0 as false ????
-* discourage use of symbol variables (e.g. $/, etc.) in manual
+* discourage use of symbol variable (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.
+* decide if begin with rescue or ensure make do..while loop.
* a +1 to be a+1, not a(+1).
-* unify == and eql? again
-* to_i returns nil if str contains no digit.
-* raise exception by `` error
-* jar like combined library package. -> RubyGems?
-* resumable Exception via Exception#resume.
-* method combination, e.g. before, after, around, etc.
-* .. or something like defadvice in Emacs.
-* property - for methods, or for objects in general.
-* "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()"
-* clarify evaluation order of operator argument (=~, .., ...)
-* :symbol => value hash in the form of {symbol: value, ...} ??
Hacking Interpreter
-- generational GC
+- use eban's fnmatch
+- RUBYOPT environment variable
+- alias $defout $>
+- retrieve STACK_LEVEL_MAX from users' limit.
+- remove end_proc registered out of require only
+- all object made freezable
* non-blocking open (e.g. for named pipe) for thread
* avoid blocking with gethostbyname/gethostbyaddr (use fork ???)
* objectify interpreters ???
@@ -49,42 +46,45 @@ Hacking Interpreter
* scrambled script, or script filter
* setuid ruby
* performance tune for in-block (dynamic) local variables.
+* generational GC
* 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.
+- hash[key] = nil does not remove entry; hashes may have nil as the value.
+- hash.fetch(key) raises exception if key is not found.
+- Array#{first,last,at}
+- Dir.glob(pat){|f|...}
+- sprintf/printf's $ to specify argument order
+- Dir.glob("**/*.c") ala zsh
+- Remove Enumerable#{size,length}
+- Array#slice, Array#slice!
+- String#slice, String#slice!
+- Marshal should handle generic instance variables.
+- debugger for thread programming
+- SyntaxError, NameError, LoadError and NotImplementedError are subclasses of
+ ScriptError<Exception, not StandardError.
+- Thread::start gives arguments, not a thread object to the block
+- regexp: (?>..), \G
+- Struct::new([name,]member,...)
+- IO#reopen accepts path as well
+- Kernel#scan
+- call initialize for builtin classes too
+- performance tune for String's non-bang methods.
+- 'w' template for pack/unpack
+- alternative for interator? => block_given?
+- regex - /p (made obsolete), /m (new)
+- consistent /, %, divmod
+- unbound method object
+- integrate final.rb into the core.
+* Enumerable#sort_by for Schwartzian transformation
* String#scanf(?)
* Object#fmt(?)
+* Integer#{bin,oct,hex,heX}
* Time::strptime
* Integer[num], Float[num]; Fixnum[num]?
* method to retrieve non-number trailer for to_i/to_f.
@@ -93,34 +93,37 @@ Standard Libraries
* optional stepsize argument for succ()
* Ruby module -- Ruby::Version, Ruby::Interpreter
* introduce Boolean class; super of TrueClass, FalseClass
+* Process::waitall [ruby-talk:4557]
* synchronized method - synchronized{...}, synchronized :foo, :bar
+* move Time::times to Process.
+- Module#define_method which takes a name and a body (block, proc or method).
+* IO#for_fd in general
* Array#&, Array#| to allow duplication. ???
+- fork_and_kill_other_threads.
* 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.
+* Array#fetch
Extension Libraries
+- FastCGI ruby
* ptk.rb pTk wrapper that is compatible to tk.rb
* Berkeley DB extension
* BitVector
-* thread-safe fcgi
Ruby Libraries
+- net/http.rb
+* add uri.rb
* urllib.rb, nttplib.rb, etc.
* format like perl's
Tools
+- extension library maker using SWIG
* freeze or undump to bundle everything
-* bundle using zlib
+
+Misc
+
+- publish Ruby books
+- publish Ruby books in English
diff --git a/array.c b/array.c
index fbca3c193e..0b36460dbd 100644
--- a/array.c
+++ b/array.c
@@ -6,7 +6,7 @@
$Date$
created at: Fri Aug 6 09:46:12 JST 1993
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
@@ -17,7 +17,6 @@
#include "st.h"
VALUE rb_cArray;
-static ID id_cmp;
#define ARY_DEFAULT_SIZE 16
@@ -31,7 +30,7 @@ rb_mem_clear(mem, size)
}
}
-static inline void
+static void
memfill(mem, size, val)
register VALUE *mem;
register long size;
@@ -44,33 +43,17 @@ memfill(mem, size, val)
#define ARY_TMPLOCK FL_USER1
-static inline void
-rb_ary_modify_check(ary)
+static void
+rb_ary_modify(ary)
VALUE ary;
{
if (OBJ_FROZEN(ary)) rb_error_frozen("array");
if (FL_TEST(ary, ARY_TMPLOCK))
- rb_raise(rb_eRuntimeError, "can't modify array during iteration");
+ rb_raise(rb_eTypeError, "can't modify array during sort");
if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
rb_raise(rb_eSecurityError, "Insecure: can't modify array");
}
-static void
-rb_ary_modify(ary)
- VALUE ary;
-{
- VALUE *ptr;
-
- rb_ary_modify_check(ary);
- if (FL_TEST(ary, ELTS_SHARED)) {
- ptr = ALLOC_N(VALUE, RARRAY(ary)->len);
- FL_UNSET(ary, ELTS_SHARED);
- RARRAY(ary)->aux.capa = RARRAY(ary)->len;
- MEMCPY(ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
- RARRAY(ary)->ptr = ptr;
- }
-}
-
VALUE
rb_ary_freeze(ary)
VALUE ary;
@@ -78,66 +61,37 @@ rb_ary_freeze(ary)
return rb_obj_freeze(ary);
}
-/*
- * call-seq:
- * array.frozen? -> true or false
- *
- * Return <code>true</code> if this array is frozen (or temporarily frozen
- * while being sorted).
- */
-
static VALUE
rb_ary_frozen_p(ary)
VALUE ary;
{
- if (OBJ_FROZEN(ary)) return Qtrue;
- if (FL_TEST(ary, ARY_TMPLOCK)) return Qtrue;
+ if (FL_TEST(ary, FL_FREEZE|ARY_TMPLOCK))
+ return Qtrue;
return Qfalse;
}
-static VALUE ary_alloc _((VALUE));
-static VALUE
-ary_alloc(klass)
- VALUE klass;
-{
- NEWOBJ(ary, struct RArray);
- OBJSETUP(ary, klass, T_ARRAY);
-
- ary->len = 0;
- ary->ptr = 0;
- ary->aux.capa = 0;
-
- return (VALUE)ary;
-}
-
-static VALUE
-ary_new(klass, len)
- VALUE klass;
+VALUE
+rb_ary_new2(len)
long len;
{
- VALUE ary = ary_alloc(klass);
+ NEWOBJ(ary, struct RArray);
+ OBJSETUP(ary, rb_cArray, T_ARRAY);
if (len < 0) {
rb_raise(rb_eArgError, "negative array size (or size too big)");
}
- if (len > 0 && len * sizeof(VALUE) <= len) {
+ if (len > 0 && len*sizeof(VALUE) <= 0) {
rb_raise(rb_eArgError, "array size too big");
}
+ ary->len = 0;
+ ary->capa = len;
+ ary->ptr = 0;
if (len == 0) len++;
- RARRAY(ary)->ptr = ALLOC_N(VALUE, len);
- RARRAY(ary)->aux.capa = len;
+ ary->ptr = ALLOC_N(VALUE, len);
- return ary;
-}
-
-VALUE
-rb_ary_new2(len)
- long len;
-{
- return ary_new(rb_cArray, len);
+ return (VALUE)ary;
}
-
VALUE
rb_ary_new()
{
@@ -165,7 +119,10 @@ rb_ary_new3(n, va_alist)
VALUE ary;
long i;
- ary = rb_ary_new2(n);
+ if (n < 0) {
+ rb_raise(rb_eIndexError, "negative number of items(%d)", n);
+ }
+ ary = rb_ary_new2(n<ARY_DEFAULT_SIZE?ARY_DEFAULT_SIZE:n);
va_init_list(ar, n);
for (i=0; i<n; i++) {
@@ -180,16 +137,14 @@ rb_ary_new3(n, va_alist)
VALUE
rb_ary_new4(n, elts)
long n;
- const VALUE *elts;
+ VALUE *elts;
{
VALUE ary;
ary = rb_ary_new2(n);
- if (n > 0 && elts) {
+ if (elts) {
MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
}
-
- /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
RARRAY(ary)->len = n;
return ary;
@@ -210,58 +165,17 @@ rb_assoc_new(car, cdr)
}
static VALUE
-to_ary(ary)
- VALUE ary;
+rb_ary_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
{
- return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
-}
+ VALUE ary = rb_ary_new();
+ OBJSETUP(ary, klass, T_ARRAY);
+ rb_obj_call_init(ary, argc, argv);
-VALUE
-rb_check_array_type(ary)
- VALUE ary;
-{
- return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
-}
-
-static VALUE rb_ary_replace _((VALUE, VALUE));
-
-/*
- * call-seq:
- * Array.new(size=0, obj=nil)
- * Array.new(array)
- * Array.new(size) {|index| block }
- *
- * 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
- * a[1]['cat'] = 'Felix'
- * a
- *
- * # here multiple copies are created
- * a = Array.new(2) { Hash.new }
- * a[0]['cat'] = 'feline'
- * a
- *
- * squares = Array.new(5) {|i| i*i}
- * squares
- *
- * copy = Array.new(squares)
- */
+ return ary;
+}
static VALUE
rb_ary_initialize(argc, argv, ary)
@@ -272,77 +186,48 @@ rb_ary_initialize(argc, argv, ary)
long len;
VALUE size, val;
- rb_ary_modify(ary);
if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
- RARRAY(ary)->len = 0;
- if (rb_block_given_p()) {
- rb_warning("given block not used");
- }
return ary;
}
- if (argc == 1 && !FIXNUM_P(size)) {
- val = rb_check_array_type(size);
- if (!NIL_P(val)) {
- rb_ary_replace(ary, val);
- return ary;
- }
- }
-
+ rb_ary_modify(ary);
len = NUM2LONG(size);
if (len < 0) {
rb_raise(rb_eArgError, "negative array size");
}
- if (len > 0 && len * (long)sizeof(VALUE) <= len) {
+ if (len > 0 && len*sizeof(VALUE) <= 0) {
rb_raise(rb_eArgError, "array size too big");
}
- if (len > RARRAY(ary)->aux.capa) {
- REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
- RARRAY(ary)->aux.capa = len;
- }
- if (rb_block_given_p()) {
- long i;
-
- if (argc == 2) {
- rb_warn("block supersedes default value argument");
- }
- for (i=0; i<len; i++) {
- rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
- RARRAY(ary)->len = i + 1;
- }
- }
- else {
- memfill(RARRAY(ary)->ptr, len, val);
- RARRAY(ary)->len = len;
+ if (len > RARRAY(ary)->capa) {
+ RARRAY(ary)->capa = len;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
}
+ memfill(RARRAY(ary)->ptr, len, val);
+ RARRAY(ary)->len = len;
return ary;
}
-
-/*
-* 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(argc, argv, klass)
int argc;
VALUE *argv;
VALUE klass;
{
- VALUE ary = ary_alloc(klass);
+ NEWOBJ(ary, struct RArray);
+ OBJSETUP(ary, klass, T_ARRAY);
- if (argc > 0) {
- RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
- MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+ ary->len = ary->capa = 0;
+ if (argc == 0) {
+ ary->ptr = 0;
}
- RARRAY(ary)->len = RARRAY(ary)->aux.capa = argc;
+ else {
+ ary->ptr = ALLOC_N(VALUE, argc);
+ MEMCPY(ary->ptr, argv, VALUE, argc);
+ }
+ ary->len = ary->capa = argc;
- return ary;
+ return (VALUE)ary;
}
void
@@ -351,31 +236,26 @@ rb_ary_store(ary, idx, val)
long idx;
VALUE val;
{
+ rb_ary_modify(ary);
if (idx < 0) {
idx += RARRAY(ary)->len;
if (idx < 0) {
- rb_raise(rb_eIndexError, "index %ld out of array",
- idx - RARRAY(ary)->len);
+ rb_raise(rb_eIndexError, "index %d out of array",
+ idx - RARRAY(ary)->len);
}
}
- rb_ary_modify(ary);
- if (idx >= RARRAY(ary)->aux.capa) {
- long new_capa = RARRAY(ary)->aux.capa / 2;
-
- if (new_capa < ARY_DEFAULT_SIZE) {
- new_capa = ARY_DEFAULT_SIZE;
- }
- new_capa += idx;
- if (new_capa * (long)sizeof(VALUE) <= new_capa) {
- rb_raise(rb_eArgError, "index too big");
+ if (idx >= RARRAY(ary)->capa) {
+ long capa_inc = RARRAY(ary)->capa / 2;
+ if (capa_inc < ARY_DEFAULT_SIZE) {
+ capa_inc = ARY_DEFAULT_SIZE;
}
- REALLOC_N(RARRAY(ary)->ptr, VALUE, new_capa);
- RARRAY(ary)->aux.capa = new_capa;
+ RARRAY(ary)->capa = idx + capa_inc;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
}
if (idx > RARRAY(ary)->len) {
- rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
- idx-RARRAY(ary)->len + 1);
+ rb_mem_clear(RARRAY(ary)->ptr+RARRAY(ary)->len,
+ idx-RARRAY(ary)->len+1);
}
if (idx >= RARRAY(ary)->len) {
@@ -384,19 +264,6 @@ rb_ary_store(ary, idx, val)
RARRAY(ary)->ptr[idx] = val;
}
-/*
- * call-seq:
- * array << obj -> array
- *
- * Append---Pushes the given object on to the end of this array. This
- * expression returns the array itself, so several appends
- * may be chained together.
- *
- * [ 1, 2 ] << "c" << "d" << [ 3, 4 ]
- * #=> [ 1, 2, "c", "d", [ 3, 4 ] ]
- *
- */
-
VALUE
rb_ary_push(ary, item)
VALUE ary;
@@ -406,113 +273,61 @@ rb_ary_push(ary, item)
return ary;
}
-/*
- * call-seq:
- * array.push(obj, ... ) -> array
- *
- * Append---Pushes the given object(s) on to the end of this array. This
- * expression returns the array itself, so several appends
- * may be chained together.
- *
- * a = [ "a", "b", "c" ]
- * a.push("d", "e", "f")
- * #=> ["a", "b", "c", "d", "e", "f"]
- */
-
static VALUE
rb_ary_push_m(argc, argv, ary)
int argc;
VALUE *argv;
VALUE ary;
{
- while (argc--) {
- rb_ary_push(ary, *argv++);
+ if (argc == 0) {
+ rb_raise(rb_eArgError, "wrong # of arguments(at least 1)");
+ }
+ if (argc > 0) {
+ long len = RARRAY(ary)->len;
+
+ --argc;
+ /* make rooms by copying the last item */
+ rb_ary_store(ary, len + argc, argv[argc]);
+
+ if (argc) { /* if any rest */
+ MEMCPY(RARRAY(ary)->ptr + len, argv, VALUE, argc);
+ }
}
return ary;
}
-/*
- * call-seq:
- * array.pop -> obj or nil
- *
- * Removes the last element from <i>self</i> and returns it, or
- * <code>nil</code> if the array is empty.
- *
- * a = [ "a", "m", "z" ]
- * a.pop #=> "z"
- * a #=> ["a", "m"]
- */
-
VALUE
rb_ary_pop(ary)
VALUE ary;
{
- rb_ary_modify_check(ary);
+ rb_ary_modify(ary);
if (RARRAY(ary)->len == 0) return Qnil;
- if (!FL_TEST(ary, ELTS_SHARED) &&
- RARRAY(ary)->len * 2 < RARRAY(ary)->aux.capa &&
- RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
- RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
- REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+ if (RARRAY(ary)->len * 10 < RARRAY(ary)->capa && RARRAY(ary)->capa > ARY_DEFAULT_SIZE) {
+ RARRAY(ary)->capa = RARRAY(ary)->len * 2;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
}
return RARRAY(ary)->ptr[--RARRAY(ary)->len];
}
-static VALUE
-ary_make_shared(ary)
- VALUE ary;
-{
- if (!FL_TEST(ary, ELTS_SHARED)) {
- NEWOBJ(shared, struct RArray);
- OBJSETUP(shared, rb_cArray, T_ARRAY);
-
- shared->len = RARRAY(ary)->len;
- shared->ptr = RARRAY(ary)->ptr;
- shared->aux.capa = RARRAY(ary)->aux.capa;
- RARRAY(ary)->aux.shared = (VALUE)shared;
- FL_SET(ary, ELTS_SHARED);
- OBJ_FREEZE(shared);
- return (VALUE)shared;
- }
- else {
- return RARRAY(ary)->aux.shared;
- }
-}
-
-/*
- * call-seq:
- * array.shift -> obj or nil
- *
- * Returns the first element of <i>self</i> and removes it (shifting all
- * other elements down by one). Returns <code>nil</code> if the array
- * is empty.
- *
- * args = [ "-m", "-q", "filename" ]
- * args.shift #=> "-m"
- * args #=> ["-q", "filename"]
- */
-
VALUE
rb_ary_shift(ary)
VALUE ary;
{
VALUE top;
- rb_ary_modify_check(ary);
+ rb_ary_modify(ary);
if (RARRAY(ary)->len == 0) return Qnil;
+
top = RARRAY(ary)->ptr[0];
- if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE && !FL_TEST(ary, ELTS_SHARED)) {
- MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
- }
- else {
- if (!FL_TEST(ary, ELTS_SHARED)) {
- RARRAY(ary)->ptr[0] = Qnil;
- }
- ary_make_shared(ary);
- RARRAY(ary)->ptr++; /* shift ptr */
- }
RARRAY(ary)->len--;
+ /* sliding items */
+ MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+1, VALUE, RARRAY(ary)->len);
+ if (RARRAY(ary)->len * 10 < RARRAY(ary)->capa && RARRAY(ary)->capa > ARY_DEFAULT_SIZE) {
+ RARRAY(ary)->capa = RARRAY(ary)->len * 2;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
+ }
+
return top;
}
@@ -521,17 +336,17 @@ rb_ary_unshift(ary, item)
VALUE ary, item;
{
rb_ary_modify(ary);
- if (RARRAY(ary)->len == RARRAY(ary)->aux.capa) {
- long capa_inc = RARRAY(ary)->aux.capa / 2;
+ if (RARRAY(ary)->len >= RARRAY(ary)->capa) {
+ long capa_inc = RARRAY(ary)->capa / 2;
if (capa_inc < ARY_DEFAULT_SIZE) {
capa_inc = ARY_DEFAULT_SIZE;
}
- RARRAY(ary)->aux.capa += capa_inc;
- REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+ RARRAY(ary)->capa+=capa_inc;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
}
/* sliding items */
- MEMMOVE(RARRAY(ary)->ptr + 1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+ MEMMOVE(RARRAY(ary)->ptr+1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
RARRAY(ary)->len++;
RARRAY(ary)->ptr[0] = item;
@@ -539,60 +354,43 @@ rb_ary_unshift(ary, item)
return ary;
}
-/*
- * call-seq:
- * array.unshift(obj, ...) -> array
- *
- * Prepends objects to the front of <i>array</i>.
- * other elements up one.
- *
- * a = [ "b", "c", "d" ]
- * a.unshift("a") #=> ["a", "b", "c", "d"]
- * a.unshift(1, 2) #=> [ 1, 2, "a", "b", "c", "d"]
- */
-
static VALUE
rb_ary_unshift_m(argc, argv, ary)
int argc;
VALUE *argv;
VALUE ary;
{
- long len = RARRAY(ary)->len;
-
- if (argc == 0) return ary;
+ if (argc == 0) {
+ rb_raise(rb_eArgError, "wrong # of arguments(at least 1)");
+ }
+ if (argc > 0) {
+ long len = RARRAY(ary)->len;
- /* make rooms by setting the last item */
- rb_ary_store(ary, len + argc - 1, Qnil);
+ /* make rooms by setting the last item */
+ rb_ary_store(ary, len + argc - 1, Qnil);
- /* sliding items */
- MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
- MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
-
+ /* sliding items */
+ MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
+ MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+ }
return ary;
}
-/* faster version - use this if you don't need to treat negative offset */
-static inline VALUE
-rb_ary_elt(ary, offset)
+VALUE
+rb_ary_entry(ary, offset)
VALUE ary;
long offset;
{
if (RARRAY(ary)->len == 0) return Qnil;
+
+ if (offset < 0) {
+ offset = RARRAY(ary)->len + offset;
+ }
if (offset < 0 || RARRAY(ary)->len <= offset) {
return Qnil;
}
- return RARRAY(ary)->ptr[offset];
-}
-VALUE
-rb_ary_entry(ary, offset)
- VALUE ary;
- long offset;
-{
- if (offset < 0) {
- offset += RARRAY(ary)->len;
- }
- return rb_ary_elt(ary, offset);
+ return RARRAY(ary)->ptr[offset];
}
static VALUE
@@ -600,121 +398,65 @@ rb_ary_subseq(ary, beg, len)
VALUE ary;
long beg, len;
{
- VALUE klass, ary2, shared;
- VALUE *ptr;
+ VALUE ary2;
if (beg > RARRAY(ary)->len) return Qnil;
if (beg < 0 || len < 0) return Qnil;
- if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+ if (beg + len > RARRAY(ary)->len) {
len = RARRAY(ary)->len - beg;
- if (len < 0)
- len = 0;
}
- klass = rb_obj_class(ary);
- if (len == 0) return ary_new(klass, 0);
+ if (len < 0) {
+ len = 0;
+ }
+ if (len == 0) return rb_ary_new2(0);
- shared = ary_make_shared(ary);
- ptr = RARRAY(ary)->ptr;
- ary2 = ary_alloc(klass);
- RARRAY(ary2)->ptr = ptr + beg;
+ ary2 = rb_ary_new2(len);
+ MEMCPY(RARRAY(ary2)->ptr, RARRAY(ary)->ptr+beg, VALUE, len);
RARRAY(ary2)->len = len;
- RARRAY(ary2)->aux.shared = shared;
- FL_SET(ary2, ELTS_SHARED);
return ary2;
}
-/*
- * call-seq:
- * array[index] -> obj or nil
- * array[start, length] -> an_array or nil
- * array[range] -> an_array or nil
- * array.slice(index) -> obj or nil
- * array.slice(start, length) -> an_array or nil
- * array.slice(range) -> an_array or nil
- *
- * 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"
- * a[6] #=> nil
- * a[1, 2] #=> [ "b", "c" ]
- * a[1..3] #=> [ "b", "c", "d" ]
- * a[4..7] #=> [ "e" ]
- * a[6..10] #=> nil
- * a[-3, 3] #=> [ "c", "d", "e" ]
- * # special cases
- * a[5] #=> nil
- * a[5, 1] #=> []
- * a[5..10] #=> []
- *
- */
-
VALUE
rb_ary_aref(argc, argv, ary)
int argc;
VALUE *argv;
VALUE ary;
{
- VALUE arg;
+ VALUE arg1, arg2;
long beg, len;
- if (argc == 2) {
- if (SYMBOL_P(argv[0])) {
- rb_raise(rb_eTypeError, "Symbol as array index");
- }
- beg = NUM2LONG(argv[0]);
- len = NUM2LONG(argv[1]);
+ if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
+ beg = NUM2LONG(arg1);
+ len = NUM2LONG(arg2);
if (beg < 0) {
- beg += RARRAY(ary)->len;
+ beg = RARRAY(ary)->len + beg;
}
return rb_ary_subseq(ary, beg, len);
}
- if (argc != 1) {
- rb_scan_args(argc, argv, "11", 0, 0);
- }
- arg = argv[0];
+
/* special case - speeding up */
- if (FIXNUM_P(arg)) {
- return rb_ary_entry(ary, FIX2LONG(arg));
+ if (FIXNUM_P(arg1)) {
+ return rb_ary_entry(ary, FIX2LONG(arg1));
}
- if (SYMBOL_P(arg)) {
- rb_raise(rb_eTypeError, "Symbol as array index");
+ else if (TYPE(arg1) == T_BIGNUM) {
+ rb_raise(rb_eIndexError, "index too big");
}
- /* check if idx is Range */
- switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) {
- case Qfalse:
- break;
- case Qnil:
- return Qnil;
- default:
- return rb_ary_subseq(ary, beg, len);
+ else {
+ /* check if idx is Range */
+ switch (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 0)) {
+ case Qfalse:
+ break;
+ case Qnil:
+ return Qnil;
+ default:
+ return rb_ary_subseq(ary, beg, len);
+ }
}
- return rb_ary_entry(ary, NUM2LONG(arg));
+ return rb_ary_entry(ary, NUM2LONG(arg1));
}
-/*
- * call-seq:
- * array.at(index) -> obj or nil
- *
- * Returns the element at _index_. A
- * negative index counts from the end of _self_. Returns +nil+
- * if the index is out of range. See also <code>Array#[]</code>.
- * (<code>Array#at</code> is slightly faster than <code>Array#[]</code>,
- * as it does not accept ranges and so on.)
- *
- * a = [ "a", "b", "c", "d", "e" ]
- * a.at(0) #=> "a"
- * a.at(-1) #=> "e"
- */
-
static VALUE
rb_ary_at(ary, pos)
VALUE ary, pos;
@@ -722,145 +464,22 @@ rb_ary_at(ary, pos)
return rb_ary_entry(ary, NUM2LONG(pos));
}
-/*
- * call-seq:
- * array.first -> obj or nil
- * array.first(n) -> an_array
- *
- * Returns the first element, or the first +n+ elements, of the array.
- * If the array is empty, the first form returns <code>nil</code>, and the
- * second form returns an empty array.
- *
- * a = [ "q", "r", "s", "t" ]
- * a.first #=> "q"
- * a.first(1) #=> ["q"]
- * a.first(3) #=> ["q", "r", "s"]
- */
-
static VALUE
-rb_ary_first(argc, argv, ary)
- int argc;
- VALUE *argv;
+rb_ary_first(ary)
VALUE ary;
{
- if (argc == 0) {
- if (RARRAY(ary)->len == 0) return Qnil;
- return RARRAY(ary)->ptr[0];
- }
- else {
- VALUE nv, result;
- long n, i;
-
- rb_scan_args(argc, argv, "01", &nv);
- n = NUM2LONG(nv);
- if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
- result = rb_ary_new2(n);
- for (i=0; i<n; i++) {
- rb_ary_push(result, RARRAY(ary)->ptr[i]);
- }
- return result;
- }
+ if (RARRAY(ary)->len == 0) return Qnil;
+ return RARRAY(ary)->ptr[0];
}
-/*
- * call-seq:
- * array.last -> obj or nil
- * array.last(n) -> an_array
- *
- * Returns the last element(s) of <i>self</i>. If the array is empty,
- * the first form returns <code>nil</code>.
- *
- * [ "w", "x", "y", "z" ].last #=> "z"
- */
-
static VALUE
-rb_ary_last(argc, argv, ary)
- int argc;
- VALUE *argv;
+rb_ary_last(ary)
VALUE ary;
{
- if (argc == 0) {
- if (RARRAY(ary)->len == 0) return Qnil;
- return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
- }
- else {
- VALUE nv, result;
- long n, i;
-
- rb_scan_args(argc, argv, "01", &nv);
- n = NUM2LONG(nv);
- if (n > RARRAY(ary)->len) n = RARRAY(ary)->len;
- result = rb_ary_new2(n);
- for (i=RARRAY(ary)->len-n; n--; i++) {
- rb_ary_push(result, RARRAY(ary)->ptr[i]);
- }
- return result;
- }
-}
-
-/*
- * call-seq:
- * array.fetch(index) -> obj
- * array.fetch(index, default ) -> obj
- * array.fetch(index) {|index| block } -> obj
- *
- * Tries to return the element at position <i>index</i>. If the index
- * lies outside the array, the first form throws an
- * <code>IndexError</code> exception, the second form returns
- * <i>default</i>, and the third form returns the value of invoking
- * the block, passing in the index. Negative values of <i>index</i>
- * count from the end of the array.
- *
- * a = [ 11, 22, 33, 44 ]
- * a.fetch(1) #=> 22
- * a.fetch(-1) #=> 44
- * a.fetch(4, 'cat') #=> "cat"
- * a.fetch(4) { |i| i*i } #=> 16
- */
-
-static VALUE
-rb_ary_fetch(argc, argv, ary)
- int argc;
- VALUE *argv;
- VALUE ary;
-{
- VALUE pos, ifnone;
- long block_given;
- long idx;
-
- rb_scan_args(argc, argv, "11", &pos, &ifnone);
- block_given = rb_block_given_p();
- if (block_given && argc == 2) {
- rb_warn("block supersedes default value argument");
- }
- idx = NUM2LONG(pos);
-
- if (idx < 0) {
- idx += RARRAY(ary)->len;
- }
- if (idx < 0 || RARRAY(ary)->len <= idx) {
- if (block_given) return rb_yield(pos);
- if (argc == 1) {
- rb_raise(rb_eIndexError, "index %ld out of array", idx);
- }
- return ifnone;
- }
- return RARRAY(ary)->ptr[idx];
+ if (RARRAY(ary)->len == 0) return Qnil;
+ return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
}
-/*
- * call-seq:
- * array.index(obj) -> int or nil
- *
- * Returns the index of the first object in <i>self</i> such that is
- * <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
- * no match is found.
- *
- * a = [ "a", "b", "c" ]
- * a.index("b") #=> 1
- * a.index("z") #=> nil
- */
-
static VALUE
rb_ary_index(ary, val)
VALUE ary;
@@ -870,24 +489,11 @@ rb_ary_index(ary, val)
for (i=0; i<RARRAY(ary)->len; i++) {
if (rb_equal(RARRAY(ary)->ptr[i], val))
- return LONG2NUM(i);
+ return INT2NUM(i);
}
return Qnil;
}
-/*
- * call-seq:
- * array.rindex(obj) -> int or nil
- *
- * Returns the index of the last object in <i>array</i>
- * <code>==</code> to <i>obj</i>. Returns <code>nil</code> if
- * no match is found.
- *
- * a = [ "a", "b", "b", "b", "c" ]
- * a.rindex("b") #=> 3
- * a.rindex("z") #=> nil
- */
-
static VALUE
rb_ary_rindex(ary, val)
VALUE ary;
@@ -896,24 +502,12 @@ rb_ary_rindex(ary, val)
long i = RARRAY(ary)->len;
while (i--) {
- if (i > RARRAY(ary)->len) {
- i = RARRAY(ary)->len;
- continue;
- }
if (rb_equal(RARRAY(ary)->ptr[i], val))
- return LONG2NUM(i);
+ return INT2NUM(i);
}
return Qnil;
}
-/*
- * call-seq:
- * array.indexes( i1, i2, ... iN ) -> an_array
- * array.indices( i1, i2, ... iN ) -> an_array
- *
- * Deprecated; use <code>Array#values_at</code>.
- */
-
static VALUE
rb_ary_indexes(argc, argv, ary)
int argc;
@@ -923,7 +517,6 @@ rb_ary_indexes(argc, argv, ary)
VALUE new_ary;
long i;
- rb_warn("Array#%s is deprecated; use Array#values_at", rb_id2name(rb_frame_last_func()));
new_ary = rb_ary_new2(argc);
for (i=0; i<argc; i++) {
rb_ary_push(new_ary, rb_ary_aref(1, argv+i, ary));
@@ -932,58 +525,42 @@ rb_ary_indexes(argc, argv, ary)
return new_ary;
}
-VALUE
-rb_ary_to_ary(obj)
- VALUE obj;
-{
- if (TYPE(obj) == T_ARRAY) {
- return obj;
- }
- if (rb_respond_to(obj, rb_intern("to_ary"))) {
- return rb_convert_type(obj, T_ARRAY, "Array", "to_ary");
- }
- return rb_ary_new3(1, obj);
-}
-
static void
-rb_ary_splice(ary, beg, len, rpl)
- VALUE ary;
+rb_ary_replace(ary, beg, len, rpl)
+ VALUE ary, rpl;
long beg, len;
- VALUE rpl;
{
long rlen;
- if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
+ if (len < 0) rb_raise(rb_eIndexError, "negative length %d", len);
if (beg < 0) {
beg += RARRAY(ary)->len;
- if (beg < 0) {
- beg -= RARRAY(ary)->len;
- rb_raise(rb_eIndexError, "index %ld out of array", beg);
- }
}
- if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
+ if (beg < 0) {
+ beg -= RARRAY(ary)->len;
+ rb_raise(rb_eIndexError, "index %d out of array", beg);
+ }
+ if (beg + len > RARRAY(ary)->len) {
len = RARRAY(ary)->len - beg;
}
if (NIL_P(rpl)) {
- rlen = 0;
+ rpl = rb_ary_new2(0);
}
- else {
- rpl = rb_ary_to_ary(rpl);
- rlen = RARRAY(rpl)->len;
+ else if (TYPE(rpl) != T_ARRAY) {
+ rpl = rb_ary_new3(1, rpl);
}
- rb_ary_modify(ary);
+ rlen = RARRAY(rpl)->len;
+ rb_ary_modify(ary);
if (beg >= RARRAY(ary)->len) {
len = beg + rlen;
- if (len >= RARRAY(ary)->aux.capa) {
- REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
- RARRAY(ary)->aux.capa = len;
- }
- rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, beg - RARRAY(ary)->len);
- if (rlen > 0) {
- MEMCPY(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+ if (len >= RARRAY(ary)->capa) {
+ RARRAY(ary)->capa=len;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
}
+ rb_mem_clear(RARRAY(ary)->ptr+RARRAY(ary)->len, beg-RARRAY(ary)->len);
+ MEMCPY(RARRAY(ary)->ptr+beg, RARRAY(rpl)->ptr, VALUE, rlen);
RARRAY(ary)->len = len;
}
else {
@@ -994,50 +571,20 @@ rb_ary_splice(ary, beg, len, rpl)
}
alen = RARRAY(ary)->len + rlen - len;
- if (alen >= RARRAY(ary)->aux.capa) {
- REALLOC_N(RARRAY(ary)->ptr, VALUE, alen);
- RARRAY(ary)->aux.capa = alen;
+ if (alen >= RARRAY(ary)->capa) {
+ RARRAY(ary)->capa=alen;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
}
- if (len != rlen) {
- MEMMOVE(RARRAY(ary)->ptr + beg + rlen, RARRAY(ary)->ptr + beg + len,
- VALUE, RARRAY(ary)->len - (beg + len));
+ if (len != RARRAY(rpl)->len) {
+ MEMMOVE(RARRAY(ary)->ptr+beg+rlen, RARRAY(ary)->ptr+beg+len,
+ VALUE, RARRAY(ary)->len-(beg+len));
RARRAY(ary)->len = alen;
}
- if (rlen > 0) {
- MEMMOVE(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
- }
+ MEMMOVE(RARRAY(ary)->ptr+beg, RARRAY(rpl)->ptr, VALUE, rlen);
}
}
-/*
- * call-seq:
- * array[index] = obj -> obj
- * array[start, length] = obj or an_array or nil -> obj or an_array or nil
- * array[range] = obj or an_array or nil -> obj or an_array or nil
- *
- * 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. If +nil+ is used in the second and third form,
- * deletes elements from _self_. An +IndexError+ is raised if a
- * negative index points past the beginning of the array. See also
- * <code>Array#push</code>, and <code>Array#unshift</code>.
- *
- * a = Array.new
- * a[4] = "4"; #=> [nil, nil, nil, nil, "4"]
- * a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
- * a[1..2] = [ 1, 2 ] #=> ["a", 1, 2, nil, "4"]
- * a[0, 2] = "?" #=> ["?", 2, nil, "4"]
- * a[0..2] = "A" #=> ["A", "4"]
- * a[-1] = "Z" #=> ["A", "Z"]
- * a[1..-1] = nil #=> ["A"]
- */
-
static VALUE
rb_ary_aset(argc, argv, ary)
int argc;
@@ -1047,87 +594,31 @@ rb_ary_aset(argc, argv, ary)
long offset, beg, len;
if (argc == 3) {
- if (SYMBOL_P(argv[0])) {
- rb_raise(rb_eTypeError, "Symbol as array index");
- }
- if (SYMBOL_P(argv[1])) {
- rb_raise(rb_eTypeError, "Symbol as subarray length");
- }
- rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
+ rb_ary_replace(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
return argv[2];
}
if (argc != 2) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)", argc);
}
if (FIXNUM_P(argv[0])) {
offset = FIX2LONG(argv[0]);
goto fixnum;
}
- if (SYMBOL_P(argv[0])) {
- rb_raise(rb_eTypeError, "Symbol as array index");
- }
- if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
+ else if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
/* check if idx is Range */
- rb_ary_splice(ary, beg, len, argv[1]);
+ rb_ary_replace(ary, beg, len, argv[1]);
return argv[1];
}
+ if (TYPE(argv[0]) == T_BIGNUM) {
+ rb_raise(rb_eIndexError, "index too big");
+ }
offset = NUM2LONG(argv[0]);
-fixnum:
+ fixnum:
rb_ary_store(ary, offset, argv[1]);
return argv[1];
}
-/*
- * call-seq:
- * array.insert(index, obj...) -> array
- *
- * Inserts the given values before the element with the given index
- * (which may be negative).
- *
- * a = %w{ a b c d }
- * a.insert(2, 99) #=> ["a", "b", 99, "c", "d"]
- * a.insert(-2, 1, 2, 3) #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
- */
-
-static VALUE
-rb_ary_insert(argc, argv, ary)
- int argc;
- VALUE *argv;
- VALUE ary;
-{
- long pos;
-
- if (argc == 1) return ary;
- if (argc < 1) {
- rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
- }
- pos = NUM2LONG(argv[0]);
- if (pos == -1) {
- pos = RARRAY(ary)->len;
- }
- if (pos < 0) {
- pos++;
- }
- rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
- return ary;
-}
-
-/*
- * call-seq:
- * array.each {|item| block } -> array
- *
- * Calls <i>block</i> once for each element in <i>self</i>, passing that
- * element as a parameter.
- *
- * a = [ "a", "b", "c" ]
- * a.each {|x| print x, " -- " }
- *
- * produces:
- *
- * a -- b -- c --
- */
-
VALUE
rb_ary_each(ary)
VALUE ary;
@@ -1140,21 +631,6 @@ rb_ary_each(ary)
return ary;
}
-/*
- * call-seq:
- * array.each_index {|index| block } -> array
- *
- * Same as <code>Array#each</code>, but passes the index of the element
- * instead of the element itself.
- *
- * a = [ "a", "b", "c" ]
- * a.each_index {|x| print x, " -- " }
- *
- * produces:
- *
- * 0 -- 1 -- 2 --
- */
-
static VALUE
rb_ary_each_index(ary)
VALUE ary;
@@ -1162,26 +638,11 @@ rb_ary_each_index(ary)
long i;
for (i=0; i<RARRAY(ary)->len; i++) {
- rb_yield(LONG2NUM(i));
+ rb_yield(INT2NUM(i));
}
return ary;
}
-/*
- * call-seq:
- * array.reverse_each {|item| block }
- *
- * Same as <code>Array#each</code>, but traverses <i>self</i> in reverse
- * order.
- *
- * a = [ "a", "b", "c" ]
- * a.reverse_each {|x| print x, " " }
- *
- * produces:
- *
- * c b a
- */
-
static VALUE
rb_ary_reverse_each(ary)
VALUE ary;
@@ -1190,38 +651,17 @@ rb_ary_reverse_each(ary)
while (len--) {
rb_yield(RARRAY(ary)->ptr[len]);
- if (RARRAY(ary)->len < len) {
- len = RARRAY(ary)->len;
- }
}
return ary;
}
-/*
- * call-seq:
- * array.length -> int
- *
- * Returns the number of elements in <i>self</i>. May be zero.
- *
- * [ 1, 2, 3, 4, 5 ].length #=> 5
- */
-
static VALUE
rb_ary_length(ary)
VALUE ary;
{
- return LONG2NUM(RARRAY(ary)->len);
+ return INT2NUM(RARRAY(ary)->len);
}
-/*
- * call-seq:
- * array.empty? -> true or false
- *
- * Returns <code>true</code> if <i>self</i> array contains no elements.
- *
- * [].empty? #=> true
- */
-
static VALUE
rb_ary_empty_p(ary)
VALUE ary;
@@ -1231,16 +671,23 @@ rb_ary_empty_p(ary)
return Qfalse;
}
-VALUE
-rb_ary_dup(ary)
+static VALUE
+rb_ary_clone(ary)
VALUE ary;
{
- VALUE dup = rb_ary_new2(RARRAY(ary)->len);
+ VALUE clone = rb_ary_new2(RARRAY(ary)->len);
- DUPSETUP(dup, ary);
- MEMCPY(RARRAY(dup)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
- RARRAY(dup)->len = RARRAY(ary)->len;
- return dup;
+ CLONESETUP(clone, ary);
+ MEMCPY(RARRAY(clone)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+ RARRAY(clone)->len = RARRAY(ary)->len;
+ return clone;
+}
+
+static VALUE
+to_ary(ary)
+ VALUE ary;
+{
+ return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
}
extern VALUE rb_output_fs;
@@ -1257,23 +704,38 @@ VALUE
rb_ary_join(ary, sep)
VALUE ary, sep;
{
- long len = 1, i;
- int taint = Qfalse;
+ long i;
+ int taint = 0;
VALUE result, tmp;
if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
- if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
+ if (OBJ_TAINTED(ary)) taint = 1;
+ if (OBJ_TAINTED(sep)) taint = 1;
+
+ tmp = RARRAY(ary)->ptr[0];
+ if (OBJ_TAINTED(tmp)) taint = 1;
+ switch (TYPE(tmp)) {
+ case T_STRING:
+ result = rb_str_dup(tmp);
+ break;
+ case T_ARRAY:
+ if (rb_inspecting_p(tmp)) {
+ result = rb_str_new2("[...]");
+ }
+ else {
+ VALUE args[2];
- for (i=0; i<RARRAY(ary)->len; i++) {
- tmp = rb_check_string_type(RARRAY(ary)->ptr[i]);
- len += NIL_P(tmp) ? 10 : RSTRING(tmp)->len;
- }
- if (!NIL_P(sep)) {
- StringValue(sep);
- len += RSTRING(sep)->len * (RARRAY(ary)->len - 1);
+ args[0] = tmp;
+ args[1] = sep;
+ result = rb_protect_inspect(inspect_join, ary, (VALUE)args);
+ }
+ break;
+ default:
+ result = rb_str_dup(rb_obj_as_string(tmp));
+ break;
}
- result = rb_str_buf_new(len);
- for (i=0; i<RARRAY(ary)->len; i++) {
+
+ for (i=1; i<RARRAY(ary)->len; i++) {
tmp = RARRAY(ary)->ptr[i];
switch (TYPE(tmp)) {
case T_STRING:
@@ -1293,27 +755,15 @@ rb_ary_join(ary, sep)
default:
tmp = rb_obj_as_string(tmp);
}
- if (i > 0 && !NIL_P(sep))
- rb_str_buf_append(result, sep);
- rb_str_buf_append(result, tmp);
- if (OBJ_TAINTED(tmp)) taint = Qtrue;
+ if (!NIL_P(sep)) rb_str_append(result, sep);
+ rb_str_append(result, tmp);
+ if (OBJ_TAINTED(tmp)) taint = 1;
}
if (taint) OBJ_TAINT(result);
return result;
}
-/*
- * call-seq:
- * array.join(sep=$,) -> str
- *
- * Returns a string created by converting each element of the array to
- * a string, separated by <i>sep</i>.
- *
- * [ "a", "b", "c" ].join #=> "abc"
- * [ "a", "b", "c" ].join("-") #=> "a-b-c"
- */
-
static VALUE
rb_ary_join_m(argc, argv, ary)
int argc;
@@ -1324,27 +774,19 @@ rb_ary_join_m(argc, argv, ary)
rb_scan_args(argc, argv, "01", &sep);
if (NIL_P(sep)) sep = rb_output_fs;
-
return rb_ary_join(ary, sep);
}
-/*
- * call-seq:
- * array.to_s -> string
- *
- * Returns _self_<code>.join</code>.
- *
- * [ "a", "e", "i", "o" ].to_s #=> "aeio"
- *
- */
-
VALUE
rb_ary_to_s(ary)
VALUE ary;
{
+ VALUE str;
+
if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-
- return rb_ary_join(ary, rb_output_fs);
+ str = rb_ary_join(ary, rb_output_fs);
+ if (NIL_P(str)) return rb_str_new(0, 0);
+ return str;
}
static ID inspect_key;
@@ -1354,7 +796,7 @@ struct inspect_arg {
VALUE arg1, arg2;
};
-static VALUE
+VALUE
inspect_call(arg)
struct inspect_arg *arg;
{
@@ -1362,50 +804,33 @@ inspect_call(arg)
}
static VALUE
-get_inspect_tbl(create)
- int create;
-{
- VALUE inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
-
- if (NIL_P(inspect_tbl)) {
- if (create) {
- tbl_init:
- inspect_tbl = rb_ary_new();
- rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
- }
- }
- else if (TYPE(inspect_tbl) != T_ARRAY) {
- rb_warn("invalid inspect_tbl value");
- if (create) goto tbl_init;
- rb_thread_local_aset(rb_thread_current(), inspect_key, Qnil);
- return Qnil;
- }
- return inspect_tbl;
-}
-
-static VALUE
inspect_ensure(obj)
VALUE obj;
{
VALUE inspect_tbl;
- inspect_tbl = get_inspect_tbl(Qfalse);
- if (!NIL_P(inspect_tbl)) {
- rb_ary_pop(inspect_tbl);
- }
+ inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
+ rb_ary_pop(inspect_tbl);
return 0;
}
VALUE
rb_protect_inspect(func, obj, arg)
- VALUE (*func)(ANYARGS);
+ VALUE (*func)();
VALUE obj, arg;
{
struct inspect_arg iarg;
VALUE inspect_tbl;
VALUE id;
- inspect_tbl = get_inspect_tbl(Qtrue);
+ if (!inspect_key) {
+ inspect_key = rb_intern("__inspect_key__");
+ }
+ inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
+ if (NIL_P(inspect_tbl)) {
+ inspect_tbl = rb_ary_new();
+ rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
+ }
id = rb_obj_id(obj);
if (rb_ary_includes(inspect_tbl, id)) {
return (*func)(obj, arg);
@@ -1424,7 +849,8 @@ rb_inspecting_p(obj)
{
VALUE inspect_tbl;
- inspect_tbl = get_inspect_tbl(Qfalse);
+ if (!inspect_key) return Qfalse;
+ inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
if (NIL_P(inspect_tbl)) return Qfalse;
return rb_ary_includes(inspect_tbl, rb_obj_id(obj));
}
@@ -1434,28 +860,23 @@ inspect_ary(ary)
VALUE ary;
{
int tainted = OBJ_TAINTED(ary);
- long i;
+ long i = 0;
VALUE s, str;
- str = rb_str_buf_new2("[");
+ str = rb_str_new2("[");
+
for (i=0; i<RARRAY(ary)->len; i++) {
s = rb_inspect(RARRAY(ary)->ptr[i]);
- if (OBJ_TAINTED(s)) tainted = Qtrue;
- if (i > 0) rb_str_buf_cat2(str, ", ");
- rb_str_buf_append(str, s);
+ tainted = OBJ_TAINTED(s);
+ if (i > 0) rb_str_cat2(str, ", ");
+ rb_str_append(str, s);
}
- rb_str_buf_cat2(str, "]");
+ rb_str_cat(str, "]", 1);
+
if (tainted) OBJ_TAINT(str);
return str;
}
-/*
- * call-seq:
- * array.inspect -> string
- *
- * Create a printable version of <i>array</i>.
- */
-
static VALUE
rb_ary_inspect(ary)
VALUE ary;
@@ -1465,37 +886,10 @@ rb_ary_inspect(ary)
return rb_protect_inspect(inspect_ary, ary, 0);
}
-/*
- * call-seq:
- * array.to_a -> array
- *
- * Returns _self_. If called on a subclass of Array, converts
- * the receiver to an Array object.
- */
-
static VALUE
rb_ary_to_a(ary)
VALUE ary;
{
- if (rb_obj_class(ary) != rb_cArray) {
- VALUE dup = rb_ary_new2(RARRAY(ary)->len);
- rb_ary_replace(dup, ary);
- return dup;
- }
- return ary;
-}
-
-/*
- * call-seq:
- * array.to_ary -> array
- *
- * Returns _self_.
- */
-
-static VALUE
-rb_ary_to_ary_m(ary)
- VALUE ary;
-{
return ary;
}
@@ -1506,118 +900,69 @@ rb_ary_reverse(ary)
VALUE *p1, *p2;
VALUE tmp;
+ if (RARRAY(ary)->len <= 1) return ary;
rb_ary_modify(ary);
- if (RARRAY(ary)->len > 1) {
- p1 = RARRAY(ary)->ptr;
- p2 = p1 + RARRAY(ary)->len - 1; /* points last item */
-
- while (p1 < p2) {
- tmp = *p1;
- *p1++ = *p2;
- *p2-- = tmp;
- }
+
+ p1 = RARRAY(ary)->ptr;
+ p2 = p1 + RARRAY(ary)->len - 1; /* points last item */
+
+ while (p1 < p2) {
+ tmp = *p1;
+ *p1++ = *p2;
+ *p2-- = tmp;
}
+
return ary;
}
-/*
- * call-seq:
- * array.reverse! -> array
- *
- * Reverses _self_ in place.
- *
- * a = [ "a", "b", "c" ]
- * a.reverse! #=> ["c", "b", "a"]
- * a #=> ["c", "b", "a"]
- */
-
static VALUE
rb_ary_reverse_bang(ary)
VALUE ary;
{
+ if (RARRAY(ary)->len <= 1) return Qnil;
return rb_ary_reverse(ary);
}
-/*
- * call-seq:
- * array.reverse -> an_array
- *
- * Returns a new array containing <i>self</i>'s elements in reverse order.
- *
- * [ "a", "b", "c" ].reverse #=> ["c", "b", "a"]
- * [ 1 ].reverse #=> [1]
- */
-
static VALUE
rb_ary_reverse_m(ary)
VALUE ary;
{
- return rb_ary_reverse(rb_ary_dup(ary));
+ return rb_ary_reverse(rb_obj_dup(ary));
}
-struct ary_sort_data {
- VALUE ary;
- VALUE *ptr;
- long len;
-};
-
-static void
-ary_sort_check(data)
- struct ary_sort_data *data;
-{
- if (RARRAY(data->ary)->ptr != data->ptr || RARRAY(data->ary)->len != data->len) {
- rb_raise(rb_eArgError, "array modified during sort");
- }
-}
+static ID cmp;
static int
-sort_1(a, b, data)
+sort_1(a, b)
VALUE *a, *b;
- struct ary_sort_data *data;
{
- VALUE retval = rb_yield_values(2, *a, *b);
- int n;
-
- n = rb_cmpint(retval, *a, *b);
- ary_sort_check(data);
- return n;
+ VALUE retval = rb_yield(rb_assoc_new(*a, *b));
+ return NUM2INT(retval);
}
static int
-sort_2(ap, bp, data)
- VALUE *ap, *bp;
- struct ary_sort_data *data;
+sort_2(a, b)
+ VALUE *a, *b;
{
VALUE retval;
- VALUE a = *ap, b = *bp;
- int n;
- if (FIXNUM_P(a) && FIXNUM_P(b)) {
- if ((long)a > (long)b) return 1;
- if ((long)a < (long)b) return -1;
- return 0;
+ if (FIXNUM_P(*a)) {
+ if (FIXNUM_P(*b)) return *a - *b;
}
- if (TYPE(a) == T_STRING) {
- if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
+ else if (TYPE(*a) == T_STRING && TYPE(*b) == T_STRING) {
+ return rb_str_cmp(*a, *b);
}
- retval = rb_funcall(a, id_cmp, 1, b);
- n = rb_cmpint(retval, a, b);
- ary_sort_check(data);
-
- return n;
+ retval = rb_funcall(*a, cmp, 1, *b);
+ return NUM2INT(retval);
}
static VALUE
sort_internal(ary)
VALUE ary;
{
- struct ary_sort_data data;
-
- data.ary = ary;
- data.ptr = RARRAY(ary)->ptr; data.len = RARRAY(ary)->len;
qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
- rb_block_given_p()?sort_1:sort_2, &data);
+ rb_block_given_p()?sort_1:sort_2);
return ary;
}
@@ -1629,105 +974,46 @@ sort_unlock(ary)
return ary;
}
-/*
- * call-seq:
- * array.sort! -> array
- * array.sort! {| a,b | block } -> array
- *
- * Sorts _self_. Comparisons for
- * the sort will be done using the <code><=></code> operator or using
- * an optional code block. The block implements a comparison between
- * <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- * <code>Enumerable#sort_by</code>.
- *
- * a = [ "d", "a", "e", "c", "b" ]
- * a.sort #=> ["a", "b", "c", "d", "e"]
- * a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
- */
-
VALUE
rb_ary_sort_bang(ary)
VALUE ary;
{
rb_ary_modify(ary);
- if (RARRAY(ary)->len > 1) {
- FL_SET(ary, ARY_TMPLOCK); /* prohibit modification during sort */
- rb_ensure(sort_internal, ary, sort_unlock, ary);
- }
+ if (RARRAY(ary)->len <= 1) return Qnil;
+
+ FL_SET(ary, ARY_TMPLOCK); /* prohibit modification during sort */
+ rb_ensure(sort_internal, ary, sort_unlock, ary);
return ary;
}
-/*
- * call-seq:
- * array.sort -> an_array
- * array.sort {| a,b | block } -> an_array
- *
- * Returns a new array created by sorting <i>self</i>. Comparisons for
- * the sort will be done using the <code><=></code> operator or using
- * an optional code block. The block implements a comparison between
- * <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- * <code>Enumerable#sort_by</code>.
- *
- * a = [ "d", "a", "e", "c", "b" ]
- * a.sort #=> ["a", "b", "c", "d", "e"]
- * a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
- */
-
VALUE
rb_ary_sort(ary)
VALUE ary;
{
- ary = rb_ary_dup(ary);
+ ary = rb_obj_dup(ary);
rb_ary_sort_bang(ary);
return ary;
}
-/*
- * call-seq:
- * array.collect {|item| block } -> an_array
- * array.map {|item| block } -> an_array
- *
- * Invokes <i>block</i> once for each element of <i>self</i>. Creates a
- * new array containing the values returned by the block.
- * See also <code>Enumerable#collect</code>.
- *
- * a = [ "a", "b", "c", "d" ]
- * a.collect {|x| x + "!" } #=> ["a!", "b!", "c!", "d!"]
- * a #=> ["a", "b", "c", "d"]
- */
-
static VALUE
rb_ary_collect(ary)
VALUE ary;
{
- long i;
+ long len, i;
VALUE collect;
if (!rb_block_given_p()) {
- return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
+ return rb_obj_dup(ary);
}
- collect = rb_ary_new2(RARRAY(ary)->len);
- for (i = 0; i < RARRAY(ary)->len; i++) {
+ len = RARRAY(ary)->len;
+ collect = rb_ary_new2(len);
+ for (i=0; i<len; i++) {
rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
}
return collect;
}
-/*
- * call-seq:
- * array.collect! {|item| block } -> array
- * array.map! {|item| block } -> array
- *
- * Invokes the block once for each element of _self_, replacing the
- * element with the value returned by _block_.
- * See also <code>Enumerable#collect</code>.
- *
- * a = [ "a", "b", "c", "d" ]
- * a.collect! {|x| x + "!" }
- * a #=> [ "a!", "b!", "c!", "d!" ]
- */
-
static VALUE
rb_ary_collect_bang(ary)
VALUE ary;
@@ -1736,114 +1022,19 @@ rb_ary_collect_bang(ary)
rb_ary_modify(ary);
for (i = 0; i < RARRAY(ary)->len; i++) {
- rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
+ RARRAY(ary)->ptr[i] = rb_yield(RARRAY(ary)->ptr[i]);
}
return ary;
}
-VALUE
-rb_values_at(obj, olen, argc, argv, func)
- VALUE obj;
- long olen;
- int argc;
- VALUE *argv;
- VALUE (*func) _((VALUE,long));
-{
- VALUE result = rb_ary_new2(argc);
- long beg, len, i, j;
-
- for (i=0; i<argc; i++) {
- if (FIXNUM_P(argv[i])) {
- rb_ary_push(result, (*func)(obj, FIX2LONG(argv[i])));
- continue;
- }
- /* check if idx is Range */
- 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));
- }
- continue;
- }
- rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
- }
- return result;
-}
-
-/*
- * call-seq:
- * array.values_at(selector,... ) -> an_array
- *
- * Returns an array containing the elements in
- * _self_ corresponding to the given selector(s). The selectors
- * may be either integer indices or ranges.
- * See also <code>Array#select</code>.
- *
- * a = %w{ a b c d e f }
- * a.values_at(1, 3, 5)
- * a.values_at(1, 3, 5, 7)
- * a.values_at(-1, -3, -5, -7)
- * a.values_at(1..3, 2...5)
- */
-
static VALUE
-rb_ary_values_at(argc, argv, ary)
- int argc;
- VALUE *argv;
+rb_ary_filter(ary)
VALUE ary;
{
- return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
-}
-
-/*
- * call-seq:
- * array.select {|item| block } -> an_array
- *
- * Invokes the block passing in successive elements from <i>array</i>,
- * returning an array containing those elements for which the block
- * returns a true value (equivalent to <code>Enumerable#select</code>).
- *
- * a = %w{ a b c d e f }
- * a.select {|v| v =~ /[aeiou]/} #=> ["a", "e"]
- */
-
-static VALUE
-rb_ary_select(ary)
- VALUE ary;
-{
- VALUE result;
- long i;
-
- result = rb_ary_new2(RARRAY(ary)->len);
- for (i = 0; i < RARRAY(ary)->len; i++) {
- if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
- rb_ary_push(result, rb_ary_elt(ary, i));
- }
- }
- return result;
+ rb_warn("Array#filter is deprecated; use Array#collect!");
+ return rb_ary_collect_bang(ary);
}
-/*
- * call-seq:
- * array.delete(obj) -> obj or nil
- * array.delete(obj) { block } -> obj or nil
- *
- * Deletes items from <i>self</i> that are equal to <i>obj</i>. If
- * the item is not found, returns <code>nil</code>. If the optional
- * code block is given, returns the result of <i>block</i> if the item
- * is not found.
- *
- * a = [ "a", "b", "b", "b", "c" ]
- * a.delete("b") #=> "b"
- * a #=> ["a", "c"]
- * a.delete("z") #=> nil
- * a.delete("z") { "not found" } #=> "not found"
- */
-
VALUE
rb_ary_delete(ary, item)
VALUE ary;
@@ -1851,12 +1042,11 @@ rb_ary_delete(ary, item)
{
long i1, i2;
+ rb_ary_modify(ary);
for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
- VALUE e = RARRAY(ary)->ptr[i1];
-
- if (rb_equal(e, item)) continue;
+ if (rb_equal(RARRAY(ary)->ptr[i1], item)) continue;
if (i1 != i2) {
- rb_ary_store(ary, i2, e);
+ RARRAY(ary)->ptr[i2] = RARRAY(ary)->ptr[i1];
}
i2++;
}
@@ -1866,15 +1056,8 @@ rb_ary_delete(ary, item)
}
return Qnil;
}
-
- rb_ary_modify(ary);
- if (RARRAY(ary)->len > i2) {
+ else {
RARRAY(ary)->len = i2;
- if (i2 * 2 < RARRAY(ary)->aux.capa &&
- RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
- REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
- RARRAY(ary)->aux.capa = i2 * 2;
- }
}
return item;
@@ -1886,15 +1069,13 @@ rb_ary_delete_at(ary, pos)
long pos;
{
long i, len = RARRAY(ary)->len;
- VALUE del;
+ VALUE del = Qnil;
+ rb_ary_modify(ary);
if (pos >= len) return Qnil;
- if (pos < 0) {
- pos += len;
- if (pos < 0) return Qnil;
- }
+ if (pos < 0) pos += len;
+ if (pos < 0) return Qnil;
- rb_ary_modify(ary);
del = RARRAY(ary)->ptr[pos];
for (i = pos + 1; i < len; i++, pos++) {
RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
@@ -1904,52 +1085,13 @@ rb_ary_delete_at(ary, pos)
return del;
}
-/*
- * call-seq:
- * array.delete_at(index) -> obj or nil
- *
- * Deletes the element at the specified index, returning that element,
- * or <code>nil</code> if the index is out of range. See also
- * <code>Array#slice!</code>.
- *
- * a = %w( ant bat cat dog )
- * a.delete_at(2) #=> "cat"
- * a #=> ["ant", "bat", "dog"]
- * a.delete_at(99) #=> nil
- */
-
-static VALUE
+VALUE
rb_ary_delete_at_m(ary, pos)
VALUE ary, pos;
{
return rb_ary_delete_at(ary, NUM2LONG(pos));
}
-/*
- * call-seq:
- * array.slice!(index) -> obj or nil
- * array.slice!(start, length) -> sub_array or nil
- * array.slice!(range) -> sub_array or nil
- *
- * Deletes the element(s) given by an index (optionally with a length)
- * or by a range. Returns the deleted object, subarray, or
- * <code>nil</code> if the index is out of range. Equivalent to:
- *
- * def slice!(*args)
- * result = self[*args]
- * self[*args] = nil
- * result
- * end
- *
- * a = [ "a", "b", "c" ]
- * a.slice!(1) #=> "b"
- * a #=> ["a", "c"]
- * a.slice!(-1) #=> "c"
- * a #=> ["a"]
- * a.slice!(100) #=> nil
- * a #=> ["a"]
- */
-
static VALUE
rb_ary_slice_bang(argc, argv, ary)
int argc;
@@ -1957,8 +1099,9 @@ rb_ary_slice_bang(argc, argv, ary)
VALUE ary;
{
VALUE arg1, arg2;
- long pos, len;
+ long pos, len, i;
+ rb_ary_modify(ary);
if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
pos = NUM2LONG(arg1);
len = NUM2LONG(arg2);
@@ -1967,7 +1110,7 @@ rb_ary_slice_bang(argc, argv, ary)
pos = RARRAY(ary)->len + pos;
}
arg2 = rb_ary_subseq(ary, pos, len);
- rb_ary_splice(ary, pos, len, Qnil); /* Qnil/rb_ary_new2(0) */
+ rb_ary_replace(ary, pos, len, Qnil); /* Qnil/rb_ary_new2(0) */
return arg2;
}
@@ -1975,18 +1118,21 @@ rb_ary_slice_bang(argc, argv, ary)
goto delete_pos_len;
}
- return rb_ary_delete_at(ary, NUM2LONG(arg1));
-}
+ pos = NUM2LONG(arg1);
+ len = RARRAY(ary)->len;
+
+ if (pos >= len) return Qnil;
+ if (pos < 0) pos += len;
+ if (pos < 0) return Qnil;
-/*
- * call-seq:
- * array.reject! {|item| block } -> array or nil
- *
- * Equivalent to <code>Array#delete_if</code>, deleting elements from
- * _self_ for which the block evaluates to true, but returns
- * <code>nil</code> if no changes were made. Also see
- * <code>Enumerable#reject</code>.
- */
+ arg2 = RARRAY(ary)->ptr[pos];
+ for (i = pos + 1; i < len; i++, pos++) {
+ RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
+ }
+ RARRAY(ary)->len = pos;
+
+ return arg2;
+}
static VALUE
rb_ary_reject_bang(ary)
@@ -1996,48 +1142,18 @@ rb_ary_reject_bang(ary)
rb_ary_modify(ary);
for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
- VALUE v = RARRAY(ary)->ptr[i1];
- if (RTEST(rb_yield(v))) continue;
+ if (RTEST(rb_yield(RARRAY(ary)->ptr[i1]))) continue;
if (i1 != i2) {
- rb_ary_store(ary, i2, v);
+ RARRAY(ary)->ptr[i2] = RARRAY(ary)->ptr[i1];
}
i2++;
}
if (RARRAY(ary)->len == i2) return Qnil;
- if (i2 < RARRAY(ary)->len)
- RARRAY(ary)->len = i2;
+ RARRAY(ary)->len = i2;
return ary;
}
-/*
- * call-seq:
- * array.reject {|item| block } -> an_array
- *
- * Returns a new array containing the items in _self_
- * for which the block is not true.
- */
-
-static VALUE
-rb_ary_reject(ary)
- VALUE ary;
-{
- ary = rb_ary_dup(ary);
- rb_ary_reject_bang(ary);
- return ary;
-}
-
-/*
- * call-seq:
- * array.delete_if {|item| block } -> array
- *
- * Deletes every element of <i>self</i> for which <i>block</i> evaluates
- * to <code>true</code>.
- *
- * a = [ "a", "b", "c" ]
- * a.delete_if {|x| x >= "b" } #=> ["a"]
- */
-
static VALUE
rb_ary_delete_if(ary)
VALUE ary;
@@ -2046,186 +1162,28 @@ rb_ary_delete_if(ary)
return ary;
}
-/*
- * call-seq:
- * array.zip(arg, ...) -> an_array
- * array.zip(arg, ...) {| arr | block } -> nil
- *
- * Converts any arguments to arrays, then merges elements of
- * <i>self</i> with corresponding elements from each argument. This
- * generates a sequence of <code>self.size</code> <em>n</em>-element
- * 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 given, it is
- * invoked for each output array, otherwise an array of arrays is
- * returned.
- *
- * a = [ 4, 5, 6 ]
- * b = [ 7, 8, 9 ]
- *
- * [1,2,3].zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- * [1,2].zip(a,b) #=> [[1, 4, 7], [2, 5, 8]]
- * a.zip([1,2],[8]) #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
- */
-
-static VALUE
-rb_ary_zip(argc, argv, ary)
- int argc;
- VALUE *argv;
- VALUE ary;
-{
- int i, j;
- long len;
- VALUE result;
-
- for (i=0; i<argc; i++) {
- argv[i] = to_ary(argv[i]);
- }
- if (rb_block_given_p()) {
- for (i=0; i<RARRAY(ary)->len; i++) {
- VALUE tmp = rb_ary_new2(argc+1);
-
- rb_ary_push(tmp, rb_ary_elt(ary, i));
- for (j=0; j<argc; j++) {
- rb_ary_push(tmp, rb_ary_elt(argv[j], i));
- }
- rb_yield(tmp);
- }
- return Qnil;
- }
- len = RARRAY(ary)->len;
- result = rb_ary_new2(len);
- for (i=0; i<len; i++) {
- VALUE tmp = rb_ary_new2(argc+1);
-
- rb_ary_push(tmp, rb_ary_elt(ary, i));
- for (j=0; j<argc; j++) {
- rb_ary_push(tmp, rb_ary_elt(argv[j], i));
- }
- rb_ary_push(result, tmp);
- }
- return result;
-}
-
-/*
- * call-seq:
- * array.transpose -> an_array
- *
- * Assumes that <i>self</i> is an array of arrays and transposes the
- * rows and columns.
- *
- * a = [[1,2], [3,4], [5,6]]
- * a.transpose #=> [[1, 3, 5], [2, 4, 6]]
- */
-
static VALUE
-rb_ary_transpose(ary)
- VALUE ary;
+rb_ary_replace_m(ary, ary2)
+ VALUE ary, ary2;
{
- long elen = -1, alen, i, j;
- VALUE tmp, result = 0;
-
- alen = RARRAY(ary)->len;
- if (alen == 0) return rb_ary_dup(ary);
- for (i=0; i<alen; i++) {
- tmp = to_ary(rb_ary_elt(ary, i));
- if (elen < 0) { /* first element */
- elen = RARRAY(tmp)->len;
- result = rb_ary_new2(elen);
- for (j=0; j<elen; j++) {
- rb_ary_store(result, j, rb_ary_new2(alen));
- }
- }
- else if (elen != RARRAY(tmp)->len) {
- rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
- RARRAY(tmp)->len, elen);
- }
- for (j=0; j<elen; j++) {
- rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
- }
- }
- return result;
+ ary2 = to_ary(ary2);
+ rb_ary_replace(ary, 0, RARRAY(ary)->len, ary2);
+ return ary;
}
-/*
- * call-seq:
- * array.replace(other_array) -> array
- *
- * Replaces the contents of <i>self</i> with the contents of
- * <i>other_array</i>, truncating or expanding if necessary.
- *
- * a = [ "a", "b", "c", "d", "e" ]
- * a.replace([ "x", "y", "z" ]) #=> ["x", "y", "z"]
- * a #=> ["x", "y", "z"]
- */
-
-static VALUE
-rb_ary_replace(copy, orig)
- VALUE copy, orig;
-{
- VALUE shared;
-
- rb_ary_modify(copy);
- orig = to_ary(orig);
- if (copy == orig) return copy;
- shared = ary_make_shared(orig);
- if (RARRAY(copy)->ptr && !FL_TEST(copy, ELTS_SHARED))
- free(RARRAY(copy)->ptr);
- RARRAY(copy)->ptr = RARRAY(orig)->ptr;
- RARRAY(copy)->len = RARRAY(orig)->len;
- RARRAY(copy)->aux.shared = shared;
- FL_SET(copy, ELTS_SHARED);
-
- return copy;
-}
-
-/*
- * call-seq:
- * array.clear -> array
- *
- * Removes all elements from _self_.
- *
- * a = [ "a", "b", "c", "d", "e" ]
- * a.clear #=> [ ]
- */
-
VALUE
rb_ary_clear(ary)
VALUE ary;
{
rb_ary_modify(ary);
RARRAY(ary)->len = 0;
- if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
- REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
- RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
+ if (ARY_DEFAULT_SIZE*3 < RARRAY(ary)->capa) {
+ RARRAY(ary)->capa = ARY_DEFAULT_SIZE * 2;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
}
return ary;
}
-/*
- * call-seq:
- * array.fill(obj) -> array
- * array.fill(obj, start [, length]) -> array
- * array.fill(obj, range ) -> array
- * array.fill {|index| block } -> array
- * array.fill(start [, length] ) {|index| block } -> array
- * array.fill(range) {|index| block } -> array
- *
- * The first three forms set the selected elements of <i>self</i> (which
- * may be the entire array) to <i>obj</i>. A <i>start</i> of
- * <code>nil</code> is equivalent to zero. A <i>length</i> of
- * <code>nil</code> is equivalent to <i>self.length</i>. The last three
- * forms fill the array with the value of the block. The block is
- * passed the absolute index of each element to be filled.
- *
- * 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]
- */
-
static VALUE
rb_ary_fill(argc, argv, ary)
int argc;
@@ -2233,22 +1191,14 @@ rb_ary_fill(argc, argv, ary)
VALUE ary;
{
VALUE item, arg1, arg2;
- long beg = 0, end = 0, len = 0;
+ long beg, end, len;
VALUE *p, *pend;
- int block_p = Qfalse;
- if (rb_block_given_p()) {
- block_p = Qtrue;
- rb_scan_args(argc, argv, "02", &arg1, &arg2);
- argc += 1; /* hackish */
- }
- else {
- rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
- }
+ rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
switch (argc) {
case 1:
beg = 0;
- len = RARRAY(ary)->len;
+ len = RARRAY(ary)->len - beg;
break;
case 2:
if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
@@ -2256,315 +1206,187 @@ rb_ary_fill(argc, argv, ary)
}
/* fall through */
case 3:
- beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
+ beg = NIL_P(arg1)?0:NUM2LONG(arg1);
if (beg < 0) {
beg = RARRAY(ary)->len + beg;
if (beg < 0) beg = 0;
}
- len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
+ len = NIL_P(arg2)?RARRAY(ary)->len - beg:NUM2LONG(arg2);
break;
}
rb_ary_modify(ary);
end = beg + len;
- if (end < 0) {
- rb_raise(rb_eArgError, "argument too big");
- }
if (end > RARRAY(ary)->len) {
- if (end >= RARRAY(ary)->aux.capa) {
- REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
- RARRAY(ary)->aux.capa = end;
+ if (end >= RARRAY(ary)->capa) {
+ RARRAY(ary)->capa=end;
+ REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->capa);
+ }
+ if (beg > RARRAY(ary)->len) {
+ rb_mem_clear(RARRAY(ary)->ptr+RARRAY(ary)->len,end-RARRAY(ary)->len);
}
- rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
RARRAY(ary)->len = end;
}
+ p = RARRAY(ary)->ptr + beg; pend = p + len;
- if (block_p) {
- VALUE v;
- long i;
-
- for (i=beg; i<end; i++) {
- v = rb_yield(LONG2NUM(i));
- if (i>=RARRAY(ary)->len) break;
- RARRAY(ary)->ptr[i] = v;
- }
- }
- else {
- p = RARRAY(ary)->ptr + beg;
- pend = p + len;
- while (p < pend) {
- *p++ = item;
- }
+ while (p < pend) {
+ *p++ = item;
}
return ary;
}
-/*
- * call-seq:
- * array + other_array -> an_array
- *
- * Concatenation---Returns a new array built by concatenating the
- * two arrays together to produce a third array.
- *
- * [ 1, 2, 3 ] + [ 4, 5 ] #=> [ 1, 2, 3, 4, 5 ]
- */
-
VALUE
rb_ary_plus(x, y)
VALUE x, y;
{
VALUE z;
- long len;
y = to_ary(y);
- len = RARRAY(x)->len + RARRAY(y)->len;
- z = rb_ary_new2(len);
+ z = rb_ary_new2(RARRAY(x)->len + RARRAY(y)->len);
MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
- MEMCPY(RARRAY(z)->ptr + RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
- RARRAY(z)->len = len;
+ MEMCPY(RARRAY(z)->ptr+RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
+ RARRAY(z)->len = RARRAY(x)->len + RARRAY(y)->len;
return z;
}
-/*
- * call-seq:
- * array.concat(other_array) -> array
- *
- * Appends the elements in other_array to _self_.
- *
- * [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
- */
-
-
VALUE
rb_ary_concat(x, y)
VALUE x, y;
{
+ long xlen = RARRAY(x)->len;
+ long ylen;
+
y = to_ary(y);
- if (RARRAY(y)->len > 0) {
- rb_ary_splice(x, RARRAY(x)->len, 0, y);
+ ylen = RARRAY(y)->len;
+ if (ylen > 0) {
+ rb_ary_modify(x);
+ if (xlen + ylen > RARRAY(x)->capa) {
+ RARRAY(x)->capa = xlen + ylen;
+ REALLOC_N(RARRAY(x)->ptr, VALUE, RARRAY(x)->capa);
+ }
+ MEMCPY(RARRAY(x)->ptr+xlen, RARRAY(y)->ptr, VALUE, ylen);
+ RARRAY(x)->len = xlen + ylen;
}
return x;
}
-
-/*
- * call-seq:
- * array * int -> an_array
- * array * str -> a_string
- *
- * 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 ]
- * [ 1, 2, 3 ] * "," #=> "1,2,3"
- *
- */
-
static VALUE
rb_ary_times(ary, times)
- VALUE ary, times;
+ VALUE ary;
+ VALUE times;
{
- VALUE ary2, tmp;
+ VALUE ary2;
long i, len;
- tmp = rb_check_string_type(times);
- if (!NIL_P(tmp)) {
- return rb_ary_join(ary, tmp);
+ if (TYPE(times) == T_STRING) {
+ return rb_ary_join(ary, times);
}
len = NUM2LONG(times);
- if (len == 0) return ary_new(rb_obj_class(ary), 0);
if (len < 0) {
rb_raise(rb_eArgError, "negative argument");
}
- if (LONG_MAX/len < RARRAY(ary)->len) {
- rb_raise(rb_eArgError, "argument too big");
- }
len *= RARRAY(ary)->len;
- ary2 = ary_new(rb_obj_class(ary), len);
+ ary2 = rb_ary_new2(len);
RARRAY(ary2)->len = len;
for (i=0; i<len; i+=RARRAY(ary)->len) {
MEMCPY(RARRAY(ary2)->ptr+i, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
}
- OBJ_INFECT(ary2, ary);
return ary2;
}
-/*
- * call-seq:
- * array.assoc(obj) -> an_array or nil
- *
- * 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" ]
- * s3 = "foo"
- * a = [ s1, s2, s3 ]
- * a.assoc("letters") #=> [ "letters", "a", "b", "c" ]
- * a.assoc("foo") #=> nil
- */
-
VALUE
rb_ary_assoc(ary, key)
- VALUE ary, key;
+ VALUE ary;
+ VALUE key;
{
- long i;
- VALUE v;
+ VALUE *p, *pend;
- for (i = 0; i < RARRAY(ary)->len; ++i) {
- v = RARRAY(ary)->ptr[i];
- if (TYPE(v) == T_ARRAY &&
- RARRAY(v)->len > 0 &&
- rb_equal(RARRAY(v)->ptr[0], key))
- return v;
+ p = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
+ while (p < pend) {
+ if (TYPE(*p) == T_ARRAY
+ && RARRAY(*p)->len > 0
+ && rb_equal(RARRAY(*p)->ptr[0], key))
+ return *p;
+ p++;
}
return Qnil;
}
-/*
- * call-seq:
- * array.rassoc(key) -> an_array or nil
- *
- * Searches through the array whose elements are also arrays. Compares
- * <em>key</em> with the second element of each contained array using
- * <code>==</code>. Returns the first contained array that matches. See
- * also <code>Array#assoc</code>.
- *
- * a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
- * a.rassoc("two") #=> [2, "two"]
- * a.rassoc("four") #=> nil
- */
-
VALUE
rb_ary_rassoc(ary, value)
- VALUE ary, value;
+ VALUE ary;
+ VALUE value;
{
- long i;
- VALUE v;
+ VALUE *p, *pend;
- for (i = 0; i < RARRAY(ary)->len; ++i) {
- v = RARRAY(ary)->ptr[i];
- if (TYPE(v) == T_ARRAY &&
- RARRAY(v)->len > 1 &&
- rb_equal(RARRAY(v)->ptr[1], value))
- return v;
+ p = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
+ while (p < pend) {
+ if (TYPE(*p) == T_ARRAY
+ && RARRAY(*p)->len > 1
+ && rb_equal(RARRAY(*p)->ptr[1], value))
+ return *p;
+ p++;
}
return Qnil;
}
-/*
- * call-seq:
- * array == other_array -> 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 the other array.
- *
- * [ "a", "c" ] == [ "a", "c", 7 ] #=> false
- * [ "a", "c", 7 ] == [ "a", "c", 7 ] #=> true
- * [ "a", "c", 7 ] == [ "a", "d", "f" ] #=> false
- *
- */
-
static VALUE
rb_ary_equal(ary1, ary2)
VALUE ary1, ary2;
{
long i;
- if (ary1 == ary2) return Qtrue;
- if (TYPE(ary2) != T_ARRAY) {
- if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
- return Qfalse;
- }
- return rb_equal(ary2, ary1);
- }
+ if (TYPE(ary2) != T_ARRAY) return Qfalse;
if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
for (i=0; i<RARRAY(ary1)->len; i++) {
- if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+ if (!rb_equal(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[i]))
return Qfalse;
}
return Qtrue;
}
-/*
- * call-seq:
- * array.eql?(other) -> true or false
- *
- * Returns <code>true</code> if _array_ and _other_ are the same object,
- * or are both arrays with the same content.
- */
-
static VALUE
rb_ary_eql(ary1, ary2)
VALUE ary1, ary2;
{
long i;
- if (ary1 == ary2) return Qtrue;
if (TYPE(ary2) != T_ARRAY) return Qfalse;
- if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
+ if (RARRAY(ary1)->len != RARRAY(ary2)->len)
+ return Qfalse;
for (i=0; i<RARRAY(ary1)->len; i++) {
- if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
+ if (!rb_eql(RARRAY(ary1)->ptr[i], RARRAY(ary2)->ptr[i]))
return Qfalse;
}
return Qtrue;
}
-/*
- * call-seq:
- * array.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 <code>eql?</code>).
- */
-
static VALUE
rb_ary_hash(ary)
VALUE ary;
{
- long i, h;
+ long i;
VALUE n;
+ long h;
h = RARRAY(ary)->len;
for (i=0; i<RARRAY(ary)->len; i++) {
- h = (h << 1) | (h<0 ? 1 : 0);
+ h = (h<<1) | (h<0 ? 1 : 0);
n = rb_hash(RARRAY(ary)->ptr[i]);
h ^= NUM2LONG(n);
}
- return LONG2FIX(h);
+ return INT2FIX(h);
}
-/*
- * call-seq:
- * array.include?(obj) -> true or false
- *
- * Returns <code>true</code> if the given object is present in
- * <i>self</i> (that is, if any object <code>==</code> <i>anObject</i>),
- * <code>false</code> otherwise.
- *
- * a = [ "a", "b", "c" ]
- * a.include?("b") #=> true
- * a.include?("z") #=> false
- */
-
VALUE
rb_ary_includes(ary, item)
VALUE ary;
VALUE item;
{
long i;
-
for (i=0; i<RARRAY(ary)->len; i++) {
if (rb_equal(RARRAY(ary)->ptr[i], item)) {
return Qtrue;
@@ -2573,236 +1395,148 @@ rb_ary_includes(ary, item)
return Qfalse;
}
-
-/*
- * call-seq:
- * array <=> other_array -> -1, 0, +1
- *
- * Comparison---Returns an integer (-1, 0,
- * or +1) if this array is less than, equal to, or greater than
- * other_array. 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
- *
- */
-
-VALUE
-rb_ary_cmp(ary1, ary2)
- VALUE ary1, ary2;
+static VALUE
+rb_ary_cmp(ary, ary2)
+ VALUE ary;
+ VALUE ary2;
{
long i, len;
ary2 = to_ary(ary2);
- len = RARRAY(ary1)->len;
+ len = RARRAY(ary)->len;
if (len > RARRAY(ary2)->len) {
len = RARRAY(ary2)->len;
}
for (i=0; i<len; i++) {
- VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
+ VALUE v = rb_funcall(RARRAY(ary)->ptr[i],cmp,1,RARRAY(ary2)->ptr[i]);
if (v != INT2FIX(0)) {
return v;
}
}
- len = RARRAY(ary1)->len - RARRAY(ary2)->len;
+ len = RARRAY(ary)->len - RARRAY(ary2)->len;
if (len == 0) return INT2FIX(0);
if (len > 0) return INT2FIX(1);
return INT2FIX(-1);
}
static VALUE
-ary_make_hash(ary1, ary2)
+rb_ary_diff(ary1, ary2)
VALUE ary1, ary2;
{
- VALUE hash = rb_hash_new();
+ VALUE ary3;
long i;
+ ary2 = to_ary(ary2);
+ ary3 = rb_ary_new();
for (i=0; i<RARRAY(ary1)->len; i++) {
- rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
- }
- if (ary2) {
- for (i=0; i<RARRAY(ary2)->len; i++) {
- rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
- }
+ if (rb_ary_includes(ary2, RARRAY(ary1)->ptr[i])) continue;
+ if (rb_ary_includes(ary3, RARRAY(ary1)->ptr[i])) continue;
+ rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
}
- return hash;
+ return ary3;
}
-/*
- * call-seq:
- * array - other_array -> an_array
- *
- * Array Difference---Returns a new array that is a copy of
- * the original array, removing any items that also appear in
- * other_array. (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 ]
- */
-
static VALUE
-rb_ary_diff(ary1, ary2)
+ary_make_hash(ary1, ary2)
VALUE ary1, ary2;
{
- VALUE ary3;
- volatile VALUE hash;
- long i;
-
- hash = ary_make_hash(to_ary(ary2), 0);
- ary3 = rb_ary_new();
+ VALUE hash = rb_hash_new();
+ int i, n;
for (i=0; i<RARRAY(ary1)->len; i++) {
- if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
- rb_ary_push(ary3, rb_ary_elt(ary1, i));
+ rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
}
- return ary3;
+ if (ary2) {
+ for (i=0; i<RARRAY(ary2)->len; i++) {
+ rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
+ }
+ }
+ return hash;
}
-/*
- * call-seq:
- * array & other_array
- *
- * 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 ]
- */
-
-
static VALUE
rb_ary_and(ary1, ary2)
VALUE ary1, ary2;
{
- VALUE hash, ary3, v, vv;
+ VALUE hash;
+ VALUE ary3 = rb_ary_new();
long i;
ary2 = to_ary(ary2);
- ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
- RARRAY(ary1)->len : RARRAY(ary2)->len);
hash = ary_make_hash(ary2, 0);
for (i=0; i<RARRAY(ary1)->len; i++) {
- v = vv = rb_ary_elt(ary1, i);
- if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
- rb_ary_push(ary3, v);
+ VALUE v = RARRAY(ary1)->ptr[i];
+ if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+ rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
}
}
return ary3;
}
-/*
- * call-seq:
- * array | other_array -> an_array
- *
- * Set Union---Returns a new array by joining this array with
- * other_array, removing duplicates.
- *
- * [ "a", "b", "c" ] | [ "c", "d", "a" ]
- * #=> [ "a", "b", "c", "d" ]
- */
-
static VALUE
rb_ary_or(ary1, ary2)
VALUE ary1, ary2;
{
- VALUE hash, ary3;
- VALUE v, vv;
+ VALUE hash;
+ VALUE ary3 = rb_ary_new();
+ VALUE v;
long i;
ary2 = to_ary(ary2);
- ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
hash = ary_make_hash(ary1, ary2);
for (i=0; i<RARRAY(ary1)->len; i++) {
- v = vv = rb_ary_elt(ary1, i);
- if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
- rb_ary_push(ary3, v);
+ v = RARRAY(ary1)->ptr[i];
+ if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+ rb_ary_push(ary3, RARRAY(ary1)->ptr[i]);
}
}
for (i=0; i<RARRAY(ary2)->len; i++) {
- v = vv = rb_ary_elt(ary2, i);
- if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
- rb_ary_push(ary3, v);
+ v = RARRAY(ary2)->ptr[i];
+ if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+ rb_ary_push(ary3, RARRAY(ary2)->ptr[i]);
}
}
+
return ary3;
}
-/*
- * call-seq:
- * array.uniq! -> array or nil
- *
- * Removes duplicate elements from _self_.
- * Returns <code>nil</code> if no changes are made (that is, no
- * duplicates are found).
- *
- * a = [ "a", "a", "b", "b", "c" ]
- * a.uniq! #=> ["a", "b", "c"]
- * b = [ "a", "b", "c" ]
- * b.uniq! #=> nil
- */
-
static VALUE
rb_ary_uniq_bang(ary)
VALUE ary;
{
- VALUE hash, v, vv;
- long i, j;
-
- hash = ary_make_hash(ary, 0);
+ VALUE hash = ary_make_hash(ary, 0);
+ VALUE *p, *q, *end;
if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
return Qnil;
}
- for (i=j=0; i<RARRAY(ary)->len; i++) {
- v = vv = rb_ary_elt(ary, i);
- if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
- rb_ary_store(ary, j++, v);
+
+ rb_ary_modify(ary);
+ p = q = RARRAY(ary)->ptr;
+ end = p + RARRAY(ary)->len;
+ while (p < end) {
+ VALUE v = *p++;
+ if (st_delete(RHASH(hash)->tbl, &v, 0)) {
+ *q++ = *(p-1);
}
}
- RARRAY(ary)->len = j;
+ RARRAY(ary)->len = (q - RARRAY(ary)->ptr);
return ary;
}
-/*
- * call-seq:
- * array.uniq -> an_array
- *
- * Returns a new array by removing duplicate values in <i>self</i>.
- *
- * a = [ "a", "a", "b", "b", "c" ]
- * a.uniq #=> ["a", "b", "c"]
- */
-
static VALUE
rb_ary_uniq(ary)
VALUE ary;
{
- ary = rb_ary_dup(ary);
+ ary = rb_obj_dup(ary);
rb_ary_uniq_bang(ary);
return ary;
}
-/*
- * call-seq:
- * array.compact! -> array or nil
- *
- * Removes +nil+ elements from array.
- * Returns +nil+ if no changes were made.
- *
- * [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
- * [ "a", "b", "c" ].compact! #=> nil
- */
-
static VALUE
rb_ary_compact_bang(ary)
VALUE ary;
@@ -2812,7 +1546,6 @@ rb_ary_compact_bang(ary)
rb_ary_modify(ary);
p = t = RARRAY(ary)->ptr;
end = p + RARRAY(ary)->len;
-
while (t < end) {
if (NIL_P(*t)) t++;
else *p++ = *t++;
@@ -2820,41 +1553,21 @@ rb_ary_compact_bang(ary)
if (RARRAY(ary)->len == (p - RARRAY(ary)->ptr)) {
return Qnil;
}
- RARRAY(ary)->len = RARRAY(ary)->aux.capa = (p - RARRAY(ary)->ptr);
+ RARRAY(ary)->len = RARRAY(ary)->capa = (p - RARRAY(ary)->ptr);
REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
return ary;
}
-/*
- * call-seq:
- * array.compact -> an_array
- *
- * Returns a copy of _self_ with all +nil+ elements removed.
- *
- * [ "a", nil, "b", nil, "c", nil ].compact
- * #=> [ "a", "b", "c" ]
- */
-
static VALUE
rb_ary_compact(ary)
VALUE ary;
{
- ary = rb_ary_dup(ary);
+ ary = rb_obj_dup(ary);
rb_ary_compact_bang(ary);
return ary;
}
-/*
- * call-seq:
- * array.nitems -> int
- *
- * Returns the number of non-<code>nil</code> elements in _self_.
- * May be zero.
- *
- * [ 1, nil, 3, nil, 5 ].nitems #=> 3
- */
-
static VALUE
rb_ary_nitems(ary)
VALUE ary;
@@ -2864,15 +1577,14 @@ rb_ary_nitems(ary)
p = RARRAY(ary)->ptr;
pend = p + RARRAY(ary)->len;
-
while (p < pend) {
if (!NIL_P(*p)) n++;
p++;
}
- return LONG2NUM(n);
+ return INT2NUM(n);
}
-static long
+static int
flatten(ary, idx, ary2, memo)
VALUE ary;
long idx;
@@ -2887,13 +1599,10 @@ flatten(ary, idx, ary2, memo)
rb_raise(rb_eArgError, "tried to flatten recursive array");
}
rb_ary_push(memo, id);
- rb_ary_splice(ary, idx, 1, ary2);
+ rb_ary_replace(ary, idx, 1, ary2);
while (i < lim) {
- VALUE tmp;
-
- tmp = rb_check_array_type(rb_ary_elt(ary, i));
- if (!NIL_P(tmp)) {
- n = flatten(ary, i, tmp, memo);
+ if (TYPE(RARRAY(ary)->ptr[i]) == T_ARRAY) {
+ n = flatten(ary, i, RARRAY(ary)->ptr[i], memo);
i += n; lim += n;
}
i++;
@@ -2903,20 +1612,6 @@ flatten(ary, idx, ary2, memo)
return lim - idx - 1; /* returns number of increased items */
}
-/*
- * call-seq:
- * array.flatten! -> array or nil
- *
- * Flattens _self_ in place.
- * Returns <code>nil</code> if no modifications were made (i.e.,
- * <i>array</i> contains no subarrays.)
- *
- * a = [ 1, 2, [3, [4, 5] ] ]
- * a.flatten! #=> [1, 2, 3, 4, 5]
- * a.flatten! #=> nil
- * a #=> [1, 2, 3, 4, 5]
- */
-
static VALUE
rb_ary_flatten_bang(ary)
VALUE ary;
@@ -2925,16 +1620,15 @@ rb_ary_flatten_bang(ary)
int mod = 0;
VALUE memo = Qnil;
+ rb_ary_modify(ary);
while (i<RARRAY(ary)->len) {
VALUE ary2 = RARRAY(ary)->ptr[i];
- VALUE tmp;
- tmp = rb_check_array_type(ary2);
- if (!NIL_P(tmp)) {
+ if (TYPE(ary2) == T_ARRAY) {
if (NIL_P(memo)) {
memo = rb_ary_new();
}
- i += flatten(ary, i, tmp, memo);
+ i += flatten(ary, i, ary2, memo);
mod = 1;
}
i++;
@@ -2943,71 +1637,46 @@ rb_ary_flatten_bang(ary)
return ary;
}
-/*
- * call-seq:
- * array.flatten -> an_array
- *
- * Returns a new array that is a one-dimensional flattening of this
- * array (recursively). That is, for every element that is an array,
- * extract its elements into the new array.
- *
- * s = [ 1, 2, 3 ] #=> [1, 2, 3]
- * t = [ 4, 5, 6, [7, 8] ] #=> [4, 5, 6, [7, 8]]
- * a = [ s, t, 9, 10 ] #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
- * a.flatten #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10
- */
-
static VALUE
rb_ary_flatten(ary)
VALUE ary;
{
- ary = rb_ary_dup(ary);
+ ary = rb_obj_dup(ary);
rb_ary_flatten_bang(ary);
return ary;
}
-
-/* Arrays are ordered, integer-indexed collections of any object.
- * Array indexing starts at 0, as in C or Java. A negative index is
- * assumed to be relative to the end of the array---that is, an index of -1
- * indicates the last element of the array, -2 is the next to last
- * element in the array, and so on.
- */
-
void
Init_Array()
{
rb_cArray = rb_define_class("Array", rb_cObject);
rb_include_module(rb_cArray, rb_mEnumerable);
- rb_define_alloc_func(rb_cArray, ary_alloc);
+ rb_define_singleton_method(rb_cArray, "new", rb_ary_s_new, -1);
rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
- rb_define_method(rb_cArray, "initialize_copy", rb_ary_replace, 1);
-
rb_define_method(rb_cArray, "to_s", rb_ary_to_s, 0);
rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
- rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
+ rb_define_method(rb_cArray, "to_ary", rb_ary_to_a, 0);
rb_define_method(rb_cArray, "frozen?", rb_ary_frozen_p, 0);
rb_define_method(rb_cArray, "==", rb_ary_equal, 1);
rb_define_method(rb_cArray, "eql?", rb_ary_eql, 1);
rb_define_method(rb_cArray, "hash", rb_ary_hash, 0);
+ rb_define_method(rb_cArray, "===", rb_ary_equal, 1);
rb_define_method(rb_cArray, "[]", rb_ary_aref, -1);
rb_define_method(rb_cArray, "[]=", rb_ary_aset, -1);
rb_define_method(rb_cArray, "at", rb_ary_at, 1);
- rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
- rb_define_method(rb_cArray, "first", rb_ary_first, -1);
- rb_define_method(rb_cArray, "last", rb_ary_last, -1);
+ rb_define_method(rb_cArray, "first", rb_ary_first, 0);
+ rb_define_method(rb_cArray, "last", rb_ary_last, 0);
rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
rb_define_method(rb_cArray, "pop", rb_ary_pop, 0);
rb_define_method(rb_cArray, "shift", rb_ary_shift, 0);
rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1);
- rb_define_method(rb_cArray, "insert", rb_ary_insert, -1);
rb_define_method(rb_cArray, "each", rb_ary_each, 0);
rb_define_method(rb_cArray, "each_index", rb_ary_each_index, 0);
rb_define_method(rb_cArray, "reverse_each", rb_ary_reverse_each, 0);
@@ -3018,6 +1687,7 @@ Init_Array()
rb_define_method(rb_cArray, "rindex", rb_ary_rindex, 1);
rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
rb_define_method(rb_cArray, "indices", rb_ary_indexes, -1);
+ rb_define_method(rb_cArray, "clone", rb_ary_clone, 0);
rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
@@ -3025,18 +1695,13 @@ Init_Array()
rb_define_method(rb_cArray, "sort!", rb_ary_sort_bang, 0);
rb_define_method(rb_cArray, "collect", rb_ary_collect, 0);
rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
- rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
- rb_define_method(rb_cArray, "select", rb_ary_select, 0);
- rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
+ rb_define_method(rb_cArray, "filter", rb_ary_filter, 0);
rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at_m, 1);
rb_define_method(rb_cArray, "delete_if", rb_ary_delete_if, 0);
- rb_define_method(rb_cArray, "reject", rb_ary_reject, 0);
rb_define_method(rb_cArray, "reject!", rb_ary_reject_bang, 0);
- rb_define_method(rb_cArray, "zip", rb_ary_zip, -1);
- rb_define_method(rb_cArray, "transpose", rb_ary_transpose, 0);
- rb_define_method(rb_cArray, "replace", rb_ary_replace, 1);
+ rb_define_method(rb_cArray, "replace", rb_ary_replace_m, 1);
rb_define_method(rb_cArray, "clear", rb_ary_clear, 0);
rb_define_method(rb_cArray, "fill", rb_ary_fill, -1);
rb_define_method(rb_cArray, "include?", rb_ary_includes, 1);
@@ -3063,6 +1728,5 @@ Init_Array()
rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, 0);
rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
- id_cmp = rb_intern("<=>");
- inspect_key = rb_intern("__inspect_key__");
+ cmp = rb_intern("<=>");
}
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
deleted file mode 100644
index b5546104d0..0000000000
--- a/bcc32/Makefile.sub
+++ /dev/null
@@ -1,499 +0,0 @@
-# -*- makefile -*-
-
-SHELL = $(COMSPEC)
-MKFILES = Makefile
-
-#### Start of system configuration section. ####
-OS = bccwin32
-RT = $(OS)
-
-## variables may be overridden by $(compile_dir)/Makefile
-!ifndef srcdir
-srcdir = ..
-!endif
-!ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = ruby
-!endif
-!ifndef RUBYW_INSTALL_NAME
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!elif "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!endif
-!if "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
-!endif
-!ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
-!endif
-!ifndef icondirs
-!ifdef ICONDIRS
-icondirs=$(ICONDIRS)
-!endif
-!endif
-!ifdef icondirs
-icondirs=$(icondirs:\=/)
-iconinc=-I$(icondirs: = -I)
-!endif
-###############
-
-VPATH = $(srcdir):$(srcdir)/missing
-.SUFFIXES: .y
-
-!ifndef CC
-CC = bcc32
-!endif
-!ifndef CPP
-CPP = cpp32
-!endif
-!ifndef RC
-RC = brcc32
-!endif
-!ifndef YACC
-YACC = byacc
-!endif
-!ifndef AR
-AR = tlib
-!endif
-
-PURIFY =
-AUTOCONF = autoconf
-RM = $(srcdir:/=\)\win32\rm.bat
-
-!if !defined(PROCESSOR_ARCHITECTURE)
-PROCESSOR_ARCHITECTURE = x86
-!endif
-MACHINE = $(PROCESSOR_ARCHITECTURE)
-!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-!ifndef PROCESSOR_LEVEL
-PROCESSOR_LEVEL = 5
-!endif
-!if 6 < $(PROCESSOR_LEVEL)
-PROCESSOR_LEVEL = 6
-!endif
-PROCESSOR_FLAG = -$(PROCESSOR_LEVEL)
-CPU = i$(PROCESSOR_LEVEL)86
-ARCH = i386
-!else
-CPU = $(PROCESSOR_ARCHITECTURE)
-ARCH = $(PROCESSOR_ARCHITECTURE)
-!endif
-!ifndef DEBUGFLAGS
-DEBUGFLAGS =
-!endif
-!ifndef OPTFLAGS
-OPTFLAGS = -O
-!endif
-
-!ifndef prefix
-prefix = /usr
-!endif
-!ifndef exec_prefix
-exec_prefix = $(prefix)
-!endif
-!ifndef libdir
-libdir = $(exec_prefix)/lib
-!endif
-!if !defined(datadir)
-datadir = /share
-!endif
-!ifndef EXTOUT
-EXTOUT = .ext
-!endif
-!ifndef RIDATADIR
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-!endif
-!ifndef TESTUI
-TESTUI = console
-!endif
-!ifndef TESTS
-TESTS =
-!endif
-!ifndef RDOCTARGET
-RDOCTARGET = install-nodoc
-!endif
-
-OUTFLAG = -o
-!ifndef CFLAGS
-CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-!endif
-!ifndef LDFLAGS
-LDFLAGS = -S:$(STACK)
-!endif
-!ifndef RFLAGS
-RFLAGS = $(iconinc)
-!endif
-!ifndef EXTLIBS
-EXTLIBS =
-!endif
-!ifndef MEMLIB
-MEMLIB =
-!endif
-LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj crypt.obj erf.obj win32.obj
-
-!ifndef STACK
-STACK = 0x2000000
-!endif
-
-XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)/missing
-
-ARFLAGS = /a
-LD = ilink32 -q -Gn
-LDSHARED = $(LD)
-XLDFLAGS = -Tpe c0x32.obj
-WLDFLAGS = -aa -Tpe c0w32.obj
-DLDFLAGS = -Tpd c0d32.obj
-LIBRUBY_LDSHARED = $(LDSHARED)
-LIBRUBY_DLDFLAGS = -Gi $(DLDFLAGS) $(EXTLDFLAGS)
-LDOBJECTS = $(MAINOBJ)
-
-SOLIBS =
-
-EXEEXT = .exe
-PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
-RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) $(MINIRUBYOPT)
-RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
-
-ORGLIBPATH = $(LIB)
-
-#### End of system configuration section. ####
-
-LIBRUBY_A = $(RUBY_SO_NAME)-static.lib
-LIBRUBY_SO = $(RUBY_SO_NAME).dll
-LIBRUBY = $(RUBY_SO_NAME).lib
-LIBRUBYARG = $(LIBRUBY)
-
-PREP = miniruby$(EXEEXT)
-
-OBJEXT = obj
-
-INSTALLED_LIST= .installed.list
-
-WINMAINOBJ = winmain.$(OBJEXT)
-MINIOBJS = dmydln.$(OBJEXT)
-
-.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.y = $(srcdir)
-.path. = $(srcdir)
-
-.c.obj:
- $(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
-
-.rc.res:
- $(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
-
-.y.c:
- $(YACC) $(YFLAGS) $(<:\=/)
- sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
- @del y.tab.c
-
-all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
-
-ruby: $(PROGRAM)
-rubyw: $(WPROGRAM)
-
-!include $(srcdir)/common.mk
-
-PHONY: Makefile
-
-CONFIG_H = ./.config.h.time
-
-config: config.status
-
-config.status: $(CONFIG_H)
-
-$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
- @$(srcdir:/=\)\win32\ifchange.bat config.h &&|
-\#define HAVE_SYS_TYPES_H 1
-\#define HAVE_SYS_STAT_H 1
-\#define HAVE_STDLIB_H 1
-\#define HAVE_STRING_H 1
-\#define HAVE_MEMORY_H 1
-\#define HAVE_OFF_T 1
-\#define SIZEOF_INT 4
-\#define SIZEOF_SHORT 2
-\#define SIZEOF_LONG 4
-\#define SIZEOF_LONG_LONG 0
-\#define SIZEOF___INT64 8
-\#define SIZEOF_OFF_T 4
-\#define SIZEOF_VOIDP 4
-\#define SIZEOF_FLOAT 4
-\#define SIZEOF_DOUBLE 8
-\#define SIZEOF_TIME_T 4
-\#define HAVE_PROTOTYPES 1
-\#define TOKEN_PASTE(x,y) x\#\#y
-\#define HAVE_STDARG_PROTOTYPES 1
-\#define NORETURN(x) x
-\#define RUBY_EXTERN extern __declspec(dllimport)
-\#define HAVE_DECL_SYS_NERR 1
-\#define HAVE_LIMITS_H 1
-\#define HAVE_FCNTL_H 1
-\#define HAVE_UTIME_H 1
-\#define HAVE_FLOAT_H 1
-\#define rb_uid_t uid_t
-\#define rb_gid_t gid_t
-\#define rb_pid_t int
-\#define HAVE_STRUCT_STAT_ST_RDEV 1
-\#define HAVE_ST_RDEV 1
-\#define GETGROUPS_T int
-\#define RETSIGTYPE void
-\#define HAVE_ALLOCA 1
-\#define HAVE_DUP2 1
-\#define HAVE_MEMMOVE 1
-\#define HAVE_MKDIR 1
-\#define HAVE_STRCASECMP 1
-\#define HAVE_STRNCASECMP 1
-\#define HAVE_STRERROR 1
-\#define HAVE_STRFTIME 1
-\#define HAVE_STRCHR 1
-\#define HAVE_STRSTR 1
-\#define HAVE_STRTOD 1
-\#define HAVE_STRTOL 1
-\#define HAVE_STRTOUL 1
-\#define HAVE_ISNAN 1
-\#define HAVE_FINITE 1
-\#define HAVE_HYPOT 1
-\#define HAVE_FMOD 1
-\#define HAVE_WAITPID 1
-\#define HAVE_FSYNC 1
-\#define HAVE_GETCWD 1
-\#define HAVE_CHSIZE 1
-\#define HAVE_TIMES 1
-\#define HAVE_FCNTL 1
-\#define HAVE_LINK 1
-\#define HAVE_TELLDIR 1
-\#define HAVE_SEEKDIR 1
-\#define HAVE_COSH 1
-\#define HAVE_SINH 1
-\#define HAVE_TANH 1
-\#define RSHIFT(x,y) ((x)>>(int)y)
-\#define FILE_COUNT level
-\#define FILE_READPTR curp
-\#define inline __inline
-\#define NEED_IO_SEEK_BETWEEN_RW 1
-\#define STACK_GROW_DIRECTION -1
-\#define DEFAULT_KCODE KCODE_NONE
-\#define DLEXT ".so"
-\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-|
- @exit > $@
-
-config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
- @echo Creating $@
- @type > $@ &&|
-# Generated automatically by Makefile.sub.
-s,@SHELL@,$$(COMSPEC),;t t
-s,@BUILD_FILE_SEPARATOR@,\,;t t
-s,@PATH_SEPARATOR@,;,;t t
-s,@CFLAGS@,$(CFLAGS),;t t
-s,@CPPFLAGS@,$(CPPFLAGS),;t t
-s,@CXXFLAGS@,$(CXXFLAGS),;t t
-s,@FFLAGS@,$(FFLAGS),;t t
-s,@LDFLAGS@,,;t t
-s,@LIBS@,$(LIBS),;t t
-s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,,;t t
-s,@program_transform_name@,s,,,,;t t
-s,@bindir@,$${exec_prefix}/bin,;t t
-s,@sbindir@,$${exec_prefix}/sbin,;t t
-s,@libexecdir@,$${exec_prefix}/libexec,;t t
-s,@datadir@,$${prefix}/share,;t t
-s,@sysconfdir@,$${prefix}/etc,;t t
-s,@sharedstatedir@,/etc,;t t
-s,@localstatedir@,/var,;t t
-s,@libdir@,$${exec_prefix}/lib,;t t
-s,@includedir@,$${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,$${prefix}/info,;t t
-s,@mandir@,$${prefix}/man,;t t
-s,@build@,$(CPU)-pc-$(OS),;t t
-s,@build_alias@,$(CPU)-$(OS),;t t
-s,@build_cpu@,$(CPU),;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,$(OS),;t t
-s,@host@,$(CPU)-pc-$(OS),;t t
-s,@host_alias@,$(CPU)-$(OS),;t t
-s,@host_cpu@,$(CPU),;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,$(OS),;t t
-s,@target@,$(ARCH)-pc-$(OS),;t t
-s,@target_alias@,$(ARCH)-$(OS),;t t
-s,@target_cpu@,$(ARCH),;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,$(OS),;t t
-s,@CC@,$(CC),;t t
-s,@CPP@,cpp32,;t t
-s,@YACC@,$(YACC),;t t
-s,@RANLIB@,,;t t
-s,@AR@,$(AR),;t t
-s,@ARFLAGS@,$(ARFLAGS) ,;t t
-s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,$(SET_MAKE),;t t
-s,@CP@,copy > nul,;t t
-s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
-s,@ALLOCA@,$(ALLOCA),;t t
-s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,obj,;t t
-s,@XCFLAGS@,$(XCFLAGS),;t t
-s,@XLDFLAGS@,$(XLDFLAGS),;t t
-s,@DLDFLAGS@,$(DLDFLAGS),;t t
-s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
-s,@STATIC@,$(STATIC),;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,$(LDSHARED),;t t
-s,@DLEXT@,so,;t t
-s,@LIBEXT@,lib,;t t
-s,@STRIP@,$(STRIP),;t t
-s,@EXTSTATIC@,$(EXTSTATIC),;t t
-s,@setup@,Setup,;t t
-s,@MINIRUBY@,$(MINIRUBY),;t t
-s,@PREP@,miniruby$(EXEEXT),;t t
-s,@RUNRUBY@,$(RUNRUBY),;t t
-s,@EXTOUT@,$(EXTOUT),;t t
-s,@ARCHFILE@,,;t t
-s,@RDOCTARGET@,,;t t
-s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
-s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
-s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@rubyw_install_name@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBYW_INSTALL_NAME@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
-s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
-s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
-s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
-s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
-s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
-s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
-s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
-s,@SOLIBS@,$(SOLIBS),;t t
-s,@DLDLIBS@,$(DLDLIBS),;t t
-s,@ENABLE_SHARED@,yes,;t t
-s,@OUTFLAG@,$(OUTFLAG),;t t
-s,@CPPOUTFILE@,,;t t
-s,@LIBPATHFLAG@, -L"%s",;t t
-s,@RPATHFLAG@,,;t t
-s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
-s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
-s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
-s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
-s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
-s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
-s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
-s,@EXPORT_PREFIX@,_,;t t
-s,@arch@,$(ARCH)-$(OS),;t t
-s,@sitearch@,$(ARCH)-$(OS),;t t
-s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
-s,@configure_args@,--enable-shared $(configure_args),;t t
-s,@configure_input@,$$configure_input,;t t
-s,@srcdir@,$(srcdir),;t t
-s,@top_srcdir@,$(srcdir),;t t
-|
-
-miniruby$(EXEEXT):
- @echo $(LIBS)
- $(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS)
-
-$(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
- $(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
-
-$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
- $(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
-
-$(LIBRUBY_A): $(OBJS) $(DMYEXT)
- @-if exist $@ del $@
- $(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
-
-# $(LIBRUBY): $(LIBRUBY_SO)
-# implib $@ $(LIBRUBY_SO)
-
-$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
- @echo $(DLDOBJS)
- @$(PRE_LIBRUBY_UPDATE)
- $(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
-
-$(LIBRUBY): $(LIBRUBY_SO)
-
-$(RUBYDEF): $(LIBRUBY_A) $(PREP)
- $(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
-
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
- @$(MINIRUBY) $(srcdir)/win32/resource.rb \
- -ruby_name=$(RUBY_INSTALL_NAME) \
- -rubyw_name=$(RUBYW_INSTALL_NAME) \
- -so_name=$(RUBY_SO_NAME) \
- . $(icondirs) $(srcdir)/win32
-
-post-install-bin::
- @$(NULLCMD)
-post-install-lib::
- @$(NULLCMD)
-post-install-ext-comm::
- @$(NULLCMD)
-post-install-ext-arch::
- @$(NULLCMD)
-post-install-man::
- @$(NULLCMD)
-post-install-doc::
- @$(NULLCMD)
-
-clean-local::
- @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
- @$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
-
-distclean-local::
- @$(RM) ext\config.cache $(RBCONFIG:/=\)
- @$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
- @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
-
-ext/extinit.obj: ext/extinit.c $(SETUP)
- $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
-
-main.$(OBJEXT): win32.h
-array.$(OBJEXT): win32.h
-bignum.$(OBJEXT): win32.h
-class.$(OBJEXT): win32.h
-compar.$(OBJEXT): win32.h
-dir.$(OBJEXT): dir.h win32.h
-dln.$(OBJEXT): win32.h
-enum.$(OBJEXT): win32.h
-error.$(OBJEXT): win32.h
-eval.$(OBJEXT): win32.h
-file.$(OBJEXT): win32.h
-gc.$(OBJEXT): win32.h
-hash.$(OBJEXT): win32.h
-inits.$(OBJEXT): win32.h
-io.$(OBJEXT): win32.h
-marshal.$(OBJEXT): win32.h
-math.$(OBJEXT): win32.h
-numeric.$(OBJEXT): win32.h
-object.$(OBJEXT): win32.h
-pack.$(OBJEXT): win32.h
-parse.$(OBJEXT): win32.h
-process.$(OBJEXT): win32.h
-prec.$(OBJEXT): win32.h
-random.$(OBJEXT): win32.h
-range.$(OBJEXT): win32.h
-re.$(OBJEXT): win32.h
-regex.$(OBJEXT): win32.h
-ruby.$(OBJEXT): win32.h
-signal.$(OBJEXT): win32.h
-sprintf.$(OBJEXT): win32.h
-st.$(OBJEXT): win32.h
-string.$(OBJEXT): win32.h
-struct.$(OBJEXT): win32.h
-time.$(OBJEXT): win32.h
-util.$(OBJEXT): win32.h
-variable.$(OBJEXT): win32.h
-version.$(OBJEXT): win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
deleted file mode 100644
index c27a1261f1..0000000000
--- a/bcc32/README.bcc32
+++ /dev/null
@@ -1,137 +0,0 @@
-=begin
-
-= How to build ruby using Borland C++
-
-== Requirement
-
-(1) Borland C++ 5.0 or later.
-
-(2) Please set environment variable (({PATH}))
- to run required commands properly from the command line.
-
- Note: building ruby requires following commands.
- * make
- * bcc32
- * tlib
- * ilink32
-
-(3) If you want to build from CVS source, following commands are required.
- * byacc ((<URL:http://gnuwin32.sourceforge.net/packages/byacc.htm>))
- * sed ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
-
-(4) We strongly recommend to build ruby on C++Builder, to link following files.
- * usebormm.lib
- * memmgr.lib
-
- RTL's internal memory manager cannot handle large memory block properly,
- so we should use borlndmm.dll instead.
- 10000.times { "" << "." * 529671; GC.start } # crash
-
-== How to compile and install
-
-(1) Execute bcc32\configure.bat on your build directory.
- ex. c:\ruby-1.6.7>bcc32\configure.bat
-
-(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
- if you want to change the name of the executable files.
- And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
- executable without console window if also you want.
-
-(3) Run `((%make%))'
-
-(4) Run `((%make test%))'
-
-(5) Run `((%make DESTDIR=<install_directory> install%))'
-
- This command will create following directories and install files onto them.
- * <install_directory>\bin
- * <install_directory>\lib
- * <install_directory>\lib\ruby
- * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
- * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
- * <install_directory>\lib\ruby\site_ruby
- * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
- * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
- * <install_directory>\man\man1
- If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
- The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
-
-(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
- usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
- directory.
-
-== Icons
-
-Any icon files(*.ico) in the build directory, directories specified with
-((|icondirs|)) make variable and (({win32})) directory under the ruby
-source directory will be included in DLL or executable files, according
-to their base names.
- $(RUBY_INSTALL_NAME).ico or ruby.ico --> $(RUBY_INSTALL_NAME).exe
- $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
- the others --> $(RUBY_SO_NAME).dll
-
-Although no icons are distributed with the ruby source or in the official
-site, you can use anything you like. For example, followings are written
-in Japanese, but you can download at least.
-
-* ((<URL:http://member.nifty.ne.jp/ueivu/rubyico.html>)) or
- ((<zipped icons|URL:http://member.nifty.ne.jp/ueivu/Ruby_ico.zip>))
-* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
- ((<icon itself|URL:http://homepage1.nifty.com/a_nakata/ruby/RubyIcon.ico>))
-
-== Build examples
-
-* Build on the ruby source directory.
-
- ex.)
- ruby source directory: C:\ruby
- build directory: C:\ruby
- install directory: C:\usr\local
-
- C:
- cd \ruby
- bcc32\configure
- make
- make test
- make DESTDIR=/usr/local install
-
-* Build on the relative directory from the ruby source directory and CPU type
- i386.
-
- ex.)
- ruby source directory: C:\ruby
- build directory: C:\ruby\bccwin32
- install directory: C:\usr\local
- CPU i386
-
- C:
- cd \ruby
- mkdir bccwin32
- cd bccwin32
- ..\bcc32\configure target i386-bccwin32
- make
- make test
- make DESTDIR=/usr/local install
-
-* Build on the different drive.
-
- ex.)
- ruby source directory: C:\src\ruby
- build directory: D:\build\ruby
- install directory: C:\usr\local
-
- D:
- cd D:\build\ruby
- C:\src\ruby\bcc32\configure
- make
- make test
- make DESTDIR=C:/usr/local install
-
-== Bugs
-
-You can ((*NOT*)) use a path name contains any white space characters as
-the ruby source directory, this restriction comes from the behavior of
-(({!INCLUDE})) directives of (({MAKE})).
-((- you may call it a bug. -))
-
-=end
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
deleted file mode 100755
index 143ad947f0..0000000000
--- a/bcc32/configure.bat
+++ /dev/null
@@ -1,92 +0,0 @@
-@echo off
-::: Don't set environment variable in batch file other than autoexec.bat
-::: to avoid "Out of environment space" problem on Windows 95/98.
-::: set TMPMAKE=~tmp~.mak
-
-echo> ~tmp~.mak ####
-echo>> ~tmp~.mak conf = %0
-echo>> ~tmp~.mak $(conf:\=/): nul
-echo>> ~tmp~.mak @del ~tmp~.mak
-echo>> ~tmp~.mak @-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \
-:loop
-if "%1" == "" goto :end
-if "%1" == "--prefix" goto :prefix
-if "%1" == "--srcdir" goto :srcdir
-if "%1" == "srcdir" goto :srcdir
-if "%1" == "--target" goto :target
-if "%1" == "target" goto :target
-if "%1" == "--with-static-linked-ext" goto :extstatic
-if "%1" == "--program-suffix" goto :suffix
-if "%1" == "--program-name" goto :progname
-if "%1" == "--enable-install-doc" goto :enable-rdoc
-if "%1" == "--disable-install-doc" goto :disable-rdoc
-if "%1" == "--extout" goto :extout
-if "%1" == "-h" goto :help
-if "%1" == "--help" goto :help
- echo>> ~tmp~.mak "%1" \
- shift
-goto :loop
-:srcdir
- echo>> ~tmp~.mak -D"srcdir=%2" \
- shift
- shift
-goto :loop
-:prefix
- echo>> ~tmp~.mak -D"prefix=%2" \
- shift
- shift
-goto :loop
-:suffix
- echo>> ~tmp~.mak -D"RUBY_SUFFIX=%2" \
- shift
- shift
-goto :loop
-:installname
- echo>> ~tmp~.mak -D"RUBY_INSTALL_NAME=%2" \
- shift
- shift
-goto :loop
-:soname
- echo>> ~tmp~.mak -D"RUBY_SO_NAME=%2" \
- shift
- shift
-goto :loop
-:target
- echo>> ~tmp~.mak "%2" \
- shift
- shift
-goto :loop
-:extstatic
- echo>> ~tmp~.mak -D"EXTSTATIC=static" \
- shift
-goto :loop
-:enable-rdoc
- echo>> ~tmp~.mak -D"RDOCTARGET=install-doc" \
- shift
-goto :loop
-:disable-rdoc
- echo>> ~tmp~.mak -D"RDOCTARGET=install-nodoc" \
- shift
-goto :loop
-:extout
- echo>> ~tmp~.mak -D"EXTOUT=%2" \
- shift
- shift
-goto :loop
-:help
- echo Configuration:
- echo --help display this help
- echo --srcdir=DIR find the sources in DIR [configure dir or `..']
- echo Installation directories:
- echo --prefix=PREFIX install files in PREFIX (ignored currently)
- echo System types:
- echo --target=TARGET configure for TARGET [i386-bccwin32]
- echo Optional Package:
- echo --with-static-linked-ext link external modules statically
- echo --enable-install-doc install rdoc indexes during install
- del ~tmp~.mak
-goto :exit
-:end
-echo>> ~tmp~.mak -Dbcc32dir="$(@D)"
-make -s -f ~tmp~.mak
-:exit
diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
deleted file mode 100755
index dc523e2541..0000000000
--- a/bcc32/mkexports.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#!./miniruby -s
-
-$name = $library = $description = nil
-
-SYM = {}
-STDIN.reopen(open("nul"))
-ARGV.each do |obj|
- IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
- next unless /(?:PUBDEF|PUBD32)/ =~ l
- SYM[$1] = true if /'(.*?)'/ =~ l
- end
-end
-
-exports = []
-if $name
- exports << "Name " + $name
-elsif $library
- exports << "Library " + $library
-end
-exports << "Description " + $description.dump if $description
-exports << "EXPORTS" << SYM.keys.sort
-
-if $output
- open($output, 'w') {|f| f.puts exports.join("\n")}
-else
- puts exports.join("\n")
-end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
deleted file mode 100644
index b7a2539d0a..0000000000
--- a/bcc32/setup.mak
+++ /dev/null
@@ -1,133 +0,0 @@
-# -*- makefile -*-
-
-!if "$(srcdir)" != ""
-bcc32dir = $(srcdir)/bcc32
-!elseif "$(bcc32dir)" == "bcc32/"
-srcdir = .
-!elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
-srcdir = $(bcc32dir:/bcc32/=)
-!else
-srcdir = $(bcc32dir)/..
-!endif
-!ifndef prefix
-prefix = /usr
-!endif
-OS = bccwin32
-RT = $(OS)
-BANG = !
-APPEND = echo>>$(MAKEFILE)
-!ifdef MAKEFILE
-MAKE = $(MAKE) -f $(MAKEFILE)
-!else
-MAKEFILE = Makefile
-!endif
-
-all: Makefile
-Makefile: -prologue- -generic- -epilogue-
-i386-$(OS): -prologue- -i386- -epilogue-
-i486-$(OS): -prologue- -i486- -epilogue-
-i586-$(OS): -prologue- -i586- -epilogue-
-i686-$(OS): -prologue- -i686- -epilogue-
-alpha-$(OS): -prologue- -alpha- -epilogue-
-
--prologue-: nul
- @echo Creating $(MAKEFILE)
- @type > $(MAKEFILE) &&|
-\#\#\# Makefile for ruby $(OS) \#\#\#
-$(BANG)ifndef srcdir
-srcdir = $(srcdir:\=/)
-$(BANG)endif
-$(BANG)ifndef prefix
-prefix = $(prefix:\=/)
-$(BANG)endif
-$(BANG)ifndef EXTSTATIC
-EXTSTATIC = $(EXTSTATIC)
-$(BANG)endif
-!if defined(RDOCTARGET)
-$(BANG)ifndef RDOCTARGET
-RDOCTARGET = $(RDOCTARGET)
-$(BANG)endif
-!endif
-!if defined(EXTOUT)
-$(BANG)ifndef EXTOUT
-EXTOUT = $(EXTOUT)
-$(BANG)endif
-!endif
-|
- @type > usebormm.bat &&|
-@echo off
-ilink32 -Gn -x usebormm.lib > nul
-if exist usebormm.tds echo MEMLIB = usebormm.lib
-|
- @usebormm.bat >> $(MAKEFILE)
- @del usebormm.*
-
- @cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
-\#include "version.h"
-MAJOR = RUBY_VERSION_MAJOR
-MINOR = RUBY_VERSION_MINOR
-TEENY = RUBY_VERSION_TEENY
-|
- @type $(MAKEFILE).i >> $(MAKEFILE)
- @del $(MAKEFILE).i
-
--generic-: nul
-!if defined(PROCESSOR_ARCHITECTURE) || defined(PROCESSOR_LEVEL)
- @type >> $(MAKEFILE) &&|
-!if defined(PROCESSOR_ARCHITECTURE)
-$(BANG)ifndef PROCESSOR_ARCHITECTURE
-PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
-$(BANG)endif
-!endif
-!if defined(PROCESSOR_LEVEL)
-$(BANG)ifndef PROCESSOR_LEVEL
-PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
-$(BANG)endif
-!endif
-
-|
-!endif
-
--alpha-: nul
- @$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
- @$(APPEND) PROCESSOR_ARCHITECTURE = alpha
- @$(APPEND) !endif
--ix86-: nul
- @$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
- @$(APPEND) PROCESSOR_ARCHITECTURE = x86
- @$(APPEND) !endif
-
--i386-: -ix86-
- @$(APPEND) !ifndef PROCESSOR_LEVEL
- @$(APPEND) PROCESSOR_LEVEL = 3
- @$(APPEND) !endif
--i486-: -ix86-
- @$(APPEND) !ifndef PROCESSOR_LEVEL
- @$(APPEND) PROCESSOR_LEVEL = 4
- @$(APPEND) !endif
--i586-: -ix86-
- @$(APPEND) !ifndef PROCESSOR_LEVEL
- @$(APPEND) PROCESSOR_LEVEL = 5
- @$(APPEND) !endif
--i686-: -ix86-
- @$(APPEND) !ifndef PROCESSOR_LEVEL
- @$(APPEND) PROCESSOR_LEVEL = 6
- @$(APPEND) !endif
-
--epilogue-: nul
- @type >> $(MAKEFILE) &&|
-
-\# OS = $(OS)
-\# RT = $(RT)
-\# RUBY_INSTALL_NAME = ruby
-\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
-\# STACK = 0x2000000
-\# LDFLAGS = -S:$$(STACK)
-\# RFLAGS = $$(iconinc)
-\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
-$(BANG)include $$(srcdir)/bcc32/Makefile.sub
-|
- @$(srcdir:/=\)\win32\rm.bat config.h config.status
- @echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/bignum.c b/bignum.c
index 788eb4bfd2..3159d143c7 100644
--- a/bignum.c
+++ b/bignum.c
@@ -6,17 +6,13 @@
$Date$
created at: Fri Jun 10 00:48:55 JST 1994
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
#include "ruby.h"
-
#include <math.h>
#include <ctype.h>
-#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
VALUE rb_cBignum;
@@ -24,29 +20,37 @@ VALUE rb_cBignum;
#define USHORT _USHORT
#endif
+#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+typedef unsigned int BDIGIT;
+typedef unsigned long long BDIGIT_DBL;
+typedef long long BDIGIT_DBL_SIGNED;
+#elif SIZEOF_INT*2 <= SIZEOF___INT64
+typedef unsigned int BDIGIT;
+typedef unsigned __int64 BDIGIT_DBL;
+typedef __int64 BDIGIT_DBL_SIGNED;
+#else
+typedef unsigned short BDIGIT;
+typedef unsigned long BDIGIT_DBL;
+typedef long BDIGIT_DBL_SIGNED;
+#endif
+
#define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
-#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
+#define BITSPERDIG (sizeof(BDIGIT)*CHAR_BIT)
#define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
-#define DIGSPERLONG ((unsigned int)(SIZEOF_LONG/SIZEOF_BDIGITS))
-#if HAVE_LONG_LONG
-# define DIGSPERLL ((unsigned int)(SIZEOF_LONG_LONG/SIZEOF_BDIGITS))
-#endif
+#define DIGSPERLONG ((unsigned int)(sizeof(long)/sizeof(BDIGIT)))
#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
#define BIGDN(x) RSHIFT(x,BITSPERDIG)
#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
-#define BDIGMAX ((BDIGIT)-1)
-
-#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || (RBIGNUM(x)->len == 1 && BDIGITS(x)[0] == 0))
static VALUE
bignew_1(klass, len, sign)
VALUE klass;
long len;
- int sign;
+ char sign;
{
NEWOBJ(big, struct RBignum);
OBJSETUP(big, klass, T_BIGNUM);
- big->sign = sign?1:0;
+ big->sign = sign;
big->len = len;
big->digits = ALLOC_N(BDIGIT, len);
@@ -65,16 +69,14 @@ rb_big_clone(x)
return z;
}
-/* modify a bignum by 2's complement */
-static void
-get2comp(x)
+void
+rb_big_2comp(x) /* get 2's complement */
VALUE x;
{
long i = RBIGNUM(x)->len;
BDIGIT *ds = BDIGITS(x);
BDIGIT_DBL num;
- if (!i) return;
while (i--) ds[i] = ~ds[i];
i = 0; num = 1;
do {
@@ -82,65 +84,43 @@ get2comp(x)
ds[i++] = BIGLO(num);
num = BIGDN(num);
} while (i < RBIGNUM(x)->len);
- if (num != 0) {
- REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
+ if (ds[0] == 1 || ds[0] == 0) {
+ for (i=1; i<RBIGNUM(x)->len; i++) {
+ if (ds[i] != 0) return;
+ }
+ REALLOC_N(RBIGNUM(x)->digits, BDIGIT, RBIGNUM(x)->len++);
ds = BDIGITS(x);
- ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
+ ds[RBIGNUM(x)->len-1] = 1;
}
}
-void
-rb_big_2comp(x) /* get 2's complement */
- VALUE x;
-{
- get2comp(x);
-}
-
static VALUE
-bigtrunc(x)
+bignorm(x)
VALUE x;
{
- long len = RBIGNUM(x)->len;
- BDIGIT *ds = BDIGITS(x);
+ if (!FIXNUM_P(x)) {
+ long len = RBIGNUM(x)->len;
+ BDIGIT *ds = BDIGITS(x);
- if (len == 0) return x;
- while (--len && !ds[len]);
- RBIGNUM(x)->len = ++len;
- return x;
-}
-
-static VALUE
-bigfixize(VALUE x)
-{
- long len = RBIGNUM(x)->len;
- BDIGIT *ds = BDIGITS(x);
+ while (len-- && !ds[len]) ;
+ RBIGNUM(x)->len = ++len;
- if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
- long num = 0;
- while (len--) {
- num = BIGUP(num) + ds[len];
- }
- if (num >= 0) {
- if (RBIGNUM(x)->sign) {
- if (POSFIXABLE(num)) return LONG2FIX(num);
+ if (len*sizeof(BDIGIT) <= sizeof(VALUE)) {
+ long num = 0;
+ while (len--) {
+ num = BIGUP(num) + ds[len];
}
- else {
- if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
+ if (num >= 0) {
+ if (RBIGNUM(x)->sign) {
+ if (POSFIXABLE(num)) return INT2FIX(num);
+ }
+ else if (NEGFIXABLE(-(long)num)) return INT2FIX(-(long)num);
}
}
}
return x;
}
-static VALUE
-bignorm(VALUE x)
-{
- if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
- x = bigfixize(bigtrunc(x));
- }
- return x;
-}
-
VALUE
rb_big_norm(x)
VALUE x;
@@ -157,6 +137,7 @@ rb_uint2big(n)
BDIGIT *digits;
VALUE big;
+ i = 0;
big = bignew(DIGSPERLONG, 1);
digits = BDIGITS(big);
while (i < DIGSPERLONG) {
@@ -165,7 +146,7 @@ rb_uint2big(n)
}
i = DIGSPERLONG;
- while (--i && !digits[i]) ;
+ while (i-- && !digits[i]) ;
RBIGNUM(big)->len = i+1;
return big;
}
@@ -192,7 +173,7 @@ VALUE
rb_uint2inum(n)
unsigned long n;
{
- if (POSFIXABLE(n)) return LONG2FIX(n);
+ if (POSFIXABLE(n)) return INT2FIX(n);
return rb_uint2big(n);
}
@@ -200,170 +181,26 @@ VALUE
rb_int2inum(n)
long n;
{
- if (FIXABLE(n)) return LONG2FIX(n);
+ if (FIXABLE(n)) return INT2FIX(n);
return rb_int2big(n);
}
-#ifdef HAVE_LONG_LONG
-
-void
-rb_quad_pack(buf, val)
- char *buf;
- VALUE val;
-{
- LONG_LONG q;
-
- val = rb_to_int(val);
- if (FIXNUM_P(val)) {
- q = FIX2LONG(val);
- }
- else {
- long len = RBIGNUM(val)->len;
- BDIGIT *ds;
-
- if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
- rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
- ds = BDIGITS(val);
- q = 0;
- while (len--) {
- q = BIGUP(q);
- q += ds[len];
- }
- if (!RBIGNUM(val)->sign) q = -q;
- }
- memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
-}
-
-VALUE
-rb_quad_unpack(buf, sign)
- const char *buf;
- int sign;
-{
- unsigned LONG_LONG q;
- long neg = 0;
- long i;
- BDIGIT *digits;
- VALUE big;
-
- memcpy(&q, buf, SIZEOF_LONG_LONG);
- if (sign) {
- if (FIXABLE((LONG_LONG)q)) return LONG2FIX((LONG_LONG)q);
- if ((LONG_LONG)q < 0) {
- q = -(LONG_LONG)q;
- neg = 1;
- }
- }
- else {
- if (POSFIXABLE(q)) return LONG2FIX(q);
- }
-
- i = 0;
- big = bignew(DIGSPERLL, 1);
- digits = BDIGITS(big);
- while (i < DIGSPERLL) {
- digits[i++] = BIGLO(q);
- q = BIGDN(q);
- }
-
- i = DIGSPERLL;
- while (i-- && !digits[i]) ;
- RBIGNUM(big)->len = i+1;
-
- if (neg) {
- RBIGNUM(big)->sign = 0;
- }
- return bignorm(big);
-}
-
-#else
-
-#define QUAD_SIZE 8
-
-void
-rb_quad_pack(buf, val)
- char *buf;
- VALUE val;
-{
- long len;
-
- memset(buf, 0, QUAD_SIZE);
- val = rb_to_int(val);
- if (FIXNUM_P(val)) {
- val = rb_int2big(FIX2LONG(val));
- }
- len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
- if (len > QUAD_SIZE) {
- rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
- }
- memcpy(buf, (char*)BDIGITS(val), len);
- if (!RBIGNUM(val)->sign) {
- len = QUAD_SIZE;
- while (len--) {
- *buf = ~*buf;
- buf++;
- }
- }
-}
-
-#define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
-
VALUE
-rb_quad_unpack(buf, sign)
- const char *buf;
- int sign;
-{
- VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
-
- memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
- if (sign && BNEG(buf)) {
- long len = QUAD_SIZE;
- char *tmp = (char*)BDIGITS(big);
-
- RBIGNUM(big)->sign = 0;
- while (len--) {
- *tmp = ~*tmp;
- tmp++;
- }
- }
-
- return bignorm(big);
-}
-
-#endif
-
-VALUE
-rb_cstr_to_inum(str, base, badcheck)
+rb_cstr2inum(str, base)
const char *str;
int base;
- int badcheck;
{
const char *s = str;
char *end;
- char sign = 1, nondigit = 0;
- int c;
+ int badcheck = (base==0)?1:0;
+ char sign = 1, c;
BDIGIT_DBL num;
long len, blen = 1;
long i;
VALUE z;
BDIGIT *zds;
-#define conv_digit(c) \
- (!ISASCII(c) ? -1 : \
- isdigit(c) ? ((c) - '0') : \
- islower(c) ? ((c) - 'a' + 10) : \
- isupper(c) ? ((c) - 'A' + 10) : \
- -1)
-
- if (!str) {
- if (badcheck) goto bad;
- return INT2FIX(0);
- }
- if (badcheck) {
- while (ISSPACE(*str)) str++;
- }
- else {
- while (ISSPACE(*str) || *str == '_') str++;
- }
+ while (*str && ISSPACE(*str)) str++;
if (str[0] == '+') {
str++;
@@ -376,85 +213,39 @@ rb_cstr_to_inum(str, base, badcheck)
if (badcheck) goto bad;
return INT2FIX(0);
}
- if (base <= 0) {
+ if (base == 0) {
if (str[0] == '0') {
- switch (str[1]) {
- case 'x': case 'X':
+ if (str[1] == 'x' || str[1] == 'X') {
base = 16;
- break;
- case 'b': case 'B':
+ }
+ else if (str[1] == 'b' || str[1] == 'B') {
base = 2;
- break;
- case 'o': case 'O':
- base = 8;
- break;
- case 'd': case 'D':
- base = 10;
- break;
- default:
+ }
+ else {
base = 8;
}
}
- else if (base < -1) {
- base = -base;
- }
else {
base = 10;
}
}
- switch (base) {
- case 2:
- len = 1;
- if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
- str += 2;
- }
- break;
- case 3:
- len = 2;
- break;
- case 8:
- if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
+ if (base == 8) {
+ while (*str == '0') str++;
+ if (!*str) return INT2FIX(0);
+ while (*str == '_') str++;
+ len = 3*strlen(str)*sizeof(char);
+ }
+ else { /* base == 10, 2 or 16 */
+ if (base == 16 && str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
str += 2;
}
- case 4: case 5: case 6: case 7:
- len = 3;
- break;
- case 10:
- if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
+ if (base == 2 && str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
str += 2;
}
- case 9: case 11: case 12: case 13: case 14: case 15:
- len = 4;
- break;
- case 16:
- len = 4;
- if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
- str += 2;
- }
- break;
- default:
- if (base < 2 || 36 < base) {
- rb_raise(rb_eArgError, "illegal radix %d", base);
- }
- if (base <= 32) {
- len = 5;
- }
- else {
- len = 6;
- }
- break;
- }
- if (*str == '0') { /* squeeze preceeding 0s */
- while (*++str == '0');
- if (!*str) --str;
- }
- c = *str;
- c = conv_digit(c);
- if (c < 0 || c >= base) {
- if (badcheck) goto bad;
- return INT2FIX(0);
+ while (*str && *str == '0') str++;
+ if (!*str) str--;
+ len = 4*strlen(str)*sizeof(char);
}
- len *= strlen(str)*sizeof(char);
if (len <= (sizeof(VALUE)*CHAR_BIT)) {
unsigned long val = strtoul((char*)str, &end, base);
@@ -463,20 +254,23 @@ rb_cstr_to_inum(str, base, badcheck)
if (badcheck) {
if (end == str) goto bad; /* no number */
while (*end && ISSPACE(*end)) end++;
- if (*end) goto bad; /* trailing garbage */
+ if (*end) { /* trailing garbage */
+ bad:
+ rb_raise(rb_eArgError, "invalid value for Integer: \"%s\"", s);
+ }
}
if (POSFIXABLE(val)) {
- if (sign) return LONG2FIX(val);
+ if (sign) return INT2FIX(val);
else {
long result = -(long)val;
- return LONG2FIX(result);
+ return INT2FIX(result);
}
}
else {
VALUE big = rb_uint2big(val);
RBIGNUM(big)->sign = sign;
- return bignorm(big);
+ return big;
}
}
bigparse:
@@ -486,19 +280,34 @@ rb_cstr_to_inum(str, base, badcheck)
z = bignew(len, sign);
zds = BDIGITS(z);
for (i=len;i--;) zds[i]=0;
- while ((c = *str++) != 0) {
- if (c == '_') {
- if (badcheck) {
- if (nondigit) goto bad;
- nondigit = c;
+ while (c = *str++) {
+ switch (c) {
+ case '8': case '9':
+ if (base == 8) {
+ c = base;
+ break;
}
+ case '0': case '1': case '2': case '3': case '4':
+ case '5': case '6': case '7':
+ c = c - '0';
+ break;
+ case 'a': case 'b': case 'c':
+ case 'd': case 'e': case 'f':
+ if (base != 16) c = base;
+ else c = c - 'a' + 10;
+ break;
+ case 'A': case 'B': case 'C':
+ case 'D': case 'E': case 'F':
+ if (base != 16) c = base;
+ else c = c - 'A' + 10;
+ break;
+ case '_':
continue;
- }
- else if ((c = conv_digit(c)) < 0) {
+ default:
+ c = base;
break;
}
if (c >= base) break;
- nondigit = 0;
i = 0;
num = c;
for (;;) {
@@ -517,182 +326,83 @@ rb_cstr_to_inum(str, base, badcheck)
if (badcheck) {
str--;
if (s+1 < str && str[-1] == '_') goto bad;
- while (*str && ISSPACE(*str)) str++;
- if (*str) {
- bad:
- rb_invalid_str(s, "Integer");
+ if (ISSPACE(c)) {
+ while (*str && ISSPACE(*str)) str++;
}
+ if (*str) goto bad;
}
return bignorm(z);
}
VALUE
-rb_str_to_inum(str, base, badcheck)
+rb_str2inum(str, base)
VALUE str;
int base;
- int badcheck;
{
char *s;
- long len;
-
- StringValue(str);
- if (badcheck) {
- s = StringValueCStr(str);
- }
- else {
- s = RSTRING(str)->ptr;
- }
- if (s) {
- len = RSTRING(str)->len;
- if (s[len]) { /* no sentinel somehow */
- char *p = ALLOCA_N(char, len+1);
-
- MEMCPY(p, s, char, len);
- p[len] = '\0';
- s = p;
- }
- }
- return rb_cstr_to_inum(s, base, badcheck);
-}
-
-#if HAVE_LONG_LONG
-
-VALUE
-rb_ull2big(n)
- unsigned LONG_LONG n;
-{
- BDIGIT_DBL num = n;
- long i = 0;
- BDIGIT *digits;
- VALUE big;
-
- big = bignew(DIGSPERLL, 1);
- digits = BDIGITS(big);
- while (i < DIGSPERLL) {
- digits[i++] = BIGLO(num);
- num = BIGDN(num);
- }
-
- i = DIGSPERLL;
- while (i-- && !digits[i]) ;
- RBIGNUM(big)->len = i+1;
- return big;
-}
+ int len;
-VALUE
-rb_ll2big(n)
- LONG_LONG n;
-{
- long neg = 0;
- VALUE big;
+ s = rb_str2cstr(str, &len);
+ if (s[len]) { /* no sentinel somehow */
+ char *p = ALLOCA_N(char, len+1);
- if (n < 0) {
- n = -n;
- neg = 1;
+ MEMCPY(p, s, char, len);
+ p[len] = '\0';
+ s = p;
}
- big = rb_ull2big(n);
- if (neg) {
- RBIGNUM(big)->sign = 0;
+ if (len != strlen(s)) {
+ rb_raise(rb_eArgError, "string for Integer contains null byte");
}
- return big;
-}
-
-VALUE
-rb_ull2inum(n)
- unsigned LONG_LONG n;
-{
- if (POSFIXABLE(n)) return LONG2FIX(n);
- return rb_ull2big(n);
-}
-
-VALUE
-rb_ll2inum(n)
- LONG_LONG n;
-{
- if (FIXABLE(n)) return LONG2FIX(n);
- return rb_ll2big(n);
-}
-
-#endif /* HAVE_LONG_LONG */
-
-VALUE
-rb_cstr2inum(str, base)
- const char *str;
- int base;
-{
- return rb_cstr_to_inum(str, base, base==0);
-}
-
-VALUE
-rb_str2inum(str, base)
- VALUE str;
- int base;
-{
- return rb_str_to_inum(str, base, base==0);
+ return rb_cstr2inum(s, base);
}
-const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+static char hexmap[] = "0123456789abcdef";
VALUE
-rb_big2str0(x, base, trim)
+rb_big2str(x, base)
VALUE x;
int base;
- int trim;
{
volatile VALUE t;
BDIGIT *ds;
long i, j, hbase;
VALUE ss;
- char *s;
+ char *s, c;
if (FIXNUM_P(x)) {
return rb_fix2str(x, base);
}
i = RBIGNUM(x)->len;
- if (BIGZEROP(x)) {
- return rb_str_new2("0");
- }
- j = SIZEOF_BDIGITS*CHAR_BIT*i;
- switch (base) {
- case 2: break;
- case 3:
- j = j * 53L / 84 + 1;
- break;
- case 4: case 5: case 6: case 7:
- j = (j + 1) / 2;
- break;
- case 8: case 9:
- j = (j + 2) / 3;
- break;
- case 10: case 11: case 12: case 13: case 14: case 15:
- j = j * 28L / 93 + 1;
- break;
- case 16: case 17: case 18: case 19: case 20: case 21:
- case 22: case 23: case 24: case 25: case 26: case 27:
- case 28: case 29: case 30: case 31:
- j = (j + 3) / 4;
- break;
- case 32: case 33: case 34: case 35: case 36:
- j = (j + 4) / 5;
- break;
- default:
- rb_raise(rb_eArgError, "illegal radix %d", base);
- break;
+ if (i == 0) return rb_str_new2("0");
+ if (base == 10) {
+ j = (sizeof(BDIGIT)/sizeof(char)*CHAR_BIT*i*241L)/800+2;
+ hbase = 10000;
+ }
+ else if (base == 16) {
+ j = (sizeof(BDIGIT)/sizeof(char)*CHAR_BIT*i)/4+2;
+ hbase = 0x10000;
+ }
+ else if (base == 8) {
+ j = (sizeof(BDIGIT)/sizeof(char)*CHAR_BIT*i)+2;
+ hbase = 010000;
+ }
+ else if (base == 2) {
+ j = (sizeof(BDIGIT)*CHAR_BIT*i)+2;
+ hbase = 020;
+ }
+ else {
+ j = 0;
+ hbase = 0;
+ rb_raise(rb_eArgError, "bignum cannot treat base %d", base);
}
- j++; /* space for sign */
-
- hbase = base * base;
-#if SIZEOF_BDIGITS > 2
- hbase *= hbase;
-#endif
t = rb_big_clone(x);
ds = BDIGITS(t);
- ss = rb_str_new(0, j+1);
+ ss = rb_str_new(0, j);
s = RSTRING(ss)->ptr;
s[0] = RBIGNUM(x)->sign ? '+' : '-';
- while (i && j > 1) {
+ while (i && j) {
long k = i;
BDIGIT_DBL num = 0;
@@ -701,63 +411,28 @@ rb_big2str0(x, base, trim)
ds[k] = (BDIGIT)(num / hbase);
num %= hbase;
}
- if (trim && ds[i-1] == 0) i--;
- k = SIZEOF_BDIGITS;
+ if (ds[i-1] == 0) i--;
+ k = 4;
while (k--) {
- s[--j] = ruby_digitmap[num % base];
+ c = (char)(num % base);
+ s[--j] = hexmap[(int)c];
num /= base;
- if (!trim && j < 1) break;
- if (trim && i == 0 && num == 0) break;
+ if (i == 0 && num == 0) break;
}
}
- if (trim) {while (s[j] == '0') j++;}
- i = RSTRING(ss)->len - j;
- if (RBIGNUM(x)->sign) {
- memmove(s, s+j, i);
- RSTRING(ss)->len = i-1;
- }
- else {
- memmove(s+1, s+j, i);
- RSTRING(ss)->len = i;
- }
+ while (s[j] == '0') j++;
+ RSTRING(ss)->len -= RBIGNUM(x)->sign?j:j-1;
+ memmove(RBIGNUM(x)->sign?s:s+1, s+j, RSTRING(ss)->len);
s[RSTRING(ss)->len] = '\0';
return ss;
}
-VALUE
-rb_big2str(VALUE x, int base)
-{
- return rb_big2str0(x, base, Qtrue);
-}
-
-/*
- * call-seq:
- * big.to_s(base=10) => string
- *
- * Returns a string containing the representation of <i>big</i> radix
- * <i>base</i> (2 through 36).
- *
- * 12345654321.to_s #=> "12345654321"
- * 12345654321.to_s(2) #=> "1011011111110110111011110000110001"
- * 12345654321.to_s(8) #=> "133766736061"
- * 12345654321.to_s(16) #=> "2dfdbbc31"
- * 78546939656932.to_s(36) #=> "rubyrules"
- */
-
static VALUE
-rb_big_to_s(argc, argv, x)
- int argc;
- VALUE *argv;
+rb_big_to_s(x)
VALUE x;
{
- VALUE b;
- int base;
-
- rb_scan_args(argc, argv, "01", &b);
- if (argc == 0) base = 10;
- else base = NUM2INT(b);
- return rb_big2str(x, base);
+ return rb_big2str(x, 10);
}
static unsigned long
@@ -769,7 +444,7 @@ big2ulong(x, type)
BDIGIT_DBL num;
BDIGIT *ds;
- if (len > SIZEOF_LONG/SIZEOF_BDIGITS)
+ if (len > sizeof(long)/sizeof(BDIGIT))
rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
ds = BDIGITS(x);
num = 0;
@@ -781,28 +456,12 @@ big2ulong(x, type)
}
unsigned long
-rb_big2ulong_pack(x)
- VALUE x;
-{
- unsigned long num = big2ulong(x, "unsigned long");
- if (!RBIGNUM(x)->sign) {
- return -num;
- }
- return num;
-}
-
-unsigned long
rb_big2ulong(x)
VALUE x;
{
unsigned long num = big2ulong(x, "unsigned long");
- if (!RBIGNUM(x)->sign) {
- if ((long)num < 0) {
- rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
- }
- return -num;
- }
+ if (!RBIGNUM(x)->sign) return -num;
return num;
}
@@ -810,63 +469,15 @@ long
rb_big2long(x)
VALUE x;
{
- unsigned long num = big2ulong(x, "long");
+ unsigned long num = big2ulong(x, "int");
if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
- rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+ rb_raise(rb_eRangeError, "bignum too big to convert into `int'");
}
if (!RBIGNUM(x)->sign) return -(long)num;
return num;
}
-#if HAVE_LONG_LONG
-
-static unsigned LONG_LONG
-big2ull(x, type)
- VALUE x;
- char *type;
-{
- long len = RBIGNUM(x)->len;
- BDIGIT_DBL num;
- BDIGIT *ds;
-
- if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
- rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
- ds = BDIGITS(x);
- num = 0;
- while (len--) {
- num = BIGUP(num);
- num += ds[len];
- }
- return num;
-}
-
-unsigned LONG_LONG
-rb_big2ull(x)
- VALUE x;
-{
- unsigned LONG_LONG num = big2ull(x, "unsigned long long");
-
- if (!RBIGNUM(x)->sign) return -num;
- return num;
-}
-
-LONG_LONG
-rb_big2ll(x)
- VALUE x;
-{
- unsigned LONG_LONG num = big2ull(x, "long long");
-
- if ((LONG_LONG)num < 0 && (RBIGNUM(x)->sign
- || (LONG_LONG)num != LLONG_MIN)) {
- rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
- }
- if (!RBIGNUM(x)->sign) return -(LONG_LONG)num;
- return num;
-}
-
-#endif /* HAVE_LONG_LONG */
-
static VALUE
dbl2big(d)
double d;
@@ -918,23 +529,10 @@ rb_big2dbl(x)
while (i--) {
d = ds[i] + BIGRAD*d;
}
- if (isinf(d)) {
- rb_warn("Bignum out of Float range");
- d = HUGE_VAL;
- }
if (!RBIGNUM(x)->sign) d = -d;
return d;
}
-/*
- * call-seq:
- * big.to_f -> float
- *
- * Converts <i>big</i> to a <code>Float</code>. If <i>big</i> doesn't
- * fit in a <code>Float</code>, the result is infinity.
- *
- */
-
static VALUE
rb_big_to_f(x)
VALUE x;
@@ -942,16 +540,6 @@ rb_big_to_f(x)
return rb_float_new(rb_big2dbl(x));
}
-/*
- * call-seq:
- * big <=> numeric => -1, 0, +1
- *
- * 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>.
- *
- */
-
static VALUE
rb_big_cmp(x, y)
VALUE x, y;
@@ -967,10 +555,11 @@ rb_big_cmp(x, y)
break;
case T_FLOAT:
- return rb_dbl_cmp(rb_big2dbl(x), RFLOAT(y)->value);
+ y = dbl2big(RFLOAT(y)->value);
+ break;
default:
- return rb_num_coerce_cmp(x, y);
+ return rb_num_coerce_bin(x, y);
}
if (RBIGNUM(x)->sign > RBIGNUM(y)->sign) return INT2FIX(1);
@@ -987,17 +576,6 @@ rb_big_cmp(x, y)
(RBIGNUM(x)->sign ? INT2FIX(-1) : INT2FIX(1));
}
-/*
- * call-seq:
- * big == obj => true or false
- *
- * Returns <code>true</code> only if <i>obj</i> has the same value
- * as <i>big</i>. Contrast this with <code>Bignum#eql?</code>, which
- * requires <i>obj</i> to be a <code>Bignum</code>.
- *
- * 68719476736 == 68719476736.0 #=> true
- */
-
static VALUE
rb_big_eq(x, y)
VALUE x, y;
@@ -1009,16 +587,10 @@ rb_big_eq(x, y)
case T_BIGNUM:
break;
case T_FLOAT:
- {
- volatile double a, b;
-
- a = RFLOAT(y)->value;
- if (isnan(a)) return Qfalse;
- b = rb_big2dbl(x);
- return (a == b)?Qtrue:Qfalse;
- }
+ y = dbl2big(RFLOAT(y)->value);
+ break;
default:
- return rb_equal(y, x);
+ return Qfalse;
}
if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
@@ -1026,35 +598,6 @@ rb_big_eq(x, y)
return Qtrue;
}
-/*
- * call-seq:
- * big.eql?(obj) => true or false
- *
- * Returns <code>true</code> only if <i>obj</i> is a
- * <code>Bignum</code> with the same value as <i>big</i>. Contrast this
- * with <code>Bignum#==</code>, which performs type conversions.
- *
- * 68719476736.eql?(68719476736.0) #=> false
- */
-
-static VALUE
-rb_big_eql(x, y)
- VALUE x, y;
-{
- if (TYPE(y) != T_BIGNUM) return Qfalse;
- if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
- if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
- if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
- return Qtrue;
-}
-
-/*
- * call-seq:
- * -big => other_big
- *
- * Unary minus (returns a new Bignum whose value is 0-big)
- */
-
static VALUE
rb_big_uminus(x)
VALUE x;
@@ -1066,33 +609,18 @@ rb_big_uminus(x)
return bignorm(z);
}
-/*
- * call-seq:
- * ~big => integer
- *
- * Inverts the bits in big. As Bignums are conceptually infinite
- * length, the result acts as if it had an infinite number of one
- * bits to the left. In hex representations, this is displayed
- * as two periods to the left of the digits.
- *
- * sprintf("%X", ~0x1122334455) #=> "..FEEDDCCBBAA"
- */
-
static VALUE
rb_big_neg(x)
VALUE x;
{
VALUE z = rb_big_clone(x);
- long i;
- BDIGIT *ds;
+ long i = RBIGNUM(x)->len;
+ BDIGIT *ds = BDIGITS(z);
- if (!RBIGNUM(x)->sign) get2comp(z);
- ds = BDIGITS(z);
- i = RBIGNUM(x)->len;
- if (!i) return INT2FIX(~0);
+ if (!RBIGNUM(x)->sign) rb_big_2comp(z);
while (i--) ds[i] = ~ds[i];
+ if (RBIGNUM(x)->sign) rb_big_2comp(z);
RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
- if (RBIGNUM(x)->sign) get2comp(z);
return bignorm(z);
}
@@ -1104,8 +632,9 @@ bigsub(x, y)
VALUE z = 0;
BDIGIT *zds;
BDIGIT_DBL_SIGNED num;
- long i = RBIGNUM(x)->len;
-
+ long i;
+
+ i = RBIGNUM(x)->len;
/* if x is larger than y, swap */
if (RBIGNUM(x)->len < RBIGNUM(y)->len) {
z = x; x = y; y = z; /* swap x y */
@@ -1123,7 +652,7 @@ bigsub(x, y)
}
}
- z = bignew(RBIGNUM(x)->len, z==0);
+ z = bignew(RBIGNUM(x)->len, (z == 0)?1:0);
zds = BDIGITS(z);
for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) {
@@ -1147,7 +676,7 @@ bigsub(x, y)
static VALUE
bigadd(x, y, sign)
VALUE x, y;
- int sign;
+ char sign;
{
VALUE z;
BDIGIT_DBL num;
@@ -1189,13 +718,6 @@ bigadd(x, y, sign)
return z;
}
-/*
- * call-seq:
- * big + other => Numeric
- *
- * Adds big and other, returning the result.
- */
-
VALUE
rb_big_plus(x, y)
VALUE x, y;
@@ -1215,13 +737,6 @@ rb_big_plus(x, y)
}
}
-/*
- * call-seq:
- * big - other => Numeric
- *
- * Subtracts other from big, returning the result.
- */
-
VALUE
rb_big_minus(x, y)
VALUE x, y;
@@ -1242,7 +757,7 @@ rb_big_minus(x, y)
}
VALUE
-rb_big_mul0(x, y)
+rb_big_mul(x, y)
VALUE x, y;
{
long i, j;
@@ -1285,21 +800,7 @@ rb_big_mul0(x, y)
}
}
- return z;
-}
-
-/*
- * call-seq:
- * big * other => Numeric
- *
- * Multiplies big and other, returning the result.
- */
-
-VALUE
-rb_big_mul(x, y)
- VALUE x, y;
-{
- return bignorm(rb_big_mul0(x, y));
+ return bignorm(z);
}
static void
@@ -1315,9 +816,9 @@ bigdivrem(x, y, divp, modp)
BDIGIT_DBL_SIGNED num;
BDIGIT dd, q;
- if (BIGZEROP(y)) rb_num_zerodiv();
yds = BDIGITS(y);
- if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
+ if (ny == 0 && yds[0] == 0) rb_num_zerodiv();
+ if (nx < ny || nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1]) {
if (divp) *divp = rb_int2big(0);
if (modp) *modp = x;
return;
@@ -1414,10 +915,10 @@ bigdivrem(x, y, divp, modp)
for (i = 0;i < j;i++) zds[i] = zds[i+ny];
RBIGNUM(*divp)->len = i;
}
- if (modp) { /* normalize remainder */
+ if (modp) { /* just normalize remainder */
*modp = rb_big_clone(z);
zds = BDIGITS(*modp);
- while (--ny && !zds[ny]); ++ny;
+ while (ny-- && !zds[ny]); ++ny;
if (dd) {
t2 = 0; i = ny;
while(i--) {
@@ -1440,7 +941,7 @@ bigdivmod(x, y, divp, modp)
VALUE mod;
bigdivrem(x, y, divp, &mod);
- if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
+ if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && RBIGNUM(mod)->len > 0) {
if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
if (modp) *modp = bigadd(mod, y, 1);
}
@@ -1450,14 +951,6 @@ bigdivmod(x, y, divp, modp)
}
}
-/*
- * call-seq:
- * big / other => Numeric
- * big.div(other) => Numeric
- *
- * Divides big by other, returning the result.
- */
-
static VALUE
rb_big_div(x, y)
VALUE x, y;
@@ -1483,14 +976,6 @@ rb_big_div(x, y)
return bignorm(z);
}
-/*
- * call-seq:
- * big % other => Numeric
- * big.modulo(other) => Numeric
- *
- * Returns big modulo other. See Numeric.divmod for more
- * information.
- */
static VALUE
rb_big_modulo(x, y)
@@ -1514,15 +999,6 @@ rb_big_modulo(x, y)
return bignorm(z);
}
-/*
- * call-seq:
- * big.remainder(numeric) => number
- *
- * Returns the remainder after dividing <i>big</i> by <i>numeric</i>.
- *
- * -1234567890987654321.remainder(13731) #=> -6966
- * -1234567890987654321.remainder(13731.24) #=> -9906.22531493148
- */
static VALUE
rb_big_remainder(x, y)
VALUE x, y;
@@ -1545,27 +1021,6 @@ rb_big_remainder(x, y)
return bignorm(z);
}
-static VALUE big_lshift _((VALUE, unsigned long));
-static VALUE big_rshift _((VALUE, unsigned long));
-
-static VALUE big_shift(x, n)
- VALUE x;
- int n;
-{
- if (n < 0)
- return big_lshift(x, (unsigned int)n);
- else if (n > 0)
- return big_rshift(x, (unsigned int)n);
- return x;
-}
-
-/*
- * call-seq:
- * big.divmod(numeric) => array
- *
- * See <code>Numeric#divmod</code>.
- *
- */
VALUE
rb_big_divmod(x, y)
VALUE x, y;
@@ -1588,57 +1043,6 @@ rb_big_divmod(x, y)
return rb_assoc_new(bignorm(div), bignorm(mod));
}
-/*
- * call-seq:
- * big.quo(numeric) -> float
- *
- * Returns the floating point result of dividing <i>big</i> by
- * <i>numeric</i>.
- *
- * -1234567890987654321.quo(13731) #=> -89910996357705.5
- * -1234567890987654321.quo(13731.24) #=> -89909424858035.7
- *
- */
-
-static VALUE
-rb_big_quo(x, y)
- VALUE x, y;
-{
- double dx = rb_big2dbl(x);
- double dy;
-
- switch (TYPE(y)) {
- case T_FIXNUM:
- dy = (double)FIX2LONG(y);
- break;
-
- case T_BIGNUM:
- dy = rb_big2dbl(y);
- break;
-
- case T_FLOAT:
- dy = RFLOAT(y)->value;
- break;
-
- default:
- return rb_num_coerce_bin(x, y);
- }
- return rb_float_new(dx / dy);
-}
-
-/*
- * call-seq:
- * big ** exponent #=> numeric
- *
- * Raises _big_ to the _exponent_ power (which may be an integer, float,
- * or anything that will coerce to a number). The result may be
- * a Fixnum, Bignum, or Float
- *
- * 123456789 ** 2 #=> 15241578750190521
- * 123456789 ** 1.2 #=> 5126464716.09932
- * 123456789 ** -2 #=> 6.5610001194102e-17
- */
-
VALUE
rb_big_pow(x, y)
VALUE x, y;
@@ -1658,29 +1062,22 @@ rb_big_pow(x, y)
break;
case T_FIXNUM:
- yy = FIX2LONG(y);
+ yy = NUM2LONG(y);
if (yy > 0) {
- VALUE z = x;
- const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
+ VALUE z;
- if ((RBIGNUM(x)->len > BIGLEN_LIMIT) ||
- (RBIGNUM(x)->len > BIGLEN_LIMIT / yy)) {
- rb_warn("in a**b, b may be too big");
- d = (double)yy;
- break;
- }
+ z = x;
for (;;) {
- yy -= 1;
+ yy = yy - 1;
if (yy == 0) break;
while (yy % 2 == 0) {
- yy /= 2;
- x = rb_big_mul0(x, x);
- bigtrunc(x);
+ yy = yy / 2;
+ x = rb_big_mul(x, x);
}
- z = rb_big_mul0(z, x);
- bigtrunc(z);
+ z = rb_big_mul(z, x);
}
- return bignorm(z);
+ if (!FIXNUM_P(z)) z = bignorm(z);
+ return z;
}
d = (double)yy;
break;
@@ -1691,34 +1088,29 @@ rb_big_pow(x, y)
return rb_float_new(pow(rb_big2dbl(x), d));
}
-/*
- * call-seq:
- * big & numeric => integer
- *
- * Performs bitwise +and+ between _big_ and _numeric_.
- */
-
VALUE
-rb_big_and(xx, yy)
- VALUE xx, yy;
+rb_big_and(x, y)
+ VALUE x, y;
{
- volatile VALUE x, y, z;
+ VALUE z;
BDIGIT *ds1, *ds2, *zds;
long i, l1, l2;
char sign;
- x = xx;
- y = rb_to_int(yy);
if (FIXNUM_P(y)) {
y = rb_int2big(FIX2LONG(y));
}
+ else {
+ Check_Type(y, T_BIGNUM);
+ }
+
if (!RBIGNUM(y)->sign) {
y = rb_big_clone(y);
- get2comp(y);
+ rb_big_2comp(y);
}
if (!RBIGNUM(x)->sign) {
x = rb_big_clone(x);
- get2comp(x);
+ rb_big_2comp(x);
}
if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
l1 = RBIGNUM(y)->len;
@@ -1743,38 +1135,33 @@ rb_big_and(xx, yy)
for (; i<l2; i++) {
zds[i] = sign?0:ds2[i];
}
- if (!RBIGNUM(z)->sign) get2comp(z);
+ if (!RBIGNUM(z)->sign) rb_big_2comp(z);
return bignorm(z);
}
-/*
- * call-seq:
- * big | numeric => integer
- *
- * Performs bitwise +or+ between _big_ and _numeric_.
- */
-
VALUE
-rb_big_or(xx, yy)
- VALUE xx, yy;
+rb_big_or(x, y)
+ VALUE x, y;
{
- volatile VALUE x, y, z;
+ VALUE z;
BDIGIT *ds1, *ds2, *zds;
long i, l1, l2;
char sign;
- x = xx;
- y = rb_to_int(yy);
if (FIXNUM_P(y)) {
y = rb_int2big(FIX2LONG(y));
}
+ else {
+ Check_Type(y, T_BIGNUM);
+ }
+
if (!RBIGNUM(y)->sign) {
y = rb_big_clone(y);
- get2comp(y);
+ rb_big_2comp(y);
}
if (!RBIGNUM(x)->sign) {
x = rb_big_clone(x);
- get2comp(x);
+ rb_big_2comp(x);
}
if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
l1 = RBIGNUM(y)->len;
@@ -1799,40 +1186,34 @@ rb_big_or(xx, yy)
for (; i<l2; i++) {
zds[i] = sign?ds2[i]:(BIGRAD-1);
}
- if (!RBIGNUM(z)->sign) get2comp(z);
+ if (!RBIGNUM(z)->sign) rb_big_2comp(z);
return bignorm(z);
}
-/*
- * call-seq:
- * big ^ numeric => integer
- *
- * Performs bitwise +exclusive or+ between _big_ and _numeric_.
- */
-
VALUE
-rb_big_xor(xx, yy)
- VALUE xx, yy;
+rb_big_xor(x, y)
+ VALUE x, y;
{
- volatile VALUE x, y;
VALUE z;
BDIGIT *ds1, *ds2, *zds;
long i, l1, l2;
char sign;
- x = xx;
- y = rb_to_int(yy);
if (FIXNUM_P(y)) {
y = rb_int2big(FIX2LONG(y));
}
+ else {
+ Check_Type(y, T_BIGNUM);
+ }
+
if (!RBIGNUM(y)->sign) {
y = rb_big_clone(y);
- get2comp(y);
+ rb_big_2comp(y);
}
if (!RBIGNUM(x)->sign) {
x = rb_big_clone(x);
- get2comp(x);
+ rb_big_2comp(x);
}
if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
l1 = RBIGNUM(y)->len;
@@ -1859,72 +1240,26 @@ rb_big_xor(xx, yy)
for (; i<l2; i++) {
zds[i] = sign?ds2[i]:~ds2[i];
}
- if (!RBIGNUM(z)->sign) get2comp(z);
+ if (!RBIGNUM(z)->sign) rb_big_2comp(z);
return bignorm(z);
}
-static VALUE
-check_shiftdown(VALUE y, VALUE x)
-{
- if (!RBIGNUM(x)->len) return INT2FIX(0);
- if (RBIGNUM(y)->len > SIZEOF_LONG / SIZEOF_BDIGITS) {
- return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(-1);
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * big << numeric => integer
- *
- * Shifts big left _numeric_ positions (right if _numeric_ is negative).
- */
+static VALUE rb_big_rshift _((VALUE,VALUE));
VALUE
rb_big_lshift(x, y)
VALUE x, y;
{
- long shift;
- int neg = 0;
-
- for (;;) {
- if (FIXNUM_P(y)) {
- shift = FIX2LONG(y);
- if (shift < 0) {
- neg = 1;
- shift = -shift;
- }
- break;
- }
- else if (TYPE(y) == T_BIGNUM) {
- if (!RBIGNUM(y)->sign) {
- VALUE t = check_shiftdown(y, x);
- if (!NIL_P(t)) return t;
- neg = 1;
- }
- shift = big2ulong(y, "long", Qtrue);
- break;
- }
- y = rb_to_int(y);
- }
-
- if (neg) return big_rshift(x, shift);
- return big_lshift(x, shift);
-}
-
-static VALUE
-big_lshift(x, shift)
- VALUE x;
- unsigned long shift;
-{
BDIGIT *xds, *zds;
- long s1 = shift/BITSPERDIG;
+ int shift = NUM2INT(y);
+ int s1 = shift/BITSPERDIG;
int s2 = shift%BITSPERDIG;
VALUE z;
BDIGIT_DBL num = 0;
long len, i;
+ if (shift < 0) return rb_big_rshift(x, INT2FIX(-shift));
len = RBIGNUM(x)->len;
z = bignew(len+s1+1, RBIGNUM(x)->sign);
zds = BDIGITS(z);
@@ -1941,160 +1276,64 @@ big_lshift(x, shift)
return bignorm(z);
}
-/*
- * call-seq:
- * big >> numeric => integer
- *
- * Shifts big right _numeric_ positions (left if _numeric_ is negative).
- */
-
-VALUE
+static VALUE
rb_big_rshift(x, y)
VALUE x, y;
{
- long shift;
- int neg = 0;
-
- for (;;) {
- if (FIXNUM_P(y)) {
- shift = FIX2LONG(y);
- if (shift < 0) {
- neg = 1;
- shift = -shift;
- }
- break;
- }
- else if (TYPE(y) == T_BIGNUM) {
- if (RBIGNUM(y)->sign) {
- VALUE t = check_shiftdown(y, x);
- if (!NIL_P(t)) return t;
- }
- else {
- neg = 1;
- }
- shift = big2ulong(y, "long", Qtrue);
- break;
- }
- y = rb_to_int(y);
- }
-
- if (neg) return big_lshift(x, shift);
- return big_rshift(x, shift);
-}
-
-static VALUE
-big_rshift(x, shift)
- VALUE x;
- unsigned long shift;
-{
BDIGIT *xds, *zds;
- long s1 = shift/BITSPERDIG;
+ int shift = NUM2INT(y);
+ int s1 = shift/BITSPERDIG;
int s2 = shift%BITSPERDIG;
VALUE z;
BDIGIT_DBL num = 0;
- long i, j;
- volatile VALUE save_x;
+ long i = RBIGNUM(x)->len;
+ long j;
+ if (shift < 0) return rb_big_lshift(x, INT2FIX(-shift));
if (s1 > RBIGNUM(x)->len) {
if (RBIGNUM(x)->sign)
return INT2FIX(0);
else
return INT2FIX(-1);
}
- if (!RBIGNUM(x)->sign) {
- save_x = x = rb_big_clone(x);
- get2comp(x);
- }
xds = BDIGITS(x);
i = RBIGNUM(x)->len; j = i - s1;
- if (j == 0) {
- if (RBIGNUM(x)->sign) return INT2FIX(0);
- else return INT2FIX(-1);
- }
z = bignew(j, RBIGNUM(x)->sign);
- if (!RBIGNUM(x)->sign) {
- num = ((BDIGIT_DBL)~0) << BITSPERDIG;
- }
zds = BDIGITS(z);
while (i--, j--) {
num = (num | xds[i]) >> s2;
zds[j] = BIGLO(num);
num = BIGUP(xds[i]);
}
- if (!RBIGNUM(x)->sign) {
- get2comp(z);
- }
return bignorm(z);
}
-/*
- * call-seq:
- * big[n] -> 0, 1
- *
- * Bit Reference---Returns the <em>n</em>th bit in the (assumed) binary
- * representation of <i>big</i>, where <i>big</i>[0] is the least
- * significant bit.
- *
- * a = 9**15
- * 50.downto(0) do |n|
- * print a[n]
- * end
- *
- * <em>produces:</em>
- *
- * 000101110110100000111000011110010100111100010111001
- *
- */
-
static VALUE
rb_big_aref(x, y)
VALUE x, y;
{
BDIGIT *xds;
- BDIGIT_DBL num;
- unsigned long shift;
- long i, s1, s2;
+ int shift = NUM2INT(y);
+ int s1, s2;
- if (TYPE(y) == T_BIGNUM) {
- if (!RBIGNUM(y)->sign)
- return INT2FIX(0);
- if (RBIGNUM(bigtrunc(y))->len > SIZEOF_LONG/SIZEOF_BDIGITS) {
- out_of_range:
- return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(1);
- }
- shift = big2ulong(y, "long", Qfalse);
- }
- else {
- i = NUM2LONG(y);
- if (i < 0) return INT2FIX(0);
- shift = (VALUE)i;
- }
+ if (shift < 0) return INT2FIX(0);
s1 = shift/BITSPERDIG;
s2 = shift%BITSPERDIG;
- if (s1 >= RBIGNUM(x)->len) goto out_of_range;
if (!RBIGNUM(x)->sign) {
- xds = BDIGITS(x);
- i = 0; num = 1;
- while (num += ~xds[i], ++i <= s1) {
- num = BIGDN(num);
- }
+ if (s1 >= RBIGNUM(x)->len) return INT2FIX(1);
+ x = rb_big_clone(x);
+ rb_big_2comp(x);
}
else {
- num = BDIGITS(x)[s1];
+ if (s1 >= RBIGNUM(x)->len) return INT2FIX(0);
}
- if (num & ((BDIGIT_DBL)1<<s2))
+ xds = BDIGITS(x);
+ if (xds[s1] & (1<<s2))
return INT2FIX(1);
return INT2FIX(0);
}
-/*
- * call-seq:
- * big.hash => fixnum
- *
- * Compute a hash based on the value of _big_.
- */
-
static VALUE
rb_big_hash(x)
VALUE x;
@@ -2106,13 +1345,9 @@ rb_big_hash(x)
for (i=0; i<len; i++) {
key ^= *digits++;
}
- return LONG2FIX(key);
+ return INT2FIX(key);
}
-/*
- * MISSING: documentation
- */
-
static VALUE
rb_big_coerce(x, y)
VALUE x, y;
@@ -2120,26 +1355,14 @@ rb_big_coerce(x, y)
if (FIXNUM_P(y)) {
return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
}
- else if (TYPE(y) == T_BIGNUM) {
- return rb_assoc_new(y, x);
- }
else {
- rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
- rb_obj_classname(y));
+ rb_raise(rb_eTypeError, "Can't coerce %s to Bignum",
+ rb_class2name(CLASS_OF(y)));
}
/* not reached */
return Qnil;
}
-/*
- * call-seq:
- * big.abs -> aBignum
- *
- * Returns the absolute value of <i>big</i>.
- *
- * -1234567890987654321.abs #=> 1234567890987654321
- */
-
static VALUE
rb_big_abs(x)
VALUE x;
@@ -2151,70 +1374,49 @@ rb_big_abs(x)
return x;
}
+/* !!!warnig!!!!
+ this is not really a random number!!
+*/
+
VALUE
-rb_big_rand(max, rand_buf)
+rb_big_rand(max, rand)
VALUE max;
- double *rand_buf;
+ double rand;
{
VALUE v;
- long len = RBIGNUM(max)->len;
+ long len;
- if (BIGZEROP(max)) {
- return rb_float_new(rand_buf[0]);
- }
+ len = RBIGNUM(max)->len;
v = bignew(len,1);
- len--;
- BDIGITS(v)[len] = BDIGITS(max)[len] * rand_buf[len];
while (len--) {
- BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
+ BDIGITS(v)[len] = ((BDIGIT)~0) * rand;
}
- return v;
+ return rb_big_modulo((VALUE)v, max);
}
-/*
- * call-seq:
- * big.size -> integer
- *
- * Returns the number of bytes in the machine representation of
- * <i>big</i>.
- *
- * (256**10 - 1).size #=> 12
- * (256**20 - 1).size #=> 20
- * (256**40 - 1).size #=> 40
- */
-
static VALUE
rb_big_size(big)
VALUE big;
{
- return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
+ return INT2FIX(RBIGNUM(big)->len*sizeof(BDIGIT));
}
-/*
- * Bignum objects hold integers outside the range of
- * Fixnum. Bignum objects are created
- * automatically when integer calculations would otherwise overflow a
- * Fixnum. When a calculation involving
- * Bignum objects returns a result that will fit in a
- * Fixnum, the result is automatically converted.
- *
- * For the purposes of the bitwise operations and <code>[]</code>, a
- * Bignum is treated as if it were an infinite-length
- * bitstring with 2's complement representation.
- *
- * While Fixnum values are immediate, Bignum
- * objects are not---assignment and parameter passing work with
- * references to objects, not the objects themselves.
- *
- */
+static VALUE
+rb_big_zero_p(big)
+ VALUE big;
+{
+ return Qfalse;
+}
void
Init_Bignum()
{
rb_cBignum = rb_define_class("Bignum", rb_cInteger);
- rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1);
+ rb_undef_method(CLASS_OF(rb_cBignum), "new");
+
+ rb_define_method(rb_cBignum, "to_s", rb_big_to_s, 0);
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);
@@ -2222,11 +1424,9 @@ Init_Bignum()
rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
rb_define_method(rb_cBignum, "/", rb_big_div, 1);
rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
- rb_define_method(rb_cBignum, "div", rb_big_div, 1);
rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
- rb_define_method(rb_cBignum, "quo", rb_big_quo, 1);
rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
rb_define_method(rb_cBignum, "&", rb_big_and, 1);
rb_define_method(rb_cBignum, "|", rb_big_or, 1);
@@ -2238,9 +1438,11 @@ Init_Bignum()
rb_define_method(rb_cBignum, "<=>", rb_big_cmp, 1);
rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
- rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1);
+ rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
+ rb_define_method(rb_cBignum, "eql?", rb_big_eq, 1);
rb_define_method(rb_cBignum, "hash", rb_big_hash, 0);
rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
rb_define_method(rb_cBignum, "size", rb_big_size, 0);
+ rb_define_method(rb_cBignum, "zero?", rb_big_zero_p, 0);
}
diff --git a/bin/erb b/bin/erb
deleted file mode 100755
index a6fcd5370c..0000000000
--- a/bin/erb
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env ruby
-# Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002 Masatoshi SEKI
-# You can redistribute it and/or modify it under the same terms as Ruby.
-
-require 'erb'
-
-class ERB
- module Main
- def ARGV.switch
- return nil if self.empty?
- arg = self.shift
- return nil if arg == '--'
- if arg =~ /^-(.)(.*)/
- return arg if $1 == '-'
- raise 'unknown switch "-"' if $2.index('-')
- self.unshift "-#{$2}" if $2.size > 0
- "-#{$1}"
- else
- self.unshift arg
- nil
- end
- end
-
- def ARGV.req_arg
- self.shift || raise('missing argument')
- end
-
- def trim_mode_opt(trim_mode, disable_percent)
- return trim_mode if disable_percent
- case trim_mode
- when 0
- return '%'
- when 1
- return '%>'
- when 2
- return '%<>'
- when '-'
- return '%-'
- end
- end
- module_function :trim_mode_opt
-
- def run(factory=ERB)
- trim_mode = 0
- disable_percent = false
- begin
- while switch = ARGV.switch
- case switch
- when '-x' # ruby source
- output = true
- when '-n' # line number
- number = true
- when '-v' # verbose
- $VERBOSE = true
- when '--version' # version
- STDERR.puts factory.version
- exit
- when '-d', '--debug' # debug
- $DEBUG = true
- when '-r' # require
- require ARGV.req_arg
- when '-S' # security level
- arg = ARGV.req_arg
- raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-4]$/
- safe_level = arg.to_i
- when '-T' # trim mode
- arg = ARGV.req_arg
- if arg == '-'
- trim_mode = arg
- next
- end
- raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
- trim_mode = arg.to_i
- when '-K' # KCODE
- arg = ARGV.req_arg
- case arg.downcase
- when 'e', '-e', 'euc'
- $KCODE = 'EUC'
- when 's', '-s', 'sjis'
- $KCODE = 'SJIS'
- when 'u', '-u', 'utf8'
- $KCODE = 'UTF8'
- when 'n', '-n', 'none'
- $KCODE = 'NONE'
- else
- raise "invalid KCODE #{arg.dump}"
- end
- when '-P'
- disable_percent = true
- when '--help'
- raise "print this help"
- else
- raise "unknown switch #{switch.dump}"
- end
- end
- rescue # usage
- STDERR.puts $!.to_s
- STDERR.puts File.basename($0) +
- " [switches] [inputfile]"
- STDERR.puts <<EOU
- -x print ruby script
- -n print ruby script with line number
- -v enable verbose mode
- -d set $DEBUG to true
- -r [library] load a library
- -K [kcode] specify KANJI code-set
- -S [safe_level] set $SAFE (0..4)
- -T [trim_mode] specify trim_mode (0..2, -)
- -P ignore lines which start with "%"
-EOU
- exit 1
- end
-
- src = $<.read
- filename = $FILENAME
- exit 2 unless src
- trim = trim_mode_opt(trim_mode, disable_percent)
- erb = factory.new(src.untaint, safe_level, trim)
- erb.filename = filename
- if output
- if number
- l = 1
- for line in erb.src
- puts "%3d %s"%[l, line]
- l += 1
- end
- else
- puts erb.src
- end
- else
- erb.run(TOPLEVEL_BINDING.taint)
- end
- end
- module_function :run
- end
-end
-
-if __FILE__ == $0
- ERB::Main.run
-end
diff --git a/bin/rdoc b/bin/rdoc
deleted file mode 100644
index fe619137fd..0000000000
--- a/bin/rdoc
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env ruby
-#
-# RDoc: Documentation tool for source code
-# (see lib/rdoc/rdoc.rb for more information)
-#
-# Copyright (c) 2003 Dave Thomas
-# Released under the same terms as Ruby
-#
-# $Revision$
-
-## Transitional Hack ####
-#
-# RDoc was initially distributed independently, and installed
-# itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
-#
-# Now that RDoc is part of the distribution, it's installed into
-# <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
-# search path. This means that if you have previously installed RDoc,
-# and then install from ruby-lang, you'll pick up the old one by
-# default. This hack checks for the condition, and readjusts the
-# search path if necessary.
-
-def adjust_for_existing_rdoc(path)
-
- $stderr.puts %{
- It seems as if you have a previously-installed RDoc in
- the directory #{path}.
-
- Because this is now out-of-date, you might want to consider
- removing the directories:
-
- #{File.join(path, "rdoc")}
-
- and
-
- #{File.join(path, "markup")}
-
- }
-
- # Move all the site_ruby directories to the end
- p $:
- $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
- p $:
-end
-
-$:.each do |path|
- if /site_ruby/ =~ path
- rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
- if File.exists?(rdoc_path)
- adjust_for_existing_rdoc(path)
- break
- end
- end
-end
-
-## End of Transitional Hack ##
-
-
-require 'rdoc/rdoc'
-
-begin
- r = RDoc::RDoc.new
- r.document(ARGV)
-rescue RDoc::RDocError => e
- $stderr.puts e.message
- exit(1)
-end
diff --git a/bin/ri b/bin/ri
deleted file mode 100755
index fb3e00eda3..0000000000
--- a/bin/ri
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env ruby
-# usage:
-#
-# ri name...
-#
-# where name can be
-#
-# Class | Class::method | Class#method | Class.method | method
-#
-# All names may be abbreviated to their minimum unbiguous form. If a name
-# _is_ ambiguous, all valid options will be listed.
-#
-# The form '.' method matches either class or instance methods, while
-# #method matches only instance and ::method matches only class methods.
-#
-#
-# == Installing Documentation
-#
-# 'ri' uses a database of documentation built by the RDoc utility.
-#
-# So, how do you install this documentation on your system?
-# It depends on how you installed Ruby.
-#
-# <em>If you installed Ruby from source files</em> (that is, if it some point
-# you typed 'make' during the process :), you can install the RDoc
-# documentation yourself. Just go back to the place where you have
-# your Ruby source and type
-#
-# make install-doc
-#
-# You'll probably need to do this as a superuser, as the documentation
-# is installed in the Ruby target tree (normally somewhere under
-# <tt>/usr/local</tt>.
-#
-# <em>If you installed Ruby from a binary distribution</em> (perhaps
-# using a one-click installer, or using some other packaging system),
-# then the team that produced the package probably forgot to package
-# the documentation as well. Contact them, and see if they can add
-# it to the next release.
-#
-
-
-require 'rdoc/ri/ri_driver'
-
-######################################################################
-
-ri = RiDriver.new
-ri.process_args
-
diff --git a/bin/testrb b/bin/testrb
deleted file mode 100755
index ff49cb5466..0000000000
--- a/bin/testrb
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
- abort r.options.banner + " tests..."
-exit r.run
diff --git a/class.c b/class.c
index 80dc9e4b2d..b5caf3082a 100644
--- a/class.c
+++ b/class.c
@@ -6,7 +6,7 @@
$Date$
created at: Tue Aug 10 15:05:44 JST 1993
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
@@ -19,7 +19,7 @@
extern st_table *rb_class_tbl;
VALUE
-rb_class_boot(super)
+rb_class_new(super)
VALUE super;
{
NEWOBJ(klass, struct RClass);
@@ -30,95 +30,70 @@ rb_class_boot(super)
klass->m_tbl = 0; /* safe GC */
klass->m_tbl = st_init_numtable();
- OBJ_INFECT(klass, super);
return (VALUE)klass;
}
-VALUE
-rb_class_new(super)
- VALUE super;
-{
- Check_Type(super, T_CLASS);
- if (super == rb_cClass) {
- rb_raise(rb_eTypeError, "can't make subclass of Class");
- }
- if (FL_TEST(super, FL_SINGLETON)) {
- rb_raise(rb_eTypeError, "can't make subclass of virtual class");
- }
- return rb_class_boot(super);
-}
-
static int
clone_method(mid, body, tbl)
ID mid;
NODE *body;
st_table *tbl;
{
- st_insert(tbl, mid, (st_data_t)NEW_METHOD(body->nd_body, body->nd_noex));
+ st_insert(tbl, mid, NEW_METHOD(body->nd_body, body->nd_noex));
return ST_CONTINUE;
}
-/* :nodoc: */
VALUE
-rb_mod_init_copy(clone, orig)
- VALUE clone, orig;
+rb_mod_clone(module)
+ VALUE module;
{
- rb_obj_init_copy(clone, orig);
- if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
- RBASIC(clone)->klass = rb_singleton_class_clone(orig);
- }
- RCLASS(clone)->super = RCLASS(orig)->super;
- if (RCLASS(orig)->iv_tbl) {
- ID id;
-
- RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
- id = rb_intern("__classpath__");
- st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
- id = rb_intern("__classid__");
- st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+ NEWOBJ(clone, struct RClass);
+ CLONESETUP(clone, module);
+
+ clone->super = RCLASS(module)->super;
+ if (RCLASS(module)->iv_tbl) {
+ clone->iv_tbl = st_copy(RCLASS(module)->iv_tbl);
}
- if (RCLASS(orig)->m_tbl) {
- RCLASS(clone)->m_tbl = st_init_numtable();
- st_foreach(RCLASS(orig)->m_tbl, clone_method,
- (st_data_t)RCLASS(clone)->m_tbl);
+ if (RCLASS(module)->m_tbl) {
+ clone->m_tbl = st_init_numtable();
+ st_foreach(RCLASS(module)->m_tbl, clone_method, clone->m_tbl);
}
- return clone;
+ return (VALUE)clone;
}
-/* :nodoc: */
VALUE
-rb_class_init_copy(clone, orig)
- VALUE clone, orig;
+rb_mod_dup(mod)
+ VALUE mod;
{
- if (RCLASS(clone)->super != 0) {
- rb_raise(rb_eTypeError, "already initialized class");
+ VALUE dup = rb_mod_clone(mod);
+ OBJSETUP(dup, RBASIC(mod)->klass, BUILTIN_TYPE(mod));
+ if (FL_TEST(mod, FL_SINGLETON)) {
+ FL_SET(dup, FL_SINGLETON);
}
- if (FL_TEST(orig, FL_SINGLETON)) {
- rb_raise(rb_eTypeError, "can't copy singleton class");
- }
- return rb_mod_init_copy(clone, orig);
+ return dup;
}
VALUE
-rb_singleton_class_clone(obj)
- VALUE obj;
+rb_singleton_class_new(super)
+ VALUE super;
{
- VALUE klass = RBASIC(obj)->klass;
+ VALUE klass = rb_class_new(super);
+ FL_SET(klass, FL_SINGLETON);
+ return klass;
+}
+
+VALUE
+rb_singleton_class_clone(klass)
+ VALUE klass;
+{
if (!FL_TEST(klass, FL_SINGLETON))
return klass;
else {
/* copy singleton(unnamed) class */
NEWOBJ(clone, struct RClass);
- OBJSETUP(clone, 0, RBASIC(klass)->flags);
-
- if (BUILTIN_TYPE(obj) == T_CLASS) {
- RBASIC(clone)->klass = (VALUE)clone;
- }
- else {
- RBASIC(clone)->klass = rb_singleton_class_clone(klass);
- }
+ CLONESETUP(clone, klass);
clone->super = RCLASS(klass)->super;
clone->iv_tbl = 0;
@@ -127,9 +102,7 @@ rb_singleton_class_clone(obj)
clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
}
clone->m_tbl = st_init_numtable();
- st_foreach(RCLASS(klass)->m_tbl, clone_method,
- (st_data_t)clone->m_tbl);
- rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
+ st_foreach(RCLASS(klass)->m_tbl, clone_method, clone->m_tbl);
FL_SET(clone, FL_SINGLETON);
return (VALUE)clone;
}
@@ -148,30 +121,6 @@ rb_singleton_class_attached(klass, obj)
}
VALUE
-rb_make_metaclass(obj, super)
- VALUE obj, super;
-{
- VALUE klass = rb_class_boot(super);
- FL_SET(klass, FL_SINGLETON);
- RBASIC(obj)->klass = klass;
- rb_singleton_class_attached(klass, obj);
- if (BUILTIN_TYPE(obj) == T_CLASS && FL_TEST(obj, FL_SINGLETON)) {
- RBASIC(klass)->klass = klass;
- RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
- }
- else {
- VALUE metasuper = RBASIC(rb_class_real(super))->klass;
-
- /* metaclass of a superclass may be NULL at boot time */
- if (metasuper) {
- RBASIC(klass)->klass = metasuper;
- }
- }
-
- return klass;
-}
-
-VALUE
rb_define_class_id(id, super)
ID id;
VALUE super;
@@ -180,32 +129,15 @@ rb_define_class_id(id, super)
if (!super) super = rb_cObject;
klass = rb_class_new(super);
- rb_make_metaclass(klass, RBASIC(super)->klass);
+ rb_name_class(klass, id);
+ /* make metaclass */
+ RBASIC(klass)->klass = rb_singleton_class_new(RBASIC(super)->klass);
+ rb_singleton_class_attached(RBASIC(klass)->klass, klass);
+ rb_funcall(super, rb_intern("inherited"), 1, klass);
return klass;
}
-void
-rb_check_inheritable(super)
- VALUE super;
-{
- if (TYPE(super) != T_CLASS) {
- rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
- rb_obj_classname(super));
- }
- if (RBASIC(super)->flags & FL_SINGLETON) {
- rb_raise(rb_eTypeError, "can't make subclass of virtual class");
- }
-}
-
-VALUE
-rb_class_inherited(super, klass)
- VALUE super, klass;
-{
- if (!super) super = rb_cObject;
- return rb_funcall(super, rb_intern("inherited"), 1, klass);
-}
-
VALUE
rb_define_class(name, super)
const char *name;
@@ -215,24 +147,9 @@ rb_define_class(name, super)
ID id;
id = rb_intern(name);
- if (rb_const_defined(rb_cObject, id)) {
- klass = rb_const_get(rb_cObject, id);
- if (TYPE(klass) != T_CLASS) {
- rb_raise(rb_eTypeError, "%s is not a class", name);
- }
- if (rb_class_real(RCLASS(klass)->super) != super) {
- rb_name_error(id, "%s is already defined", name);
- }
- return klass;
- }
- if (!super) {
- rb_warn("no super class for `%s', Object assumed", name);
- }
klass = rb_define_class_id(id, super);
+
st_add_direct(rb_class_tbl, id, klass);
- rb_name_class(klass, id);
- rb_const_set(rb_cObject, id, klass);
- rb_class_inherited(super, klass);
return klass;
}
@@ -247,24 +164,9 @@ rb_define_class_under(outer, name, super)
ID id;
id = rb_intern(name);
- if (rb_const_defined_at(outer, id)) {
- klass = rb_const_get_at(outer, id);
- if (TYPE(klass) != T_CLASS) {
- rb_raise(rb_eTypeError, "%s is not a class", name);
- }
- if (rb_class_real(RCLASS(klass)->super) != super) {
- rb_name_error(id, "%s is already defined", name);
- }
- return klass;
- }
- if (!super) {
- rb_warn("no super class for `%s::%s', Object assumed",
- rb_class2name(outer), name);
- }
klass = rb_define_class_id(id, super);
- rb_set_class_path(klass, outer, name);
rb_const_set(outer, id, klass);
- rb_class_inherited(super, klass);
+ rb_set_class_path(klass, outer, name);
return klass;
}
@@ -303,15 +205,8 @@ rb_define_module(name)
ID id;
id = rb_intern(name);
- if (rb_const_defined(rb_cObject, id)) {
- module = rb_const_get(rb_cObject, id);
- if (TYPE(module) == T_MODULE)
- return module;
- rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module));
- }
module = rb_define_module_id(id);
st_add_direct(rb_class_tbl, id, module);
- rb_const_set(rb_cObject, id, module);
return module;
}
@@ -325,13 +220,6 @@ rb_define_module_under(outer, name)
ID id;
id = rb_intern(name);
- if (rb_const_defined_at(outer, id)) {
- module = rb_const_get_at(outer, id);
- if (TYPE(module) == T_MODULE)
- return module;
- rb_raise(rb_eTypeError, "%s::%s is not a module",
- rb_class2name(outer), rb_obj_classname(module));
- }
module = rb_define_module_id(id);
rb_const_set(outer, id, module);
rb_set_class_path(module, outer, name);
@@ -346,9 +234,6 @@ include_class_new(module, super)
NEWOBJ(klass, struct RClass);
OBJSETUP(klass, rb_cClass, T_ICLASS);
- if (BUILTIN_TYPE(module) == T_ICLASS) {
- module = RBASIC(module)->klass;
- }
if (!RCLASS(module)->iv_tbl) {
RCLASS(module)->iv_tbl = st_init_numtable();
}
@@ -361,8 +246,6 @@ include_class_new(module, super)
else {
RBASIC(klass)->klass = module;
}
- OBJ_INFECT(klass, module);
- OBJ_INFECT(klass, super);
return (VALUE)klass;
}
@@ -371,66 +254,45 @@ void
rb_include_module(klass, module)
VALUE klass, module;
{
- VALUE p, c;
+ VALUE p;
int changed = 0;
rb_frozen_class_p(klass);
if (!OBJ_TAINTED(klass)) {
rb_secure(4);
}
-
- if (TYPE(module) != T_MODULE) {
+ if (NIL_P(module)) return;
+ if (klass == module) return;
+
+ switch (TYPE(module)) {
+ case T_MODULE:
+ case T_CLASS:
+ case T_ICLASS:
+ break;
+ default:
Check_Type(module, T_MODULE);
}
- OBJ_INFECT(klass, module);
- c = klass;
while (module) {
- int superclass_seen = Qfalse;
-
- if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl)
- rb_raise(rb_eArgError, "cyclic include detected");
/* ignore if the module included already in superclasses */
for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
- switch (BUILTIN_TYPE(p)) {
- case T_ICLASS:
- if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
- if (!superclass_seen) {
- c = p; /* move insertion point */
- }
- goto skip;
+ if (BUILTIN_TYPE(p) == T_ICLASS &&
+ RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
+ if (RCLASS(module)->super) {
+ rb_include_module(p, RCLASS(module)->super);
}
- break;
- case T_CLASS:
- superclass_seen = Qtrue;
- break;
+ if (changed) rb_clear_cache();
+ return;
}
}
- c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);
- changed = 1;
- skip:
+ RCLASS(klass)->super = include_class_new(module, RCLASS(klass)->super);
+ klass = RCLASS(klass)->super;
module = RCLASS(module)->super;
+ changed = 1;
}
if (changed) rb_clear_cache();
}
-/*
- * call-seq:
- * mod.included_modules -> array
- *
- * Returns the list of modules included in <i>mod</i>.
- *
- * module Mixin
- * end
- *
- * module Outer
- * include Mixin
- * end
- *
- * Mixin.included_modules #=> []
- * Outer.included_modules #=> [Mixin]
- */
-
VALUE
rb_mod_included_modules(mod)
VALUE mod;
@@ -446,62 +308,12 @@ rb_mod_included_modules(mod)
return ary;
}
-/*
- * call-seq:
- * mod.include?(module) => true or false
- *
- * Returns <code>true</code> if <i>module</i> is included in
- * <i>mod</i> or one of <i>mod</i>'s ancestors.
- *
- * module A
- * end
- * class B
- * include A
- * end
- * class C < B
- * end
- * B.include?(A) #=> true
- * C.include?(A) #=> true
- * A.include?(A) #=> false
- */
-
-VALUE
-rb_mod_include_p(mod, mod2)
- VALUE mod;
- VALUE mod2;
-{
- VALUE p;
-
- Check_Type(mod2, T_MODULE);
- for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
- if (BUILTIN_TYPE(p) == T_ICLASS) {
- if (RBASIC(p)->klass == mod2) return Qtrue;
- }
- }
- return Qfalse;
-}
-
-/*
- * call-seq:
- * mod.ancestors -> array
- *
- * Returns a list of modules included in <i>mod</i> (including
- * <i>mod</i> itself).
- *
- * module Mod
- * include Math
- * include Comparable
- * end
- *
- * Mod.ancestors #=> [Mod, Comparable, Math]
- * Math.ancestors #=> [Math]
- */
-
VALUE
rb_mod_ancestors(mod)
VALUE mod;
{
- VALUE p, ary = rb_ary_new();
+ VALUE ary = rb_ary_new();
+ VALUE p;
for (p = mod; p; p = RCLASS(p)->super) {
if (FL_TEST(p, FL_SINGLETON))
@@ -516,164 +328,115 @@ rb_mod_ancestors(mod)
return ary;
}
-#define VISI(x) ((x)&NOEX_MASK)
-#define VISI_CHECK(x,f) (VISI(x) == (f))
-
static int
-ins_methods_push(name, type, ary, visi)
- ID name;
- long type;
+ins_methods_i(key, body, ary)
+ ID key;
+ NODE *body;
VALUE ary;
- long visi;
{
- if (type == -1) return ST_CONTINUE;
- switch (visi) {
- case NOEX_PRIVATE:
- case NOEX_PROTECTED:
- case NOEX_PUBLIC:
- visi = (type == visi);
- break;
- default:
- visi = (type != NOEX_PRIVATE);
- break;
+ if ((body->nd_noex&(NOEX_PRIVATE|NOEX_PROTECTED)) == 0) {
+ VALUE name = rb_str_new2(rb_id2name(key));
+
+ if (!rb_ary_includes(ary, name)) {
+ if (!body->nd_body) {
+ rb_ary_push(ary, Qnil);
+ }
+ rb_ary_push(ary, name);
+ }
}
- if (visi) {
- rb_ary_push(ary, rb_str_new2(rb_id2name(name)));
+ else if (body->nd_body && nd_type(body->nd_body) == NODE_ZSUPER) {
+ rb_ary_push(ary, Qnil);
+ rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
}
return ST_CONTINUE;
}
static int
-ins_methods_i(name, type, ary)
- ID name;
- long type;
- VALUE ary;
-{
- return ins_methods_push(name, type, ary, -1); /* everything but private */
-}
-
-static int
-ins_methods_prot_i(name, type, ary)
- ID name;
- long type;
- VALUE ary;
-{
- return ins_methods_push(name, type, ary, NOEX_PROTECTED);
-}
-
-static int
-ins_methods_priv_i(name, type, ary)
- ID name;
- long type;
+ins_methods_prot_i(key, body, ary)
+ ID key;
+ NODE *body;
VALUE ary;
{
- return ins_methods_push(name, type, ary, NOEX_PRIVATE);
-}
+ if (!body->nd_body) {
+ rb_ary_push(ary, Qnil);
+ rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+ }
+ else if (body->nd_noex & NOEX_PROTECTED) {
+ VALUE name = rb_str_new2(rb_id2name(key));
-static int
-ins_methods_pub_i(name, type, ary)
- ID name;
- long type;
- VALUE ary;
-{
- return ins_methods_push(name, type, ary, NOEX_PUBLIC);
+ if (!rb_ary_includes(ary, name)) {
+ rb_ary_push(ary, name);
+ }
+ }
+ else if (nd_type(body->nd_body) == NODE_ZSUPER) {
+ rb_ary_push(ary, Qnil);
+ rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+ }
+ return ST_CONTINUE;
}
static int
-method_entry(key, body, list)
+ins_methods_priv_i(key, body, ary)
ID key;
NODE *body;
- st_table *list;
+ VALUE ary;
{
- long type;
+ if (!body->nd_body) {
+ rb_ary_push(ary, Qnil);
+ rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
+ }
+ else if (body->nd_noex & NOEX_PRIVATE) {
+ VALUE name = rb_str_new2(rb_id2name(key));
- if (key == ID_ALLOCATOR) return ST_CONTINUE;
- if (!st_lookup(list, key, 0)) {
- if (!body->nd_body) type = -1; /* none */
- else type = VISI(body->nd_noex);
- st_add_direct(list, key, type);
+ if (!rb_ary_includes(ary, name)) {
+ rb_ary_push(ary, name);
+ }
+ }
+ else if (nd_type(body->nd_body) == NODE_ZSUPER) {
+ rb_ary_push(ary, Qnil);
+ rb_ary_push(ary, rb_str_new2(rb_id2name(key)));
}
return ST_CONTINUE;
}
static VALUE
-class_instance_method_list(argc, argv, mod, func)
- int argc;
- VALUE *argv;
+method_list(mod, option, func)
VALUE mod;
- int (*func) _((ID, long, VALUE));
+ int option;
+ int (*func)();
{
VALUE ary;
- int recur;
- st_table *list;
-
- if (argc == 0) {
- recur = Qtrue;
- }
- else {
- VALUE r;
- rb_scan_args(argc, argv, "01", &r);
- recur = RTEST(r);
- }
+ VALUE klass;
+ VALUE *p, *q, *pend;
- list = st_init_numtable();
- for (; mod; mod = RCLASS(mod)->super) {
- st_foreach(RCLASS(mod)->m_tbl, method_entry, (st_data_t)list);
- if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
- if (FL_TEST(mod, FL_SINGLETON)) continue;
- if (!recur) break;
- }
ary = rb_ary_new();
- st_foreach(list, func, ary);
- st_free_table(list);
-
+ for (klass = mod; klass; klass = RCLASS(klass)->super) {
+ st_foreach(RCLASS(klass)->m_tbl, func, ary);
+ if (!option) break;
+ }
+ p = q = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
+ while (p < pend) {
+ if (*p == Qnil) {
+ p+=2;
+ continue;
+ }
+ *q++ = *p++;
+ }
+ RARRAY(ary)->len = q - RARRAY(ary)->ptr;
return ary;
}
-/*
- * call-seq:
- * mod.instance_methods(include_super=true) => array
- *
- * Returns an array containing the names of public instance methods in
- * the receiver. For a module, these are the public methods; for a
- * class, they are the instance (not singleton) methods. With no
- * argument, or with an argument that is <code>false</code>, the
- * instance methods in <i>mod</i> are returned, otherwise the methods
- * in <i>mod</i> and <i>mod</i>'s superclasses are returned.
- *
- * module A
- * def method1() end
- * end
- * class B
- * def method2() end
- * end
- * class C < B
- * def method3() end
- * end
- *
- * A.instance_methods #=> ["method1"]
- * B.instance_methods(false) #=> ["method2"]
- * C.instance_methods(false) #=> ["method3"]
- * C.instance_methods(true).length #=> 43
- */
-
VALUE
rb_class_instance_methods(argc, argv, mod)
int argc;
VALUE *argv;
VALUE mod;
{
- return class_instance_method_list(argc, argv, mod, ins_methods_i);
-}
+ VALUE option;
-/*
- * call-seq:
- * mod.protected_instance_methods(include_super=true) => array
- *
- * Returns a list of the protected instance methods defined in
- * <i>mod</i>. If the optional parameter is not <code>false</code>, the
- * methods of any ancestors are included.
- */
+ rb_scan_args(argc, argv, "01", &option);
+ return method_list(mod, RTEST(option), ins_methods_i);
+}
VALUE
rb_class_protected_instance_methods(argc, argv, mod)
@@ -681,25 +444,11 @@ rb_class_protected_instance_methods(argc, argv, mod)
VALUE *argv;
VALUE mod;
{
- return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
-}
+ VALUE option;
-/*
- * call-seq:
- * mod.private_instance_methods(include_super=true) => array
- *
- * Returns a list of the private instance methods defined in
- * <i>mod</i>. If the optional parameter is not <code>false</code>, the
- * methods of any ancestors are included.
- *
- * module Mod
- * def method1() end
- * private :method1
- * def method2() end
- * end
- * Mod.instance_methods #=> ["method2"]
- * Mod.private_instance_methods #=> ["method1"]
- */
+ rb_scan_args(argc, argv, "01", &option);
+ return method_list(mod, RTEST(option), ins_methods_prot_i);
+}
VALUE
rb_class_private_instance_methods(argc, argv, mod)
@@ -707,87 +456,35 @@ rb_class_private_instance_methods(argc, argv, mod)
VALUE *argv;
VALUE mod;
{
- return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
-}
+ VALUE option;
-/*
- * call-seq:
- * mod.public_instance_methods(include_super=true) => array
- *
- * Returns a list of the public instance methods defined in <i>mod</i>.
- * If the optional parameter is not <code>false</code>, the methods of
- * any ancestors are included.
- */
-
-VALUE
-rb_class_public_instance_methods(argc, argv, mod)
- int argc;
- VALUE *argv;
- VALUE mod;
-{
- return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
+ rb_scan_args(argc, argv, "01", &option);
+ return method_list(mod, RTEST(option), ins_methods_priv_i);
}
-/*
- * call-seq:
- * obj.singleton_methods(all=true) => array
- *
- * Returns an array of the names of singleton methods for <i>obj</i>.
- * If the optional <i>all</i> parameter is true, the list will include
- * methods in modules included in <i>obj</i>.
- *
- * module Other
- * def three() end
- * end
- *
- * class Single
- * def Single.four() end
- * end
- *
- * a = Single.new
- *
- * def a.one()
- * end
- *
- * class << a
- * include Other
- * def two()
- * end
- * end
- *
- * Single.singleton_methods #=> ["four"]
- * a.singleton_methods(false) #=> ["two", "one"]
- * a.singleton_methods #=> ["two", "one", "three"]
- */
-
VALUE
-rb_obj_singleton_methods(argc, argv, obj)
- int argc;
- VALUE *argv;
+rb_obj_singleton_methods(obj)
VALUE obj;
{
- VALUE recur, ary, klass;
- st_table *list;
+ VALUE ary;
+ VALUE klass;
+ VALUE *p, *q, *pend;
- rb_scan_args(argc, argv, "01", &recur);
- if (argc == 0) {
- recur = Qtrue;
- }
+ ary = rb_ary_new();
klass = CLASS_OF(obj);
- list = st_init_numtable();
- if (klass && FL_TEST(klass, FL_SINGLETON)) {
- st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
+ while (klass && FL_TEST(klass, FL_SINGLETON)) {
+ st_foreach(RCLASS(klass)->m_tbl, ins_methods_i, ary);
klass = RCLASS(klass)->super;
}
- if (RTEST(recur)) {
- while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
- st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
- klass = RCLASS(klass)->super;
+ p = q = RARRAY(ary)->ptr; pend = p + RARRAY(ary)->len;
+ while (p < pend) {
+ if (*p == Qnil) {
+ p+=2;
+ continue;
}
+ *q++ = *p++;
}
- ary = rb_ary_new();
- st_foreach(list, ins_methods_i, ary);
- st_free_table(list);
+ RARRAY(ary)->len = q - RARRAY(ary)->ptr;
return ary;
}
@@ -799,7 +496,7 @@ rb_define_method_id(klass, name, func, argc)
VALUE (*func)();
int argc;
{
- rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
+ rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC|NOEX_CFUNC);
}
void
@@ -810,10 +507,10 @@ rb_define_method(klass, name, func, argc)
int argc;
{
ID id = rb_intern(name);
- int ex = NOEX_PUBLIC;
-
- rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
+ rb_add_method(klass, id, NEW_CFUNC(func, argc),
+ ((name[0] == 'i' && id == rb_intern("initialize"))?
+ NOEX_PRIVATE:NOEX_PUBLIC)|NOEX_CFUNC);
}
void
@@ -823,7 +520,8 @@ rb_define_protected_method(klass, name, func, argc)
VALUE (*func)();
int argc;
{
- rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
+ rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc),
+ NOEX_PROTECTED|NOEX_CFUNC);
}
void
@@ -833,7 +531,8 @@ rb_define_private_method(klass, name, func, argc)
VALUE (*func)();
int argc;
{
- rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
+ rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc),
+ NOEX_PRIVATE|NOEX_CFUNC);
}
void
@@ -844,11 +543,13 @@ rb_undef_method(klass, name)
rb_add_method(klass, rb_intern(name), 0, NOEX_UNDEF);
}
-#define SPECIAL_SINGLETON(x,c) do {\
- if (obj == (x)) {\
- return c;\
+#define SPECIAL_SINGLETON(x,c) if (obj == (x)) {\
+ if (!FL_TEST(c, FL_SINGLETON)) {\
+ c = rb_singleton_class_new(c);\
+ rb_singleton_class_attached(c,obj);\
}\
-} while (0)
+ return c;\
+}
VALUE
rb_singleton_class(obj)
@@ -863,16 +564,17 @@ rb_singleton_class(obj)
SPECIAL_SINGLETON(Qnil, rb_cNilClass);
SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
- rb_bug("unknown immediate %ld", obj);
+ rb_bug("unknown immediate %d", obj);
}
DEFER_INTS;
- if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
- rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) {
+ if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON)) {
klass = RBASIC(obj)->klass;
}
else {
- klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
+ klass = rb_singleton_class_new(RBASIC(obj)->klass);
+ RBASIC(obj)->klass = klass;
+ rb_singleton_class_attached(klass, obj);
}
if (OBJ_TAINTED(obj)) {
OBJ_TAINT(klass);
@@ -943,11 +645,11 @@ rb_define_attr(klass, name, read, write)
int
#ifdef HAVE_STDARG_PROTOTYPES
-rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
+rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
#else
rb_scan_args(argc, argv, fmt, va_alist)
int argc;
- const VALUE *argv;
+ VALUE *argv;
const char *fmt;
va_dcl
#endif
@@ -964,7 +666,7 @@ rb_scan_args(argc, argv, fmt, va_alist)
if (ISDIGIT(*p)) {
n = *p - '0';
if (n > argc)
- rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
+ rb_raise(rb_eArgError, "wrong # of arguments (%d for %d)", argc, n);
for (i=0; i<n; i++) {
var = va_arg(vargs, VALUE*);
if (var) *var = argv[i];
@@ -1005,7 +707,7 @@ rb_scan_args(argc, argv, fmt, va_alist)
if (*p == '&') {
var = va_arg(vargs, VALUE*);
if (rb_block_given_p()) {
- *var = rb_block_proc();
+ *var = rb_f_lambda();
}
else {
*var = Qnil;
@@ -1019,7 +721,7 @@ rb_scan_args(argc, argv, fmt, va_alist)
}
if (argc > i) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i);
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)", argc, i);
}
return argc;
diff --git a/common.mk b/common.mk
deleted file mode 100644
index f751fecfb5..0000000000
--- a/common.mk
+++ /dev/null
@@ -1,446 +0,0 @@
-bin: $(PROGRAM) $(WPROGRAM)
-lib: $(LIBRUBY)
-dll: $(LIBRUBY_SO)
-
-RUBYOPT =
-
-STATIC_RUBY = static-ruby
-
-EXTCONF = extconf.rb
-RBCONFIG = ./.rbconfig.time
-LIBRUBY_EXTS = ./.libruby-with-ext.time
-RDOCOUT = $(EXTOUT)/rdoc
-
-DMYEXT = dmyext.$(OBJEXT)
-MAINOBJ = main.$(OBJEXT)
-EXTOBJS =
-DLDOBJS = $(DMYEXT)
-
-OBJS = array.$(OBJEXT) \
- bignum.$(OBJEXT) \
- class.$(OBJEXT) \
- compar.$(OBJEXT) \
- dir.$(OBJEXT) \
- dln.$(OBJEXT) \
- enum.$(OBJEXT) \
- error.$(OBJEXT) \
- eval.$(OBJEXT) \
- file.$(OBJEXT) \
- gc.$(OBJEXT) \
- hash.$(OBJEXT) \
- inits.$(OBJEXT) \
- io.$(OBJEXT) \
- marshal.$(OBJEXT) \
- math.$(OBJEXT) \
- numeric.$(OBJEXT) \
- object.$(OBJEXT) \
- pack.$(OBJEXT) \
- parse.$(OBJEXT) \
- process.$(OBJEXT) \
- prec.$(OBJEXT) \
- random.$(OBJEXT) \
- range.$(OBJEXT) \
- re.$(OBJEXT) \
- regex.$(OBJEXT) \
- ruby.$(OBJEXT) \
- signal.$(OBJEXT) \
- sprintf.$(OBJEXT) \
- st.$(OBJEXT) \
- string.$(OBJEXT) \
- struct.$(OBJEXT) \
- time.$(OBJEXT) \
- util.$(OBJEXT) \
- variable.$(OBJEXT) \
- version.$(OBJEXT) \
- $(MISSING)
-
-SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
- --extout="$(EXTOUT)" \
- --make="$(MAKE)" \
- --mflags="$(MFLAGS)" \
- --make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) --
-INSTRUBY_ARGS = $(SCRIPT_ARGS) --installed-list $(INSTALLED_LIST)
-
-PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
- $(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
-
-TESTSDIR = $(srcdir)/test
-TESTWORKDIR = testwork
-
-all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
- @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
-prog: $(PROGRAM) $(WPROGRAM)
-
-miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
-
-$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
-
-$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE)
-
-$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
-
-$(LIBRUBY_EXTS):
- @exit > $@
-
-$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
- @$(RM) $@
- $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-
-ruby.imp: $(OBJS)
- @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
-
-install: install-nodoc $(RDOCTARGET)
-install-all: install-nodoc install-doc
-
-install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
-pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc:
- $(MINIRUBY) $(srcdir)/instruby.rb $(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:
- $(MINIRUBY) $(srcdir)/instruby.rb $(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:
- $(MINIRUBY) $(srcdir)/instruby.rb $(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:
- $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin --install=ext-arch
-post-install-arch:: post-install-bin post-install-ext-arch
-
-install-comm: pre-install-comm do-install-comm post-install-comm
-pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man
-do-install-comm:
- $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
-post-install-comm:: post-install-lib post-install-ext-comm post-install-man
-
-install-bin: pre-install-bin do-install-bin post-install-bin
-pre-install-bin:: install-prereq
-do-install-bin:
- $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=bin
-post-install-bin::
- @$(NULLCMD)
-
-install-lib: pre-install-lib do-install-lib post-install-lib
-pre-install-lib:: install-prereq
-do-install-lib:
- $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=lib
-post-install-lib::
- @$(NULLCMD)
-
-install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
-pre-install-ext-comm:: install-prereq
-do-install-ext-comm:
- $(MINIRUBY) $(srcdir)/instruby.rb $(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:
- $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=ext-arch
-post-install-ext-arch::
- @$(NULLCMD)
-
-install-man: pre-install-man do-install-man post-install-man
-pre-install-man:: install-prereq
-do-install-man:
- $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
-post-install-man::
- @$(NULLCMD)
-
-what-where: no-install
-no-install: no-install-nodoc no-install-doc
-what-where-all: no-install-all
-no-install-all: no-install-nodoc
-
-what-where-nodoc: no-install-nodoc
-no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
-pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
-dont-install-nodoc:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(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:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
-post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
-
-what-where-ext: no-install-ext
-no-install-ext: pre-no-install-ext dont-install-ext post-no-install-ext
-pre-no-install-ext:: pre-no-install-ext-arch pre-no-install-ext-comm
-dont-install-ext:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext
-post-no-install-ext:: post-no-install-ext-arch post-no-install-ext-comm
-
-what-where-arch: no-install-arch
-no-install-arch: pre-no-install-arch dont-install-arch post-no-install-arch
-pre-no-install-arch:: pre-no-install-bin pre-no-install-ext-arch
-dont-install-arch:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin --install=ext-arch
-post-no-install-arch:: post-no-install-lib post-no-install-man post-no-install-ext-arch
-
-what-where-comm: no-install-comm
-no-install-comm: pre-no-install-comm dont-install-comm post-no-install-comm
-pre-no-install-comm:: pre-no-install-lib pre-no-install-ext-comm pre-no-install-man
-dont-install-comm:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
-post-no-install-comm:: post-no-install-lib post-no-install-ext-comm post-no-install-man
-
-what-where-bin: no-install-bin
-no-install-bin: pre-no-install-bin dont-install-bin post-no-install-bin
-pre-no-install-bin:: install-prereq
-dont-install-bin:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=bin
-post-no-install-bin::
- @$(NULLCMD)
-
-what-where-lib: no-install-lib
-no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib
-pre-no-install-lib:: install-prereq
-dont-install-lib:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=lib
-post-no-install-lib::
- @$(NULLCMD)
-
-what-where-ext-comm: no-install-ext-comm
-no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm
-pre-no-install-ext-comm:: install-prereq
-dont-install-ext-comm:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-comm
-post-no-install-ext-comm::
- @$(NULLCMD)
-
-what-where-ext-arch: no-install-ext-arch
-no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch
-pre-no-install-ext-arch:: install-prereq
-dont-install-ext-arch:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=ext-arch
-post-no-install-ext-arch::
- @$(NULLCMD)
-
-what-where-man: no-install-man
-no-install-man: pre-no-install-man dont-install-man post-no-install-man
-pre-no-install-man:: install-prereq
-dont-install-man:
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
-post-no-install-man::
- @$(NULLCMD)
-
-install-doc: rdoc pre-install-doc do-install-doc post-install-doc
-pre-install-doc:: install-prereq
-do-install-doc: $(PROGRAM)
- $(MINIRUBY) $(srcdir)/instruby.rb $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
-post-install-doc::
- @$(NULLCMD)
-
-rdoc: $(PROGRAM) PHONY
- @echo Generating RDoc documentation
- $(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
-
-what-where-doc: no-install-doc
-no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
-pre-no-install-doc:: install-prereq
-dont-install-doc::
- $(MINIRUBY) $(srcdir)/instruby.rb -n $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
-post-no-install-doc::
- @$(NULLCMD)
-
-install-prereq:
- @exit > $(INSTALLED_LIST)
-
-clean: clean-ext clean-local
-clean-local::
- @$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
- @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-clean-ext:
- @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean
-
-distclean: distclean-ext distclean-local
-distclean-local:: clean-local
- @$(RM) $(MKFILES) config.h rbconfig.rb
- @$(RM) config.cache config.log config.status
- @$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP)
-distclean-ext:
- @-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean
-
-realclean:: distclean
- @$(RM) parse.c lex.c
-
-check: test test-all
-
-test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
- @$(MINIRUBY) $(srcdir)/rubytest.rb
-
-test-all:
- $(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
-
-extconf:
- $(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)"
- $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
- @$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
- -install_name=$(RUBY_INSTALL_NAME) \
- -so_name=$(RUBY_SO_NAME) rbconfig.rb
-
-.PRECIOUS: $(MKFILES)
-
-.PHONY: test install install-nodoc install-doc dist
-
-PHONY:
-
-{$(VPATH)}parse.c: parse.y
-
-acosh.$(OBJEXT): {$(VPATH)}acosh.c
-alloca.$(OBJEXT): {$(VPATH)}alloca.c
-crypt.$(OBJEXT): {$(VPATH)}crypt.c
-dup2.$(OBJEXT): {$(VPATH)}dup2.c
-erf.$(OBJEXT): {$(VPATH)}erf.c
-finite.$(OBJEXT): {$(VPATH)}finite.c
-flock.$(OBJEXT): {$(VPATH)}flock.c
-memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
-memmove.$(OBJEXT): {$(VPATH)}memmove.c
-mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-vsnprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
-strcasecmp.$(OBJEXT): {$(VPATH)}strcasecmp.c
-strncasecmp.$(OBJEXT): {$(VPATH)}strncasecmp.c
-strchr.$(OBJEXT): {$(VPATH)}strchr.c
-strdup.$(OBJEXT): {$(VPATH)}strdup.c
-strerror.$(OBJEXT): {$(VPATH)}strerror.c
-strftime.$(OBJEXT): {$(VPATH)}strftime.c
-strstr.$(OBJEXT): {$(VPATH)}strstr.c
-strtod.$(OBJEXT): {$(VPATH)}strtod.c
-strtol.$(OBJEXT): {$(VPATH)}strtol.c
-strtoul.$(OBJEXT): {$(VPATH)}strtoul.c
-nt.$(OBJEXT): {$(VPATH)}nt.c
-x68.$(OBJEXT): {$(VPATH)}x68.c
-os2.$(OBJEXT): {$(VPATH)}os2.c
-dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
-ia64.$(OBJEXT): {$(VPATH)}ia64.s
- $(CC) $(CFLAGS) -c $<
-
-# when I use -I., there is confliction at "OpenFile"
-# so, set . into environment varible "include"
-win32.$(OBJEXT): {$(VPATH)}win32.c
-
-###
-
-array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}util.h {$(VPATH)}st.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
-compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}util.h
-dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}dln.h
-dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
- config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}dln.h
-dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}node.h {$(VPATH)}util.h
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}env.h {$(VPATH)}st.h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
-file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
- {$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
- {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h
-hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
-inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
- {$(VPATH)}env.h
-main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \
- {$(VPATH)}missing.h
-object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}st.h {$(VPATH)}util.h
-pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \
- {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
-prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h {$(VPATH)}st.h
-random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}re.h {$(VPATH)}regex.h
-regex.$(OBJEXT): {$(VPATH)}regex.c config.h {$(VPATH)}regex.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
-signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}rubysig.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
-string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}re.h {$(VPATH)}regex.h
-struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
-version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
- {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
- {$(VPATH)}version.h
-
-dist: $(PROGRAM)
- $(RUNRUBY) $(srcdir)/distruby.rb
diff --git a/compar.c b/compar.c
index 1488b2c65d..3cebc30a80 100644
--- a/compar.c
+++ b/compar.c
@@ -6,7 +6,7 @@
$Date$
created at: Thu Aug 26 14:39:48 JST 1993
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
@@ -16,68 +16,23 @@ VALUE rb_mComparable;
static ID cmp;
-int
-rb_cmpint(val, a, b)
- VALUE val, a, b;
-{
- if (NIL_P(val)) {
- rb_cmperr(a, b);
- }
- if (FIXNUM_P(val)) return FIX2INT(val);
- if (TYPE(val) == T_BIGNUM) {
- if (RBIGNUM(val)->sign) return 1;
- return -1;
- }
- if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
- if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
- return 0;
-}
-
-void
-rb_cmperr(x, y)
- VALUE x, y;
-{
- const char *classname;
-
- if (SPECIAL_CONST_P(y)) {
- y = rb_inspect(y);
- classname = StringValuePtr(y);
- }
- else {
- classname = rb_obj_classname(y);
- }
- rb_raise(rb_eArgError, "comparison of %s with %s failed",
- rb_obj_classname(x), classname);
-}
-
-#define cmperr() (rb_cmperr(x, y), Qnil)
-
static VALUE
cmp_eq(a)
VALUE *a;
{
VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
+ int t = NUM2INT(c);
- if (NIL_P(c)) return Qnil;
- if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
+ if (t == 0) return Qtrue;
return Qfalse;
}
static VALUE
cmp_failed()
{
- return Qnil;
+ return Qfalse;
}
-/*
- * call-seq:
- * obj == other => true or false
- *
- * Compares two objects based on the receiver's <code><=></code>
- * method, returning true if it returns 0. Also returns true if
- * _obj_ and _other_ are the same object.
- */
-
static VALUE
cmp_equal(x, y)
VALUE x, y;
@@ -87,147 +42,68 @@ cmp_equal(x, y)
if (x == y) return Qtrue;
a[0] = x; a[1] = y;
- return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
+ return rb_rescue2(cmp_eq, (VALUE)a, cmp_failed, 0,
+ rb_eStandardError, rb_eNameError, 0);
}
-/*
- * call-seq:
- * obj > other => true or false
- *
- * Compares two objects based on the receiver's <code><=></code>
- * method, returning true if it returns 1.
- */
-
static VALUE
cmp_gt(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ int t = NUM2INT(c);
- if (NIL_P(c)) return cmperr();
- if (rb_cmpint(c, x, y) > 0) return Qtrue;
+ if (t > 0) return Qtrue;
return Qfalse;
}
-/*
- * call-seq:
- * obj >= other => true or false
- *
- * Compares two objects based on the receiver's <code><=></code>
- * method, returning true if it returns 0 or 1.
- */
-
static VALUE
cmp_ge(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ int t = NUM2INT(c);
- if (NIL_P(c)) return cmperr();
- if (rb_cmpint(c, x, y) >= 0) return Qtrue;
+ if (t >= 0) return Qtrue;
return Qfalse;
}
-/*
- * call-seq:
- * obj < other => true or false
- *
- * Compares two objects based on the receiver's <code><=></code>
- * method, returning true if it returns -1.
- */
-
static VALUE
cmp_lt(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ int t = NUM2INT(c);
- if (NIL_P(c)) return cmperr();
- if (rb_cmpint(c, x, y) < 0) return Qtrue;
+ if (t < 0) return Qtrue;
return Qfalse;
}
-
-/*
- * call-seq:
- * obj <= other => true or false
- *
- * Compares two objects based on the receiver's <code><=></code>
- * method, returning true if it returns -1 or 0.
- */
-
static VALUE
cmp_le(x, y)
VALUE x, y;
{
VALUE c = rb_funcall(x, cmp, 1, y);
+ int t = NUM2INT(c);
- if (NIL_P(c)) return cmperr();
- if (rb_cmpint(c, x, y) <= 0) return Qtrue;
+ if (t <= 0) return Qtrue;
return Qfalse;
}
-/*
- * call-seq:
- * obj.between?(min, max) => true or false
- *
- * Returns <code>false</code> if <i>obj</i> <code><=></code>
- * <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
- * <i>max</i> is greater than zero, <code>true</code> otherwise.
- *
- * 3.between?(1, 5) #=> true
- * 6.between?(1, 5) #=> false
- * 'cat'.between?('ant', 'dog') #=> true
- * 'gnu'.between?('ant', 'dog') #=> false
- *
- */
-
static VALUE
cmp_between(x, min, max)
VALUE x, min, max;
{
- if (RTEST(cmp_lt(x, min))) return Qfalse;
- if (RTEST(cmp_gt(x, max))) return Qfalse;
+ VALUE c = rb_funcall(x, cmp, 1, min);
+ long t = NUM2LONG(c);
+ if (t < 0) return Qfalse;
+
+ c = rb_funcall(x, cmp, 1, max);
+ t = NUM2LONG(c);
+ if (t > 0) return Qfalse;
return Qtrue;
}
-/*
- * The <code>Comparable</code> mixin is used by classes whose objects
- * may be ordered. The class must define the <code><=></code> operator,
- * which compares the receiver against another object, returning -1, 0,
- * or +1 depending on whether the receiver is less than, equal to, or
- * greater than the other object. <code>Comparable</code> uses
- * <code><=></code> to implement the conventional comparison operators
- * (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
- * and <code>></code>) and the method <code>between?</code>.
- *
- * class SizeMatters
- * include Comparable
- * attr :str
- * def <=>(anOther)
- * str.size <=> anOther.str.size
- * end
- * def initialize(str)
- * @str = str
- * end
- * def inspect
- * @str
- * end
- * end
- *
- * s1 = SizeMatters.new("Z")
- * s2 = SizeMatters.new("YY")
- * s3 = SizeMatters.new("XXX")
- * s4 = SizeMatters.new("WWWW")
- * s5 = SizeMatters.new("VVVVV")
- *
- * s1 < s2 #=> true
- * s4.between?(s1, s3) #=> false
- * s4.between?(s3, s5) #=> true
- * [ s3, s2, s5, s4, s1 ].sort #=> [Z, YY, XXX, WWWW, VVVVV]
- *
- */
-
void
Init_Comparable()
{
diff --git a/config.guess b/config.guess
index dd1688b7b5..c55635bd7b 100644
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-06-11'
-
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
+# Free Software Foundation, Inc.
+#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -24,291 +22,113 @@ timestamp='2004-06-11'
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
# exits with 0. Otherwise, it exits with 1.
#
# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
- --version | -v )
- echo "$version" ; exit 0 ;;
- --help | --h* | -h )
- echo "$usage"; exit 0 ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help" >&2
- exit 1 ;;
- * )
- break ;;
- esac
-done
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
-if test $# != 0; then
- echo "$me: too many arguments$help" >&2
- exit 1
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+ if test x"$HOST_CC" != x; then
+ CC_FOR_BUILD="$HOST_CC"
+ else
+ if test x"$CC" != x; then
+ CC_FOR_BUILD="$CC"
+ else
+ CC_FOR_BUILD=cc
+ fi
+ fi
fi
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
+# Modified for Human68k by K.Okabe 1997.07.09
+# Last change: 1997.07.09
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
- if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+case "$KSH_VERSION" in
+*X6*)
+ echo m68k-sharp-human
+ exit 0 ;;
+*)
+ ;;
+esac
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
+# (ghazi@noc.rutgers.edu 8/24/94.)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
PATH=$PATH:/.attbin ; export PATH
fi
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
+
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- #
- # Note: NetBSD doesn't particularly care about the vendor
- # portion of the name. We always set it to "unknown".
- sysctl="sysctl -n hw.machine_arch"
- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- case "${UNAME_MACHINE_ARCH}" in
- armeb) machine=armeb-unknown ;;
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
- case "${UNAME_MACHINE_ARCH}" in
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
- else
- os=netbsdelf
- fi
- ;;
- *)
- os=netbsd
- ;;
- esac
- # The OS release
- # Debian GNU/NetBSD machines have a different userland, and
- # thus, need a distinct triplet. However, they do not need
- # kernel version information, so it can be replaced with a
- # suitable tag, in the style of linux-gnu.
- case "${UNAME_VERSION}" in
- Debian*)
- release='-gnu'
- ;;
- *)
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- ;;
- esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit 0 ;;
- amd64:OpenBSD:*:*)
- echo x86_64-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- cats:OpenBSD:*:*)
- echo arm-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- luna88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- *:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
- *:MirBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
- exit 0 ;;
+ *:OS/2:*:*)
+ echo "i386-pc-os2_emx"
+ exit 0;;
alpha:OSF1:*:*)
- case $UNAME_RELEASE in
- *4.0)
+ if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
- # types through head -n 1, so we only detect the type of CPU 0.
- ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
- case "$ALPHA_CPU_TYPE" in
- "EV4 (21064)")
- UNAME_MACHINE="alpha" ;;
- "EV4.5 (21064)")
- UNAME_MACHINE="alpha" ;;
- "LCA4 (21066/21068)")
- UNAME_MACHINE="alpha" ;;
- "EV5 (21164)")
- UNAME_MACHINE="alphaev5" ;;
- "EV5.6 (21164A)")
- UNAME_MACHINE="alphaev56" ;;
- "EV5.6 (21164PC)")
- UNAME_MACHINE="alphapca56" ;;
- "EV5.7 (21164PC)")
- UNAME_MACHINE="alphapca57" ;;
- "EV6 (21264)")
- UNAME_MACHINE="alphaev6" ;;
- "EV6.7 (21264A)")
- UNAME_MACHINE="alphaev67" ;;
- "EV6.8CB (21264C)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8AL (21264B)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.8CX (21264D)")
- UNAME_MACHINE="alphaev68" ;;
- "EV6.9A (21264/EV69A)")
- UNAME_MACHINE="alphaev69" ;;
- "EV7 (21364)")
- UNAME_MACHINE="alphaev7" ;;
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
- # A Pn.n version is a patched version.
+ fi
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
+ cat <<EOF >$dummy.s
+ .globl main
+ .ent main
+main:
+ .frame \$30,0,\$26,0
+ .prologue 0
+ .long 0x47e03d80 # implver $0
+ lda \$2,259
+ .long 0x47e20c21 # amask $2,$1
+ srl \$1,8,\$2
+ sll \$2,2,\$2
+ sll \$0,3,\$0
+ addl \$1,\$0,\$0
+ addl \$2,\$0,\$0
+ ret \$31,(\$26),1
+ .end main
+EOF
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy
+ case "$?" in
+ 7)
+ UNAME_MACHINE="alpha"
+ ;;
+ 15)
+ UNAME_MACHINE="alphaev5"
+ ;;
+ 14)
+ UNAME_MACHINE="alphaev56"
+ ;;
+ 10)
+ UNAME_MACHINE="alphapca56"
+ ;;
+ 16)
+ UNAME_MACHINE="alphaev6"
+ ;;
+ esac
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -320,24 +140,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo alpha-dec-winnt3.5
exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
+ echo m68k-cbm-sysv4
exit 0;;
+ amiga:NetBSD:*:*)
+ echo m68k-cbm-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
+ arc64:OpenBSD:*:*)
+ echo mips64el-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hkmips:OpenBSD:*:*)
+ echo mips-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mips-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ arm32:NetBSD:*:*)
+ echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ SR2?01:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
@@ -351,13 +189,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
- esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
@@ -386,7 +217,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo m68k-sun-sunos${UNAME_RELEASE}
exit 0 ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
@@ -400,9 +231,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;;
+ atari*:NetBSD:*:*)
+ echo m68k-atari-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
+ # "atarist" or "atariste" at least should have a processor
# > m68000). The system name ranges from "MiNT" over "FreeMiNT"
# to the lowercase version "mint" (or "freemint"). Finally
# the system name "TOS" denotes a system which is actually not
@@ -426,12 +263,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
+ sun3*:NetBSD:*:*)
+ echo m68k-sun-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3*:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:NetBSD:*:*)
+ echo m68k-apple-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
+ macppc:NetBSD:*:*)
+ echo powerpc-apple-netbsd${UNAME_RELEASE}
+ exit 0 ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
exit 0 ;;
@@ -445,10 +300,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#ifdef __cplusplus
-#include <stdio.h> /* for printf() prototype */
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
@@ -467,20 +320,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD $dummy.c -o $dummy \
+ && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
- exit 0 ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit 0 ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
exit 0 ;;
@@ -496,18 +341,15 @@ EOF
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
- [ ${TARGET_BINARY_INTERFACE}x = x ]
- then
+ if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+ -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
else
- echo i586-dg-dgux${UNAME_RELEASE}
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
fi
+ else echo i586-dg-dgux${UNAME_RELEASE}
+ fi
exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
@@ -528,20 +370,11 @@ EOF
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i*86:AIX:*:*)
+ i?86:AIX:*:*)
echo i386-ibm-aix
exit 0 ;;
- ia64:AIX:*:*)
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
- fi
- echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
@@ -553,7 +386,8 @@ EOF
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
@@ -561,9 +395,9 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit 0 ;;
- *:AIX:*:[45])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ *:AIX:*:4)
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
@@ -571,7 +405,7 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
- IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ IBM_REV=4.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
exit 0 ;;
@@ -581,7 +415,7 @@ EOF
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
exit 0 ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
@@ -597,30 +431,11 @@ EOF
echo m68k-hp-bsd4.4
exit 0 ;;
9000/[34678]??:HP-UX:*:*)
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-
- #define _HPUX_SOURCE
+ sed 's/^ //' << EOF >$dummy.c
#include <stdlib.h>
#include <unistd.h>
@@ -651,29 +466,13 @@ EOF
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
- fi ;;
+ ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+ rm -f $dummy.c $dummy
esac
- if [ ${HP_ARCH} = "hppa2.0w" ]
- then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
- then
- HP_ARCH="hppa2.0w"
- else
- HP_ARCH="hppa64"
- fi
- fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
- ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ia64-hp-hpux${HPUX_REV}
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
3050*:HI-UX:*:*)
- eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
@@ -699,7 +498,8 @@ EOF
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -708,7 +508,7 @@ EOF
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
exit 0 ;;
- *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ *9??*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
@@ -717,7 +517,7 @@ EOF
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
exit 0 ;;
- i*86:OSF1:*:*)
+ i?86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
@@ -727,6 +527,9 @@ EOF
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
exit 0 ;;
+ hppa*:OpenBSD:*:*)
+ echo hppa-unknown-openbsd
+ exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
exit 0 ;;
@@ -745,39 +548,41 @@ EOF
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
exit 0 ;;
+ CRAY*X-MP:*:*:*)
+ echo xmp-cray-unicos
+ exit 0 ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo ymp-cray-unicos${UNAME_RELEASE}
exit 0 ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
- -e 's/\.[^.]*$/.X/'
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
exit 0 ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t90-cray-unicos${UNAME_RELEASE}
exit 0 ;;
CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo t3e-cray-unicosmk${UNAME_RELEASE}
exit 0 ;;
- *:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ CRAY-2:*:*:*)
+ echo cray2-cray-unicos
+ exit 0 ;;
+ F300:UNIX_System_V:*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ F301:UNIX_System_V:*:*)
+ echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+ exit 0 ;;
+ hp3[0-9][05]:NetBSD:*:*)
+ echo m68k-hp-netbsd${UNAME_RELEASE}
exit 0 ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
sparc*:BSD/OS:*:*)
@@ -787,21 +592,22 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
- # FreeBSD's kernel, but not the complete OS.
- case ${LIBC} in gnu) kernel_only='k' ;; esac
- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ if test -x /usr/bin/objformat; then
+ if test "elf" = "`/usr/bin/objformat`"; then
+ echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+ exit 0
+ fi
+ fi
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ *:NetBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ *:*:*BOW*:*)
+ echo i386-pc-bow
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -809,20 +615,11 @@ EOF
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i586-pc-interix
+ echo i386-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
@@ -834,178 +631,180 @@ EOF
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
*:GNU:*:*)
- # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit 0 ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- mips:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips
- #undef mipsel
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mipsel
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips
- #else
- CPU=
- #endif
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- ;;
- mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
- #undef mips64
- #undef mips64el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- CPU=mips64el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- CPU=mips64
- #else
- CPU=
- #endif
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit 0 ;;
- ppc64:Linux:*:*)
- echo powerpc64-unknown-linux-gnu
- exit 0 ;;
- alpha:Linux:*:*)
- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
- EV5) UNAME_MACHINE=alphaev5 ;;
- EV56) UNAME_MACHINE=alphaev56 ;;
- PCA56) UNAME_MACHINE=alphapca56 ;;
- PCA57) UNAME_MACHINE=alphapca56 ;;
- EV6) UNAME_MACHINE=alphaev6 ;;
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-unknown-linux-gnu ;;
- PA8*) echo hppa2.0-unknown-linux-gnu ;;
- *) echo hppa-unknown-linux-gnu ;;
+ *:Linux:*:*)
+ # uname on the ARM produces all sorts of strangeness, and we need to
+ # filter it out.
+ case "$UNAME_MACHINE" in
+ armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
+ arm* | sa110*) UNAME_MACHINE="arm" ;;
esac
- exit 0 ;;
- parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-unknown-linux-gnu
- exit 0 ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
- sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
- x86_64:Linux:*:*)
- echo x86_64-unknown-linux-gnu
- exit 0 ;;
- i*86:Linux:*:*)
+
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
- # Set LC_ALL=C to ensure ld outputs messages in English.
- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
- | sed -ne '/supported targets:/!d
+ ld_help_string=`cd /; ld --help 2>&1`
+ ld_supported_emulations=`echo $ld_help_string \
+ | sed -ne '/supported emulations:/!d
s/[ ][ ]*/ /g
- s/.*supported targets: *//
+ s/.*supported emulations: *//
s/ .*//
p'`
- case "$ld_supported_targets" in
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ case "$ld_supported_emulations" in
+ i?86linux) echo "${UNAME_MACHINE}-pc-linux-aout" ; exit 0 ;;
+ i?86coff) echo "${UNAME_MACHINE}-pc-linux-coff" ; exit 0 ;;
+ sparclinux) echo "${UNAME_MACHINE}-unknown-linux-aout" ; exit 0 ;;
+ armlinux) echo "${UNAME_MACHINE}-unknown-linux-aout" ; exit 0 ;;
+ m68klinux) echo "${UNAME_MACHINE}-unknown-linux-aout" ; exit 0 ;;
+ elf32ppc)
+ # Determine Lib Version
+ cat >$dummy.c <<EOF
+#include <features.h>
+#if defined(__GLIBC__)
+extern char __libc_version[];
+extern char __libc_release[];
+#endif
+main(argc, argv)
+ int argc;
+ char *argv[];
+{
+#if defined(__GLIBC__)
+ printf("%s %s\n", __libc_version, __libc_release);
+#else
+ printf("unkown\n");
+#endif
+ return 0;
+}
+EOF
+ LIBC=""
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy | grep 1\.99 > /dev/null
+ if test "$?" = 0 ; then
+ LIBC="-libc1"
+ fi
+ fi
+ rm -f $dummy.c $dummy
+ echo powerpc-unknown-linux${LIBC} ; exit 0 ;;
esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #ifdef __ELF__
- # ifdef __GLIBC__
- # if __GLIBC__ >= 2
- LIBC=gnu
- # else
- LIBC=gnulibc1
- # endif
- # else
- LIBC=gnulibc1
- # endif
- #else
- #ifdef __INTEL_COMPILER
- LIBC=gnu
- #else
- LIBC=gnuaout
- #endif
- #endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
+
+ if test "${UNAME_MACHINE}" = "alpha" ; then
+ sed 's/^ //' <<EOF >$dummy.s
+ .globl main
+ .ent main
+ main:
+ .frame \$30,0,\$26,0
+ .prologue 0
+ .long 0x47e03d80 # implver $0
+ lda \$2,259
+ .long 0x47e20c21 # amask $2,$1
+ srl \$1,8,\$2
+ sll \$2,2,\$2
+ sll \$0,3,\$0
+ addl \$1,\$0,\$0
+ addl \$2,\$0,\$0
+ ret \$31,(\$26),1
+ .end main
+EOF
+ LIBC=""
+ $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ if test "$?" = 0 ; then
+ ./$dummy
+ case "$?" in
+ 7)
+ UNAME_MACHINE="alpha"
+ ;;
+ 15)
+ UNAME_MACHINE="alphaev5"
+ ;;
+ 14)
+ UNAME_MACHINE="alphaev56"
+ ;;
+ 10)
+ UNAME_MACHINE="alphapca56"
+ ;;
+ 16)
+ UNAME_MACHINE="alphaev6"
+ ;;
+ esac
+
+ objdump --private-headers $dummy | \
+ grep ld.so.1 > /dev/null
+ if test "$?" = 0 ; then
+ LIBC="-libc1"
+ fi
+ fi
+ rm -f $dummy.s $dummy
+ echo ${UNAME_MACHINE}-unknown-linux${LIBC} ; exit 0
+ elif test "${UNAME_MACHINE}" = "mips" ; then
+ cat >$dummy.c <<EOF
+#ifdef __cplusplus
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __MIPSEB__
+ printf ("%s-unknown-linux\n", argv[1]);
+#endif
+#ifdef __MIPSEL__
+ printf ("%sel-unknown-linux\n", argv[1]);
+#endif
+ return 0;
+}
+EOF
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ else
+ # Either a pre-BFD a.out linker (linux-oldld)
+ # or one that does not give us useful --help.
+ # GCC wants to distinguish between linux-oldld and linux-aout.
+ # If ld does not provide *any* "supported emulations:"
+ # that means it is oldld.
+ echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+ test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-oldld" && exit 0
+
+ case "${UNAME_MACHINE}" in
+ i?86)
+ VENDOR=pc;
+ ;;
+ *)
+ VENDOR=unknown;
+ ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ cat >$dummy.c <<EOF
+#include <features.h>
+#ifdef __cplusplus
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+#ifdef __ELF__
+# ifdef __GLIBC__
+# if __GLIBC__ >= 2
+ printf ("%s-${VENDOR}-linux\n", argv[1]);
+# else
+ printf ("%s-${VENDOR}-linux-libc1\n", argv[1]);
+# endif
+# else
+ printf ("%s-${VENDOR}-linux-libc1\n", argv[1]);
+# endif
+#else
+ printf ("%s-${VENDOR}-linux-aout\n", argv[1]);
+#endif
+ return 0;
+}
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
- # sysname and nodename.
+ $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+ i?86:DYNIX/ptx:4*:*)
echo i386-sequent-sysv4
exit 0 ;;
- i*86:UNIX_SV:4.2MP:2.*)
+ i?86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
# I am not positive that other SVR4 systems won't match this,
@@ -1013,62 +812,47 @@ EOF
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
fi
exit 0 ;;
- i*86:*:5:[78]*)
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
- *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
- esac
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ i?86:*:5:7*)
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
+ (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
+ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
exit 0 ;;
- i*86:*:3.2:*)
+ i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
- (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
- (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
&& UNAME_MACHINE=i686
- (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
+ i?86:UnixWare:*:*)
+ if /bin/uname -X 2>/dev/null >/dev/null ; then
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ fi
+ echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION}
+ exit 0 ;;
pc:*:*:*)
- # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
@@ -1090,15 +874,9 @@ EOF
# "miniframe"
echo m68010-convergent-sysv
exit 0 ;;
- mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
- exit 0 ;;
- M680?0:D-NIX:5.3:*)
- echo m68k-diab-dnix
- exit 0 ;;
- M68*:*:R3V[5678]*:*)
+ M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1109,21 +887,21 @@ EOF
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& echo i486-ncr-sysv4 && exit 0 ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ m68*:LynxOS:2.*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
+ i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
- rs6000:LynxOS:2.*:*)
+ rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
exit 0 ;;
@@ -1141,8 +919,8 @@ EOF
echo ns32k-sni-sysv
fi
exit 0 ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
+ PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
echo i586-unisys-sysv4
exit 0 ;;
*:UNIX_System_V:4*:FTX*)
@@ -1154,23 +932,22 @@ EOF
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
exit 0 ;;
- *:VOS:*:*)
- # From Paul.Green@stratus.com.
- echo hppa1.1-stratus-vos
- exit 0 ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
exit 0 ;;
- news*:NEWS-OS:6*:*)
+ news*:NEWS-OS:*:6*)
echo mips-sony-newsos6
exit 0 ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
+ echo mips-nec-sysv`echo ${UNAME_RELEASE} | sed -n 's/\([.0-9]*\).*/\1/p'`
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit 0 ;;
+ DS/90*:*:*:V20*)
+ echo sparc-fujitsu-uxpds
+ exit 0 ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
exit 0 ;;
@@ -1186,9 +963,6 @@ EOF
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
exit 0 ;;
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
@@ -1196,76 +970,13 @@ EOF
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
- case `uname -p` in
- *86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
- if test "$UNAME_PROCESSOR" = "x86"; then
- UNAME_PROCESSOR=i386
- UNAME_MACHINE=pc
- fi
- echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit 0 ;;
- NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
- *:NonStop-UX:*:*)
- echo mips-compaq-nonstopux
- exit 0 ;;
- BS2000:POSIX*:*:*)
- echo bs2000-siemens-sysv
- exit 0 ;;
- DS/*:UNIX_System_V:*:*)
- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
- *:Plan9:*:*)
- # "uname -m" is not consistent, so use $cputype instead. 386
- # is converted to i386 for consistency with other x86
- # operating systems.
- if test "$cputype" = "386"; then
- UNAME_MACHINE=i386
- else
- UNAME_MACHINE="$cputype"
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit 0 ;;
- *:TENEX:*:*)
- echo pdp10-unknown-tenex
- exit 0 ;;
- KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
- echo pdp10-dec-tops20
- exit 0 ;;
- XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
- echo pdp10-xkl-tops20
- exit 0 ;;
- *:TOPS-20:*:*)
- echo pdp10-unknown-tops20
- exit 0 ;;
- *:ITS:*:*)
- echo pdp10-unknown-its
- exit 0 ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo `uname -p`-apple-darwin${UNAME_RELEASE}
exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
@@ -1352,24 +1063,11 @@ main ()
#endif
#if defined (vax)
-# if !defined (ultrix)
-# include <sys/param.h>
-# if defined (BSD)
-# if BSD == 43
- printf ("vax-dec-bsd4.3\n"); exit (0);
-# else
-# if BSD == 199006
- printf ("vax-dec-bsd4.3reno\n"); exit (0);
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# endif
-# else
- printf ("vax-dec-bsd\n"); exit (0);
-# endif
-# else
- printf ("vax-dec-ultrix\n"); exit (0);
-# endif
+#if !defined (ultrix)
+ printf ("vax-dec-bsd\n"); exit (0);
+#else
+ printf ("vax-dec-ultrix\n"); exit (0);
+#endif
#endif
#if defined (alliant) && defined (i860)
@@ -1380,7 +1078,8 @@ main ()
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
# Apollos put the system type in the environment.
@@ -1412,48 +1111,6 @@ then
esac
fi
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
- ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo = `(hostinfo) 2>/dev/null`
-/bin/universe = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
+#echo '(Unable to guess system type)' 1>&2
exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
index 506d3ab77f..1000343616 100644
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,6 @@
#! /bin/sh
-# Configuration validation subroutine script.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-06-11'
-
+# Configuration validation subroutine script, version 1.1.
+# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
@@ -29,9 +25,6 @@ timestamp='2004-06-11'
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Please send patches to <config-patches@gnu.org>. Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
@@ -52,74 +45,30 @@ timestamp='2004-06-11'
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
- $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
- -h, --help print this help, then exit
- -t, --time-stamp print date of last modification, then exit
- -v, --version print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions. There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
- --version | -v )
- echo "$version" ; exit 0 ;;
- --help | --h* | -h )
- echo "$usage"; exit 0 ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
- break ;;
- -* )
- echo "$me: invalid option $1$help"
- exit 1 ;;
-
- *local*)
- # First pass through any local machine types.
- echo $1
- exit 0;;
-
- * )
- break ;;
- esac
-done
+if [ x$1 = x ]
+then
+ echo Configuration name missing. 1>&2
+ echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+ echo "or $0 ALIAS" 1>&2
+ echo where ALIAS is a recognized configuration type. 1>&2
+ exit 1
+fi
-case $# in
- 0) echo "$me: missing argument$help" >&2
- exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
- exit 1;;
+# First pass through any local machine types.
+case $1 in
+ *local*)
+ echo $1
+ exit 0
+ ;;
+ *)
+ ;;
esac
# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ linux*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -145,7 +94,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple)
os=
basic_machine=$1
;;
@@ -156,17 +105,9 @@ case $os in
-scout)
;;
-wrs)
- os=-vxworks
- basic_machine=$1
- ;;
- -chorusos*)
- os=-chorusos
+ os=vxworks
basic_machine=$1
;;
- -chorusrdb)
- os=-chorusrdb
- basic_machine=$1
- ;;
-hiux*)
os=-hiuxwe2
;;
@@ -215,137 +156,61 @@ case $os in
-psos*)
os=-psos
;;
- -mint | -mint[0-9]*)
- basic_machine=m68k-atari
- os=-mint
- ;;
esac
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- 1750a | 580 \
- | a29k \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
- | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | m32r | m68000 | m68k | m88k | mcore \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
- | mips64vr | mips64vrel \
- | mips64orion | mips64orionel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mipsisa32 | mipsisa32el \
- | mipsisa32r2 | mipsisa32r2el \
- | mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
- | msp430 \
- | ns16k | ns32k \
- | openrisc | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
- | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
- | x86 | xscale | xstormy16 | xtensa \
- | z8k)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
- # Motorola 68HC11/12.
+ tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+ | 580 | i960 | h8300 \
+ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+ | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+ | mips64orion | mips64orionel | mipstx39 | mipstx39el \
+ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+ | mips64vr5000 | miprs64vr5000el \
+ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+ | thumb | d10v)
basic_machine=$basic_machine-unknown
- os=-none
;;
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
- i*86 | x86_64)
+ i[34567]86)
basic_machine=$basic_machine-pc
;;
+ i[3456]86-TOWNS*)
+ basic_machine=`echo $basic_machine | sed -e 's/-TOWNS.*/-TOWNS/'`
+ ;;
# Object if more than one company name word.
*-*-*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
exit 1
;;
# Recognize the basic CPU types with company name.
- 580-* \
- | a29k-* \
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
- | bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
- | m32r-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
- | mips64vr-* | mips64vrel-* \
- | mips64orion-* | mips64orionel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mipsisa32-* | mipsisa32el-* \
- | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipstx39-* | mipstx39el-* \
- | msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
- | ymp-* \
- | z8k-*)
+ vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+ | xmp-* | ymp-* \
+ | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+ | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+ | clipper-* | orion-* \
+ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+ | mips64el-* | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+ | mipstx39-* | mipstx39el-* \
+ | f301-* | armv*-* | t3e-* \
+ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+ | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -377,25 +242,19 @@ case $basic_machine in
basic_machine=a29k-none
os=-bsd
;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
;;
amiga | amiga-*)
- basic_machine=m68k-unknown
+ basic_machine=m68k-cbm
;;
amigaos | amigados)
- basic_machine=m68k-unknown
+ basic_machine=m68k-cbm
os=-amigaos
;;
amigaunix | amix)
- basic_machine=m68k-unknown
+ basic_machine=m68k-cbm
os=-sysv4
;;
apollo68)
@@ -414,10 +273,6 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
- c90)
- basic_machine=c90-cray
- os=-unicos
- ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -438,30 +293,27 @@ case $basic_machine in
basic_machine=c38-convex
os=-bsd
;;
- cray | j90)
- basic_machine=j90-cray
+ cray | ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ cray2)
+ basic_machine=cray2-cray
+ os=-unicos
+ ;;
+ [ctj]90-cray)
+ basic_machine=c90-cray
os=-unicos
;;
crds | unos)
basic_machine=m68k-crds
;;
- cris | cris-* | etrax*)
- basic_machine=cris-axis
- ;;
da30 | da30-*)
basic_machine=m68k-da30
;;
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
basic_machine=mips-dec
;;
- decsystem10* | dec10*)
- basic_machine=pdp10-dec
- os=-tops10
- ;;
- decsystem20* | dec20*)
- basic_machine=pdp10-dec
- os=-tops20
- ;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
@@ -503,10 +355,6 @@ case $basic_machine in
basic_machine=tron-gmicro
os=-sysv
;;
- go32)
- basic_machine=i386-pc
- os=-go32
- ;;
h3050r* | hiux*)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
@@ -580,21 +428,22 @@ case $basic_machine in
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
+ os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i*86v32)
+ i[34567]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
;;
- i*86v4*)
+ i[34567]86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv4
;;
- i*86v)
+ i[34567]86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv
;;
- i*86sol2)
+ i[34567]86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
@@ -606,6 +455,14 @@ case $basic_machine in
basic_machine=i386-unknown
os=-vsta
;;
+ i386-go32 | go32)
+ basic_machine=i386-unknown
+ os=-go32
+ ;;
+ i386-mingw32 | mingw32)
+ basic_machine=i386-unknown
+ os=-mingw32
+ ;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
@@ -631,43 +488,35 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
- mingw32)
- basic_machine=i386-pc
- os=-mingw32
- ;;
miniframe)
basic_machine=m68000-convergent
;;
- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ *mint | *MiNT)
basic_machine=m68k-atari
os=-mint
;;
+ mipsel*-linux*)
+ basic_machine=mipsel-unknown
+ os=-linux
+ ;;
+ mips*-linux*)
+ basic_machine=mips-unknown
+ os=-linux
+ ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
- mmix*)
- basic_machine=mmix-knuth
- os=-mmixware
- ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
;;
- morphos)
- basic_machine=powerpc-unknown
- os=-morphos
- ;;
msdos)
- basic_machine=i386-pc
+ basic_machine=i386-unknown
os=-msdos
;;
- mvs)
- basic_machine=i370-ibm
- os=-mvs
- ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -676,8 +525,12 @@ case $basic_machine in
basic_machine=i386-unknown
os=-netbsd
;;
+ hpcmips*-*)
+ basic_machine=hpcmips-unknown
+ os=-netbsd
+ ;;
netwinder)
- basic_machine=armv4l-rebel
+ basic_machine=armv4l-corel
os=-linux
;;
news | news700 | news800 | news900)
@@ -725,32 +578,13 @@ case $basic_machine in
basic_machine=i960-intel
os=-mon960
;;
- nonstopux)
- basic_machine=mips-compaq
- os=-nonstopux
- ;;
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
- ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
op50n-* | op60c-*)
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
- basic_machine=or32-unknown
- os=-coff
- ;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -773,65 +607,45 @@ case $basic_machine in
pbb)
basic_machine=m68k-tti
;;
- pc532 | pc532-*)
+ pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexgen | viac3)
+ pentium | p5 | k5 | k6 | nexen)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
- pentiumii | pentium2 | pentiumiii | pentium3)
+ pentiumpro | p6 | 6x86)
basic_machine=i686-pc
;;
- pentium4)
+ pentiumii | pentium2)
basic_machine=i786-pc
;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ pentium-* | p5-* | k5-* | k6-* | nexen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ pentiumpro-* | p6-* | 6x86-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentium4-*)
+ pentiumii-* | pentium2-*)
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pn)
basic_machine=pn-gould
;;
- power) basic_machine=power-ibm
+ power) basic_machine=rs6000-ibm
;;
ppc) basic_machine=powerpc-unknown
- ;;
+ ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
- ;;
+ ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- ppc64) basic_machine=powerpc64-unknown
- ;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppc64le | powerpc64little | ppc64-le | powerpc64-little)
- basic_machine=powerpc64le-unknown
- ;;
- ppc64le-* | powerpc64little-*)
- basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
ps2)
basic_machine=i386-ibm
;;
- pw32)
- basic_machine=i586-unknown
- os=-pw32
- ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -842,26 +656,10 @@ case $basic_machine in
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
- s390 | s390-*)
- basic_machine=s390-ibm
- ;;
- s390x | s390x-*)
- basic_machine=s390x-ibm
- ;;
sa29200)
basic_machine=a29k-amd
os=-udi
;;
- sb1)
- basic_machine=mipsisa64sb1-unknown
- ;;
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
- sei)
- basic_machine=mips-sei
- os=-seiux
- ;;
sequent)
basic_machine=i386-sequent
;;
@@ -869,10 +667,7 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparclite-wrs | simso-wrs)
+ sparclite-wrs)
basic_machine=sparclite-wrs
os=-vxworks
;;
@@ -930,51 +725,23 @@ case $basic_machine in
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
- sv1)
- basic_machine=sv1-cray
- os=-unicos
- ;;
symmetry)
basic_machine=i386-sequent
os=-dynix
;;
t3e)
- basic_machine=alphaev5-cray
+ basic_machine=t3e-cray
os=-unicos
;;
- t90)
- basic_machine=t90-cray
- os=-unicos
- ;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
- tic55x | c55x*)
- basic_machine=tic55x-unknown
- os=-coff
- ;;
- tic6x | c6x*)
- basic_machine=tic6x-unknown
- os=-coff
- ;;
tx39)
basic_machine=mipstx39-unknown
;;
tx39el)
basic_machine=mipstx39el-unknown
;;
- toad1)
- basic_machine=pdp10-xkl
- os=-tops20
- ;;
tower | tower-32)
basic_machine=m68k-ncr
;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
- ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -996,8 +763,8 @@ case $basic_machine in
os=-vms
;;
vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
+ basic_machine=f301-fujitsu
+ ;;
vxworks960)
basic_machine=i960-wrs
os=-vxworks
@@ -1018,13 +785,13 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
- ymp)
- basic_machine=ymp-cray
+ xmp)
+ basic_machine=xmp-cray
os=-unicos
;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
@@ -1045,6 +812,13 @@ case $basic_machine in
op60c)
basic_machine=hppa1.1-oki
;;
+ mips)
+ if [ x$os = x-linux ]; then
+ basic_machine=mips-unknown
+ else
+ basic_machine=mips-mips
+ fi
+ ;;
romp)
basic_machine=romp-ibm
;;
@@ -1054,26 +828,16 @@ case $basic_machine in
vax)
basic_machine=vax-dec
;;
- pdp10)
- # there are many clones, so DEC is not a safe bet
- basic_machine=pdp10-unknown
- ;;
pdp11)
basic_machine=pdp11-dec
;;
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv9)
basic_machine=sparc-sun
;;
- cydra)
+ cydra)
basic_machine=cydra-cydrome
;;
orion)
@@ -1088,8 +852,9 @@ case $basic_machine in
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
- *-unknown)
- # Make sure to match an already-canonicalized machine name.
+ c4x*)
+ basic_machine=c4x-none
+ os=-coff
;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
@@ -1143,63 +908,29 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit* \
+ | -darwin*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
- -qnx*)
- case $basic_machine in
- x86-* | i*86-*)
- ;;
- *)
- os=-nto$os
- ;;
- esac
- ;;
- -nto-qnx*)
- ;;
- -nto*)
- os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
- | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
- -linux*)
- os=-linux
- ;;
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`
;;
-sunos6*)
os=`echo $os | sed -e 's|sunos6|solaris3|'`
;;
- -opened*)
- os=-openedition
- ;;
- -os400*)
- os=-os400
- ;;
- -wince*)
- os=-wince
- ;;
-osfrose*)
os=-osfrose
;;
@@ -1215,26 +946,14 @@ case $os in
-acis*)
os=-aos
;;
- -atheos*)
- os=-atheos
- ;;
- -syllable*)
- os=-syllable
- ;;
-386bsd)
os=-bsd
;;
-ctix* | -uts*)
os=-sysv
;;
- -nova*)
- os=-rtmk-nova
- ;;
-ns2 )
- os=-nextstep2
- ;;
- -nsk*)
- os=-nsk
+ os=-nextstep2
;;
# Preserve the version number of sinix5.
-sinix5.*)
@@ -1243,9 +962,6 @@ case $os in
-sinix*)
os=-sysv4
;;
- -tpf*)
- os=-tpf
- ;;
-triton*)
os=-sysv3
;;
@@ -1273,14 +989,16 @@ case $os in
-xenix)
os=-xenix
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ -mint* | -MiNT*)
+ os=-mint
;;
- -aros*)
- os=-aros
+ -uxpds)
+ os=-uxpds
;;
- -kaos*)
- os=-kaos
+ -human)
+ ;;
+ -beos)
+ os=-beos
;;
-none)
;;
@@ -1307,20 +1025,13 @@ case $basic_machine in
*-acorn)
os=-riscix1.2
;;
- arm*-rebel)
+ arm*-corel)
os=-linux
;;
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
- ;;
- pdp11-*)
+ pdp11-*)
os=-none
;;
*-dec | vax-*)
@@ -1347,9 +1058,6 @@ case $basic_machine in
mips*-*)
os=-elf
;;
- or32-*)
- os=-coff
- ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
@@ -1413,25 +1121,25 @@ case $basic_machine in
*-next)
os=-nextstep3
;;
- *-gould)
+ *-gould)
os=-sysv
;;
- *-highlevel)
+ *-highlevel)
os=-bsd
;;
*-encore)
os=-bsd
;;
- *-sgi)
+ *-sgi)
os=-irix
;;
- *-siemens)
+ *-siemens)
os=-sysv4
;;
*-masscomp)
os=-rtu
;;
- f30[01]-fujitsu | f700-fujitsu)
+ f301-fujitsu)
os=-uxpv
;;
*-rom68k)
@@ -1491,19 +1199,13 @@ case $basic_machine in
-genix*)
vendor=ns
;;
- -mvs* | -opened*)
- vendor=ibm
- ;;
- -os400*)
+ -mvs*)
vendor=ibm
;;
-ptx*)
vendor=sequent
;;
- -tpf*)
- vendor=ibm
- ;;
- -vxsim* | -vxworks* | -windiss*)
+ -vxsim* | -vxworks*)
vendor=wrs
;;
-aux*)
@@ -1515,23 +1217,12 @@ case $basic_machine in
-mpw* | -macos*)
vendor=apple
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ -*mint | -*MiNT)
vendor=atari
;;
- -vos*)
- vendor=stratus
- ;;
esac
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
;;
esac
echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure.in b/configure.in
index fafd398eb7..65a560be28 100644
--- a/configure.in
+++ b/configure.in
@@ -1,48 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT()
-
-AC_PREREQ(2.58)
-
-AC_DEFUN([RUBY_MINGW32],
-[case "$host_os" in
-cygwin*)
-AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
-[AC_TRY_CPP([
-#ifndef __MINGW32__
-# error
-#endif
-], rb_cv_mingw32=yes,rb_cv_mingw32=no)
-rm -f conftest*])
-test "$rb_cv_mingw32" = yes && target_os="mingw32"
- ;;
-esac])
-
-AC_DEFUN([RUBY_CPPOUTFILE],
-[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
-[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'
-elif test "$rb_cv_cppoutfile" = no; then
- CPPOUTFILE='> conftest.i'
-elif test -n "$rb_cv_cppoutfile"; then
- CPPOUTFILE="$rb_cv_cppoutfile"
-fi
-AC_SUBST(CPPOUTFILE)])
-
-AC_DEFUN([RUBY_PROG_GNU_LD],
-[AC_CACHE_CHECK(whether the linker is GNU ld, rb_cv_prog_gnu_ld,
-[if `$CC $CFLAGS $CPPFLAGS $LDFLAGS --print-prog-name=ld 2>&1` -v 2>&1 | grep "GNU ld" > /dev/null; then
- rb_cv_prog_gnu_ld=yes
-else
- rb_cv_prog_gnu_ld=no
-fi
-])
-GNU_LD=$rb_cv_prog_gnu_ld
-AC_SUBST(GNU_LD)])
+AC_INIT(ruby.h)
rb_version=`grep RUBY_VERSION $srcdir/version.h`
MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'`
@@ -52,93 +9,70 @@ AC_SUBST(MAJOR)
AC_SUBST(MINOR)
AC_SUBST(TEENY)
dnl checks for alternative programs
-AC_ARG_WITH(gcc, [ --without-gcc never use gcc], [
+AC_ARG_WITH(gcc, [--without-gcc never use gcc], [
case $withval in
- no) : ${CC=cc}
- ;;
- yes) : ${CC=gcc}
- ;;
+ no) CC=cc
+ without_gcc=yes;;
+ yes) CC=gcc
+ without_gcc=no;;
*) CC=$withval
- ;;
- esac])
+ without_gcc=$withval;;
+ esac], [without_gcc=no])
dnl If the user switches compilers, we can't believe the cache
if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
then
- AC_MSG_ERROR(cached CC is different -- throw away $cache_file
+ AC_ERROR(cached CC is different -- throw away $cache_file
(it is also a good idea to do 'make clean' before compiling))
fi
-if test "$program_prefix" = NONE; then
- program_prefix=
-fi
+AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
-ac_install_sh='' # unusable for extension libraries.
+AC_CANONICAL_BUILD
dnl checks for fat-binary
+fat_binary=no
AC_ARG_ENABLE(fat-binary,
- [ --enable-fat-binary=ARCHS
- build an Apple/NeXT Multi Architecture Binary (MAB);
- ARCHS is a comma-delimited list of architectures for
- which to build; if ARCHS is omitted, then the package
- will be built for all architectures supported by the
- platform ("ppc" for MacOS/X and Darwin; "ppc,i386"
- for Rhapsody; "m68k,i386,sparc" for OpenStep;
- "m68k,i386,sparc,hppa" for NextStep); if this option
- is disabled or omitted entirely, then the package
- will be built only for the target platform],
- [fat_binary=$enableval], [fat_binary=no])
-if test "$fat_binary" != no; then
-
- AC_MSG_CHECKING([target architectures])
-
- # Respect TARGET_ARCHS setting from environment if available.
- if test -z "$TARGET_ARCHS"; then
- # Respect ARCH given to --enable-fat-binary if present.
- if test "$fat_binary" != yes; then
- TARGET_ARCHS=`echo "$fat_binary" | tr ',' ' '`
- else
- # Choose a default set of architectures based upon platform.
- case "$target_os" in
- darwin*)
- TARGET_ARCHS="ppc"
- ;;
- rhapsody*)
- TARGET_ARCHS="ppc i386"
- ;;
- openstep*)
- TARGET_ARCHS="m68k i386 sparc"
- ;;
- nextstep*)
- TARGET_ARCHS="m68k i386 sparc hppa"
- ;;
- *)
- TARGET_ARCHS=`arch`
- esac
- fi
- fi
+ [--enable-fat-binary build a NeXT/Apple Multi Architecture Binary. ],
+ [fat_binary=$enableval])
+ if test "$fat_binary" = yes ; then
- AC_MSG_RESULT([$TARGET_ARCHS])
+ AC_MSG_CHECKING(target architecture)
+ case "$target_os" in
+ rhapsody*)
+ echo -n "MacOS X Server: "
+ if test "$TARGET_ARCHS" = "" ; then
+ TARGET_ARCHS="ppc i386"
+ fi
+ ;;
+ nextstep*|openstep*)
+ echo -n "NeXTSTEP/OPENSTEP: "
+ if test "$TARGET_ARCHS" = "" ; then
+ if test `/usr/bin/arch` = "m68k" ; then
+ TARGET_ARCHS="m68k i486"
+ else # Black and Native one
+ TARGET_ARCHS="m68k `/usr/bin/arch`"
+ fi
+ fi
+ # to ensure AC_HEADER_SYS_WAIT works
+ AC_DEFINE(_POSIX_SOURCE)
+ ;;
+ macos*|darwin*)
+ echo -n "MacOS X (Darwin): "
+ if test "$TARGET_ARCHS" = "" ; then
+ TARGET_ARCHS="ppc i386"
+ fi
+ ;;
+ esac
# /usr/lib/arch_tool -archify_list $TARGET_ARCHS
- ARCH_FLAG=
for archs in $TARGET_ARCHS
do
- ARCH_FLAG="$ARCH_FLAG -arch $archs"
+ ARCH_FLAG="$ARCH_FLAG -arch $archs "
+ echo -n " $archs"
done
AC_DEFINE(NEXT_FAT_BINARY)
-fi
-
-case $target_cpu in
- i?86) frame_address=yes;;
- *) frame_address=no;;
-esac
-AC_ARG_ENABLE(frame-address,
- [ --enable-frame-address use GCC __builtin_frame_address(). ],
- [frame_address=$enableval])
-if test $frame_address = yes; then
- AC_DEFINE(USE_BUILTIN_FRAME_ADDRESS)
-fi
+ echo "."
+fi
AC_ARG_PROGRAM
@@ -149,115 +83,46 @@ if test x"${build}" != x"${host}"; then
fi
AC_PROG_CC
AC_PROG_GCC_TRADITIONAL
-if test "$GCC" = yes; then
- linker_flag=-Wl,
-else
- linker_flag=
-fi
-
-RUBY_PROG_GNU_LD
-RUBY_CPPOUTFILE
-
-: ${OUTFLAG='-o '}
-AC_SUBST(OUTFLAG)
-
-RUBY_MINGW32
AC_PROG_YACC
-if test "$YACC" = "yacc"; then
- AC_DEFINE([OLD_YACC])
-fi
-
AC_CHECK_TOOL(RANLIB, ranlib, :)
AC_CHECK_TOOL(AR, ar)
-if test -z "$AR"; then
- AC_CHECK_PROGS(AR, aal, ar)
-fi
-
-AC_CHECK_TOOL(AS, as)
-ASFLAGS=$ASFLAGS
-AC_SUBST(ASFLAGS)
+AC_CHECK_PROGS(AR, ar aal, ar)
case "$target_os" in
cygwin*|mingw*)
AC_CHECK_TOOL(NM, nm)
- AC_CHECK_TOOL(WINDRES, windres)
AC_CHECK_TOOL(DLLWRAP, dllwrap)
- target_cpu=`echo $target_cpu | sed s/i.86/i386/`
- case "$target_os" in
- mingw*)
- test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
- AC_CHECK_TOOL(OBJDUMP, objdump)
- AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
- AC_TRY_LINK([#include <stdio.h>],
- [FILE* volatile f = stdin; return 0;],
- [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
- tr A-Z a-z |
- sed -n '/^[[ ]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
- [rb_cv_msvcrt=msvcrt])
- test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
- AC_ARG_WITH(winsock2,
- [ --with-winsock2 link winsock2 (MinGW only)], [
- case $withval in
- yes) with_winsock2=yes;;
- *) with_winsock2=no;;
- esac], [with_winsock2=no])
- if test "$with_winsock2" = yes; then
- AC_DEFINE(USE_WINSOCK2)
- fi
- esac
- : ${enable_shared=yes}
- ;;
-aix*)
- AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)
- ;;
-hiuxmpp*)
- # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
- AC_DEFINE(__HIUX_MPP__)
+ AC_CHECK_TOOL(AS, as)
+ AC_CHECK_TOOL(DLLTOOL, dlltool)
+ AC_CHECK_TOOL(WINDRES, windres)
+ echo 'main(){}' > conftest.c
+ if $CC -mwin32 -c conftest.c 2> /dev/null; then
+ MWIN32=-mwin32
+ CFLAGS="$CFLAGS $MWIN32"
+ fi
;;
esac
+AC_SUBST(MWIN32)
AC_PROG_LN_S
AC_PROG_MAKE_SET
-AC_PROG_INSTALL
# checks for UNIX variants that set C preprocessor variables
AC_AIX
AC_MINIX
-AC_SUBST(RM, ['rm -f'])
-AC_SUBST(CP, ['cp'])
-if $as_mkdir_p; then
- AC_SUBST(MAKEDIRS, ['mkdir -p'])
-else
- AC_SUBST(MAKEDIRS, ['install -d'])
-fi
-
-dnl check for large file stuff
-mv confdefs.h confdefs1.h
-: > confdefs.h
-AC_SYS_LARGEFILE
-mv confdefs.h largefile.h
-mv confdefs1.h confdefs.h
-cat largefile.h >> confdefs.h
-
-AC_CHECK_TYPES([long long, off_t])
+AC_EXEEXT
+AC_OBJEXT
AC_CHECK_SIZEOF(int, 4)
AC_CHECK_SIZEOF(short, 2)
AC_CHECK_SIZEOF(long, 4)
AC_CHECK_SIZEOF(long long, 0)
AC_CHECK_SIZEOF(__int64, 0)
-AC_CHECK_SIZEOF(off_t, 0)
AC_CHECK_SIZEOF(void*, 4)
AC_CHECK_SIZEOF(float, 4)
AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_SIZEOF(time_t, 0)
-
-for id in pid_t gid_t uid_t; do
- AC_CHECK_TYPE($id, [typ=$id], [typ=int])
- AC_DEFINE_UNQUOTED(rb_$id, $typ)
-done
AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
[AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@@ -296,74 +161,21 @@ if test "$rb_cv_stdarg" = yes; then
AC_DEFINE(HAVE_STDARG_PROTOTYPES)
fi
-AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
-m4_ifval([$2], dnl
- [AS_VAR_PUSHDEF([attrib],[$2])], dnl
- [AS_VAR_PUSHDEF([attrib],[FUNC_]AS_TR_CPP($1))] dnl
-)dnl
-m4_ifval([$3], dnl
- [AS_VAR_PUSHDEF([rbcv],[$3])], dnl
- [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
-)dnl
-AC_CACHE_CHECK(for [$1] function attribute, rbcv,
-[rbcv=x
-if test "${ac_c_werror_flag+set}"; then
- rb_c_werror_flag="$ac_c_werror_flag"
-else
- unset rb_c_werror_flag
+AC_CACHE_CHECK(for gcc attribute noreturn, rb_cv_have_attr_noreturn,
+ [AC_TRY_COMPILE([void exit(int x) __attribute__ ((noreturn));], [],
+ rb_cv_have_attr_noreturn=yes,
+ rb_cv_have_attr_noreturn=no)])
+if test "$rb_cv_have_attr_noreturn" = yes; then
+ AC_DEFINE(HAVE_ATTR_NORETURN)
fi
-ac_c_werror_flag=yes
-for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do
- AC_TRY_COMPILE(
- [#define ]attrib[(x) $mac
- ]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
-])
-AC_DEFINE_UNQUOTED(attrib[(x)], $rbcv)
-AS_VAR_POPDEF([attrib])
-AS_VAR_POPDEF([rbcv])
-])
-
-RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
-RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
-
-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)
-
-XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
-
-dnl Check whether we need to define sys_nerr locally
-AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
-#include <errno.h>])
-
-dnl whether link libc_r or not
+
+dnl wheather link libc_r or not
AC_ARG_WITH(libc_r,
- [ --with-libc_r link libc_r if possible (FreeBSD only)], [
+ [--with-libc_r link libc_r if possible (FreeBSD only)], [
case $withval in
yes) with_libc_r=yes;;
*) with_libc_r=no;;
- esac], [with_libc_r=no])
-
-AC_ARG_ENABLE(pthread,
- [ --enable-pthread use pthread library.],
- [enable_pthread=$enableval], [enable_pthread=no])
-
-AC_ARG_ENABLE(fastthread,
- [ --disable-fastthread do not use the fastthread mutex], [
- : handled by ext/thread/extconf.rb
- ])
+ esac], [with_libc_r=yes])
dnl Checks for libraries.
case "$target_os" in
@@ -371,23 +183,11 @@ nextstep*) ;;
openstep*) ;;
rhapsody*) ;;
darwin*) LIBS="-lobjc $LIBS";;
-hpux*) LIBS="-lm $LIBS"
- ac_cv_c_inline=no;;
-human*) ac_cv_func_getpgrp_void=yes
- ac_cv_func_setitimer=no
- ;;
-beos*) ac_cv_func_link=no;;
+human*) ac_cv_func_getpgrp_void=yes;;
+beos*) ;;
cygwin*) rb_cv_have_daylight=no
- ac_cv_var_tzname=no
- ac_cv_func__setjmp=no
- ac_cv_func_setitimer=no
- ;;
-mingw*) if test "$with_winsock2" = yes; then
- LIBS="-lws2_32 $LIBS"
- else
- LIBS="-lwsock32 $LIBS"
- fi
- LIBS="-lshell32 $LIBS"
+ ac_cv_var_tzname=no;;
+mingw*) LIBS="-lwsock32 -lmsvcrt $LIBS"
ac_cv_header_a_out_h=no
ac_cv_header_pwd_h=no
ac_cv_header_utime_h=no
@@ -395,38 +195,12 @@ mingw*) if test "$with_winsock2" = yes; then
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_func_times=yes
- ac_cv_func_waitpid=yes
- ac_cv_func_fsync=yes
- ac_cv_func_vsnprintf=yes
- ac_cv_func_seekdir=yes
- ac_cv_func_telldir=yes
- ac_cv_func_isinf=yes
- ac_cv_func_isnan=yes
- ac_cv_func_finite=yes
- ac_cv_func_link=yes
- ac_cv_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
- enable_pthread=no
- ac_cv_func_fcntl=yes
- ;;
-os2-emx*) LIBS="-lm $LIBS"
+ ac_cv_func_times=yes;;
+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_setrlimit=no
- ;;
-bsdi*) LIBS="-lm $LIBS"
- ac_cv_sizeof_rlim_t=8;;
+ ac_cv_func_getpgrp_void=yes;;
freebsd*) LIBS="-lm $LIBS"
AC_CACHE_CHECK([whether -lxpg4 has to be linked],
rb_cv_lib_xpg4_needed,
@@ -456,112 +230,63 @@ freebsd*) LIBS="-lm $LIBS"
rb_cv_supplementary_lib_c_r=yes,
rb_cv_supplementary_lib_c_r=yes)])
if test "$rb_cv_supplementary_lib_c_r" = yes; then
- MAINLIBS="-lc_r $MAINLIBS"
+ MAINLIBS="-lc_r $MAINLIBS"
+ else
+ MAINLIBS="-pthread $MAINLIBS"
+ CFLAGS="-D_THREAD_SAFE $CFLAGS"
fi
fi
;;
-dragonfly*) LIBS="-lm $LIBS"
- ;;
-bow) ac_cv_func_setitimer=no
- ;;
-superux*) ac_cv_func_setitimer=no
- ;;
-solaris*2.1*) if test -z "$GCC"; then
- ac_cv_func_isinf=yes
- fi
- LIBS="-lm $LIBS"
- ;;
+linux*) LIBS="-lm $LIBS"
+ case "$target_cpu" in
+ alpha*)
+ CFLAGS="-mieee $CFLAGS" ;;
+ esac ;;
+osf*) LIBS="-lm $LIBS"
+ case "$target_cpu"::"$without_gcc" in
+ alpha*::no)
+ CFLAGS="-mieee $CFLAGS" ;;
+ alpha*::yes)
+ CFLAGS="-ieee $CFLAGS" ;;
+ esac ;;
*) LIBS="-lm $LIBS";;
esac
AC_CHECK_LIB(crypt, crypt)
AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
-case "$target_cpu" in
-alpha*) case "$target_os"::"$GCC" in
- *::yes) CFLAGS="-mieee $CFLAGS" ;; # gcc
- osf*) CFLAGS="-ieee $CFLAGS" ;; # ccc
- esac ;;
-esac
-
dnl Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
+AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\
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 memory.h direct.h sys/resource.h \
- sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
- ucontext.h intrinsics.h)
-
-dnl Check additional types.
-AC_CHECK_SIZEOF(rlim_t, 0, [
- #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>
-])
+ syscall.h pwd.h a.out.h utime.h memory.h direct.h sys/resource.h)
dnl Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_UID_T
AC_TYPE_SIZE_T
AC_STRUCT_ST_BLKSIZE
+save_LIBOJBS="$LIBOBJS"
AC_STRUCT_ST_BLOCKS
+LIBOBJS="$save_LIBOBJS"
AC_STRUCT_ST_RDEV
dnl Checks for library functions.
AC_TYPE_GETGROUPS
AC_TYPE_SIGNAL
-case "${target_cpu}-${target_os}" in
-powerpc-darwin*)
- AC_LIBSOURCES(alloca.c)
- AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
- AC_DEFINE(C_ALLOCA)
- AC_DEFINE_UNQUOTED(alloca, alloca)
- ;;
-*)
- AC_FUNC_ALLOCA
- ;;
-esac
+AC_FUNC_ALLOCA
+AC_FUNC_VFORK
AC_FUNC_MEMCMP
-AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(ftello)
-AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
+AC_REPLACE_FUNCS(dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
strchr strstr strtoul crypt flock vsnprintf\
- isnan finite isinf hypot acosh erf)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
- truncate chsize times utimes fcntl lockf lstat symlink link\
- readlink setitimer setruid seteuid setreuid setresuid\
- setproctitle setrgid setegid setregid setresgid issetugid pause\
- lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
- getgroups setgroups getpriority getrlimit setrlimit sysconf\
- group_member dlopen sigprocmask\
- sigaction _setjmp setsid telldir seekdir fchmod mktime timegm\
- cosh sinh tanh round setuid setgid setenv unsetenv)
-AC_ARG_ENABLE(setreuid,
- [ --enable-setreuid use setreuid()/setregid() according to need even if obsolete.],
- [use_setreuid=$enableval])
-if test "$use_setreuid" = yes; then
- AC_DEFINE(USE_SETREUID)
- AC_DEFINE(USE_SETREGID)
-fi
+ isinf isnan finite)
+AC_CHECK_FUNCS(fmod killpg drand48 random wait4 waitpid syscall getcwd chroot\
+ truncate chsize times utimes fcntl lockf lstat symlink readlink\
+ setitimer setruid seteuid setreuid setrgid setegid setregid pause\
+ getpgrp setpgrp getpgid setpgid getgroups getpriority getrlimit\
+ dlopen sigprocmask sigaction _setjmp setsid telldir seekdir fchmod)
AC_STRUCT_TIMEZONE
-AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
- [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])])
-if test "$rb_cv_member_struct_tm_tm_gmtoff" = yes; then
- AC_DEFINE(HAVE_STRUCT_TM_TM_GMTOFF)
-fi
AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
[AC_TRY_LINK([#include <time.h>
int i;],
@@ -571,43 +296,6 @@ AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
if test "$rb_cv_have_daylight" = yes; then
AC_DEFINE(HAVE_DAYLIGHT)
fi
-AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
- [AC_TRY_RUN([
-#include <time.h>
-
-void
-check(tm, y, m, d, h, s)
- struct tm *tm;
- int y, m, d, h, s;
-{
- if (!tm ||
- tm->tm_year != y ||
- tm->tm_mon != m-1 ||
- tm->tm_mday != d ||
- tm->tm_hour != h ||
- tm->tm_sec != s) {
- exit(1);
- }
-}
-
-int
-main()
-{
- time_t t = -1;
- struct tm *tm;
-
- check(gmtime(&t), 69, 12, 31, 23, 59);
- t = ~(time_t)0 << 31;
- check(gmtime(&t), 1, 12, 13, 20, 52);
- return 0;
-}
-],
- rb_cv_negative_time_t=yes,
- rb_cv_negative_time_t=no,
- rb_cv_negative_time_t=yes)])
-if test "$rb_cv_negative_time_t" = yes; then
- AC_DEFINE(NEGATIVE_TIME_T)
-fi
if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
AC_DEFINE(POSIX_SIGNAL)
@@ -643,26 +331,40 @@ fi
AC_FUNC_GETPGRP
AC_FUNC_SETPGRP
+AC_CACHE_CHECK(for working strtod, rb_cv_func_strtod,
+[AC_TRY_RUN([
+double strtod ();
+int
+main()
+{
+ {
+ /* Some versions of Linux strtod mis-parse strings with leading '+'. */
+ char *string = " +69";
+ char *term;
+ double value;
+ value = strtod(string, &term);
+ if (value != 69 || term != (string + 4))
+ exit(1);
+ }
+
+ {
+ /* Under Solaris 2.4, strtod returns the wrong value for the
+ terminating character under some conditions. */
+ char *string = "NaN";
+ char *term;
+ strtod(string, &term);
+ if (term != string && *(term - 1) == 0)
+ exit(1);
+ }
+ exit(0);
+}
+], rb_cv_func_strtod=yes, rb_cv_func_strtod=no, rb_cv_func_strtod=no)])
+test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o"
+
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])
- AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base,
- rb_cv___libc_ia64_register_backing_store_base,
- [rb_cv___libc_ia64_register_backing_store_base=no
- AC_TRY_LINK(
- [extern unsigned long __libc_ia64_register_backing_store_base;],
- [unsigned long p = __libc_ia64_register_backing_store_base;
- printf("%ld\n", p);],
- [rb_cv___libc_ia64_register_backing_store_base=yes])])
- if test $rb_cv___libc_ia64_register_backing_store_base = yes; then
- AC_DEFINE(HAVE___LIBC_IA64_REGISTER_BACKING_STORE_BASE)
- fi
-fi
AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
[AC_TRY_RUN([
@@ -683,21 +385,29 @@ else
AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>y) : (x)>>y))
fi
-AC_MSG_CHECKING(read count field in FILE structures)
+AC_MSG_CHECKING(count field in FILE structures)
AC_CACHE_VAL(rb_cv_fcnt,
-[for fcnt in dnl
- _cnt dnl
- __cnt dnl
- _r dnl
- readCount dnl
- _rcount dnl for emx0.9c
-; do
- AC_TRY_COMPILE([#include <stdio.h>
-],
- [FILE *f = stdin; f->$fcnt = 0;],
- rb_cv_fcnt="$fcnt"; break,
- rb_cv_fcnt="not found")
-done])
+[AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *f = stdin; f->_cnt = 0;], rb_cv_fcnt="_cnt", )
+if test "$rb_cv_fcnt" = ""; then
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *f = stdin; f->__cnt = 0;], rb_cv_fcnt="__cnt", )
+fi
+if test "$rb_cv_fcnt" = ""; then
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *f = stdin; f->_r = 0;], rb_cv_fcnt="_r", )
+fi
+if test "$rb_cv_fcnt" = ""; then
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *f = stdin; f->readCount = 0;],
+ rb_cv_fcnt="readCount", )
+fi
+dnl for emx0.9c
+if test "$rb_cv_fcnt" = ""; then
+ AC_TRY_COMPILE([#include <stdio.h>],
+ [FILE *f = stdin; f->_rcount = 0;],
+ rb_cv_fcnt="_rcount", rb_cv_fcnt="not found")
+fi])
if test "$rb_cv_fcnt" = "not found"; then
AC_MSG_RESULT([not found(OK if using GNU libc)])
else
@@ -705,207 +415,11 @@ else
AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)
fi
-AC_MSG_CHECKING(read buffer ptr field in FILE structures)
-AC_CACHE_VAL(rb_cv_frptr,
-[for frptr in dnl
- _IO_read_ptr dnl
- _ptr dnl
- __ptr dnl
- bufpos dnl
- _p dnl
-; do
- AC_TRY_COMPILE([#include <stdio.h>
-],
- [FILE *f = stdin; char buf[256]; f->$frptr = buf;],
- rb_cv_frptr="$frptr"; break,
- rb_cv_frptr="not found")
-done])
-if test "$rb_cv_frptr" = "not found"; then
- AC_MSG_RESULT([not found])
-else
- AC_MSG_RESULT($rb_cv_frptr)
- AC_DEFINE_UNQUOTED(FILE_READPTR, $rb_cv_frptr)
-
- if test "$rb_cv_fcnt" = "not found"; then
- AC_MSG_CHECKING(read buffer end field in FILE structures)
- AC_CACHE_VAL(rb_cv_frend,
- [for frend in dnl
- _IO_read_end dnl
- bufread dnl
- ; do
- AC_TRY_COMPILE([#include <stdio.h>
- ],
- [FILE *f = stdin; char buf[256]; f->$frend = buf;],
- rb_cv_frend="$frend"; break,
- rb_cv_frend="not found")
- done])
- if test "$rb_cv_frend" = "not found"; then
- AC_MSG_RESULT([not found])
- else
- AC_MSG_RESULT($rb_cv_frend)
- AC_DEFINE_UNQUOTED(FILE_READEND, $rb_cv_frend)
- fi
- fi
-fi
-
-AC_DEFUN([RUBY_CHECK_IO_NEED],
-[AC_CACHE_CHECK(whether need to [$1], [$2],
- [AC_TRY_RUN([
-#include <stdio.h>
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-#define before_seek(f) ]ifelse(index($2,flush_before_seek),-1,[fflush(f)],[(f,0)])[
-#define reset_rw(f) ]ifelse(index($2,seek_between_rw),-1,[do_seek(f,SEEK_CUR)],[(f,0)])[
-#define do_seek(f, w) (before_seek(f), fseek(f,0,w))
-
-char *fn = "conftest.dat";
-char *wombat = "wombat\n";
-char *koara = "koara\n";
-char *kangaroo = "kangaroo\n";
-
-int main()
-{
- char buf[BUFSIZ];
- FILE *f;
- int r = 1;
-
- if (!(f = fopen(fn, "w+"))) return 1;
- fputs(wombat, f);
- do_seek(f, SEEK_SET);
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
- reset_rw(f);
- fputs(koara, f);
- fputs(kangaroo, f);
- do_seek(f, SEEK_SET);
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara)) goto fail;
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
- do_seek(f, SEEK_SET);
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
- reset_rw(f);
- fputc('X', f);
- reset_rw(f);
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara+1)) goto fail;
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
- do_seek(f, SEEK_SET);
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
- if (!fgets(buf, BUFSIZ, f) || buf[0] != 'X' || strcmp(buf+1, koara+1)) goto fail;
- if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
- r = 0;
- fail:
- fclose(f);
- unlink(fn);
- return r;
-}
-], [$2]=no, [$2]=yes, [$2]=[$3])])])
-RUBY_CHECK_IO_NEED(seek between R/W, rb_cv_need_io_seek_between_rw, yes)
-if test "$rb_cv_need_io_seek_between_rw" = yes; then
- AC_DEFINE(NEED_IO_SEEK_BETWEEN_RW, 1)
-fi
-dnl RUBY_CHECK_IO_NEED(flush before seek, rb_cv_need_io_flush_before_seek, no)
-dnl if test "$rb_cv_need_io_flush_before_seek" = yes; then
-dnl AC_DEFINE(NEED_IO_FLUSH_BEFORE_SEEK, 1)
-dnl fi
-
-AC_CACHE_CHECK([whether st_ino is huge], rb_cv_huge_st_ino,
-[AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([
-#include <sys/stat.h>
-struct stat test_stat;
-], [sizeof(test_stat.st_ino)>sizeof(long)])],
-rb_cv_huge_st_ino=yes,
-rb_cv_huge_st_ino=no)
-])
-if test $rb_cv_huge_st_ino = yes; then
- AC_DEFINE(HUGE_ST_INO)
-fi
-
-if test "$ac_cv_func_sysconf" = yes; then
- AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
- AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
- [AC_TRY_COMPILE([#include <unistd.h>
- ],
- [_SC_$1 >= 0],
- rb_cv_have_sc_[]m4_tolower($1)=yes,
- rb_cv_have_sc_[]m4_tolower($1)=no)
- ])
- if test "$rb_cv_have_sc_[]m4_tolower($1)" = yes; then
- AC_DEFINE(HAVE__SC_$1)
- fi
- ])
- RUBY_CHECK_SYSCONF(CLK_TCK)
-fi
-
-case "$target_cpu" in
-m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
-hppa*) rb_cv_stack_grow_dir=+1;;
-esac
-AC_CACHE_CHECK(stack growing direction, rb_cv_stack_grow_dir,
- [AC_TRY_RUN([
-/* recurse to get rid of inlining */
-static int
-stack_growup_p(addr, n)
- volatile int *addr, n;
-{
- volatile int end;
- if (n > 0)
- return *addr = stack_growup_p(addr, n - 1);
- else
- return (&end > addr);
-}
-int main()
-{
- int x;
- return stack_growup_p(&x, 10);
-}
-], rb_cv_stack_grow_dir=-1, rb_cv_stack_grow_dir=+1, rb_cv_stack_grow_dir=0)])
-AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
-
-if test x"$enable_pthread" = xyes; then
- for pthread_lib in pthread pthreads c c_r; do
- AC_CHECK_LIB($pthread_lib, pthread_kill,
- rb_with_pthread=yes, rb_with_pthread=no)
- if test "$rb_with_pthread" = "yes"; then break; fi
- done
- if test x"$rb_with_pthread" = xyes; then
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
- AC_DEFINE(HAVE_LIBPTHREAD)
- case $pthread_lib in
- c)
- ;;
- c_r)
- MAINLIBS="-pthread $MAINLIBS"
- ;;
- *)
- LIBS="-l$pthread_lib $LIBS"
- ;;
- esac
- else
- AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
- fi
- AC_CHECK_FUNCS(nanosleep)
- 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
- if test x"$rb_with_pthread" = xyes; then
- AC_CHECK_FUNCS(getcontext setcontext)
- fi
-fi
-
dnl default value for $KANJI
DEFAULT_KCODE="KCODE_NONE"
AC_ARG_WITH(default-kcode,
- [ --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)],
+ [--with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)],
[case $withval in
utf8) DEFAULT_KCODE="KCODE_UTF8";;
euc) DEFAULT_KCODE="KCODE_EUC";;
@@ -917,12 +431,14 @@ AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
dnl wheather use dln_a_out or not
AC_ARG_WITH(dln-a-out,
- [ --with-dln-a-out use dln_a_out if possible], [
+ [--with-dln-a-out use dln_a_out if possible], [
case $withval in
yes) with_dln_a_out=yes;;
*) with_dln_a_out=no;;
esac], [with_dln_a_out=no])
+AC_SUBST(XLDFLAGS)dnl
+
AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
[AC_TRY_RUN([
/* Test for whether ELF binaries are produced */
@@ -950,179 +466,156 @@ if test "$rb_cv_binary_elf" = yes; then
fi
case "$target_os" in
-linux* | gnu* | k*bsd*-gnu | bsdi*)
- if test "$rb_cv_binary_elf" = no; then
- with_dln_a_out=yes
+ linux*)
+ if test "$rb_cv_binary_elf" = no; then
+ with_dln_a_out=yes
+ target_os=${target_os}-a_out
+ else
+ LDFLAGS="-rdynamic"
+ fi;;
+netbsd*)
+ if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+ then
+ netbsd_elf=yes
else
- LDFLAGS="$LDFLAGS -rdynamic"
- fi;;
+ netbsd_elf=no
+ fi
+ ;;
esac
-LIBEXT=a
AC_SUBST(DLDFLAGS)dnl
-AC_SUBST(ARCH_FLAG)dnl
AC_SUBST(STATIC)dnl
AC_SUBST(CCDLFLAGS)dnl
AC_SUBST(LDSHARED)dnl
AC_SUBST(DLEXT)dnl
AC_SUBST(DLEXT2)dnl
-AC_SUBST(LIBEXT)dnl
STATIC=
-: ${LIBPATHFLAG=' -L"%s"'}
-: ${PATHFLAG=''}
if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=unknown
AC_MSG_CHECKING(whether OS depend dynamic link works)
if test "$GCC" = yes; then
case "$target_os" in
- nextstep*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
- openstep*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
- rhapsody*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
- darwin*) CCDLFLAGS="$CCDLFLAGS -fno-common";;
- human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
- *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
+ nextstep*) ;;
+ openstep*) ;;
+ rhapsody*) ;;
+ darwin*) CCDLFLAGS=-fno-common;;
+ human*) ;;
+ bsdi*) ;;
+ beos*) ;;
+ cygwin*) ;;
+ mingw*) ;;
+ netbsd*) CCDLFLAGS=-fpic
+ case "$target_cpu" in
+ mips*) CCDLFLAGS=-fPIC ;;
+ sparc) CCDLFLAGS=-fPIC ;;
+ *) ;;
+ esac ;;
+ *) CCDLFLAGS=-fPIC;;
esac
else
case "$target_os" in
- hpux*) CCDLFLAGS="$CCDLFLAGS +Z";;
- solaris*|irix*) CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
- sunos*) CCDLFLAGS="$CCDLFLAGS -PIC" ;;
- esix*|uxpds*) CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
- *) : ${CCDLFLAGS=""} ;;
+ hpux*) CCDLFLAGS='+z';;
+ solaris*|irix*) CCDLFLAGS='-KPIC' ;;
+ sunos*) CCDLFLAGS='-PIC' ;;
+ esix*|uxpds*) CCDLFLAGS='-KPIC' ;;
+ *) CCDLFLAGS='' ;;
esac
fi
case "$target_os" in
- hpux*) DLDFLAGS="$DLDFLAGS -E"
- : ${LDSHARED='ld -b'}
- XLDFLAGS="$XLDFLAGS -Wl,-E"
- : ${LIBPATHENV=SHLIB_PATH}
+ hpux*) DLDFLAGS="-E"
+ LDSHARED='ld -b'
+ LDFLAGS="-Wl,-E"
rb_cv_dlopen=yes;;
solaris*) if test "$GCC" = yes; then
- : ${LDSHARED='$(CC) -shared'}
- if test "$rb_cv_prog_gnu_ld" = yes; then
- LDFLAGS="$LDFLAGS -Wl,-E"
- fi
+ LDSHARED='$(CC) -Wl,-G'
+ `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null && LDFLAGS="-Wl,-E"
else
- : ${LDSHARED='ld -G'}
+ 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="qcc -shared"}
+ nto-qnx*) LDSHARED="qcc -shared"
rb_cv_dlopen=yes ;;
- esix*|uxpds*) : ${LDSHARED="ld -G"}
- rb_cv_dlopen=yes ;;
- osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""}
+ esix*|uxpds*) LDSHARED="ld -G"
rb_cv_dlopen=yes ;;
- bsdi3*) case "$CC" in
- *shlicc*) : ${LDSHARED="$CC -r"}
- rb_cv_dlopen=yes ;;
- esac ;;
- linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
- : ${LDSHARED='${CC} -shared'}
- if test "$rb_cv_binary_elf" = yes; then
- LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
- fi
+ osf*) LDSHARED="$CC -shared"
rb_cv_dlopen=yes ;;
- interix*) : ${LDSHARED="$CC -shared"}
- XLDFLAGS="$XLDFLAGS -Wl,-E"
- LIBPATHFLAG=" -L'%1\$-s'"
+ linux*) LDSHARED="$CC -shared"
rb_cv_dlopen=yes ;;
- freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"}
+ freebsd*) LDSHARED="$CC -shared"
if test "$rb_cv_binary_elf" = yes; then
- LDFLAGS="$LDFLAGS -rdynamic"
- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
+ LDFLAGS="-rdynamic"
+ DLDFLAGS='-Wl,-soname,$(.TARGET)'
else
- test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+ test "$GCC" = yes && `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null || LDSHARED="ld -Bshareable"
fi
rb_cv_dlopen=yes ;;
- openbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+ netbsd*) LDSHARED="ld -shared"
if test "$rb_cv_binary_elf" = yes; then
- LDFLAGS="$LDFLAGS -Wl,-E"
+ LDFLAGS="-export-dynamic"
fi
rb_cv_dlopen=yes ;;
- nextstep*) : ${LDSHARED='cc -r -nostdlib'}
- LDFLAGS="$LDFLAGS -u libsys_s"
+ openbsd*) LDSHARED="ld -Bforcearchive -Bshareable"
rb_cv_dlopen=yes ;;
- openstep*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
- : ${LDFLAGS=""}
+ bsdi3*) case "$CC" in
+ *shlicc*) LDSHARED="$CC -r"
+ rb_cv_dlopen=yes ;;
+ esac ;;
+ bsdi*) LDSHARED="ld -shared"
+ LDFLAGS='-rdynamic -Wl,-rpath,$(prefix)/lib/ruby/$(MAJOR).$(MINOR)/i386-bsdi4.0'
rb_cv_dlopen=yes ;;
- rhapsody*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
- : ${LDFLAGS=""}
+ nextstep*) LDSHARED='cc -r -nostdlib'
+ LDFLAGS="-u libsys_s"
+ DLDFLAGS="$ARCH_FLAG"
rb_cv_dlopen=yes ;;
- darwin*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
- : ${LDFLAGS=""}
- : ${LIBPATHENV=DYLD_LIBRARY_PATH}
+ openstep*) LDSHARED='cc -dynamic -bundle -undefined suppress'
+ LDFLAGS=""
+ DLDFLAGS="$ARCH_FLAG"
rb_cv_dlopen=yes ;;
- aix*) if test "$GCC" = yes; then
- : ${LDSHARED='$(CC) -shared'}
- else
- : ${LDSHARED='/usr/ccs/bin/ld'}
- fi
- DLDFLAGS="${linker_flag}-G"' -eInit_$(TARGET)'
- LDFLAGS="${LDFLAGS} ${linker_flag}-brtl"
- XLDFLAGS="${linker_flag}-bE:ruby.imp"
- : ${ARCHFILE="ruby.imp"}
- TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
- TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
- : ${LIBPATHENV=SHLIB_PATH}
- rb_cv_dlopen=yes ;;
- human*) : ${DLDFLAGS=''}
- : ${LDSHARED=''}
- : ${LDFLAGS=''}
- : ${LINK_SO='ar cru $@ $(OBJS)'}
+ rhapsody*) LDSHARED='cc -dynamic -bundle -undefined suppress'
+ LDFLAGS=""
+ DLDFLAGS="$ARCH_FLAG"
+ rb_cv_dlopen=yes ;;
+ darwin*) LDSHARED='cc -dynamic -bundle -undefined suppress'
+ LDFLAGS=""
+ DLDFLAGS="$ARCH_FLAG"
+ rb_cv_dlopen=yes ;;
+ aix*) LDSHARED='/usr/ccs/bin/ld'
+ XLDFLAGS='-Wl,-bE:ruby.imp'
+ DLDFLAGS='-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 -lc'
+ LDFLAGS="-brtl"
+ rb_cv_dlopen=yes ;;
+
+ human*) DLDFLAGS=''
+ LDSHARED=''
+ LDFLAGS=''
rb_cv_dlopen=yes ;;
beos*) case "$target_cpu" in
powerpc*)
- : ${LDSHARED="ld -xms"}
- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
+ LDSHARED="ld -xms"
+ 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 -lbe -lroot"
+ LDSHARED="ld -shared"
+ DLDFLAGS="-L/boot/develop/lib/x86 -lbe -lroot"
;;
esac
- : ${LIBPATHENV=LIBRARY_PATH}
- rb_cv_dlopen=yes ;;
- nto-qnx*) DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
- : ${LDSHARED='ld -Bshareable -x'}
- LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
- rb_cv_dlopen=yes;;
- cygwin*|mingw*) : ${LDSHARED="${CC} -shared -s"}
- XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
- DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
- : ${LIBPATHENV=""}
rb_cv_dlopen=yes ;;
- hiuxmpp) : ${LDSHARED='ld -r'} ;;
- atheos*) : ${LDSHARED="$CC -shared"}
+ cygwin*|mingw*) : ${LDSHARED="${DLLWRAP} --target=${target_os} --as=${AS} --dlltool-name=${DLLTOOL} --driver-name=${CC} --export-all -s"}
rb_cv_dlopen=yes ;;
- os2-emx*) LDFLAGS="$LDFLAGS -Zbsd-signals"
- ;;
- *) : ${LDSHARED='ld'} ;;
+ *) LDSHARED='ld' ;;
esac
AC_MSG_RESULT($rb_cv_dlopen)
-
- AC_ARG_ENABLE(rpath,
- [ --disable-rpath embed run path into extension libraries.],
- [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
- if test "$enable_rpath" = yes; then
- LIBPATHFLAG=" -L'%1\$-s'"
- RPATHFLAG=" ${linker_flag}-R'%1\$-s'"
- fi
fi
-AC_SUBST(LINK_SO)
-AC_SUBST(LIBPATHFLAG)
-AC_SUBST(RPATHFLAG)
-AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
-AC_SUBST(TRY_LINK)
dln_a_out_works=no
if test "$ac_cv_header_a_out_h" = yes; then
@@ -1150,24 +643,30 @@ if test "$dln_a_out_works" = yes; then
STATIC=-Bstatic
fi
DLEXT=so
+ AC_DEFINE(DLEXT, ".so")
CCDLFLAGS=
else
case "$target_os" in
- hpux*) DLEXT=sl;;
- nextstep*|openstep*|rhapsody*|darwin*)
- DLEXT=bundle;;
- os2-emx*) DLEXT=dll;;
- cygwin*|mingw*)
- DLEXT=so DLEXT2=dll;;
- *) DLEXT=so;;
+ hpux*) DLEXT=sl
+ AC_DEFINE(DLEXT, ".sl");;
+ nextstep*) DLEXT=bundle
+ AC_DEFINE(DLEXT, ".bundle");;
+ openstep*) DLEXT=bundle
+ AC_DEFINE(DLEXT, ".bundle");;
+ rhapsody*) DLEXT=bundle
+ AC_DEFINE(DLEXT, ".bundle");;
+ darwin*) DLEXT=bundle
+ AC_DEFINE(DLEXT, ".bundle");;
+ os2_emx*) DLEXT=dll
+ AC_DEFINE(DLEXT, ".dll");;
+ cygwin*|mingw*) DLEXT=so
+ AC_DEFINE(DLEXT, ".so")
+ DLEXT2=dll
+ AC_DEFINE(DLEXT2, ".dll");;
+ *) DLEXT=so
+ AC_DEFINE(DLEXT, ".so");;
esac
fi
-len=2 # .rb
-n=`expr "$DLEXT" : '.*'`; test "$n" -gt "$len" && len=$n
-n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
-AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
-test ".$DLEXT" = "." || AC_DEFINE_UNQUOTED(DLEXT, ".$DLEXT")
-test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
AC_SUBST(STRIP)dnl
if test "$with_dln_a_out" = yes; then
@@ -1177,7 +676,7 @@ else
fi
case "$target_os" in
- linux* | gnu* | k*bsd*-gnu)
+ linux*)
STRIP='strip -S -x';;
nextstep*)
STRIP='strip -A -n';;
@@ -1192,7 +691,7 @@ esac
EXTSTATIC=
AC_SUBST(EXTSTATIC)dnl
AC_ARG_WITH(static-linked-ext,
- [ --with-static-linked-ext link external modules statically],
+ [--with-static-linked-ext link external modules statically],
[case $withval in
yes) STATIC=
EXTSTATIC=static;;
@@ -1241,16 +740,15 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no
if test "$rb_cv_missing_fconvert" = yes; then
AC_DEFINE(MISSING_FCONVERT)
fi
- AC_LIBOBJ([x68.o])
- CFLAGS="$CFLAGS -fansi-only"
- XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
+ LIBOBJS="$LIBOBJS x68.o"
+ CFLAGS="$CFLAGS -fansi-only -cc1-stack=262144 -cpp-stack=2694144"
EXEEXT=.x
OBJEXT=o
setup=Setup.x68
;;
dnl OS/2 environment w/ Autoconf 2.1x for EMX
- os2-emx)
- AC_LIBOBJ([os2])
+ os2_emx)
+ LIBOBJS="$LIBOBJS os2.$OBJEXT"
setup=Setup.emx
;;
*djgpp*)
@@ -1267,54 +765,47 @@ if test "$prefix" = NONE; then
prefix=$ac_default_prefix
fi
-#if test "$fat_binary" != no ; then
-# CFLAGS="$CFLAGS $ARCH_FLAG"
-#fi
+if test "$fat_binary" = yes ; then
+ CFLAGS="$CFLAGS $ARCH_FLAG"
+fi
if test x"$cross_compiling" = xyes; then
- test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
+ MINIRUBY="ruby -I`pwd` -rfake"
PREP=fake.rb
- RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
else
MINIRUBY='./miniruby$(EXEEXT)'
- PREP='miniruby$(EXEEXT)'
- RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+ PREP=''
fi
AC_SUBST(MINIRUBY)
AC_SUBST(PREP)
-AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
FIRSTMAKEFILE=""
-LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
+LIBRUBY_A='lib$(RUBY_INSTALL_NAME).a'
LIBRUBY='$(LIBRUBY_A)'
-LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
-LIBRUBYARG='$(LIBRUBYARG_STATIC)'
+LIBRUBYARG='$(LIBRUBY_A)'
SOLIBS=
case "$target_os" in
- cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
- : ${DLDLIBS=""}
+ cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2_emx*)
+ DLDLIBS=""
;;
*)
- DLDLIBS="$DLDLIBS -lc"
+ DLDLIBS="-lc"
;;
esac
-RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'
LIBRUBY_LDSHARED=$LDSHARED
LIBRUBY_DLDFLAGS=$DLDFLAGS
-LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
-LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
+LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
+LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so'
ENABLE_SHARED=no
-AC_ARG_ENABLE(shared,
- [ --enable-shared build a shared library for Ruby. ],
+AC_ARG_ENABLE(enable-shared,
+ [--enable-shared build a shared library for Ruby. ],
[enable_shared=$enableval])
if test "$enable_shared" = 'yes'; then
LIBRUBY='$(LIBRUBY_SO)'
- LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
- LIBRUBYARG='$(LIBRUBYARG_SHARED)'
+ LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)'
CFLAGS="$CFLAGS $CCDLFLAGS"
ENABLE_SHARED=yes
if test "$rb_cv_binary_elf" = yes; then
@@ -1322,15 +813,15 @@ if test "$enable_shared" = 'yes'; then
fi
case "$target_os" in
sunos4*)
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
;;
- linux* | gnu* | k*bsd*-gnu | atheos*)
- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+ linux*)
+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so'
;;
- freebsd*|dragonfly*)
+ freebsd*)
SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)'
if test "$rb_cv_binary_elf" != "yes" ; then
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
LIBRUBY_ALIASES=''
@@ -1338,35 +829,33 @@ if test "$enable_shared" = 'yes'; then
;;
netbsd*)
SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
- LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+ LIBRUBY_SO='lib$(RUBY_INSTALL_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
- LIBRUBY_ALIASES=""
+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so'
+ else
+ LIBRUBY_ALIASES= # a.out platforms
fi
;;
openbsd*)
SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
- ;;
+ ;;
solaris*)
- SOLIBS='$(LIBS)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
- if test "$GCC" = yes; then
- LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
- fi
- XLDFLAGS="$XLDFLAGS "'-R${libdir}'
+ XLDFLAGS='-R${prefix}/lib'
;;
hpux*)
- XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
- LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
+ XLDFLAGS='-Wl,+s,+b,$(prefix)/lib'
+ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).sl'
;;
aix*)
- LIBRUBY_DLDFLAGS="${linker_flag}-G ${linker_flag}-bnoentry $XLDFLAGS"
- LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
+ if test "$GCC" = yes; then
+ LIBRUBY_LDSHARED='$(CC) -shared'
+ LIBRUBY_DLDFLAGS='-Wl,-bE:ruby.imp'
+ else
+ LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
+ LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
+ fi
+ LIBRUBYARG='-L${prefix}/lib -Wl,lib$(RUBY_INSTALL_NAME).so'
SOLIBS='-lm -lc'
;;
beos*)
@@ -1377,68 +866,34 @@ if test "$enable_shared" = 'yes'; then
esac
;;
darwin*)
- LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
- LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
- LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
- LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
- ;;
- interix*)
- LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
+ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
+ LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress'
+ LIBRUBY_DLDFLAGS='-install_name lib$(RUBY_INSTALL_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
;;
*)
;;
esac
fi
-if test "$enable_rpath" = yes; then
- LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
-fi
-
-LDFLAGS="-L. $LDFLAGS"
-AC_SUBST(ARCHFILE)
-
-dnl build rdoc index if requested
-RDOCTARGET=""
-AC_ARG_ENABLE(install-doc,
- [ --enable-install-doc build and install rdoc indexes during install ],
- [install_doc=$enableval], [install_doc=no])
-if test "$install_doc" != no; then
- RDOCTARGET="install-doc"
-fi
-AC_SUBST(RDOCTARGET)
case "$target_os" in
- linux*)
- XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
- ;;
- netbsd*)
+ nextstep*)
CFLAGS="$CFLAGS -pipe"
;;
- nextstep*|openstep*)
- # The -fno-common is needed if we wish to embed the Ruby interpreter
- # into a plugin module of some project (as opposed to embedding it
- # within the project's application). The -I/usr/local/include is
- # needed because CPP as discovered by configure (cc -E -traditional)
- # fails to consult /usr/local/include by default. This causes
- # mkmf.rb's have_header() to fail if the desired resource happens to be
- # installed in the /usr/local tree.
- CFLAGS="$CFLAGS -pipe -fno-common"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ openstep*)
+ CFLAGS="$CFLAGS -pipe"
;;
rhapsody*)
- CFLAGS="$CFLAGS -pipe -no-precomp -fno-common"
+ CFLAGS="$CFLAGS -pipe -no-precomp"
;;
darwin*)
- CFLAGS="$CFLAGS -pipe -fno-common"
- MINIOBJS=dmydln.o
+ CFLAGS="$CFLAGS -pipe -no-precomp"
;;
- os2-emx)
- CFLAGS="$CFLAGS -DOS2 -Zmts"
- LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
- LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
- LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
+ os2_emx)
+ CFLAGS="$CFLAGS -DOS2"
;;
osf*)
- if test "$GCC" != "yes" ; then
+ if test "$without_gcc" = "yes" ; then
# compile something small: taint.c is fine for this.
# the main point is the '-v' flag of 'cc'.
case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
@@ -1452,7 +907,7 @@ case "$target_os" in
rm -f /tmp/main.o
CFLAGS="$CFLAGS -std"
fi
- ;;
+ ;;
beos*)
case "$target_cpu" in
powerpc*)
@@ -1461,83 +916,47 @@ case "$target_os" in
esac
;;
cygwin*|mingw*)
- case "$target_os" in
- cygwin*)
- if test x"$enable_shared" = xyes; then
- LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
- LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
- fi
- AC_LIBOBJ([strftime])
- ;;
- mingw*)
- RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
- if test x"$enable_shared" = xyes; then
- LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
- LIBRUBY='lib$(LIBRUBY_SO).a'
- fi
- AC_LIBOBJ([win32])
- COMMON_LIBS=m
-# COMMON_MACROS="WIN32_LEAN_AND_MEAN="
- COMMON_HEADERS="windows.h winsock.h"
- ;;
- esac
- LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+ RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
+ if test x"$enable_shared" = xyes; then
+ LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
+ LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
+ else
+ LIBRUBY_SO=dummy
+ LIBRUBY_DLDFLAGS='--output-exp=$(RUBY_INSTALL_NAME).exp --dllname=$(RUBY_INSTALL_NAME)$(EXEEXT) --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)'
+ fi
LIBRUBY_ALIASES=''
+ LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a'
+ LIBRUBY='lib$(RUBY_SO_NAME).a'
+ LIBRUBYARG='-L. -l$(RUBY_SO_NAME)'
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
SOLIBS='$(LIBS)'
- if test x"$enable_shared" = xno; then
- LIBRUBY_SO=dummy
- LIBRUBY='lib$(RUBY_SO_NAME).a'
- LIBRUBYARG='-l$(RUBY_SO_NAME)'
- fi
- MINIOBJS=dmydln.o
- ;;
- hpux*)
- case "$YACC" in
- *yacc*)
- XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
- YACC="$YACC -Nl40000 -Nm40000"
- ;;
+ case "$target_os" in
+ cygwin*)
+ LIBOBJS="$LIBOBJS strftime.o"
+ CCDLFLAGS=-DUSEIMPORTLIB ;;
+ mingw*)
+ LIBOBJS="$LIBOBJS win32.o"
+ CFLAGS="-DNT -D__MSVCRT__ $CFLAGS"
+ CCDLFLAGS=-DIMPORT ;;
esac
- MINIOBJS=dmydln.o
;;
*)
- ;;
+ ;;
esac
-case "$build_os" in
- *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
-esac
-
-CPPFLAGS="$CPPFLAGS "'$(DEFS)'
-AC_SUBST(XCFLAGS)dnl
-AC_SUBST(XLDFLAGS)dnl
AC_SUBST(LIBRUBY_LDSHARED)
AC_SUBST(LIBRUBY_DLDFLAGS)
AC_SUBST(RUBY_INSTALL_NAME)
-AC_SUBST(rubyw_install_name)
-AC_SUBST(RUBYW_INSTALL_NAME)
AC_SUBST(RUBY_SO_NAME)
AC_SUBST(LIBRUBY_A)
AC_SUBST(LIBRUBY_SO)
AC_SUBST(LIBRUBY_ALIASES)
AC_SUBST(LIBRUBY)
AC_SUBST(LIBRUBYARG)
-AC_SUBST(LIBRUBYARG_STATIC)
-AC_SUBST(LIBRUBYARG_SHARED)
AC_SUBST(SOLIBS)
AC_SUBST(DLDLIBS)
AC_SUBST(ENABLE_SHARED)
AC_SUBST(MAINLIBS)
-AC_SUBST(COMMON_LIBS)
-AC_SUBST(COMMON_MACROS)
-AC_SUBST(COMMON_HEADERS)
-AC_SUBST(EXPORT_PREFIX)
-AC_SUBST(MINIOBJS)
-
-MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
-MAKEFILES="`echo $MAKEFILES`"
-AC_SUBST(MAKEFILES)
ri_prefix=
test "$program_prefix" != NONE &&
@@ -1549,13 +968,7 @@ test "$program_suffix" != NONE &&
RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
case "$target_os" in
- cygwin*|mingw*)
- RUBYW_INSTALL_NAME="${ri_prefix}rubyw${ri_suffix}"
- rubyw_install_name="$RUBYW_INSTALL_NAME"
- ;;
-esac
-case "$target_os" in
- cygwin*|mingw*|*djgpp*|os2-emx*)
+ cygwin*|mingw*|*djgpp*|os2_emx*)
RUBY_LIB_PREFIX="/lib/ruby"
;;
*)
@@ -1565,12 +978,12 @@ esac
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
AC_ARG_WITH(sitedir,
- [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
+ [--with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
[sitedir=$withval],
[sitedir='${prefix}/lib/ruby/site_ruby'])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
+SITE_DIR="`eval \"echo ${sitedir}\"`"
case "$target_os" in
- cygwin*|mingw*|*djgpp*|os2-emx*)
+ cygwin*|mingw*|*djgpp*|os2_emx*)
RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
RUBY_SITE_LIB_PATH="$SITE_DIR";;
*)
@@ -1583,13 +996,12 @@ AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
AC_SUBST(arch)dnl
-AC_SUBST(sitearch)dnl
AC_SUBST(sitedir)dnl
configure_args=$ac_configure_args
AC_SUBST(configure_args)dnl
-if test "$fat_binary" != no ; then
+if test "$fat_binary" = yes ; then
arch="fat-${target_os}"
AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
@@ -1603,57 +1015,18 @@ else
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
fi
-case "$target_os" in
- mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
- *) sitearch="${arch}" ;;
-esac
-
AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${arch}")
AC_ARG_WITH(search-path,
- [ --with-search-path=DIR specify the additional search path],
+ [--with-search-path=DIR specify the additional search path],
[search_path=$withval])
if test "$search_path" != ""; then
AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
fi
-AC_ARG_WITH(mantype,
- [ --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
- [
- case "$withval" in
- man|doc)
- MANTYPE=$withval
- ;;
- *)
- AC_MSG_ERROR(invalid man type: $withval)
- ;;
- esac
- ])
-if test -z "$MANTYPE"; then
- AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
- if ${NROFF} -mdoc ${srcdir}/ruby.1 >/dev/null 2>&1; then
- MANTYPE=doc
- else
- MANTYPE=man
- fi
-fi
-AC_SUBST(MANTYPE)
+echo "creating config.h"
+tr -d '\015' < confdefs.h > config.h
+: > confdefs.h
-if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
- echo "config.h unchanged"
-else
- echo "creating config.h"
- tr -d '\015' < confdefs.h > config.h
-fi
-tr -d '\015' < largefile.h > confdefs.h
-
-AC_CONFIG_FILES($FIRSTMAKEFILE)
-AC_CONFIG_FILES(Makefile, [{
- sed '/^MISSING/s/\$U\././g' Makefile
- echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
- test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
- sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
- } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
-[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
-AC_OUTPUT
+AC_OUTPUT($FIRSTMAKEFILE Makefile ext/extmk.rb)
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 03208df11c..0e89d15dec 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,47 +1,32 @@
include Makefile
ENABLE_SHARED=@ENABLE_SHARED@
-DLLWRAP = @DLLWRAP@ --target=@target_os@
-ifeq (@target_os@,cygwin)
- DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
-else
- DLL_BASE_NAME := $(RUBY_SO_NAME)
- DLLWRAP += -mno-cygwin
- VPATH += $(srcdir)/win32
-endif
-
-ifneq ($(ENABLE_SHARED),yes)
- RUBY_EXP = $(RUBY_INSTALL_NAME).exp
- EXTOBJS = $(RUBY_EXP)
+ifneq (,$(findstring no, $(ENABLE_SHARED)))
+ EXTOBJS = $(RUBY_INSTALL_NAME).exp
LIBRUBYARG = $(LIBRUBY_A)
- LIBRUBY_SO =
endif
-ifeq ($(RUBY_INSTALL_NAME),ruby)
- RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
-else
+ifneq (,$(findstring ruby, $(RUBY_INSTALL_NAME)))
RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
+else
+ RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
endif
-
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
-SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
+RUBYDEF = $(RUBY_INSTALL_NAME).def
+SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS)
EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
-RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
-ruby: $(PROGRAM)
-rubyw: $(WPROGRAM)
-
-$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
-$(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
+$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@
+$(LIBRUBY): $(LIBRUBY_SO)
%.res.@OBJEXT@: %.rc
- @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+ @WINDRES@ --preprocessor '$(CC) -E -xc-header -DRC_INVOKE @MWIN32@' --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
-$(RCFILES): $(RBCONFIG)
- @$(MINIRUBY) $(srcdir)/win32/resource.rb \
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
+ @@MINIRUBY@ $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
- -so_name=$(DLL_BASE_NAME) \
+ -so_name=$(LIBRUBY_SO) \
. $(icondirs) $(srcdir)/win32
$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
@@ -50,29 +35,7 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
$(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
$(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
-$(RUBY_EXP): $(LIBRUBY_A)
- $(DLLWRAP) \
- --output-exp=$(RUBY_EXP) \
- --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
- $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
- @rm -f $(PROGRAM)
-
-GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in
-
-ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32/win32.h
-endif
-
-ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
- @NM@ --extern --defined $(LIBRUBY_A) | \
- $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
- @DLLWRAP@ -s --def=rubydll.def -o $@
- @rm -f rubydll.def
-endif
-
-clean-local::
- @$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
-
-distclean-local::
- @$(RM) $(RCFILES)
+$(RUBYDEF): $(LIBRUBY_A)
+ echo EXPORTS > $(RUBYDEF)
+ @NM@ --extern-only --defined-only $(LIBRUBY_A) | \
+ @MINIRUBY@ -ne 'puts $$1 if / [CDT] _(.*)$$/' >> $(RUBYDEF)
diff --git a/defines.h b/defines.h
index 6b1fd68740..fefddee23b 100644
--- a/defines.h
+++ b/defines.h
@@ -12,227 +12,54 @@
#define RUBY
-#ifdef __cplusplus
-# ifndef HAVE_PROTOTYPES
-# define HAVE_PROTOTYPES 1
-# endif
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-
-#undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-
-#ifdef __cplusplus
-#define ANYARGS ...
-#else
-#define ANYARGS
-#endif
-
-#define xmalloc ruby_xmalloc
-#define xcalloc ruby_xcalloc
-#define xrealloc ruby_xrealloc
-#define xfree ruby_xfree
-
-void *xmalloc _((long));
-void *xcalloc _((long,long));
-void *xrealloc _((void*,long));
-void xfree _((void*));
-
-#if SIZEOF_LONG_LONG > 0
-# define LONG_LONG long long
-#elif SIZEOF___INT64 > 0
-# define HAVE_LONG_LONG 1
-# define LONG_LONG __int64
-# undef SIZEOF_LONG_LONG
-# define SIZEOF_LONG_LONG SIZEOF___INT64
-#endif
-
-#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned LONG_LONG
-# define BDIGIT_DBL_SIGNED LONG_LONG
-#elif SIZEOF_INT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS SIZEOF_SHORT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#else
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#endif
-
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
-#define DOSISH 1
-#ifndef _WIN32_WCE
-# define DOSISH_DRIVE_LETTER
-#endif
-#endif
-
/* define RUBY_USE_EUC/SJIS for default kanji-code */
#ifndef DEFAULT_KCODE
-#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
+#if defined(MSDOS) || defined(__CYGWIN__) || defined(__human68k__) || defined(__MACOS__) || defined(__EMX__) || defined(OS2) || defined(NT)
#define DEFAULT_KCODE KCODE_SJIS
#else
#define DEFAULT_KCODE KCODE_EUC
#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
-/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
- result in a different endian. Instead trust __BIG_ENDIAN__ and
- __LITTLE_ENDIAN__ which are set correctly by -arch. */
-#undef WORDS_BIGENDIAN
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN
-#endif
+#ifdef NeXT
+#define DYNAMIC_ENDIAN /* determine endian at runtime */
#ifndef __APPLE__
-/* NextStep, OpenStep (but not Rhapsody) */
-#ifndef GETPGRP_VOID
-#define GETPGRP_VOID 1
-#endif
-#ifndef WNOHANG
-#define WNOHANG 01
+#define S_IXUSR _S_IXUSR /* execute/search permission, owner */
#endif
-#ifndef WUNTRACED
-#define WUNTRACED 02
-#endif
-#ifndef X_OK
-#define X_OK 1
-#endif
-#endif /* __APPLE__ */
+#define S_IXGRP 0000010 /* execute/search permission, group */
+#define S_IXOTH 0000001 /* execute/search permission, other */
+
+#define HAVE_SYS_WAIT_H /* configure fails to find this */
#endif /* NeXT */
-#ifdef _WIN32
+#ifdef NT
#include "win32/win32.h"
#endif
-#if defined(__VMS)
-#include "vms.h"
-#endif
-
-#if defined(__BEOS__)
-#include <net/socket.h> /* intern.h needs fd_set definition */
-#endif
-
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
+#if defined __CYGWIN__
+# undef EXTERN
+# if defined USEIMPORTLIB
+# define EXTERN extern __declspec(dllimport)
+# else
+# define EXTERN extern __declspec(dllexport)
+# endif
#endif
#ifndef EXTERN
-#define EXTERN RUBY_EXTERN /* deprecated */
+#define EXTERN extern
#endif
-#ifndef RUBY_MBCHAR_MAXSIZE
-#define RUBY_MBCHAR_MAXSIZE INT_MAX
- /* MB_CUR_MAX will not work well in C locale */
+#ifdef sparc
+#define FLUSH_REGISTER_WINDOWS asm("ta 3")
+#else
+#define FLUSH_REGISTER_WINDOWS /* empty */
#endif
-#if defined(sparc) || defined(__sparc__)
-static inline void
-flush_register_windows(void)
-{
- asm
-#ifdef __GNUC__
- volatile
-#endif
-# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
- ("flushw")
-# else
- ("ta 0x03")
-# endif /* trap always to flush register windows if we are on a Sparc system */
- ;
-}
-# define FLUSH_REGISTER_WINDOWS flush_register_windows()
-#elif defined(__ia64)
-void *rb_ia64_bsp(void);
-void rb_ia64_flushrs(void);
-# define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
-#else
-# define FLUSH_REGISTER_WINDOWS ((void)0)
+#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
+#define DOSISH 1
#endif
-#if defined(DOSISH)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(OS2)
#define PATH_SEP ";"
#elif defined(riscos)
#define PATH_SEP ","
@@ -242,17 +69,12 @@ void rb_ia64_flushrs(void);
#define PATH_SEP_CHAR PATH_SEP[0]
#if defined(__human68k__)
-#define PATH_ENV "path"
-#else
-#define PATH_ENV "PATH"
-#endif
-
-#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
-#define ENV_IGNORECASE
+#undef HAVE_RANDOM
+#undef HAVE_SETITIMER
#endif
-#ifndef DLEXT_MAXLEN
-#define DLEXT_MAXLEN 4
+#if defined(DJGPP) || defined(__BOW__) || defined __CYGWIN__
+#undef HAVE_SETITIMER
#endif
#ifndef RUBY_PLATFORM
diff --git a/dir.c b/dir.c
index 0dd12ffd7d..f2f4faa8aa 100644
--- a/dir.c
+++ b/dir.c
@@ -6,7 +6,7 @@
$Date$
created at: Wed Jan 5 09:51:01 JST 1994
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
@@ -17,24 +17,24 @@
#include <sys/types.h>
#include <sys/stat.h>
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#else
+# define MAXPATHLEN 1024
+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if defined HAVE_DIRENT_H && !defined _WIN32
+#if defined HAVE_DIRENT_H && !defined NT
# include <dirent.h>
# define NAMLEN(dirent) strlen((dirent)->d_name)
-#elif defined HAVE_DIRECT_H && !defined _WIN32
+#elif defined HAVE_DIRECT_H && !defined NT
# include <direct.h>
# define NAMLEN(dirent) strlen((dirent)->d_name)
#else
# define dirent direct
-# 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
+# define NAMLEN(dirent) (dirent)->d_namlen
# if HAVE_SYS_NDIR_H
# include <sys/ndir.h>
# endif
@@ -44,8 +44,8 @@
# if HAVE_NDIR_H
# include <ndir.h>
# endif
-# ifdef _WIN32
-# include "win32/dir.h"
+# if defined(NT)
+# include "missing/dir.h"
# endif
#endif
@@ -61,380 +61,227 @@ char *strchr _((char*,char));
#include <ctype.h>
-#include "util.h"
-
-#if !defined HAVE_LSTAT && !defined lstat
-#define lstat stat
-#endif
-
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-# define CASEFOLD_FILESYSTEM 1
-# else
-# define CASEFOLD_FILESYSTEM 0
-# endif
+#ifndef HAVE_LSTAT
+#define lstat rb_sys_stat
#endif
#define FNM_NOESCAPE 0x01
#define FNM_PATHNAME 0x02
-#define FNM_DOTMATCH 0x04
-#define FNM_CASEFOLD 0x08
-#if CASEFOLD_FILESYSTEM
-#define FNM_SYSCASE FNM_CASEFOLD
-#else
-#define FNM_SYSCASE 0
-#endif
+#define FNM_PERIOD 0x04
+#define FNM_NOCASE 0x08
#define FNM_NOMATCH 1
#define FNM_ERROR 2
#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
-#define compare(c1, c2) (((unsigned char)(c1)) - ((unsigned char)(c2)))
-
-/* caution: in case *p == '\0'
- Next(p) == p + 1 in single byte environment
- Next(p) == p in multi byte environment
-*/
-#if defined(CharNext)
-# define Next(p) CharNext(p)
-#elif defined(DJGPP)
-# define Next(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
-#elif defined(__EMX__)
-# define Next(p) ((p) + emx_mblen(p))
-static inline int
-emx_mblen(const char *p)
-{
- int n = mblen(p, RUBY_MBCHAR_MAXSIZE);
- return (n < 0) ? 1 : n;
-}
-#endif
-#ifndef Next /* single byte environment */
-# define Next(p) ((p) + 1)
-# define Inc(p) (++(p))
-# define Compare(p1, p2) (compare(downcase(*(p1)), downcase(*(p2))))
-#else /* multi byte environment */
-# define Inc(p) ((p) = Next(p))
-# define Compare(p1, p2) (CompareImpl(p1, p2, nocase))
-static int
-CompareImpl(const char *p1, const char *p2, int nocase)
+#if defined DOSISH
+#define isdirsep(c) ((c) == '/' || (c) == '\\')
+static char *
+find_dirsep(s)
+ char *s;
{
- const int len1 = Next(p1) - p1;
- const int len2 = Next(p2) - p2;
-#ifdef _WIN32
- char buf1[10], buf2[10]; /* large enough? */
-#endif
-
- if (len1 < 0 || len2 < 0) {
- rb_fatal("CompareImpl: negative len");
- }
-
- if (len1 == 0) return len2;
- if (len2 == 0) return -len1;
-
-#ifdef _WIN32
- if (nocase && rb_w32_iswinnt()) {
- if (len1 > 1) {
- if (len1 >= sizeof(buf1)) {
- rb_fatal("CompareImpl: too large len");
- }
- memcpy(buf1, p1, len1);
- buf1[len1] = '\0';
- CharLower(buf1);
- p1 = buf1; /* trick */
- }
- if (len2 > 1) {
- if (len2 >= sizeof(buf2)) {
- rb_fatal("CompareImpl: too large len");
- }
- memcpy(buf2, p2, len2);
- buf2[len2] = '\0';
- CharLower(buf2);
- p2 = buf2; /* trick */
- }
+ while (*s) {
+ if (isdirsep(*s))
+ return s;
+ s++;
}
-#endif
- if (len1 == 1)
- if (len2 == 1)
- return compare(downcase(*p1), downcase(*p2));
- else {
- const int ret = compare(downcase(*p1), *p2);
- return ret ? ret : -1;
- }
- else
- if (len2 == 1) {
- const int ret = compare(*p1, downcase(*p2));
- return ret ? ret : 1;
- }
- else {
- const int ret = memcmp(p1, p2, len1 < len2 ? len1 : len2);
- return ret ? ret : len1 - len2;
- }
+ return 0;
}
-#endif /* environment */
+#else
+#define isdirsep(c) ((c) == '/')
+#define find_dirsep(s) strchr(s, '/')
+#endif
static char *
-bracket(p, s, flags)
- const char *p; /* pattern (next to '[') */
- const char *s; /* string */
+range(pat, test, flags)
+ char *pat;
+ char test;
int flags;
{
- const int nocase = flags & FNM_CASEFOLD;
- const int escape = !(flags & FNM_NOESCAPE);
-
- int ok = 0, not = 0;
-
- if (*p == '!' || *p == '^') {
- not = 1;
- p++;
- }
+ int not, ok = 0;
+ int nocase = flags & FNM_NOCASE;
+ int escape = !(flags & FNM_NOESCAPE);
- while (*p != ']') {
- const char *t1 = p;
- if (escape && *t1 == '\\')
- t1++;
- if (!*t1)
- return NULL;
- p = Next(t1);
- if (p[0] == '-' && p[1] != ']') {
- const char *t2 = p + 1;
- if (escape && *t2 == '\\')
- t2++;
- if (!*t2)
- return NULL;
- p = Next(t2);
- if (!ok && Compare(t1, s) <= 0 && Compare(s, t2) <= 0)
- ok = 1;
+ not = *pat == '!' || *pat == '^';
+ if (not)
+ pat++;
+
+ test = downcase(test);
+
+ while (*pat) {
+ int cstart, cend;
+ cstart = cend = *pat++;
+ if (cstart == ']')
+ return ok == not ? 0 : pat;
+ else if (escape && cstart == '\\')
+ cstart = cend = *pat++;
+ if (*pat == '-' && pat[1] != ']') {
+ if (escape && pat[1] == '\\')
+ pat++;
+ cend = pat[1];
+ if (!cend)
+ return 0;
+ pat += 2;
}
- else
- if (!ok && Compare(t1, s) == 0)
- ok = 1;
+ if (downcase(cstart) <= test && test <= downcase(cend))
+ ok = 1;
}
-
- return ok == not ? NULL : (char *)p + 1;
+ return 0;
}
-/* If FNM_PATHNAME is set, only path element will be matched. (upto '/' or '\0')
- Otherwise, entire string will be matched.
- End marker itself won't be compared.
- And if function succeeds, *pcur reaches end marker.
-*/
-#define UNESCAPE(p) (escape && *(p) == '\\' ? (p) + 1 : (p))
-#define ISEND(p) (!*(p) || (pathname && *(p) == '/'))
-#define RETURN(val) return *pcur = p, *scur = s, (val);
-
+#define PERIOD(s) (period && *(s) == '.' && \
+ ((s) == string || pathname && isdirsep(*(s))))
static int
-fnmatch_helper(pcur, scur, flags)
- const char **pcur; /* pattern */
- const char **scur; /* string */
+fnmatch(pat, string, flags)
+ const char *pat;
+ const char *string;
int flags;
{
- const int period = !(flags & FNM_DOTMATCH);
- const int pathname = flags & FNM_PATHNAME;
- const int escape = !(flags & FNM_NOESCAPE);
- const int nocase = flags & FNM_CASEFOLD;
-
- const char *ptmp = 0;
- const char *stmp = 0;
+ int c;
+ int test;
+ const char *s = string;
+ int escape = !(flags & FNM_NOESCAPE);
+ int pathname = flags & FNM_PATHNAME;
+ int period = flags & FNM_PERIOD;
+ int nocase = flags & FNM_NOCASE;
- const char *p = *pcur;
- const char *s = *scur;
+ while (c = *pat++) {
+ switch (c) {
+ case '?':
+ if (!*s || pathname && isdirsep(*s) || PERIOD(s))
+ return FNM_NOMATCH;
+ s++;
+ break;
+ case '*':
+ while ((c = *pat++) == '*')
+ ;
- if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
- RETURN(FNM_NOMATCH);
+ if (PERIOD(s))
+ return FNM_NOMATCH;
- while (1) {
- switch (*p) {
- case '*':
- do { p++; } while (*p == '*');
- if (ISEND(UNESCAPE(p))) {
- p = UNESCAPE(p);
- RETURN(0);
+ if (!c) {
+ if (pathname && find_dirsep(s))
+ return FNM_NOMATCH;
+ else
+ return 0;
}
- if (ISEND(s))
- RETURN(FNM_NOMATCH);
- ptmp = p;
- stmp = s;
- continue;
-
- case '?':
- if (ISEND(s))
- RETURN(FNM_NOMATCH);
- p++;
- Inc(s);
- continue;
-
- case '[': {
- const char *t;
- if (ISEND(s))
- RETURN(FNM_NOMATCH);
- if (t = bracket(p + 1, s, flags)) {
- p = t;
- Inc(s);
- continue;
+ else if (pathname && isdirsep(c)) {
+ s = find_dirsep(s);
+ if (s)
+ break;
+ return FNM_NOMATCH;
}
- goto failed;
- }
- }
-
- /* ordinary */
- p = UNESCAPE(p);
- if (ISEND(s))
- RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
- if (ISEND(p))
- goto failed;
- if (Compare(p, s) != 0)
- goto failed;
- Inc(p);
- Inc(s);
- continue;
-
- failed: /* try next '*' position */
- if (ptmp && stmp) {
- p = ptmp;
- Inc(stmp); /* !ISEND(*stmp) */
- s = stmp;
- continue;
- }
- RETURN(FNM_NOMATCH);
- }
-}
-static int
-fnmatch(p, s, flags)
- const char *p; /* pattern */
- const char *s; /* string */
- int flags;
-{
- const int period = !(flags & FNM_DOTMATCH);
- const int pathname = flags & FNM_PATHNAME;
-
- const char *ptmp = 0;
- const char *stmp = 0;
-
- if (pathname) {
- while (1) {
- if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
- do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
- ptmp = p;
- stmp = s;
- }
- if (fnmatch_helper(&p, &s, flags) == 0) {
- while (*s && *s != '/') Inc(s);
- if (*p && *s) {
- p++;
- s++;
- continue;
- }
- if (!*p && !*s)
+ test = escape && c == '\\' ? *pat : c;
+ test = downcase(test);
+ pat--;
+ while (*s) {
+ if ((c == '[' || downcase(*s) == test) &&
+ !fnmatch(pat, s, flags & ~FNM_PERIOD))
return 0;
- }
- /* failed : try next recursion */
- if (ptmp && stmp && !(period && *stmp == '.')) {
- while (*stmp && *stmp != '/') Inc(stmp);
- if (*stmp) {
- p = ptmp;
- stmp++;
- s = stmp;
- continue;
- }
+ else if (pathname && isdirsep(*s))
+ break;
+ s++;
}
return FNM_NOMATCH;
+
+ case '[':
+ if (!*s || pathname && isdirsep(*s) || PERIOD(s))
+ return FNM_NOMATCH;
+ pat = range(pat, *s, flags);
+ if (!pat)
+ return FNM_NOMATCH;
+ s++;
+ break;
+
+ case '\\':
+ if (escape
+#if defined DOSISH
+ && *pat && strchr("*?[\\", *pat)
+#endif
+ ) {
+ c = *pat;
+ if (!c)
+ c = '\\';
+ else
+ pat++;
+ }
+ /* FALLTHROUGH */
+
+ default:
+#if defined DOSISH
+ if (pathname && isdirsep(c) && isdirsep(*s))
+ ;
+ else
+#endif
+ if(downcase(c) != downcase(*s))
+ return FNM_NOMATCH;
+ s++;
+ break;
}
}
- else
- return fnmatch_helper(&p, &s, flags);
+ return !*s ? 0 : FNM_NOMATCH;
}
VALUE rb_cDir;
-struct dir_data {
- DIR *dir;
- char *path;
-};
-
static void
free_dir(dir)
- struct dir_data *dir;
+ DIR *dir;
{
- if (dir) {
- if (dir->dir) closedir(dir->dir);
- if (dir->path) free(dir->path);
- }
- free(dir);
+ if (dir) closedir(dir);
}
static VALUE dir_close _((VALUE));
-static VALUE dir_s_alloc _((VALUE));
static VALUE
-dir_s_alloc(klass)
+dir_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
VALUE klass;
{
- struct dir_data *dirp;
- VALUE obj = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dirp);
+ VALUE obj = Data_Wrap_Struct(klass, 0, free_dir, 0);
- dirp->dir = NULL;
- dirp->path = NULL;
+ rb_obj_call_init(obj, argc, argv);
return obj;
}
-/*
- * call-seq:
- * Dir.new( string ) -> aDir
- *
- * Returns a new directory object for the named directory.
- */
static VALUE
dir_initialize(dir, dirname)
VALUE dir, dirname;
{
- struct dir_data *dp;
-
- SafeStringValue(dirname);
- Data_Get_Struct(dir, struct dir_data, dp);
- if (dp->dir) closedir(dp->dir);
- if (dp->path) free(dp->path);
- dp->dir = NULL;
- dp->path = NULL;
- dp->dir = opendir(RSTRING(dirname)->ptr);
- if (dp->dir == NULL) {
+ DIR *dirp;
+
+ Check_SafeStr(dirname);
+ if (DATA_PTR(dir)) closedir(DATA_PTR(dir));
+ DATA_PTR(dir) = NULL;
+ dirp = opendir(RSTRING(dirname)->ptr);
+ if (dirp == NULL) {
if (errno == EMFILE || errno == ENFILE) {
rb_gc();
- dp->dir = opendir(RSTRING(dirname)->ptr);
+ dirp = opendir(RSTRING(dirname)->ptr);
}
- if (dp->dir == NULL) {
+ if (dirp == NULL) {
rb_sys_fail(RSTRING(dirname)->ptr);
}
}
- dp->path = strdup(RSTRING(dirname)->ptr);
+ DATA_PTR(dir) = dirp;
return dir;
}
-/*
- * call-seq:
- * Dir.open( string ) => aDir
- * Dir.open( string ) {| aDir | block } => anObject
- *
- * With no block, <code>open</code> is a synonym for
- * <code>Dir::new</code>. If a block is present, it is passed
- * <i>aDir</i> as a parameter. The directory is closed at the end of
- * the block, and <code>Dir::open</code> returns the value of the
- * block.
- */
-
static VALUE
dir_s_open(klass, dirname)
VALUE klass, dirname;
{
- struct dir_data *dp;
- VALUE dir = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dp);
+ VALUE dir = Data_Wrap_Struct(klass, 0, free_dir, 0);
dir_initialize(dir, dirname);
if (rb_block_given_p()) {
- return rb_ensure(rb_yield, dir, dir_close, dir);
+ rb_ensure(rb_yield, dir, dir_close, dir);
+ return Qnil;
}
return dir;
@@ -446,89 +293,23 @@ dir_closed()
rb_raise(rb_eIOError, "closed directory");
}
-static void
-dir_check(dir)
- VALUE dir;
-{
- if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
- rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
- rb_check_frozen(dir);
-}
-
-#define GetDIR(obj, dirp) do {\
- dir_check(dir);\
- Data_Get_Struct(obj, struct dir_data, dirp);\
- if (dirp->dir == NULL) dir_closed();\
-} while (0)
-
-/*
- * call-seq:
- * dir.inspect => string
- *
- * Return a string describing this Dir object.
- */
-static VALUE
-dir_inspect(dir)
- VALUE dir;
-{
- struct dir_data *dirp;
-
- GetDIR(dir, dirp);
- if (dirp->path) {
- char *c = rb_obj_classname(dir);
- int len = strlen(c) + strlen(dirp->path) + 4;
- VALUE s = rb_str_new(0, len);
- snprintf(RSTRING_PTR(s), len+1, "#<%s:%s>", c, dirp->path);
- return s;
- }
- return rb_funcall(dir, rb_intern("to_s"), 0, 0);
-}
-
-/*
- * call-seq:
- * dir.path => string or nil
- *
- * Returns the path parameter passed to <em>dir</em>'s constructor.
- *
- * d = Dir.new("..")
- * d.path #=> ".."
- */
-static VALUE
-dir_path(dir)
- VALUE dir;
-{
- struct dir_data *dirp;
-
- GetDIR(dir, dirp);
- if (!dirp->path) return Qnil;
- return rb_str_new2(dirp->path);
+#define GetDIR(obj, dirp) {\
+ Data_Get_Struct(obj, DIR, dirp);\
+ if (dirp == NULL) dir_closed();\
}
-/*
- * call-seq:
- * dir.read => string or nil
- *
- * Reads the next entry from <em>dir</em> and returns it as a string.
- * Returns <code>nil</code> at the end of the stream.
- *
- * d = Dir.new("testdir")
- * d.read #=> "."
- * d.read #=> ".."
- * d.read #=> "config.h"
- */
static VALUE
dir_read(dir)
VALUE dir;
{
- struct dir_data *dirp;
+ DIR *dirp;
struct dirent *dp;
GetDIR(dir, dirp);
errno = 0;
- dp = readdir(dirp->dir);
- if (dp) {
+ dp = readdir(dirp);
+ if (dp)
return rb_tainted_str_new(dp->d_name, NAMLEN(dp));
- }
else if (errno == 0) { /* end of stream */
return Qnil;
}
@@ -538,344 +319,127 @@ dir_read(dir)
return Qnil; /* not reached */
}
-/*
- * call-seq:
- * dir.each { |filename| block } => dir
- *
- * Calls the block once for each entry in this directory, passing the
- * filename of each entry as a parameter to the block.
- *
- * d = Dir.new("testdir")
- * d.each {|x| puts "Got #{x}" }
- *
- * <em>produces:</em>
- *
- * Got .
- * Got ..
- * Got config.h
- * Got main.rb
- */
static VALUE
dir_each(dir)
VALUE dir;
{
- struct dir_data *dirp;
+ DIR *dirp;
struct dirent *dp;
GetDIR(dir, dirp);
- rewinddir(dirp->dir);
- for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
+ for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
- if (dirp->dir == NULL) dir_closed();
+ if (DATA_PTR(dir) == NULL) dir_closed();
}
return dir;
}
-/*
- * call-seq:
- * dir.pos => integer
- * dir.tell => integer
- *
- * Returns the current position in <em>dir</em>. See also
- * <code>Dir#seek</code>.
- *
- * d = Dir.new("testdir")
- * d.tell #=> 0
- * d.read #=> "."
- * d.tell #=> 12
- */
static VALUE
dir_tell(dir)
VALUE dir;
{
#ifdef HAVE_TELLDIR
- struct dir_data *dirp;
+ DIR *dirp;
long pos;
GetDIR(dir, dirp);
- pos = telldir(dirp->dir);
+ pos = telldir(dirp);
return rb_int2inum(pos);
#else
rb_notimplement();
#endif
}
-/*
- * call-seq:
- * dir.seek( integer ) => dir
- *
- * Seeks to a particular location in <em>dir</em>. <i>integer</i>
- * must be a value returned by <code>Dir#tell</code>.
- *
- * d = Dir.new("testdir") #=> #<Dir:0x401b3c40>
- * d.read #=> "."
- * i = d.tell #=> 12
- * d.read #=> ".."
- * d.seek(i) #=> #<Dir:0x401b3c40>
- * d.read #=> ".."
- */
static VALUE
dir_seek(dir, pos)
VALUE dir, pos;
{
- struct dir_data *dirp;
- off_t p = NUM2OFFT(pos);
+ DIR *dirp;
- GetDIR(dir, dirp);
#ifdef HAVE_SEEKDIR
- seekdir(dirp->dir, p);
+ GetDIR(dir, dirp);
+ seekdir(dirp, NUM2INT(pos));
return dir;
#else
rb_notimplement();
#endif
}
-/*
- * call-seq:
- * dir.pos( integer ) => integer
- *
- * Synonym for <code>Dir#seek</code>, but returns the position
- * parameter.
- *
- * d = Dir.new("testdir") #=> #<Dir:0x401b3c40>
- * d.read #=> "."
- * i = d.pos #=> 12
- * d.read #=> ".."
- * d.pos = i #=> 12
- * d.read #=> ".."
- */
-static VALUE
-dir_set_pos(dir, pos)
- VALUE dir, pos;
-{
- dir_seek(dir, pos);
- return pos;
-}
-
-/*
- * call-seq:
- * dir.rewind => dir
- *
- * Repositions <em>dir</em> to the first entry.
- *
- * d = Dir.new("testdir")
- * d.read #=> "."
- * d.rewind #=> #<Dir:0x401b3fb0>
- * d.read #=> "."
- */
static VALUE
dir_rewind(dir)
VALUE dir;
{
- struct dir_data *dirp;
+ DIR *dirp;
- if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
- rb_raise(rb_eSecurityError, "Insecure: can't close");
- }
GetDIR(dir, dirp);
- rewinddir(dirp->dir);
+ rewinddir(dirp);
return dir;
}
-/*
- * call-seq:
- * dir.close => nil
- *
- * Closes the directory stream. Any further attempts to access
- * <em>dir</em> will raise an <code>IOError</code>.
- *
- * d = Dir.new("testdir")
- * d.close #=> nil
- */
static VALUE
dir_close(dir)
VALUE dir;
{
- struct dir_data *dirp;
-
- GetDIR(dir, dirp);
- closedir(dirp->dir);
- dirp->dir = NULL;
-
- return Qnil;
-}
-
-static void
-dir_chdir(path)
- VALUE path;
-{
- if (chdir(RSTRING(path)->ptr) < 0)
- rb_sys_fail(RSTRING(path)->ptr);
-}
-
-static int chdir_blocking = 0;
-static VALUE chdir_thread = Qnil;
+ DIR *dirp;
-struct chdir_data {
- VALUE old_path, new_path;
- int done;
-};
+ Data_Get_Struct(dir, DIR, dirp);
+ if (dirp == NULL) dir_closed();
+ closedir(dirp);
+ DATA_PTR(dir) = NULL;
-static VALUE
-chdir_yield(args)
- struct chdir_data *args;
-{
- dir_chdir(args->new_path);
- args->done = Qtrue;
- chdir_blocking++;
- if (chdir_thread == Qnil)
- chdir_thread = rb_thread_current();
- return rb_yield(args->new_path);
-}
-
-static VALUE
-chdir_restore(args)
- struct chdir_data *args;
-{
- if (args->done) {
- chdir_blocking--;
- if (chdir_blocking == 0)
- chdir_thread = Qnil;
- dir_chdir(args->old_path);
- }
return Qnil;
}
-/*
- * call-seq:
- * Dir.chdir( [ string] ) => 0
- * Dir.chdir( [ string] ) {| path | block } => anObject
- *
- * Changes the current working directory of the process to the given
- * string. When called without an argument, changes the directory to
- * the value of the environment variable <code>HOME</code>, or
- * <code>LOGDIR</code>. <code>SystemCallError</code> (probably
- * <code>Errno::ENOENT</code>) if the target directory does not exist.
- *
- * If a block is given, it is passed the name of the new current
- * directory, and the block is executed with that as the current
- * directory. The original working directory is restored when the block
- * exits. The return value of <code>chdir</code> is the value of the
- * block. <code>chdir</code> blocks can be nested, but in a
- * multi-threaded program an error will be raised if a thread attempts
- * to open a <code>chdir</code> block while another thread has one
- * open.
- *
- * Dir.chdir("/var/spool/mail")
- * puts Dir.pwd
- * Dir.chdir("/tmp") do
- * puts Dir.pwd
- * Dir.chdir("/usr") do
- * puts Dir.pwd
- * end
- * puts Dir.pwd
- * end
- * puts Dir.pwd
- *
- * <em>produces:</em>
- *
- * /var/spool/mail
- * /tmp
- * /usr
- * /tmp
- * /var/spool/mail
- */
static VALUE
dir_s_chdir(argc, argv, obj)
int argc;
VALUE *argv;
VALUE obj;
{
- VALUE path = Qnil;
+ VALUE path;
+ char *dist = "";
rb_secure(2);
if (rb_scan_args(argc, argv, "01", &path) == 1) {
- SafeStringValue(path);
+ Check_SafeStr(path);
+ dist = RSTRING(path)->ptr;
}
else {
- const char *dist = getenv("HOME");
+ dist = getenv("HOME");
if (!dist) {
dist = getenv("LOGDIR");
- if (!dist) rb_raise(rb_eArgError, "HOME/LOGDIR not set");
}
- path = rb_str_new2(dist);
}
- if (chdir_blocking > 0) {
- if (!rb_block_given_p() || rb_thread_current() != chdir_thread)
- rb_warn("conflicting chdir during another chdir block");
- }
-
- if (rb_block_given_p()) {
- struct chdir_data args;
- char *cwd = my_getcwd();
-
- args.old_path = rb_tainted_str_new2(cwd); free(cwd);
- args.new_path = path;
- args.done = Qfalse;
- return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
- }
- dir_chdir(path);
+ if (chdir(dist) < 0)
+ rb_sys_fail(dist);
return INT2FIX(0);
}
-/*
- * call-seq:
- * Dir.getwd => string
- * Dir.pwd => string
- *
- * Returns the path to the current working directory of this process as
- * a string.
- *
- * Dir.chdir("/tmp") #=> 0
- * Dir.getwd #=> "/tmp"
- */
static VALUE
dir_s_getwd(dir)
VALUE dir;
{
- char *path;
- VALUE cwd;
+ char path[MAXPATHLEN];
- rb_secure(4);
- path = my_getcwd();
- cwd = rb_tainted_str_new2(path);
-
- free(path);
- return cwd;
-}
-
-static void check_dirname _((volatile VALUE *));
-static void
-check_dirname(dir)
- volatile VALUE *dir;
-{
- char *path, *pend;
+#ifdef HAVE_GETCWD
+ if (getcwd(path, sizeof(path)) == 0) rb_sys_fail(path);
+#else
+ extern char *getwd();
+ if (getwd(path) == 0) rb_sys_fail(path);
+#endif
- SafeStringValue(*dir);
- rb_secure(2);
- path = RSTRING(*dir)->ptr;
- if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
- *dir = rb_str_new(path, pend - path);
- }
+ return rb_tainted_str_new2(path);
}
-/*
- * call-seq:
- * Dir.chroot( string ) => 0
- *
- * Changes this process's idea of the file system root. Only a
- * privileged process may make this call. Not available on all
- * platforms. On Unix systems, see <code>chroot(2)</code> for more
- * information.
- */
static VALUE
dir_s_chroot(dir, path)
VALUE dir, path;
{
#if defined(HAVE_CHROOT) && !defined(__CHECKER__)
- check_dirname(&path);
+ rb_secure(2);
+ Check_SafeStr(path);
if (chroot(RSTRING(path)->ptr) == -1)
rb_sys_fail(RSTRING(path)->ptr);
@@ -887,19 +451,6 @@ dir_s_chroot(dir, path)
#endif
}
-/*
- * call-seq:
- * Dir.mkdir( string [, integer] ) => 0
- *
- * Makes a new directory named by <i>string</i>, with permissions
- * specified by the optional parameter <i>anInteger</i>. The
- * permissions may be modified by the value of
- * <code>File::umask</code>, and are ignored on NT. Raises a
- * <code>SystemCallError</code> if the directory cannot be created. See
- * also the discussion of permissions in the class documentation for
- * <code>File</code>.
- *
- */
static VALUE
dir_s_mkdir(argc, argv, obj)
int argc;
@@ -916,1046 +467,386 @@ dir_s_mkdir(argc, argv, obj)
mode = 0777;
}
- check_dirname(&path);
+ Check_SafeStr(path);
+ rb_secure(2);
+#if !defined(NT)
if (mkdir(RSTRING(path)->ptr, mode) == -1)
rb_sys_fail(RSTRING(path)->ptr);
+#else
+ if (mkdir(RSTRING(path)->ptr) == -1)
+ rb_sys_fail(RSTRING(path)->ptr);
+#endif
return INT2FIX(0);
}
-/*
- * call-seq:
- * Dir.delete( string ) => 0
- * Dir.rmdir( string ) => 0
- * Dir.unlink( string ) => 0
- *
- * Deletes the named directory. Raises a subclass of
- * <code>SystemCallError</code> if the directory isn't empty.
- */
static VALUE
dir_s_rmdir(obj, dir)
VALUE obj, dir;
{
- check_dirname(&dir);
+ Check_SafeStr(dir);
+ rb_secure(2);
if (rmdir(RSTRING(dir)->ptr) < 0)
rb_sys_fail(RSTRING(dir)->ptr);
return INT2FIX(0);
}
-static void
-sys_warning_1(mesg)
- const char* mesg;
-{
- rb_sys_warning("%s", mesg);
-}
-
-#define GLOB_VERBOSE (1UL << (sizeof(int) * CHAR_BIT - 1))
-#define sys_warning(val) \
- (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
-
-#define GLOB_ALLOC(type) (type *)malloc(sizeof(type))
-#define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
-#define GLOB_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
- * is not a directory.
- */
-#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
-
-/* System call with warning */
-static int
-do_stat(const char *path, struct stat *pst, int flags)
-
-{
- int ret = stat(path, pst);
- if (ret < 0 && !to_be_ignored(errno))
- sys_warning(path);
-
- return ret;
-}
-
-static int
-do_lstat(const char *path, struct stat *pst, int flags)
-{
- int ret = lstat(path, pst);
- if (ret < 0 && !to_be_ignored(errno))
- sys_warning(path);
-
- return ret;
-}
-
-static DIR *
-do_opendir(const char *path, int flags)
-{
- DIR *dirp = opendir(path);
- if (dirp == NULL && !to_be_ignored(errno))
- sys_warning(path);
-
- return dirp;
-}
-
/* Return nonzero if S has any special globbing chars in it. */
static int
-has_magic(s, flags)
- const char *s;
- int flags;
+has_magic(s, send)
+ char *s, *send;
{
- const int escape = !(flags & FNM_NOESCAPE);
- const int nocase = flags & FNM_CASEFOLD;
-
- register const char *p = s;
+ register char *p = s;
register char c;
+ int open = 0;
- while (c = *p++) {
+ while ((c = *p++) != '\0') {
switch (c) {
- case '*':
case '?':
- case '[':
- return 1;
-
- case '\\':
- if (escape && !(c = *p++))
- return 0;
- continue;
-
- default:
- if (!FNM_SYSCASE && ISALPHA(c) && nocase)
- return 1;
- }
-
- p = Next(p-1);
- }
-
- return 0;
-}
-
-/* Find separator in globbing pattern. */
-static char *
-find_dirsep(const char *s, int flags)
-{
- const int escape = !(flags & FNM_NOESCAPE);
-
- register const char *p = s;
- register char c;
- int open = 0;
+ case '*':
+ return Qtrue;
- while (c = *p++) {
- switch (c) {
- case '[':
- open = 1;
- continue;
+ case '[': /* Only accept an open brace if there is a close */
+ open++; /* brace to match it. Bracket expressions must be */
+ continue; /* complete, according to Posix.2 */
case ']':
- open = 0;
- continue;
-
- case '/':
- if (!open)
- return (char *)p-1;
+ if (open)
+ return Qtrue;
continue;
case '\\':
- if (escape && !(c = *p++))
- return (char *)p-1;
- continue;
+ if (*p++ == '\0')
+ return Qfalse;
}
- p = Next(p-1);
+ if (send && p >= send) break;
}
-
- return (char *)p-1;
-}
-
-/* Remove escaping backslashes */
-static void
-remove_backslashes(p)
- char *p;
-{
- char *t = p;
- char *s = p;
-
- while (*p) {
- if (*p == '\\') {
- if (t != s)
- memmove(t, s, p - s);
- t += p - s;
- s = ++p;
- if (!*p) break;
- }
- Inc(p);
- }
-
- while (*p++);
-
- if (t != s)
- memmove(t, s, p - s); /* move '\0' too */
+ return Qfalse;
}
-/* Globing pattern */
-enum glob_pattern_type { PLAIN, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
-
-struct glob_pattern {
- char *str;
- enum glob_pattern_type type;
- struct glob_pattern *next;
-};
-
-static void glob_free_pattern(struct glob_pattern *list);
-
-static struct glob_pattern *
-glob_make_pattern(const char *p, int flags)
+static char*
+extract_path(p, pend)
+ char *p, *pend;
{
- struct glob_pattern *list, *tmp, **tail = &list;
- int dirsep = 0; /* pattern is terminated with '/' */
+ char *alloc;
+ int len;
- while (*p) {
- tmp = GLOB_ALLOC(struct glob_pattern);
- if (!tmp) goto error;
- if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
- /* fold continuous RECURSIVEs (needed in glob_helper) */
- do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
- tmp->type = RECURSIVE;
- tmp->str = 0;
- dirsep = 1;
- }
- else {
- const char *m = find_dirsep(p, flags);
- char *buf = GLOB_ALLOC_N(char, m-p+1);
- if (!buf) {
- free(tmp);
- goto error;
- }
- memcpy(buf, p, m-p);
- buf[m-p] = '\0';
- tmp->type = has_magic(buf, flags) ? MAGICAL : PLAIN;
- tmp->str = buf;
- if (*m) {
- dirsep = 1;
- p = m + 1;
- }
- else {
- dirsep = 0;
- p = m;
- }
- }
- *tail = tmp;
- tail = &tmp->next;
+ len = pend - p;
+ alloc = ALLOC_N(char, len+1);
+ memcpy(alloc, p, len);
+ if (len > 1 && pend[-1] == '/'
+#if defined DOSISH
+ && pend[-2] != ':'
+#endif
+ ) {
+ alloc[len-1] = 0;
}
-
- tmp = GLOB_ALLOC(struct glob_pattern);
- if (!tmp) {
- error:
- *tail = 0;
- glob_free_pattern(list);
- return 0;
+ else {
+ alloc[len] = 0;
}
- tmp->type = dirsep ? MATCH_DIR : MATCH_ALL;
- tmp->str = 0;
- *tail = tmp;
- tmp->next = 0;
- return list;
-}
-
-static void
-glob_free_pattern(struct glob_pattern *list)
-{
- while (list) {
- struct glob_pattern *tmp = list;
- list = list->next;
- if (tmp->str)
- free(tmp->str);
- free(tmp);
- }
+ return alloc;
}
-static char *
-join_path(const char *path, int dirsep, const char *name)
+static char*
+extract_elem(path)
+ char *path;
{
- long len = strlen(path);
- char *buf = GLOB_ALLOC_N(char, len+strlen(name)+(dirsep?1:0)+1);
-
- if (!buf) return 0;
- memcpy(buf, path, len);
- if (dirsep) {
- strcpy(buf+len, "/");
- len++;
- }
- strcpy(buf+len, name);
- return buf;
-}
+ char *pend;
-enum answer { YES, NO, UNKNOWN };
+ pend = strchr(path, '/');
+ if (!pend) pend = path + strlen(path);
-#ifndef S_ISLNK
-# ifndef S_IFLNK
-# define S_ISLNK(m) (0)
-# else
-# define S_ISLNK(m) ((m & S_IFMT) == S_IFLNK)
-# endif
-#endif
+ return extract_path(path, pend);
+}
#ifndef S_ISDIR
# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
#endif
-struct glob_args {
- void (*func) _((const char*, VALUE));
- const char *c;
- VALUE v;
-};
-
-static VALUE glob_func_caller _((VALUE));
-
-static VALUE
-glob_func_caller(val)
- VALUE val;
-{
- struct glob_args *args = (struct glob_args *)val;
-
- (*args->func)(args->c, args->v);
- return Qnil;
-}
-
-#define glob_call_func(func, path, arg) (*func)(path, arg)
-
-static int glob_helper _((const char *, int, enum answer, enum answer, struct glob_pattern **, struct glob_pattern **, int, ruby_glob_func *, VALUE));
-
-static int
-glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
- const char *path;
- int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
- enum answer exist; /* Does 'path' indicate an existing entry? */
- enum answer isdir; /* Does 'path' indicate a directory or a symlink to a directory? */
- struct glob_pattern **beg;
- struct glob_pattern **end;
- int flags;
- ruby_glob_func *func;
+void
+rb_glob_helper(path, flag, func, arg)
+ char *path;
+ int flag;
+ void (*func)();
VALUE arg;
{
struct stat st;
- int status = 0;
- struct glob_pattern **cur, **new_beg, **new_end;
- int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
- int escape = !(flags & FNM_NOESCAPE);
+ char *p, *m;
- for (cur = beg; cur < end; ++cur) {
- struct glob_pattern *p = *cur;
- if (p->type == RECURSIVE) {
- recursive = 1;
- p = p->next;
+ if (!has_magic(path, 0)) {
+ if (rb_sys_stat(path, &st) == 0) {
+ (*func)(path, arg);
}
- switch (p->type) {
- case PLAIN:
- plain = 1;
- break;
- case MAGICAL:
- magical = 1;
- break;
- case MATCH_ALL:
- match_all = 1;
- break;
- case MATCH_DIR:
- match_dir = 1;
- break;
- case RECURSIVE:
- rb_bug("continuous RECURSIVEs");
- }
- }
-
- if (*path) {
- if (match_all && exist == UNKNOWN) {
- if (do_lstat(path, &st, flags) == 0) {
- exist = YES;
- isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
+ return;
+ }
+
+ p = path;
+ while (p) {
+ if (*p == '/') p++;
+ m = strchr(p, '/');
+ if (has_magic(p, m)) {
+ char *dir, *base, *magic, *buf;
+ DIR *dirp;
+ struct dirent *dp;
+ int recursive = 0;
+
+ struct d_link {
+ char *path;
+ struct d_link *next;
+ } *tmp, *link = 0;
+
+ base = extract_path(path, p);
+ if (path == p) dir = ".";
+ else dir = base;
+
+ magic = extract_elem(p);
+ if (m && strcmp(magic, "**") == 0) {
+ recursive = 1;
+ buf = ALLOC_N(char, strlen(base)+strlen(m)+3);
+ sprintf(buf, "%s%s%s", base, (*base)?"":".", m);
+ rb_glob_helper(buf, flag, func, arg);
+ free(buf);
}
- else {
- exist = NO;
- isdir = NO;
+ if (rb_sys_stat(dir, &st) < 0) {
+ free(base);
+ break;
}
- }
- if (match_dir && isdir == UNKNOWN) {
- if (do_stat(path, &st, flags) == 0) {
- exist = YES;
- isdir = S_ISDIR(st.st_mode) ? YES : NO;
+ if (S_ISDIR(st.st_mode)) {
+ dirp = opendir(dir);
+ if (dirp == NULL) {
+ free(base);
+ break;
+ }
}
else {
- exist = NO;
- isdir = NO;
- }
- }
- if (match_all && exist == YES) {
- status = glob_call_func(func, path, arg);
- if (status) return status;
- }
- if (match_dir && isdir == YES) {
- char *tmp = join_path(path, dirsep, "");
- if (!tmp) return -1;
- status = glob_call_func(func, tmp, arg);
- free(tmp);
- if (status) return status;
- }
- }
-
- if (exist == NO || isdir == NO) return 0;
-
- if (magical || recursive) {
- struct dirent *dp;
- DIR *dirp = do_opendir(*path ? path : ".", flags);
- if (dirp == NULL) return 0;
-
- for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
- char *buf = join_path(path, dirsep, dp->d_name);
- enum answer new_isdir = UNKNOWN;
-
- if (!buf) {
- status = -1;
- break;
+ free(base);
+ break;
}
- if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
- && fnmatch("*", dp->d_name, flags) == 0) {
-#ifndef _WIN32
- if (do_lstat(buf, &st, flags) == 0)
- new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
- else
- new_isdir = NO;
+
+#if defined DOSISH
+#define BASE (*base && !((isdirsep(*base) && !base[1]) || (base[1] == ':' && isdirsep(base[2]) && !base[3])))
#else
- new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO;
+#define BASE (*base && !(*base == '/' && !base[1]))
#endif
- }
-
- new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
- if (!new_beg) {
- status = -1;
- break;
- }
-
- for (cur = beg; cur < end; ++cur) {
- struct glob_pattern *p = *cur;
- if (p->type == RECURSIVE) {
- if (new_isdir == YES) /* not symlink but real directory */
- *new_end++ = p; /* append recursive pattern */
- p = p->next; /* 0 times recursion */
- }
- if (p->type == PLAIN || p->type == MAGICAL) {
- if (fnmatch(p->str, dp->d_name, flags) == 0)
- *new_end++ = p->next;
- }
- }
-
- status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end, flags, func, arg);
- free(buf);
- free(new_beg);
- if (status) break;
- }
-
- closedir(dirp);
- }
- else if (plain) {
- struct glob_pattern **copy_beg, **copy_end, **cur2;
-
- copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
- if (!copy_beg) return -1;
- for (cur = beg; cur < end; ++cur)
- *copy_end++ = (*cur)->type == PLAIN ? *cur : 0;
-
- for (cur = copy_beg; cur < copy_end; ++cur) {
- if (*cur) {
- char *buf;
- char *name;
- name = GLOB_ALLOC_N(char, strlen((*cur)->str) + 1);
- if (!name) {
- status = -1;
- break;
- }
- strcpy(name, (*cur)->str);
- if (escape) remove_backslashes(name);
- new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
- if (!new_beg) {
- free(name);
- status = -1;
- break;
+ for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
+ if (recursive) {
+ if (strcmp(".", dp->d_name) == 0 || strcmp("..", dp->d_name) == 0)
+ continue;
+ buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+strlen(m)+6);
+ sprintf(buf, "%s%s%s/**%s", base, (BASE)?"/":"", dp->d_name, m);
+ sprintf(buf, "%s%s%s", base, (BASE)?"/":"", dp->d_name);
+ if (lstat(buf, &st) < 0) {
+ continue;
+ }
+ if (S_ISDIR(st.st_mode)) {
+ strcat(buf, "/**");
+ strcat(buf, m);
+ rb_glob_helper(buf, flag, func, arg);
+ }
+ free(buf);
+ continue;
}
- *new_end++ = (*cur)->next;
- for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
- if (*cur2 && fnmatch((*cur2)->str, name, flags) == 0) {
- *new_end++ = (*cur2)->next;
- *cur2 = 0;
+ if (fnmatch(magic, dp->d_name, flag) == 0) {
+ buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
+ sprintf(buf, "%s%s%s", base, (BASE)?"/":"", dp->d_name);
+ if (!m) {
+ (*func)(buf, arg);
+ free(buf);
+ continue;
}
+ tmp = ALLOC(struct d_link);
+ tmp->path = buf;
+ tmp->next = link;
+ link = tmp;
}
-
- buf = join_path(path, dirsep, name);
- free(name);
- if (!buf) {
- free(new_beg);
- status = -1;
- break;
+ }
+ closedir(dirp);
+ free(base);
+ free(magic);
+ while (link) {
+ stat(link->path, &st); /* should success */
+ if (S_ISDIR(st.st_mode)) {
+ int len = strlen(link->path);
+ int mlen = strlen(m);
+ char *t = ALLOC_N(char, len+mlen+1);
+
+ sprintf(t, "%s%s", link->path, m);
+ rb_glob_helper(t, flag, func, arg);
+ free(t);
}
- status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg, new_end, flags, func, arg);
- free(buf);
- free(new_beg);
- if (status) break;
+ tmp = link;
+ link = link->next;
+ free(tmp->path);
+ free(tmp);
}
}
-
- free(copy_beg);
+ p = m;
}
-
- return status;
}
-static int
-ruby_glob0(path, flags, func, arg)
- const char *path;
- int flags;
- ruby_glob_func *func;
+void
+rb_glob(path, func, arg)
+ char *path;
+ void (*func)();
VALUE arg;
{
- struct glob_pattern *list;
- const char *root, *start;
- char *buf;
- int n;
- int status;
-
- start = root = path;
- flags |= FNM_SYSCASE;
-#if defined DOSISH
- root = rb_path_skip_prefix(root);
-#endif
-
- if (root && *root == '/') root++;
-
- n = root - start;
- buf = GLOB_ALLOC_N(char, n + 1);
- if (!buf) return -1;
- MEMCPY(buf, start, char, n);
- buf[n] = '\0';
-
- list = glob_make_pattern(root, flags);
- if (!list) {
- free(buf);
- return -1;
- }
- status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg);
- glob_free_pattern(list);
- free(buf);
-
- return status;
+ rb_glob_helper(path, FNM_PERIOD, func, arg);
}
-int
-ruby_glob(path, flags, func, arg)
- const char *path;
- int flags;
- ruby_glob_func *func;
+void
+rb_iglob(path, func, arg)
+ char *path;
+ void (*func)();
VALUE arg;
{
- return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg);
+ rb_glob_helper(path, FNM_PERIOD|FNM_NOCASE, func, arg);
}
-static int rb_glob_caller _((const char *, VALUE));
-
-static int
-rb_glob_caller(path, a)
- const char *path;
- VALUE a;
-{
- int status;
- struct glob_args *args = (struct glob_args *)a;
-
- args->c = path;
- rb_protect(glob_func_caller, a, &status);
- return status;
-}
-
-static int
-rb_glob2(path, flags, func, arg)
- const char *path;
- int flags;
- void (*func) _((const char *, VALUE));
- VALUE arg;
+static void
+push_pattern(path, ary)
+ char *path;
+ VALUE ary;
{
- struct glob_args args;
-
- args.func = func;
- args.v = arg;
+ VALUE str = rb_tainted_str_new2(path);
- if (flags & FNM_SYSCASE) {
- rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
+ if (ary) {
+ rb_ary_push(ary, str);
+ }
+ else {
+ rb_yield(str);
}
-
- return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
-}
-
-void
-rb_glob(path, func, arg)
- const char *path;
- void (*func) _((const char*, VALUE));
- VALUE arg;
-{
- int status = rb_glob2(path, 0, func, arg);
- if (status) GLOB_JUMP_TAG(status);
}
-static void push_pattern _((const char* path, VALUE ary));
static void
-push_pattern(path, ary)
- const char *path;
+push_globs(ary, s)
VALUE ary;
+ char *s;
{
- rb_ary_push(ary, rb_tainted_str_new2(path));
+ rb_glob(s, push_pattern, ary);
}
-int
-ruby_brace_expand(str, flags, func, arg)
- const char *str;
- int flags;
- ruby_glob_func *func;
- VALUE arg;
+static void
+push_braces(ary, s)
+ VALUE ary;
+ char *s;
{
- const int escape = !(flags & FNM_NOESCAPE);
- const char *p = str;
- const char *s = p;
- const char *lbrace = 0, *rbrace = 0;
- int nest = 0, status = 0;
+ char buffer[MAXPATHLEN], *buf = buffer;
+ char *p, *t, *b;
+ char *lbrace, *rbrace;
+ int nest = 0;
+ p = s;
+ lbrace = rbrace = 0;
while (*p) {
- if (*p == '{' && nest++ == 0) {
+ if (*p == '{') {
lbrace = p;
+ break;
}
- if (*p == '}' && --nest <= 0) {
+ p++;
+ }
+ while (*p) {
+ if (*p == '{') nest++;
+ if (*p == '}' && --nest == 0) {
rbrace = p;
break;
}
- if (*p == '\\' && escape) {
- if (!*++p) break;
- }
- Inc(p);
+ p++;
}
- if (lbrace && rbrace) {
- char *buf = GLOB_ALLOC_N(char, strlen(s) + 1);
- long shift;
-
- if (!buf) return -1;
+ if (lbrace) {
+ int len = strlen(s);
+ if (len >= MAXPATHLEN)
+ buf = xmalloc(len + 1);
memcpy(buf, s, lbrace-s);
- shift = (lbrace-s);
+ b = buf + (lbrace-s);
p = lbrace;
- while (p < rbrace) {
- const char *t = ++p;
- nest = 0;
- while (p < rbrace && !(*p == ',' && nest == 0)) {
- if (*p == '{') nest++;
- if (*p == '}') nest--;
- if (*p == '\\' && escape) {
- if (++p == rbrace) break;
- }
- Inc(p);
+ while (*p != '}') {
+ t = p + 1;
+ for (p = t; *p!='}' && *p!=','; p++) {
+ /* skip inner braces */
+ if (*p == '{') while (*p!='}') p++;
}
- memcpy(buf+shift, t, p-t);
- strcpy(buf+shift+(p-t), rbrace+1);
- status = ruby_brace_expand(buf, flags, func, arg);
- if (status) break;
+ memcpy(b, t, p-t);
+ strcpy(b+(p-t), rbrace+1);
+ push_braces(ary, buf);
}
- free(buf);
- }
- else if (!lbrace && !rbrace) {
- status = (*func)(s, arg);
+ if (buf != buffer)
+ free(buf);
}
-
- return status;
-}
-
-struct brace_args {
- ruby_glob_func *func;
- VALUE value;
- int flags;
-};
-
-static int glob_brace _((const char *, VALUE));
-static int
-glob_brace(path, val)
- const char *path;
- VALUE val;
-{
- struct brace_args *arg = (struct brace_args *)val;
-
- return ruby_glob0(path, arg->flags, arg->func, arg->value);
-}
-
-static int
-ruby_brace_glob0(str, flags, func, arg)
- const char *str;
- int flags;
- ruby_glob_func *func;
- VALUE arg;
-{
- struct brace_args args;
-
- args.func = func;
- args.value = arg;
- args.flags = flags;
- return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args);
-}
-
-int
-ruby_brace_glob(str, flags, func, arg)
- const char *str;
- int flags;
- ruby_glob_func *func;
- VALUE arg;
-{
- return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg);
-}
-
-static int
-push_glob(VALUE ary, const char *str, int flags)
-{
- struct glob_args args;
-
- args.func = push_pattern;
- args.v = ary;
- return ruby_brace_glob0(str, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
-}
-
-static VALUE
-rb_push_glob(str, flags) /* '\0' is delimiter */
- VALUE str;
- int flags;
-{
- long offset = 0;
- VALUE ary;
-
- ary = rb_ary_new();
- SafeStringValue(str);
-
- while (offset < RSTRING_LEN(str)) {
- int status = push_glob(ary, RSTRING(str)->ptr + offset, flags);
- char *p, *pend;
- if (status) GLOB_JUMP_TAG(status);
- if (offset >= RSTRING_LEN(str)) break;
- p = RSTRING(str)->ptr + offset;
- p += strlen(p) + 1;
- pend = RSTRING(str)->ptr + RSTRING_LEN(str);
- while (p < pend && !*p)
- p++;
- offset = p - RSTRING(str)->ptr;
+ else {
+ push_globs(ary, s);
}
-
- return ary;
}
-static VALUE
-dir_globs(argc, argv, flags)
- long argc;
- VALUE *argv;
- int flags;
-{
- VALUE ary = rb_ary_new();
- long i;
-
- for (i = 0; i < argc; ++i) {
- int status;
- VALUE str = argv[i];
- StringValue(str);
- status = push_glob(ary, RSTRING(str)->ptr, flags);
- if (status) GLOB_JUMP_TAG(status);
- }
-
- return ary;
-}
+#define isdelim(c) ((c)==' '||(c)=='\t'||(c)=='\n'||(c)=='\0')
-/*
- * 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>.
- *
- */
-static VALUE
-dir_s_aref(int argc, VALUE *argv, VALUE obj)
- {
- if (argc == 1) {
- return rb_push_glob(argv[0], 0);
- }
- return dir_globs(argc, argv, 0);
- }
-
-/*
- * call-seq:
- * Dir.glob( pattern, [flags] ) => array
- * Dir.glob( pattern, [flags] ) {| filename | block } => nil
- *
- * Returns the filenames found by expanding <i>pattern</i> which is
- * an +Array+ of the patterns or the pattern +String+, either as an
- * <i>array</i> or as parameters to the block. Note that this pattern
- * 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)
- *
- * <code>*</code>:: Matches any file. Can be restricted by
- * other values in the glob. <code>*</code>
- * will match all files; <code>c*</code> will
- * 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
- * have <code>c</code> in them (including at
- * the beginning or end). Equivalent to
- * <code>/ .* /x</code> in regexp.
- * <code>**</code>:: Matches directories recursively.
- * <code>?</code>:: Matches any one character. Equivalent to
- * <code>/.{1}/</code> in regexp.
- * <code>[set]</code>:: Matches any one character in +set+.
- * Behaves exactly like character sets in
- * Regexp, including set negation
- * (<code>[^a-z]</code>).
- * <code>{p,q}</code>:: Matches either literal <code>p</code> or
- * literal <code>q</code>. Matching literals
- * may be more than one character in length.
- * More than two literals may be specified.
- * Equivalent to pattern alternation in
- * regexp.
- * <code>\</code>:: Escapes the next metacharacter.
- *
- * Dir["config.?"] #=> ["config.h"]
- * Dir.glob("config.?") #=> ["config.h"]
- * Dir.glob("*.[a-z][a-z]") #=> ["main.rb"]
- * Dir.glob("*.[^r]*") #=> ["config.h"]
- * Dir.glob("*.{rb,h}") #=> ["main.rb", "config.h"]
- * Dir.glob("*") #=> ["config.h", "main.rb"]
- * Dir.glob("*", File::FNM_DOTMATCH) #=> [".", "..", "config.h", "main.rb"]
- *
- * rbfiles = File.join("**", "*.rb")
- * Dir.glob(rbfiles) #=> ["main.rb",
- * "lib/song.rb",
- * "lib/song/karaoke.rb"]
- * libdirs = File.join("**", "lib")
- * Dir.glob(libdirs) #=> ["lib"]
- *
- * librbfiles = File.join("**", "lib", "**", "*.rb")
- * Dir.glob(librbfiles) #=> ["lib/song.rb",
- * "lib/song/karaoke.rb"]
- *
- * librbfiles = File.join("**", "lib", "*.rb")
- * Dir.glob(librbfiles) #=> ["lib/song.rb"]
- */
static VALUE
-dir_s_glob(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
-{
- VALUE str, rflags, ary;
- int flags;
-
- if (rb_scan_args(argc, argv, "11", &str, &rflags) == 2)
- flags = NUM2INT(rflags);
- else
- flags = 0;
-
- ary = rb_check_array_type(str);
- if (NIL_P(ary)) {
- ary = rb_push_glob(str, flags);
- }
- else {
- volatile VALUE v = ary;
- ary = dir_globs(RARRAY_LEN(v), RARRAY_PTR(v), flags);
- }
-
- if (rb_block_given_p()) {
- rb_ary_each(ary);
- return Qnil;
+dir_s_glob(dir, str)
+ VALUE dir, str;
+{
+ char *p, *pend;
+ char buffer[MAXPATHLEN], *buf = buffer;
+ char *t;
+ int nest;
+ VALUE ary = 0;
+
+ Check_SafeStr(str);
+ if (!rb_block_given_p()) {
+ ary = rb_ary_new();
+ }
+ if (RSTRING(str)->len >= MAXPATHLEN)
+ buf = xmalloc(RSTRING(str)->len + 1);
+
+ p = RSTRING(str)->ptr;
+ pend = p + RSTRING(str)->len;
+
+ while (p < pend) {
+ t = buf;
+ nest = 0;
+ while (p < pend && isdelim(*p)) p++;
+ while (p < pend && !isdelim(*p)) {
+ if (*p == '{') nest+=2;
+ if (*p == '}') nest+=3;
+ *t++ = *p++;
+ }
+ *t = '\0';
+ if (nest == 0) {
+ push_globs(ary, buf);
+ }
+ else if (nest % 5 == 0) {
+ push_braces(ary, buf);
+ }
+ /* else unmatched braces */
}
+ if (buf != buffer)
+ free(buf);
return ary;
}
static VALUE
-dir_open_dir(path)
- VALUE path;
-{
- VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
-
- if (TYPE(dir) != T_DATA ||
- RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
- rb_raise(rb_eTypeError, "wrong argument type %s (expected Dir)",
- rb_obj_classname(dir));
- }
- return dir;
-}
-
-
-/*
- * call-seq:
- * Dir.foreach( dirname ) {| filename | block } => nil
- *
- * Calls the block once for each entry in the named directory, passing
- * the filename of each entry as a parameter to the block.
- *
- * Dir.foreach("testdir") {|x| puts "Got #{x}" }
- *
- * <em>produces:</em>
- *
- * Got .
- * Got ..
- * Got config.h
- * Got main.rb
- *
- */
-static VALUE
dir_foreach(io, dirname)
VALUE io, dirname;
{
VALUE dir;
- dir = dir_open_dir(dirname);
+ dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
rb_ensure(dir_each, dir, dir_close, dir);
return Qnil;
}
-/*
- * call-seq:
- * Dir.entries( dirname ) => array
- *
- * Returns an array containing all of the filenames in the given
- * directory. Will raise a <code>SystemCallError</code> if the named
- * directory doesn't exist.
- *
- * Dir.entries("testdir") #=> [".", "..", "config.h", "main.rb"]
- *
- */
static VALUE
dir_entries(io, dirname)
VALUE io, dirname;
{
VALUE dir;
- dir = dir_open_dir(dirname);
+ dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
return rb_ensure(rb_Array, dir, dir_close, dir);
}
-/*
- * call-seq:
- * File.fnmatch( pattern, path, [flags] ) => (true or false)
- * File.fnmatch?( pattern, path, [flags] ) => (true or false)
- *
- * Returns true if <i>path</i> matches against <i>pattern</i> The
- * pattern is not a regular expression; instead it follows rules
- * similar to shell filename globbing. It may contain the following
- * metacharacters:
- *
- * <code>*</code>:: Matches any file. Can be restricted by
- * other values in the glob. <code>*</code>
- * will match all files; <code>c*</code> will
- * 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
- * have <code>c</code> in them (including at
- * the beginning or end). Equivalent to
- * <code>/ .* /x</code> in regexp.
- * <code>**</code>:: Matches directories recursively or files
- * expansively.
- * <code>?</code>:: Matches any one character. Equivalent to
- * <code>/.{1}/</code> in regexp.
- * <code>[set]</code>:: Matches any one character in +set+.
- * Behaves exactly like character sets in
- * Regexp, including set negation
- * (<code>[^a-z]</code>).
- * <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
- * <code>Dir::glob</code>.
- *
- * File.fnmatch('cat', 'cat') #=> true : match entire string
- * File.fnmatch('cat', 'category') #=> false : only match partial string
- * File.fnmatch('c{at,ub}s', 'cats') #=> false : { } isn't supported
- *
- * File.fnmatch('c?t', 'cat') #=> true : '?' match only 1 character
- * File.fnmatch('c??t', 'cat') #=> false : ditto
- * File.fnmatch('c*', 'cats') #=> true : '*' match 0 or more characters
- * File.fnmatch('c*t', 'c/a/b/t') #=> true : ditto
- * File.fnmatch('ca[a-z]', 'cat') #=> true : inclusive bracket expression
- * File.fnmatch('ca[^t]', 'cat') #=> false : exclusive bracket expression ('^' or '!')
- *
- * File.fnmatch('cat', 'CAT') #=> false : case sensitive
- * File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true : case insensitive
- *
- * File.fnmatch('?', '/', File::FNM_PATHNAME) #=> false : wildcard doesn't match '/' on FNM_PATHNAME
- * File.fnmatch('*', '/', File::FNM_PATHNAME) #=> false : ditto
- * File.fnmatch('[/]', '/', File::FNM_PATHNAME) #=> false : ditto
- *
- * File.fnmatch('\?', '?') #=> true : escaped wildcard becomes ordinary
- * File.fnmatch('\a', 'a') #=> true : escaped ordinary remains ordinary
- * File.fnmatch('\a', '\a', File::FNM_NOESCAPE) #=> true : FNM_NOESACPE makes '\' ordinary
- * File.fnmatch('[\?]', '?') #=> true : can escape inside bracket expression
- *
- * File.fnmatch('*', '.profile') #=> false : wildcard doesn't match leading
- * File.fnmatch('*', '.profile', File::FNM_DOTMATCH) #=> true period by default.
- * File.fnmatch('.*', '.profile') #=> true
- *
- * rbfiles = '**' '/' '*.rb' # you don't have to do like this. just write in single string.
- * File.fnmatch(rbfiles, 'main.rb') #=> false
- * File.fnmatch(rbfiles, './main.rb') #=> false
- * File.fnmatch(rbfiles, 'lib/song.rb') #=> true
- * File.fnmatch('**.rb', 'main.rb') #=> true
- * File.fnmatch('**.rb', './main.rb') #=> false
- * File.fnmatch('**.rb', 'lib/song.rb') #=> true
- * File.fnmatch('*', 'dave/.profile') #=> true
- *
- * pattern = '*' '/' '*'
- * File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME) #=> false
- * File.fnmatch(pattern, 'dave/.profile', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
- *
- * pattern = '**' '/' 'foo'
- * File.fnmatch(pattern, 'a/b/c/foo', File::FNM_PATHNAME) #=> true
- * File.fnmatch(pattern, '/a/b/c/foo', File::FNM_PATHNAME) #=> true
- * File.fnmatch(pattern, 'c:/a/b/c/foo', File::FNM_PATHNAME) #=> true
- * File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME) #=> false
- * File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
- */
-static VALUE
-file_s_fnmatch(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
-{
- VALUE pattern, path;
- VALUE rflags;
- int flags;
-
- if (rb_scan_args(argc, argv, "21", &pattern, &path, &rflags) == 3)
- flags = NUM2INT(rflags);
- else
- flags = 0;
-
- StringValue(pattern);
- StringValue(path);
-
- if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
- return Qtrue;
-
- return Qfalse;
-}
-
-/*
- * Objects of class <code>Dir</code> are directory streams representing
- * directories in the underlying file system. They provide a variety of
- * ways to list directories and their contents. See also
- * <code>File</code>.
- *
- * The directory used in these examples contains the two regular files
- * (<code>config.h</code> and <code>main.rb</code>), the parent
- * directory (<code>..</code>), and the directory itself
- * (<code>.</code>).
- */
void
Init_Dir()
{
@@ -1963,20 +854,19 @@ Init_Dir()
rb_include_module(rb_cDir, rb_mEnumerable);
- rb_define_alloc_func(rb_cDir, dir_s_alloc);
+ rb_define_singleton_method(rb_cDir, "new", dir_s_new, -1);
rb_define_singleton_method(rb_cDir, "open", dir_s_open, 1);
rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, 1);
rb_define_singleton_method(rb_cDir, "entries", dir_entries, 1);
rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
- rb_define_method(rb_cDir,"path", dir_path, 0);
rb_define_method(rb_cDir,"read", dir_read, 0);
rb_define_method(rb_cDir,"each", dir_each, 0);
rb_define_method(rb_cDir,"rewind", dir_rewind, 0);
rb_define_method(rb_cDir,"tell", dir_tell, 0);
rb_define_method(rb_cDir,"seek", dir_seek, 1);
rb_define_method(rb_cDir,"pos", dir_tell, 0);
- rb_define_method(rb_cDir,"pos=", dir_set_pos, 1);
+ rb_define_method(rb_cDir,"pos=", dir_seek, 1);
rb_define_method(rb_cDir,"close", dir_close, 0);
rb_define_singleton_method(rb_cDir,"chdir", dir_s_chdir, -1);
@@ -1988,15 +878,6 @@ Init_Dir()
rb_define_singleton_method(rb_cDir,"delete", dir_s_rmdir, 1);
rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
- rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
- rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
-
- rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
- rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
-
- rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
- 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_SYSCASE", INT2FIX(FNM_SYSCASE));
+ rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, 1);
+ rb_define_singleton_method(rb_cDir,"[]", dir_s_glob, 1);
}
diff --git a/distruby.rb b/distruby.rb
deleted file mode 100644
index 613da0eb9c..0000000000
--- a/distruby.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!./miniruby
-
-if RUBY_PATCHLEVEL.zero?
- dirname = sprintf 'ruby-%s', RUBY_VERSION
- tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
-else
- dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
- tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
-end
-tgzname = dirname + '.tar.gz'
-tbzname = dirname + '.tar.bz2'
-zipname = dirname + '.zip'
-repos = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
-
-STDERR.puts 'exporting sources...'
-system 'svn', 'export', '-q', repos, dirname
-Dir.chdir dirname do
- STDERR.puts 'generating configure...'
- system 'autoconf'
- system 'rm', '-rf', 'autom4te.cache'
-
- STDERR.puts 'generating parse.c...'
- system 'bison', '-y', '-o', 'parse.c', 'parse.y'
-end
-
-STDERR.puts 'generating tarballs...'
-ENV['GZIP'] = '-9'
-system 'tar', 'chofzp', tgzname, dirname
-system 'tar', 'chojfp', tbzname, dirname
-system 'zip', '-q9r', zipname, dirname
-
-require 'digest/md5'
-require 'digest/sha2'
-for name in [tgzname, tbzname, zipname] do
- open name, 'rb' do |fp|
- str = fp.read
- md5 = Digest::MD5.hexdigest str
- sha = Digest::SHA256.hexdigest str
- printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
- name, md5,
- name, sha,
- name, str.size
- end
-end
-
-
-
-#
-# Local Variables:
-# mode: ruby
-# code: utf-8
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# fill-column: 79
-# default-justification: full
-# End:
-# vi: ts=3 sw=3
-
diff --git a/djgpp/GNUmakefile.in b/djgpp/GNUmakefile.in
deleted file mode 100644
index 0a7e1fb131..0000000000
--- a/djgpp/GNUmakefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include Makefile
-VPATH = $(srcdir) $(srcdir)/missing
diff --git a/djgpp/README.djgpp b/djgpp/README.djgpp
index f1f413a478..d81259ccac 100644
--- a/djgpp/README.djgpp
+++ b/djgpp/README.djgpp
@@ -3,7 +3,7 @@
This is what you need to do to compile and install Ruby:
1. Run configure.bat, which will generate config.h and Makefile
- (GNU sed required).
+ and ext/extmk.rb(GNU sed required).
Message like this is normal:
sed.exe: can't read 123456789: No such file or directory (ENOENT)
diff --git a/djgpp/config.hin b/djgpp/config.hin
index 8ee427c92f..973a0db93d 100644
--- a/djgpp/config.hin
+++ b/djgpp/config.hin
@@ -1,111 +1,69 @@
-
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define USE_BUILTIN_FRAME_ADDRESS 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_LONG_LONG 1
-#define HAVE_OFF_T 1
+#define USE_THREAD 1
#define SIZEOF_INT 4
#define SIZEOF_SHORT 2
#define SIZEOF_LONG 4
-#define SIZEOF_LONG_LONG 8
-#define SIZEOF___INT64 0
-#define SIZEOF_OFF_T 4
#define SIZEOF_VOIDP 4
#define SIZEOF_FLOAT 4
#define SIZEOF_DOUBLE 8
#define HAVE_PROTOTYPES 1
#define TOKEN_PASTE(x,y) x##y
#define HAVE_STDARG_PROTOTYPES 1
-#define NORETURN(x) x __attribute__ ((noreturn))
-#define HAVE_DECL_SYS_NERR 1
+#define HAVE_ATTR_NORETURN 1
#define HAVE_DIRENT_H 1
#define STDC_HEADERS 1
-#define HAVE_SYS_WAIT_H 1
#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
#define HAVE_UNISTD_H 1
#define HAVE_LIMITS_H 1
#define HAVE_SYS_FILE_H 1
#define HAVE_SYS_IOCTL_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_SYS_FCNTL_H 1
+#define HAVE_PWD_H 1
#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TIMES_H 1
#define HAVE_SYS_PARAM_H 1
-#define HAVE_PWD_H 1
+#define HAVE_SYS_WAIT_H 1
+#define HAVE_STRING_H 1
#define HAVE_UTIME_H 1
#define HAVE_MEMORY_H 1
#define HAVE_DIRECT_H 1
-#define HAVE_SYS_RESOURCE_H 1
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
#define HAVE_ST_BLKSIZE 1
-#define HAVE_STRUCT_STAT_ST_RDEV 1
#define HAVE_ST_RDEV 1
#define GETGROUPS_T gid_t
#define RETSIGTYPE void
#define HAVE_ALLOCA 1
+#define vfork fork
#define HAVE_DUP2 1
+#define HAVE_SETENV 1
#define HAVE_MEMMOVE 1
#define HAVE_MKDIR 1
#define HAVE_STRCASECMP 1
-#define HAVE_STRNCASECMP 1
#define HAVE_STRERROR 1
#define HAVE_STRFTIME 1
#define HAVE_STRCHR 1
#define HAVE_STRSTR 1
#define HAVE_STRTOUL 1
+#define HAVE_STRDUP 1
#define HAVE_ISINF 1
#define HAVE_ISNAN 1
#define HAVE_FINITE 1
-#define HAVE_HYPOT 1
-#define HAVE_ACOSH 1
#define HAVE_FMOD 1
+#define HAVE_RANDOM 1
#define HAVE_WAITPID 1
-#define HAVE_FSYNC 1
+#define HAVE_GETCWD 1
#define HAVE_TRUNCATE 1
#define HAVE_CHSIZE 1
#define HAVE_TIMES 1
#define HAVE_UTIMES 1
-#define HAVE_FCNTL 1
-#define HAVE_SYMLINK 1
-#define HAVE_SETITIMER 1
-#define HAVE_PAUSE 1
-#define HAVE_GETPGRP 1
-#define HAVE_SETPGID 1
+#define HAVE_FCNTL_H 1
+/*#define HAVE_SETITIMER 1*/
#define HAVE_GETGROUPS 1
-#define HAVE_GETRLIMIT 1
#define HAVE_SIGPROCMASK 1
#define HAVE_SIGACTION 1
#define HAVE_SETSID 1
-#define HAVE_TELLDIR 1
-#define HAVE_SEEKDIR 1
-#define HAVE_MKTIME 1
-#define HAVE_COSH 1
-#define HAVE_SINH 1
-#define HAVE_TANH 1
-#define HAVE_STRUCT_TM_TM_ZONE 1
-#define HAVE_TM_ZONE 1
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
#define POSIX_SIGNAL 1
-#define GETPGRP_VOID 1
-#define SETPGRP_VOID 1
-#define RSHIFT(x,y) ((x)>>(int)y)
+#define BSD_SETPGRP setpgrp
+#define RSHIFT(x,y) ((x)>>y)
#define FILE_COUNT _cnt
-#define FILE_READPTR _ptr
-#define NEED_IO_FLUSH_BETWEEN_RW 1
-#define DEFAULT_KCODE KCODE_NONE
-#define DLEXT ".so"
+#define DLEXT ".o"
#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
diff --git a/djgpp/config.sed b/djgpp/config.sed
index 1805789520..0713759f16 100644
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -1,5 +1,70 @@
/^SHELL/s,/bin/sh,$(COMSPEC),
+s%@srcdir@%.%g
+s%@top_srcdir@%..%
+s%@CFLAGS@%-O2%g
+s%@CPPFLAGS@%%g
+s%@CXXFLAGS@%%g
+s%@LDFLAGS@%%g
+s%@LIBS@%-lm %g
+s%@exec_prefix@%${prefix}%g
+s%@prefix@%/usr/local%g
+s%@program_transform_name@%s,x,x,%g
+s%@bindir@%${exec_prefix}/bin%g
+s%@sbindir@%${exec_prefix}/sbin%g
+s%@libexecdir@%${exec_prefix}/libexec%g
+s%@datadir@%${prefix}/share%g
+s%@sysconfdir@%${prefix}/etc%g
+s%@sharedstatedir@%${prefix}/com%g
+s%@localstatedir@%${prefix}/var%g
+s%@libdir@%${exec_prefix}/lib%g
+s%@includedir@%${prefix}/include%g
+s%@oldincludedir@%/usr/include%g
+s%@infodir@%${prefix}/info%g
+s%@mandir@%${prefix}/man%g
+s%@host@%i386-pc-msdosdjgpp%g
+s%@host_alias@%i386-msdosdjgpp%g
+s%@host_cpu@%i386%g
+s%@host_vendor@%pc%g
+s%@host_os@%msdosdjgpp%g
+s%@CC@%gcc%g
+s%@CPP@%gcc -E%g
+s%@YACC@%bison -y%g
+s%@RANLIB@%ranlib%g
+s%@AR@%ar%g
+s%@INSTALL_PROGRAM@%${INSTALL}%g
+s%@INSTALL_DATA@%${INSTALL} -m 644%g
+s%@SET_MAKE@%%g
+s%@LIBOBJS@% crypt.o flock.o vsnprintf.o%g
+s%@ALLOCA@%%g
+s%@DEFAULT_KCODE@%%g
+s%@EXEEXT@%.exe%g
+s%@OBJEXT@%o%g
+s%@XLDFLAGS@%%g
+s%@DLDFLAGS@%%g
+s%@STATIC@%%g
+s%@CCDLFLAGS@%%g
+s%@LDSHARED@%ld%g
+s%@DLEXT@%o%g
+s%@STRIP@%strip%g
+s%@EXTSTATIC@%%g
+s%@binsuffix@%.exe%g
+s%@setup@%Setup.dj%g
+s%@LIBRUBY@%libruby.a%g
+s%@LIBRUBY_A@%libruby.a%g
+s%@LIBRUBYARG@%libruby.a%g
+s%@LIBRUBY_SO@%%g
+s%@SOLIBS@%%g
+s%@arch@%i386-msdosdjgpp%g
;s%/bin/rm%rm%
+s%@DLDLIBS@%-lc%g
+s%@PREP@%%
+s%@RUBY_INSTALL_NAME@%ruby%g
+s%@RUBY_SO_NAME@%%g
+s%@arch@%i386-msdosdjgpp%g
+s%@sitedir@%${prefix}/lib/ruby/site_ruby%g
+s%@configure_args@%%g
+s%@MINIRUBY@%./miniruby%
+s%@archlib@%/lib/ruby/i386-msdosdjgpp%
;s%|| true%%
;/\/dev\/null/ {
;s,/dev/null 2>&1, nul,
@@ -8,121 +73,8 @@
;/^config.status/ {
; N;N;N;N;N;d
;}
-:t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@srcdir@,.,g;t t
-s,@top_srcdir@,..,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,,;t t
-s,@PACKAGE_TARNAME@,,;t t
-s,@PACKAGE_VERSION@,,;t t
-s,@PACKAGE_STRING@,,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/dev/env/DJDIR,;t t
-s%@program_transform_name@%s,^,,%;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,i586-pc-msdosdjgpp,;t t
-s,@host_alias@,i586-pc-msdosdjgpp,;t t
-s,@target_alias@,i386-msdosdjgpp,;t t
-s,@DEFS@,,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,-lm ,;t t
-s,@MAJOR@,1,;t t
-s,@MINOR@,7,;t t
-s,@TEENY@,3,;t t
-s,@build@,i586-pc-msdosdjgpp,;t t
-s,@build_cpu@,i586,;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,msdosdjgpp,;t t
-s,@host@,i586-pc-msdosdjgpp,;t t
-s,@host_cpu@,i586,;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,msdosdjgpp,;t t
-s,@target@,i386-pc-msdosdjgpp,;t t
-s,@target_cpu@,i386,;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,msdosdjgpp,;t t
-s,@CC@,gcc,;t t
-s,@ac_ct_CC@,,;t t
-s,@CFLAGS@,-Os,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,o,;t t
-s,@CPP@,gcc -E,;t t
-s,@EGREP@,grep -E,;t t
-s,@GNU_LD@,yes,;t t
-s,@CPPOUTFILE@,-o conftest.i,;t t
-s,@OUTFLAG@,-o ,;t t
-s,@YACC@,bison -y,;t t
-s,@RANLIB@,ranlib,;t t
-s,@ac_ct_RANLIB@,,;t t
-s,@AR@,ar,;t t
-s,@ac_ct_AR@,,;t t
-s,@NM@,,;t t
-s,@ac_ct_NM@,,;t t
-s,@WINDRES@,,;t t
-s,@ac_ct_WINDRES@,,;t t
-s,@DLLWRAP@,,;t t
-s,@ac_ct_DLLWRAP@,,;t t
-s,@LN_S@,ln -s,;t t
-s,@SET_MAKE@,,;t t
-s,@LIBOBJS@,crypt.o flock.o vsnprintf.o,;t t
-s,@ALLOCA@,,;t t
-s,@XCFLAGS@,,;t t
-s,@XLDFLAGS@, -L.,;t t
-s,@DLDFLAGS@,,;t t
-s,@STATIC@,,;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,ld,;t t
-s,@DLEXT@,so,;t t
-s,@DLEXT2@,,;t t
-s,@LIBEXT@,a,;t t
-s,@LINK_SO@,,;t t
-s,@LIBPATHFLAG@, -L%s,;t t
-s,@STRIP@,strip,;t t
-s,@EXTSTATIC@,,;t t
-s,@setup@,Setup.dj,;t t
-s,@MINIRUBY@,./miniruby,;t t
-s,@PREP@,,;t t
-s,@ARCHFILE@,,;t t
-s,@LIBRUBY_LDSHARED@,ld,;t t
-s,@LIBRUBY_DLDFLAGS@,,;t t
-s,@RUBY_INSTALL_NAME@,ruby,;t t
-s,@rubyw_install_name@,,;t t
-s,@RUBYW_INSTALL_NAME@,,;t t
-s,@RUBY_SO_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@LIBRUBY_A@,lib$(RUBY_INSTALL_NAME).a,;t t
-s,@LIBRUBY_SO@,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY),;t t
-s,@LIBRUBY_ALIASES@,lib$(RUBY_SO_NAME).so,;t t
-s,@LIBRUBY@,$(LIBRUBY_A),;t t
-s,@LIBRUBYARG@,-l$(RUBY_INSTALL_NAME),;t t
-s,@SOLIBS@,,;t t
-s,@DLDLIBS@,-lc,;t t
-s,@ENABLE_SHARED@,no,;t t
-s,@MAINLIBS@,,;t t
-s,@COMMON_LIBS@,,;t t
-s,@COMMON_MACROS@,,;t t
-s,@COMMON_HEADERS@,,;t t
-s,@EXPORT_PREFIX@,,;t t
-s,@MAKEFILES@,Makefile,;t t
-s,@arch@,i386-msdosdjgpp,;t t
-s,@sitearch@,i386-msdosdjgpp,;t t
-s,@sitedir@,${prefix}/lib/ruby/site_ruby,;t t
-s,@configure_args@,,;t t
+;s%mv -f y\.tab\.c%if exist parse.c del parse.c\
+ ren y_tab.c%
+;s%y\.tab\.c%y_tab.c%
/^,THIS_IS_DUMMY_PATTERN_/i\
ac_given_srcdir=.
diff --git a/djgpp/configure.bat b/djgpp/configure.bat
index e6a5d79d4a..dbb4a08528 100755..100644
--- a/djgpp/configure.bat
+++ b/djgpp/configure.bat
@@ -5,6 +5,7 @@ if exist djgpp\version.sed goto exist
:exist
set _conv_=-f djgpp\config.sed -f djgpp\version.sed
sed %_conv_% < Makefile.in > Makefile
+sed %_conv_% < ext\extmk.rb.in > ext\extmk.rb
sed %_conv_% < djgpp\config.hin > config.h
echo LFN check > 12345678
sed -n /LFN/d 123456789 > nul
diff --git a/dln.c b/dln.c
index 9fd605e32e..40a326df63 100644
--- a/dln.c
+++ b/dln.c
@@ -6,28 +6,28 @@
$Date$
created at: Tue Jan 18 17:05:06 JST 1994
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
-#include "ruby.h"
+#include "config.h"
+#include "defines.h"
#include "dln.h"
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
#ifdef __CHECKER__
#undef HAVE_DLOPEN
#undef USE_DLN_A_OUT
#undef USE_DLN_DLOPEN
#endif
-#ifdef USE_DLN_A_OUT
char *dln_argv0;
+void rb_loaderror();
+
+#ifdef _AIX
+#pragma alloca
#endif
-#if defined(HAVE_ALLOCA_H)
+#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
#include <alloca.h>
#endif
@@ -44,20 +44,15 @@ void *xrealloc();
#endif
#include <stdio.h>
-#if defined(_WIN32) || defined(__VMS)
+#ifdef NT
#include "missing/file.h"
#endif
#include <sys/types.h>
#include <sys/stat.h>
-#ifndef S_ISDIR
-# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
-#endif
-
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
-#endif
-#ifndef MAXPATHLEN
+#else
# define MAXPATHLEN 1024
#endif
@@ -65,15 +60,10 @@ void *xrealloc();
# include <unistd.h>
#endif
-#ifndef _WIN32
+#ifndef NT
char *getenv();
#endif
-#if defined(__VMS)
-#pragma builtins
-#include <dlfcn.h>
-#endif
-
#ifdef __MACOS__
# include <TextUtils.h>
# include <CodeFragments.h>
@@ -85,61 +75,44 @@ char *getenv();
# include <image.h>
#endif
-#ifndef NO_DLN_LOAD
+int eaccess();
-#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__) && !defined(_UNICOSMP)
+#if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX)
/* dynamic load with dlopen() */
# define USE_DLN_DLOPEN
#endif
#ifndef FUNCNAME_PATTERN
-# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__)
-# define FUNCNAME_PATTERN "_Init_%s"
+# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && __FreeBSD__ < 3) || defined(__OpenBSD__) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__)
+# define FUNCNAME_PATTERN "_Init_%.200s"
# else
-# define FUNCNAME_PATTERN "Init_%s"
+# define FUNCNAME_PATTERN "Init_%.200s"
# endif
#endif
-static int
-init_funcname_len(buf, file)
- char **buf;
- const char *file;
+static void
+init_funcname(buf, file)
+ char *buf;
+ char *file;
{
- char *p;
- const char *slash;
- int len;
+ char *p, *slash;
/* Load the file as an object one */
- for (slash = file-1; *file; file++) /* Find position of last '/' */
+ for (p = file, slash = p-1; *p; p++) /* Find position of last '/' */
#ifdef __MACOS__
- if (*file == ':') slash = file;
+ if (*p == ':') slash = p;
#else
- if (*file == '/') slash = file;
+ if (*p == '/') slash = p;
#endif
- 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 */
+ snprintf(buf, MAXPATHLEN, FUNCNAME_PATTERN, slash + 1);
+ for (p = buf; *p; p++) { /* Delete suffix if it exists */
if (*p == '.') {
*p = '\0'; break;
}
}
- return p - *buf;
}
-#define init_funcname(buf, file) do {\
- int len = init_funcname_len(buf, file);\
- char *tmp = ALLOCA_N(char, len+1);\
- if (!tmp) {\
- free(*buf);\
- rb_memerror();\
- }\
- strcpy(tmp, *buf);\
- free(*buf);\
- *buf = tmp;\
-} while (0)
-
#ifdef USE_DLN_A_OUT
#ifndef LIBC_NAME
@@ -156,7 +129,7 @@ static int dln_errno;
#define DLN_ENOEXEC ENOEXEC /* Exec format error */
#define DLN_ECONFL 1201 /* Symbol name conflict */
-#define DLN_ENOINIT 1202 /* No initializer given */
+#define DLN_ENOINIT 1202 /* No inititalizer given */
#define DLN_EUNDEF 1203 /* Undefine symbol remains */
#define DLN_ENOTLIB 1204 /* Not a library file */
#define DLN_EBADLIB 1205 /* Malformed library file */
@@ -391,7 +364,7 @@ dln_init(prog)
if (c != '!') goto err_noexec;
p = buf;
- /* skip forwarding spaces */
+ /* skip forwading spaces */
while (read(fd, &c, 1) == 1) {
if (c == '\n') goto err_noexec;
if (c != '\t' && c != ' ') {
@@ -645,6 +618,7 @@ load_1(fd, disp, need_init)
struct nlist *sym;
struct nlist *end;
int init_p = 0;
+ char buf[MAXPATHLEN];
if (load_header(fd, &hdr, disp) == -1) return -1;
if (INVALID_OBJECT(hdr)) {
@@ -653,12 +627,8 @@ load_1(fd, disp, need_init)
}
reloc = load_reloc(fd, &hdr, disp);
if (reloc == NULL) return -1;
-
syms = load_sym(fd, &hdr, disp);
- if (syms == NULL) {
- free(reloc);
- return -1;
- }
+ if (syms == NULL) return -1;
sym = syms;
end = syms + (hdr.a_syms / sizeof(struct nlist));
@@ -671,7 +641,7 @@ load_1(fd, disp, need_init)
char *key = sym->n_un.n_name;
if (st_lookup(sym_tbl, sym[1].n_un.n_name, &old_sym)) {
- if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
+ if (st_delete(undef_tbl, &key, NULL)) {
unlink_undef(key, old_sym->n_value);
free(key);
}
@@ -684,7 +654,7 @@ load_1(fd, disp, need_init)
st_foreach(reloc_tbl, reloc_repl, &data);
st_insert(undef_tbl, strdup(sym[1].n_un.n_name), NULL);
- if (st_delete(undef_tbl, (st_data_t*)&key, NULL)) {
+ if (st_delete(undef_tbl, &key, NULL)) {
free(key);
}
}
@@ -752,7 +722,7 @@ load_1(fd, disp, need_init)
}
key = sym->n_un.n_name;
- if (st_delete(undef_tbl, (st_data_t*)&key, NULL) != 0) {
+ if (st_delete(undef_tbl, &key, NULL) != 0) {
unlink_undef(key, sym->n_value);
free(key);
}
@@ -861,13 +831,12 @@ load_1(fd, disp, need_init)
if (need_init) {
int len;
char **libs_to_be_linked = 0;
- char *buf;
if (undef_tbl->num_entries > 0) {
if (load_lib(libc) == -1) goto err_exit;
}
- init_funcname(&buf, need_init);
+ init_funcname(buf, need_init);
len = strlen(buf);
for (sym = syms; sym<end; sym++) {
@@ -956,9 +925,8 @@ load_lib(lib)
dln_errno = DLN_EBADLIB;
if (lib[0] == '-' && lib[1] == 'l') {
- long len = strlen(lib) + 4;
- char *p = alloca(len);
- snprintf(p, len, "lib%s.a", lib+2);
+ char *p = alloca(strlen(lib) + 4);
+ sprintf(p, "lib%s.a", lib+2);
lib = p;
}
@@ -1112,7 +1080,7 @@ dln_sym(name)
#endif /* USE_DLN_A_OUT */
#ifdef USE_DLN_DLOPEN
-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
+# ifdef __NetBSD__
# include <nlist.h>
# include <link.h>
# else
@@ -1136,29 +1104,17 @@ dln_sym(name)
#include <mach-o/rld.h>
#else
#include <mach-o/dyld.h>
-#ifndef NSLINKMODULE_OPTION_BINDNOW
-#define NSLINKMODULE_OPTION_BINDNOW 1
#endif
#endif
-#else
#ifdef __APPLE__
#include <mach-o/dyld.h>
#endif
-#endif
+
#if defined _WIN32 && !defined __CYGWIN__
#include <windows.h>
#endif
-#ifdef _WIN32_WCE
-#undef FormatMessage
-#define FormatMessage FormatMessageA
-#undef LoadLibrary
-#define LoadLibrary LoadLibraryA
-#undef GetProcAddress
-#define GetProcAddress GetProcAddressA
-#endif
-
static const char *
dln_strerror()
{
@@ -1169,7 +1125,7 @@ dln_strerror()
case DLN_ECONFL:
return "Symbol name conflict";
case DLN_ENOINIT:
- return "No initializer given";
+ return "No inititalizer given";
case DLN_EUNDEF:
return "Unresolved symbols";
case DLN_ENOTLIB:
@@ -1193,7 +1149,7 @@ dln_strerror()
char *p = message;
p += sprintf(message, "%d: ", error);
FormatMessage(
- FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ FORMAT_MESSAGE_FROM_SYSTEM,
NULL,
error,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
@@ -1218,7 +1174,7 @@ aix_loaderror(const char *pathname)
int i,j;
struct errtab {
- int errnum;
+ int errno;
char *errstr;
} load_errtab[] = {
{L_ERROR_TOOMANY, "too many errors, rest skipped."},
@@ -1230,7 +1186,7 @@ aix_loaderror(const char *pathname)
{L_ERROR_MEMBER,
"file not an archive or does not contain requested member:"},
{L_ERROR_TYPE, "symbol table mismatch:"},
- {L_ERROR_ALIGN, "text alignment in file is wrong."},
+ {L_ERROR_ALIGN, "text allignment in file is wrong."},
{L_ERROR_SYSTEM, "System error:"},
{L_ERROR_ERRNO, NULL}
};
@@ -1238,14 +1194,14 @@ aix_loaderror(const char *pathname)
#define LOAD_ERRTAB_LEN (sizeof(load_errtab)/sizeof(load_errtab[0]))
#define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1)
- snprintf(errbuf, 1024, "load failed - %s ", pathname);
+ snprintf(errbuf, 1024, "load failed - %.200s ", pathname);
if (!loadquery(1, &message[0], sizeof(message)))
ERRBUF_APPEND(strerror(errno));
for(i = 0; message[i] && *message[i]; i++) {
int nerr = atoi(message[i]);
for (j=0; j<LOAD_ERRTAB_LEN; j++) {
- if (nerr == load_errtab[i].errnum && load_errtab[i].errstr)
+ if (nerr == load_errtab[i].errno && load_errtab[i].errstr)
ERRBUF_APPEND(load_errtab[i].errstr);
}
while (isdigit(*message[i])) message[i]++;
@@ -1258,72 +1214,46 @@ aix_loaderror(const char *pathname)
}
#endif
-#if defined(__VMS)
-#include <starlet.h>
-#include <rms.h>
-#include <stsdef.h>
-#include <unixlib.h>
-#include <descrip.h>
-#include <lib$routines.h>
-
-static char *vms_filespec;
-static int vms_fileact(char *filespec, int type);
-static long vms_fisexh(long *sigarr, long *mecarr);
-#endif
-
-#endif /* NO_DLN_LOAD */
-
void*
dln_load(file)
const char *file;
{
-#ifdef NO_DLN_LOAD
- rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
-#else
-
-#if !defined(_AIX) && !defined(NeXT)
- const char *error = 0;
-#define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
-#endif
-
#if defined _WIN32 && !defined __CYGWIN__
HINSTANCE handle;
char winfile[MAXPATHLEN];
void (*init_fct)();
- char *buf;
+ char buf[MAXPATHLEN];
if (strlen(file) >= MAXPATHLEN) rb_loaderror("filename too long");
/* Load the file as an object one */
- init_funcname(&buf, file);
+ init_funcname(buf, file);
strcpy(winfile, file);
/* Load file */
- if ((handle = LoadLibrary(winfile)) == NULL) {
- error = dln_strerror();
+ if ((handle =
+ LoadLibraryExA(winfile, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)) == NULL) {
goto failed;
}
if ((init_fct = (void(*)())GetProcAddress(handle, buf)) == NULL) {
rb_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
}
-
/* Call the init code */
(*init_fct)();
return handle;
#else
#ifdef USE_DLN_A_OUT
if (load(file) == -1) {
- error = dln_strerror();
goto failed;
}
return 0;
#else
- char *buf;
+ char buf[MAXPATHLEN];
/* Load the file as an object one */
- init_funcname(&buf, file);
+ init_funcname(buf, file);
#ifdef USE_DLN_DLOPEN
#define DLN_DEFINED
@@ -1334,28 +1264,21 @@ dln_load(file)
#ifndef RTLD_LAZY
# define RTLD_LAZY 1
#endif
-#ifdef __INTERIX
-# undef RTLD_GLOBAL
-#endif
#ifndef RTLD_GLOBAL
# define RTLD_GLOBAL 0
#endif
/* Load file */
if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
- error = dln_strerror();
goto failed;
}
- init_fct = (void(*)())dlsym(handle, buf);
- if (init_fct == NULL) {
- error = DLN_ERROR();
+ if ((init_fct = (void(*)())dlsym(handle, buf)) == NULL) {
dlclose(handle);
goto failed;
}
/* Call the init code */
(*init_fct)();
-
return handle;
}
#endif /* USE_DLN_DLOPEN */
@@ -1411,41 +1334,31 @@ dln_load(file)
Special Thanks...
Yu tomoak-i@is.aist-nara.ac.jp,
Mi hisho@tasihara.nest.or.jp,
- 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;
+ object_files[0] = 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);
+ if(rld_load(NULL, NULL, object_files, NULL) == 0) {
rb_loaderror("Failed to load %.200s", file);
}
/* lookup the initial function */
- if(rld_lookup(s, buf, &init_address) == 0) {
- NXFlush(s);
- NXClose(s);
+ if(rld_lookup(NULL, buf, &init_address) == 0) {
rb_loaderror("Failed to lookup Init function %.200s", file);
}
- NXFlush(s);
- NXClose(s);
+ /* Cannot call *init_address directory, so copy this value to
+ funtion pointer */
- /* Cannot call *init_address directory, so copy this value to
- funtion pointer */
init_fct = (void(*)())init_address;
(*init_fct)();
return (void*)init_address;
@@ -1455,7 +1368,7 @@ dln_load(file)
int dyld_result;
NSObjectFileImage obj_file; /* handle, but not use it */
/* "file" is module file name .
- "buf" is pointer to initial function name with "_" . */
+ "buf" is initial function name with "_" . */
void (*init_fct)();
@@ -1466,12 +1379,15 @@ dln_load(file)
rb_loaderror("Failed to load %.200s", file);
}
- NSLinkModule(obj_file, file, NSLINKMODULE_OPTION_BINDNOW);
+ NSLinkModule(obj_file, file, TRUE);
/* lookup the initial function */
- if(!NSIsSymbolNameDefined(buf)) {
+ /*NSIsSymbolNameDefined require function name without "_" */
+ if(NSIsSymbolNameDefined(buf + 1)) {
rb_loaderror("Failed to lookup Init function %.200s",file);
- }
+ }
+
+ /* NSLookupAndBindSymbol require function name with "_" !! */
init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
(*init_fct)();
@@ -1568,77 +1484,23 @@ dln_load(file)
if (err) {
rb_loaderror("Unresolved symbols - %s" , file);
}
+
init_fct = (void (*)())symAddr;
(*init_fct)();
return (void*)init_fct;
}
#endif /* __MACOS__ */
-#if defined(__VMS)
-#define DLN_DEFINED
- {
- long status;
- void (*init_fct)();
- char *fname, *p1, *p2;
-
- $DESCRIPTOR(fname_d, "");
- $DESCRIPTOR(image_d, "");
- $DESCRIPTOR(buf_d, "");
-
- decc$to_vms(file, vms_fileact, 0, 0);
-
- fname = (char *)__alloca(strlen(file)+1);
- strcpy(fname,file);
- if (p1 = strrchr(fname,'/'))
- fname = p1 + 1;
- if (p2 = strrchr(fname,'.'))
- *p2 = '\0';
-
- fname_d.dsc$w_length = strlen(fname);
- fname_d.dsc$a_pointer = fname;
- image_d.dsc$w_length = strlen(vms_filespec);
- image_d.dsc$a_pointer = vms_filespec;
- buf_d.dsc$w_length = strlen(buf);
- buf_d.dsc$a_pointer = buf;
-
- lib$establish(vms_fisexh);
-
- status = lib$find_image_symbol (
- &fname_d,
- &buf_d,
- &init_fct,
- &image_d);
-
- lib$establish(0);
-
- if (status == RMS$_FNF) {
- error = dln_strerror();
- goto failed;
- } else if (!$VMS_STATUS_SUCCESS(status)) {
- error = DLN_ERROR();
- goto failed;
- }
-
- /* Call the init code */
- (*init_fct)();
-
- return 1;
- }
-#endif /* __VMS */
-
#ifndef DLN_DEFINED
- rb_notimplement();
+ rb_notimplement("dynamic link not supported");
#endif
#endif /* USE_DLN_A_OUT */
#endif
#if !defined(_AIX) && !defined(NeXT)
failed:
- rb_loaderror("%s - %s", error, file);
+ rb_loaderror("%s - %s", dln_strerror(), file);
#endif
-
-#endif /* NO_DLN_LOAD */
- return 0; /* dummy return */
}
static char *dln_find_1();
@@ -1649,11 +1511,15 @@ dln_find_exe(fname, path)
const char *path;
{
if (!path) {
- path = getenv(PATH_ENV);
+#if defined(__human68k__)
+ path = getenv("path");
+#else
+ path = getenv("PATH");
+#endif
}
if (!path) {
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__MACOS__)
path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
#else
path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
@@ -1676,6 +1542,34 @@ dln_find_file(fname, path)
#endif
}
+#if defined(__CYGWIN32__)
+const char *
+conv_to_posix_path(win32, posix, len)
+ char *win32;
+ char *posix;
+ int len;
+{
+ char *first = win32;
+ char *p = win32;
+ char *dst = posix;
+
+ for (p = win32; *p; p++)
+ if (*p == ';') {
+ *p = 0;
+ cygwin32_conv_to_posix_path(first, posix);
+ posix += strlen(posix);
+ *posix++ = ':';
+ first = p + 1;
+ *p = ';';
+ }
+ if (len < strlen(first))
+ fprintf(stderr, "PATH length too long: %s\n", first);
+ else
+ cygwin32_conv_to_posix_path(first, posix);
+ return dst;
+}
+#endif
+
static char fbuf[MAXPATHLEN];
static char *
@@ -1687,21 +1581,19 @@ dln_find_1(fname, path, exe_flag)
register char *dp;
register char *ep;
register char *bp;
+#ifndef __MACOS__
struct stat st;
-#ifdef __MACOS__
+#else
const char* mac_fullpath;
#endif
- if (!fname) return fname;
if (fname[0] == '/') return fname;
if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
return fname;
if (exe_flag && strchr(fname, '/')) return fname;
-#ifdef DOSISH
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__)
if (fname[0] == '\\') return fname;
-# ifdef DOSISH_DRIVE_LETTER
if (strlen(fname) > 2 && fname[1] == ':') return fname;
-# endif
if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
return fname;
if (exe_flag && strchr(fname, '\\')) return fname;
@@ -1731,7 +1623,7 @@ dln_find_1(fname, path, exe_flag)
*/
if (*dp == '~' && (l == 1 ||
-#if defined(DOSISH)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__)
dp[1] == '\\' ||
#endif
dp[1] == '/')) {
@@ -1768,7 +1660,7 @@ dln_find_1(fname, path, exe_flag)
*bp = '\0';
fprintf(stderr, "\tDirectory \"%s\"\n", fbuf);
fprintf(stderr, "\tFile \"%s\"\n", fname);
- goto next;
+ continue;
}
memcpy(bp, fname, i + 1);
@@ -1776,20 +1668,16 @@ dln_find_1(fname, path, exe_flag)
if (stat(fbuf, &st) == 0) {
if (exe_flag == 0) return fbuf;
/* looking for executable */
- if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
- return fbuf;
+ if (eaccess(fbuf, X_OK) == 0) return fbuf;
}
#else
if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) {
if (exe_flag == 0) return mac_fullpath;
/* looking for executable */
- if (stat(mac_fullpath, &st) == 0) {
- if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0)
- return mac_fullpath;
- }
+ if (eaccess(mac_fullpath, X_OK) == 0) return mac_fullpath;
}
#endif
-#if defined(DOSISH)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__)
if (exe_flag) {
static const char *extension[] = {
#if defined(MSDOS)
@@ -1797,9 +1685,9 @@ dln_find_1(fname, path, exe_flag)
#if defined(DJGPP)
".btm", ".sh", ".ksh", ".pl", ".sed",
#endif
-#elif defined(__EMX__) || defined(_WIN32)
+#elif defined(__EMX__) || defined(NT)
".exe", ".com", ".cmd", ".bat",
-/* end of __EMX__ or _WIN32 */
+/* end of __EMX__ or NT*/
#else
".r", ".R", ".x", ".X", ".bat", ".BAT",
/* __human68k__ */
@@ -1822,13 +1710,10 @@ dln_find_1(fname, path, exe_flag)
#else
if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf))
return mac_fullpath;
-
#endif
}
}
-#endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */
-
- next:
+#endif /* MSDOS or NT or __human68k__ or __EMX__ */
/* if not, and no other alternatives, life is bleak */
if (*ep == '\0') {
return NULL;
@@ -1837,24 +1722,3 @@ dln_find_1(fname, path, exe_flag)
/* otherwise try the next component in the search path */
}
}
-
-#if defined(__VMS)
-
-/* action routine for decc$to_vms */
-static int vms_fileact(char *filespec, int type)
-{
- if (vms_filespec)
- free(vms_filespec);
- vms_filespec = malloc(strlen(filespec)+1);
- strcpy(vms_filespec, filespec);
- return 1;
-}
-
-/* exception handler for LIB$FIND_IMAGE_SYMBOL */
-static long vms_fisexh(long *sigarr, long *mecarr)
-{
- sys$unwind(1, 0);
- return 1;
-}
-
-#endif /* __VMS */
diff --git a/dln.h b/dln.h
index 182cf9f9f4..c29d3bd8e9 100644
--- a/dln.h
+++ b/dln.h
@@ -6,27 +6,20 @@
$Date$
created at: Wed Jan 19 16:53:09 JST 1994
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
#ifndef DLN_H
#define DLN_H
-#ifdef __cplusplus
-# ifndef HAVE_PROTOTYPES
-# define HAVE_PROTOTYPES 1
-# endif
-# ifndef HAVE_STDARG_PROTOTYPES
-# define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
+#ifndef _
+#ifndef __STDC__
# define _(args) ()
+# define const
+#else
+# define _(args) args
+#endif
#endif
char *dln_find_exe _((const char*,const char*));
diff --git a/dmydln.c b/dmydln.c
deleted file mode 100644
index 09ea06806c..0000000000
--- a/dmydln.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_DLN_LOAD 1
-#include "dln.c"
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
deleted file mode 100644
index d168a50f80..0000000000
--- a/doc/ChangeLog-1.8.0
+++ /dev/null
@@ -1,24345 +0,0 @@
-Mon Aug 4 17:21:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (class_instance_method_list): methods defined in
- singleton class and extended modules should be included.
- [ruby-dev:21119]
-
-Mon Aug 4 13:05:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (method_proc): should specify YIELD_FUNC_SVALUE.
- [ruby-dev:21107]
-
- * marshal.c (w_object): should not call w_extended for USRMARSHAL
- dump. [ruby-dev:21106]
-
-Mon Aug 4 10:42:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit/ui/console/testrunner.rb: Flushed io in the
- Console::TestRunner so that it will output immediately.
-
-Mon Aug 4 10:27:22 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * util.h: remove unnecessary parentheses. [ruby-dev:20879]
-
-Mon Aug 4 10:00:47 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (receive_responses): raise exception to
- client_thread. Thanks to William Webber.
-
-Mon Aug 4 09:22:53 2003 William Webber <wew@williamwebber.com>
-
- * lib/net/imap.rb: convert RD to RDoc.
-
-Mon Aug 4 02:34:05 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_utime): never use utime() of C runtime.
- [ruby-talk:77782]
-
-Sun Aug 3 23:56:50 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_call_super): should propagate previous block for
- super call. [ruby-talk:77884]
-
-Sun Aug 3 22:07:47 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkentry.rb: support 'validatecommand' option of
- TkEntry/TkSpinbox widget
-
- * ext/tk/sample/{demos-en,demos-jp}/spin.rb: add
-
-Sun Aug 3 19:25:28 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (call_trace_func): clear exception flag temporarily.
- [ruby-dev:21090]
-
-Sun Aug 3 18:03:44 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * regex.h (re_mbctab): should refer to RUBY_EXPORT. [ruby-ext:02199]
-
- * lib/un.h (help): new. % ruby -run -e help cp
-
-Sun Aug 3 08:53:06 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/{demos-en,demos-jp}/image3.rb: add
-
- * ext/tk/lib/tkcanvas.rb: bug fix on Tk object ID management
-
- * ext/tk/lib/tktext.rb: ditto
-
-Sun Aug 3 02:55:52 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * process.c: modify macro to detect 'MacOS X' [ruby-talk:77849]
-
- * ext/tcltklib/lib/tcltk.rb: bug fix ( NOT MAINTAINED : only
- for running 'line2.rb' demo. )
-
-Sun Aug 3 02:45:06 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * numeric.c (flo_to_s): get rid of buffer overflow.
-
-Sat Aug 2 23:51:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (appendline): clearerr(3) before raising exception, since
- exception may be captured by rescue. [ruby-talk:77794]
-
-Sat Aug 2 09:58:13 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix --- TkGrid failed to treat
- RELATIVE PLACEMENT
-
- * ext/tk/sample/demos-en/, demos-jp/: add or modify some
- widget demo scripts
-
-Sat Aug 2 20:59:38 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick/https.rb: change an option name.
- :SSLCertStore -> :SSLCertificateStore.
-
-Sat Aug 2 19:18:40 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: respond_to? needs 2nd argument.
- Thanks Jim Bob. [ruby-talk:77796]
-
-Sat Aug 2 15:11:54 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb (--no-undefined): annoying option removed.
-
-Sat Aug 2 14:53:55 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * lib/mkmf.rb (pkg_config): get configuration by pkg-config. [new]
-
- * ext/openssl/extconf.rb: use pkg_config.
-
-Sat Aug 2 13:45:17 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c: add "#pragma weak" for __libc_ia64_register_backing_store_base.
- [ruby-dev:21072]
-
-Sat Aug 2 14:02:39 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * variable.c (classname): find regular class name if not set.
- [ruby-dev:20496]
-
-Sat Aug 2 09:58:13 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix --- forgot to entry a widget class
- name of 'labelframe' widget
-
- * ext/tk/sample/{demos-en,demos-jp}/{labelframe.rb,paned1.rb,
- paned2.rb,spin.rb}: add demo-scripts to the JP/EN widget demos
-
-Sat Aug 2 05:04:30 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkentry.rb: bug fix of TkEntry#delete
-
- * ext/tk/samples/: bug fix of some widget demos
-
- * ext/tk/lib/tk.rb: support <TkVariable object> == <Symbol>
-
- * ext/tk/lib/*.rb: freeze some object for security reason
-
-Sat Aug 2 03:30:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_obj_singleton_methods): should not go up to
- ancestors unless the recursive flag is set. [ruby-list:38007]
-
- * eval.c (rb_yield_0): expand [] to nil if avalue is set.
- [ruby-dev:21058]
-
- * hash.c (env_each_key): use env_keys to avoid environment modify
- on the fly.
-
- * hash.c (env_each_value): use env_values for safety.
-
- * hash.c (env_each): allocate environment array first.
-
-Fri Aug 2 03:20:00 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * lib/yaml/store.rb (YAML::Store#initialize): filename is first
- argument. Thanks Kent Dahl.
-
-Sat Aug 2 00:49:31 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: refine document.
-
-Fri Aug 1 23:57:45 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * gc.c (rb_gc_mark_locations): no need to swap arguments.
-
- * gc.c (STACK_LENGTH): insufficient for growing up stack
- architectures.
-
- * gc.c (rb_gc, Init_stack) ditto.
-
-Fri Aug 1 23:33:36 2003 Masatoshi Seki <mas@snow.local.>
-
- * rubytest.rb: set dldpath on darwin.
-
-Fri Aug 1 23:07:38 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: convert RD to RDoc. Thanks William Webber.
- [ruby-doc:456]
-
-Fri Aug 1 19:48:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/rubyext.c (syck_emitter_write_m): forgot to declare
- "self", making it default to "int".
-
- * ext/syck/rubyext.c (syck_emitter_simple_write): ditto.
-
- * gc.c (rb_gc): should mark backing store region on IA64.
-
-Fri Aug 1 18:51:10 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * process.c: bug fix --- preprocessor errors occur on OpenBSD-current
-
-Fri Aug 1 17:13:23 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/openssl/extconf.rb: should replace literally.
-
-Fri Aug 1 16:22:57 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (rb_io_check_readable, rb_io_check_writable): ensure not
- closed at first.
-
- * io.c (rb_io_getline): check readable always. (ruby-bugs:PR#1069)
-
- * io.c (rb_io_each_byte): ditto.
-
-Fri Aug 1 16:02:46 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * io.c (READ_DATA_PENDING_PTR): cast to get rid of warnings.
-
- * ext/socket/socket.c (unix_send_io, unix_recv_io): ditto.
-
-Fri Aug 1 15:53:24 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (isInternalCmd): shouldn't return if find end of str.
- [ruby-talk:77678]
-
-Fri Aug 1 13:45:14 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * eval.c (rb_call_super): propagate previous block if a block is
- given. [ruby-talk:77577]
-
-Fri Aug 1 09:54:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_fill): array length may be changed during the
- block execution. [ruby-talk:77579]
-
- * array.c (rb_ary_zip): ditto.
-
- * array.c (rb_ary_fill): ditto.
-
- * hash.c (env_reject_bang): length may be changed during the block
- execution.
-
- * hash.c (env_clear): ditto.
-
-Fri Aug 1 04:58:55 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix --- forget to eval given block to
- TkRoot.new method
-
- * ext/tk/sample/tkoptdb-safeTk.rb: new sample script
-
-Fri Aug 1 00:52:58 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (Init_stack): IA64 requires STACK_LEVEL_MAX to be less than
- magic number when optimizer turned on, regardless of rlimit
- values.
-
-Thu Jul 31 23:44:00 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/erb.rb: import erb-2.0.4b4.
-
-Thu Jul 31 23:04:45 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/sample/resource.en, ext/tk/sample/resource.jp:
- wrong resource file format
-
- * ext/tk/lib/tk.rb: add Tk::Encoding.{encoding_convertfrom,
- encoding_convertto}
-
- * ext/tk/lib/tk.rb: add TkOptionDB.read_with_encoding to read
- non-utf8 resource file
-
-Thu Jul 31 23:02:47 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/etc/etc.c: revert getenv()'s prototype. use it only when _WIN32
- is not defined.
-
-Thu Jul 31 20:52:40 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: (IMPORTANT BUG FIX) scan of event keywords
- doesn't work on recent versions of Tck/Tk
-
- * ext/tk/lib/tk.rb: initialize error of instance variable on
- TkComposite
-
- * ext/tk/lib/multi-tk.rb: initialize error on encoding-system on
- MultiTkIp
-
- * ext/tk/lib/tk.rb: trouble on destroying widgets
-
- * ext/tk/sample/demos-en/, demos-jp/: add JP and EN version of
- Ruby/Tk widget demos
-
-Thu Jul 31 15:25:12 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * array.c (rb_ary_collect): must get length of array for each
- iteration. reported on [ruby-talk:77500], and fixed by
- K.Sasada <ko1@namikilab.tuat.ac.jp> on [ruby-talk:77504]
-
-Thu Jul 31 14:11:54 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: move gmake specific features
- into GNUmakefile.
-
-Thu Jul 31 12:36:11 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * bin/erb, lib/erb.rb: add explicit trim mode.
-
-Thu Jul 31 04:59:10 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (rb_num_coerce_relop): export function.
-
-Thu Jul 31 08:18:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
-
- * lib/test/unit.rb: A useful return code is now set if tests fail when
- running automatically using the Console::TestRunner.
-
-Thu Jul 31 07:59:18 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: wrap the command-proc of TkScale --- pass
- the numeric object to the proc
-
- * ext/tk/lib/tk.rb: better support for widgets created on
- Tk interpreter (without Ruby)
-
- * ext/tk/lib/multi-tk.rb: a little more stable on Multiple Tk
- interpreters running
-
-Thu Jul 31 00:17:19 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (return_code): obsolete.
-
- * lib/net/ftp.rb (last_response_code): new method. lastresp is now
- alias to last_response_code.
-
- * lib/net/ftp.rb (last_response): new method.
-
-Wed Jul 30 23:55:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): check has been dropped. "_dump must return
- string." [ruby-dev:21024]
-
-Wed Jul 30 22:35:19 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (dir_config): allow multiple directories separated
- by File::PATH_SEPARATOR.
-
- * lib/mkmf.rb (create_makefile): DLDFLAGS include $LDFLAGS again.
- [ruby-talk:76894]
-
- * lib/mkmf.rb (init_mkmf): not default $LDFLAGS to LDFLAGS for
- ruby itself, but default $DLDFLAGS to DLDFLAGS.
-
-Wed Jul 30 16:17:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): marshal_dump should not take any
- argument.
-
-Wed Jul 30 15:54:04 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): should initialize
- instance variables. [ruby-talk:77362]
-
-Wed Jul 30 15:39:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): -F set compiled regular expression to $;.
- [ruby-talk:77381]
-
- * string.c (Init_String): no setter type check for $;
-
-Wed Jul 30 15:10:02 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * error.c (rb_raise): snprintf() termination moved to
- win32/win32.c.
-
- * win32/win32.c (valid_filename, str_grow): unused.
-
- * win32/win32.c (NTLoginName, ChildRecord): make static.
-
- * win32/win32.c (CreateChild): argument check.
-
- * win32/win32.c (kill): should not call CloseHandle() when
- OpenProcess() failed.
-
- * win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): ensure buffer
- terminated. [ruby-talk:69672]
-
-Wed Jul 30 10:54:10 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (get): fix wrong argument name. Thanks to William
- Webber.
-
-Wed Jul 30 10:31:37 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/iconv/iconv.c (iconv_convert): append unchanged portion
- after overflow. [ruby-dev:21006]
-
- * ext/iconv/extconf.rb: check if iconv() 2nd argument is const.
-
-Wed Jul 30 09:31:55 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (os2-emx): renamed from os2_emx, add flags to
- CFLAGS and LDFLAGS, and remove lib prefix. [ruby-dev:20993]
-
- * file.c (rb_file_s_rename): retry with removing new file on
- DOSISH. [ruby-dev:21007]
-
- * ext/socket/extconf.rb (sendmsg, recvmsg): check functions.
-
- * ext/socket/socket.c (unix_send_io, unix_recv_io): raise
- NotImplementedError unless system calls are available.
-
- * ext/socket/socket.c (sock_initialize): rename from sock_init()
- to get rid of conflict with OS/2 socket library.
-
-Wed Jul 30 07:23:14 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkentry.rb: fix lack of methods for TkEntry
-
- * ext/tk/lib/multi-tk.rb, ext/tk/lib/tk.rb,
- ext/tk/lib/tkdialog.rb, ext/tk/lib/tkentry.rb,
- ext/tk/sample/safe-tk.rb, ext/tk/sample/tktimer2.rb: bug fix
-
- * ext/tk/lib/multi-tk.rb: MultiTkIp.new_* accept a block to
- eval under the new interpreter
-
-Wed Jul 30 04:36:30 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c,
- ext/tk/lib/tk.rb, ext/tk/lib/tkafter.rb: additional check of
- Tk interpreters' status for a little more safety
-
-Wed Jul 30 02:37:12 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): if object responds to 'marshal_dump',
- Marshal.dump uses it to dump object. unlike '_dump',
- marshal_dump returns any kind of object.
-
- * marshal.c (r_object0): restore instance by calling
- 'marshal_load' method. unlike '_load', it's an instance
- method, to handle cyclic reference.
-
- * marshal.c (marshal_load): all objects read from file should be
- tainted. [ruby-core:01325]
-
-Wed Jul 30 01:47:51 2003 Hugh Sasse <hgs@dmu.ac.uk>
-
- * lib/timeout.rb (Timeout::timeout): execute immediately if sec is
- zero.
-
-Wed Jul 30 01:36:18 2003 Aron Griffis <ruby-talk@griffis1.net>
-
- * ext/socket/socket.c (socks_init): typo fixed. [ruby-talk:77232]
-
-Wed Jul 30 00:48:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/extconf.rb: the default value for --enable-socks is
- taken from ENV["SOCKS_SERVER"]. [ruby-talk:77232]
-
- * ruby.c (proc_options): add -W option. -W0 to shut up all warning
- messages. [ruby-talk:77227]
-
- * error.c (rb_warn): no message will be printed if the value of
- $VERBOSE is "nil", i.e. perfect silence.
-
- * ruby.c (verbose_setter): $VERBOSE value is either true, false,
- or nil.
-
- * io.c (Init_IO): no "read" check for $stdin. in addition some
- function names has been changed.
-
-Tue Jul 29 23:10:19 2003 Yoshida Masato <yoshidam@yoshidam.net>
-
- * regex.c (re_match_exec): incorrect multibyte match.
-
-Tue Jul 29 22:36:50 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb (send0): do taint check only when $SAFE > 0
-
-Tue Jul 29 19:20:34 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/fileutils.rb (install): support preserve timestamp.
-
- * instruby.rb (install): use FileUtils::install preserve mode.
-
- * lib/un.rb: new. % ruby -run -e cp -- -p foo bar
-
- * lib/mkmf.rb: use un.rb instead of ftools.rb.
-
- * MANIFEST: add lib/un.rb.
-
- * ext/extmk.rb (INSTALL_PROG, INSTALL_DATA): modify verbose messages.
-
-Tue Jul 29 18:55:22 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: unify coding style.
-
- * lib/net/http.rb: ditto.
-
-Tue Jul 29 17:27:59 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ruby.h (LLONG_MIN): fix typo.
-
-Tue Jul 29 16:38:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/net/smtp.rb (Net::SMTP::send0): add taint check.
-
-Tue Jul 29 15:41:02 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * instruby.rb (install): preserve the timestamp for Mac OS X ranlib
- problem.
-
-Tue Jul 29 01:14:51 2003 Rick Ohnemus <rick_ohnemus@acm.org>
-
- * ruby.h (LLONG_MIN): wrong value.
-
-Mon Jul 28 22:57:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_getc): $stdin may not be IO. [ruby-dev:20973]
-
-Tue Jul 29 16:20:36 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: bug fix and
- change mainloop_abort_on_no_widget_cmd => mainloop_abort_on_exception
- ( to avoid thread timing trouble on accessing destroyed widgets )
-
- * ext/tk/lib/multi-tk.rb: change default mode of
- mainloop_abort_on_exception on multi-tk.rb
-
- * ext/tk/lib/multi-tk.rb: fix a bug of the procedure for
- 'Delete' button on the safe-Tk frmae
-
-Tue Jul 29 12:22:28 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/token.c: prefixed many constants and definitions
- with YAML_ to avoid name clash.
-
- * ext/syck/gram.c: ditto.
-
- * ext/syck/gram.h: ditto.
-
-Tue Jul 29 12:15:37 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/etc/etc.c: add real prototype to getenv().
-
- * win32/win32.h: add arguments to definitions of functions if possible.
-
-Tue Jul 29 08:05:30 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb, ext/tk/lib/tkdialog.rb, ext/tk/lib/tktext.rb,
- ext/tk/sample/tkbiff.rb, ext/tk/sample/tkdialog.rb,
- ext/tk/sample/tkform.rb: bug fix ( tested with Ruby/Tk widget demo )
-
-Tue Jul 29 04:22:08 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/syck.h: Added 'syck' yacc prefixes.
-
- * ext/syck/gram.c: ditto.
-
- * ext/syck/token.c: ditto.
-
- * ext/syck: Added ruby.h reference to source files.
-
-Tue Jul 29 03:53:28 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/lib/net/https.rb (use_ssl=): raise ProtocolError if
- connection is set up already.
-
-Tue Jul 29 01:45:32 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: use RTEST()
-
-Tue Jul 29 01:24:32 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: bug fix
-
- * ext/tk/lib/multi-tk.rb: bug fix and pack options are pssed
- to the safeTk container
-
- * ext/tk/sample/safe-tk.rb: add example for pack options of
- safeTk container
-
-Mon Jul 28 23:23:08 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (Init_File): IO should include File::Const.
- [ruby-dev:20964]
-
-Mon Jul 28 18:53:03 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/openssl/extconf.rb: check again after pkg-config for MinGW on
- Cygwin.
-
-Mon Jul 28 15:32:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_gets): only "gets" should set $_.
-
- * ext/stringio/stringio.c (strio_getline): should not set $_ here.
-
- * io.c (argf_to_s): argf.to_s returns "ARGF".
-
- * io.c (set_defout_var, set_deferr_var): make $defout and $deferr
- obsolete.
-
- * io.c (set_input_var, set_output_var): allow $stdin, $stdout,
- $stderr not to be instance of IO.
-
- * io.c (rb_f_readline): forward method to current_file. gets,
- readline, readlines, getc, readchar, tell, seek, pos=, rewind,
- fileno, to_io, eof, each_line, each_byte, binmode, and closed?
- as well.
-
- * io.c (argf_forward): utility function to forward method to
- current_file.
-
-Mon Jul 28 06:10:13 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: bug fix
-
- * ext/lib/tk/multi-tk.rb: bug fix
-
- * ext/lib/tk/multi-tk.rb: add methods depend on Tcl's 'interp' command
-
- * ext/lib/tk/multi-tk.rb: suppot safe-level control of each interpreter
-
-Mon Jul 28 03:08:47 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: each() should return self.
-
-Mon Jul 28 01:35:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_chomp_bang): defer rb_str_modify() to actual
- modify point. other methods, replace, tr, delete, squeeze,
- lstrip, and rstrip as well.
-
- * string.c (rb_str_rstrip_bang): remove trailing '\0' at the end
- of string.
-
- * string.c (rb_str_lstrip_bang): do not strip '\0' from the left.
-
-Sun Jul 27 21:16:30 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/openssl/extconf.rb: better support MinGW. add
- dir_config("kerberos") and with_config("pkg-config").
-
- * mkconfig.rb: initialize global variables to avoid warnings.
-
-Sun Jul 27 19:35:06 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: add some methods to support
- multiple interpreters (low level)
-
- * ext/tk/lib/multi-tk.rb: new library to support multiple Tk
- interpreters (high level)
-
- * ext/tcltklib/demo/safeTk.rb: new sample of safeTk interpreter
-
- * ext/tk/sample/safe-tk.rb: new sample of multi-tk.rb
-
- * ext/tk/lib/tk.rb: bug fix and add feature to supprt multi-tk
-
- * ext/tk/lib/tkafter.rb: ditto
-
-Sun Jul 27 14:43:37 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/debug.rb: fix breakpoint parameter parsing/checking.
- (?:(file|class):)(line_number|method)
-
-Sun Jul 27 10:21:28 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/unix.rb: add UNIXFileOwner, UNIXFileGroup.
-
-Sun Jul 27 03:10:43 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (io_reopen): avoid dup2() equal handles not to close itself and
- to get rid of a msvcrt bug. [ruby-dev:20919]
-
-Sun Jul 27 00:37:16 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/tmpdir.rb: use GetWindowsDirectory, not GetSystemDirectory.
- [ruby-talk:77073]
-
-Sat Jul 26 21:25:21 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (rb_fdopen): set errno if it's zero on win32 platforms.
-
- * ext/openssl/ossl_ssl.c (TO_SOCKET): define special version when
- _WIN32 is defined. this is ruby's problem, not OpenSSL.
-
- * win32/win32.c: remove some old comments.
-
-Sat Jul 26 14:26:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/tk/lib/tk.rb (TkCore::chooseDirectory): back up wrongly
- removed method.
-
-Sat Jul 26 14:14:12 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/stringio/stringio.c: includes Enumerable as well as IO.
- [ruby-talk:77058]
-
-Sat Jul 26 07:00:53 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/erb.rb: fix % line.
-
-Sat Jul 26 05:31:09 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ossl.h: fix comment.
-
- * ext/openssl/ossl.c (ossl_debug): should enable if no va-args
- macro supplied.
-
-Sat Jul 26 04:04:36 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: refine va-args macro detection.
- [ruby-talk:76983]
-
-Sat Jul 26 01:33:51 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/openssl/ossl_ssl.c (ossl_ssl_setup): need to pass the real
- socket to SSL_get_fd on native win32 platforms.
-
-Sat Jul 26 01:20:29 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_const_missing): "const_missing" should not
- appear in the caller(); add call frame adjustment.
-
- * eval.c (rb_method_missing): simplify call frame adjustment.
-
-Fri Jul 26 00:04:25 2003 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
-
- * ext/openssl/sample: add samples.
- - cert2text.rb: dump certificate file as text.
- - crlstore.rb: CRL store implementation. Fetch CRL via HTTP when
- http-access2 is installed.
- - certstore.rb: certificate store implementation.
- - cert_store_view.rb: certificate store viewer with FXRuby. Uses
- c_rehash.rb, crlstore.rb and certstore.rb.
-
-Fri Jul 25 16:43:03 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: add TclTkIp#create_slave,
- TclTkIp#_make_safe and TclTkIp#safe?
-
- * ext/tcltklib/MANUAL.euc: modify descriptions
-
- * ext/tk/lib/tk.rb: bug fix [ruby-talk:76980] and modify to
- support multi Tk IPs
-
- * ext/tk/lib/tkafter.rb: modify to support multi Tk IPs
-
-Fri Jul 25 15:47:39 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: add check for BN_rand_range() and
- BN_pseudo_rand_range().
-
- * ext/openssl/ossl_bn.c (ossl_bn_s_rand_range): should raise
- NotImplementedError if BN_rand_range() wan not defined.
-
- * ext/openssl/ossl_bn.c (ossl_bn_s_pseudo_rand_range): should raise
- NotImplementedError if BN_pseudo_rand_range() wan not defined.
-
- * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_s_encrypt): avoid compiler
- warning for OpenSSL-0.9.6.
-
- * ext/openssl/ossl_pkcs7.c (ossl_pkcs7si_initialize): ditto.
-
-Fri Jul 25 14:34:55 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (tcp_s_gethostbyname): was using
- uninitialized size_t value. [ruby-talk:76946]
-
-Fri Jul 25 13:38:38 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * re.c (rb_reg_options_m): use rb_reg_options() to mask internal
- flags.
-
- * re.c (rb_reg_initialize_m): allow nil as third argument and
- ignore, and mask code flags if the argument is given.
- [ruby-dev:20885]
-
- * re.c (rb_reg_options): get common flags directly.
-
-Fri Jul 25 03:52:21 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * lib/yaml/dbm.rb: replace indexes with values_at.
-
-Fri Jul 25 02:55:59 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: add check for libsocket and libnsl.
-
- * ext/openssl/extconf.rb: use pkg-config to build CFLAGS and LDFLAGS.
-
-Fri Jul 25 01:27:59 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/emitter.c (syck_emitter_flush): accepts count
- of bytes to flush. anchor offsets now functional.
-
- * ext/syck/syck.h (syck_emitter_flush): ditto.
-
- * ext/syck/rubyext.c: ditto.
-
- * ext/syck/token.c: URI escaping now supported.
-
-Thu Jul 24 16:41:31 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (have_type): check if a type is defined.
-
- * lib/mkmf.rb (check_sizeof): check size of a type.
-
- * ext/dbm/extconf.rb: check if type DBM is defined.
- [ruby-talk:76693]
-
-Thu Jul 24 16:18:40 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ChangeLog (add-log-time-format): "%c" contains timezone on
- XEmacs.
-
-Thu Jul 24 16:05:22 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (AC_C_VOLATILE): check if volatile works.
-
- * defines.h (volatile): removed.
-
- * eval.c (rb_thread_group): Thread#group. [new]
-
-Thu Jul 24 15:50:42 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/extconf.rb: add check for win32 OpenSSL libraries.
-
- * ext/openssl/extconf.rb: add check for __VA_ARGS__.
-
- * ext/openssl/ossl.h: avoid non C99 compiler errors.
-
-Thu Jul 24 13:32:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (thgroup_add): no warning for terminated threads.
-
-Thu Jul 24 13:09:26 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pathname.rb: added.
-
-Thu Jul 24 11:21:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/io/wait/extconf.rb: removed unnecessary backward
- compatibility stuff.
-
-Thu Jul 24 11:09:10 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/openssl/extconf.rb: revert use of dir_config.
-
-Thu Jul 24 09:58:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Win32API/lib/win32/resolv.rb: added.
-
- * lib/resolv.rb: support Win32 platforms. based on Tietew's work
- [ruby-dev:15573].
-
-Thu Jul 24 04:05:46 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl/ssl.h: undef X509_NAME and PKCS7_SIGNER_INFO to
- avoid name confliction on mswin32.
-
- * ext/openssl/ssl.c (ossl_protect_obj2bio): avoid VC++ warnings
- in function prototype.
-
- * ext/openssl/ssl.c (ossl_protect_membio2str): ditto.
-
- * ext/openssl/ssl.c (ossl_protect_x509_ary2sk): ditto.
-
-Thu Jul 24 03:44:04 2003 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * ext/openssl/extconf.rb: cut check for OpenSSL version
-
-Thu Jul 24 03:41:30 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/tcltklib/tcltklib.c (ip_init): need at least one statement after
- label.
-
-Thu Jul 24 01:48:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::[]): should return StringIO (or
- Tempfile) for multipart/form.
-
- * variable.c (rb_define_const): give warning for non constant
- name. [ruby-core:01287]
-
-Thu Jul 24 01:51:08 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * lib/webrick: imported.
-
- * MANIFEST: added webrick files.
-
-Thu Jul 24 01:32:04 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/tmpdir.rb (tmpdir): new method. remove TMPDIR.
- use GetSystemWindowsDirectory(GetSystemDirectory), not GetTempPath.
-
-Thu Jul 24 01:08:43 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/openssl: imported.
-
-Wed Jul 23 23:06:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * file.c (DOSISH): better Cygwin support.
-
-Wed Jul 23 19:13:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_split_m): the receiver may be empty string.
-
-Wed Jul 23 18:43:00 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/erb.rb: import erb-2.0.4b1.
-
-Wed Jul 23 18:21:52 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/io/wait: imported.
-
-Wed Jul 23 16:07:35 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * process.c: unify indentation
-
- * configure.in: add --enable-setreuid option
-
- * ext/tcltklib/tcltklib.c: TclTkIp.new accepts 'ip-name' and 'options'
-
- * ext/tk/lib/tk.rb: support arguments of TclTkIp.new
-
- * ext/tk/lib/tk*.rb: preparations for multi-Tk interpreter support
-
-Wed Jul 23 15:49:01 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_lstrip_bang): strip NUL along with white
- spaces. [ruby-talk:76659]
-
- * string.c (rb_str_rstrip_bang): ditto.
-
-Wed Jul 23 14:19:17 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (log_src, checking_for, create_header):
- Logging.message is printf like format.
-
-Wed Jul 23 10:11:15 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/iconv/iconv.c (check_iconv): check if Iconv instance.
-
- * ext/iconv/iconv.c (iconv_convert): stringify argument.
-
-Wed Jul 23 02:39:46 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * process.c: add a module for raw syscalls to control UID/GID
-
- * process.c: add modules for portable UID/GID control
-
-Tue Jul 22 19:16:40 2003 Tanaka Akira <akr@m17n.org>
-
- * ext/iconv/iconv.c (iconv_failure_initialize): limit
- inspect message. [ruby-dev:20785]
-
- * ext/iconv/iconv.c (rb_str_derive): share with original
- string if possible. [ruby-dev:20785]
-
-Tue Jul 22 17:22:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_const_missing): new method. [ruby-core:00441]
-
- * variable.c (rb_const_get_at): allow "const_missing" hook.
-
- * variable.c (rb_const_get_0): ditto.
-
- * eval.c (method_missing): rename from rb_undefined to clarify.
-
- * eval.c (ruby_finalize_0): update exit status if any of END proc
- raises SystemExit. [ruby-core:01256]
-
- * signal.c (rb_trap_exit): wrap rb_eval_cmd
-
- * eval.c (rb_exec_end_proc): reduce rb_protect().
-
-Tue Jul 22 17:15:57 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * MANIFEST (lib/cgi/session/pstore.rb, lib/yaml/baseemitter.rb):
- added.
-
-Tue Jul 22 10:52:19 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/tmpdir.rb: remove charcters after "\000" and regularize path.
-
-Tue Jul 22 02:22:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_equal): should not use rb_equal().
-
- * string.c (rb_str_equal): should return nil for non string
- operand to conform comparable convention. [ruby-dev:20759]
-
-Tue Jul 22 00:19:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tmpdir.rb: new library to get temporary directory path,
- using GetTempPath on Win32 environment.
-
- * lib/tempfile.rb: now uses tmpdir.rb.
-
- * lib/cgi/session.rb, ib/drb/unix.rb: ditto.
-
-Mon Jul 21 01:53:43 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_string_value_cstr): check null byte in the string
- before retrieving C ptr. accessed via macro StringValueCStr.
-
- * file.c: use StringValueCStr to retrieve paths to system calls.
-
- * file.c (sys_fail2): raise error for two operand system calls
- such as rename, link, symlink. (ruby-bugs PR#1047)
-
-Sun Jul 20 11:03:25 2003 UENO Katsuhiro <katsu@blue.sky.or.jp>
-
- * ext/zlib/zlib.c (gzfile_read_header): gz->z.input may be nil after
- finishing reading a gzip header.
-
-Sat Jul 19 22:25:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_match2): add warning to "~string".
- [ruby-list:37751]
-
- * lib/net/ftp.rb (Net::FTP::open): takes block. suggested by Gavin
- Sinclair in [ruby-core:01237].
-
-Sat Jul 19 19:03:24 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/stdlib.c: add bsearch().
-
-Sat Jul 19 12:34:45 2003 David Black <dblack@superlink.net>
-
- * lib/scanf.rb: import.
-
-Sat Jul 19 11:27:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/xmlrpc: import.
-
- * eval.c (thgroup_add): should return group for terminated thread
- case.
-
- * eval.c (thgroup_add): do not raise ThreadError on terminated
- thread addition for compatibility. just warning.
-
-Sat Jul 19 04:50:56 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/iconv/charset_alias.rb, ext/iconv/extconf.rb: make wrapper
- script which maps charset names. [ruby-dev:20625]
-
- * ext/iconv/iconv.c (charset_map): charset name map.
-
- * ext/iconv/iconv.c (iconv_dfree): no exception while
- finalization.
-
- * ext/iconv/iconv.c (iconv_s_conv): new method Iconv.conv.
- [ruby-dev:20588]
-
-Sat Jul 19 03:09:18 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Win32API/lib/win32/registry.rb (Win32::Registry::Error):
- inherit StandardError instead of SystemCallError.
-
-Sat Jul 19 02:00:39 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_attr): extra calls of method_added. [ruby-talk:76361]
-
-Fri Jul 18 18:44:22 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (init_mkmf): clear $INSTALLFILES. [ruby-dev:20727]
-
-Fri Jul 18 17:34:39 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (rm_f): use FileUtils.
-
- * lib/mkmf.rb (modified?): return mtime of the target if
- it exists and newer than times.
-
- * lib/mkmf.rb (install_files): add a current directory
- file even if it does not exist yet.
-
- * lib/mkmf.rb (configuration): do not add $LDFLAGS to
- DLDFLAGS.
-
- * ext/extmk.rb (extmake): check whether Makefile is newer
- than depend and MANIFEST.
-
-Fri Jul 18 14:57:19 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (make_cmdvector): recognize quote within string.
- based on Nobu's patch ([ruby-win32:450]). [ruby-talk:75853]
-
-Fri Jul 18 13:04:36 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_missing): VCALL is called only for LOCAL_ID. no
- check required.
-
- * parse.y (primary): primary:tFID generates NODE_FCALL.
- [ruby-dev:20641]
-
-Thu Jul 17 18:50:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (match_captures): rename from "groups".
-
-Thu Jul 17 17:57:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_clear_cache_by_class): check both klass and origin.
-
-Thu Jul 17 13:46:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_init): set ruby_running to true after
- initialization.
-
-Thu Jul 17 13:42:53 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/ftools.rb (File::makedirs): do not handle "//" as a directory.
-
-Thu Jul 17 06:40:28 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: recover and fix typo : Tk.chooseDirectory
- (Tk8.4 feature)
-
-Wed Jul 16 16:23:58 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_proc_new): call svalue_to_avalue for yield argument.
-
-Wed Jul 16 00:31:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_disable_super, rb_enable_super): deprecate.
-
- * eval.c (thgroup_s_alloc): re-implement group struct.
-
- * eval.c (thgroup_add): add check for enclose and frozen status.
-
-Tue Jul 15 19:50:49 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_add_method, rb_alias): need to clear cache by
- ID when method defined in parent class is cached for
- grand child classes. [ruby-dev:20672]
-
-Tue Jul 15 14:38:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/matrix.rb: remove elements conversion to_f, to_i, to_r.
-
- * lib/cgi/session/pstore.rb: add new file.
-
-Tue Jul 15 03:30:41 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c (syck_mark_emitter): forgot to rb_gc_mark the
- outgoing IO object.
-
-Sun Jul 13 14:55:36 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * process.c (proc_getgroups, proc_setmaxgroups): fix typo.
-
-Sat Jul 12 17:01:28 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * struct.c (struct_entry): add prototype to avoid VC++ warnings.
-
-Sat Jul 12 04:43:57 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/emitter.c: new emitter code.
-
- * ext/syck/rubyext.c: Emitter class.
-
- * lib/yaml.rb: Load Syck emitter, if available.
-
- * lib/yaml/stream.rb: ditto.
-
- * lib/yaml/baseemitter.rb: underlying class for all emitters.
-
- * lib/yaml/rubytypes.rb: use BaseEmitter abstraction.
-
- * lib/yaml/emitter.rb: ditto.
-
-Sat Jul 12 04:23:13 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_undef): need to clear cache for inherited class.
- (rubicon/builtin/TestModulePrivate.rb:test_undef_method)
-
-Sat Jul 12 01:21:54 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (avalue_to_svalue): typo.
-
- * eval.c (rb_load): rb_prohibit_interrupt must not underflow.
-
- * parse.y (NODE_STRTERM, tokadd_string, parse_string): moved
- string nest level from a static variable to NODE_STRTERM, to
- preserve it from word to word in %W/%w.
-
-Fri Jul 11 22:37:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (aix): needs ruby.imp even with gcc.
- (ruby-bugs:PR#1007)
-
-Fri Jul 11 18:37:37 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * instruby.rb: do not handle directories. [ruby-dev:20613]
-
-Fri Jul 11 16:09:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c (ruby_strtod): exp should be less than MDMAXEXPT.
-
-Fri Jul 11 07:17:47 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: not create a Tcl/Tk interpreter if already
- defined TkCore::INTERP
-
- * ext/tk/lib/tk.rb: bugfix on TkWindow#configure
-
-Thu Jul 10 14:42:02 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * math.c (math_log): nan takes a dummy argument on Cygwin 1.5.0.
-
-Wed Jul 9 23:50:46 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * regex.c (mbctab_sjis): 0x80 is not shift jis first byte.
- [ruby-dev:20516]
-
-Wed Jul 9 15:38:28 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * instruby.rb: do not install shared libraries as man pages.
-
- * mkconfig.rb: support text-mount on Cygwin.
-
-Wed Jul 9 11:09:57 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * re.c (match_entry): add prototype to avoid VC++ warnings.
-
-Wed Jul 9 03:48:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_load): put rb_load_file() in a thread critical
- section. [ruby-dev:20490]
-
- * eval.c (compile): put rb_compile_string() in a thread critical
- section.
-
-Tue Jul 8 02:35:41 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_const_get_0): should not warn if constant is not
- defined. (ruby-bugs-ja PR#509)
-
- * bignum.c (rb_big2dbl): give a warning on overflow.
- (ruby-bugs-ja PR#510)
-
- * util.c (ruby_strtod): change MDMAXEXPT from 511 to 308.
-
- * pack.c (utf8_to_uv): long is sufficient. LONG_LONG is not
- required.
-
-Tue Jul 8 01:43:16 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * bignum.c (rb_big2str): support 32 bit (without `long long' type)
- machines. (ruby-bugs-ja PR#512)
-
-Mon Jul 7 10:22:46 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/dbm/extconf.rb (gdbm_compat, qdbm): add check for gdbm_compat
- and qdbm.
-
-Mon Jul 7 01:34:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call_super): k->super maybe NULL if klass is Kernel.
- [ruby-dev:20519]
-
- * gc.c (obj_free): clear method cache when freeing class/module.
-
-Sat Jul 5 23:32:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_remove_method): allow "remove_method" to accept
- multiple arguments.
-
-Sat Jul 5 00:22:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * node.h (NEW_NODE): cast arguments to rb_node_newnode().
-
-Fri Jul 4 21:48:44 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/syck/rubyext.c, ext/syck/syck.c, ext/syck/syck.h,
- ext/syck/token.c: C++ style comments are not allowed.
- (ruby-bugs:PR#1008)
-
-Thu Jul 3 23:41:30 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/timeout.rb: add optional exception argument for compatibility
- function.
-
-Thu Jul 3 14:22:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_values_at): extract common procedure from
- rb_ary_values_at. follow DRY principle.
-
- * re.c (match_values_at): values_at should understand ranges.
-
- * struct.c (rb_struct_values_at): ditto.
-
- * struct.c (inspect_struct): inspect format changed; add "struct "
- at the top.
-
- * sprintf.c (rb_f_sprintf): "%p" specifier for inspect output.
- (RCR#69)
-
- * eval.c (rb_mod_undef_method): allow "undef_method" to accept
- multiple arguments. (RCR#146)
-
- * lib/timeout.rb: put timeout in Timeout module. (RCR#121)
- [ruby-talk:61028]
-
- * re.c (match_groups): new method added. (RCR#139)
-
- * variable.c (rb_mod_const_of): should exclude constant defined
- in Object, unless retrieving constants of Object.
-
-Thu Jul 3 12:13:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (VPATH): convert from Windows form to Unix form on
- MinGW. This fixes the build with GNU make 3.80-1 for Cygwin.
-
-Wed Jul 2 23:27:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_new4): do not allocate new string if original
- is frozen or already have copy-on-write entry. [ruby-talk:74940]
-
-Wed Jul 2 13:22:39 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_shared_replace): clear flags before copy.
-
- * string.c (rb_str_replace): ditto.
-
- * eval.c (rb_yield_0): override visibility mode for module_eval
- etc. (ruby-bugs-ja PR#505)
-
-Wed Jul 2 11:45:34 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: synchronize document with source code.
-
- * lib/net/pop.rb: ditto.
-
-Wed Jul 2 11:39:50 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: unify SMTP and SMTPCommand.
-
- * lib/net/smtp.rb: new exception class SMTPError.
-
- * lib/net/smtp.rb: new exception class SMTPAuthenticationError.
-
- * lib/net/smtp.rb: new exception class SMTPServerBusy.
-
- * lib/net/smtp.rb: new exception class SMTPSyntaxError.
-
- * lib/net/smtp.rb: new exception class SMTPFatalError.
-
- * lib/net/smtp.rb: new exception class SMTPUnknownError.
-
- * lib/net/smtp.rb: change critical section protect algorithm.
-
- * lib/net/smtp.rb (SMTP#do_start): check authentication args
- before all.
-
- * lib/net/smtp.rb: new method send_message (alias send_mail).
-
- * lib/net/smtp.rb: new method open_message_stream (alias ready).
-
- * lib/net/pop.rb: POPBadResponse is a POPError.
-
- * lib/net/pop.rb (POPMail#pop): ban ReadAdapter.
-
- * lib/net/pop.rb (POPMail#top): ditto.
-
- * lib/net/pop.rb (POP3Command): change critical section protect
- algorithm.
-
- * lib/net/pop.rb (POP3Command#auth): USER and PASS should be one
- critical block.
-
- * lib/net/pop.rb (POP3Command#retr): ban `dest' argument using
- iterator.
-
- * lib/net/pop.rb (POP3Command#top): ditto.
-
- * lib/net/protocol.rb: #read_message_to -> #each_message_chunk
-
- * lib/net/protocol.rb: #D -> #LOG
-
- * lib/net/protocol.rb: #D_off -> #LOG_off
-
- * lib/net/protocol.rb: #D_on -> #LOG_on
-
-Wed Jul 2 11:10:47 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: set old class aliases for backward
- compatibility. [ruby-talk:74863]
-
- * lib/net/protocol.rb: ditto.
-
-Wed Jul 2 01:32:40 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/net/pop.rb (Net::POP3#start): typofix.
-
-Tue Jul 1 22:08:19 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: TkWindow include TkWinfo
-
- * ext/tk/lib/tk.rb: treat unknown widget classes as subclasses
- of TkWindow
-
-Tue Jul 1 19:02:12 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * parse.y (rb_intern): should use mbclen instead of mblen.
-
-Tue Jul 1 10:36:19 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * class.c (rb_define_class, rb_define_module): also set constant under
- Object. [ruby-dev:20445]
-
- * object.c (boot_defclass): ditto.
-
- * variable.c (rb_const_get_at, rb_const_get_0, rb_mod_const_at,
- rb_const_defined, mod_av_set, rb_const_assign): toplevel constants
- are now under Object, rb_class_tbl remains for GC.
-
-Mon Jun 30 17:53:06 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (mnew): ignore metaclasses have no influence, for rklass.
- [ruby-talk:74706]
-
-Sun Jun 29 06:59:07 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb/drb.rb, lib/drb/invokemethod.rb: import drb-2.0.4
- (use LocalJumpError#reason)
-
-Sat Jun 28 12:28:54 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (rb_cv_stack_grow_dir): check stack growing direction.
-
- * eval.c (rb_thread_restore_context): prior configuration macro.
-
- * gc.c (ruby_stack_length): always return the address of lower edge.
-
- * gc.c (rb_gc_mark_locations): remove margin. [ruby-dev:20462]
-
- * gc.c (rb_gc, Init_stack): prior configuration macro.
-
- * gc.c (Init_stack): add safety margin.
-
-Fri Jun 27 14:41:22 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * string.c (rb_str_split_m): remove white spaces on the head of
- the last element, when limit is specified. [ruby-talk:74506]
-
-Fri Jun 27 03:24:54 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (io_fflush): need to check if closed after thread switch.
- [ruby-dev:20351]
-
- * io.c (fptr_finalize): ditto.
-
- * string.c (rb_str_rindex_m): fixed wrong fix. should move backward
- first only when matching from the end.
-
-Thu Jun 26 21:34:49 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * class.c (class_instance_method_list): get rid of warning about
- arguement type mismatch, and inline method_list().
- [ruby-core:01198]
-
-Wed Jun 25 14:40:33 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add and modify methods ---
- TkWidget.database_class, TkWidget.database_classname,
- TkWidget#database_class, TkWidget#database_classname
-
- * ext/tk/lib/tk.rb: instances of a subclass of TkToplevel or
- TkFrame are created with ":class=>subclass" option as default.
-
- * ext/tk/sample/tkoptdb.rb: add a new part
-
-Wed Jun 25 12:52:58 2003 Matthew Dempsky <jivera@flame.org>
-
- * class.c (rb_generic_class_instance_methods): merge argument
- check (and warning) into one function; following DRY principle.
- [ruby-core:01193]
-
-Wed Jun 25 05:49:10 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: add widget destroy hook binding to TkBindTag::ALL
-
- * ext/tk/lib/tkcanvas.rb: Although requiring manual control of GC,
- memory eating problem of TkCanvas Items is fixed.
-
- * ext/tk/lib/tktext.rb: add some methods and bug fix
-
-Wed Jun 25 00:14:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (autoload_delete): should delete Qundef from iv_tbl.
- (ruby-bugs-ja PR#504)
-
-Tue Jun 24 16:46:07 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix on TkToplevel, TkFrame,
- TkPanedwindow, TkOptionDB
-
- * ext/tk/lib/tk.rb: TkOptionDB --- make it more secure to use procs
- defined on resourceDB
-
- * ext/tk/sample/tkoptdb.rb, resource.ja, resource.en:
- sample script how to use TkOptionDB.
-
-Tue Jun 24 14:22:41 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * lib/yaml/types.rb: replaced Kernel::Hash reference with Object::Hash
- from [ruby-talk:74270]
-
-Tue Jun 24 17:59:30 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_yield_0): show yielded block position not only yielding
- point. [ruby-dev:20441]
-
-Tue Jun 24 16:47:07 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTPHeader#proxy_basic_auth): missing `@'.
- Thanks Douglas Koszerek. (ruby-bugs:PR975)
-
-Tue Jun 24 14:31:17 2003 Minero Aoki <aamine@loveruby.net>
-
- * config.guess: have wrongly returned "alphaev56-unknown-linux-"
- on Linux/Alpha. [ruby-dev:20434]
-
-Tue Jun 24 04:54:46 2003 Minero Aoki <aamine@loveruby.net>
-
- * configure.in: always add -mieee for gcc/alpha. [ruby-dev:20429]
-
-Tue Jun 24 02:40:09 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * array.c (rb_ary_unshift_m): need to check number of arguments.
- [ruby-talk:74189]
-
-Mon Jun 23 23:59:56 2003 Minero Aoki <aamine@loveruby.net>
-
- * io.c (io_close): missing prototype. [ruby-dev:20422]
-
- * ext/socket/socket.c (bsock_do_not_rev_lookup_set): ditto.
-
- * ext/win32ole/win32ole.c (foletype_guid, foletype_progid): ditto.
-
- * error.c (syserr_initialize): length argument of sprintf() is an
- int.
-
-Mon Jun 23 23:28:14 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * MANIFEST: add wince files.
-
- * ext/tk/MANIFEST: add sample/tkmenubutton.rb.
-
-Mon Jun 23 17:40:58 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * dir.c (find_dirsep): get rid of warnings.
-
- * eval.c (error_print): temporary value might be disposed by GC.
-
- * hash.c (env_has_value, env_index): should not increment NULL.
-
- * io.c (io_read, rb_io_sysread): not read when length is 0.
-
- * io.c (rb_io_reopen): ensure initialized IO.
-
- * io.c (rb_io_init_copy): sychronize file pointer.
-
- * io.c (rb_io_s_pipe): make exception proof.
-
- * string.c (rb_str_rindex_m): Fixnum 0 matched end of string.
-
-Mon Jun 23 16:18:12 2003 Tanaka Akira <akr@m17n.org>
-
- * io.c (rb_open_file): initialize flags.
-
- * time.c (time_arg): initialize v[6] even when argc is 10 to
- avoid valgrind error.
-
-Mon Jun 23 14:22:44 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix on TkRoot and TkToplevel
-
-Mon Jun 23 08:24:01 2003 Florian Frank <flori@nixe.ping.de>
-
- * string.c (rb_str_upto): generate sequence according to "succ"
- order. formerly check was done by dictionary order.
- [ruby-talk:74138]
-
-Mon Jun 23 00:27:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_string_value): fill constant empty string along
- with setting ELTS_SHARED if str->ptr is NULL. [ruby-core:01179]
-
- * string.c (rb_string_value_ptr): ditto.
-
- * string.c (rb_check_string_type): ditto.
-
-Sun Jun 22 23:42:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * string.c (str_gsub): move END(0) check before mbclen2().
-
- * string.c (scan_once): reduce END(0) check.
-
- * io.c (rb_io_initialize): accept fixnum mode.
-
- * eval.c (error_print): replace strchr() by memchr(), einfo may
- contain "\0".
-
- * pack.c (pack_unpack): range check for "@" move; initialize check
- for "m".
-
- * error.c (syserr_initialize): avoid buffer overflow.
-
- * file.c (rb_file_s_readlink): expand buffer until readlink
- succeed.
-
-Sun Jun 22 16:17:02 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm
- commands as elements
-
- * ext/tk/lib/tk.rb: TkMenu --- add some methods
-
- * ext/tk/lib/tk.rb: TkOptionMenubutton --- bug fix
-
- * ext/tk/sample/tkmenubutton.rb: sample of TkMenubutton and
- TkOptionMenubutton
-
-Sat Jun 21 23:15:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): should not propagate distination tag if
- tag is already handled in this level. (ruby-bugs-ja PR#501)
-
- * object.c (str_to_id): check for empty string before intern.
- [ruby-talk:74006]
-
-Sat Jun 21 13:56:09 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/Makefile.sub: undefine HAVE__SETJMP.
-
- * wince/resource.rb: include winver.h in wince3.0.
-
-Sat Jun 21 12:55:17 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm commands
- as elements of a hash argument.
-
- * ext/tk/sample/tktimer2.rb: add comments about the usage of a
- TkTimer object.
-
-Sat Jun 21 08:47:22 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk*.rb: remove direct-accesses to TkComm::INTERP and
- TkComm::INITIALIZE_TARGETS
-
- * ext/tk/lib/tk*.rb: use TkINTERP_SETUP_SCRIPTS constant for setting
- up the interpreter
-
- * ext/tcltklib/tcltklib.c: support to create a safe interpreter
- with safe-Tk
-
-Fri Jun 20 23:28:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): should not propagate TAG_BREAK and
- TAG_RETURN from orphan Proc object. [ruby-core:01148]
-
-Fri Jun 20 15:04:28 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * defines.h (PATH_ENV): name of PATH environment. [new].
-
- * defines.h (ENV_IGNORECASE): define for case insensitive platforms
- to access environment variables.
-
- * dln.c (dln_find_exe): use PATH_ENV instead of "PATH".
-
- * hash.c (env_delete, rb_f_getenv, env_fetch, rb_env_path_tainted,
- env_aset): ditto.
-
- * ruby.c (proc_options): ditto.
-
-Fri Jun 20 14:52:46 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: Tk interpreter returns TAINTED strings.
-
-Fri Jun 20 03:09:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (new_yield): distinguish "yield 1,2" and "yield [1,2]".
- [ruby-dev:20360]
-
- * eval.c (rb_eval): support new_yield() change.
-
- * variable.c (rb_const_get_0): warn for Foo::BAR when BAR is a
- toplevel constant (i.e. a constant defined under Object).
- [ruby-list:36935]
-
- * parse.y (no_blockarg): separate no block argument check and
- ret_args argument processing.
-
-Fri Jun 20 00:45:19 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/csv.rb: import csv module.
-
-Thu Jun 19 22:51:41 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
-
- * lib/drb.rb, lib/drb/drb.rb, lib/drb/eq.rb,
- lib/drb/extserv.rb, lib/drb/extservm.rb, lib/drb/gw.rb,
- lib/drb/invokemethod.rb, lib/drb/observer.rb,
- lib/drb/timeridconv.rb, lib/drb/unix.rb: import drb-2.0.4b3
-
-Thu Jun 19 16:14:43 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (lib_do_one_event): change default
- value of the argument
-
- * ext/tcltklib/tcltklib.c (lib_do_one_event): returns true/false
-
- * ext/tcltklib/tcltklib.c: add TclTkLib::EventFlag::NONE ( == 0 )
-
- * ext/tcltklib/tcltklib.c: add set_no_event_wait() and
- get_no_event_wait()
-
- * ext/tcltklib/MANUAL.euc: modify
-
- * ext/tcltklib/README.euc: ditto
-
- * ext/tk/lib/tk.rb: change default value of TkCore.do_one_event
- argument
-
- * ext/tk/lib/tk.rb: add TkCore.set_no_event_wait(wait) and
- TkCore.get_no_event_wait
-
- * ext/tk/lib/tk.rb: add Tk.exit ( == destroy root widget )
-
- * ext/tk/lib/tkafter.rb: rename TkAfter => TkTimer (TkAfter is
- an alias name)
-
- * ext/tk/lib/tkafter.rb: set_callback returns self
-
- * ext/tk/lib/tkafter.rb: continue() raises an exception, if already
- running or no procedure.
-
- * ext/tk/lib/tkafter.rb: skip() raises an exception, if not running.
-
- * ext/tk/sample/tktimer2.rb: new sample for TkTimer class.
-
-Thu Jun 19 16:13:54 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * rubytest.rb: add library path to include standard libraries.
-
-Thu Jun 19 13:13:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * hash.c (env_delete, rb_f_getenv, env_fetch): case insensitive to
- access environment variables on DOSISH platforms.
-
-Thu Jun 19 00:51:47 2003 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
-
- * range.c (rb_range_beg_len): out_of_range check after adjusting
- end point. [ruby-dev:20370]
-
-Wed Jun 18 23:59:11 2003 Guy Decoux <ts@moulon.inra.fr>
-
- * parse.y (call_args): the first argument to arg_cancat() should
- be NODE_LIST. [ruby-core:01151]
-
-Wed Jun 18 23:41:27 2003 Marc Cartright <marc@isri.unlv.edu>
-
- * ext/zlib/zlib.c (zstream_run): In a particular situation,
- deflate/inflate will return Z_BUF_ERROR, even though another call
- is required by the zlib library.
-
-Wed Jun 18 19:46:21 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb: bug fix
-
- * ext/tk/lib/tk.rb: rename 'no_create' option to 'without_creating'
-
- * ext/tk/lib/tk.rb: add TkWindow#pack_in, TkWindow#grid_in,
- TkWindow#place_in
-
- * ext/tk/lib/tk.rb: add TkWindow#bind_class and TkWindow#database_class
-
- * ext/tk/lib/tk.rb: add TkBindTag.new_by_name and TkDatabaseClass
- for binding to database class
-
- * ext/tk/lib/tk.rb: check varname whether already exsist or not.
- (TkVarAccess.new)
-
- * ext/tk/lib/tk.rb: TkTextWin#bbox returns an array of four numbers
-
- * ext/tk/lib/tk.rb: autoload TkDialog2, TkWarning2
-
- * ext/tk/lib/tk.rb: scan event callback arguments and convert
- to proper type
-
- * ext/tk/lib/tk.rb: TkBindTag.new accepts a block
-
- * ext/tk/lib/tk.rb: If given taglist, TkWindow#bindtags(taglist)
- returns taglist
-
- * ext/tk/lib/tk.rb: add TkWindow#bindtags=(taglist)
-
- * ext/tk/lib/tk.rb: Tk.focue and Tk.focus_lastfor return nil
- if there is no target widget.
-
- * ext/tk/lib/tk.rb: Tk::Wm.client returns the argument string
- when setting name
-
- * ext/tk/lib/tk.rb: TkGrid.columnconfiginfo and rowconfiginfo
- given a slot return a number.
-
- * ext/tk/lib/tk.rb: TkWindow.grid_columnconfiginfo and
- grid_rowconfiginfo --- ditto
-
- * ext/tk/lib/tk.rb: rename and define alias :: TkOption ==> TkOptionDB
-
- * ext/tk/lib/tk.rb: define alias :: TkTimer ==> TkAfter
-
- * ext/tk/lib/tk.rb: some instance methods change from public to private
-
- * ext/tk/lib/tk.rb: some TkComm methods change to module functions
-
- * ext/tk/lib/tk.rb: add support for -displayof option to some
- TkWinfo methods
-
- * ext/tk/lib/tk.rb: bind, bind_append and bind_remove ---
- returns the target of event-binding
-
- * ext/tk/lib/tk.rb: add Tk8.4 features
-
- * ext/tk/lib/tk.rb: add TkPaneWindow
-
- * ext/tk/lib/tkdialog.rb: bug fix
-
- * ext/tk/lib/tkdialog.rb: some methods return self
-
- * ext/tk/lib/tkdialog.rb: add TkTextMark#+(mod) and TkTextMark#-(mod)
-
- * ext/tk/lib/tkdialog.rb: add some methods
-
- * ext/tk/lib/tkcanvas.rb: bug fix and some methods return self
-
- * ext/tk/lib/tkentry.rb: some methods return self
-
- * ext/tk/lib/tkentry.rb: TkEntry#bbox returns an array of four numbers
-
- * ext/tk/lib/tkentry.rb: scan validatecommand arguments and
- convert to proper type
-
- * ext/tk/lib/tkbgerror.rb: support to define a error handler by user
-
- * ext/tcltklib/tcltklib.c: [ruby-talk:60759]
-
-Wed Jun 18 13:50:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should dispatch based on ID type.
-
-Wed Jun 18 12:53:42 2003 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (rb_yield_0): should restore scope_vmode during yield.
- [ruby-dev:20361]
-
-Wed Jun 18 01:13:36 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c (rb_syck_load_handler): merge key implemented.
-
- * ext/syck/rubyext.c (transfer_find_i): removed use of String#=~ in favor
- of Regexp#match.
-
- * lib/yaml.rb: YAML::try_implicit returns.
-
- * lib/yaml/rubytypes.rb: Regexps added for type matching.
-
- * lib/yaml/emitter.rb: fix String + nil error.
-
-Tue Jun 17 17:01:08 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/gram.c: added grammar for certain empty sequence entries.
-
- * ext/syck/handler.c, ext/syck/syck.c, ext/syck/syck.h: track bad anchors.
-
- * ext/syck/token.c: added pause token, tag possible circular references.
-
- * lib/yaml/rubytypes.rb: parsing YMD time as Date instance.
-
- * ext/syck/rubyext.c: ditto. DomainType, PrivateType, BadAlias classes.
-
-Tue Jun 17 21:28:27 2003 Ariff Abdullah <skywizard@time.net.my>
-
- * win32/win32.c (rb_w32_opendir): need to set errno. [ruby-talk:73761]
-
-Mon Jun 16 19:01:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c: remove rb_cBlock.
-
-Mon Jun 16 18:06:33 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * numeric.c (rb_fix2uint): renamed from rb_fix2int on IA64.
-
-Mon Jun 16 17:02:57 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (proc_invoke): format the message for localjump_error().
-
-Mon Jun 16 16:23:56 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dl/dl.c (rb_dl_callback): use rb_block_proc() instead of
- rb_block_new().
-
- * ext/win32ole/win32ole.c (ev_on_event): ditto.
-
-Mon Jun 16 16:06:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_alloc): re-unification of Block and Proc. Block
- class is no longer available.
-
-Mon Jun 16 14:43:14 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * bcc32/Makefile.sub: undefine HAVE_GETGROUPS.
-
-Sat Jun 14 16:58:41 2003 Guy Decoux <ts@moulon.inra.fr>
-
- * regex.c (calculate_must_string): should handle option_set
- properly. [ruby-talk:73481]
-
- * regex.c (re_compile_fastmap): a bug in flag manipulation.
- [ruby-talk:73549]
-
-Sat Jun 14 17:59:59 2003 Guy Decoux <ts@moulon.inra.fr>
-
- * eval.c (method_arity): should handle NODE_BMETHOD and
- NODE_DMETHOD. [ruby-core:01138]
-
-Fri Jun 13 09:24:39 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (storebinary): seek correctly. Thanks, William Webber.
-
- * lib/net/ftp.rb (putbinaryfile): rescue FTPPermError.
-
-Thu Jun 12 22:13:13 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb : add 'no_create' option to widget
- initialize method.
-
- * ext/tk/MANIFEST : forgot to commit when added tkmacpkg.rb
- and tkwinpkg.rb
-
- * ext/tk/lib/README : ditto.
-
-Thu Jun 12 21:14:11 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tk.rb : widget configure returns self (for method
- call chain)
-
- * ext/tk/lib/tkmacpkg.rb : Mac resource (not new but not
- included until now)
-
- * ext/tk/lib/tkwinpkg.rb : Win DDE and registry (not new but not
- included until now)
-
-Tue Jun 10 14:26:30 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/token.c: preserve newlines prepended to a block.
-
- * ext/syck/implicit.c (syck_match_implicit): added !merge and !default.
-
- * lib/yaml/constants.rb: remove '\z' escape.
-
- * lib/yaml/emitter.rb: ensure reset of @seq_map shortcut flag.
-
- * lib/yaml/encoding.rb: remove Unicode translation methods.
-
- * lib/yaml/rubytypes.rb: improved round-tripping of Strings.
- [ruby-core:1134]
-
-Tue Jun 10 01:07:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/irb.rb (IRB::Irb::eval_input): warn and exit if $SAFE >=3
- after input evaluation.
-
- * lib/irb.rb (IRB::Irb::eval_input): untaint input string. now
- irb works for levels 1 and 2.
-
-Mon Jun 9 19:02:33 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in: checks presence of grp.h and setgroups().
-
- * process.c (proc_getgroups, proc_setgroups): raise
- NotImplementedError unless available. [ruby-talk:73014]
-
-Mon Jun 9 18:09:11 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: fixed 100% CPU problem of Tk.mainloop
-
-Mon Jun 9 15:50:24 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: renewal Tk.mainloop
-
-Sun Jun 8 13:37:21 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/setup.mak: set SUBSYSTEM in each platform.
-
- * wince/stdlib.c: fix mblen() bug.
-
-Sat Jun 7 22:22:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/syck/rubyext.c (syck_loader_transfer): should not use
- rb_cProc directly, since type_proc may be Proc, Block, or
- Method.
-
- * parse.y (value_expr0): class and module statements should not be
- warned for "void value expression". [ruby-talk:72989]
-
-Sat Jun 7 01:46:41 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (add_final): should determine type by respond_to?
-
- * gc.c (define_final): ditto.
-
- * io.c (rb_io_ctl): should not depend on respond_to?
-
- * range.c (range_step): rb_check_string_type().
-
-Fri Jun 6 20:29:14 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (error_print): needs to be exception proof.
-
- * eval.c (error_handle, rb_longjmp): bails out when exception
- reentered. (ruby-bugs-ja:PR#487), [ruby-core:01119],
- [ruby-core:01122]
-
- * eval.c (Init_Proc): pre-allocates critical error objects.
-
-Fri Jun 6 20:29:14 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (cmd_brace_block, do_block, brace_block): initialize block
- variables at the beginning of the block. [ruby-talk:72521]
-
-Fri Jun 6 18:49:11 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_setgroups): new functions.
-
-Fri Jun 6 18:33:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (define_final): eliminate rb_f_lambda() call.
-
- * class.c (rb_scan_args): ditto.
-
- * signal.c (sig_trap): ditto.
-
- * hash.c (rb_hash_initialize): ditto.
-
- * variable.c (rb_f_trace_var): ditto.
-
- * ext/dl/dl.c (rb_dl_callback): ditto.
-
- * ext/win32ole/win32ole.c (ev_on_event): ditto.
-
-Fri Jun 6 16:10:01 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: define Net::HTTPResponse#to_ary for backward
- compatibility. [ruby-talk:72927]
-
- * lib/net/protocol.rb: add warning.
-
-Fri Jun 6 13:30:57 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_cleanup): $SAFE is turned off in the finalization.
- Each END proc should preserve its own $SAFE level. [ruby-core:01119]
-
- * marshal.c (marshal_load): remove unused variable "hash".
- [ruby-core:01120]
-
- * hash.c (env_str_new): freeze strings from ENV. [ruby-talk:72860]
-
- * array.c (rb_ary_first): optional argument to retrieve first n
- elements.
-
- * array.c (rb_ary_last): optional argument to retrieve last n
- elements.
-
-Thu Jun 5 21:31:55 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/stdlib.c: add mblen().
-
-Thu Jun 5 18:33:46 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/curses/curses.c (window_s_allocate,curses_finalize):
- avoid VC++ warnings.
-
-Thu Jun 5 17:44:11 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c (syck_parser_mark): was a bit heavy on the GC.
-
- * lib/yaml.rb (YAML::transfer): added.
-
-Thu Jun 5 16:11:50 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
- (MISSING): link with missing/erf.c.
-
- * missing.h (erf, erfc): fix prototype.
-
- * missing/erf.c: new. [ruby-list:37753]
-
-Thu Jun 5 15:09:06 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (math_erf,math_erfc): new function. [ruby-list:37753]
-
-Thu Jun 5 14:49:43 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c: using GC nodes caused segfault. [ruby-core:1071]
-
-Thu Jun 5 13:48:57 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/token.c: directives choked on a period.
-
- * ext/syck/gram.y: anchors work above a collection. [ruby-core:1071]
-
- * ext/syck/handler.c, ext/syck/syck.c: ensure a fresh strtable between
- parser iterations.
-
-Wed Jun 4 12:06:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_finalize): no longer need to turn off $DEBUG in the
- finalizer. (ruby-bugs-ja PR#473)
-
-Tue Jun 3 22:20:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call_super): should search superclass method based on
- orig_func, not last_func.
-
-Tue Jun 3 09:59:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call_super): inheritance line adjustment moved from
- rb_call(). [ruby-core:01113]
-
- * eval.c (rb_eval): use rb_call_super() to follow DRY principle.
-
-Mon Jun 2 02:20:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (push_values_at): Array#values_at should work with
- ranges too.
-
- * range.c (rb_range_beg_len): length calculation was wrong.
-
- * eval.c (rb_call): should set T_ICLASS in the frame->last_class.
- [ruby-core:01110]
-
-Sun Jun 1 21:50:01 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: should not use def file, use ld with
- --export-all-symbols option on Cygwin/MinGW.
-
- * defines.h: ditto.
-
- * cygwin/GNUmakefile.in: ditto.
-
- * ext/digest/defs.h: avoid warnings on Cygwin.
-
-Sun Jun 01 13:33:49 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/string_wce.c: add strpbrk() for hpcpro support.
-
- * wince/setup.mak: add hpcpro(CE2.11) & armv4t(CE.NET) support.
-
- * wince/resource.rb: ditto.
-
- * wince/Makefile.sub: ditto.
-
-Sun Jun 1 10:38:28 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * variable.c (rb_autoload_load): autoloaded constants under a module
- belong to the module. [ruby-core:01094], [ruby-dev:20309]
-
-Sat May 31 04:36:54 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (rb_intern): should handle multibyte name.
-
-Fri May 30 23:18:01 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c (rb_syck_mktime): seconds calculated wrong.
-
- * ext/syck/gram.c: flexibility to anchors and transfer methods on
- collections.
-
- * ext/syck/token.c: hex escapes.
-
- * lib/yaml/basenode.rb: YamlNode references changed to YAML::BaseNode.
-
-Fri May 30 22:28:04 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * numeric.c (rb_num2uint, rb_fix2int): new function to convert
- values over INT_MAX. [ruby-core:01099]
-
- * ruby.h (NUM2UINT, FIX2INT): ditto.
-
-Fri May 30 15:01:05 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/token.c: preserve any indentation past an explicit
- indentation.
-
-Fri May 30 14:55:44 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_Array): exclude Kernel#to_a instead of Object#to_a.
- (ruby-bugs-ja:PR#483)
-
- * lib/optparse.rb (OptionParser::Switch#parse_arg): not splat.
-
- * lib/optparse.rb (OptionParser::Switch#conv_arg): splat if no
- conversion supplied.
-
- * lib/optparse.rb (OptionParser::Switch::PlacedArgument#parse):
- override next switch after argument conversion.
-
-Fri May 30 14:41:34 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/handler.c, ext/syck/syck.h: removed syck_fold_format().
-
- * ext/syck/gram.c: flexibility for aliases and anchors.
-
- * ext/syck/token.c: folding now handled in the tokenizer.
-
-Fri May 30 06:21:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * variable.c (rb_autoload_load): should delete autoloaded
- symbol itself before load. [ruby-core:01097]
-
- * variable.c (rb_mod_remove_const): must not return Qundef.
-
-Thu May 29 14:59:10 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (_CRTIMP): redefine _CRTIMP on MinGW.
-
- * configure.in: remove '-D__USE_CRTIMP' from XCFLAGS on MinGW.
-
- * win32/win32.c (NtMakeCmdVector): handle quotes only if not instring.
-
-Thu May 29 09:11:01 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (ev_const_defined, ev_const_get), variable.c
- (rb_const_get_at, rb_const_get, rb_mod_remove_const): use Qundef
- as autoload marker. [ruby-dev:18103], [ruby-dev:18184]
-
- * eval.c (rb_mod_autoload, rb_mod_autoload_p): new method;
- Module#autoload, Module#autoload?.
-
- * variable.c (rb_autoload, rb_autoload_load, rb_autoload_p):
- manage autoload constants per classes/modules.
-
- * variable.c (rb_const_defined_at, rb_const_defined): return false
- for autoloading constants.
-
- * class.c (rb_define_class, rb_define_module), eval.c (rb_eval),
- variable.c (rb_mod_const_at, rb_const_assign): removed autoload
- stuff.
-
- * intern.h: prototypes; rb_autoload, rb_autoload_load,
- rb_autoload_p.
-
- * lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
- do not treat unmatched argument as an option.
-
-Wed May 28 08:44:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_syscall): type dispatch should be based on
- rb_check_string_type(), not FIXNUM_P(), because values may be a
- bignum. [ruby-talk:72257]
-
-Tue May 27 20:33:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c, util.c: removed duplicated includes/defines.
-
- * ext/socket/socket.c (sock_addrinfo): get rid of SEGV at NULL ptr
- String. increase buffer size for 64bit platforms.
-
-Tue May 27 02:34:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): should pass the current klass value to
- block_invoke, which may be called via "super". [ruby-core:01077]
-
- * eval.c (block_invoke): now takes 4th argument "klass".
-
- * eval.c (block_alloc): should propagate BLOCK_PROC to
- ruby_block.
-
-Mon May 26 23:51:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object0): should not use "yield" method, use "call"
- instead. (ruby-bugs-ja PR#476)
-
-Mon May 26 21:39:46 2003 MoonWolf <moonwolf@moonwolf.com>
-
- * lib/mkmf.rb, lib/optparse.rb, lib/tracer.rb: use Method#to_block
- instead of deprecated Method#to_proc. (ruby-bugs-ja:PR#477)
-
-Mon May 26 21:21:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb (OptionParser::Switch::parse,
- OptionParser::order): use {Block,Proc}#call instead of deprecated
- #yield.
-
-Mon May 26 16:39:10 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_Proc): Block/Proc separation. [huge change]
-
- * eval.c (block_arity): returns exact arity number for Procs out
- of methods. also gives 1 for {|a|..}.
-
- * string.c (rb_str_match): revert use of String#index for
- invocation like string =~ string.
-
- * eval.c (rb_Array): move Object#to_a exclusion hack from
- splat_value(). need to be in eval.c for a while.
-
-Sun May 25 23:48:21 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bignum.c (rb_quad_pack): should negate negative bignum.
- (ruby-bugs-ja:PR#474)
-
-Sun May 25 03:27:25 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: support LOGIN authentication, based on
- the patch by Kazuhiko Izawa. [ruby-talk:78981]
-
-Sat May 24 18:19:51 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/Makefile.sub: add eMbedded Visual C++ 4.0 support.
-
- * wince/resource.rb: ditto.
-
- * wince/setup.mak: ditto.
-
- * wince/configure.bat: ditto.
-
- * wince/mkexports.rb: delete japanese comments.
-
-Fri May 23 18:34:05 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_longjmp): get rid of reentering while debug warning.
- (ruby-bugs-ja:PR473)
-
-Fri May 23 15:16:16 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * pack.c (pack_unpack): sign-extend if sizeof long is bigger than
- 32. (ruby-bugs-ja:PR#472)
-
-Fri May 23 14:19:29 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_finalize): turn off ruby_debug flag before calling
- at_exit procs and finalizers. (ruby-bugs-ja:PR473)
-
- * ext/tcltklib/tcltklib.c (lib_mainloop_core): OK to block if
- there's no other thread. (ruby-bugs:PR#861)
-
-Thu May 22 18:07:46 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/token.c: single- and double-quoted root-level fix.
-
- * lib/yaml.rb (YAML::object_maker): can create object attributes (such as
- found in Exception class)
-
- * lib/yaml/rubytypes.rb: roundtripping of Exception and subclasses.
-
-Fri May 23 01:26:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_clone): defer copying freezing state after
- calling initialize_copy(). [ruby-dev:20276]
-
-Thu May 22 17:12:10 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (run_final): use rb_thread_critical instead of DEFER_INTS.
- [ruby-dev:20272]
-
- * marshal.c: try to make ArgumentError and TypeError consistent.
- [ruby-core:01068]
-
-Thu May 22 15:46:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_define_alloc_func): need not to disable
- rb_call_super() for allocation functions. [ruby-core:1065]
-
-Thu May 22 06:21:33 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c (rb_syck_err_handler): raise ArgumentError on
- malformed YAML.
-
- * lib/yaml/rubytypes.rb: String#to_yaml was missing space indicators at
- the end of a line.
-
-Thu May 22 05:43:24 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c (syck_parser_load): root-level false was returning
- nil.
-
- * ext/syck/token.c: root-level transfer method bug.
-
- * ext/syck/gram.c: root-level empty gave a parse error.
-
- * lib/yaml/rubytypes.rb: Symbol#to_yaml generating method call error.
-
-Thu May 22 02:46:38 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): splat NODE_RESTARY. [ruby-dev:20268]
-
- * eval.c (rb_thread_fd_close): raise for writing threads.
- [ruby-dev:20269]
-
- * io.c (rb_io_close, io_reopen): ditto.
-
- * io.c (io_reopen): keep stdio objects for stdin, stdout,
- and stderr. [ruby-dev:19442]
-
-Thu May 22 01:11:15 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (strings, word_list): must create new instance always.
- http://yowaken.dip.jp/tdiary/20030521.html#p02
-
- * parse.y (yylex): slight optimization.
-
-Wed May 21 23:07:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (rb_sys_fail): should not specify errno explicitly.
- [ruby-dev:20264]
-
-Wed May 21 20:51:47 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
- wince/Makefile.sub: update dependencies.
-
-Wed May 21 17:44:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (syserr_initialize): prohibit specifying errno for
- subclasses of SystemCallError. in addition, if initialize is
- called for SystenCallError instance, its class be changed.
- [ruby-dev:20257]
-
- * gc.c (run_final): to protect thread context switch, finalizers
- are wrapped in DEFER_INTS/ENABLE_INTS.
-
-Wed May 21 13:26:08 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb: get rid of warnings.
-
-Tue May 20 18:59:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_save_context): prohibit rb_gc_force_recycle()
- on thread saved ruby_dyna_vars. [ruby-dev:20236]
-
-Tue May 20 17:39:15 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (init_copy): call initialize_copy at the end of copy
- process.
-
-Tue May 20 17:15:55 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * error.c (syserr_initialize): use Errno constants as default
- errno for subclasses. [ruby-dev:20241]
-
-Tue May 20 15:26:25 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * st.h: define ST_DATA_T_DEFINED for portability.
-
- * ext/syck/syck.h: add typedef, st_data_t for Ruby 1.6.
-
- * ext/syck/syck.c (syck_st_free_nodes): return int.
-
- * ext/syck/syck.c (syck_add_sym): cast the data to st_data_t
- to avoid error on bcc32.
-
- * ext/syck/syck.c (syck_lookup_sym): ditto.
-
- * ext/syck/syck.c (syck_free_parser): NULL is not integer.
-
-Tue May 20 13:29:04 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (kill): set errno after calling raise().
-
-Tue May 20 10:51:26 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_f_missing): create exception instance by ordinal
- method. [ruby-dev:20033]
-
- * error.c (rb_name_error, rb_sys_fail): ditto.
-
- * error.c (exc_to_s, exit_status, name_err_name,
- nometh_err_args, syserr_errno, syserr_eqq): access
- attributes.
-
- * error.c (name_err_initialize, nometh_err_initialize,
- syserr_initialize): initialize attributes.
-
-Tue May 20 10:26:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): give warning for multiple values for a
- block parameter.
-
- * eval.c (rb_yield_values): a function to yield multiple values.
-
- * array.c (sort_1): use rb_yield_values.
-
- * enum.c (min_ii, max_ii): ditto.
-
- * hash.c (rb_hash_update_block_i, delete_if_i, select_i,
- each_pair_i, env_each, env_reject_bang, env_select,
- env_update_i): ditto.
-
- * struct.c (rb_struct_each_pair): ditto.
-
- * eval.c (top_include): should include module in the current self,
- not ruby_top_self. [ruby-dev:20198]
-
- * eval.c (top_include): stop inclusion to ruby_wrapper; give
- warning.
-
-Mon May 19 18:54:30 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/token.c, ext/syck/implicit.c: expanded character set to
- allow UTF-8, other Ruby encodings.
-
-Mon May 19 16:47:00 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/syck.c, ext/syck/syck.h, ext/syck/token.c, ext/syck/gram.c:
- count line numbers only if line pointer has increased.
-
-Tue May 20 00:45:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (push_braces): do not push_braces() unless rbrace is found.
- (ruby-bugs-ja:PR#469)
-
-Tue May 20 00:09:41 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/pty/pty.c (pty_finalize_syswait): join (using Thread#value)
- before detach pid. [ruby-talk:71519]
-
-Mon May 19 23:02:10 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (PUSH_FRAME): save outer ruby_block. [ruby-list:37677],
- [ruby-dev:20202]
-
- * eval.c (BEGIN_CALLARGS): restore outer block by using
- ruby_block->outer.
-
- * eval.c (block_pass): do not alter block->prev, but block->outer.
-
- * array.c (get_inspect_tbl): warning on wrong condition.
-
-Mon May 19 16:13:57 2003 Minero Aoki <aamine@loveruby.net>
-
- * class.c: add #include "version.h".
-
- * hash.c: ditto.
-
- * string.c: ditto.
-
-Mon May 19 15:33:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (localjump_xvalue): renamed exitstatus to exit_value
- since it's not exit "status" after all.
-
- * eval.c (localjump_error): add reason to LocalJumpError.
-
- * compar.c (rb_cmpint): raise error via rb_cmperr(), if cmp value
- is nil. now take new 2 arguments.
-
- * time.c (time_cmp): 2003-05-16 fix was incomplete.
- (ruby-bugs-ja:PR#458)
-
-Mon May 19 14:42:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_cmp): stupid comparison fixed.
-
- * io.c (Init_IO): ARGF.path added (alias to ARGF.filename).
- [ruby-dev:20197]
-
-Mon May 19 13:58:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (init_copy): rename copy_object as initialize_copy,
- since it works as copy constructor.
-
- * eval.c (rb_add_method): initialize_copy should always be
- private, like initialize.
-
-Mon May 19 13:51:50 2003 Minero Aoki <aamine@loveruby.net>
-
- * re.c (rb_reg_quote): \n \r \f \v quoting was wrong.
- [ruby-dev:20203]
-
- * re.c (rb_reg_quote): rb_reg_quote(" ") should be "\\ ", not
- "\\s".
-
-Mon May 19 08:08:51 2003 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb: use warn() instead of $stderr.puts().
-
- * sample/cal.rb: ditto.
-
-Sat May 17 12:02:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (get_inspect_tbl): check whether inspect_tbl value is a
- valid array. (ruby-bugs-ja PR#65)
-
- * array.c (inspect_ensure,rb_protect_inspect,rb_inspecting_p):
- use get_inspect_tbl().
-
-Sat May 17 11:50:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_abort): call exit(1) if exception is raised. This
- patch was made by Nobuyoshi Nakada <nobu.nokada@softhome.net> on
- 2002-05-30. (ruby-bugs-ja PR#236)
-
- * signal.c: disable Ruby's interrupt handler at the beginning.
- (ruby-bugs-ja PR#236)
-
-Sat May 17 02:17:42 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/rational.rb (Integer::denominator): fixed typo.
- (ruby-bugs-ja:PR#466)
-
-Sat May 17 00:18:11 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/socket/socket.c (ruby_connect): connect() after EINPROGRESS
- returns EINVAL on some platforms, need to check true error
- status. [ruby-core:01037]
-
-Sat May 17 00:21:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_class_allocate_instance): singleton class check
- moved to rb_obj_alloc(). (ruby-bugs-ja PR#345)
-
-Fri May 16 23:55:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_quote): should escape white space characters,
- \t, \f, \n, \r. (ruby-bugs-ja PR#231)
-
-Fri May 16 12:40:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (block_pass): chain previous block to the pushing block.
- [ruby-list:37677]
-
- * time.c (time_cmp): does not compare with numbers for
- interchangeability. (ruby-bugs-ja:PR#458)
-
-Thu May 15 21:55:54 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/gram.c: fixes to one-line documents and end of stream
- documents.
-
- * ext/syck/syck.c, ext/syck/syck.h: add root_on_error to parser
- struct, specifying the symbol to be returned on a parse error.
-
-Thu May 15 18:44:31 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb (OpenURI::Redirect#initialize): call super to
- initialize mesg.
-
- * lib/open-uri.rb (OpenURI::Meta#charset): call block to guess charset
- if block is given and charset is not given.
-
-Thu May 15 16:55:16 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_le): returns nil if two classes/modules are not
- in class-superclass relationship.
-
- * object.c (rb_mod_cmp): uses new rb_mod_le() behavior.
-
-Thu May 15 07:45:30 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/rubyext.c, ext/syck/implicit.c: timestamp repairs to
- timezone and milliseconds.
-
- * ext/syck/syck.c (syck_parser_reset_levels): duplicate string literal
- to avoid warning.
-
-Thu May 15 13:26:48 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_class_instance_methods): default will be changed in
- 1.8.1.
-
- * io.c (set_stdio): better message.
-
-Thu May 15 13:18:11 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (set_stdio): $stdin, $stdout, $stderr now became read-only.
-
- * variable.c (readonly_setter): message changed.
-
-Thu May 15 09:50:51 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/syck/syck.c (syck_parser_pop_level): add prototype.
-
- * ext/syck/syck.c (syck_strndup): should return value.
-
-Thu May 15 09:32:25 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (kill): fix typo and add signal 0 support.
-
-Wed May 14 20:09:26 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/gram.c: sequence-in-map shortcut, transfer methods on
- sequence-in-sequence, memory leak in mapping merge.
-
- * ext/syck/syck.c: memory leak in domain anchoring.
-
- * lib/yaml/rubytypes.rb, lib/yaml/types.rb: eliminated 1.6.x code.
-
-Wed May 14 19:56:43 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/syck/rubyext.c: add prototypes to avoid VC++ warnings.
-
-Wed May 14 12:23:46 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (Net::HTTP#start): should check whether HTTP
- session is opened before finishing. (ruby-bugs-ja:PR#463)
-
-Wed May 14 09:12:55 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: reduce warning. (ruby-bugs-ja:PR#462)
-
-Tue May 13 22:31:04 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * lib/yaml/rubytypes.rb, lib/yaml/types.rb: using Object#object_id
- rather than deprecated Object#id.
-
- * ext/syck/token.c: changed ASCII escapes to octal notation.
-
- * ext/Setup*: added entries for static linking of Syck extension.
-
-Tue May 13 20:31:58 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: add '--Wl,--enable-auto-import' to DLDFLAGS
- on Cygwin/MinGW.
-
- * configure.in: add '-D__USE_CRTIMP' to XCFLAGS on MinGW.
-
- * ext/syck/handler.c: add proper casts.
-
- * ext/syck/syck.c: ditto.
-
-Tue May 13 17:58:08 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
- HAVE_FSYNC.
-
- * win32/win32.h (fsync): define as _commit().
-
-Tue May 13 15:35:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_match_exec): \Z changed to be consistent with new $
- (endbuf) behavior.
-
-Tue May 13 14:48:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (error_pos): use $deferr for output instead of stderr
- directly.
-
- * eval.c (error_print,error_handle,rb_longjmp,rb_thread_schedule):
- ditto.
-
-Tue May 13 06:34:19 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * lib/yaml/rubytypes.rb: object and struct loading
-
- * lib/yaml.rb: YAML::detect_implicit will discover typing for a Ruby
- string
-
- * ext/syck/: Fixed portable comments, misuse of NULL and methods without
- return VALUEs.
-
-Mon May 12 18:08:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (Init_IO): new variable $deferr which is default output
- port of error messages.
-
- * io.c (rb_warn_m): new method "warn". [new]
-
- * error.c (warn_print): use $deferr.
-
- * error.c (rb_bug): ditto.
-
- * error.c (err_append): ditto.
-
-Sun May 11 13:50:12 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb: refine to_s test.
-
- * lib/pp.rb (PP::ObjectMixin#pretty_print): refine to_s handling.
-
-Sun May 11 06:32:13 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/implicit.c, ext/syck/rubyext.c: transfer methods applied to
- native loading
-
- * ext/syck/token.c: fix for transfer methods on same indentation as nested
- mapping
-
- * lib/yaml/rubytypes.rb: all type names in lowercase
-
-Sat May 10 19:55:18 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ext/syck/gram.c ext/syck/handler.c ext/syck/implicit.c
- ext/syck/node.c ext/syck/rubyext.c ext/syck/syck.c
- ext/syck/syck.h ext/syck/token.c: updated to Syck 0.27
-
- * lib/yaml/loader.rb: new YAML::Loader class
-
- * lib/yaml.rb: loading of type families leverages YAML::DefaultLoader
-
-Sat May 10 19:00:08 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/string.c: file removed.
-
- * wince/stdlib.c: file added.
-
-Sat May 10 16:17:02 2003 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (decode_utf7): new method.
-
- * lib/net/imap.rb (encode_utf7): new method.
-
-Fri May 9 21:25:50 2003 why the lucky stiff <ruby-cvs@whytheluckystiff.net>
-
- * ruby/ext/syck, ruby/lib/yaml: Initial checkin of YAML substances.
-
-Fri May 9 16:38:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_reopen): It should be possible to reopen closed IO.
- [ruby-talk:70941]
-
- * io.c (rb_io_reopen): inherit original file mode unless specified.
-
-Thu May 8 18:44:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc): check odd alignment stack on m68k machines.
-
-Thu May 8 12:56:04 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * compar.c (rb_cmperr): raise comparison failure.
-
- * intern.h: prototype; rb_cmperr
-
- * numeric.c (flo_gt, flo_ge, flo_lt, flo_le, fix_gt, fix_ge,
- fix_lt, fix_le): should fail unless the argument is comparable.
- (ruby-bugs-ja:PR#456)
-
- * numeric.c (int_upto, int_downto): should fail unless the
- argument is comparable. (ruby-bugs-ja:PR#454)
-
-Wed May 7 13:30:11 2003 Masahiro TANAKA <masa@ir.isas.ac.jp>
-
- * numeric.c (num_step): better error treatment of float values.
-
-Tue May 6 17:51:54 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: rename method: POP3#mail_size -> n_mails
-
- * lib/net/pop.rb: rename method: POP3#bytes -> n_bytes
-
-Tue May 6 17:21:01 2003 Minero Aoki <aamine@loveruby.net>
-
- * ext/bigdecimal/.cvsignore: new file.
-
- * ext/zlib/.cvsignore: new file.
-
-Tue May 6 14:39:36 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_methods): list singleton methods if recur
- argument is false; list all methods otherwise.
-
-Mon May 5 21:19:25 2003 Koji Arai <jca02266@nifty.ne.jp>
-
- * ext/gdbm/gdbm.c (fgdbm_values_at): new method to replace
- select(index..).
-
- * ext/sdbm/init.c (fsdbm_values_at): ditto.
-
- * ext/dbm/dbm.c (fdbm_values_at): ditto.
-
- * ext/dbm/dbm.c (DBM::VERSION): defined.
-
- * ext/gdbm/testgdbm.rb: replace select with values_at.
-
- * ext/sdbm/testsdbm.rb: ditto.
-
- * ext/dbm/testdbm.rb: ditto.
-
- * ext/dbm/testdbm.rb (setup): DBM.open(path, 0400) cause EACCESS
- on Berkeley DB[234].
-
-Mon May 5 22:57:07 2003 Tadayoshi Funaba <tadf@dotrb.org>
-
- * sample/cal.rb: use values_at instead of select.
-
- * sample/biorhythm.rb: ditto.
-
-Mon May 5 18:59:45 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * sample/test.rb: substitute 'select' with 'values_at'.
-
- * lib/date.rb: ditto.
-
- * lib/parsedate.rb: ditto.
-
-Mon May 5 00:46:10 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_values_at): new method to replace select(index..).
-
- * hash.c (rb_hash_values_at,env_values_at): ditto.
-
- * re.c (match_values_at): ditto.
-
- * struct.c (rb_struct_values_at): ditto.
-
- * re.c (match_select): add iterator behavior.
-
-Sun May 4 19:08:53 2003 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date/format.rb: synchronized with date2 3.3.2.
-
-Sun May 4 15:21:18 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: ESMTP -> SMTP transition wrongly fails.
-
-Sun May 4 15:06:37 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: APOP did not work. [ruby-dev:20149]
-
-Sat May 3 21:14:29 2003 Johan Holmberg <holmberg@iar.se>
-
- * ext/curses/curses.c, ext/digest/sha2/sha2.c, ext/iconv/iconv.c,
- ext/racc/cparse/cparse.c: include "ruby.h" at the top to shut up
- "_FILE_OFFSET_BITS redefined" warning on Solaris.
-
-Sat May 3 11:00:12 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_class_protected_instance_methods): now gives
- warnings to show migration path. The default will be reversed
- on Jan 2004.
-
-Sat May 3 00:58:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_methods): now accepts recurse parameter.
-
- * lib/delegate.rb (Delegator::initialize): instance_methods
- etc. now recurse by default. need to specify false.
-
-Sat May 3 00:22:00 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: reintroduce Protocol.protocol_param.
-
- * lib/net/http.rb: ditto.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/smtp.rb: ditto.
-
-Fri May 2 23:29:53 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: remove Protocol class.
-
- * lib/net/smtp.rb (SMTP): ditto.
-
- * lib/net/pop.rb (POP3): ditto.
-
- * lib/net/http.rb (HTTP): ditto.
-
- * lib/net/protocol.rb: remove Command class.
-
- * lib/net/smtp.rb (SMTPCommand): ditto.
-
- * lib/net/pop.rb (POP3Command): ditto.
-
- * lib/net/pop.rb: remove APOPCommand class.
-
- * lib/net/protocol.rb: remove Code class and its all subclasses.
-
- * lib/net/protocol.rb: remove Response class and its all
- subclasses.
-
- * lib/net/pop.rb (POPMail): new method unique_id (alias uidl).
-
-Fri May 2 18:17:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compar.c (cmp_gt): raises ArgumentError when "<=>" give nil.
- inspired by discussion on comp.lang.python.
-
-Fri May 2 17:37:01 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi/session.rb (CGI::Session::initialize): updated to
- support 2003-04-23 change in cgi.rb [ruby-core:1002]
-
-Fri May 2 17:21:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (method_list): classify methods based on nearest
- visibility. [ruby-dev:20127]
-
- * class.c (rb_class_instance_methods): recurse by default. other
- method listing methods as well.
-
-Fri May 2 09:38:06 2003 Warren Brown <wkb@airmail.net>
-
- * string.c (rb_str_ljust): now takes optional argument to specify
- pad string. [ruby-talk:70482]
-
- * string.c (rb_str_rjust): ditto.
-
- * string.c (rb_str_center): ditto.
-
- * string.c (rb_str_justify): utility function.
-
-Fri May 2 04:10:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_add_method): call singleton_method_added or
- method_added for every method definition (after ruby_running).
- [ruby-talk:70471]
-
- * array.c (rb_ary_reverse_bang): Array#reverse! should not return
- nil even for arrays sized less than 2.
-
-Thu May 1 23:18:01 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_eof): should not block after reading all argument
- files. (ruby-bugs-ja PR#449)
-
-Fri May 2 15:10:41 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: use hashes to pass options.
-
- * lib/fileutils.rb: new option mkdir(:mode), mkdir_p(:mode).
-
- * instruby.rb: follow fileutils.rb feature change.
-
-Thu May 1 08:24:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_match_exec): $ _always_ matches at the end of string.
-
-Wed Apr 30 14:12:00 2003 wanowa.kimura@nifty.ne.jp (kimura wataru)
-
- * net/imap.rb: support THREAD extension.
-
-Sun Apr 27 23:13:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * string.c (rb_str_to_i): disallow negative radix.
- [ruby-dev:20087]
-
-Sat Apr 26 23:34:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (open_args): warning message changed to "don't put space
- before argument parentheses".
-
-Sat Apr 26 14:25:00 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * wince/ : files removed.
- (config, dll.mak, exe.mak, mswince-ruby17.def,
- io.c, process.c, signal.c, string.c, time.c)
-
- * wince/ : files added.
- (assert.c, Makefile.sub, mkexports.rb, io_wce.c,
- process_wce.c, signal_wce.c, string_wce.c,
- time_wce.c)
-
- * wince/configure.bat : like mswin32 style.
-
- * wince/direct.c : remove "static" at _currentdir.
-
- * wince/io.h : change definition.
-
- * wince/stdio.c : _fdopen -> fdopen.
-
- * wince/process.h : add _P_OVERLAY.
-
- * wince/time.h : change definition.
-
- * wince/wincemain.c : add wce_SetCurrentDir.
-
- * wince/wince.c : add wce_SetCurrentDir and wce_fopen.
- fix GetModuleFileNameA to return correct "lpFileName".
-
- * wince/wince.h : remove #ifdef.
-
- * wince/sys/utime.h, utime.c : rename _utime to utime.
-
- * wince/sys/stat.c : expand relative directory in stat.
-
-Sat Apr 26 06:33:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_read): ARGF.read() should read all argument files.
-
-Fri Apr 25 18:46:00 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * gc.c: STACK_LEVEL_MAX=65535 on mswince.
-
-Fri Apr 25 18:40:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_read): read should not span two files. [ruby-dev:20073]
-
-Fri Apr 25 18:19:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (splat_value): split splat_value() and avalue_splat().
-
- * io.c: there's no way to set non-IO value to current_file, thus
- no need for argf_forward().
-
-Fri Apr 25 02:03:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): Proc#yield should pass through retry and
- break like keyword yield. [ruby-talk:70034]
-
- * eval.c (proc_invoke): orphan Proc now raises LocalJumpError for
- break and retry again.
-
- * eval.c (rb_eval): ARGSCAT should splat the argument.
-
- * eval.c (splat_value): splat operation function.
-
-Thu Apr 24 23:37:02 2003 Dave Thomas <dave@thomases.com>
-
- * lib/matrix.rb (Matrix#minor): Used Range#size, which no longer
- exists.
-
- * lib/complex.rb (new!): Complex.new had been made private, but
- Kernel#Complex called it. Re-exposed as new!.
-
- * lib/matrix.rb (Matrix.row_vector): Fix method name typo
-
-Thu Apr 24 19:40:02 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb: add -Wl,--no-undefined to LDSHARED only
- if GNU ld is 2.11 or later.
-
-Wed Apr 23 14:05:40 2003 Dave Thomas <dave@pragprog.com>
-
- * lib/ipaddr.rb (include?): Support non-IPAddr parameters.
- [ruby-core:00980]
-
-Wed Apr 23 13:31:10 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/cgi.rb (CGI::QueryExtension::[]): always return Value
- object.
-
-Wed Apr 23 08:39:27 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/zlib/extconf.rb: bccwin32 is win32 too.
-
-Tue Apr 22 20:58:00 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp>
-
- * ruby.c: don't call VirtualQuery in ruby_init_loadpath()
- on mswince.
-
-Tue Apr 22 19:08:53 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c (save_mantissa, load_mantissa): for interoperability
- should count cut-down bit from topmost.
-
-Tue Apr 22 09:20:40 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg_ambiguous): hopefully better message.
-
- * lib/cgi.rb (CGI::QueryExtension::initialize_query): to_ary
- removed.
-
-Tue Apr 22 06:06:22 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/resolv.rb (Resolv::DNS::Resource#hash): use XOR to accumulate
- hash value.
-
- * lib/tsort.rb (TSort#each_strongly_connected_component): don't use
- block argument.
- (each_strongly_connected_component_from): ditto.
-
-Mon Apr 21 21:59:48 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c: one more digit for decimal point. [ruby-talk:69808]
-
-Mon Apr 21 21:25:59 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * numeric.c (flo_is_finite_p): use finite() if available.
-
- * win32/win32.h (isinf, isnan): define as macro.
- [ruby-win32:00533]
-
- * bcc32/Makefile.sub, win32/Makefile.sub: no longer use
- missing/isinf.c, missing/isnan.c.
-
-Mon Apr 21 18:36:28 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bignum.c (rb_cstr_to_inum): unnecessarily long buffer was used
- for radix 9. [ruby-dev:20057]
-
-Mon Apr 21 17:44:34 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (block_append, value_expr0, assign_in_cond,
- warn_unless_e_option, warning_unless_e_option, range_op,
- cond0): adjust line number in warning.
-
-Mon Apr 21 00:47:42 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * sample/test.rb: avoid the MSVCRT *printf problem(float).
- [ruby-dev:20037]
-
-Mon Apr 21 00:11:15 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c (w_float): append least mantissa bits to get rid
- of roundoff problem. [ruby-talk:69518]
-
- * marshal.c (r_object0): load least mantissa bits.
-
-Sun Apr 20 23:24:25 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (NtInitialize): set the floating-point control word
- on bcc32.
-
- * win32/win32.h, bcc32/Makefile.sub: use missing/isinf.c, should not
- use _finite() because it returns 0 if NaN.
-
-Sun Apr 20 03:09:30 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * parse.y (void_expr0): node might become NULL after calling
- remove_begin().
-
-Sat Apr 19 21:55:10 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/Setup*: Add zlib and remove bogus and obsolete entries.
-
-Sat Apr 19 14:47:07 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc): use rb_gc_mark_maybe() to mark registered C
- addresses. C variables may not hold valid reference to Ruby
- objects. [ruby-core:00975]
-
-Sat Apr 19 00:56:13 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (rb_struct_eql): should compare values with "eql?".
-
-Fri Apr 18 23:29:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_check): <=> returns nil for invalid values;
- should check.
-
-Fri Apr 18 15:26:50 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * error.c (rb_raise): workaround for some implementations of
- vsnprintf.
-
-Fri Apr 18 02:23:42 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): should not set RE_OPTIMIZE_ANCHOR,
- if anychar_repeat is enclosed by parentheses.
-
-Fri Apr 18 01:49:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * util.c (ruby_strtod): improved conversion accuracy.
-
-Thu Apr 17 14:39:23 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dbm/dbm.c (each_pair): add prototype to avoid VC++ warnings.
-
- * ext/readline/readline.c (Init_readline): follow readline 4.2
- prototype.
-
-Thu Apr 17 14:22:36 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (cond0): warn only range literals whose both side are
- literals. [ruby-core:00964]
-
-Thu Apr 17 11:10:59 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/readline/readline.c: add the defined operator for bcc32.
-
-Wed Apr 16 00:14:06 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-special-char-p): should test at the
- point if no argument. fixed by Michael Scholz
- <scholz-micha@gmx.de>.
-
-Tue Apr 15 19:35:08 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: rm_r should raise Errno::ENOENT if file
- does not exist ([ruby-core:958]). Thanks Johan Holmberg.
-
-Tue Apr 15 19:12:21 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * struct.c (rb_struct_hash): new methods Struct#hash, Struct#eql?.
- (ruby-bugs:PR#758)
-
-Tue Apr 15 16:05:11 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * numeric.c (rb_fix2str): buffer was insufficient.
- (ruby-bugs-ja:PR#431)
-
-Mon Apr 14 19:45:56 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (file_expand_path): root must follow buf when
- reallocated. [ruby-talk:69339], [ruby-dev:20025]
-
-Mon Apr 14 03:22:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * rubyio.h (struct OpenFile): add noraise flag to finalizer.
-
- * io.c (Init_IO): define $/, $-0, and $\ as string-only
- variables.
-
- * string.c (rb_str_split_m): does not generate empty string if
- the receiver is empty.
-
- * io.c (fptr_finalize): should raise error on EBADF for readable
- IOs as well.
-
-Mon Apr 14 15:54:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bignum.c (rb_cstr_to_inum, rb_big2str): allow 2-36 as radix.
-
- * numeric.c (rb_fix2str): ditto.
-
- * string.c (rb_str_to_i): ditto.
-
-Sun Apr 13 03:20:31 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (try_func): remove COMMON_HEADERS at first for
- performance.
-
-Sat Apr 12 20:59:40 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-beginning-of-arg): substitute
- ruby-backward-arg.
-
- * misc/ruby-mode.el (ruby-calculate-indent): fixed wrong
- indentation in brace block and parentheses.
-
- * misc/ruby-mode.el (ruby-forward-sexp, ruby-backward-sexp):
- support special char literal, and negative arguments.
-
-Sat Apr 12 17:52:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_stat): use rb_check_convert_type() to retrieve IO.
-
-Fri Apr 11 19:00:14 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (rb_w32_stat): check arguments. [ruby-dev:20007]
- [ruby-win32:535]
-
-Fri Apr 11 15:56:08 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * numeric.c (coerce_rescue): prevent inspected String from GC.
-
- * numeric.c (flo_eq, rb_dbl_cmp, flo_gt, flo_ge, flo_lt, flo_le,
- flo_eql): correct NaN comparison. (ruby-bugs:PR#744)
-
- * sample/test.rb: NaN comparison test.
-
-Fri Apr 11 14:48:47 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_stat): dereference using StringValuePtr().
-
- * file.c (rb_file_s_stat): use rb_stat(). [ruby-dev:20007]
-
-Fri Apr 11 10:51:08 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/benchmark.rb (Benchmark::bm): get rid of warning.
- [ruby-talk:69124]
-
-Fri Apr 11 02:41:35 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (set_stdin): assigned value must respond to "read" and
- "getc".
-
- * io.c (set_outfile): assigned value must respond to "write".
- (ruby-bugs-ja:PR#425)
-
-Thu Apr 10 21:12:19 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: Exception line was accidentaly removed.
- [ruby-dev:19989]
-
-Thu Apr 10 18:42:13 2003 Tadayoshi Funaba <tadf@dotrb.org>
-
- * array.c (rb_ary_times): added some checks for request size.
-
-Thu Apr 10 03:22:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_name): always return empty string for
- anonymous class/module. (ruby-bugs-ja PR#424)
-
- * config.sub: stop forcing addition of -gnu to -linux.
-
- * variable.c (classname): refactoring.
-
- * variable.c (rb_class_path): __tmp__classpath__ handling moved
- from classname().
-
-Thu Apr 10 01:52:24 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_obj_is_method): indefinite return value.
-
-Thu Apr 10 00:39:32 2003 Tanaka Akira <akr@m17n.org>
-
- * regex.c (re_compile_pattern): /[\--\-]/ was warned. warn /]/.
-
- * mkconfig.rb: escape `]' in regexp.
-
-Thu Apr 10 00:27:07 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * time.c (time_strftime): RSTRING(format)->ptr might become NULL.
-
-Wed Apr 9 23:54:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_obj_remove_instance_variable): better message.
- [ruby-talk:68987]
-
- * variable.c (rb_mod_remove_const): ditto.
-
- * object.c (rb_obj_ivar_get): ditto.
-
- * object.c (rb_obj_ivar_set): ditto.
-
- * parse.y (yylex): ditto.
-
-Wed Apr 9 21:51:20 2003 Dave Thomas <Dave@Thomases.com>
-
- * eval.c (rb_mod_define_method): Allow UnboundMethod as
- parameter.
-
-Wed Apr 9 18:30:58 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (top_include): include module to wrapper module if
- wrapper is present. experimental. [ruby-list:37539]
-
-Wed Apr 9 17:24:21 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_mark_children): introduce this function again; this
- is required when stack was very tight. [ruby-talk:68916]
-
-Wed Apr 9 15:49:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivmod): small typo.
-
-Wed Apr 9 15:35:04 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/readline/readline.c: include <unistd.h> only when
- HAVE_UNISTD_H is defined.
-
-Wed Apr 9 14:05:00 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c (w_object): preserve extended module on struct.
- (ruby-bugs-ja:PR#422)
-
-Wed Apr 9 03:43:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (BIGZEROP): macro to determine if x is a bignum zero.
-
-Tue Apr 8 11:49:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (Init_Proc): make Method and UnboundMethod independent.
- They are like instance and its class. [ruby-core:00941]
-
- * parse.y (yylex): disallow global variables like "$1ve".
- [ruby-core:00945]
-
- * marshal.c (marshal_dump): Marshal.dump(0, false) should cause an
- error. (ruby-bugs-ja PR#421)
-
- * regex.c (re_compile_pattern): warn if '-' is the edge of
- character range.
-
-Mon Apr 7 15:49:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_unpack_sockaddr_in): remove struct
- size check. getnameinfo(3) can handle. [ruby-dev:19967]
-
-Mon Apr 7 01:33:31 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_read): do not call rb_sys_fail() when required data
- length is zero. (ruby-bugs-ja PR#420)
-
- * eval.c (umethod_proc): should raise TypeError, instead of
- returning error causing Proc. Following the principle of "fail
- early". [ruby-core:00927]
-
-Sun Apr 6 18:29:21 2003 UENO Katsuhiro <katsu@blue.sky.or.jp>
-
- * ext/zlib/zlib.c: the return value of GzipReader#getc must be
- unsigned.
-
-Sun Apr 6 00:35:37 2003 Tanaka Akira <akr@m17n.org>
-
- * sample/exyacc.rb: use Regexp in gsub!.
-
-Sat Apr 5 23:41:28 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): small but serious typo.
-
-Sat Apr 5 04:23:05 2003 Warren Brown <wkb@airmail.net>
-
- * sprintf.c (rb_f_sprintf): was decrementing width even if there
- is no sign character.
-
-Sat Apr 5 01:41:28 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (backtrace): skip internal allocator frame.
- (ruby-bugs-ja PR#416)
-
-Fri Apr 4 10:53:22 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (assign): should prepare mrhs by svalue_to_mrhs().
-
-Wed Apr 2 15:11:23 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * README.EXT, README.EXT.ja (3.3): clarified -1 as free for
- Data_Wrap_Struct(). [ruby-dev:19881]
-
-Mon Mar 31 11:11:36 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_missing): use "inspect" for T_OBJECT as well.
-
-Mon Mar 31 10:50:48 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (env_reject_bang): untaint key string.
-
- * hash.c (env_delete_m): execute block only if deleting key does
- not exist.
-
-Sat Mar 29 17:54:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): do not call rb_str_buf_cat() with NULL ptr,
- which causes SEGV; jump to grow instead. [ruby-dev:19944]
-
-Sat Mar 29 15:19:48 2003 Tanaka Akira <akr@m17n.org>
-
- * instruby.rb, ext/extmk.rb, lib/benchmark.rb, lib/cgi.rb,
- lib/debug.rb, lib/getoptlong.rb, lib/optparse.rb, lib/time.rb,
- lib/date/format.rb, lib/irb/ruby-lex.rb lib/uri/common.rb: revert
- escape for `-' in character class.
-
-Sat Mar 29 09:48:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (avalue_to_svalue): use rb_check_array_type() again.
- Clarify how "to_ary" and "to_a" work. [ruby-talk:68155]
-
- * eval.c (svalue_to_avalue): ditto.
-
- * eval.c (svalue_to_mrhs): ditto.
-
- * eval.c (rb_eval): unary splat to use to_a, but we need a hack to
- exclude Object#to_a until it's removed.
-
- * object.c (rb_Array): check obj.respond_to?("to_a"). Currently
- all object respond_to "to_a", but Object#to_a will be removed.
-
- * range.c (Init_Range): undefine to_ary.
-
- * re.c (Init_Regexp): ditto.
-
-Sat Mar 29 09:47:52 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * MANIFEST (ext/aix_mksym.rb): remove obsolete file.
-
-Fri Mar 29 06:21:24 2003 UENO Katsuhiro <katsu@blue.sky.or.jp>
-
- * ext/zlib: merge from rough.
-
-Fri Mar 28 19:33:39 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * variable.c (rb_class_path): hold temporary class path in a
- instance variable to get rid of GC. [ruby-dev:19932]
-
- * variable.c (classname): remove temporary class path when exact
- name found.
-
-Fri Mar 28 18:29:23 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): do not warn if "-" is at the top
- or last of character class.
-
-Thu Mar 27 12:10:15 2003 Tanaka Akira <akr@m17n.org>
-
- * regex.c (re_compile_pattern): fix [:name:] handling.
- /[\[:digit:]]/ was treated as /[[:digit:]]/.
- /[[:-@]/ was treated as /[\[:\-@]/.
- /[%-[:digit:]]/ was treated as /[%-\[:digit:]\]/.
-
-Thu Mar 27 03:26:40 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * string.c (rb_str_capitalize_bang): check length before upcase
- first character. (ruby-bugs:PR#697)
-
-Wed Mar 26 20:25:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * dln.c (dln_find_1): break if path list end, even for too long
- path names. (ruby-bugs-ja:PR#412)
-
-Wed Mar 26 13:19:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (avalue_splat): new function to do unary * (splat)
- operator.
-
- * eval.c (avalue_to_svalue,svalue_to_avalue,svalue_to_mrhs): do
- not use implicit "to_ary" conversion.
-
- * ext/curses/curses.c (GetWINDOW,GetMOUSE): add taint check.
-
- * ext/curses/curses.c (curses_init_screen): ditto.
-
- * ext/curses/curses.c (window_initialize): ditto.
-
- * gc.c (os_each_obj): prohibit ObjectSpace#each_object in safe
- mode ($SAFE >= 4).
-
-Tue Mar 25 23:26:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * signal.c (trap): return "DEFAULT" and "IGNORE" respectively for
- previous sighandler SIG_DFL and SIG_IGN. [ruby-talk:67860]
-
-Tue Mar 25 12:24:15 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): call avalue_to_mrhs() to assign block
- parameter |a|. [ruby-dev:19897]
-
- * ruby.c (ruby_set_argv): freeze argument strings.
-
-Tue Mar 25 12:01:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_initialize): should check rb_secure(4).
-
- * dir.c (dir_s_getwd): should check rb_secure(4).
-
- * object.c (rb_obj_infect): function version of OBJ_INFECT().
-
- * eval.c (rb_secure_update): new function to check object update.
-
-Tue Mar 25 10:18:05 2003 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: should infect also return values of
- #inspect.
-
- * ext/strscan/strscan.c: use snprintf() instead of sprintf().
-
-Mon Mar 24 16:55:04 2003 Takaaki Tateishi <ttate@ttsky.net>
-
- * ext/dl/dl.c: added rb_secure(4). (Thanks to Minero Aoki)
-
- * ext/dl/sym.c: ditto.
-
- * ext/dl/ptr.c: ditto.
-
-Mon Mar 24 00:09:02 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (block_append): warn unused literal.
-
-Sun Mar 23 22:22:04 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/jcode.rb (tr!, delete!, szueeze!): add empty string checking.
-
-Sun Mar 23 19:54:53 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.
-
-Sat Mar 22 15:50:29 2003 Tanaka Akira <akr@m17n.org>
-
- * time.c (make_time_t): try search_time_t if mktime/timegm is failed.
-
-Sat Mar 22 13:26:33 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/optparse.rb, lib/jcode.rb, ext/tk/lib/tk.rb: reorder character
- class /[\]\[]/ to /[\[\]]/ for readability.
-
-Sat Mar 22 12:44:15 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/date/format.rb, lib/uri/common.rb: escape `[', `]', `-' in
- character class in regexp to avoid warning.
-
-Sat Mar 22 07:39:32 2003 Ulf Betlehem <flu@iki.fi>
-
- * io.c (rb_io_fread): may lose data on nonblocking read.
-
-Fri Mar 21 23:40:41 2003 Tanaka Akira <akr@m17n.org>
-
- * regex.c (re_compile_pattern): fix previous change.
-
- * instruby.rb, ext/extmk.rb, ext/tk/lib/tk.rb, lib/benchmark.rb,
- lib/cgi.rb, lib/debug.rb, lib/getoptlong.rb, lib/jcode.rb,
- lib/optparse.rb, lib/time.rb, lib/date/format.rb,
- lib/irb/ruby-lex.rb: escape `[', `]', `-' in character class in
- regexp to avoid warning.
-
-Fri Mar 21 23:23:45 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): give warning for unescaped square
- brackets and minus in character class. [ruby-dev:19868]
-
-Fri Mar 21 18:12:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (bmcall): missing type.
-
-Fri Mar 21 01:29:35 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): copy sign bits only if value is
- negative.
-
- * missing.h: include <stdarg.h> or <varargs.h> if HAVE_VSNPRINTF
- is not defined.
-
-Thu Mar 20 18:31:37 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb (OptionParser#order!): follow recent change
- of proc argument.
-
-Thu Mar 20 16:12:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_to_s): change format specifier to "%.15g" to
- avoid unnecessary 9s (e.g. 99.59999999999999). (ruby-bugs-ja PR#406)
-
-Thu Mar 20 16:03:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (stmt, primary): get rid of SEGV at empty or invalid
- condition. (ruby-bugs-ja:PR#410)
-
- * parse.y (cond_negative): negate condition node when NODE_NOT.
-
-Thu Mar 20 10:45:29 2003 Tanaka Akira <akr@m17n.org>
-
- * eval.c (bmcall): add volatile to avoid GC problem.
-
-Thu Mar 20 10:10:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (load_dyna): clear ruby_errinfo. (ruby-bugs-ja PR#409)
-
-Wed Mar 19 23:05:30 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/tracer.rb (trace_func): save and recover Thread.critical state.
- Fixed by Fukumoto Atsushi <fukumoto@imasy.or.jp> [ruby-dev:19830]
-
-Wed Mar 19 02:55:46 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): make str empty if given. (ruby-bugs-ja PR#408)
-
- * io.c (io_read): ditto.
-
- * io.c (rb_io_sysread): ditto.
-
-Tue Mar 18 18:24:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c: do not override min and max.
-
-Sun Mar 16 12:29:55 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (object_address_group): use to_s instead of name
- to get name of class.
-
-Fri Mar 14 08:53:29 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (remove_sign_bits): octal left most digit for negative
- numbers may be '3'. (ruby-bugs-ja PR#407)
-
- * sprintf.c (rb_f_sprintf): should prefix sign bits if bignum is
- negative, using sign_bits().
-
-Wed Mar 12 16:48:19 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (prep_stdio): set binmode only if the file descriptor
- is not connected to a terminal on Cygwin.
-
-Wed Mar 12 11:23:49 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (avalue_to_mrhs): split argument passing and assignment
- conversion.
-
- * eval.c (svalue_to_mrhs): ditto.
-
- * eval.c (avalue_to_svalue): avalue_to_svalue([[1,2]]) should be
- [[1,2]], not [1,2] to wrap-around.
-
-Tue Mar 11 21:00:59 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: Digest string wrongly included '\n' when user
- name is too long (ruby-bugs-ja:PR#404).
-
-Tue Mar 11 20:07:01 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: speeding up by avoiding extra flush.
- (suggested by Brian Candler <B.Candler@pobox.com> [ruby-talk:66516])
-
-Tue Mar 11 04:30:12 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (massign): remove unnecessary array unpacking; it should
- be handled before massign() by svalue_to_mrhs().
-
- * eval.c (svalue_to_mrhs): '*a = v' value conversion to avalue
- (i.e. [1] => [[1]], [1,2] => [1,2]).
-
- * eval.c (rb_eval): use svalue_to_mrhs.
-
- * eval.c (rb_yield_0): ditto.
-
- * eval.c (proc_invoke): break from "Proc#yield" is legal.
-
-Mon Mar 10 23:19:29 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_find_file): need world writable directory check for
- relative paths too.
-
-Mon Mar 10 11:23:00 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_find_file): world writable directory check if
- $SAFE >= 1 (was $SAFE >= 2).
-
-Mon Mar 10 01:59:47 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: do not dispatch LIST when a mailbox is empty.
-
- * lib/net/pop.rb: merge the 'STAT' patch from Frank S.Fejes
- <frank@oopdreams.com>, with modifications (listed below).
-
- * lib/net/pop.rb: new method Net::POP#mail_size.
-
- * lib/net/pop.rb: new method Net::POP#bytes.
-
- * lib/net/pop.rb: new method Net::POPCommand#stat.
-
-Sun Mar 9 19:30:25 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/fileutils.rb (mkdir, mkdir_p): revert.
-
- * instruby.rb (umask): umask 0022, not 0.
-
-Sun Mar 9 17:09:40 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/fileutils.rb (mkdir, mkdir_p): set mode to 0755.
-
- * Makefile.in (fake.rb): set ALT_SEPARATOR to the default value.
-
-Sat Mar 8 11:30:59 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (massign): fix a bug not to expand in assignment to sole
- lhs. [ruby-dev:19766]
-
-Fri Mar 7 21:57:25 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (Kernel.pp): module function.
- (MatchData#pretty_print): new method.
-
-Fri Mar 7 20:27:19 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/tcltklib/extconf.rb (find_tcl, find_tk): return true if
- non-versioned found. [ruby-dev:19759]
-
-Fri Mar 7 15:05:35 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/dbm/extconf.rb: add QDBM support.
-
-Fri Mar 7 12:59:39 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (massign): deal with sole lhs, assign rest args from
- converted array. [ruby-dev:19751]
-
-Fri Mar 7 03:31:36 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (dsym): :"symbol string" style should not contain `\0'.
-
- * process.c (proc_detach): new method Process.detach(pid) which
- create background watcher thread to issue waitpid. [new]
-
- * process.c (rb_detach_process): utility function to detach
- process from C code.
-
- * ext/pty/pty.c (pty_finalize_syswait): terminate watcher thread,
- and detach child process (by creating new idle waitpid watcher
- thread).
-
- * ext/pty/pty.c (pty_syswait): may lost signal stopped child.
-
-Fri Mar 7 00:30:33 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/Win32API/Win32API.c: no longer use inline-asms.
-
- * ext/Win32API/extconf.rb: no need to add gcc options.
-
-Thu Mar 6 13:02:10 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (reswords): fix reswords list.
-
-Wed Mar 5 12:13:21 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: better YACC support on HP-UX.
-
-Wed Mar 5 05:55:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_cat): remove ptr NULL check and MEMZERO(). ptr
- must be non NULL.
-
-Tue Mar 4 23:12:07 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in, bcc32/Makefile.sub, win32/Makefile.sub: define
- RUBY_EXPORT to export symbols.
-
- * defines.h: use RUBY_EXTERN instead of EXTERN.
-
- * intern.h, re.h, ruby.h, rubysig.h: ditto.
-
- * win32/win32.h: remove EXTERN definition.
-
-Tue Mar 4 17:54:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_aref): raise TypeError if index is a symbol.
- [ruby-list:37217]
-
- * array.c (rb_ary_aset): ditto.
-
-Tue Nov 13 14:39:11 2001 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * missing/strftime.c: HP-UX support.
-
-Tue Mar 4 15:08:08 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: better HP-UX support.
-
- * missing/strftime.c: ditto.
-
-Tue Mar 4 10:11:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_popen): do not call rb_io_close() directly, call
- "close" method instead. [ruby-dev:19717]
-
- * io.c (rb_io_s_open): ditto.
-
- * hash.c (rb_any_hash): remove DEFER_INTS. all do_hash() calls in
- st.c are at the top of functions. No reentrant problem.
-
-Tue Mar 4 01:19:21 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dl/MANIFEST: Exclude .cvsignore. [found by: eban]
-
-Tue Mar 4 01:17:08 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/Win32API/MANIFEST: Belatedly add lib/win32/registry.rb.
- [found by: eban]
-
-Tue Mar 4 00:33:04 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * MANIFEST: Belatedly add Test::Unit files. D'oh!
-
-Sun Mar 2 09:51:47 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c (w_nbyte): should output always via rb_io_write().
-
- * marshal.c (dump_ensure): ditto.
-
- * marshal.c (marshal_dump): should call "binmode" method, if it
- responds to.
-
- * marshal.c (r_byte): should input always via "getc" method.
-
- * marshal.c (r_bytes0): should input always via "read" method.
-
- * marshal.c (marshal_load): need not to set up FILE* fp;
-
-Mon Mar 3 11:29:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): parse 'lhs = a rescue b' as 'lhs=(a rescue b)'.
-
-Mon Mar 3 02:53:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_fread): should not clearerr() if there's no filled
- buffer (i.e. rb_io_fread() returning zero).
-
-Mon Mar 3 01:42:35 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-expr-beg): escaped char syntax.
-
- * misc/ruby-mode.el (ruby-parse-partial): ditto.
-
- * misc/ruby-mode.el (ruby-parse-partial): no deep indent for
- block.
-
- * misc/ruby-mode.el (ruby-backward-arg): skip arguments backward.
-
- * misc/ruby-mode.el (ruby-calculate-indent): too deep indentation.
-
-Fri Feb 28 23:50:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (map_errno): map OS error to errno. [new]
-
- * win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
- kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime): use
- map_errno() instead of using GetLastError() directly.
-
- * 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): map winsock error to errno.
-
-Fri Feb 28 22:54:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (flock): supports larger files, and maps error
- code.
-
- * win32/win32.c (rb_w32_asynchronize): returns errno from child
- thread.
-
- * win32/win32.c (rb_w32_fclose, rb_w32_close): ensures unlocked.
-
-Wed Feb 26 17:38:16 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: replace Kernel.open as well.
-
-Tue Feb 25 23:03:08 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
-
- * lib/debug.rb (DEBUGGER__::Context#debug_command): bp filename must
- be the basename of it. [ruby-talk:65644]
-
-Mon Feb 24 17:49:35 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (yycompile): zero clear ruby_eval_tree_begin if
- compilation failed.
-
-Mon Feb 24 08:06:29 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_new): need no MEMZERO().
-
-Sun Feb 23 17:57:06 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/fileutils (fu_stream_blksize): wrong logical condition.
- (and -> or).
-
-Sat Feb 22 03:12:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_gt): use rb_num_coerce_cmp() instead of
- rb_num_coerce_bin.
-
- * numeric.c (fix_ge, fix_lt, fix_le): ditto.
-
- * numeric.c (flo_gt, flo_ge, flo_lt, flo_le): ditto.
-
-Sat Feb 22 02:45:20 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_create): may called from place higher than
- rb_gc_stack_start.
-
- * gc.c (Init_stack): update rb_gc_stack_start if it is lower (or
- higher if stack grows down) than the previous value.
-
-Fri Feb 21 21:03:41 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: new method FileUtils#copy_stream.
-
- * lib/fileutils.rb: new method FileUtils#compare_file.
-
- * lib/fileutils.rb: new method FileUtils#compare_stream.
-
- * lib/fileutils.rb: new method FileUtils#rmtree (alias of rm_rf).
-
-Fri Feb 21 17:19:27 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * eval.c (rb_f_require): do not need to abort if a DLEXT file
- is not found.
-
-Fri Feb 21 13:39:25 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_cmp_m): should use LONG2NUM().
-
-Fri Feb 21 12:45:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_cmp_m): two small bugs fixed.
-
-Fri Feb 21 08:03:09 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_mark): inline rb_gc_mark_children().
-
- * gc.c (gc_sweep): new tactics to increase malloc_limit mildly.
-
-Fri Feb 21 05:16:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_cmp_m): return nil if str2 does not respond to
- both "to_str" and "<=>".
-
- * compar.c (cmp_gt): return nil if "<=>" returns nil (means
- incomparable).
-
- * compar.c (cmp_ge, cmp_lt, cmp_le): ditto.
-
- * compar.c (cmp_between): use RTEST(), since cmp_lt and cmp_gt may
- return nil.
-
-Thu Feb 20 19:05:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): main thread swapped by fork() may
- terminate rb_thread_start_0() successfully. call ruby_stop(0);
- this change was suggested by Rudi Cilibrasi
- <cilibrar@drachma.ugcs.caltech.edu>.
-
-Thu Feb 20 18:44:51 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (file_expand_path): fix wrong behavior for root file.
- expand_path("..", "//machine/share") => "//machine/share"
- expand_path("..", "c:/a") => "c:/"
- expand_path("..", "/a") => "/"
-
-Thu Feb 20 18:11:01 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (file_expand_path): should not upward beyond share name.
-
-Thu Feb 20 15:45:33 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * missing.h (strtoul): fix prototype of strtoul.
-
-Thu Feb 20 10:11:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (clhs): allow "Foo::Bar = x".
-
-Thu Feb 20 04:07:06 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (primary): "self[n]=x" can be legal even when "[]=" is
- private. changes submitted in [ruby-talk:63982]
-
- * parse.y (aryset): ditto.
-
- * parse.y (attrset): "self.foo=x" can be legal even when "foo="
- is private.
-
- * eval.c (is_defined): private "[]=" and "foo=" support.
-
- * eval.c (rb_eval, assign): ditto.
-
-Thu Feb 20 03:58:34 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): "foo=" should not always be public.
-
-Thu Feb 20 01:23:59 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_restore_context): inhibit interrupts in
- critical section while context switching. [ruby-talk:64785]
-
-Wed Feb 19 18:27:42 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * node.h (nd_cpath): nested class/module declaration.
- [EXPERIMENTAL]
-
- * eval.c (rb_eval): ditto.
-
- * gc.c (rb_gc_mark_children): ditto.
-
- * parse.y (cpath): ditto.
-
-Tue Feb 18 21:39:27 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): should not report uninitialized warning by
- attribute reader method.
-
- * variable.c (rb_attr_get): new function to get instance variable
- without uninitialized warning.
-
- * io.c (argf_to_io): should prefetch argv.
-
-Tue Feb 18 00:13:50 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-comment-column): customize comment
- column. [new]
-
- * misc/ruby-mode.el (ruby-deep-indent-paren): deep indentation
- parentheses. [new]
-
- * misc/ruby-mode.el (ruby-expr-beg): fix for / after $?.
-
- * misc/ruby-mode.el (ruby-parse-partial, ruby-calculate-indent):
- deep indentation support.
-
- * misc/ruby-mode.el (ruby-forward-sexp, ruby-backward-sexp):
- move forward/backward across one balanced expression. [new]
-
- * misc/ruby-mode.el (ruby-indent-exp): indent balanced
- expression. [new]
-
- * misc/ruby-mode.el (ruby-electric-brace): indent before
- show matching parenthesis. (contributed by NABEYA Kenichi)
-
-Mon Feb 17 14:36:56 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (rb_w32_opendir, rb_w32_utime): need parens.
-
-Mon Feb 17 14:13:25 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (link): implement with CreateHardLink().
-
- * win32/win32.c, win32/win32.h (rb_w32_utime): enable utime() to
- directory if on NT. [new] (ruby-bugs-ja:PR#393)
-
-Mon Feb 17 13:28:51 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (file_expand_path): strip last slash when path is
- root.
-
-Sun Feb 16 19:22:31 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (file_expand_path): buffer might be reallocated while
- expanding default directory.
-
- * file.c (file_expand_path): default directory was being
- ignored if path was full path with no drive letter, under
- DOSISH.
-
-Sun Feb 16 03:14:33 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (prep_stdio, Init_io): always set binmode on Cygwin.
-
-Sat Feb 15 01:01:45 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (file_expand_path): fix surplus path separators while
- expanding at root directory. [ruby-dev:19572]
-
-Fri Feb 14 14:25:24 2003 akira yamada <akira@arika.org>
-
- * lib/uri/generic.rb, lib/uri/ldap.rb, lib/uri/mailto.ldap: all foo=()
- returns arguments passed by caller.
-
- * lib/uri/generic.rb (Generic#to_str, Generic#to_s): removed to_str.
- Suggested by Tanaka Akira <akr@m17n.org> at [ruby-dev:19475].
-
- * lib/uri/generic.rb (Generic#==): should not generate an URI object
- from argument. Suggested by Tanaka Akira <akr@m17n.org> at
- [ruby-dev:19475].
-
-Thu Feb 13 11:54:50 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ruby.c (ruby_init_loadpath): ensures buffer terminated
- before use strncpy().
-
- * ruby.c (proc_options): avoid SEGV at -S with no arguments.
- script argument is in effect only when -e is not given.
- (ruby-bugs-ja:PR#391)
-
-Thu Feb 13 01:30:10 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_schedule): current thread may be dead when
- deadlock. (ruby-bugs:PR#588)
-
-Thu Feb 13 00:28:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): step might be float 0 < x < 1.
-
- * eval.c (rb_thread_schedule): pause if no runnable thread when
- there's only one thread.
-
-Thu Feb 13 00:09:47 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (strrdirsep): ignore trailing directory separators.
-
- * file.c (rb_file_s_expand_path): File.expand_path(".","/") should
- return "/". (ruby-bugs-ja:PR#389)
-
- * file.c (rb_file_s_basename): also ignore trailing directory
- separators, in compliance with SUSv3. (ruby-bugs-ja:PR#390)
-
- * file.c (rb_file_s_dirname, rb_file_s_extname): ditto.
-
- * file.c (rb_file_s_dirname): append "." if drive only.
-
- * file.c (rb_file_s_split): get rid of converting twice.
-
-Mon Feb 10 20:55:15 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb (parse_args): add '-n' to $mflags BEFORE "--".
- do not add DESTDIR if already included in $mflags.
-
-Mon Feb 10 19:54:30 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (FileUtils#uptodate?): use mtime for
- comparison.
-
-Mon Feb 10 10:14:26 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_to_a): return value should be an Array if the
- receiver is an instance of subclass of Array.
-
- * string.c (rb_str_to_s): return value should be a String if the
- receiver is an instance of subclass of String.
-
-Mon Feb 10 03:33:42 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (rb_file_sysopen): rb_file_sysopen_internal() needs four
- arguments.
-
-Sun Feb 9 15:16:04 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * intern.h (HAVE_RB_DEFINE_ALLOC_FUNC, RB_CVAR_SET_4ARGS):
- define to 1.
-
- * ruby.h (NORETURN_STYLE_NEW): ditto.
-
-Sun Feb 9 12:28:18 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (init_mkmf): add libdir to LIBPATH unless cross
- compiling.
-
-Sun Feb 9 08:34:45 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: 4xx raises Net::ProtoServerError, 5xx raises
- Net::ProtoFatalError (for backward compatibility).
-
-Sun Feb 9 07:07:26 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: new method FileUtils.pwd (really).
-
- * lib/fileutils.rb: FileUtils.pwd, cmp, identical?, uptodate? does
- not accept any option.
-
-Sat Feb 8 18:35:30 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-forward-string): fixed void variable
- error.
-
-Sat Feb 8 16:23:11 2003 NABEYA Kenichi <kenichi@nabeya.com>
-
- * misc/ruby-mode.el (ruby-font-lock-keywords): method name can
- be delimited by tab.
-
-Sat Feb 8 03:57:32 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/irb/workspace.rb, lib/irb/ext/math-mode.rb,
- lib/irb/ext/multi-irb.rb, lib/irb/lc/error.rb,
- lib/irb/lc/help-message, lib/irb/lc/ja/error.rb,
- lib/shell/command-processor.rb, lib/shell/error.rb,
- lib/shell/filter.rb: Fix typos and grammos. [approved by: keiju]
-
-Sat Feb 8 03:34:28 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * intern.h (HAVE_RB_DEFINE_ALLOC_FUNC): New boolean macro to make
- it easier to write extensions that work with both ~1.6 and 1.8~.
-
- * intern.h (RB_CVAR_SET_4ARGS): Ditto.
-
- * ruby.h (NORETURN_STYLE_NEW): Ditto.
-
-Sat Feb 8 00:47:24 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call): calls method_missing when superclass method
- does not exist.
-
- * eval.c (rb_f_missing): now handles "no super" case.
-
- * object.c (rb_obj_ivar_get): Object#instance_variable_get: new
- method to get instance variable value without eval(). [new]
-
- * object.c (rb_obj_ivar_set): Object#instance_variable_set: new
- method to set instance variable value without eval(). [new]
-
-Fri Feb 7 15:35:21 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * intern.h, re.c (rb_memsearch): returns long.
-
- * string.c (rb_str_index): should return offset position.
-
-Fri Feb 7 15:30:15 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (proc_invoke): should propagate self to super
- methods. [ruby-dev:19510]
-
-Thu Feb 6 19:04:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize_m): should not preset "kcode" unless
- encoding is explicitly specified.
-
-Thu Feb 6 19:01:32 2003 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: new method FileUtils.pwd.
-
- * lib/fileutils.rb: default label is ''.
-
- * lib/fileutils.rb: using module_eval again, to avoid ruby's bug.
-
- * lib/fileutils.rb: fix wrong examples in rdoc.
-
-Thu Feb 6 17:43:56 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/complex.rb (Complex#==): should not raise error by type
- mismatch.
-
- * lib/rational.rb (Rational#==): ditto.
-
-Thu Feb 6 11:44:40 2003 MoonWolf <moonwolf@moonwolf.com>
-
- * re.c (rb_reg_initialize_m): 3rd argument was ignored.
-
-Thu Feb 6 01:09:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_count): return 0 for empty string (was
- returning nil).
-
-Wed Feb 5 19:41:37 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: dispatch code restructured to make it openable
- that has `open' method.
-
- * lib/open-uri.rb: Location: field may has a relative URI.
- pointed out by erik eriksson <ee@opera.com>.
-
-Wed Feb 5 17:11:02 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): no .<digit> float literal anymore.
-
-Tue Feb 4 16:11:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_equal): a == b is true when b is non T_ARRAY
- object, if b has "to_ary" and b == a.
-
- * hash.c (rb_hash_equal): a == b is true when b is non T_HASH
- object, if b has "to_hash" and b == a.
-
- * string.c (rb_str_equal): a == b is true when b is non T_STRING
- object, if b has "to_str" and b == a.
-
-Mon Feb 3 23:46:48 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_getline): should not increment lineno at EOF.
-
-Mon Feb 3 16:49:19 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): default Object#=== now calls "=="
- internally.
-
- * re.c (rb_reg_initialize_m): should honor option status of
- original regexp.
-
- * array.c (rb_ary_equal): ary2 should be T_ARRAY (no to_ary
- conversion).
-
- * array.c (rb_ary_eql): ditto.
-
- * string.c (rb_str_equal): str2 should be T_STRING (no to_str
- conversion).
-
-Mon Feb 3 16:32:52 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * re.c (rb_memsearch): a little improvement.
-
-Mon Feb 3 13:18:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_memsearch): algorithm body of String#index.
-
- * error.c (Init_Exception): "to_str" removed.
-
- * eval.c (eval): should not rely on Exception#to_str
-
- * eval.c (compile_error): ditto.
-
- * error.c (err_append): ditto.
-
-Sat Feb 1 23:56:29 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_merge): Hash#merge, non destructive "update".
- now there's also Hash#merge! which is an alias to "update".
-
-Fri Jan 31 14:16:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_index): search using Karp-Rabin algorithm.
-
-Fri Jan 31 12:45:11 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_obj_classname): new function.
-
- * string.c (rb_str_dup): should preserve original's class (but not
- hidden singleton class).
-
- * string.c (rb_str_substr): ditto.
-
- * parse.y: backout EXPR_CMDARG removal.
-
-Fri Jan 31 09:40:07 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb (OptionParser::List::accept): default
- pattern must not be nil.
-
- * lib/optparse.rb (OptionParser::make_switch): NoArgument doesn't
- override other styles.
-
-Thu Jan 30 16:46:43 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb (OptionParser::Switch::PlacedArgument): added.
- if the next argument doesn't start with '-', use it as the
- value.
-
- * lib/optparse.rb (OptionParser::make_switch): fixed a bug of
- pattern.
-
- * lib/optparse.rb (Array): no need to guard.
-
-Thu Jan 30 08:27:19 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (rb_file_s_expand_path): removed a sludge.
-
-Wed Jan 29 03:24:39 2003 Michal Rokos <michal@rokos.homeip.net>
-
- * dir.c (glob_helper): memory leak fixed.
-
-Tue Jan 28 04:45:03 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * instruby.rb (parse_args), ext/extmk.rb (parse_args): Prepend a
- hyphen to the first argument of MAKEFLAGS only if appropriate.
- Remove wrong comments.
-
-Mon Jan 27 03:30:06 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * error.c (get_syserror): use snprintf() instead of sprintf(). pointed
- out by knu.
-
-Mon Jan 27 02:06:38 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * error.c (get_syserror): some Windows' errno have 5 digits. pointed
- out by znz.
-
-Sun Jan 26 19:23:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb ($mflags.set?): Check $make instead of $nmake, since
- there is no such a variable.
-
- * instruby.rb ($mflags.set?), ext/extmk.rb ($mflags.set?): Return
- false if unmatched.
-
-Sun Jan 26 19:08:30 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/shellwords.rb: Embed rdoc style comments.
-
- * lib/shellwords.rb (shellwords): Use String#lstrip!.
-
- * lib/shellwords.rb (shellwords): Recognize an object that
- responds to to_str() by using String.new().
-
-Sun Jan 26 17:53:04 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * instruby.rb (parse_args), ext/extmk.rb (parse_args): Detect -n
- and emulate a dry run. Use 'make' in case no --make argument is
- given.
-
-Sun Jan 26 07:18:42 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * instruby.rb: re-define individual methods verbosely rather than
- including FileUtils::Verbose, in order to suppress messages from
- FileUtils#cmp.
-
- * instruby.rb (makedirs): make same directory only once even if
- dryrun.
-
- * lib/fileutils.rb (FileUtils::Verbose, FileUtils::NoWrite):
- re-define methods with define_method instead of module_eval.
-
-Sun Jan 26 03:37:18 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * instruby.rb, ext/extmk.rb, Makefile.in, win32/Makefile.sub,
- bcc32/Makefile.sub: Replace the complicated MFLAGS/MAKEFLAGS
- parser with something plain and comprehensible. This fixes a
- bug where make flags were wrongly reordered and the resulted
- command line often did not make sense especially when BSD make
- is used with extra arguments given. Tested with FreeBSD and
- Linux by me and mswin32, bccwin32 and mingw by usa.
-
-Fri Jan 24 18:15:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: tMINUS should have lower precedence than tPOW.
-
-Fri Jan 24 05:12:55 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): deal
- with escaped $ and ? at the end of strings. [ruby-talk:62297]
-
- * misc/ruby-mode.el (ruby-font-lock-keywords): added defined?.
-
-Thu Jan 23 17:25:04 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): do not warn discarding already undefined
- method.
-
- * lib/rational.rb: undef quo before replacing.
-
-Thu Jan 23 15:49:57 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (arg): missing arguments.
-
-Thu Jan 23 14:56:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/rational.rb: modified to support "quo".
-
- * numeric.c (num_quo): should return most exact quotient value,
- i.e. float by default, rational if available.
-
- * numeric.c (num_div): "div" should return x.divmod(x)[0].
-
-Thu Jan 23 13:24:18 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_arg): was accessing garbage argv value.
-
-Thu Jan 23 06:37:01 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * instruby.rb: should not contain destdir in shebang line.
-
-Wed Jan 22 23:19:57 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (pipe_exec): remove unnecessary SetStdHandle().
-
-Wed Jan 22 20:20:59 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): syntaxify tPOW negative number hack.
-
- * parse.y (negate_lit): new function to negate literal numeric
- values in compile time.
-
-Wed Jan 22 15:36:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_match_exec): charset info may be stored in MBC
- region when $KCODE != NONE.
-
-Wed Jan 22 14:22:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (set_syserr): should preserve duplicated error names.
-
-Tue Jan 21 20:29:31 2003 Michal Rokos <michal@rokos.homeip.net>
-
- * mkmf.rb: make possible to add files to clean and distclean targets
-
-Tue Jan 21 18:05:25 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bcc32/Makefile.sub (LIBRUBY_A): link dmyext.
-
-Tue Jan 21 16:59:18 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb: use real interpreter pathname at shebang line.
- [ruby-dev:19370]
-
-Tue Jan 21 16:22:32 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): put back old ** behavior for negative number
- right operand.
-
-Tue Jan 21 14:46:12 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb: Use Test::Unit.
-
- * lib/prettyprint.rb: Ditto
-
- * lib/time.rb: Ditto
-
- * lib/tsort.rb: Ditto
-
-Tue Jan 21 04:15:50 2003 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb: Use redefined `to_s' as well as `inspect'.
- Useless `pretty_print' methods removed.
- (PP::ObjectMixin#pretty_print_inspect): new method.
-
-Mon Jan 20 21:48:43 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in (MANTYPE): Detect if the system's nroff(1) groks
- mdoc. Provide a new option --with-mantype={doc|man} in case the
- check does not work as expected.
-
- * Makefile.in (MANTYPE): Define MANTYPE and pass it to
- instruby.rb.
-
- * instruby.rb: Convert mdoc manpages to man for systems which
- nroff(1) does not grok mdoc.
-
-Mon Jan 20 21:25:18 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/tempfile.rb (self.open): If a block is given, call it with
- tempfile as an argument and automatically close the tempfile
- when the block terminates.
-
-Mon Jan 20 21:02:50 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * mdoc2man.rb: Properly put nested braces, parentheses and angles.
-
- * mdoc2man.rb: Add support for .An and .Aq/.Ao/.Ac.
-
- * mdoc2man.rb: Add support for .Dl.
-
- * mdoc2man.rb: Make .Pf macro actually work.
-
- * mdoc2man.rb: Properly handle .Os.
-
- * mdoc2man.rb: Correctly omit spaces around punctuation
- characters.
-
-Mon Jan 20 19:43:41 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * mdoc2man.rb: Make this work as a library.
-
-Mon Jan 20 18:22:40 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_f_require): purge too many goto's.
-
-Mon Jan 20 17:50:05 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * mdoc2man.rb (parse_macro): Understand .Ux.
-
-Mon Jan 20 17:32:56 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * mdoc2man.rb: New file. A mdoc to man converter ported from
- Perl.
-
-Mon Jan 20 15:40:15 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * ruby.1: Properly close .Bl with .El.
-
-Mon Jan 20 04:14:17 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (egrep_cpp): use inspect to show options.
-
- * lib/mkmf.rb (dir_config): prior configured directories to
- defaults.
-
- * lib/mkmf.rb (dir_config): extract first word to determine
- make command type.
-
-Mon Jan 20 02:15:53 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/aix_mksym.rb: no longer used.
-
-Mon Jan 20 00:17:16 2003 Matt Armstrong <matt@lickey.com>
-
- * file.c (eaccess): under windows, make eaccess() just call
- access(). [ruby-core:716], [ruby-bugs:PR#556]
-
-Sun Jan 19 23:08:18 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/shellwords.rb (shellwords): A backslash ('\') in single
- quotes should not be regarded as meta character. This bug or
- maybe feature was inherited from Perl's shellwords.pl.
-
-Sun Jan 19 14:01:12 2003 UENO Katsuhiro <unnie@blue.sky.or.jp>
-
- * regex.c (is_in_list): should work well with UTF-8.
-
- * regex.c (re_match_exec): ditto.
-
-Sat Jan 18 14:53:49 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bignum.c (rb_cstr_to_inum): should not erase all 0s, but
- squeeze into one. [ruby-dev:19377]
-
-Fri Jan 17 03:33:42 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * sprintf.c (rb_f_sprintf): Fix a bug caused by an uninitialized
- variable v, that a bignum unexpectedly gets converted into a
- string with its higher figures all filled with ./f/7/1,
- depending on the base. This bug seems to have been introduced
- in rev.1.27.
-
- * sprintf.c (rb_f_sprintf): Use switch instead of a sequence of
- else-if's.
-
-Wed Jan 15 15:18:38 2003 moumar <moumar@netcourrier.com>
-
- * configure.in (ARCHFILE): set even unless --enable-shared on
- AIX. [ruby-talk:61466]
-
- * marshal.c (math.h): should be included after ruby.h on AIX.
- [ruby-talk:61366]
-
-Tue Jan 14 21:47:56 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_f_require): do not search adding .rb/.so suffixes if
- the suffix specified. [ruby-dev:18702]
- http://moonrock.jp/~don/d/200211.html#d08_t1
-
-Tue Jan 14 18:36:41 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_all): now works without block.
-
- * enum.c (enum_any): ditto.
-
-Tue Jan 14 01:21:32 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (next_argv): not always set binmode.
-
-Mon Jan 13 20:45:19 2003 Guy Decoux <ts@moulon.inra.fr>
-
- * parse.y (list_append): avoid O(n) search using node->nd_next->nd_end.
-
- * parse.y (list_concat): ditto.
-
- * eval.c (rb_eval): NODE_ARRY nd_end adoption.
-
-Mon Jan 13 02:22:11 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/dl/lib/dl/win32.rb: eliminate unnecessary "A" adding.
-
-Sun Jan 12 16:07:17 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (next_argv): inherit binmode from $defout.
-
-Sat Jan 11 22:50:47 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/dl/lib/dl/win32.rb: compatibility improvement.
-
-Sat Jan 11 01:44:16 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (RUBY_CHECK_IO_NEED): added more tests.
-
- * io.c (rb_io_check_readable): seek after synchronized write.
-
-Fri Jan 10 01:23:45 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): syntax
- classes are not allowed inside character classes.
- [ruby-talk:60996]
-
-Thu Jan 9 23:28:01 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in: AC_MSG_FAILURE is a new macro in 2.54b or later.
-
-Thu Jan 9 17:05:24 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (RUBY_CHECK_IO_NEED): check whether fseek() and
- fflush() are needed.
-
- * io.c (flush_before_seek): flush write stream only.
-
- * io.c (rb_io_check_readable): seek instead of flush if the last
- operation was write.
-
- * io.c (rb_io_check_writable): seek instead of flush if the last
- operation was read.
-
- * bcc32/Makefile.sub, win32/Makefile.sub: needs to seek between
- R/W.
-
-Thu Jan 9 16:31:51 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should not discard nested NODE_BLOCK.
-
-Thu Jan 9 15:12:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (stmt): NODE_NOT elimination for if/unless/while/until node.
-
- * parse.y (primary): ditto.
-
-Thu Jan 9 13:26:18 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * st.h, st.c: Back out the introduction of st_*_func_t. Some
- compilers complain about function type mismatch.
-
-Thu Jan 9 02:10:44 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): reduce recursive rb_eval() call by using sort
- of continuation passing style.
-
-Wed Jan 8 17:10:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/Win32API/lib/win32/registry.rb: added. [new]
-
-Wed Jan 8 15:54:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c: remove ruby_last_node and assignments seems to be
- unnecessary
-
- * intern.h: debug does not run if ID_ALLOCATOR is zero.
-
-Wed Jan 8 15:04:11 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_each): treat fixnums specially to boost.
-
- * numeric.c (num_step): remove rb_scan_args() for small speedup.
-
-Tue Jan 7 17:56:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (svalue_to_avalue): should return converted array.
-
-Tue Jan 7 07:48:01 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_f_local_variables): skip $_, $~ and flip states in
- dynamic variables. [ruby-core:00681]
-
-Tue Jan 7 02:46:29 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (env_clear): new Hash compatible method.
-
- * hash.c (env_shift, env_invert, env_replace, env_update): ditto.
-
-Mon Jan 6 23:36:29 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * st.h, st.c: Introduce new conventional typedef's, st_data_t,
- st_compare_func_t, st_hash_func_t and st_each_func_t.
-
- * st.h, st.c: Do explicit function declarations and do not rely on
- implicit declarations.
-
- * class.c, eval.c, gc.c, hash.c, marshal.c, parse.y, variable.c:
- Add proper casts to avoid warnings.
-
-Mon Jan 6 20:44:43 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * intern.h (rb_check_array_type): Declare rb_check_array_type().
-
- * ext/digest/md5/md5ossl.c: Include stdio.h for sprintf() and
- string.h for memcmp().
-
- * ext/dl/ptr.c: Include ctype.h for isdigit().
-
-Mon Jan 6 18:43:17 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c: improve DOSISH drive letter support.
-
-Mon Jan 6 18:31:45 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/fileutils.rb (ln): add ' -f' in the verbose message.
-
- * lib/fileutils.rb (cp_r): add 'p' in the verbose message.
-
-Mon Jan 6 16:44:52 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_join): dispatch based on "to_str".
-
- * array.c (rb_ary_times, rb_ary_equal): ditto.
-
-Mon Jan 6 13:26:35 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (proc_exec_v): follow to proc_spawn_v(). call do_aspawn()
- on Win32.
-
- * process.c (rb_proc_exec): call do_spawn() on Win32.
-
- * win32/win32.c, win32/win32.h (do_spawn, do_aspawn): add mode flag.
-
- * process.c (proc_spawn_v, rb_f_system): follow above change.
-
-Mon Jan 6 05:11:15 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/extmk.rb: make $0 normal variable.
-
-Mon Jan 6 02:32:46 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * struct.c (make_struct): needs meta class.
-
-Sun Jan 5 22:54:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/fileutils.rb (ln): `argv' is not a argument.
-
-Sun Jan 5 17:44:37 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/extmk.rb (extmake): set $0 temporarily while loading
- extconf.rb.
-
-Sun Jan 5 14:46:46 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * instruby.rb: need paren in regexp(make -n install).
-
- * ext/extmk.rb (sysquote): do not need to quote on mswin/bccwin/mingw.
-
- * ext/extmk.rb ($mflags): uniq items and remove '-' and '--'.
- move options to the lead.
-
- * lib/fileutils.rb (install): model on the real install
- command(message).
-
-Sun Jan 5 09:36:46 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ruby.c (ruby_init_loadpath): under Windows, get the module
- path from an internal address instead of hard coded library
- name.
-
- * cygwin/GNUmakefile.in, bcc32/Makefile.sub,
- win32/Makefile.sub (CPPFLAGS): removed LIBRUBY_SO macro.
-
- * bcc32/Makefile.sub, win32/Makefile.sub (config.h): no longer
- depends on makefiles.
-
-Sun Jan 5 04:17:05 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * gc.c (SET_STACK_END): Issue a FLUSH_REGISTER_WINDOWS here too.
- This fixes make test on FreeBSD/sparc64.
-
-Sun Jan 5 03:43:47 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * defines.h (FLUSH_REGISTER_WINDOWS): Make the flushw call an
- inline function so it can be used as an expression.
-
- * eval.c (EXEC_TAG, THREAD_SAVE_CONTEXT): Consistently call
- FLUSH_REGISTER_WINDOWS before calling setjmp(). (I suspect that
- every setjmp() implementation should take care of register
- windows, though)
-
-Sun Jan 5 03:12:32 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (utimbuf): use utimbuf instead of _utimbuf if defined _WIN32.
-
- * win32/Makefile.sub (LIBS): use oldnames.lib.
-
- * win32/win32.c (rb_w32_getcwd): follow above change.
-
- * win32/win32.h: ditto.
-
- * wince/direct.c, wince/direct.h (getcwd): ditto.
-
- * wince/io.h: ditto.
-
- * wince/string.c, wince/wince.h (stricmp, strnicmp): ditto.
-
-Sat Jan 4 15:18:50 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * process.c (rb_proc_exec): use same logic as DJGPP on win32 ports.
-
- * process.c (rb_f_system): ditto.
-
- * win32/win32.c, win32/win32.h (do_aspawn): [new]. for arrayed
- arguments.
-
- * win32/win32.c (CreateChild): add new argument for real filename of
- executing process.
-
- * win32/win32.c (NtHasRedirection, pipe_exec): follow above change.
-
-Sat Jan 4 14:29:52 2003 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * configure.in: set rb_cv_need_io_flush_between_seek=yes.
-
- * win32/Makefile.sub (config.h): define NEED_IO_FLUSH_BETWEE_SEEK.
- (pointed out by moriq [ruby-dev:19299])
-
-Sat Jan 4 03:12:14 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (umethod_bind): exact class match is not required. relax
- the restriction to subclasses.
-
-Sat Jan 4 01:33:40 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (rb_file_s_lchmod): get rid of gcc-3 -O3 warning.
-
-Fri Jan 3 22:26:07 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * process.c (rb_proc_times): need to initialize first.
-
-Fri Jan 3 01:10:17 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): call "inherited" before executing class body.
-
- * class.c (rb_define_class): call "inherited" after defining the
- constant.
-
- * class.c (rb_define_class_under): ditto.
-
-Thu Jan 2 19:37:30 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (massign): expand first element if RHS is an array and
- its size is 1, and LHS has concrete assignment target (i.e. LHS
- has target(s) other than *var).
-
- * eval.c (massign): avoid unnecessary avalue/svalue conversion.
-
- * eval.c (rb_yield_0): ditto
-
- * array.c (rb_ary_update): do not allocate unused array if rpl is
- nil (i.e. merely removing elements).
-
-Thu Jan 2 13:55:08 2003 Mathieu Bouchard <matju@sympatico.ca>
-
- * io.c (io_read): should resize supplied string if it's shorter
- than expected.
-
-Thu Jan 2 11:01:20 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (bmcall): arguments should be an array.
-
-Wed Jan 1 18:18:45 2003 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: better DJGPP support. add GNUmakefile.
-
- * djgpp/GNUmakefile: new.
-
-Wed Jan 1 04:16:18 2003 Akinori MUSHA <knu@iDaemons.org>
-
- * node.h (struct RNode): Change argc from int to long. Otherwise
- NEW_CFUNC() sets argc to a wrong value on platforms where
- sizeof(int) != sizeof(long) and the byte order is big-endian.
- This fixes breakage on FreeBSD/sparc64.
-
-Tue Dec 31 23:22:50 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (massign): removed awkward conversion between yvalue,
- mvalue, etc.
-
- * eval.c (rb_yield_0): new parameter added to tell whether val is
- an array value or not.
-
- * parse.y (yield_args): restructuring: new nodes: NODE_RESTARY2,
- NODE_SVALUE; removed node: NODE_RESTARGS.
-
-Tue Dec 31 21:13:51 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * Makefile.in, {win32,bcc32}/Makefile.sub: add new target:
- what-where, no-install.
-
- * mkconfig.rb: add const: CROSS_COMPILING.
-
- * ext/extmk.rb: no-install support. add MAKEDIRS macro.
-
- * lib/mkmf.rb: add !ifdef .. !endif for Borland make.
-
- * process.c: improve DJGPP support. system "ls", "-l".
-
-Tue Dec 31 20:16:37 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/socket/addrinfo.h (NI_MAXHOST): Define NI_MAXHOST and
- NI_MAXSERV only if they are not defined yet. This fixes build
- on such platforms as OpenBSD.
-
-Tue Dec 31 20:07:49 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/tcltklib/extconf.rb (find_tcl, find_tk): Look for both
- lib{tcl,tk}M.N and lib{tcl,tk}MN on all platforms. *BSD have
- Tcl/Tk libraries named this way.
-
-Tue Dec 31 19:48:21 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in: Improve OpenBSD support. [obtained from: OpenBSD
- ports]
-
- * dln.c (FUNCNAME_PATTERN): Ditto.
-
-Tue Dec 31 19:21:02 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * array.c (rb_ary_transpose): Properly declare ary as a VALUE.
-
- * file.c (rb_file_s_chmod): Do not directly cast an int to void *
- to avoid a warning.
-
- * defines.h (FLUSH_REGISTER_WINDOWS): Add support for
- FreeBSD/sparc64. miniruby still coredumps in a different place,
- though.
-
-Tue Dec 31 07:47:15 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (parse_string): readjusted.
-
- * parse.y (heredoc_identifier): readjusted.
-
- * parse.y (here_document): make EOL codes of single-quoted
- here-documents consistent.
-
- * parse.y (yylex): reduced unnecessary conditionals.
-
-Tue Dec 31 04:49:51 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ruby.1: mdoc'ify.
-
-Tue Dec 31 01:30:29 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * parse.y (yylex): do not accept " __END__\n". ([ruby-dev:19245])
-
-Mon Dec 30 21:10:59 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * parse.y (yylex): use strncmp instead of strcmp.
- accept "__END__\r\n". ([ruby-dev:19241])
-
-Mon Dec 30 20:32:14 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_mark_frame): should mark frame->node.
-
-Mon Dec 30 19:10:30 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/extmk.rb: split --make argument contains options, assume
- the first word of --make-flags is always options even unless
- preceded by -, and ignore letter-case of options if nmake.
-
- * instruby.rb: extract -n option also from --make and
- --make-flags.
-
- * bcc32/Makefile.sub, win32/Makefile.sub: not prepend - to
- $(MFLAGS)
-
-Mon Dec 30 16:44:14 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * string.c (rb_str_substr): should share the shared string if
- present, instead of the original string. (ruby-bugs:PR#528)
-
-Mon Dec 30 05:10:00 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/socket/socket.c (tcp_svr_init): local host to
- init_inetsock() is VALUE but not pointer.
-
- * ext/socket/socket.c (sock_s_unpack_sockaddr_in): get rid of
- gcc-3 -O3 warning.
-
-Sun Dec 29 23:45:53 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * gc.c (gc_sweep): adjust GC trigger.
-
- * dln.c (init_funcname_len): get rid of gcc-3 -O3 warning.
-
- * eval.c (copy_node_scope): ditto.
-
- * hash.c (rb_hash_foreach, delete_if_i, select_i, each_value_i,
- each_key_i, each_pair_i, envix): ditto.
-
- * range.c (range_each_func): ditto.
-
- * file.c (rb_file_s_chmod): ditto.
-
-Sun Dec 29 15:30:37 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_parseargs): should not inherit ftools.rb's
- misfeature.
-
-Sun Dec 29 05:08:13 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/fileutils.rb (cmp): return false if file size differs.
-
-Sat Dec 28 19:21:24 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * instruby.rb: remove junk args.
-
- * lib/mkmf.rb (create_makefile): remove a trouble library
- before making a shared library.
-
- * win32/Makefile.sub: invoke instruby.rb with the --make-flags option.
-
-Sat Dec 28 03:09:58 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/cgi.rb (CGI#[]): improvement. thanks to Kazuhiro NISHIYAMA
- <zn@mbf.nifty.com>
-
-Sat Dec 28 00:34:03 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * {win32,bcc32}/Makefile.sub: remove `=' from --make-flags options.
- nmake quotes args if included `=' in args.
-
- * instruby.rb: use getopts.rb.
-
- * ext/dbm/extconf.rb (-DDBM_HDR): substitute ' with " to avoid
- a error on Win32.
-
- * ext/gdbm/gdbm.c: add prototypes to avoid VC++ warnings.
-
-Fri Dec 27 21:41:57 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bcc32/setup.mak, win32/setup.mak(-prologue-): move srcdir from
- CPP input or UNC path will be removed as a comment.
-
-Fri Dec 27 17:55:00 2002 Takaaki Uematsu <mail@uema2.cjb.net>
-
- * wince/config, wince/configure.bat: replace 1.7 with 1.8
- in macros.
-
-Fri Dec 27 13:28:14 2002 Minero Aoki <aamine@loveruby.net>
-
- * instruby.rb: fileutils.rb accepts only one argument.
-
-Fri Dec 27 13:23:29 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb (fu_parseargs): reject illegal options
- correctly.
-
- * lib/fileutils.rb (uptodate?): parameter declaration was wrong.
-
- * lib/fileutils.rb: change coding styles.
-
-Fri Dec 27 09:25:22 2002 ABE Shigeru <shiger-a@nifty.com>
-
- * process.c (rb_proc_times): avoid WindowsXP crash using volatile
- variables.
-
-Fri Dec 27 02:56:58 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * instruby.rb: check only `-' option, and use fileutils instead of
- ftools.
-
-Fri Dec 27 02:45:17 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/net/telnet.rb: Telnet#print not add "\n".
-
- * lib/cgi.rb: cgi['key'] is equal cgi['key'][0]
-
-Thu Dec 26 22:33:18 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb (create_makefile): check only `-' option.
-
- * configure.in: cleanups for MinGW. remove -D__NO_ISOCEXT in $CFLAGS.
-
- * win32/win32.h: prototypes for isinf, isnan are not needed on MinGW.
-
-Thu Dec 26 19:22:00 2002 YOSHIDA Kazuhiro <moriq@moriq.com>
-
- * win32/setup.mak (-prologue-): moved srcdir macro definition.
- [ruby-win32:420].
-
-Wed Dec 25 18:26:44 2002 K.Kosako <kosako@sofnec.co.jp>
-
- * regex.c (re_match): fixed wrong \G behavior. (ruby-bugs-ja:PR#377)
-
-Wed Dec 25 16:41:16 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_match_exec): fix odd \G behavior based on the patch
- from Nobu.
-
-Wed Dec 25 11:05:11 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bcc32/setup.mak (-generic-): removed garbages.
-
-Wed Dec 25 10:36:20 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub, win32/Makefile.sub (RUBY_SO_NAME, config.h):
- use $(MAJOR) and $(MINOR). based on Nobu's patch. [ruby-win32:413]
-
- * bcc32/setup.mak, win32/setup.mak (-prologue-): define MAJOR, MINOR
- and TEENY from version.h. based on Nobu's patch. [ruby-win32:413]
-
- * win32/Makefile.sub (config.h): add HAVE_FLOAT_H.
-
- * win32/Makefile.sub (parse.obj): depend on win32/win32.h.
-
-Tue Dec 24 23:49:16 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/irb/completion.rb: Use Object#class rather than Object#type.
-
-Tue Dec 24 23:37:40 2002 TADA Tadashi <sho@spc.gr.jp>
-
- * lib/cgi.rb (Cookie::parse), lib/cgi-lib.rb (initialize): Do not
- pass to split() a bare string longer than 2 characters as
- separator.
-
-Tue Dec 24 19:19:24 2002 Tietew <tietew@tietew.net>
-
- * numeric.c (DBL_MAX_10_EXP): fix typo. [ruby-dev:19175]
-
-Tue Dec 24 17:02:46 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_undefined): use NoMethodError instead of fatal.
-
-Tue Dec 24 02:12:45 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/README: Synchronize with reality.
-
-Tue Dec 24 02:05:51 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * MANIFEST, lib/README, lib/ipaddr.rb: Add ipaddr.rb from rough.
-
-Sun Dec 22 04:07:47 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/dbm/dbm.c (fdbm_alloc): allocator takes only one argument.
-
-Sun Dec 22 02:49:25 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * array.c (ary_alloc), dir.c (dir_s_alloc), eval.c (thgroup_s_alloc),
- file.c (rb_stat_s_alloc), hash.c (hash_alloc), io.c (io_alloc),
- object.c (rb_module_s_alloc, rb_class_allocate_instance),
- re.c (match_alloc, rb_reg_s_alloc), string.c (str_alloc),
- time.c (time_s_alloc), ext/digest/digest.c (rb_digest_base_alloc),
- ext/tcltklib/tcltklib.c (ip_alloc),
- ext/win32ole/win32ole.c (fole_s_allocate, fev_s_allocate)
- : add prototype to get rid of VC++ warnings.
-
- * ext/sdbm/init.c (fsdbm_alloc): allocator takes only one argument.
-
-Sun Dec 22 00:36:43 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): accept pure ruby libraries.
-
-Sat Dec 21 23:59:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (ins_methods_i): should not show ID_ALLOCATOR.
-
- * class.c (ins_methods_prot_i): ditto.
-
- * class.c (ins_methods_priv_i): ditto.
-
- * class.c (ins_methods_pub_i): ditto.
-
- * eval.c (call_trace_func): ditto.
-
- * eval.c (rb_undefined): ditto.
-
-Sat Dec 21 07:27:24 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-parse-partial): keywords must not be
- preceded by @ or $.
-
-Fri Dec 20 20:29:04 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
- ext/dl/handle.c, ext/dl/ptr.c, ext/dl/sym.c, ext/gdbm/gdbm.c,
- ext/iconv/iconv.c, ext/sdbm/init.c, ext/stringio/stringio.c,
- ext/strscan/strscan.c, ext/tcltklib/tcltklib.c,
- ext/win32ole/win32ole.c: use rb_define_alloc_func().
-
-Fri Dec 20 18:29:04 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (rb_io_fwrite): separated from io_write().
-
- * marshal.c (w_byten): use rb_io_fwrite() to support non-blocking
- IO, and added error check.
-
- * rubyio.h: prototypes; rb_io_fwrite
-
-Fri Dec 20 17:40:59 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): should not remove Class#allocate.
-
- * lib/profiler.rb: separate profiling functions, without
- trace_func and at_exit setting.
-
-Fri Dec 20 16:20:04 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (do_block): split "do" block and tLBRACE_ARG block.
-
- * parse.y (cmd_brace_block): new tLBRACE_ARG block rule
-
- * parse.y (command): can take optional cmd_brace_block; use %prec
- to resolve shift/reduce conflict. (ruby-bugs-ja PR#372)
-
- * eval.c (ruby_finalize): trace_func should be cleared here (after
- executing exit procs and finalizers).
-
- * eval.c (rb_define_alloc_func): new allocation framework, based
- on Nobu's work [ruby-dev:19116]. "allocate" method is no longer
- used for object allocation.
-
-Fri Dec 20 05:06:49 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/README, lib/cgi/ftplib.rb, lib/telnet.rb: Delete ftplib.rb
- and telnet.rb. It has been quite some time sinc they were
- obsoleted and made to emit warnings.
-
-Fri Dec 20 04:58:22 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/tempfile.rb: Embed Rdoc style comments.
-
- * lib/tempfile.rb: Add length as an alias for size.
-
-Fri Dec 20 03:57:32 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/tempfile.rb: Add Tempfile#close!() as a shorthand for
- Tempfile#close(true).
-
- * lib/tempfile.rb: Add Tempfile#{unlink,delete}().
-
-Fri Dec 20 03:53:01 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/README, lib/cgi/final.rb, lib/cgi/session.rb: Delete
- final.rb, which was obsoleted long ago.
-
-Fri Dec 20 00:16:06 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * re.c (rb_reg_match_pre, rb_reg_match_post, match_to_a,
- match_select): return instances of same class as the original
- string. [ruby-dev:19119]
-
-Thu Dec 19 22:55:49 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * numeric.c (DBL_EPSILON): fix typo.
-
-Thu Dec 19 22:35:20 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (assign): avoid [BUG] at multiple attribute assignment.
-
-Thu Dec 19 01:00:09 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_step): use DBL_EPSILON.
-
- * array.c (rb_check_array_type): new function: return an array
- (convert if possible), or nil.
-
- * string.c (rb_check_string_type): new function: return a string
- (convert if possible), or nil.
-
- * numeric.c (rb_dbl_cmp): returns nil if values are not
- comparable.
-
- * numeric.c (fix_cmp,flo_cmp): use rb_num_coerce_cmp()
-
- * bignum.c (rb_big_cmp): ditto.
-
- * numeric.c (rb_num_coerce_cmp): new coercing function for "<=>",
- which does not raise TypeError.
-
- * numeric.c (do_coerce): can be suppress exception now.
-
- * object.c (rb_mod_cmp): should return nil for non class/module
- objects.
-
-Thu Dec 19 04:21:10 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/open-uri.rb: add a missing ||. (found by: ruby -wc)
-
-Wed Dec 18 17:53:05 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_eqq): return false if the argument is not a
- string. now returns boolean value.
-
- * class.c (rb_include_module): argument should be T_MODULE, not
- T_class, nor T_ICLASS.
-
-Wed Dec 18 03:52:55 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * string.c (rb_str_new4): handle tail shared string.
- (ruby-bugs-ja:PR#370)
-
- * string.c (rb_str_dup_frozen): ditto.
-
-Tue Dec 17 21:08:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * node.h (NODE_ATTRASGN): new node, assignment to attribute.
- [ruby-core:00637].
-
- * eval.c (is_defined, rb_eval): ditto.
-
- * parse.y (attrset, node_assign): ditto.
-
- * string.c (rb_str_substr): tail sharing. [ruby-core:00650]
-
- * re.c (rb_reg_nth_match): ditto.
-
-Tue Dec 17 16:52:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): "defined?" should return "assignment" for
- attribute assignment (e.g. a.foo=b) and indexed assignment
- (e.g. a[2] = 44).
-
- * parse.y (aryset): use NODE_ATTRASGN.
-
-Tue Dec 17 04:03:45 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/open-uri.rb: new file.
-
-Tue Dec 17 00:28:19 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * file.c (utimbuf): need to define for VC++.
-
-Mon Dec 16 15:53:20 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (nextc): get rid of overrun. (pointed out by akr
- [ruby-list:36773])
-
-Sun Dec 15 21:16:44 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (init_mkmf): add $(topdir) to $LIBPATH if $extmk.
- remove adding $(archdir) to $LIBPATH.
-
-Sat Dec 15 12:15:00 2002 Takaaki Uematsu <mail@uema2.cjb.net>
-
- * configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
- eval.c, file.c, hash.c, io.c, main.c, missing.c,
- process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
- bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
- ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
- ext/socket/getnameinfo.c, ext/socket/socket.c,
- ext/tcltklib/stubs.c
- : replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
- * wince/exe.mak : delete \r at the end of lines.
- * wince/mswince-ruby17.def : delete rb_obj_become
-
-Sun Dec 15 11:43:26 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (dispose_string): dispose String object.
-
- * parse.y (heredoc_restore, here_document): fix memory leak.
-
-Sat Dec 14 14:25:00 2002 Takaaki Uematsu <mail@uema2.cjb.net>
-
- * wince/sys : add stat.c, stat.h, timeb.c, timeb.h,
- types.h, utime.c, utime.h
- * wince/dll.mak : object file name changed.
- * wince/io.c : add empty dup2().
- * wince/io.h : add dup2 definition.
-
-Sat Dec 14 01:51:29 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/dbm/extconf.rb (rb_check): support for GNU dbm 1.8.3.
- (-with-dbm-type=gdbm_compat). link against -lgdbm_compat
- and -lgdbm.
-
-Fri Dec 13 23:42:16 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/dbm/extconf.rb (db_check): check existence of the function
- in the specified library before checking it in libc.
-
-Fri Dec 13 17:15:49 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (generic_ivar_get): should always warn uninitialized
- instance variables.
-
-Fri Dec 13 12:33:22 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (expr): rescue clause was ignored.
-
-Thu Dec 12 18:19:14 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (RUBY_PROG_GNU_LD): add $CFLAGS, $CPPFLAGS, $LDFLAGS
- to the option of $CC.
-
- * configure.in: set LIBRUBYARG to '-l$(RUBY_SO_NAME)' if the
- target os is cygwin and --disable-shared option is supplied.
-
- * lib/mkmf.rb (init_mkmf): expand config["LIBRUBY"] and
- config["LIBRUBY_A"]. don't link $LIBRUBYARG_STATIC if
- --disable-shared option is supplied.
-
- * configure.in (RUBY_CPPOUTFILE): should be a better message.
-
- * ext/Win32API/extconf.rb: join with a space.
-
-Thu Dec 12 17:27:19 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_hash): define Regexp#hash to make regexps to be
- hash keys.
-
- * re.c (Init_Regexp): define Regexp#eql? (alias to Regexp#==).
-
-Thu Dec 12 16:26:31 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c (r_object0): singleton class instance can't be loaded.
- (ruby-bugs-ja:PR#366)
-
-Wed Dec 11 23:35:43 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb (create_makefile): -no-undefined -> --no-undefined.
-
-Wed Dec 11 17:54:59 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_read): takes optional second argument to specify a
- string to be written. the string should not be frozen.
-
- * io.c (rb_io_sysread): ditto.
-
-Wed Dec 11 11:30:28 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/digest/digest.c (rb_digest_base_copy): renamed "become".
-
- * ext/stringio/stringio.c (strio_copy): ditto.
-
-Wed Dec 11 00:45:00 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/getoptlong.rb (GetoptLong::Error): provide a common ancestor
- for GetoptLong error classes (RCR#129).
-
-Tue Dec 10 17:42:39 2002 K.Kosako <kosako@sofnec.co.jp>
-
- * re.c (rb_reg_copy_object): fixed memory leak.
-
-Tue Dec 10 17:30:35 2002 Tanaka Akira <akr@m17n.org>
-
- * pack.c (utf8_limits): fix the limit of 4 bytes UTF-8 sequence.
-
-Tue Dec 10 12:01:15 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (mnew): original class of method defined in module should
- be the module not intermediate class. [ruby-dev:19040]
-
-Tue Dec 10 01:16:52 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): preceding ".." for negative numbers
- still left; removed.
-
- * sprintf.c (rb_f_sprintf): should not prepend '0' if width > prec
- for example "%5.3d".
-
-Sat Dec 7 18:14:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (Init_process): add Process.exit and Process.abort
-
- * pack.c (utf8_to_uv): raise ArgumentError for malformed/redundant
- UTF-8 sequences.
-
-Fri Dec 6 03:46:00 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (last_status_set): add pid attribute to Process::Status.
-
-Wed Dec 4 17:31:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (uv_to_utf8): limit maximum length of the encoded string
- to 6 bytes, even when the platform supports 8 bytes long integers.
-
- * pack.c (utf8_to_uv): do not decode sequences longer than 6 bytes.
-
- * object.c (copy_object): use "copy_object" method, not "become".
-
-Wed Dec 4 16:37:11 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (copy_object): copy finalizers as well if any.
-
- * gc.c (rb_gc_copy_finalizer): new function to copy finalizers.
-
-Tue Dec 3 01:13:41 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (PP.singleline_pp): new method.
-
-Sun Dec 1 23:04:03 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb (OptionParser::new): same as OptionParser#on but
- returns new OptionParser::switch.
-
-Sun Dec 1 22:43:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (rb_w32_stat): empty path is invalid, and return
- ENOENT rather than EBADF in such case. [ruby-talk:57177]
-
-Fri Nov 29 18:01:48 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (utf8_to_uv): added checks for malformed or redundant
- UTF-8 sequences.
-
-Thu Nov 28 12:08:30 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb: Avoid the use of "clean::" in favor of "clean:" in
- order not to let make(1) choke if there is another dependency on
- the target added in a depend file.
-
-Thu Nov 28 02:40:42 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb: Make sure to dig the destination directory before
- installing a file there. Formerly "make install" could fail
- depending on make(1)'s mood of the moment, especially when -jN
- is given.
-
-Wed Nov 27 17:39:38 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syslog/syslog.c: Cut redundancy.
-
- * ext/syslog/syslog.c: Do not leak ident.
-
-Wed Nov 27 17:25:29 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syslog/syslog.c, ext/syslog/test.rb: Syslog.close should
- raise RuntimeError when not opened.
-
- * ext/syslog/syslog.c, ext/syslog/test.rb:
- Syslog.{ident,options,facility,mask} should all return nil when
- not opened.
-
- * ext/syslog/syslog.c, ext/syslog/test.rb: Change back the output
- format of inspect().
-
-Wed Nov 27 16:25:43 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/test.rb: Switch from RUnit to Test::Unit.
-
-Wed Nov 27 16:14:12 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syslog/syslog.c: Fix a problem where Syslog.ident was not
- marked and could thus be GC'd.
-
-Wed Nov 27 16:11:53 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syslog/test.rb: Switch from RUnit to Test::Unit.
-
- * ext/syslog/test.rb: The output format of inspect() is slightly
- altered.
-
-Wed Nov 27 06:43:26 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * error.c (exit_initialize): add SystemExit#initialize to set
- instance variable status. (ruby-bugs-ja:PR#362)
- Now accepts status as optional first argument.
-
- * eval.c (error_handle): now SystemExit have status always.
-
- * eval.c (system_exit): just instantiate SystemExit without raise.
-
- * eval.c (rb_thread_start_0): initialize SystemExit properly.
-
-Tue Nov 26 10:17:04 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dln.c (init_funcname_len): remove MAXPATHLEN dependency.
-
-Mon Nov 25 19:55:38 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb (extmake): return true if not dynamic and not static.
-
-Mon Nov 25 01:08:40 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dln.c: revert and add the MAXPATHLEN definition on mswin32/mingw32.
-
-Sun Nov 24 20:36:53 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dln.c: move the MAXPATHLEN definition in front.
-
-Fri Nov 22 22:55:01 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (rb_f_sprintf): preceding ".." for negative
- hexadecimal numbers should not appear if prec (e.g. %.4) is
- specified.
-
- * pack.c (NUM2I32): support platforms which does not have 32bit
- integers (e.g. Cray).
-
-Fri Nov 22 19:20:36 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * instruby.rb: Install batch files on Windows. [Submitted by usa]
-
-Fri Nov 22 18:31:46 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_add_method): node may be NULL.
-
-Thu Nov 21 20:53:06 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: changes coding style.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/protocol.rb: ditto.
-
-Thu Nov 21 20:17:08 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: changes coding style.
-
-Thu Nov 21 20:04:06 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: should not overwrite Host: header.
- (This patch is contributed by sean@ruby-lang.org)
-
-Thu Nov 21 20:01:33 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: support Proxy-Authorization.
- (This patch is contributed by Alexander Bokovoy)
-
-Thu Nov 21 11:03:39 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_find_file_ext): should not terminate searching with
- empty path, just ignore.
-
- * dir.c: remove <sys/parm.h> inclusion.
-
-Wed Nov 20 02:07:12 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * compar.c (cmp_eq,cmp_gt,cmp_ge,cmp_lt,cmp_le): check using
- rb_cmpint().
-
- * error.c (init_syserr): remove sys_nerr dependency.
-
-Wed Nov 20 01:52:21 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_cmp): added to satisfy Comparable assumption.
-
- * eval.c (rb_add_method): "initialize" should be public if it is a
- singleton method.
-
-Tue Nov 19 22:37:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_match): avoid dereferencing if size == 0.
- (ruby-bugs-ja:PR#360)
-
-Tue Nov 19 20:40:39 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_cmp): should return nil if an operand is not a
- number nor time. (ruby-bugs-ja:PR#359)
-
- * file.c (rb_stat_cmp): should return nil if an operand is not
- File::Stat.
-
-Tue Nov 19 14:35:09 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_zip): iterates over items in the receiver.
- zipped with nil if argument arrays are shorter. if arrays are
- longer, left items are ignored. now works with blocks.
-
- * enum.c (zip_i): changed for new behavior.
-
- * array.c (rb_ary_transpose): added. [new]
-
-Tue Nov 19 05:12:21 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * instruby.rb: Do not install various working files under bin/.
-
-Tue Nov 19 05:07:39 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * instruby.rb: not rewrite installed scripts when dry-run mode.
-
- * lib/ostruct.rb (OpenStruct::initialize): should symbolize keys
- instead of values.
-
-Tue Nov 19 02:24:10 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * instruby.rb: Rewrite installed scripts' shebang lines.
-
- * instruby.rb: Use File.join() where appropriate.
-
-Tue Nov 19 01:53:35 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * bin/irb: Moved from sample/irb.rb.
-
- * instruby.rb: Install script files under bin/ with ruby's program
- prefix and suffix.
-
-Mon Nov 18 02:13:36 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/tempfile.rb: Make this library thread safe.
-
- * lib/tempfile.rb: Do not pick a name which was once used and is
- still scheduled for removal.
-
- * lib/tempfile.rb: A lock file need not and must not be scheduled
- for removal.
-
- * lib/tempfile.rb: Compare Max_try with the number of mkdir
- failures instead of the suffix counter.
-
- * lib/tempfile.rb: Overall cleanup and add some important notices.
-
-Sun Nov 17 22:57:31 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (dsym): garbage returned. (ruby-bugs-ja:PR#358)
-
-Fri Nov 15 07:40:08 2002 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
-
- * observer.rb: raise NoMethodError instead of NameError.
- [ruby-dev:18788]
-
- * ostruct.rb: ditto. fix a bug in inspect which called String#+ with
- Symbol. [ruby-dev:18788]
-
- * profile.rb: illegal use of Array#sort!. replaced it with non-bang
- method. [ruby-dev:18792]
-
-Thu Nov 14 22:40:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (LIBRUBY_A): append -static. [ruby-dev:18689]
-
- * configure.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): linker
- argument to link static/shared library respectively.
-
- * Makefile.in (LIBRUBYARG_STATIC, LIBRUBYARG_SHARED): added.
-
- * bcc32/Makefile.sub, win32/Makefile.sub: ditto.
-
- * instruby.rb (LIBRUBY_A): install to libdir.
-
- * lib/mkmf.rb (link_command): link static library of ruby, or
- try_run fails unless LIBRUBY_SO is installed. [ruby-dev:18646]
-
- * eval.c (call_trace_func): toplevel caller was missing.
- [ruby-dev:18754]
-
- * eval.c (proc_to_s): adjust created line number.
-
- * parse.y (primary, do_block, brace_block): adjust line number of
- block to beginning line, instead of the first statement inside
- the block.
-
-Thu Nov 14 08:23:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (math_acos): check errno after operation. ditto for
- asin, acosh, atanh, log, log10 and sqrt.
-
- * eval.c (rb_add_method): initialize should always be private.
-
- * parse.y (expr): add rescue modifier rule.
-
- * parse.y (command_call): return, break and next with argument is
- now part of this rule.
-
-Wed Nov 13 16:22:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (DLDFLAGS): removed -Wl,-no-undefined to
- ext/extmk.rb, in order to allow references to symbols in other
- extension libraries for mkmf.rb. [ruby-dev:18724]
-
- * ext/extmk.rb (extmake): ditto.
-
- * ext/extmk.rb (extmake): exit when make failed.
-
-Sun Nov 10 03:46:18 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: retire contain?() and add superset?(),
- proper_superset?() subset?(), and proper_subset?().
- [obtained from: Jason Voegele's set.rb]
-
- * lib/set.rb: define several aliases: union() for |(),
- difference() for -(), and intersection() for &().
- [obtained from: Jason Voegele's set.rb]
-
- * lib/set.rb: deal with a s/id/object_id/ leftover.
-
-Sat Nov 9 16:06:57 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/tcltklib/stubs.c: should include "util.h" for ruby_strdup.
-
-Sat Nov 9 11:39:45 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c: remove ENABLE_TRACE/DISABLE_TRACE to trace child nodes of
- c-call. [ruby-dev:18699]
-
-Fri Nov 8 04:16:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): "a" in "a /5" should be considered as a local
- variable. [experimental]
-
-Thu Nov 7 09:51:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_yield_0): should enable trace for non-cfunc nodes.
- [ruby-dev:18645]
-
- * eval.c (blk_orphan): a block created in a different thread is
- orphan. [ruby-dev:17471]
-
-Wed Nov 6 16:57:06 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_define_method): do not set NOEX_CFUNC if klass is
- really a module, whose methods must be safe for reciever's type.
-
- * eval.c (rb_eval): nosuper should not be inherited unless the
- overwritten method is an undef placeholder.
-
-Tue Nov 5 00:46:04 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb: Properly pass the given target to
- make(1). [pointed out by eban]
-
-Mon Nov 4 20:03:53 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * instruby.rb, lib/mkmf.rb: use CONFIG["ENABLE_SHARED"] instead of
- checking whether CONFIG["configure-args"] includes "--enable-shared".
-
-Mon Nov 4 16:49:14 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): allow 'when'-less case statement; persuaded
- by Sean Chittenden.
-
-Mon Nov 4 06:28:09 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * Makefile.in, ext/extmk.rb, bcc32/Makefile.sub,
- win32/Makefile.sub: Introduce better command line syntax
- (--make/--make-flags/--extstatic) to extmk.rb and instruby.rb.
- Previously such command as 'make -j3 install' with pmake doesn't
- fail. Formerly extmk.rb was receiving "make -j 3 -j 3" via the
- command line arguments and just ended up recognizing the first
- "3" as destdir. [with help of usa]
-
-Mon Nov 4 03:59:51 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/getopts.rb: Do not choke on characters that cannot be used
- in a variable name. Replace them with `_'. Define a hash named
- $OPT for convenience.
-
-Sat Nov 2 00:38:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): added Object#object_id, new name for
- Object#id. [new]
-
- * object.c (rb_obj_id_obsolete): give warning for Object#id.
-
- * numeric.c (fix_intern): added Fixnum#to_sym. [new]
-
- * object.c (sym_to_sym): rename from Symbol#intern
-
-Fri Nov 1 14:21:06 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_zip): added Enumerable#zip. [new]
-
- * array.c (rb_ary_zip): added Array#zip.
-
-Thu Oct 31 20:10:18 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (init_syserr): remove sys_nerr dependency.
-
-Thu Oct 31 09:31:51 2002 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (rb_export_method): undef'ed method visibility should not
- be changed.
-
-Wed Oct 30 17:00:47 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_public_method_defined, etc.): new methods:
- public_method_defined?, private_method_defined?,
- protected_method_defined?
-
- * object.c (rb_obj_public_methods): new method
- Object#public_methods.
-
- * class.c (ins_methods_i): Object#methods should list both public
- and protected methods.
-
- * class.c (rb_class_public_instance_methods): new method
- Module#public_instance_methods.
-
-Wed Oct 30 06:29:00 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * eval.c, file.c, gc.c, io.c, object.c, ruby.c, ruby.h, struct.c,
- ext/socket/socket.c: differentiate long and int; use proper
- printf type specifiers and do casts where appropriate.
-
-Wed Oct 30 04:07:33 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (error_print, rb_longjmp, rb_thread_schedule): flush
- error message. [ruby-dev:18582]
-
- * eval.c (ruby_cleanup): added. just clean up without exit.
- [ruby-dev:18582]
-
- * eval.c (ruby_exec): added. execute main evaluation tree without
- exit. [ruby-dev:18582]
-
- * intern.h: prototypes; ruby_cleanup, ruby_exec
-
-Tue Oct 29 02:00:08 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/extmk.rb (extmake): use dummy_makefile to create dummy
- Makefile.
-
- * lib/mkmf.rb (find_executable0): EXEEXT is optional.
-
- * lib/mkmf.rb (dummy_makefile): make dummy Makefile content.
-
- * lib/mkmf.rb (create_makefile): define EXTLIB replacing -l.
-
- * lib/mkmf.rb ($bccwin): detect Borland make by help message.
-
- * lib/mkmf.rb (CLEANINGS): common rules to clean.
-
-Mon Oct 28 01:27:17 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * djgpp/config.sed (@program_transform_name@): use `%', not `,'.
-
-Sun Oct 27 22:59:50 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * ext/extmk.rb(78) : The unnecessary error when installing by bccwin32
- is controlled.
-
- * lib/mkmf.rb(773) : Also in the case of bccwin32, the path was added.
-
-Sun Oct 27 17:07:25 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * djgpp/*: sync with the latest.
-
- * ext/extmk.rb, lib/mkmf.rb: flush $stdout.
-
- * io.c (READ_DATA_PENDING_COUNT, READ_DATA_PENDING_PTR):
- undef these macros on DJGPP.
-
-Sat Oct 26 10:11:47 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * node.h (nd_type): cast the value to int.
-
-Sat Oct 26 04:27:35 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dbm/dbm.c (fdbm_indexes, fdbm_select): add a missing
- argument and prevent coredump when a nonexistent key is
- specified.
-
- * ext/sdbm/init.c (fsdbm_indexes, fsdbm_select): ditto.
-
-Sat Oct 26 03:28:43 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * eval.c, gc.c: use a common set of alloca() #ifdef's. This fixes
- the build with Intel C Compiler for Linux.
-
- * eval.c (rb_f_require): declare old_func with a real type, not
- just type modifiers.
-
-Fri Oct 25 02:55:01 2002 Minero Aoki <aamine@loveruby.net>
-
- * string.c (rb_str_split_m): RSTRING(str)->ptr might become NULL.
- [ruby-dev:18581]
-
-Thu Oct 24 21:57:02 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (LIBPATHFLAG): avoid $ substitution.
- [ruby-dev:18577]
-
- * ext/extmk.rb (extmake): expand $srcdir.
-
- * ext/win32ole/extconf.rb: should not override $CFLAGS, but
- append.
-
- * lib/mkmf.rb (config_string): use given config hash.
-
- * bcc32/Makefile.sub (.rc.res): directory part may be empty in
- Borland make.
-
-Thu Oct 24 03:38:07 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb (create_makefile): site-install target for backward
- compatibility.
-
- * lib/mkmf.rb (init_mkmf): libdir prior to topdir.
-
- * configure.in (LIBPATHFLAG): should escape $. [ruby-dev:18572]
-
- * mkconfig.rb: never substitute escaped $$.
-
- * instruby.rb: not install LIBRUBY_SO unless enable-shared.
- [ruby-dev:18569]
-
-Wed Oct 23 19:16:06 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): added NODE_DSYM, symbol literal with
- interpolation.
-
- * node.h: ditto.
-
- * intern.h: prototypes; rb_is_junk_id, rb_str_dump, rb_str_intern
-
- * object.c (sym_inspect): escape and quote for non-alphanumeric
- symbols.
-
- * parse.y (dsym, tokadd_string, yylex): extended symbol literals.
-
- * parse.y (rb_is_junk_id): added.
-
- * string.c (rb_str_dump, rb_str_intern) : make extern.
-
- * lib/mkmf.rb (create_makefile): deffile should be removed by
- distclean, not clean.
-
-Tue Oct 22 23:56:41 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (init_mkmf): add dir_config("opt").
-
-Tue Oct 22 19:44:03 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * bcc32/configure.bat : The command line when calling setup.mak is
- corrected.
-
- * bcc32/readme.bcc32 : It follows up about the option of configure.bat.
-
-Tue Oct 22 15:23:19 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * instruby.rb: add dryrun mode.
-
- * ext/extmk.rb (extmake): add install: target to dummy Makefile.
-
- * ext/extmk.rb (extmake): avoid Borland make's quirk behavior.
-
- * lib/mkmf.rb (link_command): opt is not a makefile macro.
-
- * bcc32/Makefile.sub ($(LIBRUBY_SO) $(LIBRUBY)): EXTOBJS were not
- linked.
-
- * bcc32/Makefile.sub (ext/extinit.obj): missing.
-
- * bcc32/Makefile.sub (TRY_LINK): options have to place before any
- non-option arguments.
-
- * win32/Makefile.sub (TRY_LINK): need -link and -libpath options.
-
- * bcc32/Makefile.sub, win32/Makefile.sub (RANLIB): logical
- operator never work with command.com.
-
-Tue Oct 22 00:59:59 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (RUBY_CPPOUTFILE): fix cache file bug.
-
- * lib/mkmf.rb (link_command): put 'opt' after conftest.c for
- static linking.
-
-Mon Oct 21 22:53:02 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (XCFLAGS): CFLAGS to compile ruby itself.
-
- * configure.in (LIBEXT): suffix for static libraries.
-
- * configure.in (LIBPATHFLAG): switch template to specify library
- path.
-
- * configure.in (LINK_SO): command to link shared objects.
-
- * configure.in (DEFFILE, ARCHFILE): miscellaneous system dependent
- files.
-
- * configure.in (EXPORT_PREFIX): prefix to exported symbols on
- Windows.
-
- * configure.in (COMMON_LIBS, COMMON_MACROS, COMMON_HEADERS):
- libraries, macros and headers used in common.
-
- * configure.in (RUBYW_INSTALL_NAME, rubyw_install_name): GUI mode
- executable name.
-
- * Makefile.in (CFLAGS): append XCFLAGS.
-
- * Makefile.in (PREP): miscellaneous system dependent files.
-
- * Makefile.in (ruby.imp, ext/extinit.o): moved from ext/extmk.rb.
-
- * Makefile.in (fake.rb): CROSS_COMPILING keeps building platform.
-
- * Makefile.in (MAKEFILES): depend on *.in and config.status.
-
- * Makefile.in (parse.c): replace "y.tab.c" with actual name for
- byacc.
-
- * ext/extmk.rb, lib/mkmf.rb: integrated.
-
- * ext/extmk.rb: propagate MFLAGS.
-
- * ext/extmk.rb (extmake): make dummy Makefile to clean even if no
- Makefile is made.
-
- * lib/mkmf.rb (older): accept multiple file names and Time
- objects.
-
- * lib/mkmf.rb (xsystem): split and quote.
-
- * lib/mkmf.rb (cpp_include): make include directives.
-
- * lib/mkmf.rb (try_func): try whether specified function is
- available.
-
- * lib/mkmf.rb (install_files): default to site-install.
-
- * lib/mkmf.rb (checking_for): added.
-
- * lib/mkmf.rb (find_executable0): just find executable file with
- no message.
-
- * lib/mkmf.rb (create_header): output header file is variable.
-
- * lib/mkmf.rb (create_makefile): separate sections.
-
- * lib/mkmf.rb (init_mkmf): initialize global variables.
-
- * win32/Makefile.sub, bcc32/Makefile.sub (CPP, AR): added.
-
- * bcc32/Makefile.sub (ARCH): fixed to i386.
-
- * win32/Makefile.sub, bcc32/Makefile.sub (miniruby): should not
- link EXTOBJS.
-
- * ext/dl/extconf.rb: use try_cpp to cross compile.
-
- * ext/dl/extconf.rb: not modify files in source directory.
-
-Fri Oct 18 23:11:21 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (value_expr0): allow return/break/next/redo/retry in rhs
- of logical operator. [ruby-dev:18534]
-
- * parse.y (remove_begin): eliminate useless NODE_BEGIN.
- [ruby-dev:18535]
-
-Fri Oct 18 01:02:44 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * hash.c, eval.c: Use (*_NSGetEnviron()) instead of environ on
- Darwin for namespace cleanness. [ruby-core:00537]
-
- * dln.c (dln_load): Fix Darwin support that has been disabled and
- switch to using it on Darwin instead of the system dlopen().
- [ruby-core:00541]
-
-Thu Oct 17 19:17:56 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c (w_byten): added; write n bytes from s to arg.
-
- * marshal.c (dump): flush buffered data.
-
- * marshal.c (marshal_dump, r_byte, r_bytes0, marshal_load): unify
- marshaling I/O. [ruby-talk:53368]
-
-Thu Oct 17 12:58:24 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: stat.blksize might be 0/nil.
-
- * lib/fileutils.rb: change coding style.
-
-Wed Oct 16 22:35:53 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * sprintf.c (rb_f_sprintf): disallow mixed usage of numbered and
- unnumbered arguments. [ruby-dev:18531]
- get rid of memory leak at exception. [ruby-core:00460]
-
-Wed Oct 16 13:36:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * variable.c (rb_global_entry): not add global entry until
- initialized to avoid accessing it while GC. [ruby-dev:18514]
-
- * variable.c (rb_alias_variable): ditto.
-
-Wed Oct 16 01:03:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_str_to_dbl): RString ptr might be NULL.
-
- * object.c (rb_cstr_to_dbl): p pointer might be NULL.
-
- * bignum.c (rb_str_to_inum): RString ptr might be NULL.
-
- * bignum.c (rb_cstr_to_inum): str pointer might be NULL.
-
-Sat Oct 12 23:44:11 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (rb_w32_putc): wrong condition to fill or flush on
- bccwin32. [ruby-win32:408]
-
-Fri Oct 11 15:58:06 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): rescue modifier is now an operator with
- precedence right below assignments. i.e. "a = b rescue c" now
- parsed as "a = (b rescue c)", not as "(a = b) rescue c". [new]
- [experimental]
-
-Fri Oct 11 06:05:30 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (rb_w32_fclose, rb_w32_close): use closesocket()
- for socket. [ruby-win32:382]
-
- * win32/win32.c (StartSockets): set NtSocketsInitialized.
-
- * win32/win32.h: prototypes; rb_w32_fclose, rb_w32_close
-
-Fri Oct 11 00:24:57 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * gc.c (ruby_xmalloc, ruby_xrealloc): restrict total allocation
- size according to memories consumed by live objects.
- [ruby-dev:18482]
-
- * gc.c (gc_sweep): estimate how live objects consume memories.
-
-Thu Oct 10 17:26:12 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/tcltklib/stubs.c (ruby_tcltk_stubs): fix memory leak.
- [ruby-dev:18478]
-
-Thu Oct 10 15:20:18 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/weakref.rb (WeakRef::@@final): use Hash#delete.
-
- * lib/weakref.rb (WeakRef::__getobj__): examine if alive or not by
- ID_REV_MAP to deal with recycled object. [ruby-dev:18472]
-
- * lib/weakref.rb (WeakRef::weakref_alive?): ditto.
-
-Wed Oct 9 07:11:25 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * gc.c (gc_sweep): also adjust heaps_limits when free unused heap
- page. [ruby-core:00526]
-
- * io.c (io_fflush): condition to retry can occur.
-
- * io.c (io_write): returned 0 wrongly if no error occurred.
-
-Tue Oct 8 14:19:07 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (io_write): must check returned value from fwrite() before
- test with ferror(). (ruby-bugs-ja:PR#350)
-
-Tue Oct 8 10:55:23 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/prettyprint.rb (PrettyPrint.singleline_format): new method.
-
-Mon Oct 7 16:43:07 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivrem): bignum zero's len should not be 0.
-
-Mon Oct 7 15:36:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivmod): wrong condition check for Bignum zero.
-
- * bignum.c (Init_Bignum): need to add Bignum#div.
-
-Sun Oct 6 00:49:15 2002 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (rb_load): should not pass blocks to the loaded file.
- [ruby-dev:18458]
-
-Fri Oct 4 20:25:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_interrupt, rb_thread_signal_raise): no need to
- save dead thread context. (same as [ruby-dev:18322])
- (ruby-bugs-ja:PR#349)
-
-Fri Oct 4 13:05:58 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (RUBY_PROG_GNU_LD): check whether the linker is GNU ld.
-
- * ext/extmk.rb (create_makefile): add -Wl,-no-undefined to $DLDFLAGS
- on Linux if GNU ld is used and --enable-shared is specified.
-
-Fri Oct 4 02:21:16 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_rshift): num should be initialized by carry
- bits if x is negative.
-
- * bignum.c (bigdivmod): len for bignum zero is 1, not 0.
-
-Thu Oct 3 20:22:11 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bcc32/mkexports.rb: to work on cygwin via telnet.
- [ruby-win32:358]
-
- * ext/tcltklib/tcltklib.c (ip_invoke): requires command name
- argument. [ruby-dev:18438]
-
- * eval.c (ruby_init, ruby_options): Init_stack() with local
- location. (ruby-bugs-ja:PR#277)
-
- * eval.c (rb_call0): disable trace call. [ruby-dev:18074]
-
- * eval.c (eval, rb_load): enable trace call. [ruby-dev:18074]
-
- * eval.c (rb_f_require): set source file name for extension
- libraries. [ruby-dev:18445]
-
- * gc.c (Init_stack): prefer address of argument rather than local
- variable to initialize rb_gc_stack_start.
-
- * ruby.c (translate_char): translate a character in a string;
- DOSISH only. [ruby-dev:18274]
-
- * ruby.c (ruby_init_loadpath): added argv[0] handling under
- Human68K. [ruby-dev:18274]
-
- * ruby.c (proc_options): translate directory separator in $0 to
- '/'. [ruby-dev:18274]
-
-Thu Oct 3 00:27:26 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/delegate.rb (Delegator::initialize): use Object#class
- instead of deprecated Object#type.
-
-Wed Oct 2 23:32:48 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * configure.in (RUBY_CHECK_IO_NEED_FLUSH): check whether fflush()
- is needed.
-
- * io.c (flush_before_seek): flush before seek if buffered data
- may remain.
-
- * io.c (rb_io_check_readable): flush if the last operation was
- write.
-
- * io.c (rb_io_check_writable): flush if the last operation was
- read.
-
- * rubyio.h (FMODE_RBUF): added.
-
-Wed Oct 2 23:09:20 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (rb_io_wait_readable): handle retryable errors.
-
- * io.c (rb_io_wait_writable): ditto.
-
- * ext/socket/socket.c (bsock_send): ditto.
-
- * ext/socket/socket.c (s_recvfrom): ditto.
-
- * ext/socket/socket.c (s_accept): ditto.
-
- * ext/socket/socket.c (udp_send): ditto.
-
- * ext/socket/getaddrinfo.c (afdl): made private structures constant.
-
- * rubyio.h: prototype; rb_io_wait_readable(), rb_io_wait_writable().
-
-Wed Oct 2 13:03:58 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: set ac_cv_func_setitimer to "no" on Cygwin.
-
-Wed Oct 2 10:59:29 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_sweep): free unused heap page to reduce process size if
- possible.
-
- * object.c (rb_obj_type): deprecated Object#type; use Object#class.
-
-Tue Oct 1 23:48:32 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/socket/socket.c (init_sock): no need for special finalizer,
- socket descriptor is no longer duplicated in 1.7.
- [ruby-talk:50732]
-
- * win32/win32.c, win32/win32.h (rb_w32_fddup, rb_w32_fdclose):
- delete.
-
-Mon Sep 30 20:29:10 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (rb_io_inspect): not need to raise IOError for closed
- stream. [ruby-talk:51871]
-
-Mon Sep 30 03:48:15 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_check): need no Fixnum check.
-
-Sun Sep 29 18:30:24 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (rb_w32_open_osfhandle): adjust
- rb_w32_open_osfhandle() with _open_osfhandle().
-
- * win32/win32.c (rb_w32_accept, rb_w32_socket): return -1 on
- error.
-
- * win32/win32.h: should use file descriptor instead of SOCKET.
-
-Sun Sep 29 06:33:03 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (is_socket, 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):
- need to protect WSAGetLastError() by RUBY_CRITICAL. [ruby-talk:51778]
-
-Sat Sep 28 20:06:36 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * keywords: add braces around initializers.
-
-Sat Sep 28 13:19:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * hash.c (rb_hash_become): should check self-assignment after
- conversion.
-
-Sat Sep 28 10:40:44 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_become): Hash#become should check added
- self-assignment.
-
- * class.c (rb_make_metaclass): metaclass of a superclass may be
- NULL at boot time.
-
-Sat Sep 28 09:50:03 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * ext/extmk.rb: The condition judgment without necessity was deleted.
-
-Fri Sep 27 18:40:42 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_deadlock): more verbose message at deadlock.
-
- * eval.c (rb_thread_schedule): ditto.
-
- * eval.c (rb_thread_join): ditto.
-
-Fri Sep 27 13:24:35 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): Class#inherited should be called after the
- execution of the class body.
-
-Fri Sep 27 02:41:53 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha1: Use OpenSSL's SHA1 engine if available. It is
- much faster than what we have now (sha1.[ch]). Add a knob
- (--with-bundled-sha1) to extconf.rb which makes it use the
- bundled one anyway.
-
-Fri Sep 27 02:25:14 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/rmd160: Use OpenSSL's RMD160 engine if available. It
- is much faster than what we have now (rmd160.[ch]). Add a knob
- (--with-bundled-rmd160) to extconf.rb which makes it use the
- bundled one anyway.
-
-Fri Sep 27 01:23:39 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/md5: Use OpenSSL's MD5 engine if available. It is
- much faster than what we have now (md5.[ch]). Add a knob
- (--with-bundled-md5) to extconf.rb which makes it use the
- bundled one anyway.
-
-Thu Sep 26 22:44:21 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_s_digest): Fix a double
- free() bug mingled with allocation framework deployment.
-
- * ext/digest/digest.c (rb_digest_base_s_hexdigest): Get rid of
- redundant struct allocation.
-
-Thu Sep 26 09:52:52 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): remove "return outside of method" check at
- compile time.
-
-Wed Sep 25 23:51:29 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * dir.c (glob_helper): must not closedir() when exception raised
- while globbing "**".
-
- * marshal.c (w_uclass): unused variable.
-
- * re.c (match_clone): unused.
-
- * regex.c (re_compile_pattern): get rid of implicit promotion from
- plain char to int.
-
-Wed Sep 25 17:46:46 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * lib/mkmf.rb (libpathflag): restore ENV['LIB'] when some error
- occurred.
-
-Wed Sep 25 16:14:51 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_match): p1 may exceed pend limit.
-
-Mon Sep 23 23:22:43 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_call0): must not clear ruby_current_node, or
- backtrace cannot be generated.
-
- * intern.h (ruby_yyparse): rather than yyparse().
-
- * parse.y (yylex): nextc() returns -1 at end of input, not 0.
-
- * parse.y (newline_node): reduce duplicated newline node.
-
- * parse.y (literal_concat): get rid of warning.
-
- * parse.y (new_evstr): fixed junk code.
-
-Mon Sep 23 19:57:52 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (RUBY_MINGW32): new macro. check for the MinGW
- compiler environment.
-
- * lib/mkmf.rb: refactoring.
-
-Mon Sep 23 08:27:11 2002 Tanaka Akira <akr@m17n.org>
-
- * io.c (appendline): forget to terminate with nul.
-
-Mon Sep 23 02:46:29 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_run): should set toplevel visibility again here.
-
- * eval.c (rb_eval): should not rely on ruby_class == rb_cObject
- check. Besides allow implicit publicity for attribute set
- methods.
-
- * parse.y (primary): need not to check class_nest, just set
- whether method is an attrset or not.
-
-Sun Sep 22 21:49:42 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (call_trace_func): should not call trace function while
- compilation.
-
- * eval.c (rb_call0): also inside c-func.
-
- * parse.y (yycompile): ditto.
-
- * ruby.c (require_libraries): preserve source file/line for each
- require.
-
-Sun Sep 22 17:08:11 2002 Tanaka Akira <akr@m17n.org>
-
- * string.c (rb_str_each_line): p might be at the top of the
- string.
-
-Sat Sep 21 23:28:28 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_make_metaclass): class of metaclass should be
- metaclass of superclass, unless class itself is a metaclass;
- class of metaclass of metaclass should point back to self.
- eh, confusing, isn't it.
-
- * class.c (rb_singleton_class): check if its class is singleton
- AND attached to self.
-
-Sat Sep 21 22:23:41 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_raise): no need to save dead thread context.
- [ruby-dev:18322]
-
-Fri Sep 20 23:02:01 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (block_append): eliminate unused literal nodes.
-
- * parse.y (literal_concat): refined literal concatenation.
-
-Fri Sep 20 19:43:40 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: Merge rough/lib/set.rb rev.1.5-1.15.
-
-Wed Sep 18 12:41:16 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should define class/module under ruby_cbase.
-
- * eval.c (rb_eval): should set class/module path based on
- ruby_cbase, not ruby_class.
-
- * eval.c (module_setup): use ruby_cbase instead of ruby_class.
-
-Tue Sep 17 21:06:04 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_die): put thread dead state.
-
- * eval.c (rb_thread_atfork): free stack buffer at fork too.
-
-Tue Sep 17 01:13:31 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_nesting): load wrapping module should appear in
- Module#nesting list. (ruby-bugs-ja:PR#328)
-
- * eval.c (rb_thread_remove): free stack buffer on remove.
-
-Tue Sep 17 00:58:35 2002 Minero Aoki <aamine@loveruby.net>
-
- * io.c: add parameter prototype.
-
- * re.c: ditto.
-
-Sun Sep 15 21:14:22 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * win32/win32.c (rb_w32_opendir, rb_w32_stat): Corresponds to
- the unjust path containing ".
-
-Sun Sep 15 19:48:55 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (OUTFLAG, CPPOUTFILE): moved from lib/mkmf.rb.
- check whether ${CPP} accepts the -o option.
-
- * win32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
-
- * bcc32/Makefile.sub (OUTFLAG, CPPOUTFILE): ditto.
-
- * djgpp/config.sed (OUTFLAG, CPPOUTFILE): ditto.
-
- * lib/mkmf.rb (OUTFLAG, CPPOUTFILE): use CONFIG.
- make easy to understand log.
-
- * mkconfig.rb (val): should not strip.
-
-Sat Sep 14 20:13:42 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * error.c(rb_sys_fail): remove case EPIPE on bcc32 .
-
-Fri Sep 13 23:39:49 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * dir.c (glob_func_caller): add prototype to get rid of warning.
-
-Fri Sep 13 18:35:12 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): avoid uninitialized global/class variable
- warnings at `||='. [ruby-dev:18278]
-
- * parse.y (stmt, arg): ditto
-
-Fri Sep 13 13:28:04 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb ($INSTALLFILES): avoid warning when $VERBOSE mode.
-
-Thu Sep 12 23:20:10 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * bcc32/setup.mak : Control of a message.
-
- * bcc32/makefile.sub : include resource.
-
-Thu Sep 12 18:10:03 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * dir.c (glob_helper): fixed freeing buffer. (ruby-bugs-ja:PR#332)
-
- * dir.c (glob_helper): should pass matched path. (ruby-bugs-ja:PR#333)
-
-Thu Sep 12 00:09:32 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_trap_eval): preserve thread status and so on.
- [ruby-talk:40337], [ruby-core:00019]
-
-Wed Sep 11 21:25:52 2002 Tanaka Akira <akr@m17n.org>
-
- * pp.rb (ARGF.pretty_print): implemented.
- (PP.pp): arguments reordered.
-
-Wed Sep 11 18:55:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (proc_to_s): refined format. [ruby-dev:18215]
-
-Wed Sep 11 17:47:17 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c, win32/win32.h (rb_w32_getpid): negate pid under Win9x.
- [ruby-dev:18262]
-
-Wed Sep 11 12:58:57 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * string.c (get_pat): Add an extra argument "quote".
-
- * string.c (rb_str_match_m): Do not bother to convert if a regexp
- is given.
-
-Wed Sep 11 11:33:40 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub: remove unnecessary `.dll' from filename of
- dll's resource file.
-
- * cygwin/GNUmakefile.in: ditto. [ruby-dev:17103]
-
- * win32/Makefile.sub: ditto. [ruby-dev:17103]
-
- * win32/resource.rb: ditto. [ruby-dev:17103]
-
-Wed Sep 11 09:59:46 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (rb_io_wait_readable): added.
-
- * io.c (rb_io_wait_writable): added.
-
- * io.c (io_read_retryable): added.
-
- * io.c (io_write): retry on EINTR, ERESTART and EWOULDBLOCK.
- [ruby-dev:17855], [ruby-dev:17878], [ruby-core:00444]
-
- * io.c (rb_io_fread): ditto.
-
- * io.c (read_all): ditto.
-
- * io.c (appendline): ditto.
-
- * io.c (rb_io_each_byte): ditto.
-
- * io.c (rb_io_getc): ditto.
-
-Wed Sep 11 09:29:24 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (ext): make directory `ext' on compile dir.
- [ruby-dev:18255]
-
-Wed Sep 11 00:41:10 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_mod_define_method): initialize orig_func too.
- (ruby-bugs-ja:PR#330)
-
-Wed Sep 11 00:01:32 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (glob_helper): prevent memory leak using rb_protect().
-
- * string.c (rb_str_associate): no need to check freeze flag.
-
- * string.c (rb_str_resize): should honor STR_ASSOC flag on
- resize.
-
- * string.c (rb_str_resize): proper STR_ASSOC handling. pointed
- out by Michal Rokos.
-
- * string.c (rb_str_buf_cat): ditto.
-
- * string.c (rb_str_cat): ditto.
-
- * string.c (rb_str_buf_append): ditto.
-
- * string.c (rb_str_append): ditto.
-
-Tue Sep 10 23:35:46 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (nextc): restore line number after here documents.
- (ruby-bugs-ja:PR#331)
-
- * parse.y (heredoc_restore): ditto.
-
-Tue Sep 10 18:26:52 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb, lib/mkmf.rb ($INCFLAGS): new var for -I$(topdir).
-
- * lib/mkmf.rb: add #define WIN32_LEAN_AND_MEAN to improve compile
- times.
-
-Tue Sep 10 17:16:14 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (miniruby): shouldn't link $(EXTOBJS).
- [ruby-dev:17059]
-
- * win32/Makefile.sub ($(LIBRUBY_A), $(LIBRUBY)): avoid lib.exe's
- warning. [ruby-dev:17059]
-
- * win32/Makefile.sub: remove unnecessary rules. [ruby-dev:17059]
-
- * win32/configure.bat, win32/setup.mak, win32/README.win32: enable to
- pass some arguments to configure. [ruby-dev:17059]
-
-Mon Sep 9 23:43:33 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.h (S_I?USR): define only if not mingw32.
-
-Mon Sep 9 11:21:04 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/stringio/stringio.c (strio_set_string): reinitialize
- properly.
-
- * ext/stringio/stringio.c (strio_become): added self-assign check
- and experimental auto-conversion to StringIO.
-
- * ext/stringio/stringio.c (strio_reopen): added.
-
-
-Sun Sep 8 21:29:25 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * time.c (time_free): prototype; struct time_object -> void *.
- avoid GCC warnings.
-
- * lib/mkmf.rb, ext/extmk.rb ($LINK, $CPP): move to lib/mkmf.rb.
-
-Sun Sep 8 19:02:28 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * time.c: prototype; time_free() to avoid VC++ warnings.
-
- * ext/tcltklib/tcltklib.c: prototype; invoke_queue_handler() to avoid
- VC++ warning.
-
- * win32/win32.c (rb_w32_stat): remove S_IWGRP and S_IWOTH bits from
- st_mode.
-
- * win32/win32.h (S_I*): define if not defined.
-
-Sun Sep 8 14:38:31 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: modify program_prefix only if specified
- --program-prefix.
-
- * configure.in: don't generate ext/extmk.rb.
-
- * Makefile.in: execute directly $(srcdir)/ext/extmk.rb.
- remove -Cext option, "Dir::chdir 'ext'" in ext/extmk.rb.
-
- * {win32,bccwin32}/Makefile.sub: ditto.
-
- * instruby.rb: ditto.
-
- * ext/extmk.rb: renamed from ext/extmk.rb.in.
-
- * lib/mkmf.rb (module Logging): create log files (mkmf.log)
- in each extension module directories.
-
- * ext/extmk.rb: ditto.
-
- * lib/mkmf.rb (macro_defined?): new method.
-
- * ext/.cvsignore: remove extmk.rb.
-
- * ext/*/.cvsignore: add "*.def".
-
- * lib/mkmf.rb (have_struct_member): moved from ext/socket/extconf.rb.
-
- * ext/socket/extconf.rb: use macro_defined? instead of egrep_cpp.
-
- * ext/etc/extconf.rb: use have_struct_member.
-
- * ext/etc/etc.c: add prefix HAVE_ST_ to PW_ macros.
-
-Sun Sep 8 14:36:40 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * bcc32/configure.bat : Control of a message.
- * bcc32/makefile.sub : @(sitearch) typo.
- * ext/extmk.rb.in : [bccwin32] libdir is added to a library path.
- * lib/mkmf.rb : ditto.
-
-Sat Sep 7 23:32:56 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * 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.
-
-Sat Sep 7 19:46:57 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: Disallow Set.new(false). Add even more tests.
- [Submitted by: "Christoph" <chr_news@gmx.net>]
-
-Sat Sep 7 19:23:56 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: Fix a bug in flatten()'s recursive set detection.
- [Submitted by: "Christoph" <chr_news@gmx.net>] Some tests
- against the bug are added.
-
- * lib/set.rb: Resurrect the test suite by putting it after
- __END__ and executing `eval DATA.read'.
-
-Sat Sep 7 08:41:39 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (rb_gc_mark_parser): ruby_eval_tree is marked in eval.c.
-
-Fri Sep 6 20:01:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/mkmf.rb ($CC): command to compile C source.
-
- * lib/mkmf.rb (logging): added.
-
- * lib/mkmf.rb (try_compile): added.
-
- * lib/mkmf.rb (egrep_cpp): use internal grep when pattern is
- Regexp, otherwise use external egrep command but get rid of
- pipe of command.com.
-
- * lib/mkmf.rb (have_func): local variable should be volatile not
- to be eliminated by optimization.
-
- * lib/mkmf.rb (create_makefile): link with CONFIG["LIBS"].
-
- * lib/mkmf.rb (create_makefile): emit .SUFFIXES:.
-
-Fri Sep 6 12:11:22 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (rb_gc_mark_parser): should mark ALL global variables
- defined in parse.y.
-
-Fri Sep 6 01:15:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (ruby_xmalloc): remove MALLOC_LIMIT to avoid frequent
- garbage collection.
-
-Fri Sep 6 11:47:37 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (rb_gc_mark_parser): should mark global variables
- defined in parse.y.
-
-Fri Sep 6 10:34:32 2002 Minero Aoki <aamine@loveruby.net>
-
- * io.c (rb_io_puts): RSTRING(line)->ptr might be NULL.
-
-Fri Sep 6 10:26:37 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y: should not put non-NODE-VALUEs in the semantic stack.
-
-Fri Sep 6 05:48:26 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (rb_path_check): nothing to check under DOSISH.
- [ruby-list:35772]
-
-Fri Sep 6 05:03:50 2002 Minero Aoki <aamine@loveruby.net>
-
- * gc.c (rb_gc): should mark parser.
-
- * parse.y (rb_gc_mark_parser): new function.
-
- * intern.h (rb_gc_mark_parser): added.
-
-Thu Sep 5 18:32:32 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_path2class): should not use rb_eval_string().
-
-Thu Sep 5 17:18:22 2002 Michal Rokos <michal@ruby-lang.org>
-
- * dln.c: fix memory leak in dln_load (ruby-core:405) and
- in load_1 (ruby-core:407)
-
-Thu Sep 5 15:43:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_extended): should allow marshaling of object which
- is extended by named module.
-
- * class.c (rb_make_metaclass): super may be T_ICLASS, need to skip.
-
-Thu Sep 5 13:09:22 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): overriding false constant with class/module
- definition should be error. (PR#327)
-
-Thu Sep 5 01:24:26 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * extmk.rb (create_makefile): add macro MAKEDIRS, INSTALL_PROG,
- INSTALL_DATA.
-
- * extmk.rb (create_makefile): support for building to any directory.
-
- * extmk.rb (xsystem): move to mkmf.rb.
-
- * mkmf.rb (xsystem): support for extmk.rb
-
- * mkmf.rb ($CPP): remove '-E' option. add CPPFLAGS.
-
-Wed Sep 4 16:15:17 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: ==(o) should be aware of all the Set variant
- instances, not just those of its subclasses. [Submitted by:
- "Christoph" <chr_news@gmx.net>]
-
- * lib/set.rb: - Fix eql?(). [ditto]
-
-Wed Sep 4 15:23:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_make_metaclass): obj.meta.super.meta should be equal
- to obj.meta.meta.super (ruby-bugs-ja:PR#324).
-
-Wed Sep 4 05:10:16 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * parse.y (yylex): the warning message "invalid
- character syntax" was never issued (ruby-bugs-ja:PR#323).
-
-Wed Sep 4 01:08:45 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_bytes): do not use alloca (ruby-bugs:PR#382).
-
-Tue Sep 3 17:12:59 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * extmk.rb: require mkmf.rb. remove duplicate methods.
- use Config::CONFIG["FOO"] instead of @FOO@.
-
- * mkmf.rb: support for extmk.rb.
-
-Mon Sep 2 23:01:50 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * re.c (rb_reg_search): MatchData must be rb_cMatch.
- (ruby-bugs-ja:PR#319)
-
-Mon Sep 2 21:21:46 2002 Minero Aoki <aamine@loveruby.net>
-
- * gc.c (gc_sweep): does reclaim nodes in also compile time, if we
- can.
-
- * ruby.c (load_file): omit GC if we can.
-
- * parse.y (ruby_parser_stack_on_heap): new function.
-
- * intern.h (ruby_parser_stack_on_heap): added.
-
-Mon Sep 2 18:45:07 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_copy_generic_ivar): remove old generic instance
- variable table if it exists.
-
-Sun Sep 1 15:54:33 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * config.guess: fixed for Linux/PPC.
-
-Sat Aug 31 09:38:12 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_make_metaclass): metaclass of a metaclass is a
- metaclass itself.
-
-Fri Aug 30 22:45:16 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/set.rb: Added.
-
-Fri Aug 30 20:58:54 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * ext/Win32API/Win32API.c (Win32API_Call): typo.
-
-Fri Aug 30 19:45:52 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * variable.c (rb_const_assign): st_delete() takes pointer to key.
-
-Fri Aug 30 19:40:28 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/Win32API/Win32API.c (Win32API_Call): RSTRING()->ptr may be
- NULL.
-
- * ext/nkf/nkf.c (rb_nkf_guess): ditto.
-
- * ext/readline/readline.c (readline_s_set_completion_append_character):
- ditto.
-
- * ext/socket/socket.c (sock_s_getaddrinfo, sock_s_getnameinfo):
- ditto.
-
- * ext/tcltklib/tcltklib.c (ip_toUTF8, ip_fromUTF8): ditto.
-
-Fri Aug 30 01:32:17 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_singleton_class): superclass of a metaclass
- should be a metaclass of superclass.
-
- * range.c (range_eq): two instances must belong to a same class to
- be equal.
-
- * range.c (range_eql): ditto.
-
- * io.c (rb_io_taint_check): frozen check added.
-
- * file.c (rb_stat_become): frozen check added.
-
- * object.c (rb_obj_become): ditto.
-
- * re.c (rb_reg_become): ditto.
-
- * struct.c (rb_struct_become): ditto.
-
- * time.c (time_become): ditto.
-
- * array.c (rb_ary_become): should call rb_ary_modify().
-
- * hash.c (rb_hash_become): should call rb_hash_modify().
-
- * compar.c (cmp_equal): should not use NUM2LONG(), since <=> may
- return bignum.
-
- * compar.c (cmp_gt, cmp_ge, cmp_lt, cmp_le, cmp_between): ditto.
-
-Thu Aug 29 23:34:42 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * bcc32/MakeFile.sub (sitearch): add.
-
-Thu Aug 29 13:36:42 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (read_all): should use off_t instead of long.
-
-Thu Aug 29 00:55:55 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * marshal.c (r_object): yield loaded objects, not intermediates.
- (ruby-bugs-ja:PR#296)
-
-Thu Aug 29 00:06:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_become): should not free ptr if it's shared.
-
- * eval.c (rb_alias): prohibit making an alias named "allocate" if
- klass is a metaclass.
-
-Wed Aug 28 23:59:15 2002 Michal Rokos <michal@ruby-lang.org>
-
- * signal.c: remove #ifdef SIGINT for struct signals.
-
- * variable.c: get rid of fix length buffer in rb_class_path.
-
-Wed Aug 28 23:34:32 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (appendline): data was lost when raw mode.
-
-Wed Aug 28 22:57:34 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_string_value_ptr): StringValuePtr() should never
- return NULL pointer.
-
-Wed Aug 28 19:12:46 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/stringio/stringio.c (strio_initialize): RSTRING(mode)->ptr
- can be NULL.
-
- * ext/stringio/stringio.c (strio_ungetc): fix buffer overflow.
-
-Wed Aug 28 18:19:55 2002 Michal Rokos <michal@ruby-lang.org>
-
- * file.c: fix memory leak in rb_stat_init.
-
-Wed Aug 28 17:45:03 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/win32.c (kill): negate pid under Win9x.
-
-Wed Aug 28 16:36:40 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (ar): don't check ar twice.
-
-Wed Aug 28 15:00:29 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_delete_bang): should check if str->ptr is 0.
-
- * string.c (rb_str_squeeze_bang): ditto.
-
- * string.c (rb_str_count): ditto.
-
- * string.c (rb_str_lstrip_bang): ditto.
-
- * string.c (rb_str_rstrip_bang): ditto.
-
- * string.c (rb_str_intern): ditto.
-
-Wed Aug 28 11:37:35 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.h: define SIGINT and SIGKILL if not defined.
-
- * win32/win32.c: remove definition of SIGINT and SIGKILL.
-
-Tue Aug 27 19:50:27 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ruby.c (require_libraries): prevent ruby_sourcefile from GC.
-
-Tue Aug 27 15:03:35 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_find_file): $LOAD_PATH must not be empty.
-
- * file.c (rb_find_file_ext): ditto.
-
-Tue Aug 27 02:35:21 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_eq): class check should be based on range.class,
- instead of Range to work with Range.dup.
-
- * range.c (range_eql): ditto.
-
-Mon Aug 26 18:17:56 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_mod_dup): need to preserve metaclass and flags.
-
-Mon Aug 26 10:44:18 2002 Tanaka Akira <akr@m17n.org>
-
- * object.c (rb_cstr_to_dbl): had a buffer overrun.
-
-Sun Aug 25 20:10:32 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/cgi.rb (CGI#form): fix ruby-bugs-ja:PR#280, add default action.
-
-Sat Aug 24 15:32:16 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (call_trace_func): restore source file/line, as trace
- function installed in required library with -r option can be
- called while parsing. (ruby-bugs:PR#372)
-
- * eval.c (module_setup): unused variable. [ruby-core:00358]
-
-Sat Aug 24 14:59:02 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_class): integrate singleton check into a function
- to follow DRY principle.
-
- * marshal.c (w_uclass): should check singleton method.
-
- * object.c (rb_obj_dup): dmark and dfree functions must be match
- for T_DATA type.
-
- * object.c (rb_obj_dup): class of the duped object must be match
- to the class of the original.
-
-Sat Aug 24 13:57:28 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/time.rb (Time.rfc2822, Time#rfc2822): preserve localtimeness.
-
- * lib/pp.rb: pretty_print_cycled is renamed to pretty_print_cycle.
-
-Fri Aug 23 23:59:57 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (method_call): check receiver is defined.
-
- * eval.c (umethod_call): removed.
-
-Fri Aug 23 23:39:17 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_quote): do not escape \t, \f, \r, \n, for they are
- not regular expression metacharacters.
-
- * time.c (time_s_alloc): use time_free instead of free (null check,
- also serves for type mark).
-
- * time.c (time_s_at): check dfree function too.
-
-Fri Aug 23 17:06:48 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: RUBY_SO_NAME is msvcrt-rubyXX on mswin32/mingw32.
-
- * configure.in (sitearch): new var.
-
- * mkconfig.rb, lib/mkmf.rb (sitearch): ditto.
-
- * win32/Makefile.sub, win32/setup.mak (sitearch): ditto.
-
- * instruby.rb: ditto.
-
-Wed Aug 21 16:53:00 2002 Michal Rokos <michal@ruby-lang.org>
-
- * *.c: int, long types cleanup.
-
- * parse.y: ditto.
-
- * re.h, regex.h, ruby.h: ditto.
-
-Wed Aug 21 16:43:19 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_cleanup): should not modify the global
- variable curr_thread.
-
-Wed Aug 21 16:14:26 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: set ac_cv_func__setjmp to "no" on Cygwin.
-
- * configure.in: set ac_cv_func_crypt to "no" on MinGW.
-
-Tue Aug 20 21:47 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * io.c (rb_io_fread): remove case EPIPE on bcc32 .
-
- * win32/win32.c (rb_w32_getc): clear EPIPE error on bcc32.
-
-Tue Aug 20 19:39:03 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * file.c (rb_file_s_expand_path): accept drive letter on Cygwin.
-
- * file.c (is_absolute_path): ditto.
-
-Tue Aug 20 12:12:25 2002 Tietew <tietew@tietew.net>
-
- * io.c (rb_io_putc): output via rb_io_write().
-
-Mon Aug 19 19:01:55 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * 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.
-
-Mon Aug 19 17:08:19 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize_m): frozen check should be moved here
- from rb_reg_initialize().
-
-Mon Aug 19 15:38:44 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (sort_2): comparison should be done as signed long.
-
- * array.c (sort_2): should return int, not VALUE.
-
-Mon Aug 19 12:38:33 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_save_context, rb_thread_restore_context):
- save/restore SEH chain on MS-Windows at thread switch.
- [ruby-win32:273]
-
- * eval.c (win32_get_exception_list, win32_set_exception_list):
- added.
-
-Sat Aug 17 23:01:25 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (sort_2): *a - *b may overflow.
-
-Sat Aug 17 00:25:08 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (ary_new): len*sizeof(VALUE) may be a positive value.
-
- * array.c (rb_ary_initialize): ditto.
-
-Fri Aug 16 15:58:16 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (NOFILE): define NOFILE as 64 if not defined.
-
- * signal.c (sighandler_t): rename to sh_t on dietlibc.
-
-Fri Aug 16 15:37:04 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bignum.c (rb_cstr_to_inum): new decimal and octal string.
-
-Fri Aug 16 13:17:11 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_class_allocate_instance): move singleton class
- check from rb_obj_alloc().
-
-Fri Aug 16 11:47:24 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (rb_io_fread): renamed from io_fread and made extern.
-
- * marshal.c (r_bytes0): check if successfully read, use
- rb_io_fread() instead of fread() to be preemptive.
- (ruby-bugs-ja:PR#294, 295)
-
- * rubyio.h (rb_io_fread): added.
-
-Fri Aug 16 07:57:26 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (compile_error): must not clear ruby_sourcefile here.
- (ruby-bugs:PR#364).
-
- * eval.c (rb_longjmp): set ruby_sourcefile before making
- backtrace.
-
-Thu Aug 15 20:38:58 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (ruby_current_node) : added to set sourceline on demand.
-
- * eval.c (error_pos, error_print, rb_longjmp, assign): set source
- file/line.
-
- * eval.c (rb_eval): store current node instead of file/line, and
- preserve it at return.
-
- * eval.c (module_setup): ditto.
-
- * eval.c (struct thread): store node instead of file/line.
-
- * eval.c (rb_thread_raise): ditto.
-
- * intern.h (ruby_current_node): added.
-
- * intern.h (ruby_set_current_source): added.
-
- * parse.y (stmt, arg): not fix position of assignment.
-
- * parse.y (node_assign): ditto.
-
- * parse.y (yycompile): clear current node.
-
-Thu Aug 15 00:48:46 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_initialize): should not modify frozen Regexp.
-
-Tue Aug 13 18:33:18 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/tcltklib/tcltklib.c (ip_init): allocation framework.
-
-Tue Aug 13 15:32:14 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_replace): should copy ifnone.
-
- * hash.c (rb_hash_dup): should preserve HASH_PROC_DEFAULT and
- HASH_DELETED flags.
-
- * hash.c (rb_hash_shift): shift from empty hash should not return
- its default proc.
-
- * hash.c (rb_hash_default_proc): new method. [new]
-
-Tue Aug 13 00:37:11 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_aref): no need for Bignum check.
-
- * array.c (rb_ary_aset): explicit Bignum check removed.
-
- * numeric.c (fix_aref): normalize bignum before bit-op.
-
- * bignum.c (rb_big_rand): max may be Bignum zero.
-
- * bignum.c (rb_cstr_to_inum): should normalize bignums, to avoid
- returning fixable bignum value.
-
- * bignum.c (rb_uint2big): there should be no zero sized bignum.
-
-Mon Aug 12 23:45:28 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/extmk.rb.in: extmake() that works properly for both tkutil
- (tk/tkutil.so) and digest/sha1.
-
-Mon Aug 12 22:29:35 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ruby.c (set_arg0): Correct the position of #endif.
-
-Mon Aug 12 17:25:06 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_equal): should check HASH_PROC_DEFAULT too.
-
-Mon Aug 12 16:15:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * bignum.c (rb_big_cmp): raise for NaN. (ruby-bugs-ja:PR#284).
-
-Sun Aug 11 09:34:07 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): set line number from all nodes.
-
- * eval.c (proc_to_s): show source file/line if available.
-
- * marshal.c (r_object): register TYPE_BIGNUM regardless real type.
-
-Sat Aug 10 23:47:16 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_cmp): use dbl2big() for Floats, instead of
- big2dbl().
-
- * bignum.c (Init_Bignum): rb_big_zero_p() removed. There may be
- Bignum zero.
-
-Fri Aug 9 13:31:40 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/Win32API/extconf.rb: check existence of <windows.h>.
-
-Thu Aug 8 09:37:02 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb (NilClass): must provide conversion block.
-
- * lib/optparse.rb (String): ditto.
-
-Thu Aug 8 00:45:15 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): new argument added for original method name.
- preserve original method name in frame->orig_func.
-
- * eval.c (is_defined): use frame->orig_func, not last_func.
-
- * eval.c (rb_eval): ditto.
-
- * eval.c (method_call): supply data->oid also to rb_call0().
-
- * object.c (rb_class_allocate_instance): call rb_obj_alloc() when
- called from alias, thus invoke original "allocate".
-
- * eval.c (remove_method): removing allocate from classes should
- cause NameError.
-
-Wed Aug 7 22:12:54 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/optparse.rb (OptionParser::Completion::convert): returned
- all values not first one.
-
- * lib/optparse.rb (OptionParser::Switch::parse): return values as
- is.
-
- * lib/optparse.rb (OptionParser::order): ditto.
-
- * lib/optparse/time.rb: prior time.rb.
-
- * lib/optparse/uri.rb: require standard uri module. thanks to
- Minero Aoki.
-
-Wed Aug 7 09:51:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_equal): should check default values.
-
-Wed Aug 7 08:44:32 2002 Minero Aoki <aamine@loveruby.net>
-
- * ext/racc/cparse/cparse.c: reduce goto.
-
-Tue Aug 6 15:19:39 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * string.c (rb_str_rindex): must return -1 if unmatched.
-
-Mon Aug 5 22:41:18 2002 Minero Aoki <aamine@loveruby.net>
-
- * MANIFEST: add lib/racc/parser.rb.
-
- * ext/racc/cparse/cparse.c: code refine.
-
- * ext/racc/cparse/MANIFEST: add depend.
-
-Sun Aug 4 22:30:50 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/curses/curses.c: follow allocation framework.
-
-Sat Aug 3 21:23:56 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): set constant in cbase scope.
-
- * eval.c (assign): ditto.
-
-Fri Aug 2 09:12:32 2002 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: follow allocation framework.
-
-Fri Aug 2 01:21:52 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (s_recvfrom): update RSTRING len.
-
-Thu Aug 1 17:47:15 2002 Tachino Nobuhiro <tachino@jp.fujitsu.com>
-
- * parse.y (tokadd_string): ignore backslashed spaces in %w.
-
-Thu Aug 1 14:14:15 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_find): do not use rb_eval_cmd(); should not accept
- a string for if_none.
-
-Wed Jul 31 14:11:43 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_undef): undef should be done for klass, not ruby_class.
-
-Tue Jul 30 19:48:51 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-accurate-end-of-block): restrict search
- region.
-
- * misc/ruby-mode.el (ruby-parse-partial): reversed wrong patch.
-
-Tue Jul 30 17:21:13 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-accurate-end-of-block): incomplete block
- caused infinite loop.
-
- * misc/ruby-mode.el (ruby-parse-partial): returns nil unless
- delimiters found.
-
-Tue Jul 30 15:24:07 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/tcltklib/stubs.c (ruby_tcltk_stubs): win32_getenv returns
- the same address always, so allocate string by ruby_strdup.
-
- * win32/win32.c: prototype; rb_w32_open_osfhandle().
-
-Tue Jul 30 09:11:07 2002 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (rb_thread_join_m): add parameter type declaration.
-
-Tue Jul 30 08:37:11 2002 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (localjump_error): add parameter type declaration.
-
-Mon Jul 29 16:00:54 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in: always use File.expand_path for $top_srcdir.
-
-Sat Jul 27 23:07:52 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_to_int): default to_int implementation for every
- numeric class.
-
-Sat Jul 27 08:09:03 2002 Booker C. Bense <bbense@slac.stanford.edu>
-
- * re.c (rb_reg_quote): initial part of the string was never copied
- to the quoted string.
-
-Fri Jul 26 23:03:53 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): no need to convert to string twice.
-
-Fri Jul 26 18:32:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-expr-beg): wrong indent at modifiers
- after ?.
-
-Fri Jul 26 16:01:16 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in (create_makefile): use Regexp in gsub.
-
- * sample/mkproto.rb: ditto and fix bug.
-
-Fri Jul 26 14:31:06 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * random.c: replace with Mersenne Twister RNG.
-
-Fri Jul 26 12:14:48 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (yylex): modify to accept a code like "m (a){...}".
-
-Thu Jul 25 09:05:02 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-delimiter): include here document.
-
- * misc/ruby-mode.el (ruby-deep-arglist): skips spaces after
- parenthesis when 'space.
-
- * misc/ruby-mode.el (ruby-imenu-create-index): fix for nested
- classes.
-
- * misc/ruby-mode.el (ruby-accurate-end-of-block): added. scan a
- block in the order.
-
- * misc/ruby-mode.el (ruby-expr-beg): support for here document.
-
- * misc/ruby-mode.el (ruby-parse-partial): splitted from
- ruby-parse-region.
-
- * misc/ruby-mode.el (ruby-move-to-block): skips RD style comments.
-
-Wed Jul 24 09:47:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (jump_tag_but_local_jump): preserve retval in
- LocalJumpError exceptions.
-
- * parse.y (command): no more check for "super outside of method".
-
- * eval.c (rb_mod_define_method): should set last_class and
- last_func in the block->frame.
-
-Mon Jul 22 17:23:00 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (error_handle): should handle TAG_THROW as well.
-
-Fri Jul 19 10:52:32 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): new decimal notation '0d4567'.
-
-Thu Jul 18 11:52:02 2002 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (set_socket): new method.
-
-Thu Jul 18 06:51:24 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (yylex): fix typo.
-
-Wed Jul 17 18:41:28 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): new octal notation '0o777'.
-
-Mon Jul 15 18:36:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (string_content): every string_content node should
- return string only. use NODE_EVSTR to coercing.
-
- * eval.c (rb_eval): NODE_EVSTR support.
-
-Mon Jul 15 10:35:35 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (heredoc_identifier): fix typo.
-
-Sat Jul 13 09:30:04 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (literal_concat_string): wrong optimization.
-
-Sat Jul 13 01:25:38 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/resolv.rb (Resolv::DNS::open, close): new.
-
- * lib/optparse.rb, lib/optparse: import.
-
-Fri Jul 12 06:34:05 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: rename HTTP.get_uri get_response.
-
- * lib/net/http.rb: HTTP.get_print accepts URI objects.
-
- * lib/net/http.rb: HTTP.get had not work with URI objects.
-
-Fri Jul 12 02:15:58 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * string.c (rb_str_match): fix for string match.
-
-Fri Jul 12 00:02:50 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/stringio/stringio.c (strio_gets_internal): fixed for record
- separator longer than 1.
-
-Thu Jul 11 17:59:20 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_quote): avoid unnecessary string allocation.
-
- * string.c (get_pat): quote metacharacters before compiling a
- string into a regex.
-
- * string.c (rb_str_split_m): special treatment of strings of size
- 1, but AWK emulation. now uses get_pat().
-
- * string.c (rb_str_match_m): quote metacharacters.
-
- * string.c (rb_str_match2): ditto.
-
-Thu Jul 11 12:59:23 2002 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/resolv.rb: untaint strings read from /etc/hosts and
- /etc/resolv.conf to prevent SecurityError when $SAFE==1.
-
-Thu Jul 11 09:00:43 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_slice_bang): if there's no corresponding
- substring, slice! should return nil without exception.
-
-Tue Jul 9 20:03:55 2002 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * irb 0.9
-
-Sat Jul 6 07:35:02 2002 Jamie Herre <jfh@gettysgroup.com>
-
- * array.c (rb_ary_insert): type fixed.
-
-Fri Jul 5 09:17:00 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_split_m): accept separator value nil as well.
-
-Fri Jul 5 08:59:15 2002 Michal Rokos <michal@ruby-lang.org>
-
- * enum.c: Fix bug in enum_sort_by and some code indents
-
-Fri Jul 5 05:00:40 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
- thanks to Sean Chittenden <sean@ruby-lang.org>, Shugo Maeda
- <shugo@modruby.net>
-
-Fri Jul 5 00:10:09 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_become): was leaking memory.
-
-Thu Jul 4 23:43:26 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y: remove useless function str_extend_p().
-
-Wed Jul 3 14:26:40 2002 Sean Chittenden <sean@ruby-lang.org>
-
- * lib/net/ftp.rb (get): new method.
-
- * lib/net/ftp.rb (putt): ditto.
-
- * lib/net/ftp.rb (binary): ditto.
-
- * lib/net/ftp.rb (binary=): ditto.
-
-Wed Jul 3 13:57:53 2002 Sean Chittenden <sean@ruby-lang.org>
-
- * lib/net/ftp.rb (getbinaryfile): the second argument (localfile)
- is now optional.
-
- * lib/net/ftp.rb (gettextfile): ditto.
-
-Wed Jul 3 13:45:42 2002 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb: use &block and yield for speed.
-
-Wed Jul 3 02:32:31 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
-
-Tue Jul 2 14:53:10 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_include_module): should not alter other
- classes/modules by inclusion. by this fix, local order may not
- be preserved for some cases.
-
- * class.c (include_class_new): module may be T_ICLASS; retrieve
- original module information.
-
-Tue Jul 2 14:13:11 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/cgi.rb (CGI#header): accept any type as value.
-
-Sun Jun 30 17:05:29 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (seekdir, telldir): add ac_cv_func_telldir=yes,
- ac_cv_func_seekdir=yes for MinGW.
-
-Sat Jun 29 01:43:32 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * io.c (pipe_finalize, pipe_popen): two-way pipe support for win32.
-
- * win32/win32.c (ChildRecord, FindFreeChildSlot): ditto.
-
- * win32/win32.c, win32/win32.h (pipe_exec): new function for two-way
- pipe support for win32.
-
- * win32/win32.c, win32/win32.h (FindPipedChildSlot, rb_w32_popen,
- rb_w32_pclose): removed functions for two-way pipe support for win32.
-
-Fri Jun 28 23:49:34 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * pack.c (pack_unpack): change names of local variables because their
- names are overlapped.
-
-Fri Jun 28 17:54:07 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb: fix object address.
-
-Thu Jun 27 23:55:50 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/win32.c (rb_w32_stat): fix buffer overflow. (ruby-bugs:PR#329)
-
-Thu Jun 27 20:57:45 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/prettyprint.rb, lib/pp.rb: convenience methods added.
-
-Thu Jun 27 15:22:18 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/prettyprint.rb: re-implemented for incremental output to handle
- huge data. API is changed a bit.
-
- * lib/pp.rb: adapt new pretty printing API.
-
-Thu Jun 27 08:28:18 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (literal_concat_string): non-string last expression in
- #{} was ignored when followed by literal.
-
-Thu Jun 27 03:42:04 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_expr_str): need to process backslashes properly.
-
-Wed Jun 26 17:33:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_any_to_a): declare Object#to_a to be obsolete.
-
- * object.c (rb_Array): do not convert nil into [] automagically.
-
-Wed Jun 26 15:40:00 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (words, qwords): word list literal rules.
-
- * parse.y (parse_string): ditto.
-
- * parse.y (yylex): %W: word list literal with interpolation. [new]
-
-Tue Jun 25 18:53:34 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (string1, xstring, regexp): moved lex_strnest
- initialization to string_contents/xstring_contents.
-
-Tue Jun 25 19:24:38 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * dln.c: remove definition rb_loaderror().
-
-Tue Jun 25 00:34:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_Integer): use "to_int" instead of
- "to_i". [experimental]
-
- * object.c (nil_to_f): new method.
-
- * object.c (rb_Integer): Symbols and nil should cause error.
-
- * object.c (rb_Float): nil should cause error.
-
-Tue Jun 25 00:21:00 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * dln.c: remark definition rb_loaderror().
-
-Tue Jun 25 00:14:07 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (string_dvar): allow back references in interpolation.
-
-Mon Jun 24 16:32:31 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_eval): NODE_EVSTR is no longer used.
-
- * eval.c (eval): not enforce to make assigned variables dynamic.
-
- * parse.y (string): split rules to strings/xstring/regexp to allow
- arbitrary statements inside string interpolation.
-
- * parse.y (here_document): splitted into three phases.
-
- * parse.y (literall_append, literal_concat): added.
- append/concatenate string literals.
-
- * sample/test.rb (valid_syntax): adjust line number for BEGIN.
-
- * lib/mkmf.rb (create_makefile): get rid of nested string.
-
- * lib/mkmf.rb (install_rb): site-install didn't work properly.
-
-Sun Jun 23 00:19:10 2002 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb, sample/cal.rb, sample/goodfriday.rb:
- updated to the new version (based on date2 3.3).
-
-Sat Jun 22 14:41:33 2002 Guy Decoux <ts@moulon.inra.fr>
-
- * ext/socket/socket.c (sock_addrinfo): make all 3 versions of
- getaddrinfo happy. [ruby-core:00184]
-
-Fri Jun 21 18:49:58 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): __END__ should not be effective within
- string literals.
-
-Thu Jun 20 21:09:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/readline/readline.c (readline_readline): get rid of
- libreadline's bug. (ruby-bugs-ja:PR#268)
-
-Thu Jun 20 17:10:27 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/ftool.rb (BUFSIZE): tuning, set buffer length to 8192.
-
- * configure.in (__NO_ISOCEXT): add for mingw-runtime 2.0-2.
-
- * configure.in (__MSVCRT__): removed because it is defined
- in the GCC specs.
-
-Wed Jun 19 14:46:18 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb, lib/mkmf.rb (xsystem): open the log file if xsystem
- is called.
-
-Wed Jun 19 01:01:13 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (here_document): should be aware of __END__ within here
- documents.
-
-Wed Jun 19 00:50:50 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (yylex): ? followed by successive word characters is
- ternary operator not numeric literal.
-
- * parse.y (yylex): commands after break/next/rescue can take
- arguments. (ruby-bugs-ja:PR#265)
-
-Tue Jun 18 19:20:16 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/mkexports.rb: remove unnecessary exports. (ruby-dev:17418)
-
-Tue Jun 18 12:50:17 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (yylex): should pushback proper char after '<<'.
-
- * parse.y (range_op, cond0, cond): get rid of doubled warnings.
-
- * parse.y (value_expr): reduce recursion level.
-
- * parse.y (logop): ditto.
-
-Mon Jun 17 11:11:34 2002 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * string.c (rb_str_crypt): result need not be tainted always.
-
-Mon Jun 17 10:51:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * dln.c (dln_load): need to preserve dln_strerror() result,
- calling other dl family can clear it.
-
-Sat Jun 15 22:56:37 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): obsolete '?<whitespace>'; use '?\s', '?\n',
- etc, instead.
-
-Sat Jun 15 18:51:13 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * dir.c (glob_helper): Use lstat() instead of stat() so it catches
- a dead symlink. Given a dead symlink named "a", Dir.glob("?")
- did catch it but Dir.glob("a") somehow didn't.
-
-Sat Jun 15 01:59:05 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): no here document after a dot.
-
- * parse.y (yylex): should have set lex_state after '`'.
-
- * parse.y (yylex): should have set lex_state properly after
- tOP_ASGN.
-
-Fri Jun 14 21:01:48 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * bcc32/mkexports.rb: insert sleep(1) for win9x.
-
- * bcc32/configure.bat: change return code LF -> CRLF for win9x.
-
- * win32/win32.c: fix rb_w32_open_osfhandle()
-
-Fri Jun 14 15:22:19 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (read_escape): deny zero-width hexadecimal character.
- (ruby-bugs-ja:PR#260)
-
- * parse.y (tokadd_escape): ditto.
-
- * regex.c (re_compile_pattern): ditto.
-
-Fri Jun 14 00:49:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big2dbl): return canonical HUGE_VAL for infinity.
-
-Thu Jun 13 09:43:37 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (svalue_to_avalue): v may be Qundef. This fix was
- suggested by Guy Decoux.
-
-Thu Jun 13 00:33:49 2002 takuma ozawa <metal@mine.ne.jp>
-
- * hash.c (rb_hash_s_create): use rb_hash_aset() instead of calling
- st_insert() directly, to dup&freeze string keys.
-
-Thu Jun 13 00:12:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): proper error message for "@@0".
-
- * parse.y (yylex): paren to parse_string() must be zero for
- unparenthesized strings.
-
- * parse.y (str_extend): broken string when unterminated "#{".
-
- * enum.c (enum_sort_by): had a bug in 1 element enumeration.
-
-Wed Jun 12 18:04:44 2002 akira yamada <akira@arika.org>
-
- * uri/common.rb (REGEXP::PATTERN::X_ABS_URI): 'file:/foo' is valid.
-
- * uri/generic.rb (Generic#xxx=): should return substituted value.
- (ruby-dev:16728.)
-
- * test/generic.rb (test_set_component): added tests for the above
- change.
-
-Wed Jun 12 02:38:00 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (stmt): fix typo.
-
-Wed Jun 12 01:10:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): 'do' should return kDO_BLOCK on EXPR_ENDARG.
-
- * parse.y (singleton): "def (()).a end" dumped core.
-
- * parse.y (range_op): node may be null.
-
- * parse.y (match_gen): ditto.
-
-Tue Jun 11 19:20:34 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW.
-
- * configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared
- is specified.
-
-Tue Jun 11 17:12:04 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): void value check for "..", "...", "!", and "not".
-
- * parse.y (match_gen): void value check for "=~".
-
- * parse.y (value_expr): check NODE_AND and NODE_OR recursively.
-
- * parse.y (cond0): void value check added for conditionals.
-
-Tue Jun 11 13:18:47 2002 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/ftp.rb (noop): new method.
-
- * lib/net/ftp.rb (site): ditto.
-
-Tue Jun 11 13:15:41 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * bcc32/Makefile.sub: set PROCESSOR_LEVEL to 6 if it's too big value.
-
- * win32/Makefile.sub: ditto.
-
-Tue Jun 11 12:37:46 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * bcc32/configure.bat fix.
-
-Tue Jun 11 10:18:23 2002 KONISHI Hiromasa <konishih@fd6.so-net.ne.jp>
-
- * new platform [bccwin32] merged.
- - create new folder bcc32
- - modify any files for bccwin32
- error.c, file.c, hash.c, io.c, instruby.rb,
- ext/extmk.rb.in,
- lib/mkmf.rb, lib/ftools.rb,
- ext/digest/defs.h,
- ext/dl/depend, ext/dl/dl.c, ext/dl/sym.c, ext/dl/extconf.rb,
- ext/socket/extconf.rb,
- ext/pty/extconf.rb,
- ext/tcltklib/extconf.rb
- ext/Win32API/Win32API.c,
- win32/dir.h, win32/win32.c, win32/win32.h, win32/resource.rb
-
-Mon Jun 10 19:02:19 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * numeric.c (fix_lshift): negative shift count means right shift.
- (ruby-bugs-ja:PR#248)
-
- * numeric.c (fix_rshift): return -1 when left side operand is
- negative. (ruby-bugs-ja:PR#247)
-
- * parse.y (yylex): `0_' should be an error. (ruby-bugs-ja:PR#249)
-
-Mon Jun 10 01:53:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): ruby_frame->last_func may be null, if it's
- called outside of a method.
-
- * parse.y (arg): use INT2NUM, not INT2FIX for tUMINUS.
-
- * parse.y (arg): unnecessary negative tPOW treatment.
-
- * parse.y (tokadd_escape): wrong backslash escapement.
-
-Sun Jun 9 17:40:41 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl: change the callback mechanism.
-
-Sat Jun 8 00:48:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (stmt,arg): too much void value check.
-
- * parse.y (stmt,arg): need to check void value on rules which does
- not use node_assign().
-
-Thu Jun 6 19:50:39 2002 KONISHI Hiromasa <H_Konishi@ruby-lang.org>
-
- * sample/biorhythm.rb (getPosiiton,etc)
- fix at changing Date module ( Date is changed Fixnum to Rational )
-
-Thu Jun 6 17:42:39 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (ipaddr): need not to taint hostnames.
-
-Thu Jun 6 12:04:30 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): use sub! instead of []= because
- []= causes exception.
-
-Thu Jun 6 11:42:15 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * lib/thread.rb (Queue::pop): get rid of race condition.
-
-Wed Jun 5 01:56:47 2002 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c: Stop the running zombi-eventloop when
- mainloop_watchdog is killed.
-
-Tue Jun 4 23:09:24 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_include): should be based on "<=>", whereas
- member? still is based on "each".
-
- * range.c (range_min,range_max): redefine methods based on "<=>".
-
-Tue Jun 4 18:28:37 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/extconf.rb: The IPv6 stack of Cygwin is still incomplete.
-
- * ext/Win32API/extconf.rb: refactoring.
-
-Tue Jun 4 07:03:33 2002 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
-
- * ext/tk/lib/tkfont.rb: Fix bugs on TkFont.init_widget_font for Tk8.x.
-
- * ext/tk/lib/tkafter.rb: Add self to 1st argument of interval-
- and loop-proc
- TkAfter#current_interval returns an interval (sleep) time value
- TkAfter#current_args returns an array of arguments
- TkAfter#return_value returns a return value of last loop-proc
-
- * ext/tk/lib/tk*.rb: Allow to use Symbols for parameters.
-
- * ext/tk/lib/tkcanvas.rb: (TkcItem) Add 'coords' parameter to the
- canvas item constructor (for new notation of constructor).
-
- * ext/tcltklib/tcltklib.c: New 'mainloop' and 'mainloop_watchdog'.
-
- * ext/tk/lib/tk.rb: (Tk.restart) Add 'app-name' paramater and
- 'use' parameter.
-
- * ext/tk/lib/tk.rb: Add new parameter 'widgetname' to the widget
- constructor to support effective use of Resource Database.
-
- * ext/tk/lib/tk.rb: TkOption::get always returns a tainted string.
-
-Tue Jun 4 00:45:50 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/socket/addrinfo.h: typo.
-
- * ext/socket/getaddrinfo.c (gai_strerror): make literals const.
-
- * ext/socket/socket.c (init_inetsock): ensures resources are
- freed at exceptions.
-
- * ext/socket/socket.c (init_unixsock): ditto.
-
- * ext/socket/socket.c (udp_connect): ditto.
-
-Mon Jun 3 20:39:51 2002 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole/extconf.rb : change PLATFORM with RUBY_PLATFORM.
-
-Mon Jun 3 07:07:07 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (here_document): check if identifier is terminated.
- (ruby-bugs-ja:PR#239)
-
- * parse.y (yylex): should pushback proper char after '**'.
- (ruby-bugs-ja:PR#240)
-
-Mon Jun 3 05:56:17 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_aset): should raise error if an indexing string
- is not found in the receiver.
-
- * sprintf.c (rb_f_sprintf): "%d" should convert objects into
- integers using Integer().
-
-Sat Jun 1 19:20:07 2002 Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
- * ext/win32ole: merge from rough.
-
-Fri May 31 17:11:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/tempfile.rb (Tempfile::size): added.
-
-Thu May 30 12:52:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): iteration done using "+" if elements are
- Numeric. Otherwise using "succ".
-
- * range.c (range_each): iteration done using "succ". If the
- elements does not respond to "succ", raise TypeError. As a
- result, all Enumerable methods, e.g. collect, require elements
- to respond to "succ".
-
- * range.c (range_member): comparison done using "each", if
- elements are non-Numeric or no-"succ" objects. Otherwise
- compare using "<=>".
-
- * range.c (Init_Range): remove "size" and "length".
-
-Thu May 30 09:16:36 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/cgi.rb: if StringIO is usable then use it.
-
-Wed May 29 18:55:47 2002 KONISHI Hiromasa <H_Konishi@ruby-lang.org>
-
- * function renames my* and win32_* to rb_w32_* in win32/win32.c
- fixed files win32/win32.c, win32/win32.h, win32/dir.h,
- hash.c, rubysig.h, signal.c, ext/socket/socket.c
-
-Wed May 29 17:32:55 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * time.c (tmcmp, search_time_t): activate unless HAVE_TIMEGM.
-
-Wed May 29 13:45:15 2002 Wakou Aoyama <wakou@ruby-lang.org>
-
- * lib/cgi.rb: not use const if GET, HEAD. check multipart form head.
-
-Tue May 28 17:56:02 2002 Sean Chittenden <sean@ruby-lang.org>
-
- * parse.y: yyparse #defines moved from intern.h
-
- * ruby.c (proc_options): access prefixed "ruby_yydebug".
-
- * applied modifies to pacify some of gcc -Wall warnings.
-
-Tue May 28 14:07:00 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): no more ugly hack for "**", so that "-2**2" to be
- parsed as "(-2)**2", whereas "- 2**2" or "-(2)**2" to be parsed
- as "-(2**2)".
-
- * parse.y (yylex): '-2' to be literal fixnum. [new]
-
-Tue May 28 12:13:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (scope_node): trick to keep the node has a scope.
-
- * eval.c (rb_eval): NODE_EVSTR: write back local_tbl to the node.
-
- * eval.c (rb_eval): NODE_SCOPE: hold the scope node in ruby_scope.
-
- * eval.c (module_setup): ditto.
-
- * eval.c (rb_call0): ditto.
-
- * node.h (NEW_DASGN, NEW_DASGN_CURR): remove surplus semicolons.
-
-Fri May 24 09:06:29 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_arg): nil test against v[6] (usec).
-
-Thu May 23 16:39:21 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ruby.c (proc_options): option parsing problem.
- (ruby-bugs-ja:PR#233)
-
-Thu May 23 09:13:56 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): removed "-*-" support for #! line.
-
- * io.c (rb_io_s_sysopen): new method to get a raw file
- descriptor. [new]
-
- * ext/socket/socket.c (tcp_sysaccept): new method to return an
- accepted socket fd (integer). [new]
-
- * ext/socket/socket.c (unix_sysaccept,sock_sysaccept): ditto.
-
-Wed May 22 21:26:47 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ruby.c (proc_options): -T consumes digits only.
-
-Wed May 22 20:18:31 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: need not link vsnprintf.o on MinGW.
-
-Wed May 22 18:34:23 2002 Minero Aoki <aamine@loveruby.net>
-
- * parse.y (yylex): Here-document label ate '-'.
-
-Tue May 21 13:25:18 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-font-lock-keywords): symbols end with
- '_'.
-
-Tue May 21 04:48:37 2002 Sean Chittenden <sean@chittenden.org>
-
- * lib/cgi-lib.rb: Checking for constant MOD_RUBY instead of
- environment variable. Remove a mod_ruby warning and use
- Apache::request.headers_out[] instead.
-
-Tue May 21 01:16:46 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (bodystmt): ensure clause was executed on else clause
- without rescue clause.
-
-Tue May 21 00:20:25 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl/ptr.c: rename PtrData::alloc to PtrData::malloc.
-
- * ext/dl/lib/dl/struct.c: rename Struct#alloc to Struct#malloc.
-
-Mon May 20 14:29:14 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): should do exact match for Module#==.
-
- * compar.c (cmp_eq): returns 'false' if <=> returns 'nil'.
-
- * compar.c (cmp_gt,cmp_ge,cmp_lt,cmp_le,cmp_between): ditto.
-
-Mon May 20 13:28:52 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * io.c (rb_io_clone): writing stream was not copied properly.
-
-Sat May 18 21:38:11 2002 Tadayoshi Funaba <tadf@dotrb.org>
-
- * lib/date.rb, lib/date/format.rb, lib/parsedate.rb:
- updated to the new version (based on date2 3.2.1).
-
-Sat May 18 21:18:00 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.h): add VC++4/5 support about noreturn
- directive.
-
-Sat May 18 02:16:41 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): should propagate taintedness.
-
- * pack.c (pack_unpack): ditto.
-
-Fri May 17 16:16:19 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * sample/test.rb: use eval instead of './miniruby -c',
- in order to check a syntax error.
-
-Thu May 16 14:46:34 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_select): cleanup conditional compilation.
-
-Wed May 15 06:13:35 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_schedule): need to preserve errno before
- calling rb_trap_exec().
-
- * regex.c (calculate_must_string): a bug in charset/charset_not
- parsing.
-
-Tue May 14 18:17:44 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * win32/Makefile.sub: config.h inlined. and catch up with the
- latest change.
-
- * win32/config.h.in: no longer used.
-
-Tue May 14 14:49:05 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * gc.c (is_pointer_to_heap): avoid GCC 3.1 warnings.
-
- * missing/strftime.c (timezone): it should take no argument on Cygwin.
-
-Tue May 14 03:07:35 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_clear_cache_by_class): new function.
-
- * eval.c (set_method_visibility): should have clear cache for
- updated visibility.
-
-Mon May 13 14:38:33 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * djgpp/config.hin, djgpp/config.sed: catch up with the latest change.
-
-Mon May 13 01:59:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_to_s): default format precision to be "%.16g".
-
- * util.c (ruby_strtod): use own strtod(3) implementation to avoid
- locale hell. Due to this change "0xff".to_f no longer returns 255.0
-
-Sun May 12 03:01:08 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * missing.h: add for missing/*.c.
-
- * ruby.h: add `#include "missing.h"'.
-
- * Makefile.in: add the dependency of missing.h by gcc -MM.
-
- * MANIFEST: add missing.h
-
-Sat May 11 23:24:52 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl: enable dl's stack emulation for constructing function call.
-
-Sat May 11 10:52:09 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * dir.c (glob_helper): remove escaping backslashes.
-
-Sat May 11 02:46:43 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (avalue_to_yvalue): new function to distinguish yvalue
- (no-arg == Qundef) from svalue (no-arg == Qnil).
-
- * eval.c (rb_yield_0): use avalue_to_yvalue().
-
- * eval.c (assign): warn if val == Qundef where it means rhs is
- void (e.g. yield without value or call without argument).
-
-Fri May 10 19:00:47 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * parse.y (here_document): preserve line number begins here
- document.
-
-Fri May 10 01:55:44 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_thread_join): added an argument to limit time to wait
- the thread.
-
- * eval.c (rb_thread_join_m): new. and added optional argument.
-
-Wed May 8 23:48:40 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (value_expr): need not to warn for WHILE and UNTIL,
- since they can have return value (via valued break).
-
-Tue May 7 17:13:40 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: forgot to add '-Wl,' to the gcc option on Cygwin/MinGW.
-
-Tue May 7 15:41:33 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/iconv/iconv.c (iconv_try): should initialize exceptions
- properly. (ruby-bugs-ja:PR#232)
-
-Tue May 7 15:28:03 2002 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (rb_yield_0): The destination of the goto jump was wrong.
-
-Tue May 7 09:17:51 2002 Minero Aoki <aamine@loveruby.net>
-
- * eval.c (superclass): undesirable "unexpected return" when the
- superclass is not a Class.
-
-Sun May 5 06:53:45 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb: exclude topdir from the system configuration
- section and prevent it from being overridden.
-
-Fri May 3 20:19:00 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: add #include <errno.h> in AC_CHECK_DECLS().
-
- * win32/config.h.in: define HAVE_DECL_SYS_NERR.
-
-Thu May 2 23:42:40 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_s_quote): # also should be quoted.
-
-Thu May 2 18:27:13 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb: use 'do...end' instead of '{}' for
- Borland make.
-
-Thu May 2 08:01:56 2002 Chris Thomas <kenshin@apple.com>
-
- * error.c: use HAVE_DECL_SYS_NERR instead of platform names.
-
-Tue Apr 30 09:23:05 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_step): better iteration condition for float
- values; suggested by Masahiro TANAKA <masa@ir.isas.ac.jp>.
-
-Tue Apr 30 05:59:42 2002 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * range.c (range_step): step (for Range#step method) <= 0 makes no
- sense, thus ArgError will be raised.
-
- * range.c (range_each): Range#each method is special case for
- Range#step(1)
-
-Mon Apr 29 18:46:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_find_file): load must be done from an absolute path if
- $SAFE >= 4.
-
-Sun Apr 28 17:01:56 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (insert): fix prototype for ANSI C.
-
-Fri Apr 26 13:47:15 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_partition): new method. [new]
-
-Fri Apr 26 13:41:00 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_s_quote): quote whitespaces for /x cases.
-
-Fri Apr 26 06:48:23 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl/ptr.c (cary2ary): missing break in switch statements.
-
-Fri Apr 26 09:35:47 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_proc_new): make Proc from C function. [new]
-
- * intern.h (rb_proc_new): prototype.
-
-Wed Apr 24 14:56:46 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (proc_to_proc): return self. [new]
-
- * eval.c (block_pass): no need to convert if block is Proc.
-
-Wed Apr 24 14:21:41 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: set size of the initial stack from
- 2MB to 32MB on MinGW/Cygwin.
-
-Wed Apr 24 14:06:35 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_step): try to reduce residual on Float operations.
-
-Wed Apr 24 06:48:31 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed.
-
- * io.c (rb_io_mode_modenum): ditto.
-
-Wed Apr 24 01:16:14 2002 Nobuyoshi Nakada <nobu@ruby-lang.org>
-
- * ext/stringio/stringio.c (strio_mark): must check if ptr is NULL
- first. [ruby-talk:38873]
-
- * lib/mkmf.rb (create_makefile): should print depend file when
- make is other than nmake.
-
-Wed Apr 24 00:37:12 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/extmk.rb.in (create_makefile): use `{$(srcdir)}' directive instead
- of `$(srcdir)/' when including depend file.
-
- * lib/mkmf.rb (create_makefile): add `{$(srcdir)}' when including depend
- file.
-
-Tue Apr 23 12:58:18 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_memerror): rename from mem_error, and exported.
-
- * gc.c (Init_GC): pre-allocate NoMemoryError instance.
-
- * object.c (convert_type): error message changed from "failed to
- convert" to "cannot convert", since it does not try to convert
- if an object does not respond to the converting method.
-
-Mon Apr 22 09:31:30 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (block_pass): convert Method to Proc using
- rb_check_convert_type().
-
- * object.c (rb_check_convert_type): always convert T_DATA
-
- * eval.c (rb_thread_cleanup): should not terminate main_thread by
- Fatal error.
-
- * regex.c (is_in_list): need to not exclude NUL and NEWLINE.
-
-Sat Apr 20 00:19:13 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_expr_str): wrong backslash escapement.
-
- * re.c (rb_reg_expr_str): do not escape embedded space
- characters.
-
-Fri Apr 19 22:03:40 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub: add -DNT to $CFLAGS instead of $CPPFLAGS.
-
- * win32/setup.mak: ditto.
-
-Fri Apr 19 17:24:22 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): T_DATA process patch from Joel VanderWerf
- <vjoel@PATH.Berkeley.EDU>. This is temporary hack; it remains
- undocumented, and it will be removed when marshaling is
- re-designed.
-
- * marshal.c (r_object): ditto.
-
-Fri Apr 19 17:10:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_step): Integer#step is moved to Numeric#step;
- Fixnum#step is merged into this method.
-
- * numeric.c (int_dotimes): Fixnum#times is merged.
-
- * numeric.c (int_upto): Fixnum#upto is merged.
-
- * numeric.c (int_downto): Fixnum#downto is merged.
-
-Fri Apr 19 16:22:55 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/extconf.rb: include <windows.h>, <winsock.h> on _WIN32.
-
- * win32/win32.c: include <mswsock.h> on __MINGW32__.
-
- * configure.in: cleanup for autoconf 2.5x.
-
- * configure.in: use gcc -shared instead of dllwrap on Cygwin/MinGW.
-
- * ext/extmk.rb, lib/mkmf.rb: get rid of "--def=".
-
-Fri Apr 19 14:57:44 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * re.c (rb_reg_to_s): remove redundant shy group.
-
-Fri Apr 19 01:08:20 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_cleanup): current thread may be THREAD_STOPPED,
- for example when terminated from signal handler.
-
-Thu Apr 18 19:03:15 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): remove /p support.
-
- * regex.h: ditto.
-
- * parse.y (parse_regx): ditto.
-
-Thu Apr 18 17:01:43 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl/ptr.c (rb_dlptr_cast): removed.
-
-Thu Apr 18 17:01:43 2002 Tanaka Akira <akr@m17n.org>
-
- * re.c (rb_reg_to_s): new function for Regexp#to_s.
-
-Wed Apr 17 23:55:34 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/Setup*, ext/bigfloat/*: Back out the import of BigFloat in
- favor of its forthcoming successor, BigDecimal.
-
-Wed Apr 17 16:53:33 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_expr_str): should treat backslash specially in
- escaping.
-
-Wed Apr 17 08:16:41 2002 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * io.c: complete off_t handling; missing argument for
- fptr_finalize(); polished rb_scan_args call.
-
-Wed Apr 17 00:01:59 2002 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * dir.c: wrap multi-statement macro by do { } while (0)
-
- * eval.c, numeric,c, sprintf.c, util.c: ditto.
-
-Tue Apr 16 08:59:50 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (assign): convert mrhs to mvalue.
-
-Mon Apr 15 18:12:57 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_eq): check `y == x' if y is neither Fixnum,
- Bignum, nor Float.
-
-Mon Apr 15 09:27:31 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_unpack): should treat 'U' in character unit, not in
- byte unit.
-
- * error.c (exc_initialize): should clear backtrace information.
-
-Sat Apr 13 23:42:43 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_fptr_cleanup): should close IO created by IO.new(fd).
-
- * rubyio.h: remove FMODE_FDOPEN
-
-Fri Apr 12 12:54:04 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * win32/Makefile.sub: use missing/acosh.c.
-
- * win32/config.h.in: define HAVE_COSH, HAVE_SINH, and HAVE_TANH.
-
-Fri Apr 12 02:58:55 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * struct.c (rb_struct_select): fix typo.
-
-Fri Apr 12 00:34:17 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * MANIFEST (missing/acosh.c): added.
-
- * Makefile.in (missing/acosh.c): ditto.
-
- * Makefile.in (missing/fileblocks.c): ditto.
-
- * configure.in (AC_REPLACE_FUNCS): check acosh() on behalf of
- inverse hyperbolic functions, asinh() and atanh().
-
- * missing/acosh.c: added for acosh(), asinh() and atanh().
-
-Thu Apr 11 20:01:44 2002 Masahiro Tomita <tommy@tmtm.org>
-
- * io.c (io_write): check error if written data is less than
- specified size to detect EPIPE.
-
-Thu Apr 11 19:10:37 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (remain_size): IO#read returns "" if file.size == 0.
-
- * random.c (rand_init): add check for initstate(3).
-
- * configure.in: ditto.
-
-Thu Apr 11 09:31:19 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl/ptr.c: raise() -> rb_raise(). (Thanks Tetsuya Watanabe)
-
- * ext/dl/sym.c: ditto.
-
-Thu Apr 11 07:57:48 2002 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * eval.c (assign): ruby_verbose should be surrounded by RTEST().
-
- * object.c (rb_str2cstr): ditto.
-
- * parse.y (void_expr): ditto.
-
- * parse.y (void_stmts): ditto.
-
- * variable.c (rb_ivar_get): ditto.
-
- * variable.c (rb_cvar_set): ditto.
-
- * variable.c (rb_cvar_get): ditto.
-
-Thu Apr 11 07:02:31 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl: Add dl.txt instead of README and README.html.
-
-Thu Apr 11 01:55:52 2002 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi/session.rb: support for multipart form.
-
-Wed Apr 10 18:42:23 2002 Tachino Nobuhiro <tachino@jp.fujitsu.com>
-
- * dir.c (glob_helper): should have proceed link when link->path
- was non existing symbolic link.
-
-Wed Apr 10 17:30:19 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_obj_remove_instance_variable): raise NameError if
- specified instance variable is not defined.
-
- * variable.c (generic_ivar_remove): modified to check ivar
- existence.
-
-Wed Apr 10 14:16:45 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * misc/ruby-mode.el (ruby-font-lock-keywords): fontify symbols for
- unary operators and aset.
-
-Tue Apr 9 13:40:31 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * lib/mkmf.rb (try_link0): need expand macro in command, sync with
- ext/extmk.rb.in.
-
- * lib/mkmf.rb (try_cpp): ditto.
-
- * lib/mkmf.rb (egrep_cpp): ditto.
-
-Tue Apr 9 12:44:59 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/stringio/stringio.c (check_modifiable): performance
- improvement. avoid calling rb_str_modify() twice.
-
- * ext/stringio/stringio.c (strio_ungetc): ditto.
-
- * ext/stringio/stringio.c (strio_putc): ditto.
-
- * ext/stringio/stringio.c (strio_write): ditto, and use
- rb_str_cat() as possible.
-
-Tue Apr 9 05:17:48 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * re.c (match_select): fix index references and make
- MatchData#select actually work.
-
-Tue Apr 9 00:20:52 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_s_extname): new method based on the proposal
- (and patch) from Mike Hall. [new]
-
-Mon Apr 8 04:50:51 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (error_handle): default to 1 unless status is set.
-
- * eval.c (ruby_options): guard error_handle() with PROT_NONE.
-
- * eval.c (ruby_stop): ditto.
-
-Mon Apr 8 01:22:24 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * math.c (math_acosh): added. [new]
-
- * math.c (math_asinh): ditto.
-
- * math.c (math_atanh): ditto.
-
- * struct.c (rb_struct_each_pair): method added. [new]
-
-Sat Apr 6 02:04:49 2002 Guy Decoux <ts@moulon.inra.fr>
-
- * class.c (rb_singleton_class): wrong condition; was creating
- unnecessary singleton class.
-
-Sat Apr 6 01:09:41 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * sprintf.c (remove_sign_bits): simplifies the condition.
-
- * bignum.c (get2comp): calculate proper carry over.
-
-Fri Apr 5 05:07:28 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl: Add dl/struct.rb.
-
-Thu Apr 4 14:08:52 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl/lib/dl/import.rb: Get rid of ineffective
- encoding/decoding procedures.
-
-Thu Apr 4 01:08:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (int_step): step may be a float less than 1.
-
-Wed Apr 3 20:42:34 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl: Merge Nakada's patch.
-
- * ext/dl/dl.h: define StringValuePtr for ruby-1.6.
-
-Wed Apr 3 15:37:24 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl: Add dl/types.rb.
-
-Wed Apr 3 01:54:10 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/extmk.rb.in (enable_config): follow lib/mkmf.rb.
-
-Tue Apr 2 19:59:13 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * ext/dl: Merge from rough.
-
-Tue Apr 2 15:17:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * Makefile.in (CPPFLAGS): remove @includedir@.
-
- * lib/mkmf.rb (create_makefile): ditto.
-
- * ext/extmk.rb.in (create_makefile): ditto.
-
-Tue Apr 2 15:09:05 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/socket.c (sock_addrinfo): should clear addrinfo hints.
-
-Mon Apr 1 23:48:12 2002 Takaaki Tateishi <ttate@kt.jaist.ac.jp>
-
- * lib/mkmf.rb: install any files using $INSTALLFILES.
- (see also [ruby-dev:16683])
-
-Mon Apr 1 17:25:50 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_fptr_cleanup): need flush even when io will not be
- closed.
-
- * io.c (rb_io_initialize): was calling wrong function
- rb_io_mode_flags().
-
-Mon Apr 1 16:52:00 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/sdbm/init.c (each_pair): moved prototype before the
- definition.
-
- * ext/racc/cparse/cparse.c (call_scaniter): ditto.
-
-Mon Apr 1 15:11:40 2002 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * ext/racc/cparse/cparse.c: prototype; call_scaniter().
-
- * ext/sdbm/init.c: prototype; each_pair().
-
- * ext/tcltklib/tcltklib.c: prototypes; _timer_for_tcl() and ip_ruby(),
- Nobu's patch at [ruby-dev:14483].
-
-Mon Apr 1 10:56:40 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (match_setter): it's OK to assign nil to $~.
-
-Mon Apr 1 03:55:46 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_fptr_cleanup): do not close IO created by for_fd().
-
- * io.c (rb_io_initialize): mark IO created by for_fd
-
- * ext/socket/socket.c (bsock_s_for_fd): ditto.
-
-Fri Mar 29 20:21:58 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * lib/mkmf.rb (create_makefile): default FLAGS to empty strings.
-
-Fri Mar 29 16:36:52 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * lib/mkmf.rb (arg_config): should use Shellwords::shellwords like
- ext/extmk.rb.in.
-
- * lib/mkmf.rb (enable_config): default had priority over command
- line options and configure_args.
-
- * lib/mkmf.rb: support autoconf 2.53 style variables from
- environment.
-
- * lib/mkmf.rb: add directory options.
-
-Fri Mar 29 15:49:29 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/README.win32: follow recent changes.
-
-Fri Mar 29 14:44:05 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fflush): DRY patch from /Christoph applied.
-
-Thu Mar 28 18:58:13 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): reflect user defined $CC in
- config.status.
-
-Thu Mar 28 18:03:51 2002 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/strscan.c: add taint check.
-
- * ext/strscan/strscan.c: #getch/#get_byte should set regexp
- registers.
-
- * ext/strscan/strscan.c: remove useless #include directive.
-
- * ext/strscan/strscan.c: refactor struct strscanner.
-
-Thu Mar 28 14:51:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_addrinfo): should specify socktype
- from outside.
-
-Wed Mar 27 17:04:30 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_binmode): should call next_argv() to initialize ARGF.
-
- * io.c (argf_filename): ditto.
-
- * io.c (argf_file): ditto.
-
-Wed Mar 27 14:47:32 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (READ_DATA_PENDING): configure.in has supported for uClibc,
- so remove uClibc stuff.
-
-Wed Mar 27 13:14:43 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_sysseek): new method based on a patch from Aristarkh
- A Zagorodnikov <xm@bolotov-team.ru>. [new]
-
- * io.c (READ_DATA_PENDING): use !feof(fp) for default behavior.
-
-Tue Mar 26 20:28:50 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: HTTP.get accepts URI.
-
- * lib/net/http.rb: new method HTTP.get_uri.
-
- * lib/net/http.rb: add some HTTP 1.1 response codes.
-
-Tue Mar 26 20:25:28 2002 Minero Aoki <aamine@loveruby.net>
-
- * doc/net/protocol.rd.ja, smtp.rd.ja, pop.rd.ja: removed.
-
- * MANIFEST: remove doc/net/* entries.
-
-Tue Mar 26 18:45:15 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (FILE_READPTR): check bufread instead of bufend
- for uClibc.
-
- * ext/extmk.rb.in (arg_config): should use Shellwords::shellwords.
-
-Tue Mar 26 01:56:33 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): while/until statement modifiers to "begin"
- statement now work as "do .. while" even when begin statement
- has "rescue" or "ensure" [new].
-
- * parse.y (bodystmt): rescue/ensure is allowed at every bodies,
- i.e. method bodies, begin bodies, class bodies[new], and module
- bodies[new].
-
-Mon Mar 25 22:10:04 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_addrinfo): should specify ai_socktype
- for getaddrinfo hints.
-
-Mon Mar 25 17:18:48 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * dir.c (rb_push_glob): local variable 'maxnest' was
- uninitialized.
-
-Mon Mar 25 16:53:30 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_abort): embed aborting message into exception
- object [new].
-
- * eval.c (terminate_process): utility function for exit and abort.
-
-Tue Mar 26 14:04:47 2002 okabe katsuyuki <HGC02147@nifty.ne.jp>
-
- * win32/mkexports.rb: support VC++.NET.
-
-Tue Mar 26 14:00:17 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/bigfloat/bigfloat.c: Fix the initializer's function name
- according to the new library name. (pointed out by nobu)
-
-Tue Mar 26 11:12:01 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/fileutils.rb: new file.
-
-Tue Mar 26 03:23:50 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (pp): return nil like p.
-
-Tue Mar 26 01:48:01 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/bigfloat/extconf.rb: Downcase the library name. (BigFloat.so
- -> bigfloat.so)
-
- * ext/bigfloat/bigfloat.c (BigFloat_inspect): Alter the inspect
- format not to look like an array. (pointed out by akr)
-
- * ext/bigfloat/bigfloat.c (BigFloat_hash): Implement BigFloat#hash.
-
- * ext/bigfloat/bigfloat.c (BigFloat_dump, BigFloat_load):
- Support marshaling.
-
-Tue Mar 26 00:38:11 2002 Tanaka Akira <akr@m17n.org>
-
- * configure.in (FILE_READPTR): check _p for 4.4BSD.
-
-Mon Mar 25 23:39:25 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * configure.in (FILE_READPTR): new. for IO#gets improvement.
-
- * io.c (READ_DATA_PENDING_PTR): ditto.
-
- * io.c (remain_size): separated from read_all().
-
- * io.c (read_all): argument changed.
-
- * io.c (appendline): new. get a line and append to string.
-
- * io.c (swallow): new. swallow continuous line delimiters.
-
- * io.c (rb_io_getline_fast): add delimiter argument.
-
- * io.c (rb_io_getline): performance improvement.
-
-Mon Mar 25 19:30:25 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in (arg_config): get rid of single quotes
- for autoconf 2.53.
-
-Mon Mar 25 17:49:41 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * regex.c (mbc_startpos_func): VC6 seems to be unable to
- understand forward declaration for static variables.
-
- * dir.c (rb_push_glob): local variable 'maxnest' was
- uninitialized.
-
-Mon Mar 25 13:24:20 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (bsock_do_not_rev_lookup_set): should not be
- allowed when $SAFE > 3.
-
- * eval.c (rb_thread_ready): THREAD_TO_KILL threads should not turn
- into THREAD_RUNNABLE on wakeup.
-
- * eval.c (rb_thread_list): THREAD_TO_KILL threads should be in the
- list.
-
- * eval.c (thgroup_list): ditto; by moving gid clearance from
- rb_thread_cleanup().
-
-Mon Mar 25 11:06:19 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * dln.c (dln_argv0): unused unless USE_DLN_A_OUT.
-
- * regex.c (mbc_startpos_func): should be static.
-
-Sun Mar 24 12:19:09 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * dir.c (fnmatch): "*/bar" (with FNM_PATHNAME flag) does not
- match "foo/bar".
-
-Sun Mar 24 00:46:05 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * util.c (push_element): avoid warning for djgpp.
-
-Sat Mar 23 01:50:30 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (read_all): files on /proc filesystem with zero stat size,
- may have contents.
-
-Fri Mar 22 18:07:29 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (tcp_s_gethostbyname): refactored.
-
- * ext/socket/socket.c (sock_s_gethostbyname): ditto.
-
-Fri Mar 22 16:46:54 2002 Minero Aoki <aamine@loveruby.net>
-
- * ext/extmk.rb.in: replace mkdir with mkpath to compile racc/cparse.
-
-Fri Mar 22 16:22:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * the VMS support patch submitted by Akiyoshi, Masamichi
- <Masamichi.Akiyoshi@jp.compaq.com> is merged.
-
-Fri Mar 22 16:27:24 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/racc/parser.rb: new file.
-
- * ext/racc/MANIFEST, cparse.c, depend, extconf.rb: new files.
-
- * lib/README: add racc/parser.rb.
-
- * ext/Setup*: add racc/cparse.
-
-Fri Mar 22 15:04:03 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (exec_under): changing ruby_class is OK, but should not
- alter cbase.
-
- * eval.c (yield_under_i): ditto.
-
-Fri Mar 22 15:44:38 2002 Minero Aoki <aamine@loveruby.net>
-
- * ext/strscan/MANIFEST, strscan.c, depend, extconf.rb: new files.
-
- * ext/Setup*: add strscan entry.
-
-Fri Mar 22 14:32:14 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: Protocol#start should return self.
-
-Fri Mar 22 14:14:21 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/resolv.rb: fix arguments to create exceptions.
- Patch from matt@lickey.com. (ruby-bugs:PR#278)
-
-Fri Mar 22 13:51:11 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/bigfloat/.cvsignore, ext/bigfloat/MANIFEST: BigFloat 1.1.8
- has been imported. Add .cvsignore and MANIFEST.
-
-Fri Mar 22 04:07:55 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * sprintf.c (rb_f_printf): discard meaningless prefix ".." for '%u'.
-
-Thu Mar 21 01:11:37 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/Makefile.sub (config.status): fix install path (prefix).
-
-Thu Mar 21 01:03:05 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/configsub.rb: latest autoconf style support.
-
-Wed Mar 20 22:16:25 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * mkconfig.rb: close duplicated $stdout before renaming rbconfig.rb.
-
-Wed Mar 20 21:54:17 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * win32/Makefile.sub: made variables configurable.
-
- * win32/Makefile.sub (config.h): updates RUBY_PLATFORM from
- Makefile.
-
- * win32/Makefile.sub (config.status): ditto. and use recent
- autoconf format.
-
- * win32/Makefile.sub (clean): separate ext and local clean up.
-
- * win32/Makefile.sub (distclean): ditto.
-
- * win32/config.status.in: no longer used.
-
-Wed Mar 20 20:12:35 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * variable.c (rb_const_list): a temporary table must be freed.
-
-Wed Mar 20 19:44:09 2002 Tanaka Akira <akr@m17n.org>
-
- * mkconfig.rb: don't touch rbconfig.rb if there is a trouble.
-
-Wed Mar 20 16:05:37 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): should check receiver only once.
-
- * eval.c (is_defined): should handle NODE_NEWLINE.
-
-Wed Mar 20 11:29:25 2002 Aristarkh A Zagorodnikov <xm@xml-objects.com>
-
- * file.c (rb_file_s_expand_path): memory leak fixed.
-
-Wed Mar 20 00:36:43 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * util.c (ruby_getcwd): the content of buf is uncertain and must
- not be printed when getcwd(buf, size) has failed.
-
-Mon Mar 18 22:19:52 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/stringio/stringio.c (check_modifiable): wrong declaration.
-
-Mon Mar 18 18:04:05 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/digest: add depend file.
-
- * ext/digest/md5: ditto.
-
- * ext/digest/rmd160: ditto.
-
- * ext/digest/sha1: ditto.
-
- * ext/digest/sha2: ditto.
-
- * ext/iconv/MANIFEST: ditto.
-
- * ext/stringio/MANIFEST: ditto.
-
- * ext/syslog: ditto.
-
-Mon Mar 18 17:18:06 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_f_abort): should not bypass cleanup.
-
- * ext/stringio/stringio.c (check_modifiable): void function.
-
-Mon Mar 18 12:52:01 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/iconv/extconf.rb: workaround for GNU libiconv.
-
-Mon Mar 18 10:55:03 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (parse_string): part of multi-byte sequence must not
- match to paren.
-
- * parse.y (parse_qstring): ditto.
-
- * parse.y (parse_quotedwords): ditto.
-
- * parse.y (str_extend): handle multi-byte characters.
-
-Mon Mar 18 10:31:20 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * enum.c (enum_find): catch a value before recycle.
-
- * enum.c (enum_all): ditto.
-
- * enum.c (enum_any): ditto.
-
- * enum.c (enum_min): ditto.
-
- * enum.c (enum_max): ditto.
-
-Sun Mar 17 20:08:04 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/iconv/depend: added.
-
- * ext/stringio/depend: added.
-
-Sat Mar 16 22:43:53 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * missing/fileblocks.c: add for autoconf.
-
-Sat Mar 16 15:30:40 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_search): should clear last_match if pos is out of
- string range.
-
- * string.c (rb_str_index_m): ditto.
-
- * string.c (rb_str_rindex): ditto.
-
-Sat Mar 16 09:04:58 2002 Koji Arai <JCA02266@nifty.ne.jp>
-
- * enum.c (enum_inject): use the first iterated element as the
- initial value when omitted.
-
- * enum.c (inject_i): ditto.
-
- * enum.c (Init_Enumerable): Enumerable#inject now takes variable
- count arguments.
-
-Fri Mar 15 19:47:31 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * win32/win32.c (StartSockets): remove duplicated lines.
-
-Fri Mar 15 17:44:08 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * bignum.c, intern.h (rb_ull2big, rb_ll2big, rb_ull2inum, rb_ll2inum,
- big2ull, rb_big2ull, rb_big2ll): use LONG_LONG macro instead of
- long long.
-
- * numeric.c, intern.h, ruby.h (rb_num2ll, rb_num2ull): ditto.
-
- * ruby.h: use _I64_MAX and _I64_MIN if they are defined (for VC++).
-
-Fri Mar 15 14:02:43 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/iconv/iconv.c: fixed document, Iconv#new is no longer an
- iterator. thanks to Tanaka Akira <akr@m17n.org>.
-
-Thu Mar 14 22:17:45 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/iconv: imported.
-
-Thu Mar 14 16:42:37 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_define_class): should handle autoload.
-
- * class.c (rb_define_module): ditto.
-
-Thu Mar 14 16:18:12 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: autoconf 2.53 support. use AC_LIBOBJ.
-
-Thu Mar 14 00:29:12 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_match): should clear $~ if operand is nil.
-
- * re.c (rb_reg_match2): ditto.
-
-Thu Mar 14 12:32:59 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/stringio/stringio.c: fixed frozen string bug. ungetc no
- longer raises on readonly stream unless modifies actually.
-
-Thu Mar 14 08:57:41 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * dir.c (rb_push_glob): avoid SEGV when a block given.
-
-Thu Mar 14 00:16:02 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * string.c (rb_str_subpat_set): must make str independent after
- rb_reg_search() matched.
-
-Wed Mar 13 19:05:15 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * dir.c: FNM_PERIOD is obsoleted and FNM_DOTMATCH is introduced
- instead, which has the opposite meaning of FNM_PERIOD.
-
- * dir.c: Dir::glob now accepts optional FNM_* flags via the second
- argument, whereas Dir::[] doesn't.
-
-Wed Mar 13 18:36:55 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/getopts.rb: single_options can be nil[*], and is not not
- optional. ([*]Pointed out by gotoken)
-
-Wed Mar 13 17:23:46 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure: merge Jonathan Baker's large file support patch
- [ruby-talk:35316], with read_all patch in [ruby-talk:35470].
-
-Wed Mar 13 04:06:48 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_abort): optional message argument that be printed
- on termination.
-
-Tue Mar 12 17:12:06 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/resolv.rb: don't complete domains for absolute FQNs.
-
-Mon Mar 11 23:08:48 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/tsort.rb: new file.
-
-Mon Mar 11 21:03:37 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/stringio: new.
-
-Mon Mar 11 18:03:37 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): '\0111' should be '\011' plus '1',
- since octal literals are formed by three digits at most.
-
-Mon Mar 11 14:44:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): module inclusion using extend() should
- also be detected.
-
- * eval.c (rb_eval_cmd): cbase should not be NULL; it should be
- either ruby_wrapper or Object.
-
-Sun Mar 10 02:18:22 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * enum.c (enum_each_with_index): should return self.
-
- * process.c (proc_setpgrp): should return value for non-void function.
-
- * process.c (proc_getpgid): should raise exception if getpgid() return -1.
-
- * string.c (rb_str_ljust): should return a duplicated string.
-
- * string.c (rb_str_rjust): ditto.
-
- * string.c (rb_str_center): ditto.
-
-Sat Mar 9 08:45:58 2002 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/extconf.rb (have_struct_member): don't print checked
- result.
-
-Fri Mar 8 12:19:15 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/resolv.rb: use its own thread group for background threads.
-
-Fri Mar 8 02:21:32 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (cvar_cbase): utility function to find innermost non
- singleton cbase.
-
- * eval.c (is_defined): adopt new cvar behavior.
-
- * eval.c (rb_eval): ditto.
-
- * eval.c (assign): ditto.
-
-Thu Mar 7 20:08:25 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * gc.c (rb_source_filename): added. holds unique strings for file
- names with GC space.
-
- * gc.c (rb_gc_mark): mark source file name.
-
- * gc.c (gc_sweep): ditto.
-
- * gc.c (Init_GC): initialize source file name table.
-
- * intern.h (rb_source_filename): added.
-
- * eval.c (rb_eval_string): use rb_source_filename().
-
- * parse.y (yycompile): ditto.
-
- * ruby.c (proc_options): ditto.
-
- * ruby.c (load_file): ditto.
-
- * ruby.c (ruby_script): ditto.
-
- * ruby.c (ruby_prog_init): ditto.
-
-Wed Mar 6 17:58:08 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dln.c (dln_load): use LoadLibrary instead of LoadLibraryEx.
-
-Wed Mar 6 16:50:37 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_mod_clone): should not call rb_obj_clone(), since
- Module does not provide "allocate".
-
- * class.c (rb_singleton_class): should create new singleton class
- if obj is a class or module and attached object is different,
- which means metaclass of singleton class is sought.
-
- * time.c (time_s_alloc): now follows allocation framework.
-
-Tue Mar 5 05:56:29 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/getopts.rb: Rewrite to fix some bugs and complete features.
- - Accept options with the colon in the first argument;
- getopts("a:bcd:") is equivalent to getopts("bc", "a:", "d:").
- - Do not discard the argument that caused an error.
- - Do not discard '-', which commonly stands for stdin or stdout.
- - Allow specifying a long option with a value using '='.
- (command --long-option=value)
- - Stop reading options when it meets a non-option argument.
-
-Mon Mar 4 13:19:18 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in (dir_config): Sync with mkmf.rb: Fix a bug where
- --with-xx-{include,lib} is ignored when --with-xx-dir is
- specified.
-
-Mon Mar 4 00:09:55 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should initialize outer class variables from
- methods in singleton class definitions.
-
- * eval.c (assign): ditto.
-
-Fri Mar 1 11:29:10 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): add const
- qualifier only for uClibc.
-
-Fri Mar 1 11:22:51 2002 Amos Gouaux <amos+ruby@utdallas.edu>
-
- * lib/net/imap.rb: added document.
-
- * lib/net/imap.rb (getquotaroot): new method.
-
- * lib/net/imap.rb (setacl): remove the rights if the rights
- parameter is nil.
-
- * lib/net/imap.rb (getacl): return an array of MailboxACLItem.
-
-Fri Mar 1 06:25:49 2002 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/extconf.rb (have_struct_member): new method.
- check msg_control and msg_accrights in struct msghdr. check
- sys/uio.h.
-
- * ext/socket/socket.c: include sys/uio.h if available.
- (thread_read_select): new function.
- (unix_send_io): ditto.
- (unix_recv_io): ditto.
- (unix_s_socketpair): ditto.
- (Init_socket): define UNIXSocket#send_io, UNIXSocket#recv_io,
- UNIXSocket.socketpair and UNIXSocket.pair.
-
- * dln.c (dln_load): fix typo.
-
-Wed Feb 27 16:30:50 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_include): load modules in argument order.
-
- * st.c (st_init_table_with_size): num_bins should be prime numbers
- (no decrement).
-
- * st.c (rehash): ditto.
-
-Wed Feb 27 13:18:49 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * io.c (READ_DATA_PENDING): uClibc support.
-
- * random.c (rand_init): ditto.
-
- * ext/socket/{addinfo.h,getaddrinfo.c} (gai_strerror): ditto.
-
-Wed Feb 27 07:05:17 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha2/sha2.c: Merge from rough. Fix a couple of
- off-by-one errors in Aaron Gifford's code.
-
- Obtained from: KAME via FreeBSD
- KAME PR: 393
- FreeBSD PR: kern/34242
-
-Wed Feb 27 03:36:47 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * ext/dbm/dbm.c (fdbm_select): 1.7 behavior.
-
- * ext/gdbm/gdbm.c (fgdbm_select): ditto.
-
- * ext/sdbm/sdbm.c (fsdbm_select): ditto.
-
- * ext/dbm/dbm.c (fdbm_delete): adopt Hash#delete behavior.
-
- * ext/sdbm/sdbm.c (fsdbm_delete): ditto.
-
- * ext/gdbm/gdbm.c: need not to dup key to the block.
-
- * ext/sdbm/sdbm.c : replace RuntimeError with SDBMError.
-
-Tue Feb 26 21:34:07 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * bignum.c (rb_big_2comp): void function cannot return any value.
-
-Tue Feb 26 16:52:12 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_missing): NoMethod error messages for true, false,
- nil must respond visibility like for other objects.
-
-Tue Feb 26 15:41:30 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): call trace_func for if/while conditions.
-
- * marshal.c (r_object): separate r_regist from proc calling.
-
-Tue Feb 26 11:25:50 2002 akira yamada <akira@arika.org>
-
- * lib/uri/generic.rb: merge0 should return [oth, oth] if oth is
- absolute URI.
-
- * lib/uri/generic.rb: registry part must not be allowed for any
- schemes for the Internet. (RFC2396, section 3.2.2 and 3.2.1.)
-
-Mon Feb 25 21:22:41 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syslog/syslog.c: Merge from rough. Use SafeStringValue().
-
-Mon Feb 25 21:12:08 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/syslog/syslog.c: Merge from rough. Turn Syslog into a
- module keeping backward compatibility intact.
-
-Mon Feb 25 19:35:48 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * sample/test.rb (system): test with scripts under the source
- directory.
-
-Mon Feb 25 15:14:01 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (method_inspect): should not dump core for unbound
- singleton methods.
-
- * object.c (rb_mod_to_s): better description.
-
-Mon Feb 25 13:32:13 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * lib/shell.rb (Shell::expand_path): relative to @cwd.
-
-Mon Feb 25 06:30:11 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * hash.c (env_select): should path the assoc list.
-
-Sun Feb 24 17:20:22 2002 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/*/*.h: Merge from rough.
- - Avoid namespace pollution. (MD5_* -> rb_Digest_MD5_*, etc.)
-
-Sat Feb 23 21:12:13 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_syswait): thread kludge; should be fixed to
- support native thread.
-
-Fri Feb 22 21:20:53 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: set read_timeout dynamically.
-
- * lib/net/http.rb: @@newimpl is always true in the main trunk.
-
- * lib/net/http.rb: HTTP.port -> default_port
-
- * lib/net/http.rb: HTTPResponse.read_response_status ->
- read_status_line
-
-Fri Feb 22 19:56:15 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/config.status.in: set LIBRUBY_SO.
-
-Fri Feb 22 03:34:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (get2comp): need to specify to carry or not.
-
- * io.c (rb_io_inspect): embed path info.
-
-Fri Feb 22 11:30:01 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/prettyprint.rb: FillGroup implemented.
-
-Thu Feb 21 21:40:18 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * ext/extmk.rb.in (create_makefile): remove unnecessary -L option from
- LIBS macro.
-
-Thu Feb 21 02:49:12 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * pack.c (pack_pack): wrong # comment treatment.
-
- * pack.c (pack_unpack): ditto.
-
-Wed Feb 20 15:15:03 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * intern.h: prototypes; rb_io_addstr(), rb_io_printf(),
- rb_io_print(), rb_io_puts()
-
- * io.c (rb_io_addstr): make extern.
-
- * io.c (rb_io_printf): ditto.
-
- * io.c (rb_io_print): ditto.
-
- * io.c (rb_io_puts): ditto.
-
-Wed Feb 20 13:41:35 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * io.c (rb_io_close): return Qnil.
-
-Wed Feb 20 12:41:59 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_any_cmp): should handle Qundef in keys.
-
- * eval.c (remove_method): should not remove a empty method to
- implement "undef".
-
- * eval.c (rb_eval): should allow singleton class def for
- true/false/nil.
-
-Tue Feb 19 21:43:32 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: rename Protocol.port to default_port.
-
- * lib/net/smtp.rb: ditto.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/http.rb: ditto.
-
- * lib/net/protocol.rb: rename BufferedSocket class to
- InternetMessageIO.
-
- * lib/net/smtp.rb: ditto.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/http.rb: ditto.
-
- * lib/net/protocol.rb: rename InternetMessageIO#write_pendstr to
- write_message.
-
- * lib/net/smtp.rb: ditto.
-
- * lib/net/protocol.rb: new method
- InternetMessageIO#through_message.
-
- * lib/net/smtp.rb: ditto.
-
- * lib/net/protocol.rb: rename InternetMessageIO#read_pendstr to
- read_message_to.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/protocol.rb: rename InternetMessageIO#read_pendlist to
- each_list_item
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/protocol.rb: Now block size is 1024.
-
- * lib/net/smtp.rb: new methods SMTP#esmtp? and #esmtp=.
-
- * lib/net/http.rb: Using singleton method syntax instead of
- singleton class clause, to avoid behavior change of class
- variables in ruby 1.7.
-
- * lib/net/http.rb: HTTPResponse class does not inherit from
- Net::Response.
-
- * lib/net/http.rb: divide HTTP#connecting into
- {begin,end}_transport.
-
- * lib/net/http.rb: unused class Accumulator removed.
-
- * lib/net/http.rb: Net::HTTP reads response. not HTTPRequest.
-
- * lib/net/http.rb: proxy related class-instance-variables are not
- initialized correctly.
-
-Tue Feb 19 20:20:12 2002 Ed Sinjiashvili <edsin@swes.saren.ru>
-
- * parse.y (str_extend): backslash escape was done wrong.
-
-Tue Feb 19 17:10:25 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (path_check_1): do not fail on world writable *parent*
- directories too.
-
-Tue Feb 19 15:51:41 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (path_check_1): do not warn on world writable *parent*
- directories.
-
- * class.c (rb_include_module): should preserve ancestor order in
- the included class/module.
-
-Tue Feb 19 14:45:32 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (path_check_1): should check directory sticky bits.
-
- * process.c (security): need not to warn twice.
-
- * marshal.c (r_object): complete restoration before calling
- r_regist().
-
-Tue Feb 19 14:24:36 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): operators in the "op" rule should make
- lex_state EXPR_ARG on EXPR_FNAME and EXPR_DOT.
-
-Tue Feb 19 13:38:10 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval_string_wrap): should hide the toplevel local
- variable bindings by PUSH_SCOPE().
-
-Tue Feb 19 13:21:51 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * regex.c: fix prototypes of xmalloc(), xcalloc() and xrealloc().
-
-Tue Feb 19 13:16:08 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * io.c (rb_io_ungetc): don't fail pushed EOF back.
-
-Mon Feb 18 20:48:40 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * pack.c (pack_pack): avoid infinite loop at comment.
-
- * pack.c (pack_unpack): ditto.
-
-Mon Feb 18 14:06:28 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * misc/ruby-mode.el (ruby-block-hanging-re): rescue block was too
- indented.
-
-Mon Feb 18 13:56:44 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (expr_value, arg_value, primary_value): value_expr()
- check in place.
-
- * eval.c (block_pass): "&nil" should clear block given.
-
-Mon Feb 18 02:05:56 2002 Wolfgang Jahrling <wolfgang@pro-linux.de>
-
- * dir.c (push_braces): remove MAXPATHLEN dependency.
-
- * dir.c (dir_s_globd): ditto.
-
- * dln.c (init_funcname): ditto.
-
- * dln.c (load_1): ditto.
-
- * dln.c (dln_load): ditto.
-
- * configure.in: add GNU/Hurd switches.
-
-Fri Feb 15 17:44:26 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): allows comment in template strings.
-
- * pack.c (pack_unpack): ditto.
-
-Sun Feb 17 23:41:37 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * mkconfig.rb (Config::expand): expand ${} too.
-
- * ext/extmk.rb.in (try_link0): expand command.
-
- * ext/extmk.rb.in (try_cpp): ditto.
-
- * ext/extmk.rb.in (extmake): default $LIBPATH to $libdir
-
-Sun Feb 17 21:39:24 2002 Tetsuya Watanabe <tetsuya.watanabe@nifty.com>
-
- * ext/digest/md5/md5init.c (Init_md5): rb_cvar_declare() is
- replaced by rb_cvar_set().
-
- * ext/digest/rmd160/rmd160init.c (Init_rmd160): ditto.
-
- * ext/digest/sha1/sha1init.c (Init_sha1): ditto.
-
- * ext/digest/sha2/sha2init.c (Init_sha2): ditto.
-
-Sun Feb 17 18:10:09 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * class.c (rb_define_class): warn unless superclass is specified
- explicitly.
-
- * class.c (rb_define_class_under): ditto.
-
-Thu Feb 16 02:11:08 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * misc/ruby-mode.el (ruby-font-lock-keywords): fontify
- instance/class/global variables start with '_'.
-
-Fri Feb 15 14:40:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): replace rb_cvar_declare() by rb_cvar_set().
-
- * eval.c (assign): ditto.
-
- * variable.c (rb_cvar_set): 4th argument (warn) added; define new
- class variable if it's not defined yet.
-
- * variable.c (rb_cvar_declare): removed.
-
-Fri Feb 15 13:36:58 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_rshift): should properly convert the negative
- value to 2's compliment.
-
-Thu Feb 14 17:38:35 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y: avoid SEGV at OP_ASIGN to pseudo variable.
-
-Thu Feb 14 14:13:16 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * struct.c (Init_Struct): should undefine "allocate" for Struct
- class (it's redefined in the subclasses).
-
-Wed Feb 13 17:58:12 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (stmt): local variable declaration order was changed
- since 1.6
-
- * parse.y (arg): ditto.
-
- * pack.c (pack_pack): add templates 'q' and 'Q'.
-
- * pack.c (pack_unpack): ditto.
-
- * bignum.c (rb_quad_pack): new utility function.
-
- * bignum.c (rb_quad_unpack): ditto.
-
-Tue Feb 12 01:21:34 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (assignable): should emit CVASGN within the method
- body.
-
-Mon Feb 11 06:13:53 2002 Matt Armstrong <matt@lickey.com>
-
- * dir.c (dir_s_glob): should not warn even if no match found.
-
-Mon Feb 11 04:25:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): clean up class variable behavior.
-
- * eval.c (assign): ditto.
-
- * eval.c (is_defined): ditto.
-
- * variable.c (rb_mod_class_variables): need not to call rb_cvar_singleton().
-
- * variable.c (rb_cvar_singleton): removed.
-
-Mon Feb 11 00:10:41 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * regex.c (re_compile_fastmap): skip begpos.
-
-Sun Feb 10 16:52:53 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ruby.c (load_file): avoid SEGV on '#' only input.
-
-Fri Feb 8 23:07:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): singleton check should be moved from yycompile
- to here.
-
- * eval.c (is_defined): check should be added here too.
-
-Fri Feb 8 05:31:48 2002 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: HTTP.Proxy should use self for proxy-class's
- super class.
-
- * lib/net/http.rb: initialize HTTP.proxy_port by HTTP.port.
-
-Fri Feb 8 01:27:33 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yycompile): should inherit "in_single" if eval happened
- in a singleton method.
-
- * eval.c (rb_eval): class variables from singleton methods defined
- within singleton class statement should work like ones defined
- by singleton def statements.
-
-Thu Feb 7 13:44:08 2002 akira yamada <akira@arika.org>
-
- * uri/common.rb (URI::join): new method.
-
- * uri/generic.rb (Generic#merge): URI.parse("http://a/")+"b" should
- return "http://a/b" but it returned "http://a//b".
-
- * uri/generic.rb (Generic#check_path): corrected error message,
- @path -> v
-
-Thu Feb 7 00:18:43 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_write): flag when buffered write is done.
-
- * io.c (fptr_finalize): do not raise error on EBADF if write
- buffer is empty.
-
-Wed Feb 6 17:18:54 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * configure.in: keep old config.h unless changed.
-
-Wed Feb 6 13:28:53 2002 Amos Gouaux <amos+ruby@utdallas.edu>
-
- * lib/net/imap.rb: OpenSSL support.
-
- * lib/net/imap.rb (setquota): unset quota if the second argument
- is nil.
-
-Wed Feb 6 13:05:11 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_readlines): avoid calling GetOpenFile() repeatedly.
-
- * io.c (rb_io_each_line): ditto.
-
- * io.c (argf_getline): ditto.
-
- * process.c: should include <time.h> to get proper CLK_TCK.
-
-Wed Feb 6 02:10:30 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * io.c (fptr_finalize): ignore EBADF when f and f2 use same
- descriptor.
-
-Tue Feb 5 16:17:20 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (fptr_finalize): should raise error when fclose fails.
-
- * eval.c (method_inspect): proper output format to distinguish
- methods and singleton methods.
-
-Mon Feb 4 22:44:58 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (rb_file_s_expand_path): should terminate.
-
-Mon Feb 4 15:38:29 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_class_real): should not follow ICLASS link
-
- * variable.c (classname): should follow ICLASS link explicitly.
-
- * eval.c (rb_call): ditto.
-
-Fri Feb 1 19:10:04 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * intern.h: prototypes for new functions; rb_cstr_to_inum(),
- rb_str_to_inum(), rb_cstr_to_dbl(), rb_str_to_dbl()
-
- * bignum.c (rb_cstr_to_inum): changed from rb_cstr2inum(), and
- added argument badcheck to be consistent with parser. [new]
-
- * bignum.c (rb_str_to_inum): ditto.
-
- * bignum.c (rb_cstr2inum): wrapper of rb_cstr_to_inum() now.
-
- * bignum.c (rb_str2inum): ditto.
-
- * object.c (rb_cstr_to_dbl): float number parser. [new]
-
- * object.c (rb_str_to_dbl): ditto.
-
- * object.c (rb_Float): use rb_cstr_to_dbl() for strict check.
-
- * object.c (rb_Integer): use rb_str_to_inum() for strict check.
-
- * string.c (rb_str_to_f): use rb_str_to_dbl() with less check.
-
- * string.c (rb_str_to_i): use rb_str_to_inum() with less check.
-
- * string.c (rb_str_hex): ditto.
-
- * string.c (rb_str_oct): ditto.
-
- * sprintf.c (rb_f_sprintf): ditto.
-
- * time.c (obj2long): ditto.
-
- * parse.y (yylex): use rb_cstr_to_inum() for strict check.
-
-Fri Feb 1 17:46:39 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * regex.c (mbc_startpos): become macro.
-
- * regex.c (euc_startpos): added for improvement.
-
- * regex.c (sjis_startpos): ditto.
-
- * regex.c (utf8_startpos): ditto.
-
-Fri Feb 1 00:03:30 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_stat_inspect): print dev, rdev in hexadecimal.
-
-Thu Jan 31 20:45:33 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * lib/mkmf.rb (dir_config): prior --with flag.
-
- * lib/mkmf.rb (arg_config): avoid special variables for
- font-lock-mode.
-
-Thu Jan 31 13:22:36 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb (File::Stat#pretty_print): print rdev_major and rdev_minor.
-
-Wed Jan 30 15:58:04 2002 K.Kosako <kosako@sofnec.co.jp>
-
- * regex.c (re_adjust_startpos): fix for SJIS and UTF-8.
-
- * regex.c (mbc_startpos): ditto.
-
-Wed Jan 30 13:37:05 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (rb_reg_search): should set regs.allocated.
-
-Wed Jan 30 02:25:38 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * regex.c (re_adjust_startpos): search start of multibyte
- backward.
-
- * regex.c (mbc_startpos): ditto.
-
-Tue Jan 29 17:59:20 2002 Tanaka Akira <akr@m17n.org>
-
- * file.c: `major' and `minor' macro needs sys/mkdev.h on SunOS 5.x.
-
- * configure.in: add check for `sys/mkdev.h'.
-
- * lib/pp.rb: don't print a mode File::Stat as decimal number.
-
-Mon Jan 28 19:16:58 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * array.c (rb_ary_fill): shouldn't yield unless block given.
-
-Mon Jan 28 18:33:18 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (yylex): strict check for numbers.
-
-Mon Jan 28 18:01:01 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * 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.
-
-Mon Jan 28 13:29:41 2002 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (is_defined): defined?(Foo::Baz) should check constants
- only, no methods.
-
- * eval.c (is_defined): should not dump core on defined?(a::b)
- where a is not a class nor a module.
-
-Mon Jan 28 02:50:12 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): remove dup and clone from TrueClass,
- FalseClass, and NilClass.
-
- * array.c (rb_ary_fill): Array#fill takes block to get the value to
- fill.
-
-Sat Jan 26 20:05:18 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_to_i): to_i(0) auto-detects base radix.
-
- * array.c (rb_ary_initialize): fill by the block evaluation value
- if block is given.
-
-Fri Jan 25 17:48:43 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in (solaris): add '-shared' only for GNU ld.
-
-Fri Jan 25 17:16:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_include_module): detect cyclic module inclusion.
-
-Fri Jan 25 02:17:56 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_cleanup): need not to free thread stacks at
- process termination.
-
- * array.c (rb_ary_fetch): use the block to get the default value
- if the block is given.
-
- * eval.c (rb_thread_schedule): should check time only if BOTH
- WAIT_SELECT and WAIT_TIME.
-
-Thu Jan 24 11:49:05 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (umethod_bind): should update rklass field.
-
- * hash.c (rb_hash_update): if a block is given, yields [key,
- value1, value2] to the block to resolve conflict.
-
-Thu Jan 24 05:42:01 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * string.c (rb_str_split_m): no need to consider KANJI
- characters, if the length of separator is 1 (byte).
-
-Wed Jan 23 16:07:31 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (Init_Array): remove Array#filter.
-
-Wed Jan 23 13:27:44 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_yield_0): restore source file/line after yield.
-
-Wed Jan 23 02:00:14 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_initialize): should accept zero argument.
-
- * object.c (rb_mod_cmp): should raise ArgumentError if
- inheritance/inclusion relation between two classes/modules is
- not defined. [new]
-
-Tue Jan 22 17:45:23 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_fsync): new method. [new]
-
-Mon Jan 21 22:57:18 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * signal.c (ruby_signal): must define sighandler_t for every
- occasion.
-
-Mon Jan 21 08:25:30 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_stop): should not trace error handler.
-
- * signal.c (install_sighandler): do not install sighandler unless
- the old value is SIG_DFL.
-
- * io.c (io_write): should not raise exception on O_NONBLOCK io.
-
- * dir.c (dir_set_pos): seek should return dir, pos= should not.
-
-Sat Jan 19 02:31:45 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): need not to clear method cache for NODE_CLASS,
- NODE_SCLASS.
-
- * gc.c (obj_free): need not to clear method cache on class/module
- finalization.
-
-Fri Jan 18 23:38:03 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_fetch): index out of range raises exception
- unless optional second argument is specified.
-
-Fri Jan 18 17:32:09 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_new): block check moved from initialize to this
- method.
-
- * io.c (rb_io_s_open): open should call initialize too. IO#for_fd
- also calls initialize. [new]
-
-Fri Jan 18 10:26:33 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (rb_sys_fail): replace INT2FIX() by INT2NUM() since
- errno value may not fit in Fixnum size on Hurd.
-
- * error.c (set_syserr): ditto.
-
-Fri Jan 18 10:12:00 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * ext/socket/socket.c (tcp_svr_s_open): fix typo.
-
-Fri Jan 18 02:27:48 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_s_glob): returns nil if block given.
-
- * io.c (rb_io_each_byte): should return self.
-
- * io.c (rb_io_close_m): close check added.
-
- * dir.c (dir_seek): should return pos.
-
-Fri Jan 18 01:21:53 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (fixpos): orig may be (NODE*)1, which should not be
- dereferenced.
-
-Thu Jan 17 16:21:42 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (block_pass): allow "retry" from within argument passed
- block. [new]
-
- * eval.c (localjump_error): should preserve exit status in the
- exception object. [new]
-
- * eval.c (proc_invoke): should raise exception for "break" if it's
- yielding, not calling. [new]
-
- * eval.c (block_pass): should NOT raise exception for "break". [new]
-
- * eval.c (block_pass): should allow block argument relay even in
- the tainted mode.
-
-Thu Jan 17 04:51:48 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c: support subclassing by proper "initialize"
- calling convention. [new]
-
-Wed Jan 16 18:25:08 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * st.c: primes should be primes.
-
-Wed Jan 16 12:29:14 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/timeout.rb (timeout): new optional argument to specify an
- exception class.
-
- * lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
- avoid problem with timeout of application.
-
-Wed Jan 16 11:12:30 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * object.c (rb_Float): remove underscores between digits.
-
- * bignum.c (rb_cstr2inum): reject prefix followed by spaces only.
-
- * class.c (rb_class_inherited): should use Object when no super
- class.
-
-Tue Jan 15 01:11:44 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): method defined? check should honor
- protected too.
-
-Mon Jan 14 13:06:02 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (block_pass): should not pass tainted block, if $SAFE > 0.
-
-Sun Jan 13 09:31:41 2002 Koji Arai <jca02266@nifty.ne.jp>
-
- * variable.c (rb_mod_remove_cvar): should pass the char*.
-
-Fri Jan 11 05:06:25 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * class.c (rb_make_metaclass): [new]
-
- * class.c (rb_define_class_id): use rb_make_metaclass(), don't
- call Class#inherited hook.
-
- * class.c (rb_class_inherited): [new]
-
- * class.c (rb_define_class): call Class#inherited hook here.
-
- * class.c (rb_define_class_under): ditto after class path is set.
-
- * class.c (rb_singleton_class): use rb_make_metaclass().
-
- * eval.c (rb_eval): same as rb_define_class_under().
-
- * intern.h: prototypes of rb_make_metaclass() and
- rb_class_inherited().
-
- * object.c (rb_class_s_new): use rb_make_metaclass() and
- rb_class_inherited().
-
- * object.c (Init_Object): use rb_make_metaclass().
-
- * struct.c (make_struct): use rb_class_inherited().
-
-Thu Jan 10 19:15:15 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_add_method): should clear cache by id always.
-
- * eval.c (rb_disable_super): no longer need to clear cache before
- rb_add_method().
-
- * eval.c (rb_export_method): ditto.
-
- * eval.c (rb_attr): ditto.
-
- * eval.c (rb_undef): ditto.
-
- * eval.c (rb_eval): ditto.
-
- * eval.c (rb_mod_modfunc): ditto.
-
- * eval.c (rb_mod_define_method): ditto.
-
-Thu Jan 10 11:42:47 2002 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/resource.rb: Modify copyright in resource script.
-
-Thu Jan 10 07:15:44 2002 takuma ozawa <metal@mine.ne.jp>
-
- * re.c (match_select): should propagate taintness.
-
-Thu Jan 10 00:54:57 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_set_default): Hash#default= should return the
- new value.
-
-Wed Jan 9 20:21:09 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * misc/ruby-mode.el (ruby-calculate-indent): indentation after
- comment at beginning of buffer failed.
-
- * misc/ruby-mode.el (font-lock-defaults): unless XEmacs, set
- font-lock variables in ruby-mode-hook.
-
-Tue Jan 8 15:56:20 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_to_i): accepts optional base argument. [new]
-
- * numeric.c (rb_fix2str): should not handle negative fixnum values
- int32 via calling sprintf() directly.
-
-Tue Jan 8 15:54:02 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_add_method): clear replaced method from the cache.
-
-Mon Jan 7 12:38:47 2002 Tanaka Akira <akr@m17n.org>
-
- * lib/time.rb (Time#xmlschema): new optional argument
- fractional_seconds to specify a number of digits of
- fractional part of the time.
-
-Sat Jan 5 13:18:11 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * range.c (range_member): beginning check was
- wrong. [ruby-talk:30252]
-
-Sat Jan 5 03:07:34 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_new2): NULL pointer check added.
-
-Sat Jan 5 00:19:12 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (yycompile): strdup()'ed twice.
-
-Fri Jan 4 18:29:10 2002 Michal Rokos <m.rokos@sh.cvut.cz>
-
- * class.c (rb_define_module_under): should locate predefined
- module using rb_const_defined_at().
-
-Fri Jan 4 17:23:49 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * misc/ruby-mode.el (ruby-forward-string): forward a string. [new]
-
- * misc/ruby-mode.el (ruby-parse-region): handle nested parentheses
- in a string and terminators in #{}.
-
- * misc/ruby-mode.el (ruby-calculate-indent): ditto.
-
-Wed Jan 2 23:34:25 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): add -I. to CPPFLAGS.
-
- * lib/mkmf.rb (create_makefile): srcdir support(.def and depend file).
-
-Wed Jan 2 11:51:56 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_f_system): abandon vfork.
-
- * io.c (pipe_open): ditto.
-
-Tue Jan 1 02:16:48 2002 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/curses/extconf.rb: add dir_config.
-
- * Makefile.in (fake.rb): set RUBY_VERSION.
-
-Mon Dec 31 14:20:46 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (yycompile): always store copy of filename.
-
- * parse.y (rb_compile_file): no longer need to strdup() here.
-
-Mon Dec 31 05:26:40 2001 Ferris McCormick <fmccor@inforead.com>
-
- * defines.h: sparc linux needs different FLUSH_REGISTER_WINDOWS
-
-Mon Dec 31 04:27:28 2001 Minero Aoki <aamine@mx.edit.ne.jp>
-
- * lib/net/protocol.rb: Protocol#start returns the return value of
- block.
-
- * lib/net/protocol.rb: set timeout limit by default.
-
- * lib/net/protocol.rb: new methods WriteAdapter#write, puts,
- print, printf.
-
- * lib/net/http.rb: rename HTTP#get2 to request_get, post2 to
- request_post ...
-
- * lib/net/smtp.rb: should not resolve HELO domain automatically.
-
-Sun Dec 30 00:59:16 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb (have_library): accept -lm
- unconditionally on mswin32/mingw32.
-
-Sat Dec 29 01:55:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_search): abandon stclass optimization.
-
-Fri Dec 28 14:39:05 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * array.c (rb_cmpint): fixed typo.
-
-Thu Dec 27 18:43:04 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * bignum.c (rb_cstr2inum): deny "0_".
-
-Thu Dec 27 01:54:02 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * bignum.c (rb_cstr2inum): allow "0\n" and so on.
-
-Wed Dec 26 19:24:21 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (rb_invalid_str): utility function to show inspect()'ed
- string.
-
- * bignum.c (rb_cstr2inum): prints invalid strings in inspect()'ed
- format.
-
- * object.c (rb_Float): ditto.
-
-Wed Dec 26 02:41:29 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_convert_type): no longer use rb_rescue().
-
-Tue Dec 25 18:32:16 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * re.c (rb_reg_search): initialize taint status of match object.
-
-Tue Dec 25 02:37:49 2001 Tanaka Akira <akr@m17n.org>
-
- * lib/pp.rb, lib/prettyprint.rb: new files.
-
-Tue Dec 25 02:11:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_convert_type): check method response check before
- invoking rb_rescue().
-
- * object.c (rb_check_convert_type): ditto.
-
-Mon Dec 24 02:37:40 2001 Le Wang <lewang@bigfoot.com>
-
- * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords):
- fix font-lock problem [ruby-talk:29296].
-
-Sat Dec 22 22:52:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_timeval): wrong cast to time_t.
-
- * time.c (time_plus): ditto.
-
-Fri Dec 21 20:33:34 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * parse.y (str_extend): make up "#$;" handling.
-
-Fri Dec 21 16:18:17 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * dln.h, ruby.h, util.h: enable prototypes in C++.
-
-Fri Dec 21 15:12:41 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_plus): result should not be negative unless
- NEGATIVE_TIME_T is defined.
-
- * time.c (time_new_internal): should check tv_sec overflow too.
-
- * time.c (time_timeval): should check time_t range when time is
- initialized from float.
-
- * time.c (time_plus): uses modf(3).
-
-Fri Dec 21 03:15:52 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_mod_define_method): must not convert Method to Proc.
-
-Fri Dec 21 01:17:57 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * lib/mkmf.rb (with_destdir): new.
-
- * lib/mkmf.rb: prefix target directories with $(DESTDIR) all.
-
- * lib/mkmf.rb: no need to mkdir $(libdir)
-
-Thu Dec 20 14:08:20 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: rename Net::Socket to Net::BufferedSocket
-
-Thu Dec 20 13:51:52 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * variable.c (rb_cvar_set): add frozen class/module check.
-
- * variable.c (rb_cvar_declare): add frozen class/module check.
-
-Thu Dec 20 01:01:50 2001 takuma ozawa <metal@mine.ne.jp>
-
- * re.c (match_to_a): should propagate taint.
-
- * re.c (rb_reg_s_quote): ditto.
-
-Wed Dec 19 16:58:29 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/readline/readline.c: new methods
- Readline::basic_word_break_characters,
- Readline::basic_word_break_characters=,
- Readline::completer_word_break_characters,
- Readline::completer_word_break_characters=,
- Readline::basic_quote_characters,
- Readline::basic_quote_characters=,
- Readline::completer_quote_characters,
- Readline::completer_quote_characters=,
- Readline::filename_quote_characters,
- Readline::filename_quote_characters=.
-
-Wed Dec 19 14:05:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_define_method): define_method should follow
- default method visibility.
-
- * eval.c (rb_attr): should warn if the default method visibility
- is "module_function" (can be error).
-
- * eval.c (rb_mod_define_method): should define class/module method
- also if the visibility is "module_function".
-
- * eval.c (rb_mod_define_method): should call hook method
- "method_added", and "singleton_method_added".
-
-Wed Dec 19 11:42:13 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * string.c: use RESIZE_CAPA for capacity change.
-
-Wed Dec 19 03:08:40 2001 Tanaka Akira <akr@m17n.org>
-
- * lib/time.rb: date.rb is not required anymore.
-
- * lib/resolv.rb: fix document. refine IPv6 regex.
-
-Tue Dec 18 23:24:53 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (Init_socket): add listen method to
- TCPServer and UNIXServer.
-
-Tue Dec 18 17:54:53 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * sample/test.rb: Hash#indexes -> Hash#select.
-
-Tue Dec 18 01:02:13 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_schedule): should not select a thread which is
- not yet initialized.
-
-Mon Dec 17 18:53:49 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * string.c (rb_str_replace): swap arguments of OBJ_INFECT.
-
-Mon Dec 17 16:52:20 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * intern.h: add prototypes.
- rb_gc_enable(), rb_gc_disable(), rb_gc_start(), rb_str_new5()
- rb_str_buf_append(), rb_str_buf_cat(), rb_str_buf_cat2(),
- rb_str_dup_frozen()
-
- * ruby.h: added declaration.
- rb_defout, rb_stdin, rb_stdout, rb_stderr, ruby_errinfo
-
- * rubyio.h: changed double include guard macro to RUBYIO_H.
-
- * array.c (inspect_call): make static.
-
- * eval.c (dvar_asgn): ditto.
-
- * io.c (rb_io_close_read): ditto.
-
- * lex.c (rb_reserved_word): ditto.
-
- * ruby.c: (req_list_head, req_list_last): ditto.
-
- * ruby.c (require_libraries): ditto.
-
-Mon Dec 17 15:41:24 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_plus): wrong boundary check.
-
- * time.c (time_minus): ditto.
-
-Mon Dec 17 15:19:32 2001 Tanaka Akira <akr@m17n.org>
-
- * time.c: new method `gmtoff', `gmt_offset' and `utc_offset'.
- (time_utc_offset): new function.
- (Init_Time): bind above methods to `time_utc_offset'.
-
- * time.c: 64bit time_t support.
- (time_s_at): use NUM2LONG instead of NUM2INT for tv_sec.
- (time_arg): initialize tm_isdst correctly.
- use long to initialize tm_year.
- (search_time_t): renamed from `make_time_t'.
- (make_time_t): call `timegm' and `mktime' instead of `search_time_t'
- if available.
- (time_to_i): use LONG2NUM instead of INT2NUM.
- (time_localtime): check localtime failure.
- (time_gmtime): check gmtime failure.
- (time_year): use LONG2NUM instead of INT2FIX.
- (time_to_a): use long for tm_year.
- (time_dump): check tm_year which is not representable with 17bit.
- (time_load): initialize tm_isdst.
-
- * configure.in: check existence of `mktime' and `timegm'.
- check existence of tm_gmtoff field of struct tm.
- fix negative time_t for 64bit time_t.
-
- * missing/strftime.c: fix overflow by tm_year + 1900.
-
- * lib/time.rb: use Time#utc_offset.
-
-Mon Dec 17 00:02:04 2001 Guy Decoux <ts@moulon.inra.fr>
-
- * variable.c (find_class_path): should initialize iv_tbl if it's
- NULL.
-
-Fri Dec 14 04:23:36 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: new method Net::POP3.APOP
-
- * lib/net/http.rb: set default Content-Type to
- x-www-form-urlencoded (causes warning)
-
- * lib/net/protocol.rb: remove Net::NetPrivate module.
-
- * lib/net/smtp.rb: ditto.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/http.rb: ditto.
-
-Fri Dec 14 00:16:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_define_class): should return the existing class if
- the class is already defined and its superclass is identical to
- the specified superclass.
-
- * class.c (rb_define_class_under): ditto.
-
- * class.c (rb_define_module): should return the existing module if
- the module is already defined.
-
-Thu Dec 13 09:52:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_new_internal): avoid loop to calculate negative
- div, mod.
-
- * time.c (time_cmp): should handle Bignums.
-
-Tue Dec 11 17:39:16 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * array.c (rb_ary_pop): should ELTS_SHARED flag check before
- REALLOC.
-
-Tue Dec 11 12:45:28 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_match_m): should convert an argument into
- regexp if it's a string.
-
-Tue Dec 11 03:40:23 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_select): Array#select(n,m,...) now works like
- Array#indexes(n,m,..). [new, experimental]
-
- * hash.c (rb_hash_select): ditto.
-
- * hash.c (env_select): ditto.
-
- * re.c (match_select): ditto.
-
- * struct.c (rb_struct_select): ditto.
-
-Tue Dec 11 03:17:19 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * object.c (rb_class_real): follow included modules.
-
-Mon Dec 10 23:37:51 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * util.h: change prototype of ruby_qsort() to accord with its
- definition.
-
-Mon Dec 10 20:30:01 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * gc.c (STR_ASSOC): use FL_USER3 instead of FL_USER2.
-
-Mon Dec 10 17:40:02 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * parse.y (str_extend): make up pushback call.
-
-Mon Dec 10 02:09:28 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_modify): should copy the internal buffer if the
- modifying buffer is shared.
-
- * array.c (ary_make_shared): make an internal buffer of an array
- to be shared.
-
- * array.c (rb_ary_shift): avoid sliding an internal buffer by
- using shared buffer.
-
- * array.c (rb_ary_subseq): avoid copying the buffer.
-
-Mon Dec 10 01:06:56 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (gettable): should freeze __FILE__ string.
-
-Sun Dec 9 18:06:26 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: calls on_connect before conn_command
-
-Sat Dec 8 23:27:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_puts): old behavior restored. rationale: a) if you
- want to call to_s for arrays, you can just call print a, "\n".
- b) to_s wastes memory if array (and sum of its contents) is
- huge. c) now any object that has to_ary is treated as an array,
- using rb_check_convert_type().
-
-Sat Dec 8 22:40:38 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_initialize): now accepts a block to calculate
- the default value. [new]
-
- * hash.c (rb_hash_aref): call "default" method to get the value
- corresponding to the non existing key.
-
- * hash.c (rb_hash_default): get the default value based on the
- block given to 'new'. Now it takes an optional "key" argument.
- "default" became the method to get the value for non existing
- key. Users may override "default" method to change the hash
- behavior.
-
- * hash.c (rb_hash_set_default): clear the flag if a block is given
- to 'new'
-
-Sat Dec 8 02:29:54 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (Init_Object): undef Data.allocate, left Data.new.
-
-Fri Dec 7 19:12:14 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/smtp.rb: SMTP.new requires at least one arg.
-
- * lib/net/pop.rb: POP.new requires at least one arg.
-
- * lib/net/pop.rb: uses "raise *Error.new" instead of simple raise.
-
- * lib/net/http.rb: HTTP.new requires at least one arg.
-
- * lib/net/http.rb: changes implicit start algorithm.
-
-Fri Dec 7 15:49:39 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * ext/extmk.rb.in: ignore adding -Wl,-R to DLDFLAGS when the directory
- is $topdir.
-
-Fri Dec 7 13:58:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/curses/curses.c (window_scrollok): use RTEST().
-
- * ext/curses/curses.c (window_idlok): ditto.
-
- * ext/curses/curses.c (window_keypad): ditto.
-
- * ext/curses/curses.c (window_idlok): idlok() may return void on
- some platforms; so don't use return value.
-
- * ext/curses/curses.c (window_scrollok): ditto for consistency.
-
- * ext/curses/curses.c: replace FIX2INT() by typechecking NUM2INT().
-
-Fri Dec 7 09:51:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (str_extend): should not process immature #$x and
- #@x interpolation, e.g #@#@ etc.
-
-Fri Dec 7 03:21:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_sort_by): sort_by does not have to be stable always.
-
- * enum.c (enum_sort_by): call qsort directly to gain performance.
-
-Thu Dec 6 18:52:28 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * ext/extmk.rb.in: add -Wl,-R flags to DLDFLAGS on netbsdelf.
-
- * lib/mkmf.rb: ditto.
-
-Thu Dec 6 09:15:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * util.c (ruby_qsort): ruby_qsort(qs6) is now native thread safe.
-
- * error.c (rb_sys_fail): it must be a bug if it's called when
- errno == 0.
-
-Wed Dec 5 23:36:56 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (WC2MBC1ST): should not pass through > 0x80 number in UTF-8.
-
-Wed Dec 5 20:05:18 2001 Florian Frank <flori@ping.de>
-
- * ext/socket/socket.c (bsock_send): should raise EWOULDBLOCK
- exception.
-
- * ext/socket/socket.c (s_recvfrom): ditto.
-
- * ext/socket/socket.c (s_accept): ditto.
-
- * ext/socket/socket.c (udp_send): ditto.
-
-Tue Dec 4 17:43:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (DUPSETUP): new SETUP macro for duplication.
-
- * time.c (time_dup): implement in Time class using DUPSETUP.
-
- * time.c (time_getlocaltime): new method; probably requires
- better name than getlocaltime. [new,experimental]
-
- * time.c (time_getgmtime): ditto.
-
- * array.c (rb_ary_dup): uses DUPSETUP.
-
- * string.c (rb_str_dup): uses DUPSETUP. now properly copies
- instance variables too.
-
-Tue Dec 4 03:49:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fread): EAGAIN/EWOULDBLOCK should not terminate and
- throw away the input.
-
- * time.c (time_new_internal): underflow adjustment must not use
- negative div/mod.
-
- * time.c (time_cmp): should consider tv_usec on non Fixnum number
- comparison.
-Sun Dec 9 23:00:54 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
- * matrix.rb: Vector#* bug. reported from Massimiliano Mirra
- <info@chromatic-harp.com>.
-
-Sun Dec 9 22:15:59 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * enum.c (enum_sort_by): should replace with last elements.
-
-Mon Dec 3 16:06:57 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/extconf.rb: remove -L/usr/local/lib.
-
- * configure.in: add -Wl,-export-dynamic on NetBSD.
-
-Mon Dec 3 16:04:16 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * configure.in: not use X11BASE, since it's not always set.
-
-Mon Dec 3 13:53:49 2001 Tanaka Akira <akr@m17n.org>
-
- * time.c (rb_strftime): buffer length condition was wrong.
-
- * time.c (time_strftime): should backup buf to the original
- buffer.
-
-Mon Dec 3 09:59:08 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_plus): must detect result overflow.
-
- * time.c (time_minus): ditto.
-
- * time.c (time_new_internal): round usec overflow and underflow
- here.
-
- * time.c (time_plus): move operand overflow/underflow check to
- time_new_internal().
-
- * time.c (time_minus): ditto.
-
- * time.c (time_cmp): should consider tv_usec too.
-
-Mon Dec 3 03:32:22 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * configure.in: apply patch from NetBSD's pkgsrc (patch-aa).
-
-Sun Dec 2 22:01:52 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: use GCC, not without_gcc. remove without_gcc.
-
- * ext/curses/extconf.rb: check for curses.h.
-
- * ext/dbm/extconf.rb: check if $CFLAGS includes DBM_HDR.
-
-Sat Dec 1 12:13:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_gmtime): time_modify() should be called even if tm
- struct is not calculated yet.
-
-Fri Nov 30 17:02:55 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: set target_cpu to i386 on cygwin and mingw32.
-
- * configure.in: default --enable-shared to yes on cygwin and mingw32.
-
-Fri Nov 30 00:25:28 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * README.EXT: Appendix B is duplicated.
-
- * README.EXT.ja: ditto.
-
-Thu Nov 29 00:28:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_equal): object with to_str must be treated as a
- string.
-
-Wed Nov 28 18:46:28 2001 Ville Mattila <mulperi@iki.fi>
-
- * eval.c (rb_thread_select): should subtract timeofday() from
- limit, not reverse.
-
-Wed Nov 28 16:03:28 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * util.c (scan_hex): x is not a hexadecimal digit.
-
-Wed Nov 28 13:38:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_schedule): should treat the case that
- select(2) returns 0, if a thread is under both WAIT_SELECT and
- WAIT_TIME. Jakub Travnik <J.Travnik@sh.cvut.cz> actually fixed
- this bug.
-
-Tue Nov 27 02:15:25 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_float): must distinguish -0.0 from 0.0.
-
-Mon Nov 26 20:57:24 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/Setup*, ext/syslog/*: import the "syslog" module from the
- rough ruby project.
-
-Mon Nov 26 16:14:42 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * gc.c (gc_mark_all): tweak mark order for little bit better scan.
-
- * gc.c (rb_gc_mark): ditto.
-
- * gc.c (rb_gc): ditto.
-
-Mon Nov 26 16:54:59 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/win32.c (mypopen): fixed that mypclose() didn't really close
- pipe.
-
- * win32/win32.c (CreateChild): set STARTF_USESTDHANDLES flag only
- when some handles are passed.
-
-Mon Nov 26 16:31:28 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (sort_by_i): slight performance boost.
-
-Sun Nov 25 21:02:18 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * parse.y (str_extend): change types of second and third arguments
- from char to int.
-
-Thu Nov 22 20:15:28 2001 TAMURA Takashi <sheepman@tcn.zaq.ne.jp>
-
- * gc.c (gc_mark_rest): should call gc_mark_children(), not gc_mark().
-
- * gc.c (rb_gc_mark): may cause infinite loop.
-
-Thu Nov 22 00:28:13 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (str_extend): should check nesting parentheses in #{}.
-
-Wed Nov 21 12:22:52 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/cgi.rb: CGI#header: do not set Apache.request.status for
- Location: if Apache.request.status is already set.
-
-Wed Nov 21 02:24:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (pst_wstopsig): returns nil unless WIFSTOPPED() is
- non-zero.
-
- * process.c (pst_wtermsig): returns nil unless WIFSIGNALED() is
- non-zero.
-
- * process.c (pst_wexitstatus): returns nil unless WIFEXITED() is
- non-zero.
-
-Wed Nov 21 00:17:54 2001 Ville Mattila <mulperi@iki.fi>
-
- * eval.c (rb_thread_select): tv_sec and tv_usec should not be
- negative.
-
- * signal.c (posix_signal): do not set SA_RESTART for SIGVTALRM.
-
-Tue Nov 20 21:09:22 2001 Guy Decoux <ts@moulon.inra.fr>
-
- * parse.y (call_args2): block_arg may follow the first argument in
- call_args2.
-
-Tue Nov 20 02:01:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (stack_check): should avoid stack length check during
- raising SystemStackError exception.
-
-Tue Nov 20 01:07:13 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (str_extend): should not terminate string interpolation
- with newlines in here-docs and newline terminated strings.
-
-Mon Nov 19 17:58:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_modfunc): should follow NODE_ZSUPER link; based
- on Guy Decoux's patch in [ruby-talk:25478].
-
-Mon Nov 19 16:09:33 2001 Tanaka Akira <akr@m17n.org>
-
- * string.c (rb_str_succ): there was buffer overrun.
-
-Mon Nov 19 14:14:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (str_extend): term can be any character.
-
-Mon Nov 19 04:58:42 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb (header): support for Apache. thanks to
- Shugo Maeda <shugo@ruby-lang.org>.
-
-Sun Nov 18 19:37:55 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y: needless conditionals.
-
- * parse.y (parse_regx): parse error at unterminated regex /#{.
- (ruby-bugs-ja:PR#142)
-
-Sat Nov 17 12:37:39 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_unpack): should give length to utf8_to_uv().
-
- * pack.c (utf8_to_uv): add length check.
-
-Sat Nov 17 01:41:52 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * massages: replace "wrong #" by "wrong number".
-
- * marshal.c (w_float): output Infinity and NaN explicitly.
-
- * marshal.c (r_object): support new explicit float format.
-
- * eval.c (rb_thread_wait_for): select may cause ERESTART on
- Solaris.
-
- * eval.c (rb_thread_select): ditto.
-
-Thu Nov 15 15:29:39 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * array.c (rb_ary_join): non-nil separator must be converted to
- String. and separators' total length was wrong.
-
-Thu Nov 15 03:37:17 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * hash.c (ruby_setenv): remove USE_WIN32_RTL_ENV block since it's
- obsoleted.
-
- * win32/win32.c, win32/win32.h: sort out #if 0 - #endif or others.
-
-Thu Nov 15 00:07:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_to_s): if rb_output_fs is nil, insert newlines
- between array elements (use rb_default_rs as newline literal)
- [experimental].
-
-Wed Nov 14 15:16:23 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * gc.c (init_mark_stack): no need to clear mark_stack.
-
- * gc.c (gc_mark_all): need to handle finalizer mark.
-
- * gc.c (gc_mark_rest): use MEMCPY instead of memcpy.
-
- * gc.c (rb_gc_mark): earlier const check to avoid pusing special
- constants into mark stack.
-
-Wed Nov 14 01:12:07 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/win32.c (waitpid): fix wait count.
-
- * win32/win32.c (poll_child_status): rename from wait_child().
-
-Wed Nov 14 01:33:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_to_s): 'to_s' now takes optional argument to
- specify radix. [new]
-
- * bignum.c (rb_big_to_s): ditto. [new]
-
-Tue Nov 13 19:50:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: do not override CC if set.
-
-Tue Nov 13 16:49:16 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/win32.c (mypopen): return error status instead of calling
- rb_sys_fail().
-
- * win32/win32.c (do_spawn): ditto.
-
-Tue Nov 13 14:39:11 2001 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * signal.c (sighandle): should not re-register sighandler if
- POSIX_SIGNAL is defined.
-
-Tue Nov 13 12:55:59 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/win32.c (do_spawn): use CreateChild() instead of calling
- CreateProcess() directly. Original patches comes from Patrick Cheng.
-
- * win32/win32.c (mypopen): ditto.
-
- * win32/win32.c (mypclose): use rb_syswait() instead of waiting in this
- function.
-
- * win32/win32.c (waitpid): use wait_child() instead of _cwait().
-
- * win32/win32.c (CreateChild): added. [new]
-
- * win32/win32.c (wait_child): added. [new]
-
- * win32/win32.c (FindFirstChildSlot): added. [new]
-
- * win32/win32.c (FindChildSlot): added. [new]
-
- * win32/win32.c (FindPipedChildSlot): added. [new]
-
- * win32/win32.c (CloseChildHandle): added. [new]
-
- * win32/win32.c (FindFreeChildSlot): added. [new]
-
-Tue Nov 13 12:38:12 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * hash.c (envix): use GET_ENVIRON and FREE_ENVIRON to get environment
- variables list.
-
- * hash.c (env_keys): ditto.
-
- * hash.c (env_each_key): ditto.
-
- * hash.c (env_values): ditto.
-
- * hash.c (env_keys): ditto.
-
- * hash.c (env_each_value): ditto.
-
- * hash.c (env_each): ditto.
-
- * hash.c (env_inspect): ditto.
-
- * hash.c (env_to_a): ditto.
-
- * hash.c (env_size): ditto.
-
- * hash.c (env_empty_p): ditto.
-
- * hash.c (env_has_value): ditto.
-
- * hash.c (env_index): ditto.
-
- * hash.c (env_to_hash): ditto.
-
- * win32/win32.c (win32_getenv): use static buffer.
-
- * win32/win32.c, win32/win32.h (win32_get_environ): get environment
- variables list. [new]
-
- * win32/win32.c, win32/win32.h (win32_free_environ): free environment
- variables list. [new]
-
-Mon Nov 12 16:48:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (error_print): errat array may be empty.
-
-Mon Nov 12 01:30:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval_cmd): should not upgrade safe level unless
- explicitly specified by argument newly added.
-
- * signal.c (sig_trap): should not allow tainted trap closure.
-
- * variable.c (rb_f_trace_var): should not allow trace_var on safe
- level higher than 3.
-
- * variable.c (rb_f_trace_var): should not allow tainted trace
- closure.
-
-Sun Nov 11 00:12:23 2001 TAMURA Takashi <sheepman@tcn.zaq.ne.jp>
-
- * gc.c: do not use static stack until system stack overflows.
-
-Sat Nov 10 03:57:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (eval): should call Exception#exception instead of
- calling rb_exc_new3() directly.
-
- * error.c (exc_exception): set "mesg" directly to the clone. it
- might be better to set mesg via some method for flexibility.
-
-Sat Nov 10 00:14:24 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (cvar_override_check): should print original module
- name, if 'a' is T_ICLASS.
-
- * parse.y (yylex): float '1_.0' should not be allowed.
-
- * variable.c (var_getter): should care about var as Qfalse
- (ruby-bugs#PR199).
-
-Fri Nov 9 13:50:06 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/config.status.in: make CFLAGS same as Makefile's one.
-
-Thu Nov 8 20:20:37 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_trap_eval): avoid annoying warning with signal.
- [ruby-talk:23225]
-
- * eval.c (rb_call0): adjust caller source file/line while
- evaluating optional arguments.
-
-Thu Nov 8 18:41:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (cmpint): <=> or block for {min,max} may return bignum.
-
- * array.c (sort_1): use rb_compint.
-
- * array.c (sort_2): ditto.
-
- * enum.c (min_ii): ditto.
-
- * enum.c (min_ii): ditto.
-
- * enum.c (max_i): ditto.
-
- * enum.c (max_ii): ditto.
-
-Thu Nov 8 18:21:02 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (path_check_1): forgot to initialize 'p'.
-
-Thu Nov 8 14:52:15 2001 Tanaka Akira <akr@m17n.org>
-
- * mkconfig.rb: use String#dump to generate Ruby string literal.
-
-Thu Nov 8 15:46:54 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_eql): should override 'eql?'
-
- * array.c (rb_ary_hash): should override 'hash' too.
-
-Tue Nov 6 14:38:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (security): always give warning for insecure PATH.
-
- * dir.c (my_getcwd): do not rely on MAXPATHLEN.
-
- * file.c (rb_file_s_readlink): ditto.
-
- * file.c (path_check_1): ditto.
-
-Tue Nov 6 14:17:14 2001 Amos Gouaux <amos+ruby@utdallas.edu>
-
- * lib/net/imap.rb (getquota_response): use astring for mailbox
- names.
-
- * lib/net/imap.rb (getacl_response): ditto.
-
-Mon Nov 5 17:09:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): should not call rb_f_block_given_p().
-
-Sat Nov 3 23:33:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_chomp_bang): should terminate string by NUL.
-
-Sat Nov 3 22:28:51 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * matrix.rb (Matrix#column_vectors, Matrix#row_vectors): ditto bug.
- this bug report and fix by tsutomu@nucba.ac.jp.
-
- * forwardable.rb: change raise to Kernel::raise
-
-Sat Nov 3 10:11:57 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): better error message.
-
-Thu Nov 1 14:08:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_aref): idx may be a Bignum.
-
- * numeric.c (fix_aref): negative index must return zero.
-
-Thu Nov 1 13:23:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (gc_mark_children): should NOT treat last element of
- structs and arrays specially.
-
-Wed Oct 31 16:59:25 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (exec_under): should initialize ruby_frame->self;
-
-Wed Oct 31 15:09:28 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (POP_VARS): should not set DVAR_DONT_RECYCLE if _old
- ruby_vars is already force_recycled.
-
-Wed Oct 31 10:28:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc): handles mark stack overflow.
-
- * gc.c (PUSH_MARK): use static mark stack, no more recursion.
-
-Wed Oct 31 02:44:06 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: CGI::Cookie::parse(): Ignore duplicate keys caused by
- Netscape bug.
-
-Tue Oct 30 18:21:51 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/mkexports.rb: follow the change of rb_io_puts().
-
-Tue Oct 30 14:04:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_chomp_bang): do smart chomp if $/ == '\n'. [new]
-
- * io.c (rb_io_puts): don't treat Array specially.
-
- * bignum.c (rb_big_cmp): should convert bignum to float.
-
- * eval.c (rb_f_eval): can't modify untainted binding.
-
-Mon Oct 29 16:08:30 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): should preserve p0 value.
-
-Mon Oct 29 14:56:44 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * intern.h (rb_protect_inspect): follow the change of array.c.
-
- * eval.c (rb_exec_end_proc): follow the change of rb_protect().
-
- * eval.c (method_proc, umethod_proc, rb_catch): cast the first
- parameter of rb_iterate() to avoid VC++ warning.
-
- * range.c (range_step): ditto.
-
- * ext/sdbm/init.c (fsdbm_update, fsdbm_replace): ditto.
-
-Mon Oct 29 07:57:31 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (str_extend): should allow interpolation of $-x.
-
- * variable.c (rb_cvar_set): empty iv_tbl may cause infinite loop.
-
- * variable.c (rb_cvar_get): ditto.
-
- * variable.c (cvar_override_check): ditto.
-
-Sat Oct 27 23:01:19 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_eq): convert Bignum to Float, instead of
- reverse.
-
-Fri Oct 26 06:19:29 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_localtime): getting tm should not be prohibited for
- frozen time objects.
-
- * time.c (time_gmtime): ditto.
-
- * version.c (Init_version): freeze RUBY_VERSION,
- RUBY_RELEASE_DATE, and RUBY_PLATFORM.
-
- * file.c (Init_File): freeze File::SEPARATOR, ALT_SEPARATOR and
- PATH_SEPARATOR.
-
- * file.c (rb_stat_cmp): should check operand type before calling
- get_stat().
-
-Thu Oct 25 10:28:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval_cmd): should not invoke "call" with a block on
- any occasion.
-
-Wed Oct 24 03:25:31 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_aref): idx may be a Bignum.
-
-Tue Oct 23 01:21:19 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (proc_invoke): fix self switching in Proc#call
- (ruby-bugs-ja#PR108) and GC failure. use Qundef instead of 0
- to direct not switching self.
-
- * eval.c (call_trace_func): ditto.
-
- * eval.c (call_end_proc): ditto.
-
- * eval.c (proc_call): ditto.
-
- * eval.c (proc_yield): ditto.
-
-Tue Oct 23 01:15:43 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * variable.c (rb_global_entry): reconstruct global variable
- aliasing (sharing global_entry->var with other global_entry).
-
- * variable.c (undef_getter): ditto.
-
- * variable.c (undef_setter): ditto.
-
- * variable.c (val_setter): ditto.
-
- * variable.c (mark_global_entry): ditto.
-
- * variable.c (rb_define_hooked_variable): ditto.
-
- * variable.c (rb_f_trace_var): ditto.
-
- * variable.c (remove_trace): ditto.
-
- * variable.c (rb_f_untrace_var): ditto.
-
- * variable.c (rb_gvar_get): ditto.
-
- * variable.c (trace_en): ditto.
-
- * variable.c (rb_gvar_set): ditto.
-
- * variable.c (rb_gvar_defined): ditto.
-
- * variable.c (rb_alias_variable): ditto.
-
-Mon Oct 22 18:53:55 2001 Masahiro Tanaka <masa@stars.gsfc.nasa.gov>
-
- * numeric.c (num_remainder): a bug in Numeric#remainder.
-
-Mon Oct 22 15:21:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_exec_end_proc): END might be called within END
- block.
-
- * class.c (rb_mod_clone): should not copy class name, since clone
- should remain anonymous.
-
-Fri Oct 19 23:40:37 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * variable.c (remove_trace): should not access already freed area.
-
- * variable.c (rb_f_untrace_var): fix memory leak.
-
-Fri Oct 19 17:55:14 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * marshal.c (w_uclass): cloned class is not user
- class. (ruby-bugs-ja#PR103)
-
- * marshal.c (r_object): Struct subclass couldn't
- load. (ruby-bugs-ja#PR104)
-
-Wed Oct 17 14:12:50 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * variable.c (alias_fixup): added. ad hoc support for ordinary
- global variable aliasing. when original entry is set, make the
- alias to refer directly as possible.
-
- * variable.c (alias_getter, alias_setter): ditto.
-
- * variable.c (rb_alias_variable): ditto. and no need to mark alias
- variables.
-
- * variable.c (rb_gvar_defined): refer the original entry of an alias.
-
-Tue Oct 16 23:29:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): self in a block given to define_method now be
- switched to the receiver of the method.
-
- * eval.c (proc_invoke): added new parameter to allow self
- switching.
-
-Tue Oct 16 21:38:15 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_f_missing): check stack level with rb_stack_check().
-
- * eval.c (rb_call0): ditto.
-
- * eval.c, intern.h (rb_stack_check): added. [new]
-
-Tue Oct 16 13:18:47 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * object.c (rb_mod_initialize): optional block with
- Module.new. [new] (from 2001-10-10)
-
-Tue Oct 16 00:07:06 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (yylex): disallow alpha-numeric and mbchar for
- terminator of %string.
-
-Mon Oct 15 18:00:05 2001 Pit Capitain <pit@capitain.de>
-
- * string.c (rb_str_index): wrong increment for non alphanumeric
- string.
-
-Mon Oct 15 05:23:02 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * sprintf.c (rb_f_sprintf): support "%B".
-
-Wed Oct 10 03:11:47 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_stat_clone): should copy internal data too.
-
- * numeric.c (num_clone): Numeric should not be copied by clone.
-
- * object.c (rb_obj_clone): should check immediate values.
-
- * parse.y (command): `yield' should take command_args.
-
- * parse.y (parse_quotedwords): %w(...) is not a string.
-
-Tue Oct 9 18:40:35 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * process.c (Init_process): activate the case NT.
-
-Tue Oct 9 17:08:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (thread_status_name): separated from
- rb_thread_inspect(). return string expression for thread status.
-
- * eval.c (rb_thread_status, rb_thread_inspect): use
- thread_status_name().
-
- * eval.c (rb_thread_priority_set): return the priority not but
- self.
-
-Sat Oct 6 23:07:08 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): NODE_MATCH3 was confusing left and right. sigh.
-
-Fri Oct 5 15:19:46 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_unique): should not dump anonymous class.
-
-Fri Oct 5 11:59:13 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (proc_s_new): revived.
-
- * eval.c (Init_Proc): define Proc.new instead of Proc.allocate to
- inhibit from creating uninitialized Proc.
-
-Thu Oct 4 14:11:03 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_connect): EALREADY is the equivalent
- for EINPROGRESS in ws2_32.lib.
-
-Wed Oct 3 20:11:06 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * re.c (rb_reg_s_alloc): avoid infinite recursion.
-
-Wed Oct 3 16:49:49 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/gdbm/gdbm.c (rb_gdbm_fetch): str is a VALUE now.
-
-Wed Oct 3 13:32:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object): better allocation type check for
- TYPE_UCLASS. usage of allocation framework is disabled for now.
-
- * variable.c (rb_class_path): Module may have subclass.
-
- * string.c (rb_str_update): should maintain original negative
- offset.
-
- * string.c (rb_str_subpat_set): ditto
-
- * string.c (rb_str_aset): ditto.
-
- * re.c (rb_reg_nth_match): should check negative nth.
-
- * re.c (rb_reg_nth_defined): ditto.
-
-Tue Oct 2 19:12:47 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/ftools.rb (catname): allow trailing '/' for the destination.
-
-Tue Oct 2 18:31:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should override existing class.
-
-Tue Oct 2 17:08:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_alloc): general instance allocation framework.
- use of NEWOBJ() is deprecated except within 'allocate' method.
-
-Tue Oct 2 08:04:52 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * marshal.c (r_object): TYPE_UCLASS check should be inversed.
-
-Mon Oct 1 19:18:54 2001 Tanaka Akira <akr@m17n.org>
-
- * ext/socket/socket.c (unix_addr): getsockname(2) may result len = 0.
-
- * ext/socket/socket.c (unix_peeraddr): getpeername(2) may result
- len = 0.
-
-Mon Oct 1 09:59:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_subpat_set): support function for new argument
- pattern String#[re,offset] = val. [new]
-
-Sat Sep 29 02:30:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (POP_BLOCK): rb_gc_force_recycle() was called too much.
- Should not be called if SCOPE_DONT_RECYCLE is set.
-
-Wed Sep 26 22:21:52 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_aref_m): new argument pattern
- String#[re,offset]. [new]
-
-Wed Sep 26 19:02:39 2001 Guy Decoux <ts@moulon.inra.fr>
-
- * parse.y: allow 'primary[] = arg'
-
-Tue Sep 25 10:46:42 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/win32.c (isInternalCmd): check return value of NtMakeCmdVector
- (Tietew <tietew@tietew.net>'s patch).
-
-Mon Sep 24 00:55:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_substr): should return an instance of
- receiver's class.
-
- * string.c (rb_str_succ): ditto.
-
- * array.c (rb_ary_subseq): ditto.
-
- * array.c (rb_ary_initialize): Array.new([1,2,3]) => [1,2,3]. [new]
-
-Sat Sep 22 22:16:08 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_reverse): should return an instance of
- receiver's class.
-
- * string.c (rb_str_times): ditto.
-
- * array.c (rb_ary_times): ditto
-
- * string.c (str_gsub): ditto.
-
- * string.c (rb_str_ljust): ditto.
-
- * string.c (rb_str_rjust): ditto.
-
- * string.c (rb_str_center): ditto.
-
-Sat Sep 22 12:13:39 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (eval): retrieves file, line information from binding.
-
-Thu Sep 20 21:25:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (MATCH_DATA): access via rb_svar().
-
-Thu Sep 20 15:20:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c, intern.h (rb_svar): return reference to special variable
- from local variable index. [new]
-
- * eval.c (rb_eval): use rb_svar() for NODE_FLIP{2,3}.
-
- * parse.y (rb_(backref|lastline)_(get|set)): access via rb_svar().
-
- * eval.c (proc_invoke): push dynamic variables.
-
- * eval.c (rb_thread_yield): push special variables as dynamic
- variables($_, $~ and FLIP states).
-
-Thu Sep 20 15:20:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * intern.h, parse.y (rb_is_local_id): return true if the ID is
- local symbol. [new]
-
- * parse.y (internal_id): make new ID for internal use. [new]
-
- * parse.y (cond0): allocate internal ID for NODE_FLIP{2,3}.
-
- * eval.c (rb_f_local_variables): use rb_is_local_id() to select
- visible local variables.
-
-Thu Sep 20 15:20:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_thread_start_0): SCOPE_SHARED is removed.
-
- * eval.c, intern.h (rb_thread_scope_shared_p): removed. special
- variables are no longer shared by threads.
-
- * re.c (rb_reg_search): MATCHDATA is no longer shared by threads.
-
-Tue Sep 18 11:44:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_init): String.new() => "" [new]
-
-Tue Sep 11 20:53:56 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_path): new method.
-
- * dir.c (dir_initialize): wrap DIR into struct, along with path
- information.
-
-Sat Sep 8 07:13:42 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/net/telnet.rb: waitfor(): improvement. thanks to
- nobu.nakada@nifty.ne.jp
-
-Sat Sep 8 04:34:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_restore_context): save current value of
- lastline and lastmatch in the thread struct for later restore.
-
- * eval.c (rb_thread_save_context): restore lastline and lastmatch.
-
-Fri Sep 7 11:27:56 2001 akira yamada <akira@ruby-lang.org>
-
- * numeric.c (flo_to_s): should handle negative float value.
-
-Fri Sep 7 09:44:44 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/net/telnet.rb: waitfor(): bug fix.
-
-Fri Sep 7 07:11:34 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: CGI#doctype(): bug fix (html4Fr).
-
- * lib/net/telnet.rb, lib/cgi.rb: remove VERSION, RELEASE_DATE,
- VERSION_CODE, RELEASE_CODE. please use REVISION.
-
- * lib/cgi.rb: CGI#header(): bug fix.
-
- * lib/net/telnet.rb, lib/cgi.rb: concat --> +=
-
-Thu Sep 6 17:38:18 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * dir.c (dir_s_chdir): raise if environment variable HOME/LOGDIR
- not set.
-
- * dir.c (glob_helper): avoid infinite loop on a file name with
- wildcard characters. (ruby-bugs#PR177)
-
-Thu Sep 6 14:25:15 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_s_hexdigest): remove a debug
- print.
-
-Thu Sep 6 13:56:14 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/digest.c (rb_digest_base_s_digest,
- rb_digest_base_s_hexdigest): ensure that a string is given.
-
-Thu Sep 6 13:28:51 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/jcode.rb (_regexp_quote): fix quote handling, again.
-
-Thu Sep 6 07:28:56 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (rb_find_file_ext): add const qualifiers to ext.
-
- * intern.h (rb_find_file_ext): ditto.
-
-Thu Sep 6 07:16:14 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/socket/socket.c (Init_socket): remove duplicating constants.
-
-Thu Sep 6 03:15:24 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_include_module): should check whole ancestors to
- avoid duplicate module inclusion.
-
-Wed Sep 5 20:02:27 2001 Shin'ya Adzumi <adzumi@denpa.org>
-
- * string.c (trnext): should check backslash before updating "now"
- position.
-
-Wed Sep 5 17:41:11 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/jcode.rb (_regexp_quote): fix quote handling.
-
-Tue Sep 4 01:03:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (Init_Regexp): to_s to be alias to inspect.
-
-Mon Sep 3 22:46:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): should support 'keyword='.
-
-Mon Sep 3 20:26:08 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * intern.h (rb_find_file_ext): changed from rb_find_file_noext().
-
-Mon Sep 3 15:12:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): should not adjust argc/argv if -e option
- is supplied.
-
-Mon Sep 3 14:11:17 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * error.c: unbreak the build on *BSD with gcc 3.0.1 by removing
- the conflicting declaration of sys_nerr for *BSD.
-
-Sat Sep 1 18:50:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): should not alter origargv[].
-
- * ruby.c (set_arg0): long strings for $0 dumped core.
-
-Sat Sep 1 09:50:54 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ruby.c (set_arg0): prevent SEGV when val is longer than the
- original arguments.
-
- * ruby.c (ruby_process_options): initialize total length of
- original arguments at first.
-
-Sat Sep 1 14:05:28 2001 Brian F. Feldman <green@FreeBSD.org>
-
- * ruby.c (set_arg0): use setprogtitle() if it's available.
-
-Sat Sep 1 03:49:11 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_popen): accept integer flags as mode.
-
-Fri Aug 31 19:46:05 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (rb_find_file_ext): extension table can be supplied from
- outside. renamed.
-
- * eval.c (rb_f_require): replace rb_find_file_noext by
- rb_find_file_ext.
-
-Fri Aug 31 19:26:55 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_provided): should also check feature without
- extension.
-
-Fri Aug 31 13:06:33 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (flo_to_s): do not rely on decimal point to be '.'
-
-Wed Aug 29 02:18:53 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): ternary ? can be followed by newline.
-
-Tue Aug 28 00:40:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_require): should check static linked libraries
- before raising exception.
-
-Fri Aug 24 15:17:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_equal): check identity equality first.
-
- * string.c (rb_str_equal): ditto.
-
- * struct.c (rb_struct_equal): ditto.
-
-Fri Aug 24 14:38:17 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * dln.c (dln_strerror): fix a bug that sometimes made null message on
- win32 (Tietew <tietew@tietew.net>'s patch).
-
- * win32/win32.c (mystrerror): ditto.
-
-Fri Aug 24 03:15:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (Init_Numeric): undef Integer::new.
-
-Fri Aug 24 00:46:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): NODE_WHILE should update result for each
- conditional evaluation.
-
- * eval.c (rb_eval): NODE_UNTIL should return last evaluated value
- (or value given to break).
-
-Thu Aug 23 21:59:38 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * enum.c (sort_by_i): fix typo.
-
-Thu Aug 23 10:10:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): should not dump core for "defined?(())".
-
- * eval.c (umethod_bind): recv can be an instance of descender of
- oklass if oklass is a Module.
-
-Wed Aug 22 23:20:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_equal): check identity equality first.
-
-Wed Aug 22 19:58:59 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (intersect_fds): counts intersecting fds.
-
- * eval.c (rb_thread_schedule): only fds requested by
- each thread count as select_value.
-
-Tue Aug 21 22:28:09 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (group_member): should check real gid only.
-
- * file.c (eaccess): do not cache euid, since effective euid may be
- changed via Process.euid=().
-
- * file.c (eaccess): return -1 unless every specified access mode
- is permitted.
-
-Tue Aug 21 16:09:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): while/until returns the value which is given
- to break.
-
- * parse.y (value_expr): using while/until/class/def as an
- expression is now gives a warning, not an error.
-
-Tue Aug 21 11:56:02 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_eqq): should compare strings based on magical
- increment (using String#upto), not dictionary order.
-
-Mon Aug 20 19:53:16 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/digest/sha2/extconf.rb: fix support for cross-compiling.
-
- * mkconfig.rb: fix support for autoconf 2.52.
-
-Mon Aug 20 17:24:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_sort_by): new method for Schewartzian transformed
- stable sort.
-
-Mon Aug 20 16:09:05 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (mod_av_set): detect constant overriding for built-in
- classes/modules.
-
-Mon Aug 20 15:14:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (tokadd_escape): escaped backslashes too much.
-
-Mon Aug 20 13:24:08 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): 'iter' here should be an array.
-
-Mon Aug 20 12:43:08 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): should retrieve __member__ data from
- non-singleton class.
-
-Sat Aug 18 23:11:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_cvar_get): class variable override check added.
-
- * variable.c (rb_cvar_set): ditto
-
- * variable.c (rb_cvar_declare): ditto.
-
-Fri Aug 17 12:13:48 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/protocol.rb: Protocol.new requires at least one arg.
-
- * lib/net/smtp.rb: ditto.
-
- * lib/net/pop.rb: ditto.
-
- * lib/net/http.rb: ditto.
-
-Fri Aug 17 00:49:51 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parse_regx): handle backslash escaping of delimiter here.
-
-Thu Aug 16 23:03:40 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * io.c: prevent recursive malloc calls on NEC UX/4800.
-
- * ext/socket/socket.c: ditto.
-
-Thu Aug 16 13:54:04 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * ext/socket/socket.c (s_recvfrom): fix typo.
-
-Thu Aug 16 09:53:28 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * ext/socket/socket.c (s_recvfrom): avoid VC++6 warning.
-
-Thu Aug 16 03:50:33 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/win32.c (NtCmdGlob): avoid VC++ warning.
-
- * lib/mkmf.rb: add -I$(srcdir) to CPPFLAGS.
-
-Wed Aug 15 04:59:15 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/*/extconf.rb: really fix so that they build from any
- directory.
-
-Wed Aug 15 04:04:02 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha2/extconf.rb: fix so that they build from any
- directory.
-
-Wed Aug 15 01:59:19 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/defs.h: Define NO_UINT64_T instead of emitting an
- error to fail.
-
- * ext/digest/sha2/extconf.rb: Do not exit on error, and utilize
- NO_UINT64_T to detect if the system has a 64bit integer type.
-
-Tue Aug 14 21:14:07 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/digest/sha2/extconf.rb: do not create Makefile when no 64bit
- integer type is detected.
-
-Tue Aug 14 17:09:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_step): new method.
-
-Tue Aug 14 11:49:00 2001 TOYOFUKU Chikanobu <toyofuku@juice.or.jp>
-
- * string.c (rb_str_cmp): remove needless conditional.
-
-Tue Aug 14 03:23:25 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * string.c (rb_str_lstrip_bang) `return Qnil' was missing.
-
-Mon Aug 13 14:16:46 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * bignum.c, marshal.c: Detypo: s/SIZEOF_ING/SIZEOF_INT/.
-
-Sun Aug 12 15:01:58 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * string.c (rb_str_cat): fix buffer overflow.
-
- * string.c (rb_str_append): nothing to append actually when `str2'
- is empty.
-
-Sat Aug 11 14:43:47 2001 Tanaka Akira <akr@m17n.org>
-
- * array.c (rb_inspecting_p): initialize inspect_key if it is
- not initialized yet.
-
-Fri Aug 10 22:14:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (cond0): operands of logical operators are not treated
- as conditional expression anymore, but propagate conditional
- status if used in conditionals.
-
-Tue Aug 7 09:10:32 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * win32/win32.h: fix problems with BC++ (ruby-bugs#PR161).
-
-Mon Aug 6 23:47:46 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * pack.c (pack_pack): associates p/P strings once at last
- (reverted to 1.26).
-
- * string.c (rb_str_associate): associates an Array at once, not
- but a String. realloc's when str_buf.
-
-Mon Aug 6 17:01:33 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_gc_mark_threads): should mark ruby_cref.
-
-Mon Aug 6 14:31:37 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * numeric.c (num_divmod): fix typo.
-
-Mon Aug 6 03:29:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_lstrip_bang): new method.
-
- * string.c (rb_str_rstrip_bang): new method.
-
-Mon Aug 6 00:35:03 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * struct.c (rb_struct_modify): should check frozen and taint
- status.
-
-Sun Aug 5 19:28:39 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * string.c (rb_str_associate): should consider STR_ASSOC too.
-
-Sun Aug 5 07:46:18 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_undefined): do not recurse if method_missing is
- undefined.
-
-Thu Aug 2 21:37:32 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_waitpid): now all arguments are optional.
-
- * process.c (Init_process): waitpid is now alias to wait.
-
- * process.c (Init_process): waitpid2 is now alias to wait2.
-
- * process.c (rb_waitpid): made public.
-
- * ext/pty/pty.c (pty_getpty): avoid disturbing SIGCHLD using
- thread and rb_waitpid.
-
-Thu Aug 2 11:23:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_getpgrp): now takes no argument on all
- platforms.
-
- * process.c (proc_setpgrp): ditto.
-
-Thu Aug 2 01:29:42 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (strrdirsep): removed meaningless code.
-
- * file.c (rb_file_s_expand_path): reverted to 1.66.
-
-Wed Aug 1 16:17:47 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/socket/socket.c (sock_s_pack_sockaddr_in): added
- Socket::pack_sockaddr_in(). [new]
-
- * ext/socket/socket.c (sock_s_pack_sockaddr_un): added
- Socket::pack_sockaddr_un(). [new]
-
- * ext/socket/socket.c (sock_s_pack_sockaddr_in): added
- Socket::unpack_sockaddr_in(). [new]
-
- * ext/socket/socket.c (sock_s_pack_sockaddr_un): added
- Socket::unpack_sockaddr_un(). [new]
-
-Wed Aug 1 15:42:16 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * eval.c (ruby_run): avoid VC++ warning.
-
-Tue Jul 31 17:30:53 2001 Usaku Nakamura <usa@ruby-lang.org>
-
- * marshal.c (Init_marshal): fix typos.
-
-Tue Jul 31 15:16:39 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * process.c (last_status_set): nothing returned, should be void.
-
- * ext/socket/socket.c (load_addr_info): ditto.
-
-Tue Jul 31 12:11:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (Init_marshal): new constant Marshal::MAJOR_VERSION
- and Marshal::MINOR_VERSION.
-
-Tue Jul 31 07:18:04 2001 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * file.c (rb_file_s_expand_path): scans per path element not per
- byte/character, including fix of [ruby-talk:18152] and
- multi-byte pathname support.
-
-Tue Jul 31 11:52:10 2001 akira yamada <akira@ruby-lang.org>
-
- * marshal.c (marshal_load): ruby_verbose test should be wrapped by
- RTEST().
-
-Mon Jul 30 17:54:23 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_index): should return nil (not the default
- value) if value is not in the hash.
-
-Mon Jul 30 12:55:47 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (num_div): new method added. alias to '/' which
- should be preserved even if '/' is redefined (e.g. by
- mathn). [new]
-
-Mon Jul 30 11:12:14 2001 Amos Gouaux <amos+ruby@utdallas.edu>
-
- * lib/net/imap.rb: added new commands for managing folder quotas
- and folder ACLs.
-
-Mon Jul 30 03:19:53 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_cstr2inum): "0 ff".hex should return 0, not 255.
-
-Fri Jul 27 22:29:41 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (rb_file_s_expand_path): fixed using CharNext().
-
-Fri Jul 27 18:07:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_provided): extension should be guessed using
- rb_find_file_noext().
-
- * eval.c (rb_f_require): should call rb_feature_p() after
- extension completion.
-
-Fri Jul 27 16:25:52 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): add CHECK_INTS before next, redo, retry to
- avoid potential uninterruptable infinite loop.
-
-Thu Jul 26 11:27:12 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * file.c (rb_find_file_noext, rb_find_file): fix tilde expansion
- problem.
-
-Wed Jul 25 17:54:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_s_expand_path): use CharNext() to expand.
-
-Wed Jul 25 17:16:26 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * intern.h: add some missing function prototypes.
-
-Wed Jul 25 15:50:05 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * file.c (rb_file_s_expand_path): should not expand "." and ".."
- not following dirsep.
-
-Wed Jul 25 12:15:32 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * file.c (rb_find_file_noext): should update f by expanded path.
-
- * file.c (rb_find_file): ditto.
-
-Tue Jul 24 23:10:47 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (strrdirsep): multi-byte pathname and DOSish separator
- support. originally comes from Patrick Cheng. [new]
-
- * file.c (rb_file_s_basename, rb_file_s_dirname): use
- strrdirsep(). comes from Patrick Cheng.
-
- * file.c (is_absolute_path): restricted in DOSish absolute path
- with drive letter, and UNC support. originally comes from
- Patrick Cheng.
-
- * file.c (getcwd): define macro using getwd() unless provided.
-
-Tue Jul 24 19:23:15 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb: dig the target subdirectory for
- lib/* files properly in case of create_makefile("dir/name").
-
-Mon Jul 23 00:26:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_provide_feature): should not tweak extension used for
- loading.
-
-Sun Jul 22 21:16:43 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb: introduce a couple of new make
- variables: CLEANFILES and DISTCLEANFILES. They'd typically be
- defined in a file "depend".
-
-Sat Jul 21 09:40:10 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * io.c (io_fread): use fread(3) if PENDING_COUNT is available.
-
-Fri Jul 20 22:55:01 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * gc.c (ruby_xrealloc): fix a dangling bug which led memory
- reallocation to fail even though the second try after a GC
- succeeds.
-
-Fri Jul 20 03:00:46 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * class.c (rb_mod_include_p): Module#include? added. [new]
-
-Fri Jul 20 01:05:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (ignorecase_setter): give warning on modifying $=.
-
- * string.c (rb_str_casecmp): new method. [new]
-
- * string.c (rb_str_eql): separated from rb_str_equal(), make it
- always be case sensitive. [new]
-
- * string.c (rb_str_hash): made it always be case sensitive.
-
-Thu Jul 19 13:03:15 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_f_require): should not include path in $" value
-
- * file.c (rb_find_file): should return 0 explicitly on failure.
-
-Tue Jul 17 11:44:40 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * ruby.h: enable volatile directive with VC++.
-
- * regex.c: ditto.
-
-Tue Jul 17 06:01:12 2001 Minero Aoki <aamine@loveruby.net>
-
- * doc/net/smtp.rd.ja, pop.rd.ja, http.rd.ja: new files.
-
- * MANIFEST: add doc/net/{http,pop,smtp}.rd.ja.
-
-Tue Jul 17 11:22:01 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (NUM_FAILURE_ITEMS): was confusing NUM_REG_ITEMS and
- NUM_NONREG_ITEMS, which have happened to be same value.
-
-Tue Jul 17 11:08:34 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * ext/extmk.rb.in: modify RM macro because command.com/cmd.exe don't
- recognize single quotation as quote character.
-
- * lib/mkmf.rb: ditto.
-
-Tue Jul 17 01:38:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_class_new): subclass check moved to this function.
-
- * class.c (rb_class_boot): check less version of rb_class_new().
-
-Man Jul 16 13:21:30 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * file.c (file_load_ok): fix typo.
-
-Mon Jul 16 12:58:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_invoke): should preserve iter status for embedded
- frame in the block.
-
-Mon Jul 16 00:04:39 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_s_expand_path): may overrun buffer on stack.
-
-Sun Jul 15 01:38:28 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * string.c (rb_str_insert): forgot to call rb_str_modify().
-
-Sat Jul 14 12:26:30 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/digest/*/extconf.rb: fix so that they build from any
- directory.
-
-Sat Jul 14 06:20:17 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/net/http.rb: HTTP#proxy? did not worked.
-
-Sat Jul 14 02:56:19 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in: support multi-level ext/ directories.
- (e.g. you can have ext/foo, ext/foo/bar and ext/foo/baz)
-
-Sat Jul 14 02:55:02 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/.cvsignore: let cvs ignore extinit.c.
-
-Fri Jul 13 23:47:35 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_search): should consider reverse search.
-
-Fri Jul 13 22:26:09 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb: use File::split to split a target into a prefix and
- a module name. This also works around a just found bug of
- String#rindex.
-
- * ext/extmk.rb.in: ditto.
-
-Fri Jul 13 02:36:10 2001 Minero Aoki <aamine@loveruby.net>
-
- * dir.c (dir_s_chdir): warn only when invoked from multiple
- threads or block is not given.
-
-Thu Jul 12 15:11:48 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_connect): workaround for the setup of
- Cygwin socket(EALREADY).
-
-Mon Jul 9 16:49:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in: modify RM macro.
-
- * lib/mkmf.rb: ditto.
-
-Sun Jul 8 20:52:02 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ruby.h: fix a wrong function name: rb_iglob() -> rb_globi().
-
-Sun Jul 8 16:04:35 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: rename HTTP#request_by_name to send_request.
-
- * lib/net/protocol.rb (ProtoSocket#read): modify typo.
-
-Sat Jul 7 17:45:35 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_convert_type): should use rb_rescue(), not rb_rescue2().
-
- * range.c (range_init): ditto.
-
-Fri Jul 6 18:01:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_dup): copies (actually does not free)
- generic_ivar on dupif original owns them.
-
-Fri Jul 6 02:15:06 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/tempfile.rb: a tempfile must be created with mode 0600.
-
-Thu Jul 5 20:28:53 2001 Tietew <tietew@tietew.net>
-
- * string.c (rb_str_each_line): should propagate taint mark.
-
- * ext/nkf/nkf.c (rb_nkf_kconv): ditto.
-
-Fri Jul 6 14:54:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_require): revamp for simpler implementation.
-
- * file.c (rb_find_file_noext): use String object, instead of
- passing char* around.
-
- * file.c (rb_find_file): ditto.
-
-Thu Jul 5 22:01:02 2001 Mitsuhiro Kondo <kondo@nik-prt.co.jp>
-
- * dln.c (dln_load): should use NSLINKMODULE_OPTION_BINDNOW.
-
-Thu Jul 5 13:44:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (load_file): local variables 'c' remain uninitialized on
- xflag.
-
-Thu Jul 5 10:00:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_match): prefetched escaped character too early.
-
-Wed Jul 4 08:58:30 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): add argument check for attr_readers.
-
-Wed Jul 4 04:22:44 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTP#request_by_name): arg order changes.
-
-Wed Jul 4 04:07:36 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb (HTTP#request_by_name): bug fix.
-
- * lib/net/http.rb: does not write Connection: by default.
-
- * lib/net/protocol.rb: "start" for started protocol is an error.
-
- * lib/net/protocol.rb: "finish" for finished protocol is an error.
-
-Wed Jul 4 03:17:31 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/http.rb: new method HTTP#request_by_name (test)
-
- * lib/net/http.rb: new class HTTPGenericRequest
-
-Tue Jul 3 23:58:29 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb: distclean should remove mkmf.log as well.
-
-Tue Jul 3 18:35:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval_string_wrap): should push frame (and adjust
- cbase) before wrapped eval.
-
- * eval.c (rb_eval_cmd): ditto.
-
- * eval.c (eval): should update ruby_class always after all.
-
-Tue Jul 3 14:56:27 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (block_pass): do not change wrapper information.
-
- * eval.c (rb_yield_0): preserve wrapper information.
-
-Tue Jul 3 08:59:50 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * error.c (rb_name_error): raise NameError instead of LoadError.
-
-Mon Jul 2 17:22:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (exc_exception): clone the receiver exception instead of
- creating brand new exception object of the receiver.
-
-Mon Jul 2 09:53:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval_string_wrap): extend new ruby_top_self, not
- original self.
-
- * eval.c (rb_eval_cmd): respect ruby_wrapper if set.
-
- * eval.c (eval): do not update ruby_class unless scope is not
- provided.
-
-Sun Jul 1 10:51:15 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (eval): preserve wrapper information.
-
- * eval.c (proc_invoke): ditto.
-
- * eval.c (block_pass): ditto.
-
-Sat Jun 30 02:55:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (void_expr): too much warnings for void context
- (e.g. foo[1] that can be mere Proc call).
-
-Fri Jun 29 17:23:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (rb_name_error): new function to raise NameError with
- name attribute set.
-
- * eval.c (rb_f_missing): set name and args in the exception
- object. [new]
-
- * error.c (name_name): NameError#name - new method.
-
- * error.c (nometh_args): NoMethodError#args - new method.
-
-Fri Jun 29 15:29:31 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lex.c (rb_reserved_word): lex_state after tRESCUE should be
- EXPR_MID.
-
-Thu Jun 28 00:21:28 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/matrix.rb: resolve 'ruby -w' warnings.
-
- * lib/irb/locale.rb: resolve 'ruby -w' warnings.
-
- * lib/irb/multi-irb.rb: resolve 'ruby -w' warnings.
-
- * lib/irb/ruby-lex.rb: fix problem for "\\M-\\..." and "\\C-\\..."
- and resolve 'ruby -w' warnings.
-
- * lib/irb/ruby-token.rb: fix typo
-
- * lib/shell/command-processor.rb: resolve 'ruby -w' warnings.
-
-Wed Jun 27 08:53:26 2001 Minero Aoki <aamine@loveruby.net>
-
- * lib/net/pop.rb: new methods POP3.auth_only, POP3#auth_only
-
- * lib/net/http.rb: HTTP.Proxy returns self if ADDRESS is nil.
-
- * lib/net/protocol.rb: new method ProtocolError#response
-
- * lib/net/protocol.rb,smtp.rb,pop.rb,http.rb: add document.
-
-Tue Jun 26 18:42:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (add_heap): allocation size of the heap unit is doubled for
- each allocation.
-
-Mon Jun 25 09:54:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (isdelim): space, tab, and newline are no longer
- delimiters for glob patterns.
-
-Sat Jun 23 22:28:52 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (svalue_to_avalue): new conversion scheme between single
- value and array values.
-
- * eval.c (avalue_to_svalue): ditto.
-
- * eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return
- and yield too.
-
- * eval.c (rb_yield_0): use avalue_to_svalue().
-
- * eval.c (proc_invoke): Proc#call gives avaules, whereas
- Proc#yield gives mvalues.
-
- * eval.c (bmcall): convert given value (svalue) to avalue.
-
-Sat Jun 23 18:28:52 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/readline/readline.c (readline_event): a non-void function
- should return a value.
-
-Fri Jun 22 23:17:28 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/socket/socket.c (ruby_connect): workaround for the setup of
- Cygwin socket.
-
-Fri Jun 22 23:11:17 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb/locale.rb: fix for require "kconv" problem
-
-Fri Jun 22 18:08:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): no mvalue_to_svalue conversion here.
-
- * eval.c (massign): takes svalue, convert it to mvalue inside.
-
- * eval.c (rb_eval): parameters for yield/return are always
- svalues now.
-
- * eval.c (svalue_to_mvalue): more strict conversion.
-
- * eval.c (mvalue_to_svalue): ditto.
-
-Fri Jun 22 17:12:23 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * st.c (new_size): prime hash size enabled.
-
- * ext/socket/socket.c (Init_socket): SO_* constants added.
-
-Tue Jun 19 22:24:07 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * gc.c (rb_setjmp): avoid GCC 3.0 warnings.
-
-Tue Jun 19 18:19:30 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/readline/readline.c: add new methods:
- Readline::completion_append_character and
- Readline::completion_append_character=.
-
-Tue Jun 19 16:29:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (svalue_to_mvalue): new function to convert from svalue
- to mvalue. [experimental]
-
- * eval.c (mvalue_to_svalue): new function to convert from mvalue
- to svalue.
-
- * eval.c (rb_eval): use mvalue_to_svalue().
-
- * eval.c (rb_yield_0): use mvalue_to_svalue().
-
- * eval.c (proc_invoke): proper mvalue handling.
-
-Mon Jun 18 17:38:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_require): searches ".rb" and ".so" at the same
- time. previous behavior (search ".rb", then ".so") has a
- security risk (ruby-bugs#PR140).
-
- * array.c (rb_ary_to_ary): new function to replace internal
- rb_Array(), which never calls to_a, but to_ary (rb_Array() might
- call both). [new]
-
-Mon Jun 18 00:43:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (PUSH_FAILURE_POINT): push option status again.
-
- * regex.c (re_compile_pattern): avoid pushing unnecessary
- option_set.
-
-Sat Jun 16 10:58:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_load): tainted string is OK if wrapped *and*
- $SAFE >= 4.
-
-Thu Jun 14 16:27:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): should not nail down higher blocks
- before preserving original context (i.e. should not alter
- original context).
-
-Wed Jun 13 19:34:59 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * dir.c (Init_Dir): add a new method File::fnmatch? along with
- File::Constants::FNM_*. While I am here, FNM_NOCASE is renamed
- to FNM_CASEFOLD which is commonly used by *BSD and GNU libc.
-
-Wed Jun 13 09:33:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_yield): new method equivalent to Proc#call but no
- check for number of arguments. [new]
-
-Tue Jun 12 14:21:28 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * lib/mkmf.rb: target_prefix is only for installation, not for
- build.
-
-Tue Jun 12 00:41:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (method_eq): new method Method#==. [new]
-
-Mon Jun 11 14:29:41 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * confgure.in: add RUBY_CANONICAL_BUILD.
-
-Sun Jun 10 17:31:47 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * gc.c (STR_NO_ORIG): STR_NO_ORIG value was different between
- string.c and gc.c
-
-Sat Jun 9 22:10:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should convert *non-array at the end of
- arguments by using Array().
-
-Sat Jun 9 17:04:30 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * hash.c (ruby_setenv): readline library leaves their environment
- strings uncopied. "free" check revised.
-
-Sat Jun 9 16:31:03 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * ext/extmk.rb.in: Use -F and -T for mswin32 because cl.exe doesn't
- support -o officially and cl.exe considers that *.cc and *.cxx are
- OBJs.
-
- * lib/mkmf.rb: ditto.
-
- * win32/Makefile.sub: Use del instead of rm.
- All these changes are derived from Nobuyoshi Nakada's patch.
- Thanks.
-
-Fri Jun 8 22:37:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (Init_stack): avoid __builtin_frame_address(2) to retrieve
- stack bottom line.
-
-Fri Jun 8 18:14:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * st.c (numhash): should shuffle bits by dividing by prime number.
-
-Fri Jun 8 17:05:21 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): multiple assignment behavior fixed, which
- results "*a = nil" makes "a == []" now.
-
-Fri Jun 8 15:25:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_require): should set SCOPE_PUBLIC before calling
- dln_load().
-
-Thu Jun 7 17:28:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): exclude kDO_BLOCK too much by false condition.
-
-Wed Jun 6 23:02:36 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/sync.rb: bug fix if obj.initialize has parameters when
- obj.extend(Sync_m)
-
- * lib/mutex_m.rb: modified bit
-
-Wed Jun 6 16:11:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_load): should check if tainted even when wrap is
- specified.
-
-Wed Jun 6 14:34:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (mrhs_basic): "*arg" should always be expanded by REXPAND.
-
- * regex.c (re_compile_pattern): too much optimization for the
- cases like /(.|a)b/.
-
-Tue Jun 5 23:58:43 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (fc_i): removed vast string allocation.
-
-Tue Jun 5 16:45:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (Init_Exception): NameError went under StandardError,
- and NoMethodError went under NameError.
-
-Tue Jun 5 16:40:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (rb_intern): non identifier symbols should be
- categorized as ID_JUNK. [new]
-
-Tue Jun 5 16:15:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_const_at): use hash table as internal
- data. [new]
-
- * variable.c (rb_mod_const_of): ditto.
-
- * variable.c (rb_const_list): new function to convert internal
- data (hash table) to array of strings.
-
- * eval.c (rb_mod_s_constants): data handling scheme has changed.
-
-Tue Jun 5 15:16:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_add_method): should not call rb_secure(), for
- last_func may not be set.
-
- * io.c (rb_io_ctl): ioctl should accept any integer within C long
- range.
-
-Tue Jun 5 13:41:13 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/etc/extconf.rb: use egrep_cpp.
-
-Tue Jun 5 12:44:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (r_object): wrong type check for modules.
-
- * marshal.c (w_object): should not dump anonymous classes/modules.
-
-Tue Jun 5 01:19:34 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_open_file): use rb_file_sysopen_internal() if the 3rd
- argument (permission flags) is given. [new, should be backported?]
-
- * io.c (rb_io_mode_binmode): mode string (e.g. "r+") to flags to
- open(2).
-
-Mon Jun 4 23:55:54 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): NODE_REXPAND expand an array of 1 element as
- the element itself. [new, should be backported?]
-
- * parse.y (ret_args): should treat "*[a]" in rhs expression as
- "a", not "[a]".
-
-Mon Jun 4 04:14:53 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/shellwords.rb: don't destroy argument.
-
-Sat Jun 2 23:23:05 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): should push option modifier at the
- right place.
-
-Sat Jun 2 23:05:20 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/cgi/session.rb: don't use module_function for Class.
-
-Sat Jun 2 00:02:22 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * irb messages: fix typos.
-
-Fri Jun 1 17:26:24 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * hash.c (replace_i): ignore when key == Qundef.
-
-Fri Jun 1 16:50:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (call_args2): confusion with list_append() and
- list_concat() was fixed.
-
-Fri Jun 1 15:01:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): fixed 'print CGI::bar() {}, "\n"' syntax
- breakage, adding new lex_state status. sigh. [new]
-
-Fri Jun 1 11:21:04 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: use waitpid on mingw32.
-
- * ext/dbm/extconf.rb: include <ndbm.h>, not <gdbm.h>.
-
-Thu May 31 18:34:57 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * file.c (rb_file_s_unlink): should not allow if $SAFE >= 2.
-
-Thu May 31 17:23:25 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (Init_Range): define "to_ary".
-
-Thu May 31 13:30:25 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * mkconfig.rb, ext/configsub.rb: VERSION -> RUBY_VERSION.
-
-Thu May 31 08:00:58 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * win32/dir.h: re-add.
-
-Thu May 31 01:25:59 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in: default --with-libc_r to `no' until the problem is
- fixed. (FreeBSD only)
-
-Tue May 29 17:24:23 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * ruby.c (proc_options): unexpected SecurityError happens when -T4.
-
-Tue May 29 18:46:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): * \1 .. \9 should be
- backreferences always.
-
- * regex.c (re_match): backreferences corresponding to
- unclosed/unmatched parentheses should fail always.
-
-Tue May 29 16:35:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_cat): use rb_str_buf_cat() if possible. [new]
-
- * string.c (rb_str_append): ditto.
-
- * string.c (rb_str_buf_cat): remove unnecessary check (type,
- taint, modify) to gain performance.
-
- * string.c (rb_str_buf_append): ditto.
-
- * string.c (rb_str_buf_finish): removed.
-
-Tue May 29 02:05:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_buf_new): buffering string function. [new]
-
- * string.c (rb_str_buf_append): ditto.
-
- * string.c (rb_str_buf_cat): ditto.
-
- * string.c (rb_str_buf_finish): ditto.
-
-Mon May 28 23:20:43 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: remove unnecessary AC_CANONICAL_BUILD
-
- * defines.h: #define HAVE_SETITIMER on Cygwin(bug fixed).
-
- * ruby.c: use relative path from LIBRUBY_SO.
-
- * ruby.c: don't use -mwin32 option on Cygwin.
-
- * cygwin/GNUmakefile.in: ditto.
-
- * ext/sdbm/_sdbm: ditto.
-
- * ext/tcltklib/extconf.rb: ditto.
-
- * ext/tcltklib/stubs.c: ditto.
-
-Mon May 28 22:12:01 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/extconf.rb.in: make the priority of the make rule of .c
- higher than .C .
-
-Mon May 28 13:22:19 2001 Tanaka Akira <akr@m17n.org>
-
- * time.c (make_time_t): local time adjustment revised.
-
-Mon May 28 02:20:38 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * dir.c (glob_helper): teach has_magic() to handle flags and get
- glob_helper to properly support FNM_NOESCAPE.
-
- * dir.c (fnmatch): fix a bug when FNM_PATHNAME and FNM_PERIOD are
- specified at the same time.
-
-Sat May 26 09:55:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: accomplish extended syntax described in [ruby-talk:14525]
- using tSPC token. [new, experimental]
-
-Sat May 26 07:05:45 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * MANIFEST: add win32/dir.h .
-
-Fri May 25 20:03:51 2001 Pascal Rigaux <pixel@mandrakesoft.com>
-
- * dln.c (dln_find_1): should exclude directories in executable
- file lookup.
-
-Fri May 25 18:00:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_obj_singleton_methods): list methods in extended
- modules if optional argument is true. [new]
-
-Fri May 25 14:19:25 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * string.c (rb_str_replace): add taint status infection
- (OBJ_INFECT()).
-
- * string.c (rb_str_crypt): ditto.
-
- * string.c (rb_str_ljust): ditto.
-
- * string.c (rb_str_rjust): ditto.
-
- * string.c (rb_str_center): ditto.
-
-Fri May 25 05:39:03 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/sha1/sha1-ruby.c (sha1_hexdigest): fix buffer overflow. The
- buffer for a SHA-1 hexdigest needs to be 41 bytes in length.
-
-Fri May 25 01:47:39 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * MANIFEST: update the entries I forgot to add or remove.
-
-Fri May 25 00:57:25 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/sha1/sha1-ruby.c (sha1_new): separate initialize() from
- new().
-
- * ext/md5/md5init.c (md5i_new): ditto.
-
-Fri May 25 00:53:41 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/dbm/extconf.rb: fix support for *BSD and set $CFLAGS
- properly.
-
-Thu May 24 16:10:33 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_member): check based on "<=>" comparison. [new]
-
- * range.c (range_check): add "succ" check if first end is not a
- numeric.
-
- * range.c (range_eqq): comparison should based on "<=>".
-
- * range.c (range_each): ditto.
-
-Thu May 24 16:08:21 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * mkconfig.rb: autoconf 2.50 support.
-
-Thu May 24 14:23:35 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): need argument adjustment for C defined
- blocks too.
-
-Thu May 24 01:11:30 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dbm/extconf.rb: header search added. [new]
-
-Wed May 23 02:58:21 2001 Tanaka Akira <akr@m17n.org>
-
- * time.c (make_time_t): fix ad-hoc local time adjustment, using
- binary tree search.
-
-Tue May 22 17:10:35 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * variable.c (rb_alias_variable): should not allow variable
- aliasing if $SAFE >= 4.
-
-Tue May 22 02:37:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (expr): "break" and "next" to take optional expression,
- which is used as a value for termination. [new, experimental]
-
- * eval.c (rb_eval): "break" can give value to terminating method.
-
- * eval.c (rb_eval): "break" and "next" to take optional expression.
-
- * eval.c (rb_yield_0): "next" can give value to terminating "yield".
-
- * eval.c (rb_iterate): "break" can give value to terminating method.
-
- * eval.c (proc_call): ditto.
-
-Mon May 21 13:15:25 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big2str): t should be protected from GC.
-
-Sat May 19 09:29:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (rb_proc_times): need not to check return value from
- times(2).
-
-Fri May 18 05:36:08 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in (xsystem): backout the previous fix which was
- bogus.
-
-Fri May 18 05:19:55 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/mkmf.rb (xsystem): make a temporary fix to get $(...) macros
- properly expanded on a command execution.
-
- * ext/extmk.rb.in (xsystem): ditto.
-
-Fri May 18 03:45:55 2001 Brian F. Feldman <green@FreeBSD.org>
-
- * lib/mkmf.rb: unbreak "make install". lib/* must be installed
- under $rubylibdir, not under $libdir.
-
-Fri May 18 01:28:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (expr): break, next, redo, retry are moved from primary.
-
-Fri May 18 01:11:02 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * ext/sha1/sha1-ruby.c (sha1_new): get rid of an unneeded
- rb_obj_call_init() call.
-
-Fri May 18 01:03:55 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * ext/sha1/sha1.txt, ext/sha1/sha1.txt.jp: fix typos.
-
-Thu May 17 19:17:11 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/shell.rb, lib/shell/process-controller.rb,
- lib/shell/command-processor.rb: translate Japanese comments into
- English.
-
-Thu May 17 19:07:14 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * doc/shell.rd.jp: RD'ify and make some fixes.
-
- * doc/shell.rd: RD'ify, delete Japanese leftovers, make overall
- English fixes, and sync with doc/shell.rd.jp.
-
-Thu May 17 17:35:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_call0): address of local_vars might change during eval.
-
-Thu May 17 07:27:09 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/md5/md5.txt.jp, ext/sha1/sha1.txt.jp:
- s/SuperClass/Superclass/.
-
-Thu May 17 07:21:44 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/Setup.dj, ext/Setup.emx, ext/Setup.nt, ext/Setup.x68:
- compile sha1 in as well as md5.
-
- * ext/Setup: put sha1 in a comment.
-
-Thu May 17 07:16:38 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/sha1/sha1.txt.jp: add the Japanese version derived from
- ext/md5/md5.txt.jp.
-
- * ext/sha1/sha1.txt: revise the copyright info and reduce the
- difference from ext/md5/md5.txt.
-
- * ext/md5/md5.txt: reduce the difference from ext/sha1/sha1.txt.
-
-Thu May 17 07:11:35 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/sha1/extconf.rb, ext/sha1/sha1.c: use WORDS_BIGENDIAN to
- detect the platform's endian.
-
-Thu May 17 06:31:30 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/md5/md5.txt: make wording fixes, and mention the newly added
- method: "<<".
-
- * ext/md5/md5.txt.jp: ditto.
-
-Wed May 16 18:05:52 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/md5/md5init.c: add an instance method "<<" as an alias for
- "update". (inspired by Steve Coltrin's ruby-sha1)
-
-Tue May 15 17:46:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_and): should not push frozen key string.
-
- * array.c (rb_ary_or): ditto.
-
-Tue May 15 02:18:23 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/thread.rb: rescue ThreadError in case the thread is dead
- just before calling Thread#run.
-
-Mon May 14 13:50:22 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_schedule): should save context before raising
- deadlock, saved context for current thread might be obsolete.
-
- * time.c (make_time_t): non DST timezone shift supported (hopefully).
-
- * time.c (make_time_t): strict range detection for negative time_t.
-
-Mon May 14 11:54:20 2001 Tanaka Akira <akr@m17n.org>
-
- * signal.c: SIGINFO added.
-
-Mon May 14 08:57:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_ensure): should not SEGV when prot_tag is NULL.
-
-Sun May 13 23:51:14 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * win32/resource.rb: Modify copyright in resource script.
-
-Sun May 13 14:03:33 2001 Okada Jun <yun@be-in.org>
-
- * lib/thread.rb: fix Queue#pop and SizedQueue#max= to avoid
- deadlock.
-
-Sat May 12 15:43:55 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * win32/win32.c (kill): add support of signal 9 on mswin32/mingw32.
-
-Fri May 11 15:09:52 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ruby.h (rb_string_value): add volatile to avoid compiler warning.
-
- * string.c (rb_string_value): ditto.
-
-Fri May 11 03:35:33 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * README.EXT: Document find_library(), with_config() and
- dir_config().
-
-Fri May 11 03:34:20 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * README.EXT.jp: Remove the description of find_header() because
- such a function does not actually exist.
-
- * README.EXT.jp: Update the description of dir_config().
-
-Fri May 11 02:42:05 2001 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * README, README.jp: Fix CVS access and mailing lists info.
-
-Fri May 11 02:00:44 2001 Ryo HAYASAKA <ryoh@jaist.ac.jp>
-
- * bignum.c (bigdivrem): access boundary bug.
-
-Thu May 10 02:40:47 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): prohibit dumping out singleton classes.
-
- * object.c (rb_mod_to_s): distinguish singleton classes.
-
- * variable.c (rb_class2name): it's ok to reveal NilClass,
- TrueClass, FalseClass.
-
-Wed May 9 14:38:33 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (rb_yield_0): preserve and restore ruby_cref as well.
-
-Tue May 8 18:28:19 2001 Keiju Ishitsuka <keiju@ishitsuka.com>
-
- * lib/irb.rb lib/irb/multi-irb.rb lib/irb/ruby-lex.rb
- lib/irb/version.rb resolve ctrl-c problem
-
-Tue May 8 17:12:43 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (is_defined): core dumped during instance_eval for
- special constants.
-
- * eval.c (rb_eval): ditto.
-
-Tue May 8 08:52:57 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * doc/forwardable.rd, doc/forwardable.rd.jp: Hit `=begin' and
- `=end' in proper places so rd2 can format them without a problem.
-
- * doc/irb/irb-tools.rd.jp, doc/irb/irb.rd, doc/irb/irb.rd.jp:
- ditto.
-
-Tue May 8 08:38:53 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * doc/forwardable.rd, doc/forwardable.rd.jp, lib/forwardable.rb:
- Import forwardable 1.1.
-
-Tue May 8 08:34:33 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * doc/irb/irb-tools.rd.jp, doc/irb/irb.rd.jp: Convert from JIS to
- EUC.
-
-Tue May 8 03:46:39 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * sample/rbc.rb: Obsoleted by IRB.
-
-Mon May 7 15:58:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): "||=" should not warn for uninitialized instance
- variables.
-
- * eval.c (rb_eval): ditto.
-
- * eval.c (eval): preserve and restore ruby_cref as well.
-
-Mon May 7 15:45:48 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/ftools.rb (syscopy): chmod destination file only if
- it does not exist.
-
-Mon May 7 14:35:57 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_is_instance_of): takes only class/module as an
- argument.
-
-Sun May 6 16:27:29 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * eval.c (is_defined): rb_reg_nth_defined() may return Qnil.
-
-Thu May 3 03:15:06 2001 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
- * configure.in: get --enable-shared to work on MacOS X.
-
- * Makefile.in: make $(LIBRUBY_SO) depend on miniruby properly.
- Now `make -jN' should work without a problem.
-
-Thu May 3 02:07:45 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * win32/config.h.in: add SIZEOF___INT64 definition.
-
-Wed May 2 20:39:35 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dir.c (rb_glob, rb_globi): remove unnecessary FNM_PATHNAME.
-
-Wed May 2 11:46:13 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (block_pass): should not downgrade safe level.
-
-Wed May 2 03:07:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/dbm/extconf.rb: allow specifying dbm-type explicitly.
-
- * ext/dbm/extconf.rb: avoid gdbm if possible, because it leaks
- memory, whereas gdbm.so doesn't. potential incompatibility.
-
-Wed May 2 02:02:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_insert): new method.
-
-Tue May 1 17:55:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
-
-Tue May 1 16:23:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_insert): new method.
-
- * array.c (rb_ary_update): new utility function.
-
-Tue May 1 03:24:05 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * lib/irb/completion.rb, lib/irb/frame.rb, lib/irb/xmp.rb,
- doc/irb/irb-tools.rd.jp: Merge from irb-tools 0.7.1.
-
-Tue May 1 03:07:17 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * sample/irb.rb, lib/irb.rb, lib/irb/*, doc/irb/*: Merge from irb
- 0.7.3.
-
- * instruby.rb: Install help-message's too.
-
- * lib/irb/main.rb: This file is not needed anymore.
-
-Fri Apr 27 09:27:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (set_outfile): should check if closed before assignment.
-
-Thu Apr 26 22:36:11 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: don't use tzname on Cygwin 1.3.1+.
-
- * configure.in: add -mieee/-ieee to CFLAGS on OSF1/Alpha
- to disable "DIVISION BY ZERO" exception.
-
-Thu Apr 26 22:30:43 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should preserve value of ruby_errinfo.
-
-Thu Apr 26 10:36:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_schedule): infinite sleep should not cause
- dead lock.
-
-Wed Apr 25 16:40:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_flatten_bang): proper recursive detection.
-
-Wed Apr 25 15:36:15 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (yield_under): need not to prohibit at safe level 4.
-
-Wed Apr 25 15:22:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): p/P packs nil into NULL.
-
- * pack.c (pack_unpack): p/P unpacks NULL into nil.
-
-Tue Apr 24 15:35:32 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): size check for P template.
-
- * ruby.c (set_arg0): wrong predicate when new $0 value is bigger
- than original space.
-
-Tue Apr 24 15:18:49 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb: (dir_config) do not add the
- specified include directory if already included in $CPPFLAGS.
-
- * ext/extmk.rb.in, lib/mkmf.rb: (dir_config) return a more useful
- value, [include_dir, lib_dir].
-
-Mon Apr 23 14:43:59 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (id2ref): should use NUM2ULONG()
-
- * object.c (rb_mod_const_get): check whether name is a class
- variable name.
-
- * object.c (rb_mod_const_set): ditto.
-
- * object.c (rb_mod_const_defined): ditto.
-
-Sat Apr 21 22:33:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_float): precision changed to "%.16g"
-
-Sat Apr 21 22:07:58 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * eval.c (rb_call0): wrong retry behavior.
-
-Fri Apr 20 19:12:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (fix_aref): a bug on long>int architecture.
-
-Fri Apr 20 14:57:15 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (rb_eval_string_wrap): should restore ruby_wrapper.
-
-Sun Apr 22 17:44:37 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: add -mieee to CFLAGS on Linux/Alpha
- to disable "DIVISION BY ZERO" exception.
-
- * configure.in: remove -ansi on OSF/1.
-
-Wed Apr 18 04:37:51 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: CGI::Cookie: no use PATH_INFO.
-
-Wed Apr 18 00:24:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): char class at either edge of range
- should be invalid.
-
-Tue Apr 17 17:33:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (handle_rescue): use === to compare exception match.
-
- * error.c (syserr_eqq): comparison between SytemCallErrors should
- based on their error numbers.
-
-Tue Apr 17 16:54:39 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (safe_getter): should use INT2NUM().
-
-Tue Apr 17 15:12:56 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big2long): 2**31 cannot fit in 31 bit long.
-
-Sat Apr 14 22:46:43 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * regex.c (calculate_must_string): wrong length calculation.
-
-Sat Apr 14 13:37:32 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * win32/config.status.in: no longer use missing/alloca.c.
-
- * win32/Makefile.sub: ditto.
-
-Fri Apr 13 12:40:48 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (rb_thread_start_0): fixed memory leak.
-
-Fri Apr 13 16:41:18 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (none): should clear cmdarg_stack too.
-
-Fri Apr 13 06:19:29 2001 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * io.c (rb_fopen): use setvbuf() to avoid recursive malloc() on
- some platforms.
-
-Wed Apr 11 23:36:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_stat_dev): device functions should honor stat field
- types (except long long such as dev_t).
-
-Wed Apr 11 18:07:53 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (rb_mod_nesting): should not push nil for nesting array.
-
- * eval.c (rb_mod_s_constants): should not search array by
- rb_mod_const_at() for nil (happens for singleton class).
-
-Wed Apr 11 13:29:26 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_singleton_class_attached): should modify iv_tbl by
- itself, no longer use rb_iv_set() to avoid freeze check error.
-
- * variable.c (rb_const_get): error message "uninitialized constant
- Foo at Bar::Baz" instead of "uninitialized constantBar::Baz::Foo".
-
-Tue Apr 10 17:52:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_included): new hook called from rb_mod_include().
-
-Tue Apr 10 02:24:40 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * io.c (opt_i_set): should strdup() inplace_edit string.
-
-Mon Apr 9 23:29:54 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (exec_under): need to push cref too.
-
-Mon Apr 9 15:20:21 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_missing): raise NameError for "undefined local
- variable or method".
-
- * error.c (Init_Exception): new exception NoMethodError.
- NameError moved under ScriptError again.
-
- * eval.c (rb_f_missing): use NoMethodError instead of NameError.
-
-Mon Apr 9 12:05:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (Init_File): should redefine "new" class method.
-
-Mon Apr 9 11:56:52 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: fix typo.
-
-Fri Apr 6 01:46:35 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (PUSH_CREF): sharing cref node was problematic. maintain
- runtime cref list instead.
-
- * eval.c (rb_eval): copy defn node before registering.
-
- * eval.c (rb_load): clear ruby_cref before loading.
-
-Thu Apr 5 22:40:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_const_get): no recursion to show full class path
- for modules.
-
- * eval.c (rb_set_safe_level): should set safe level in curr_thread
- as well.
-
- * eval.c (safe_setter): ditto.
-
-Thu Apr 5 13:46:06 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * object.c (rb_obj_is_instance_of): nil belongs to false, not true.
-
-Thu Apr 5 02:19:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (make_time_t): proper (I hope) daylight saving time
- handling for both US and Europe. I HATE DST!
-
- * eval.c (rb_thread_wait_for): non blocked signal interrupt should
- stop the interval.
-
-Wed Apr 4 03:47:03 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_eq): class check added.
-
- * eval.c (proc_eq): typo fixed ("return" was omitted).
-
- * error.c (Init_Exception): move NameError under StandardError.
-
- * class.c (rb_mod_clone): should copy method bodies too.
-
- * bignum.c (bigdivrem): should trim trailing zero bdigits of
- remainder, even if dd == 0.
-
- * file.c (check3rdbyte): safe string check moved here.
-
-Tue Apr 3 09:56:20 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in (create_makefile): create def file only if
- it does not yet exist.
-
- * lib/mkmf.rb: ditto.
-
-Tue Apr 3 00:05:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (make_time_t): remove HAVE_TM_ZONE code since it
- sometimes reports wrong time.
-
- * time.c (make_time_t): remove unnecessary range check for
- platforms where negative time_t is available.
-
-Mon Apr 2 16:52:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_waitall): should push Process::Status instead of
- Fixnum status.
-
- * process.c (waitall_each): should add all entries in pid_tbl.
- these changes are inspired by Koji Arai. Thanks.
-
- * process.c (proc_wait): should not iterate if pid_tbl is 0.
-
- * process.c (proc_waitall): ditto.
-
-Mon Apr 2 14:25:49 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/monitor.rb (wait): ensure reentrance.
-
- * lib/monitor.rb (wait): fix timeout support.
-
-Mon Apr 2 12:40:45 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (media_subtype): return subtype.
-
-Mon Apr 2 12:01:15 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb (flag_list): capitalize flags.
-
-Mon Apr 2 01:32:38 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * Makefile.in: Introduce MAINLIBS.
-
- * configure.in: Link libc_r against the ruby executable on
- FreeBSD, which is the first attempt to work around a certain
- problem regarding pthread on FreeBSD. It should make ruby/libruby
- happy when it loads an extension to a library compiled and linked
- with -pthread. Note, however, that libruby is _not_ linked with
- libc_r so as not to mess up pthread unfriendly stuff including
- apache+mod_ruby and vim6+ruby_interp.
-
-Mon Apr 2 01:16:24 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c: use ruby's opendir on mingw32.
-
- * win32/dir.h, dir.c, Makefile: ditto.
-
-Sun Apr 1 23:26:14 2001 TOYOFUKU Chikanobu <toyofuku@juice.or.jp>
-
- * numeric.c (flodivmod): a bug in no fmod case.
-
-Sun Apr 1 18:36:14 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * process.c (pst_wifsignaled): should apply WIFSIGNALED for status
- (int), not st (VALUE).
-
-Sat Mar 31 04:47:55 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: add document and example code.
-
-Sat Mar 31 03:24:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (Init_IO): value of $/ and $\ are no longer restricted to
- strings. type checks are done on demand.
-
- * class.c (rb_include_module): module inclusion should be check
- taints.
-
- * ruby.h (STR2CSTR): replace to StringType() and StringTypePtr().
-
- * ruby.h (rb_str2cstr): ditto.
-
-Fri Mar 30 23:37:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_load): should not copy toplevel local variables. It
- cause variable/method ambiguity. Thanks to L. Peter Deutsch.
-
-Fri Mar 30 22:56:56 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: rename ContinueRequest to ContinuationRequest.
-
-Fri Mar 30 12:51:19 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_include_module): freeze check at first.
-
-Thu Mar 29 17:05:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_attr): sprintf() and rb_intern() moved into
- conditional body.
-
-Wed Mar 28 23:43:00 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
- rules for the mswin32 platforms.
-
-Wed Mar 28 19:29:21 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb: move C++ rules to the right place.
-
-Wed Mar 28 17:39:04 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_str2cstr): warn if string contains \0 and length
- value is ignored.
-
-Wed Mar 28 15:00:31 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * class.c (rb_singleton_class_clone): should copy class constant
- table as well.
-
-Wed Mar 28 14:23:23 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * class.c (rb_include_module): sometimes cache was mistakenly left
- uncleared - based on the patch by K.Kosako.
-
- * ruby.h: all Check_SafeStr()'s are replaced by SafeStr() to
- ensure 'to_str' be always effective.
-
-Wed Mar 28 09:52:33 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/Makefile.sub: disable global optimization.
-
-Tue Mar 27 15:00:54 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (rb_mod_define_method): should have clear method cache.
-
- * eval.c (rb_mod_define_method): should have raised exception for
- type error.
-
-Tue Mar 27 14:48:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h: changed "extern INLINE" to "static inline".
-
-Mon Mar 26 23:19:33 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * time.c (rb_strftime): check whether strftime returns empty string.
-
-Mon Mar 26 21:16:56 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: supports response handlers and multiple commands.
-
-Mon Mar 26 17:21:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c: remove TMP_PROTECT_END to prevent C_ALLOCA crash.
-
-Mon Mar 26 14:04:41 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/Win32API/Win32API.c: remove Init_win32api().
-
-Sun Mar 25 16:52:48 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * file.c (rb_file_flock): do not trap EINTR.
-
- * missing/flock.c (flock): returns the value from lockf(2)
- directly.
-
-Sat Mar 24 23:44:50 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ev_const_defined): should ignore toplevel cbase (Object).
-
- * eval.c (ev_const_get): ditto.
-
-Fri Mar 23 17:37:52 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ext/md5/md5.h: replace by independent md5 implementation
- contributed by L. Peter Deutsch (thanks).
-
- * ext/md5/md5init.c: adopted to Deutsch's md5 implementation.
-
-Fri Mar 23 17:26:19 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_unpack): string from P/p should be tainted.
-
-Fri Mar 23 12:18:44 2001 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
- * ext/curses/curses.c: curses on Mac OS X public beta does not
- have _maxx etc.
-
-Fri Mar 23 10:50:31 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_object): should truncate trailing zero short for
- bignums.
-
-Fri Mar 23 09:49:02 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (sym_intern): new method.
-
-Thu Mar 22 22:15:45 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/Win32API/extconf.rb: add -fno-omit-frame-pointer.
-
-Thu Mar 22 18:17:36 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_nesting): should not include Object at the
- toplevel.
-
-Thu Mar 22 17:43:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h: better inline function support.
-
- * configure.in (NO_C_INLINE): check if inline is available for the
- C compiler.
-
-Mon Mar 19 11:03:10 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * marshal.c (r_object): len calculation patch was wrong for
- machines SIZEOF_BDIGITS == SIZEOF_SHORT.
-
- * gc.c: alloca prototype reorganized for C_ALLOCA machine.
-
-Wed Mar 21 23:07:45 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (win32_stat): WinNT/2k "//host/share" support.
-
-Wed Mar 21 08:05:35 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * win32/dir.h: replace missing/dir.h .
-
- * win32/win32.h: ditto.
-
- * win32/win32.c: ditto.
-
-Wed Mar 21 01:26:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (id2ref): sometimes confused symbol and reference.
-
-Tue Mar 20 23:09:33 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (win32_stat): UNC support.
-
- * dir.c (extract_path): fix "./*" problem.
-
-Tue Mar 20 15:10:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (glob_helper): breaks loop after calling recursive
- glob_helper; all wild cards should be consumed; no need for
- further match.
-
- * dir.c (dir_s_glob): gives warning if no match found.
-
-Tue Mar 20 14:13:45 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * object.c (sym_inspect): did allocate extra byte space.
-
-Mon Mar 19 19:14:47 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * marshal.c (shortlen): shortlen should return number of bytes
- written.
-
-Mon Mar 19 16:52:23 2001 K.Kosako <kosako@sofnec.co.jp>
-
- * eval.c (ev_const_defined): need not to check if cbase->nd_class
- is rb_cObject.
-
- * eval.c (ev_const_get): ditto.
-
-Mon Mar 19 17:11:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_zone): return "UTC" for UTC time objects.
-
-Mon Mar 19 16:27:32 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (THREAD_ALLOC): flags should be initialized.
-
- * signal.c (rb_f_kill): should use FIX2INT, not FIX2UINT.
-
-Mon Mar 19 10:55:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (glob_helper): replace lstat() by stat() to follow symlink
- in the case like 'symlink/*'.
-
- * dir.c (glob_helper): gave warning too much.
-
-Sun Mar 18 08:58:18 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: // === '' --> //.match('')
-
- * lib/cgi.rb: cgi#header(): improvement for mod_ruby.
-
- * lib/cgi.rb: cgi#rfc1123date(): improvement.
- thanks to TADA Tadashi <sho@spc.gr.jp>.
-
- * lib/cgi.rb: cgi#rfc1123date(): document bug fix.
- thanks to Kazuhiro NISHIYAMA <zn@mbf.nifty.com>.
-
- * lib/cgi.rb: cgi#header(): bug fix.
- thanks to IWATSUKI Hiroyuki <don@na.rim.or.jp>.
-
-Sat Mar 17 11:11:24 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (glob_helper): * should follow symlink, whereas ** should
- not follow.
-
-Thu Mar 15 01:28:02 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_s_chdir): block form of Dir.chdir. (RCR#U016).
-
-Fri Mar 16 17:14:17 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * configure.in: Set SOLIBS properly for all ELF and
- FreeBSD/NetBSD/OpenBSD a.out platforms so that the shlib
- dependencies are recorded in the libruby shlib.
-
-Wed Mar 14 16:41:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_schedule): raise FATAL just once to
- THREAD_TO_KILL.
-
-Wed Mar 14 10:41:34 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): 0 (= Qfalse) is a valid value, so that
- default self should be checked by klass == 0.
-
- * bignum.c (rb_cstr2inum): should disallow '++1', '+-1', etc.
-
-Tue Mar 13 17:51:09 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ev_const_defined): add new parameter self for special
- const fallback.
-
- * eval.c (ev_const_get): ditto.
-
-Tue Mar 13 16:39:45 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dir.c (rb_glob_helper): fix drive letter handling on DOSISH.
-
-Tue Mar 13 14:54:39 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: add HTTPRequest#basic_auth.
-
- * lib/net/smtp.rb: raise if only account or password is given.
-
- * lib/net/protocol.rb: WriteAdapter#<< returns self.
-
-Tue Mar 13 14:41:16 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_seek_m): wrong calling sequence of rb_io_seek().
-
-Tue Mar 13 09:14:19 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (cond0): no special treatment of string literal in
- condition.
-
-Mon Mar 12 18:59:38 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): save/restore $libs and $LIBPATH.
-
-Sun Mar 11 18:13:34 2001 Masahiro Tanaka <masa@stars.gsfc.nasa.gov>
-
- * math.c: add acos, asin, atan, conh, sinh, tanh and hypot to Math.
-
- * configure.in: check hypot availability.
-
- * missing/hypot.c: public domain rewrite of hypot.
-
-Sun Mar 11 13:21:04 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * parse.y (warn_unless_e_option): warning condition was wrong.
-
- * parse.y (warning_unless_e_option): ditto.
-
-Sun Mar 11 00:55:31 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (install_rb): fix handling of destination path.
-
-Sat Mar 10 22:56:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_all): new method 'all?', which returns true if
- block returns true for all elements.
-
- * enum.c (enum_any): new method 'any?', which returns true if
- block returns true for any of elements.
-
-Sat Mar 10 02:34:18 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * math.c (math_log, math_log10): use nan() instead of 0.0/0.0 on Cygwin.
-
-Fri Mar 9 09:56:19 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (marshal_load): do not give warning unless explicitly
- set to verbose.
-
-Fri Mar 9 02:07:53 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_exit): give string value "exit" to SystemExit.
-
- * ruby.c (proc_options): -v should not print version if
- proc_options called via moreswitches().
-
-Thu Mar 8 17:45:19 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb: one write(2) per one line.
-
-Wed Mar 7 14:26:11 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * math.c (math_log, math_log10): should return NaN if x < 0.0
- on Cygwin.
-
-Thu Mar 7 10:31:26 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (stmt): while/until modifier must work for empty body.
-
-Tue Mar 6 22:53:58 2001 Kazuhiro Yoshida <moriq.kazuhiro@nifty.ne.jp>
-
- * ruby.c (ruby_set_argv): clear ARGV contents before adding args.
-
-Tue Mar 6 10:50:29 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): rescue and ensure clauses should be allowed
- to appear in singleton method body.
-
-Mon Mar 5 17:25:13 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_eq): compare Procs using blocktag equality.
-
- * eval.c (proc_to_s): stringify according to block tag address.
-
-Mon Mar 5 17:19:56 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (gettimeofday): use GetLocalTime() instead of ftime()
- for high-resolution timing.
-
-Sun Mar 4 17:01:09 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * string.c (trnext): support backslash escape in String#tr.
-
-Sat Mar 3 16:15:16 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): push cbase if ruby_cbase != ruby_class, for
- example in the case NODE_DEFN/NODE_DEFS are called within
- module_eval.
-
-Wed Feb 28 11:02:41 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_delete_bang): delete! should take at least 1
- argument.
-
- * ruby.c (load_file): add rb_gc() after loading to avoid
- extraordinary memory growth.
-
-Wed Feb 28 05:01:40 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * dir.c (rb_glob_helper): "./foo" should match "foo", not "./foo".
-
-Tue Feb 27 16:38:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ev_const_get): retrieve Object's constant if no current
- class is available (e.g. defining singleton class for Fixnums).
-
- * eval.c (ev_const_defined): check Object's constant if no current
- class is available (e.g. defining singleton class for Fixnums).
-
- * time.c (time_timeval): negative time interval should not be
- allowed.
-
- * eval.c (proc_call): ignore block to `call' always, despite of
- being orphan or not.
-
-Wed Feb 27 10:16:32 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_yield_0): should check based on rb_block_given_p()
- and rb_f_block_given_p().
-
-Tue Feb 27 04:13:45 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * configure.in (frame-address): --enable-frame-address to allow
- __builtin_frame_address() to be used.
-
- * eval.c (stack_length): use __builtin_frame_address() based on
- the macro USE_BUILTIN_FRAME_ADDRESS.
-
- * gc.c (rb_gc): ditto.
-
- * gc.c (Init_stack): ditto.
-
-Mon Feb 26 16:20:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (proc_options): call ruby_show_version() just once.
-
- * dir.c (dir_s_open): returns the value from a block (if given).
-
-Mon Feb 26 14:29:04 2001 Akinori MUSHA <knu@iDaemons.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb: add C++ rules in addition to C
- rules.
-
-Mon Feb 26 00:04:52 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_call): should not modify ruby_block->frame.iter
- based on ruby_frame->iter altered by PUSH_ITER().
-
-Mon Feb 26 05:27:52 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/net/telnet.rb: #telnetmode(), #binmode(): bug fix.
- thanks to nobu.nakada@nifty.ne.jp.
-
-Mon Feb 26 04:55:50 2001 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: CGI#form(): bug fix.
- thanks to MoonWolf <moonwolf@moonwolf.com>.
-
- * lib/cgi.rb: CGI#rfc1123_date(): improvement.
- thanks to Tomoyasu Akita <genzo-@dm4lab.to>.
-
- * lib/cgi.rb: CGI#header(): improvement for mod_ruby.
- thanks to Shugo Maeda <shugo@ruby-lang.org>.
-
-Sun Feb 25 02:45:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * file.c (rb_file_s_rename): avoid Cygwin's bug.
-
-Sat Feb 24 23:32:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_fd_close): should save current context before
- raising exception.
-
-Sat Feb 24 22:14:00 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c (myrename): fix error handling.
-
-Sat Feb 24 13:58:48 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: always close connection on request without
- body.
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: change copyright.
-
-Sat Feb 24 03:15:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (set_stdin): preserve original stdin.
-
- * io.c (set_outfile): preserve original stdout/stderr.
-
-Fri Feb 23 08:28:58 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb: clear read buffer after reopen.
-
- * lib/net/protocol.rb: refactoring.
-
- * lib/net/http.rb: split module HTTPHeader from HTTPResponse.
-
-Tue Feb 20 23:45:35 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * process.c: add W* macro if not available.
-
-Tue Feb 20 16:37:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in: add check for negative time_t for gmtime(3).
-
- * time.c (time_new_internal): no positive check if gmtime(3) can
- handle negative time_t.
-
- * time.c (time_timeval): ditto.
-
- * bignum.c (rb_big2long): should not raise RangeError for Bignum
- LONG_MIN value.
-
-Mon Feb 19 17:46:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_substr): "a"[1,2] should return ""; need
- rubicon upgrade.
-
-Mon Feb 19 12:10:36 2001 Triet H. Lai <thlai@mail.usyd.edu.au>
-
- * error.c (rb_sys_warning): new function to give warning with
- strerror() message.
-
- * dir.c (rb_glob_helper): better error handling, along with
- performance tune.
-
-Mon Feb 19 01:55:43 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (secure_visibility): visibility check for untainted modules.
-
-Mon Feb 19 00:29:29 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * signal.c (sigpipe): sighandler which does nothing.
-
- * signal.c (trap): set sigpipe function for SIGPIPE.
-
- * signal.c (Init_signal): default SIGPIPE handler should be
- sigpipe function.
-
-Sun Feb 18 15:42:38 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/curses/extconf.rb: add dir_config.
-
- * missing/flock.c: use fcntl(2) instead of lockf(2).
-
-Sun Feb 18 05:46:03 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: Response#range_length was not debugged.
-
-Sun Feb 18 04:02:03 2001 Yasushi Shoji <yashi@yashi.com>
-
- * array.c (rb_ary_subseq): wrong boundary check.
-
-Sun Feb 18 00:09:50 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * win32/win32.c: make file I/O faster on mswin32/mingw32.
-
- * win32/win32.h: ditto.
-
- * rubysig.h: ditto.
-
-Sat Feb 17 23:32:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (cond0): integer literal in condition should not be
- compared to lineno ($.).
-
-Fri Feb 16 01:44:56 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (set_outfile): f should be the FILE* from the assigning value.
-
- * ext/socket/socket.c (tcp_s_open): should not give default value
- to local_host.
-
- * time.c (time_s_times): move to Process::times.
-
- * file.c (rb_file_s_lchmod): new method File::lchmod.
-
- * file.c (rb_file_s_lchown): new method File::lchown.
-
-Thu Feb 15 11:33:49 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/cgi/session.rb (close): fixed reversed condition.
-
-Thu Feb 15 08:34:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_waitall): new method based on a patch from Brian
- Fundakowski Feldman <green@green.dyndns.org>.
-
- * process.c (last_status_set): objectify $? value (Process::Status).
-
-Wed Feb 14 17:28:24 2001 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: supports unknown resp_text_code.
-
-Wed Feb 14 00:44:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * dir.c (dir_s_glob): support backslash escape of metacharacters
- and delimiters.
-
- * dir.c (remove_backslases): remove backslashes from path before
- calling stat(2).
-
- * dir.c (dir_s_glob): call rb_yield directly (via push_pattern) if
- block is given to the method.
-
- * dir.c (push_pattern): do not call rb_ary_push; yield directly.
-
- * eval.c (blk_copy_prev): reduced ALLOC_N too much.
-
- * eval.c (frame_dup): ditto.
-
-Tue Feb 13 23:05:38 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dir.c (lstat): should use rb_sys_stat if lstat(2) is not
- available.
-
-Tue Feb 13 08:43:10 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_ctl): do not call ioctl/fcntl for f2, if f and f2
- have same fileno.
-
-Tue Feb 13 01:13:43 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_load): raise LocalJumpError if unexpected local jumps
- appear during load.
-
- * ext/socket/socket.c (bsock_close_read): don't call rb_thread_fd_close();
- it's supposed to be called by io_io_close().
-
- * ext/socket/socket.c (bsock_close_read): do not modify f and f2.
-
- * ext/socket/socket.c (bsock_close_write): ditto.
-
- * ext/socket/socket.c (sock_new): avoid dup(2) on sockets.
-
- * parse.y (primary): preserve and clear in_single and in_def using
- stack to prevent nested method errors in singleton class bodies.
-
-Sun Feb 11 16:00:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * eval.c (stack_length): use __builtin_frame_address() only if
- GCC and i386 CPU.
-
- * gc.c (rb_gc, Init_stack): ditto.
-
- * configure.in: add ac_cv_func_getpgrp_void=yes on DJGPP.
-
-Sat Feb 10 23:43:49 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * hash.c (rb_any_hash): dumped core on machines sizeof(int) != sizeof(long).
-
-Sat Feb 10 23:07:15 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_for_fd): IO::for_fd(fd) - new method.
-
- * regex.c (PREV_IS_A_LETTER): should not treat c>0x7f as a word
- character if -Kn.
-
-Sat Feb 10 00:00:30 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * win32/win32.c (win32_stat): replace stat to enable when pathname
- ends with '/' or '\' for mswin32 on Win9X / Win2k.
-
- * win32/win32.h: ditto.
-
- * ruby.h: ditto.
-
- * dir.c (rb_glob_helper): ditto.
-
- * file.c (rb_stat, rb_file_s_stat, eaccess, check3rdbyte): ditto.
-
-Fri Feb 9 22:54:57 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ruby.c (ruby_init_loadpath): convert '\\' to '/'
- before finding executable file path.
-
-Fri Feb 9 17:41:53 2001 Triet H. Lai <thlai@mail.usyd.edu.au>
-
- * dir.c (rb_glob_helper): do not follow symbolic links.
-
-Thu Feb 8 21:27:24 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/mkmf.rb (install_rb): fix handling of relative path.
-
- * lib/mkmf.rb (create_makefile): add srcdir.
-
-Thu Feb 8 02:22:09 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: join HTTPReadResponse into HTTPResponse again.
-
- * lib/net/http.rb: move http_version() from HTTPRequest to
- HTTPResponse.
-
- * lib/net/protocol.rb: refactoring.
-
-Wed Feb 7 16:27:27 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: split HTTPResponse into HTTPReadResponse
- module.
-
- * lib/net/protocol.rb: add Net::net_private.
-
- * lib/net/protocol.rb: Socket#reopen takes arg, open_timeout.
-
-Wed Feb 7 16:05:22 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (parse_quotedwords): %w should allow parenthesis escape.
-
-Wed Feb 7 00:57:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (parse_qstring): %q should allow terminator escape.
-
- * re.c (rb_reg_options): new method to give an option values.
-
- * parse.y (cond0): disable special treating of integer literal in
- conditional unless option -e is supplied. changes current
- behavior. experimental.
-
- * parse.y (cond0): give warning for string/integer literals and
- dot operators in conditionals unless option -e is supplied.
-
- * re.c (rb_reg_equal): all option flags should be same to be equal.
-
-Tue Feb 6 21:30:44 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: call on_connect() on re-opening socket.
-
- * lib/net/pop.rb: also POP3 can use APOP auth.
-
-Tue Feb 6 20:19:10 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: add HTTP#request.
-
- * lib/net/http.rb: take HTTP 1.0 server into account (incomplete).
-
- * lib/net/protocol.rb: timeout for open/read.
-
- * lib/net/protocol.rb: add Protocol#on_connect,on_disconnect.
-
-Mon Feb 5 23:15:46 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (Init_Exception): make Interrupt a subclass of
- SignalException.
-
-Mon Feb 5 00:39:06 2001 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
-
- * dir.c: use ISXXX() instead of isxxx().
-
- * dln.c (aix_loaderror): ditto.
-
- * file.c (rb_file_s_expand_path): ditto.
-
- * string.c (rb_str_upcase_bang): ditto.
-
- * win32/win32.c (do_spawn): ditto.
-
- * win32/win32.c (NtMakeCmdVector): ditto.
-
- * win32/win32.c (opendir): ditto.
-
-Sat Feb 3 14:44:53 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * configure.in (AC_C_INLINE): check inline attribute.
-
- * gc.c (is_pointer_to_heap): use inline rather than __inline__.
-
- * pack.c (hex2num): ditto.
-
- * ruby.h (rb_class_of, rb_type, rb_special_const_p): ditto.
-
- * util.c (rb_class_of, rb_type, rb_special_const_p): defined in
- ruby.h.
-
-Fri Feb 2 16:14:51 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_sort_bang): returns self, even if its length is
- less than 2.
-
- * eval.c (POP_VARS): propagate DVAR_DONT_RECYCLE, if
- SCOPE_DONT_RECYCLE of ruby_scope is set.
-
-Wed Jan 31 22:27:29 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: gcc-2.95.2-7(Cygwin) support.
- add -mwin32 if available.
-
- * cygwin/GNUmakefile: ditto.
-
-Tue Jan 30 17:56:48 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_fetch): new method.
-
-Mon Jan 29 17:36:19 2001 TOYOFUKU Chikanobu <toyofuku@juice.or.jp>
-
- * eval.c (rb_eval): nd_iter evaluation should be wrapped by
- BEGIN_CALLARGS and END_CALLARGS.
-
-Mon Jan 29 14:25:39 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (block_pass): return from block jumps directory to
- block invoker.
-
-Mon Jan 29 01:40:27 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (str_independent): should not clear str->orig here.
- it's too early.
-
-Fri Jan 26 01:42:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y: clarify do ambiguity, bit more complex but natural
- from my point of view.
-
-Wed Jan 24 14:58:08 2001 Akinori MUSHA <knu@ruby-lang.org>
-
- * lib/cgi.rb: fix the problem that when running under mod_ruby
- header() outputs only one Set-Cookie line.
-
-Wed Jan 24 01:45:49 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (POP_BLOCK_TAG): call rb_gc_force_recycle() if block has
- not been objectified.
-
- * eval.c (rb_callcc): should nail down block->tag history to avoid
- rb_gc_force_recycle().
-
-Tue Jan 23 18:51:57 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_call_finalizer_at_exit): should finalize objects in
- deferred_final_list too.
-
-Tue Jan 23 16:10:12 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (os_live_obj): do not list terminated object.
-
- * gc.c (os_obj_of): ditto.
-
- * gc.c (rb_gc_mark): support new T_BLKTAG tag.
-
- * gc.c (obj_free): ditto.
-
- * eval.c (new_blktag): creation of new block tag, which holds
- destination of global jump and orphan status.
-
- * eval.c (block_pass): break from orphan Proc object will raise a
- LocalJumpError exception.
-
-Mon Jan 22 16:33:16 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * mkconfig.rb: autoconf 2.49 support.
-
-Mon Jan 22 00:32:44 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (block_pass): behavior consistency with proc_call(). do
- not propagate `break'.
-
-Sat Jan 20 03:54:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): fixed serious syntax misbehavior. do's
- preceding was too high. a block in `foo bar do .. end' should
- be passed to `foo', not `bar'.
-
- * parse.y (block_call): syntax restructure.
-
-Thu Jan 18 04:28:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_s_read): new method to call IO#read from
- pathname. In addition, it accepts third optional argument to
- specify starting point.
-
-Wed Jan 17 13:28:26 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: remove DEFS definition.
-
- * mkconfig.rb: ditto.
-
- * win32/config.status.in: ditto.
-
-Tue Jan 16 17:00:50 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb: ignore EOFError for read.
-
- * lib/net/http.rb: user specified header was not used.
-
-Mon Jan 15 16:00:07 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_unpack): should check associated pointer packed by
- pack("P"). Thus pointers can be retrieved only from pointer
- packed strings. restriction added.
-
-Sun Jan 14 21:49:28 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * sprintf.c (rb_f_sprintf): simple typo. binary base should be 2,
- not '2'.
-
- * re.c (rb_reg_s_last_match): should explicitly return nth match.
-
-Sun Jan 14 18:21:30 2001 Usaku Nakamura <usa@osb.att.ne.jp>
-
- * win32/config.status.in: add some field.
-
- * win32/win32.c (isInternalCmd): ignore case for shell's internal
- command.
-
- * win32/win32.c (do_spawn): recognize quoted command line.
-
-Sun Jan 14 04:10:27 2001 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb (adding): too few "yield" in case of arg is
- not String/File.
-
- * lib/net/http.rb: add http request object.
-
-Sat Jan 13 19:39:30 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * re.c (rb_reg_desc): separate RE_OPTION_MULTILINE
-
- * re.c (rb_reg_options): add RE_OPTION_{POSIXLINE,RE_OPTION_MULTILINE,
- RE_OPTION_EXTENDED}
-
-Thu Jan 11 10:45:04 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.h, win32/config.h.in: move NORETURN from win32.h
- to config.h.in.
-
- * win32/config.h.in (inline): renamed from INLINE.
-
- * djgpp/config.hin (INLINE): removed.
-
-Thu Jan 11 06:45:55 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_dup): should propagate FL_SINGLETON.
-
- * object.c (inspect_obj): handles the case of no instance variable.
-
-Wed Jan 10 16:15:08 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ruby.h: NORETURN macro is changed for VC++ 6.0.
-
- * eval.c, intern.h: ditto.
-
- * djgpp/config.hin, win32/win32.h: ditto.
-
- * configure.in: ditto.
-
-Wed Jan 10 13:54:53 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * process.c (proc_setuid): use setresuid() if available.
-
- * process.c (proc_setgid): use setresgid() if available.
-
- * configure.in: ditto.
-
-Wed Jan 10 01:50:45 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * configure.in (AC_C_INLINE): check inline attribute.
-
- * string.c (rb_str_reverse_bang): forgot to call rb_str_modify().
-
-Tue Jan 9 17:41:40 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_taint): check frozen status before modifying
- taint status.
-
- * object.c (rb_obj_untaint): ditto.
-
-Tue Jan 9 16:22:14 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * enum.c (enum_inject): new method.
-
-Tue Jan 9 02:16:42 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_call_finalizer_at_exit): clear klass member of
- terminating object.
-
- * eval.c (rb_call): raise exception for terminated object.
-
-Mon Jan 8 21:24:37 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivrem): t2 might be too big for signed long; do
- not use rb_int2big(), but rb_uint2big().
-
-Mon Jan 8 21:35:10 2001 Guy Decoux <decoux@moulon.inra.fr>
-
- * file.c (path_check_1): should restore modified path.
-
-Mon Jan 8 03:09:58 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (rb_load_fail): new func to report LoadError.
-
- * ruby.c (load_file): use rb_load_fail.
-
-Sat Jan 6 00:17:18 2001 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * pack.c (pack_pack): avoid infinite loop(pack 'm2').
-
-Fri Jan 5 01:02:17 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_finalize): should enclosed by PUSH_TAG/POP_TAG.
-
- * gc.c (rb_gc_mark): link 2 of NODE_IFUNC should not be explicitly
- marked. it may contain non object pointer.
-
-Tue Jan 2 00:20:06 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * re.c (reg_s_last_match): Regexp::last_match(nth) returns nth
- substring of the match (alternative for $& and $<digit>).
-
-Sun Dec 31 01:39:16 2000 Guy Decoux <decoux@moulon.inra.fr>
-
- * eval.c (rb_mod_define_method): wrong comparison for blocks.
-
-Sat Dec 30 19:28:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (id2ref): should handle Symbol too.
-
- * gc.c (id2ref): should print original ptr value
-
-Sat Dec 30 03:14:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_iterate): NODE_CFUNC does not protect its data
- (nd_tval), so create new node NODE_IFUNC for iteration C
- function.
-
- * eval.c (rb_yield_0): use NODE_IFUNC.
-
- * gc.c (rb_gc_mark): support NODE_IFUNC.
-
-Fri Dec 29 11:41:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (mem_error): prohibit recursive mem_error().
- (ruby-bugs-ja:PR#36)
-
-Fri Dec 29 11:05:41 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_fd_writable): should not switch context if
- rb_thread_critical is set.
-
- * eval.c (rb_thread_wait_fd): ditto.
-
- * eval.c (rb_thread_wait_for): ditto.
-
- * eval.c (rb_thread_select): ditto.
-
- * eval.c (rb_thread_join): join during critical section causes
- deadlock.
-
-Fri Dec 29 00:38:46 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * m17n.c: new file - core functions of M17N.
-
-Tue Dec 26 18:46:41 2000 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
-
- * lib/debug.rb: Avoid thread deadlock in debugging stopped thread.
-
- * lib/debug.rb: Uncleared 'finish' state.
-
-Tue Dec 26 16:53:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): remove dvar node by rb_gc_force_recycle()
- more eagerly.
-
- * eval.c (rb_f_binding): recycling should be stopped for outer
- scope too.
-
- * eval.c (proc_new): ditto.
-
-Tue Dec 26 15:45:35 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_inspect): should treat multibyte characters
- properly.
-
-Mon Dec 25 17:49:08 2000 K.Kosako <kosako@sofnec.co.jp>
-
- * string.c (rb_str_replace_m): unexpected string share happens if
- replace is done for associated (STR_NO_ORIG) string.
-
-Tue Dec 26 15:01:53 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_f_p): should not call rb_io_flush() if rb_defout is not
- a IO (T_FILE).
-
-Mon Dec 25 15:52:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * stable version 1.6.2 released.
-
-Mon Dec 25 05:11:04 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: version 2.1.2 (some bug fixes).
-
- * lib/cgi.rb: Regexp::last_match[1] --> $1
-
- * lib/net/telnet.rb: ditto.
-
-Mon Dec 25 04:43:02 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: does not send HEAD on closing socket.
-
-Mon Dec 25 00:44:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_any_cmp): should use rb_str_cmp() if TYPE == T_STRING
- and CLASS_OF == rb_cString.
-
- * string.c (rb_str_new4): should copy class of original too.
-
-Mon Dec 25 00:04:54 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_thread_schedule): initial value of `max' changed to -1.
-
-Mon Dec 25 00:16:14 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_replace_m): copy-on-write replace.
-
- * parse.y (yylex): should handle => after identifier as well as ==
- and =~.
-
-Sat Dec 23 23:55:57 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_cstr2inum): Integer("") should not return 0.
-
-Sat Dec 23 11:55:57 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_and): Array#& should preserve original order.
-
-Sat Dec 23 03:44:16 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb: set @closed false in Socket#reopen.
-
- * lib/net/pop.rb: add POP3.foreach, delete_all.
-
- * lib/net/pop.rb: add POP3#delete_all.
-
- * lib/net/http.rb: add HTTP.version_1_1, version_1_2
-
- * lib/net/http.rb: refactoring.
-
-Fri Dec 22 23:11:12 2000 Ueno Katsuhiro <unnie@blue.sky.or.jp>
-
- * eval.c (rb_feature_p): ext might be null.
-
-Fri Dec 22 17:04:12 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * win32/win32.c (myselect): avoid busy loop by adjusting fd_count.
-
-Fri Dec 22 15:07:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_cstr2inum): prefix like '0x' had removed too much.
-
-Thu Dec 21 13:01:46 2000 Tanaka Akira <akr@m17n.org>
-
- * lib/net/ftp.rb (makeport): don't use TCPsocket.getaddress.
-
-Wed Dec 20 12:00:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_lshift): should cast up to BDIGIT_DBL.
-
- * parse.y (yylex): disallow trailing '_' for numeric literals.
-
- * bignum.c (rb_cstr2inum): allow `_' within converting string.
-
- * eval.c (specific_eval): should take no argument if block is
- supplied.
-
-Tue Dec 19 13:44:50 2000 K.Kosako <kosako@sofnec.co.jp>
-
- * io.c (rb_f_p): should flush rb_defout, not stdout.
-
-Tue Dec 19 00:57:10 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_minus): usec might overflow. (ruby-bugs-ja:PR#35)
-
- * eval.c (rb_obj_extend): Object#extend should take at least one
- argument.
-
- * parse.y (mrhs_basic): should check value_expr($3), not $1.
-
-Mon Dec 18 23:18:39 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * util.c (mblen, __crt0_glob_function): add for multibyte
- on DJGPP 2.03.
-
-Mon Dec 18 18:10:30 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_plus): usec might underflow (ruby-bugs-ja:#PR33).
-
-Mon Dec 18 08:11:20 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (rb_hash_set_default): should call rb_hash_modify().
-
-Sat Dec 16 02:58:26 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * eval.c (rb_eval): should clear ruby_errinfo on retry.
-
- * eval.c (rb_rescue2): ditto.
-
-Thu Dec 14 13:06:18 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * class.c (rb_include_module): prohibit frozen class/module.
-
- * eval.c (rb_frozen_class_p): make external.
-
- * intern.h (rb_frozen_class_p): prototyped.
-
- * intern.h (rb_undef): prototyped not but rb_undef_method()
- which is also in ruby.h.
-
-Thu Dec 14 09:20:26 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: support -T1 on ruby 1.6.2
-
- * lib/cgi.rb: $1 --> Regexp::last_match[1]
-
- * lib/net/telnet.rb: ditto.
-
-Wed Dec 13 23:27:06 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): handles case statement without expr, which
- looks for any TRUE (non nil, non false) when expression.
-
- * parse.y (primary): case expression should not be compstmt, but
- mere expr.
-
- * parse.y (primary): case without following expression is now
- separated rule.
-
-Wed Dec 13 12:41:27 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ruby.c (proc_options): accept "--^M" for DOS line endings.
-
-Tue Dec 12 15:45:42 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (newline_node): cancel newline unification.
-
-Mon Dec 11 23:01:57 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): supports cases `?' precedes EOF and newline.
-
-Mon Dec 11 12:11:25 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (call_end_proc): some frame members were left
- uninitialized.
-
-Mon Dec 11 01:14:58 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_fptr_finalize): do not fclose stdin, stdout and
- stderr at exit.
-
-Sat Dec 9 17:34:48 2000 Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
-
- * time.c (time_cmp): should check with kind_of?, not instance_of?
-
- * time.c (time_eql): ditto.
-
- * time.c (time_minus): ditto.
-
-Fri Dec 8 17:23:25 2000 Tachino Nobuhiro <tachino@open.nm.fujitsu.co.jp>
-
- * sprintf.c (rb_f_sprintf): proper string precision treat.
-
-Fri Dec 8 10:44:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_remove_cvar): Module#remove_class_variable
- added.
-
-Thu Dec 7 17:35:51 2000 Shugo Maeda <shugo@ruby-lang.org>
-
- * eval.c (stack_length): don't use __builtin_frame_address() on alpha.
-
-Wed Dec 6 18:07:13 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * djgpp/config.sed, win32/Makefile.sub: typo.
-
- * eval.c (rb_mod_define_method): avoid VC4.0 warnings.
-
-Wed Dec 6 13:38:08 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_and): tuning, make hash from shorter operand.
-
-Wed Dec 6 01:28:50 2000 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
- * gc.c (rb_gc): __builtin_frame_address() should not be used on
- MacOS X.
-
- * gc.c (Init_stack): ditto.
-
-Mon Dec 4 13:44:01 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * lib/jcode.rb: consider multibyte. not /n.
-
-Mon Dec 4 09:49:36 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_inspect): output whole string contents. no more `...'
-
- * string.c (rb_str_dump): should propagate taintness.
-
- * hash.c (env_inspect): hash like human readable output.
-
- * variable.c (rb_ivar_get): prohibiting instance variable access
- is too much restriction.
-
- * class.c (method_list): retrieving information should not be
- restricted where $SAFE=4.
-
- * class.c (rb_obj_singleton_methods): ditto.
-
- * eval.c (rb_thread_priority): ditto.
-
- * eval.c (rb_thread_local_aref): ditto.
-
- * variable.c (rb_obj_instance_variables): ditto.
-
- * variable.c (rb_mod_const_at): ditto.
-
- * variable.c (rb_mod_class_variables): ditto.
-
- * eval.c (rb_exec_end_proc): end_proc should be preserved.
-
-Sat Dec 2 22:32:43 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): || should accept exactly zero argument.
-
- * parse.y (stmt): multiple right hand side for single assignment
- (e.g. a = 1,2) is allowed.
-
-Wed Nov 29 07:55:29 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (w_long): dumping long should be smaller than 32bit max.
-
- * marshal.c (w_long): shorter long format for small integers(-123..122).
-
- * marshal.c (r_long): ditto.
-
-Tue Nov 28 18:10:51 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_mod_define_method): quick hack to implement
- on-the-fly method definition. experimental.
-
-Mon Nov 27 17:00:35 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should not redefine builtin classes/modules
- from within wrapped load.
-
-Mon Nov 27 08:57:33 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (call_end_proc): should be isolated from outer block.
-
-Mon Nov 27 00:10:08 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_ctl): call ioctl/fcntl for fptr->f2 too.
-
- * process.c (rb_f_fork): call rb_thread_atfork() after creating
- child process.
-
- * eval.c (rb_thread_atfork): kill all other threads immediately,
- then turn the current thread into the main thread.
-
-Sat Nov 25 23:12:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (ruby_run): move calling point of rb_trap_exit after
- cleaning up threads.
-
- * eval.c (ruby_finalize): new function to call EXIT trap, END
- procs and GC finalizers.
-
- * eval.c (rb_exec_end_proc): prevent recursion.
-
- * gc.c (rb_gc_call_finalizer_at_exit): ditto.
-
- * signal.c (rb_trap_exit): ditto. made static.
-
- * process.c (rb_f_fork): should swallow all exceptions from block
- execution.
-
- * process.c (fork_rescue): should call ruby_finalize().
-
- * parse.y (yycompile): rb_gc() removed. I don't remember why I put
- this here. test code?
-
-Fri Nov 24 22:03:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (EXCL): exclusive information is now stored in an
- instance variable. this enables proper marshal dump.
-
- * process.c (proc_waitpid): should clear rb_last_status ($?) if
- no pid was given by waitpid(2).
-
-Thu Nov 23 01:35:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * process.c (proc_waitpid2): returns nil if no pid found.
-
-Wed Nov 22 23:45:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * range.c (range_eq): new method. Compares start and end of range
- respectively.
-
-Wed Nov 22 11:01:32 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_class_variables): should honor singleton
- class variable rule defined yesterday.
-
-Tue Nov 21 23:24:14 2000 Mitsuteru S Nakao <nakao@kuicr.kyoto-u.ac.jp>
-
- * numeric.c (flodivmod): missing second operand (typo).
-
-Tue Nov 21 03:39:41 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (marshal_load): marshal format compatibility check
- revised. greater minor revision is UPWARD compatible;
- downward compatibility is not assured.
-
- * eval.c (is_defined): clarify class variable behavior for
- singleton classes. class variables within singleton class
- should be treated like within singleton method.
-
-Mon Nov 20 13:45:21 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): set ruby_sourceline before evaluating
- exceptions.
-
- * gc.c (gc_sweep): defer finalization in GC during compilation or
- interrupt prohibit section.
-
- * gc.c (gc_sweep): mark all nodes before sweeping if GC happened
- during compilation.
-
- * eval.c (rb_eval): should treat class variables specially in a
- method defined in the singleton class.
-
-Mon Nov 20 10:20:21 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dir.c, win32/win32.c, ruby.h: add rb_iglob().
-
-Mon Nov 20 00:18:16 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_subseq): should return nil for outbound start
- index.
-
- * marshal.c (marshal_load): show format versions explicitly when
- format version mismatch happens.
-
-Sun Nov 19 06:13:24 2000 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * marshal.c: use long for string/array length.
-
- * pack.c (swaps): use bit-or(|) instead of plus(+).
-
- * pack.c (swapl): ditto.
-
-Sat Nov 18 15:18:16 2000 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * array.c (rb_ary_replace): array size should be in long.
-
- * array.c (rb_ary_concat): ditto.
-
- * array.c (rb_ary_hash): ditto.
-
-Sat Nov 18 14:07:20 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: Socket#readline() reads until "\n", not "\r\n"
-
-Fri Nov 17 14:55:18 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * string.c (rb_str_succ): output should be NUL terminated.
-
-Fri Nov 17 02:54:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_close): need not to flush before closing.
-
- * eval.c (rb_thread_join): should preserve last thread status when
- THREAD_TO_KILL.
-
- * eval.c (rb_thread_stop): ditto.
-
- * io.c (io_fflush): wrap fflush by TRAP_BEG, TRAP_END.
-
- * eval.c (rb_eval): method defined within singleton class
- definition should behave like singleton method about class
- variables.
-
- * eval.c (is_defined): ditto.
-
-Thu Nov 16 23:06:07 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: can call {old,new}_implementation any times.
-
- * lib/net/http.rb: HTTP#connecting, receive ->
- common_oper, connecting.
-
- * lib/net/http.rb: output warning if u_header includes
- duplicated header.
-
- * lib/net/http.rb: not check Connection:/Proxy-Connection;
- always read until eof.
-
- * lib/net/protocol.rb: detects and catches "break" from block.
-
-Thu Nov 16 16:32:45 2000 Masahiro Tanaka <masa@stars.gsfc.nasa.gov>
-
- * bignum.c (bigdivrem): should have incremented ny first.
-
-Thu Nov 16 14:58:00 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/socket/socket.c (sock_new): duplicates file descriptor
- with myfddup() on mswin32/mingw32.
-
- * win32/win32.h: uses system original fdopen().
-
- * win32/win32.c (myfddup): newly added instead of myfdopen().
-
- * win32/win32.c (mybind, myconnect, mygetsockname, mygetsockopt,
- mylisten, mysetsockopt): now accept file descriptor only, not
- SOCKET.
-
- * win32/win32.c (myaccept, mysocket): return file descriptor,
- instead of SOCKET.
-
-Thu Nov 16 10:23:24 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (massign): too strict check for nameless rest argument.
-
- * eval.c (method_arity): mere * should return -1.
-
- * eval.c (intersect_fds): should check all FDs in the fd_set.
-
-Wed Nov 15 19:33:20 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_attr): should clear method cache before calling hook.
-
- * eval.c (rb_eval): ditto.
-
- * eval.c (rb_mod_modfunc): ditto.
-
-Mon Nov 13 22:44:52 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (rb_bug): print version to stderr.
-
-Mon Nov 13 19:02:08 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * win32/win32.c, io.c, process.c: the exit status of program must be
- multiplied 256 on mswin32 and msdosdjgpp(system(), ``).
-
-Sat Nov 11 22:57:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (arg): uniformed treatment of -a**b, where a is a
- number literal; hacky but behavior appears more consistent.
-
- * parse.y (newline_node): reduce newline node (one per line).
-
- * random.c (rb_f_srand): should be prohibited in safe level
- greater than 4.
-
-Sat Nov 11 22:37:36 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * rubysig.h: do not use rb_trap_immediate on win32.
-
- * rubysig.h: new macros, ATOMIC_TEST, ATOMIC_SET, ATOMIC_INC,
- ATOMIC_DEC, RUBY_CRITICAL and new definition of TRAP_BEG,
- TRAP_END.
-
- * gc.c (ruby_xmalloc): should wrap malloc() by RUBY_CRITICAL.
-
- * signal.c (sighandle): better win32 sig handling.
-
- * win32/win32.c (flock): better implementation.
-
- * win32/win32.c (myselect): ditto.
-
- * win32/win32.c (myaccept): ditto.
-
- * win32/win32.c (waitpid): ditto.
-
- * win32/win32.c (myrename): ditto.
-
- * win32/win32.c (wait_events): support function for win32 signal
- handling.
-
-Sat Nov 11 08:34:18 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.31.
-
- * lib/net/http.rb: initializes header in HTTP, not HTTPCommand.
-
- * lib/net/protocol.rb, http.rb: rewrites proxy code.
-
-Fri Nov 10 16:15:53 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (rb_num2long): use to_int, not to_i.
-
- * error.c: T_SYMBOL was misplaced by T_UNDEF.
-
- * parse.y (yylex): eval("^") caused infinite loop.
-
-Thu Nov 9 14:22:13 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (rb_io_taint_check): should check IO taintness; no
- operation for untainted IO should be allowed in the sandbox.
-
- * rubyio.h (GetOpenFile): check IO taintness inside using
- rb_io_taint_check().
-
-Wed Nov 8 03:08:53 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (io_fflush): ensure fflush(3) would not block by calling
- rb_thread_fd_writable().
-
-Tue Nov 7 20:29:56 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.30.
-
- * lib/net/protocol.rb, smtp.rb: Command#critical_ok -> error_ok
-
- * lib/net/http.rb: reads header when also "100 Continue".
-
-Tue Nov 7 04:32:19 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (bigdivrem): use bit shift to make y's MSB set.
-
-Mon Nov 6 1:22:49 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * error.c (warn_print): do not use err_append(), to ensure output
- to stderr.
-
- * error.c (rb_warn): use warn_print() instead of err_print().
-
- * error.c (rb_warning): ditto.
-
- * error.c (rb_bug): ditto.
-
- * eval.c (rb_load): re-raise exceptions during load.
-
- * time.c (make_time_t): remove useless adjust
-
-Thu Nov 2 18:01:16 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * random.c (rb_f_rand): half-baked float support fixed. This fix
- was originally proposed by K.Kosako <kosako@sofnec.co.jp>.
-
-Tue Oct 31 17:27:17 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c: change digit size to `long|int' if long long is
- available.
-
- * marshal.c (w_object): support `long|int' digits.
-
- * marshal.c (r_object): ditto.
-
-Sat Oct 28 23:54:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): allow =end at the end of file (without a
- newline at the end).
-
-Fri Oct 27 10:00:27 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_cstr2inum): should ignore trailing white spaces.
-
- * bignum.c (rb_str2inum): string may not have sentinel NUL.
-
-Fri Oct 27 02:37:22 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_cstr2inum): wrongly assigned base to c before
- badcheck check.
-
-Thu Oct 26 02:42:50 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb: Command#critical_ok
-
- * lib/net/smtp.rb: clear critical flag before go to SMTP
-
-Wed Oct 25 12:30:19 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_concat): replacing array might be the receiver
- itself. do not call rb_ary_push_m.
-
- * array.c (rb_ary_replace): replacing array might be the receiver
- itself. use memmove.
-
-Fri Oct 20 07:56:23 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): ARGSPUSH should not modify args array.
-
-Thu Oct 19 14:58:17 2000 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * pack.c (NUM2U32): should use NUM2ULONG().
-
-Tue Oct 17 17:30:34 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * eval.c (error_print): ruby_sourcefile may be NULL.
-
-Tue Oct 17 16:36:28 2000 Wes Nakamura <wknaka@pobox.com>
-
- * pack.c (NATINT_U32): wrong use of sizeof.
-
-Tue Oct 17 12:48:20 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * eval.c (rb_abort): nil check against ruby_errinfo.
-
- * eval.c (rb_thread_schedule): use FOREACH_THREAD_FROM instead of
- FOREACH_THREAD, since curr_thread may be removed from thread ring.
-
- * eval.c (THREAD_ALLOC): errinfo should be Qnil.
-
- * eval.c (rb_callcc): th->prev,th->next are now already
- initialized in THREAD_ALLOC.
-
-Mon Oct 16 15:37:33 2000 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
-
- * eval.c (rb_thread_inspect): tag size was shorter than required.
-
- * object.c (rb_obj_inspect): ditto.
-
-Mon Oct 16 14:25:18 2000 Shugo Maeda <shugo@ruby-lang.org>
-
- * object.c (sym_inspect): used `name' before initialization.
-
-Mon Oct 16 14:06:00 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * pack.c (pack_pack): use NATINT_U32 for 'l', 'L', and 'N'.
-
- * pack.c (I32,U32): 32 bit sized integer.
-
- * pack.c (OFF16,OFF32B): big endian offset for network byteorder.
-
-Mon Oct 16 06:39:32 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: hex-alpha is not [a-h] but [a-f].
-
-Mon Oct 16 01:02:02 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): should not abort on exception if
- $SAFE >= 4.
-
- * parse.y (sym): symbols for class variable names.
-
-Sun Oct 15 01:49:18 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_flock): should accept interrupt.
-
- * process.c (rb_waitpid): ditto.
-
- * process.c (rb_waitpid): ditto.
-
- * process.c (proc_wait): ditto.
-
- * process.c (proc_waitpid2): wrong recursion.
-
-Sat Oct 14 03:32:13 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_alloc): should not link a new thread in the
- live thread ring before initialization.
-
-Fri Oct 13 17:08:09 2000 Shugo Maeda <shugo@ruby-lang.org>
-
- * lib/net/imap.rb: new file.
-
-Thu Oct 12 18:56:28 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/pop.rb: POP3#reset
-
- * lib/net/http.rb: a code for "Switch Protocol" was wrongly 100.
-
-Thu Oct 12 01:23:38 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: bug fix: CGI::html(): PRETTY option didn't work.
-
-Thu Oct 12 00:03:02 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (sym_inspect): should adjust string length.
-
- * struct.c (rb_struct_to_s): ditto.
-
- * struct.c (rb_struct_inspect): ditto.
-
-Wed Oct 11 22:15:47 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * eval.c (rb_thread_inspect): should adjust string length.
-
- * object.c (rb_any_to_s): ditto.
-
- * object.c (rb_obj_inspect): ditto.
-
-Wed Oct 11 18:13:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_start_0): should check insecure exit.
-
-Wed Oct 11 14:29:51 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb: 2nd arg for ProtocolError#initialize is
- optional.
-
- * lib/net/http.rb: code refining.
-
-Wed Oct 11 11:13:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (primary): setter method (e.g. foo=) should always be
- public.
-
- * eval.c (rb_thread_raise): should not raise SecurityError if
- exception raised by the interpreter.
-
- * eval.c (rb_thread_cleanup): skip all THREAD_KILLED threads
- before FOREACH_THREAD.
-
-Tue Oct 10 16:11:54 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * dln.c (dln_load): remove unused code for Cygwin.
-
-Tue Oct 10 09:49:23 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (Init_File): FileTest.size should return 0 (not nil) for
- empty files.
-
-Sun Oct 8 13:20:26 2000 Guy Decoux <decoux@moulon.inra.fr>
-
- * eval.c (POP_SCOPE): not just set SCOPE_DONT_RECYCLE, but do
- scope_dup().
-
-Sat Oct 7 15:10:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_reverse_bang): unnecessary ALLOCA_N() was
- removed.
-
-Fri Oct 6 14:50:24 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * ext/extmk.rb.in, lib/mkmf.rb: remove "DESTDIR =".
-
- * Makefile.in, win32/Makefile.sub, ruby.1: renamed -X to -C.
-
-Fri Oct 6 12:50:52 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * array.c (rb_ary_plus): use to_ary(), not Check_Type().
-
- * array.c (rb_ary_concat): ditto.
-
- * gc.c (rb_gc): use __builtin_frame_address() for gcc.
-
- * eval.c (stack_length): ditto.
-
- * parse.y (assign_in_cond): stop warning till some better warning
- condition will be found.
-
-Thu Oct 5 18:02:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_obj_dup): should have propagated taint flag.
- (ruby-bugs:#PR64,65)
-
-Wed Oct 4 00:26:11 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (proc_arity): proc{|a|}'s arity should be -1.
-
-Mon Oct 2 05:28:58 2000 akira yamada <akira@ruby-lang.org>
-
- * string.c (trnext): minus at the end of pattern.
-
-Sun Oct 1 00:43:34 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * configure.in: exp-name was wrong on cygwin and mingw32.
-
-Thu Sep 28 14:57:09 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_compile_pattern): should try must_string calculation
- every time.
-
-Tue Sep 19 23:47:44 2000 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
- * configure.in, config.guess, config.sub: MacOS X support.
-
-Wed Sep 27 18:40:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * stable version 1.6.1 released.
-
-Wed Sep 27 16:13:05 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * mkconfig.rb: variables should be expanded only if /\$\{?\w+\}?/.
-
-Tue Sep 26 18:09:51 2000 WATANABE Hirofumi <eban@ruby-lang.org>
-
- * string.c: include <math.h>
-
-Tue Sep 26 15:59:50 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * object.c (rb_mod_dup): metaclasses of class/module should not be
- cleared by rb_obj_dup.
-
-Tue Sep 26 02:44:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (GC_MALLOC_LIMIT): size extended.
-
- * regex.c (DOUBLE_STACK): use machine's stack region for regex
- stack if its size is small enough.
-
-Mon Sep 25 18:13:07 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c: include <defines.h>.
-
- * eval.c (rb_add_method): cache mismatch by method
- definition. need to clear_cache_by_id every time.
-
-Mon Sep 25 13:31:45 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * win32/win32.c (NtCmdGlob): substitute '\\' with '/'.
-
-Mon Sep 25 00:35:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * defines.h: #undef HAVE_SETITIMER on cygwin.
-
-Sun Sep 24 03:01:53 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, http.rb: typo.
-
-Sat Sep 23 07:33:20 2000 Aleksi Niemela <aleksi.niemela@cinnober.com>
-
- * regex.c (re_compile_pattern): nicer regexp error messages for
- invalid patterns.
-
-Sat Sep 23 03:06:25 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_autoload_load): should not require already
- provided features.
-
-Fri Sep 22 15:46:21 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/http.rb: too early parameter expansion in string.
-
-Fri Sep 22 13:58:51 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/extmk.rb.in: don't use default $:
-
-Fri Sep 22 13:42:50 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * regex.c (PUSH_FAILURE_COUNT): avoid casting warning on alpha.
-
- * regex.c (PUSH_FAILURE_POINT): ditto.
-
-Fri Sep 22 10:16:21 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * win32/config.h.in: add HAVE_TELLDIR, HAVE_SEEKDIR
-
-Thu Sep 21 19:04:34 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/extmk.rb, lib/mkmf.rb (install_rb): check whether libdir is
- directory or not.
-
-Thu Sep 21 17:23:05 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * file.c (rb_file_s_symlink): use HAVE_SYMLINK.
-
- * file.c (rb_file_s_readlink): use HAVE_READLINK.
-
- * dir.c (dir_tell): use HAVE_TELLDIR.
-
- * dir.c (dir_seek): use HAVE_SEEKDIR.
-
- * configure.in (AC_CHECK_FUNCS): lstat, symlink, readlink,
- telldir, seekdir checks added.
-
- * file.c (lstat): should use stat(2) if lstat(2) is not
- available.
-
-Thu Sep 21 15:59:23 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.29.
-
- * lib/net/http.rb: HTTPReadAdapter -> HTTPResponseReceiver
-
- * lib/net/http.rb (connecting): response is got in receive()
-
-Thu Sep 21 15:49:07 2000 Wayne Scott <wscott@ichips.intel.com>
-
- * lib/find.rb (find): should not follow symbolic links;
- tuned performance too.
-
-Wed Sep 20 23:21:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.c (load_file): two Ctrl-D was required to stop ruby at the
- beginning of stdin script read.
-
-Wed Sep 20 14:01:45 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_provided): detect infinite load loop.
-
- * eval.c (rb_provided): too weak filename comparison.
-
- * eval.c (rb_thread_alloc): avoid recycling still referenced
- dvar structures.
-
- * eval.c (rb_callcc): ditto.
-
- * eval.c (THREAD_ALLOC): fill dyna_vars field by ruby_dyna_vars.
-
-Tue Sep 19 17:47:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * stable version 1.6.0 released.
-
-Tue Sep 19 16:24:52 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * marshal.c (Init_marshal): provide marshal.so no more.
-
-Tue Sep 19 14:01:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in, win32/setup.mak: include version number
- in RUBY_SO_NAME.
-
-Tue Sep 19 13:07:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): was confusing $~ and $_.
-
-Tue Sep 19 13:06:53 2000 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * signal.c (rb_f_kill): signum may be a negative number, should be
- treated by signed number.
-
-Tue Sep 19 01:14:56 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_provide): better feature handling.
-
- * eval.c (rb_f_require): loading ruby library may be partial
- state. checks in rb_thread_loading is integrated.
-
- * eval.c (rb_provided): better thread awareness.
-
- * lib/irb/frame.rb: 6 (not 5) parameters for trace_func proc.
-
- * eval.c (error_print): should print error position even if
- get_backtrace() failed.
-
-Sat Sep 16 03:29:59 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_f_require): rb_provided() was called too early; does
- not work well with threads.
-
- * parse.y (ensure): should distinguish empty ensure and non
- existing ensure.
-
- * file.c (Init_File): extending File by class of FileTest was
- serious mistake.
-
-Thu Sep 14 02:46:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_yield): array strip should be done in this
- function.
-
-Wed Sep 13 17:01:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * bignum.c (rb_big_eq): incomplete value comparison of bignums.
-
-Wed Sep 13 06:39:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_mod_class_variables): Module#class_variables added.
-
-Wed Sep 13 06:09:26 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: bug fix: CGI::header(): output status header.
-
-Wed Sep 13 01:09:12 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (yylex): allow global variables like '$__a'.
-
-Tue Sep 12 22:28:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/socket/extconf.rb: avoid using terrible <netinet/tcp.h>
- on cygwin 1.1.5.
-
-Tue Sep 12 16:01:58 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * array.c (rb_ary_unshift_m): typo.
-
-Tue Sep 12 15:37:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): stripped array too much, should remove just
- for proc_call().
-
-Tue Sep 12 07:05:24 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: version 2.0.0: require ruby1.5.4 or later.
-
- * lib/net/telnet.rb: version 1.6.0
-
-Tue Sep 12 03:26:07 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (massign): use to_ary to get an array if available.
-
- * object.c (rb_Array): ditto.
-
-Mon Sep 11 14:24:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * hash.c (ruby_setenv): should not free the element of
- origenvironment.
-
- * parse.y (command_call): kYIELD moved to this rule to allow
- 'a = yield b'. (ruby-bugs-ja:#PR15)
-
-Mon Sep 11 01:27:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_yield_0): proc#call([]) should pass single value to
- the block.
-
- * eval.c (callargs): reduce array allocation.
-
- * eval.c (massign): precise check for argument number.
-
-Fri Sep 8 10:05:17 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (STR_NO_ORIG): should be FL_USER2.
-
-Thu Sep 7 14:17:51 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * string.c (rb_str_cat): should work even for concatenating same
- string.
-
-Wed Sep 6 17:06:38 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_cvar_declare): should check superclass's class
- variable first.
-
-Wed Sep 6 10:42:02 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * misc/ruby-mode.el (ruby-calculate-indent): shift continuing line
- if previous line ends with modifier keyword.
-
- * misc/ruby-mode.el (ruby-parse-region): should not give up if
- modifiers are at the end of line.
-
- * misc/ruby-mode.el (ruby-expr-beg): indented wrongly if modified
- statement was size 1.
-
-Wed Sep 6 10:41:19 2000 Kenichi Komiya <kom@mail1.accsnet.ne.jp>
-
- * misc/ruby-mode.el (ruby-parse-region): modifier was not handled
- well on emacs19.
-
-Tue Sep 5 17:10:12 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_to_s): fixed zone string UTC for utc time object.
-
-Tue Sep 5 00:26:06 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * regex.c (re_search): range worked wrongly on bm_search().
-
-Mon Sep 4 13:40:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: renamed libruby.a to libruby.{cygwin,mingw32}.a
- on cygwin and mingw32.
-
-Sun Sep 3 23:44:04 2000 Noriaki Harada <tenmei@maoh.office.ne.jp>
-
- * io.c (NO_SAFE_RENAME): for BeOS too.
-
-Sun Sep 3 11:31:53 2000 Takaaki Tateishi <ttate@jaist.ac.jp>
-
- * parse.y (rescue): no assignment was done if rescue body was
- empty.
-
-Sat Sep 2 10:52:21 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (call_args,aref_args): block_call can be the last
- argument.
-
- * parse.y (COND_PUSH,COND_POP): maintain condition stack to allow
- kDO2 in parentheses in while/until/for conditions.
-
- * parse.y (yylex): generate kDO2 for EXPR_ARG outside of
- while/until/for condition.
-
-Fri Sep 1 10:36:29 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (aref_args,opt_call_args): add block_call to allow a
- method without parentheses and with block as a last argument.
-
- * hash.c (rb_hash_sort): should not return nil.
-
- * re.c (match_aref): should use rb_reg_nth_match().
-
- * eval.c (POP_SCOPE): recycled scopes too much
-
- * eval.c (Init_eval): extend room for stack allowance.
-
- * eval.c (POP_SCOPE): frees scope too much.
-
-Thu Aug 31 14:28:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * gc.c (rb_gc_mark): T_SCOPE condition must be more precise.
-
- * eval.c (scope_dup): should not make all duped scope orphan.
-
-Thu Aug 31 10:11:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (stmt): allow stmt_rhs to be right hand side of multiple
- assignment.
-
- * time.c (rb_time_timeval): type error should not mention the word
- 'interval'.
-
-Wed Aug 30 23:21:20 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * numeric.c (rb_num2long): use rb_Integer() instead of independent
- convert routine.
-
- * eval.c (rb_rescue2): now takes arbitrary number of exception types.
-
- * object.c (rb_convert_type): use rb_rescue2 now to handle NameError.
-
- * object.c (rb_convert_type): better error message.
-
-Wed Aug 30 17:09:14 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/Win32API/Win32API.c (Win32API_initialize): AlphaNT support.
-
-Wed Aug 30 14:19:07 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (node_assign): should support NODE_CVASGN2 too.
-
-Wed Aug 30 11:31:47 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ext/Win32API/Win32API.c (Win32API_initialize): add the
- arguments checking.
-
- * ext/Win32API/Win32API.c (Win32API_initialize): add taint
- checking. allow String object in the third argument.
-
-Wed Aug 30 10:29:40 2000 Masahiro Tomita <tommy@tmtm.org>
-
- * io.c (rb_f_p): flush output buffer.
-
-Tue Aug 29 16:29:15 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * parse.y (assignable): remove NODE_CVASGN3.
-
- * parse.y (gettable): remove NODE_CVAR3.
-
-Tue Aug 29 02:02:14 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * lib/mkmf.rb (create_makefile): handles create_makefile("a/b").
-
- * ext/extmk.rb.in (create_makefile): ditto
-
-Mon Aug 28 18:43:54 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): now handles class variables.
-
- * eval.c (rb_eval): class variable behavior revisited.
-
- * parse.y (assignable): ditto.
-
- * parse.y (gettable): ditto.
-
- * regex.c (PUSH_FAILURE_COUNT): push/pop interval count on failure
- stack. this fix is inspired by the Emacs21 patch from Stefan
- Monnier <monnier@cs.yale.edu>.
-
-Fri Aug 25 15:24:39 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * variable.c (rb_cvar_get): should not follow __attached__.
-
- * variable.c (rb_cvar_set): ditto.
-
- * variable.c (rb_cvar_declare): ditto.
-
- * variable.c (mod_av_set): second class variable assignment at the
- toplevel should not give warning.
-
-Fri Aug 25 01:18:36 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (next_argv): prepare path for open file.
-
- * string.c (rb_str_setter): moved from io.c.
-
- * io.c (next_argv): filename should be "-" for refreshed ARGF.
-
-Thu Aug 24 15:27:39 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/socket/socketport.h: use `extern int h_errno' if needed.
-
-Sat Aug 19 01:34:02 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/sdbm/_sdbm.c (sdbm_prep): flags should be or-ed by O_BINARY on
- Win32 too.
-
- * ext/sdbm/_sdbm.c (makroom): fill hole with 0 on Win32 too.
-
-Fri Aug 18 13:23:59 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_eval): should preserve and clear $! value before
- compilation.
-
- * eval.c (eval): ditto.
-
-Fri Aug 18 11:06:19 2000 Shugo Maeda <shugo@ruby-lang.org>
-
- * ext/socket/socket.c (s_accept): start GC on EMFILE/ENFILE.
-
-Thu Aug 17 16:04:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (is_defined): should clear ruby_errinfo.
-
-Thu Aug 17 04:26:31 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.27.
-
- * lib/net/protocol.rb: writing methods returns written byte size.
-
- * lib/net/smtp.rb: send_mail accepts many destinations.
-
-Wed Aug 16 00:43:47 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * time.c (time_s_times): use CLK_TCK for HZ if it's defined.
-
-Tue Aug 15 17:30:59 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (frame_dup): should set flag FRAME_MALLOC after
- argv allocation.
-
- * eval.c (blk_free): should not free argv if GC was called before
- frame_dup.
-
-Tue Aug 15 16:08:40 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: add ac_cv_func_times=yes for mingw32.
-
- * win32/win32.c (mytimes): typo.
-
-Tue Aug 15 01:45:28 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * io.c (argf_eof): should return true at the end of ARGF without
- checking stdout if arguments are given.
-
-Mon Aug 14 10:34:32 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_thread_status): status should return false for normal
- termination, nil for termination by exception.
-
-Fri Aug 11 15:43:46 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_undef): give warning for undefining __id__, __send__.
-
-Thu Aug 10 08:05:03 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_callcc): returned current thread instead of
- continuation wrongly.
-
-Thu Aug 10 05:40:28 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/extmk.rb.in: $CPPFLAGS should be initialized.
-
- * ext/tcltklib/depend: add stubs.o.
-
- * ext/tcltklib/extconf.rb: use $CPPFLAGS instead of $CFLAGS.
-
-Wed Aug 9 16:31:48 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * eval.c (rb_callcc): thread status for continuations must be
- THREAD_KILLED, otherwise thread_free() breaks other threads.
-
-Wed Aug 9 13:24:25 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * win32/win32.[ch]: emulate rename(2).
-
-Tue Aug 8 14:01:46 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/tcltklib/tcltklib.c: support --enable-tcltk_stubs
-
- * ext/tcltklib/extconf.rb: ditto.
-
- * ext/tcltklib/stubs.c: created. examine candidate shared libraries.
-
-Mon Aug 7 13:59:12 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
-
- * ruby.h (CLONESETUP): should copy flags before any potential
- object allocation.
-
- * regex.c (re_match): check for stack depth was needed.
-
-Sat Aug 5 16:43:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * djgpp/*: convert DOS line endings to UNIX style.
-
- * djgpp/config.status: rename to config.sed for SFN.
-
- * lib/ftools.rb (compare, safe_unlink, chmod): avoid warnings.
-
- * lib/ftools.rb (move): typo. not `tpath', but `to'.
-
-Fri Aug 4 23:26:48 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (proc_call): gives warning if a block is supplied.
-
- * eval.c (rb_eval): no warning for discarding if an alias for the
- method is already made.
-
-Fri Aug 4 16:32:29 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_reject_bang): returns nil if no element removed.
-
- * hash.c (rb_hash_reject_bang): returns nil if no element removed.
-
-Thu Aug 3 19:44:26 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_fd_writable): should return integer value.
-
- * array.c (rb_ary_assoc): search array element whose length is
- longer than 0 (not 1).
-
-Wed Aug 2 18:27:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_wait_fd): prohibit thread context switch
- during compilation.
-
- * eval.c (rb_cont_call): prohibit Continuation#call across threads.
-
-Wed Aug 2 08:22:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (rb_gc): clear malloc_memories to zero, to avoid potential
- super frequent GC invocation. (ruby-bugs:#PR48)
-
- * gc.c (rb_gc): only add_heap() if GC trigger condition is
- satisfied.
-
-Tue Aug 1 16:41:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (proc_options): global load path setting moved from
- ruby_prog_init().
-
- * ruby.c (incpush): renamed. push path entry at the END of the
- load path array. This makes -I directories sorted in order in
- the arguments.
-
-Sat Jul 29 23:42:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dir.c (dir_each): should check whether dir is closed during the
- block execution. (ruby-bugs:#PR47)
-
-Sat Jul 29 21:57:30 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ruby.c (rubylib_mangle): provide another buffer for the result.
-
-Wed Jul 26 10:09:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: set SOLIBS to LIBS on Cygwin.
-
- * configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'.$target_os.dll
- on cygwin and mingw32. ruby-cygwin.dll is bad. why?
-
-Wed Jul 26 10:04:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (gc_sweep): avoid full scan during compilation.
-
- * gc.c (rb_gc): add heap during no gc period (including
- compilation).
-
-Tue Jul 25 19:03:04 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * cygwin/GNUmakefile: use puts instead of print, because
- Cygwin DLL's behavior is changed(or bug?).
-
- * configure.in: LIBRUBY_SO='$(RUBY_INSTALL_NAME)'-$target_os.dll
- on cygwin and mingw32.
-
- * cygwin/GNUmakefile: ditto.
-
- * Makefile.in: $(SOLIBS) should be put after dmyext.@OBJEXT@.
-
- * instruby.rb: install $(LIBRUBY) to libdir
- if $(LIBRUBY) != $(LIBRUBY_A_).
-
-Tue Jul 25 15:16:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_p): redirect to $defout.
-
-Mon Jul 24 18:52:55 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * win32/win32.c (win32_getenv): should remove `static'.
-
- * ruby.c (rubylib_mangle): support "/hoge;/foo"
-
-Mon Jul 24 10:28:55 2000 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
-
- * string.c (rb_str_count): raise exception if no argument is
- given.
-
-Sun Jul 23 12:55:04 2000 Dave Thomas <Dave@Thomases.com>
-
- * string.c (rb_str_rindex): Support negative end position.
-
-Fri Jul 21 17:35:01 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (aref_args): command_call now be permitted as
- aref_args.
-
- * process.c (proc_getpriority): getpriority(2) may return valid
- negative number. use errno to detect error.
-
- * marshal.c (dump_ensure): dumped string should be tainted if
- any among target objects is tainted.
-
- * marshal.c (r_regist): restored object should be tainted if and
- only if the source is a file or a tainted string.
-
-Wed Jul 19 15:14:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (bigdivrem): should use rb_int2big(), not rb_uint2big().
-
-Tue Jul 18 14:58:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (ruby_options): should treat SystemExit etc. properly.
-
- * parse.y (yycompile): should check compile_for_eval, not
- ruby_in_eval.
-
-Mon Jul 17 04:29:50 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/mkmf.rb: converts extension of $objs into $OBJEXT.
-
-Sun Jul 16 03:02:34 2000 Dave Thomas <dave@thomases.com>
-
- * lib/weakref.rb: Change to use new ObjectSpace calls.
-
-Sat Jul 15 21:59:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): should not redefine __id__ nor __send__.
-
- * gc.c (define_final): integrate final.rb features into the
- interpreter. define_finalizer and undefine_finalizer was
- added to ObjectSpace. plus, add_finalizer, remove_finalizer,
- and call_finalizer are deprecated now.
-
-Sat Jul 15 01:32:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_mod_method): implements unbound method.
-
- * eval.c (Init_eval): should prohibit `module_function' for class
- Class.
-
-Fri Jul 14 17:19:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * cygwin/GNUmakefile.in: use miniruby instead of sed.
-
-Fri Jul 14 12:49:50 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (argf_eof): need to check stdin, when next_p == -1.
-
- * io.c (read_all): use io_fread() instead of fread(3).
-
- * io.c (io_reopen): should clearerr FILE if fd < 3.
-
- * re.c (rb_reg_match_m): the result is exported, so it should be
- declared as busy.
-
- * eval.c (rb_eval): should preserve errinfo even if return, break,
- etc. is called in rescue clause.
-
- * instruby.rb: install irb too.
-
-Wed Jul 12 15:32:57 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_const_get): constants for builtin classes must
- have higher priority than constants from included modules at
- Object class.
-
- * bignum.c (bigdivrem): small embarrassing typo.
-
-Wed Jul 12 15:06:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): use rb_const_get_at().
-
- * variable.c (top_const_get): retrieve toplevel constants only,
- not ones of Object (and its included modules) in general.
-
-Wed Jul 12 15:04:11 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb:
- add module Net::NetPrivate and its inner classes
- {Read,Write}Adapter, Command, Socket,
- SMTPCommand, POP3Command, APOPCommand, HTTPCommand
-
-Wed Jul 12 13:10:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (bigdivrem): defer bignorm().
-
- * bignum.c (bignorm): accepts accidental fixnums.
-
-Tue Jul 11 16:54:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): `@<digit>' is no longer a valid instance
- variable name.
-
-Tue Jul 11 01:51:50 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (rb_big_divmod): should not use Integer(float) for
- the right operand.
-
- * bignum.c (rb_big_remainder): ditto.
-
- * bignum.c (rb_big_modulo): ditto.
-
-Mon Jul 10 15:27:16 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * io.c (pipe_finalize): should set rb_last_status when pclose().
-
-Mon Jul 10 09:07:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * error.c (rb_bug): print version number and such too.
-
-Sat Jul 8 23:08:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_start_0): should copy previous scopes to
- prevent rb_gc_force_recycle().
-
-Fri Jul 7 23:36:36 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/addrinfo.h: move IN_EXPERIMENTAL and IN_LOOPBACKNET
- definitions to ext/socket/sockport.h.
-
- * ext/socket/extconf.rb: add getservbyport() and arpa/inet.h check.
-
- * ext/socket/getaddrinfo.c (getaddrinfo): SOCK_RAW may not be
- defined (ex. BeOS, Palm OS 2.x or before).
-
- * ext/socket/getnameinfo.c (getnameinfo): getservbyport() may not
- exist (ex. BeOS, Palm OS).
-
- * ext/socket/sockport.h: add IN_EXPERIMENTAL, IN_CLASSA_NSHIFT,
- IN_LOOPBACKNET, AF_UNSPEC, PF_UNSPEC and PF_INET.
-
-Fri Jul 7 03:30:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (aref_args): should allow Hash[:a=>2] etc.
-
- * numeric.c (fix_aref): convert index by NUM2INT, not FIX2INT.
- (ruby-bugs:#PR37)
-
- * time.c (time_localtime): should prohibit for frozen time.
-
- * time.c (time_gmtime): ditto.
-
-Thu Jul 6 19:12:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_file_s_open): should not terminate fptr; just clear it.
-
- * ruby.c (proc_options): should not call require_libraries()
- twice.
-
- * ruby.c (require_libraries): clear req_list_head.next after
- execution.
-
-Thu Jul 6 13:51:57 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * object.c (rb_to_id): name may not be symbol nor fixnum.
-
- * struct.c (rb_struct_s_def): name may be nil.
-
-Thu Jul 6 02:09:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (bigdivrem): new function to return remainder.
-
- * numeric.c (fixdivmod): now returns modulo, not remainder.
-
- * numeric.c (flodivmod): ditto.
-
- * bignum.c (bigdivmod): ditto.
-
- * numeric.c (num_modulo): new method; alias to '%'.
-
-Thu Jul 6 00:51:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * win32/win32.c (NtCmdGlob): patterns should be separated and
- NUL terminated.
-
-Wed Jul 5 22:27:56 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * cygwin/GNUmakefile: use ruby.def to make rubycw.dll.
-
- * ext/extmk.rb.in: create target.def.
-
- * lib/mkmf.rb: ditto.
-
-Wed Jul 5 09:47:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_arg): Time::local, Time::gm now take 7th optional
- argument for usec.
-
- * numeric.c (num_ceil, etc): default ceil, floor, round, truncate
- implementation for Numeric, using `to_f'.
-
- * io.c (rb_io_reopen): clear fptr->path after free() to prevent
- potential GC crash.
-
- * io.c (rb_file_s_open): terminate fptr unless null.
-
- * io.c (rb_file_initialize): ditto.
-
- * lib/tempfile.rb: specify FILE::CREAT|File::EXCL to open for
- better security.
-
- * numeric.c (flo_truncate): new method.
-
-Wed Jul 5 01:02:53 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/extmk.rb.in: join ' ' -> join(' ').
-
- * lib/mkmf.rb: ditto.
-
-Tue Jul 4 13:51:29 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/dbm/dbm.c: add methods added to Hash in 1.5.x.
-
- * ext/gdbm/gdbm.c: ditto.
-
- * ext/sdbm/init.c: ditto.
-
- * eval.c (proc_call): args may be Qundef (means no argument), do
- not call TYPE() for args.
-
-Tue Jul 4 13:20:56 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/extmk.rb.in: make command line must be single-quoted.
- $(RUBY_INSTALL_NAME) is command substitution in the POSIX sh.
-
-Tue Jul 4 13:16:02 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * util.c (rb_type): should add T_UNDEF.
-
-Tue Jul 4 09:30:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (here_document): supports EOF right after terminator.
-
- * random.c (rb_f_rand): argument is now optional (rand(max=0)).
-
-Tue Jul 4 01:50:49 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * win32/ruby.def: remove ruby_mktemp.
-
-Tue Jul 4 01:27:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_rescue2): new function to rescue arbitrary exception.
-
- * numeric.c (do_coerce): should catch NameError explicitly.
-
-Tue Jul 4 00:15:23 2000 Dave Thomas <Dave@thomases.com>
-
- * numeric.c (Init_Numeric): forgot to register Numeric#remainder.
-
-Mon Jul 3 23:46:56 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/win32.c (myselect, myaccept): disable interrupt while
- executing accept() or select() to avoid Ctrl-C causes
- "unknown software exception (0xc0000029)".
-
-Mon Jul 3 18:35:41 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * lib/mkmf.rb: use null device if it exists for cross-compiling.
-
-Mon Jul 3 18:19:51 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
-
- * lib/net/protocol.rb (finish): do nothing unless active.
-
- * lib/net/http.rb: HTTP#{get,post}2 again (for new impl).
-
-Mon Jul 3 16:47:22 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * cygwin/GNUmakefile: librubys.a -> lib$(RUBY_INSTALL_NAME)s.a
-
- * configure.in: use AC_CANONICAL_{HOST,TARGET,BUILD}.
-
-Mon Jul 3 13:15:02 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (fix_divmod): x * d + m = y where d, m = x.divmod(y).
-
- * bignum.c (rb_big_divmod): ditto.
-
- * numeric.c (fixdivmod): does not depend C's undefined %
- behavior. adopt to fmod(3m) behavior.
-
- * numeric.c (flo_mod): modulo now reserves fmod(3m) behavior.
-
- * numeric.c (num_remainder): 'deprecated' warning.
-
-Mon Jul 3 10:27:28 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: use AC_CANONICAL_SYSTEM.
-
-Sun Jul 2 21:17:37 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: support without --enable-shared for cygwin/mingw32.
-
- * cygwin/GNUmakefile: ditto.
-
- * ext/extmk.rb.in: use null device if it exists for cross-compiling.
-
- * lib/mkmf.rb: ditto.
-
- * util.c (ruby_mktemp): remove unused ruby_mktemp().
-
-Sun Jul 2 14:18:04 2000 Koji Arai <JCA02266@nifty.ne.jp>
-
- * eval.c (TMP_PROTECT_END): tmp__protect_tmp may be NULL.
-
-Sun Jul 2 03:37:50 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.25.
-
- * lib/net/protocol.rb (each_crlf_line): beg = 0 is needed in adding{}
-
- * lib/net/smtp.rb: allow String for to_addr of SMTP#sendmail
-
-Sat Jul 1 15:22:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (fix_rshift): should handle shift value more than
- sizeof(long).
-
-Sat Jul 1 15:22:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): the value from RTEST() is not valid Ruby
- object. result should be either true or false.
-
-Sat Jul 1 09:30:06 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * re.c (rb_reg_initialize): was freeing invalid pointer.
-
-Sat Jul 1 03:25:56 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (call_args): command_call can be the last argument of
- call_args. It had to be the only argument.
-
- * re.c (rb_reg_s_quote): should not dump core even for unsane mbc
- string.
-
-Fri Jun 30 01:36:20 2000 Aleksi Niemela <aleksi.niemela@cinnober.com>
-
- * parse.y (f_norm_arg): better, nicer error message.
-
-Thu Jun 29 07:45:33 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (udp_send): destination may be packed
- struct sockaddr.
-
- * object.c (rb_Integer): Integer(nil) should be invalid, on the
- other hand, nil.to_i is OK.
-
-Wed Jun 28 17:26:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (ip_recvfrom): udp_recvfrom and tcp_recvfrom
- is merged and moved to IPSocket#recvfrom.
-
- * ext/socket/socket.c (sock_s_getaddrinfo): family can be a
- strings such as "AF_INET" etc.
-
- * ruby.c (require_libraries): . and RUBYLIB added to $load_path
- just before -r procedure.
-
- * ruby.c (proc_options): -e, - did not exec -r.
-
-Wed Jun 28 14:52:28 2000 Koga Youichirou <y-koga@mms.mt.nec.co.jp>
-
- * config.sub: NetBSD/hpcmips support.
-
-Wed Jun 28 10:11:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c: gc trigger threshold changed; GC_NEWOBJ_LIMIT removed,
- FREE_MIN is increased to 4096.
-
-Tue Jun 27 22:39:28 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.24.
-
- * lib/net/protocol.rb: modified each_crlf_line again.
-
- * lib/net/protocol.rb: do_write_beg,do_write_end -> writing{}
- do_write_do -> do_write
-
- * lib/net/http.rb: can make proxy connection by passing
- addresses to HTTP.new, start.
-
- * lib/net/http.rb: HTTP.new_implementation, old_implementation:
- can use 1.2 implementation of head, get, post, put.
- (see document)
-
-Tue Jun 27 12:05:10 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32.c (myfdclr): new function.
-
- * win32.h: add FD_CLR.
-
-Mon Jun 26 23:41:41 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ruby.h: add cast for ANSI style.
-
- * gc.c (rb_data_object_alloc): use RUBY_DATA_FUNC.
-
-Mon Jun 26 22:20:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/win32.c (is_socket, extract_file_fd): New function.
-
- * win32/win32.c (myfdopen): use is_socket().
-
- * win32/win32.c (myselect): return non socket files immediately
- if file and socket handles are mixed.
-
-Mon Jun 26 16:21:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_schedule): wait_for cleared too early.
-
-Mon Jun 26 09:15:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c: remove obsolete 'F', 'D' specifiers.
-
-Sun Jun 25 00:55:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/socket.c (sock_s_getnameinfo): `res' would not
- be assigned if TYPE(sa) == T_STRING.
-
-Sat Jun 24 14:36:29 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * config*.dj, configure.bat, top.sed: move to djgpp/.
-
-Sat Jun 24 02:34:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (load_file): call require_libraries() here to let
- debug.rb work properly.
-
-Fri Jun 23 22:34:51 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * bignum.c (rb_big_lshift): reorder xds assignment to avoid
- reusing `x' as `len' by VC++ 6.0 SP3 compiler with -Ox switch.
-
-Fri Jun 23 01:11:27 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_substr): should return empty string (""),
- if beg == str.size and len == zero, mostly for convenience and
- backward compatibility.
-
- * parse.y (new_super): should tweak block_pass node for super too.
-
- * string.c (rb_str_split_m): last split element should not be nil,
- but "" when limit is specified.
-
-Thu Jun 22 17:27:46 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_substr): str[n,m] now returns nil when n equals
- to str.size.
-
-Thu Jun 22 13:49:02 2000 Uechi Yasumasa <uechi@ryucom.ne.jp>
-
- * lib/net/ftp.rb: support resuming.
-
-Thu Jun 22 13:37:19 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * eval.c (rb_thread_sleep_forever): merge pause() macro.
-
-Wed Jun 21 08:49:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): should not raise exception just by defining
- singleton class.
-
-Wed Jun 21 01:18:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.h: two macros RUBY_DATA_FUNC and RUBY_METHOD_FUNC are added
- to make writing C++ extensions easier.
-
- * array.c (rb_ary_dup): internal classes should not be shared by dup.
-
- * hash.c (rb_hash_dup): ditto.
-
- * object.c (rb_obj_dup): ditto.
-
- * string.c (rb_str_dup): ditto.
-
- * error.c (Init_Exception): renamed NotImplementError to
- NotImplementedError.
-
-Tue Jun 20 16:22:38 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (make_time_t): bug in DST boundary.
-
-Tue Jun 20 10:54:19 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: add eval sitedir.
-
-Tue Jun 20 06:14:43 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: change: version syntax. old: x.yz, now: x.y.z
-
- * lib/net/telnet.rb: ditto.
-
-Tue Jun 20 00:37:45 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_kcode_m): Regexp#kcode returns nil for code unfixed
- regexp object.
-
- * bignum.c (bigdivmod): bignum zero check was wrong.
-
-Mon Jun 19 10:48:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_cvar_set): forgot to add security check for class
- variable assignment.
-
-Sun Jun 18 22:49:13 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: single quoted sitedir.
-
- * mkconfig.rb: add DESTDIR for cross-compiling.
-
- * lib/mkmf.rb: add DESTDIR.
-
- * ruby.c (load_file): force binmode if fname includes ".exe"
- on DOSISH.
-
-Sat Jun 17 23:22:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c (rb_f_sprintf): should ignore negative precision given
- by <%.*>.
-
- * sprintf.c (rb_f_sprintf): should allow zero precision.
-
-Sat Jun 17 03:13:29 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_localtime): avoid unnecessary call of localtime.
-
- * time.c (time_gmtime): avoid unnecessary call of gmtime.
-
- * process.c (proc_wait2): new method.
-
- * process.c (proc_waitpid): second argument made optional.
-
- * process.c (proc_waitpid2): new method.
-
-Sat Jun 17 00:05:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_clone): should initialize member fields.
-
-Fri Jun 16 22:49:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_rewind): set lineno to zero.
-
-Fri Jun 16 22:47:47 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.23.
-
- * lib/net/protocol.rb: too many CRLF in last line.
-
-Fri Jun 16 21:23:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: add pause(2) checking.
-
- * eval.c: define pause() if missing.
-
-Fri Jun 16 18:41:58 2000 Koji Arai <JCA02266@nifty.ne.jp>
-
- * process.c (proc_setsid): BSD-style setpgrp() don't return
- process group ID, but 0 or -1.
-
-Fri Jun 16 16:23:35 2000 Koji Arai <JCA02266@nifty.ne.jp>
-
- * file.c (rb_stat_inspect): gives detailed information;
- compatibility with ruby-1.4.x.
-
-Fri Jun 16 05:18:45 2000 Yasuhiro Fukuma <yasuf@bsdclub.org>
-
- * configure.in: FreeBSD: do not link dummy libxpg4 which was
- merged into libc.
-
-Fri Jun 16 03:17:36 2000 Satoshi Nojo <nojo@t-samukawa.or.jp>
-
- * ext/dbm/dbm.c (fdbm_length): use GetDBM. empty?, [] too.
-
- * ext/gdbm/gdbm.c (fgdbm_length): ditto.
-
- * ext/sdbm/init.c (fsdbm_length): ditto.
-
-Fri Jun 16 01:57:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_sleep_forever): pause(2) instead of sleep(3).
-
-Thu Jun 15 10:46:36 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_sub_bang): should propagate taintness from
- replacement string.
-
-Wed Jun 14 17:01:41 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * rubytest.rb: add CONFIG['EXEEXT'] to the executable file name.
-
-Wed Jun 14 14:50:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_f_sub): assign to $_ only if modification happens.
-
- * string.c (rb_f_gsub): ditto.
-
- * string.c (rb_f_chop): ditto.
-
- * string.c (rb_f_chomp): ditto.
-
- * io.c (io_reopen): preserve file position by ftell/fseek, if io
- is a seekable.
-
- * eval.c (method_arity): wrong arity number for the methods with
- optional arguments.
-
- * time.c (make_time_t): opposite timezone shift (should be negative).
-
-Wed Jun 14 14:07:38 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * io.c: typo(ig/if).
-
- * re.c: typo(re/reg). add rb_reg_check().
-
- * time.c: remove unneeded declare(daylight, timezone).
-
- * configure.in: add include <time.h> when daylight checking.
-
-Wed Jun 14 11:36:52 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * marshal.c (r_object): modified for symbols.
-
- * marshal.c (w_object): ditto.
-
-Wed Jun 14 10:04:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_memcmp): should compare according to ruby_ignorecase.
-
- * string.c (rb_str_cmp): use rb_memcmp.
-
- * string.c (rb_str_index): ditto.
-
- * string.c (rb_str_rindex): ditto.
-
- * string.c (rb_str_each_line): ditto.
-
-Wed Jun 14 04:58:53 2000 Dave Thomas <dave@thomases.com>
-
- * io.c (rb_io_set_lineno): should have returned VALUE, not
- integer.
-
-Wed Jun 14 09:29:42 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_dup): dup should always propagate taintness.
-
-Wed Jun 14 00:50:14 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: read_multipart(): if no content body then raise EOFError.
-
-Tue Jun 13 11:46:17 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * process.c (proc_setsid): try implement it using setpgrp() and
- ioctl(fd, TIOCNOTTY, NULL).
-
- * re.c (rb_reg_prepare_re): magic variable $= should affect regex
- pattern match.
-
- * time.c (make_time_t): use tm.tm_gmtoff if possible.
-
- * time.c (time_zone): use tm.tm_zone if available.
-
-Tue Jun 13 01:50:57 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.22.
-
- * lib/net/http.rb: HTTPResponse#body returns body.
-
-Mon Jun 12 23:41:54 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in (daylight): avoid GCC optimization.
-
-Mon Jun 12 19:02:27 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: cygwin has strange timezone.
-
- * time.c (time_zone): use tzname and daylight.
-
-Sat Jun 10 23:10:32 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_seek): whence is optional, default is SEEK_SET.
-
-Fri Jun 9 17:00:29 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.21.
-
- * lib/net/http.rb: exception is raised with response object.
-
-Fri Jun 9 15:11:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (make_time_t): supports daylight saving time.
-
- * eval.c (rb_thread_safe_level): should retrieve current $SAFE
- value if a thread is the current thread.
-
-Thu Jun 8 14:25:45 2000 Hiroshi Igarashi <iga@ruby-lang.org>
-
- * lib/mkmf.rb: add target `distclean' in Makefile for extlib.
- target `clean' doesn't remove Makefile.
-
-Thu Jun 8 13:34:03 2000 Dave Thomas <dave@thomases.com>
-
- * numeric.c: add nan?, infinite?, and finite? to Float
-
-Thu Jun 8 00:31:04 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * regex.h: export re_mbctab properly on cygwin.
-
- * dln.c: use dlopen instead of LoadLibrary on cygwin.
-
-Thu Jun 8 13:41:34 2000 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * file.c (rb_file_s_basename): might dump core.
-
-Tue Jun 6 03:29:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dir.c (dir_foreach): now returns nil for consistency.
-
- * bignum.c (bigdivmod): modulo by small numbers was wrong.
-
-Mon Jun 5 00:18:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * bignum.c: avoid conflict with USHORT on mingw32.
-
-Mon Jun 5 00:13:35 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * eval.c (rb_thread_schedule): =/== typo.
-
-Sun Jun 4 03:17:36 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: improve: CGI::pretty()
-
-Sun Jun 4 02:01:10 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * lib/mkmf.rb: do not need to add -L$(topdir) in --enable-shared case.
-
-Sat Jun 3 13:50:06 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (rb_id2name): should support constant attrset
- identifiers.
-
- * bignum.c (rb_big_eq): Bignum#== should not raise exception.
-
-Fri Jun 2 11:24:48 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_popen): open with a block returns the value from the
- block. old behavior was back.
-
-Fri Jun 2 00:42:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
-
- * eval.c (rb_thread_cleanup): should clear priority for thread
- termination.
-
-Thu Jun 1 22:39:41 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.20.
-
- * lib/net/http.rb: wrongly closed the socket twice
- when no Content-Length: was given.
-
-Thu Jun 1 00:59:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_yield_0): convert Qundef to [].
-
-Wed May 31 20:45:59 2000 Dave Thomas <Dave@Thomases.com>
-
- * string.c (rb_str_slice_bang): wrong argument number.
-
-Wed May 31 12:37:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_exec_end_proc): print error message from END procs.
-
-Wed May 31 04:06:41 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: change: CGI#out() if "HEAD" == REQUEST_METHOD then
- output only HTTP header.
-
-Wed May 31 01:54:21 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_schedule): set main_thread->status to
- THREAD_TO_KILL, before raising deadlock error.
-
- * eval.c (rb_thread_deadlock): if curr_thread == main_thread, do
- not call rb_thread_restore_context()
-
-Tue May 30 23:33:41 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * lib/mkmf.rb (create_makefile): add $(TARGET).ilk and *.pdb
- to cleanup files for mswin32.
-
-Mon May 29 10:41:10 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (rb_file_s_basename): should propagate taintness.
-
-Sun May 28 21:37:13 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * eval.c: bug fix: DLEXT2.
-
-Sun May 28 19:21:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * win32/win32.c: use ruby's glob.
-
- * dir.c: "glob" exported and renamed to "rb_glob".
-
- * ruby.h: ditto.
-
- * main.c: turn off command line mingw32's globbing.
-
-Wed May 25 22:25:13 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/extmk.rb.in: use "ftools" instead of "rm -f".
-
- * lib/mkmf.rb: ditto.
-
-Thu May 25 22:01:32 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * defines.h: mswin32: remove obsolete USHORT definition.
-
- * re.h: mswin32: use EXTERN instead of extern.
-
- * regex.h: mswin32: export re_mbctab properly.
-
- * win32/ruby.def: add ruby_ignorecase and regex.c's exports.
-
-Thu May 25 21:28:44 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * re.c (rb_reg_expr_str): escape un-printable character.
-
-Thu May 25 01:35:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (tokadd_escape): forgot to add `\x' to hexadecimal
- escape sequences.
-
- * object.c (rb_obj_dup): dup for normal object (T_OBJECT) copies
- instance variables only.
-
-Wed May 24 23:49:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (rb_mod_initialize): should provide initialize.
-
-Wed May 24 23:17:50 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/Makefile: remove unnecessary mv and rm command call.
-
-Wed May 24 21:01:04 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/pty/pty.c: use "" instead of <> to include ruby.h and rubyio.h
- for BeOS (PowerPC).
-
- * file.c (rb_find_file): should check dln_find_file() result.
-
- * win32/ruby.def: add rb_block_given_p.
-
-Wed May 24 16:32:45 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_popen): popen does not take 3rd argument anymore.
-
- * re.c (rb_reg_desc): re may be zero, check before dereferencing.
-
-Wed May 24 16:03:06 2000 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/cgi.rb: bug fix: CGI::escape(), CGI::Cookie::new()
-
- * lib/net/telnet.rb: improve: binmode(), telnetmode() interface
-
-Wed May 24 13:12:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * misc/ruby-mode.el (ruby-parse-region): support `while .. do'
- etc. But corresponding keywords must be at the beginning of
- line.
-
-Tue May 23 23:50:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_initialize_m): wrong kcode value.
-
- * re.c (rb_reg_s_new): forgot to initialize re->ptr.
-
-Tue May 23 08:36:24 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): forgot to restore old option
- status by (?ix-ix).
-
- * regex.c (re_compile_fastmap): anychar may match newline if
- RE_OPTION_MULTILINE or RE_OPTION_POSIXLINE is set.
-
-Mon May 22 22:45:06 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.19.
-
- * lib/net/http.rb: do not use Regexp "p" option.
-
-Mon May 22 21:56:43 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * struct.c (rb_struct_getmember): should use ID2SYM, not INT2NUM.
-
-Mon May 22 15:07:37 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (rb_find_file): should check if the file really exists.
-
-Mon May 22 09:08:12 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_popen): _exit(0) after processing block under the
- child process.
-
- * io.c (rb_io_popen): flush stdout/stderr before subprocess
- termination.
-
- * eval.c (rb_check_safe_str): insert rb_secure(4); operation
- requires untainted string should be prohibited in level 4.
-
-Sun May 21 21:17:00 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: add Setup.dj for djgpp cross-compiling.
-
- * Setup.dj: add readline.
-
- * instruby.rb: copy win32/win32.h to archlibdir on mingw32.
-
-Sun May 21 20:58:08 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * pack.c: fix OFF16 and OFF32 definitions for Alpha and IRIX64.
-
-Sun May 21 17:31:37 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * instruby.rb: support "make install" for cross-compiling.
-
- * ext/extmk.rb.in: ditto.
-
-Sun May 21 14:22:49 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * Makefile.in: rename prep.rb to fake.rb.
-
- * configure.in: ditto.
-
-Sat May 20 23:29:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dir.c (dir_s_new): does not take block; "open" does.
-
- * io.c (rb_io_s_new): ditto.
-
-Fri May 19 07:44:26 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dir.c (dir_s_open): Dir#open does not returns closed Dir if a
- block is given to the method.
-
- * re.c (rb_reg_initialize_m): Regexp::new calls initialize now.
-
- * string.c (Init_String): String#delete_at removed.
-
- * string.c (rb_str_aset_m): should have checked argc != 2.
-
- * eval.c (rb_thread_schedule): select(2) was called too many.
-
- * regex.c (re_compile_pattern): a bug in (?m) support. Pointed
- out by Dave Thomas <Dave@thomases.com>.
-
-Thu May 18 23:55:26 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * dln.c (search_undef): st_lookup()'s 3rd parameter should be
- a pointer of the variable which has the same size and alignment
- as `char *'.
-
- * marshal.c (w_symbol, w_object): ditto.
-
- * parse.y (rb_intern): ditto.
-
-Thu May 18 18:00:35 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.18.
-
- * lib/net/protocol.rb: Net::Version was removed.
-
- * lib/net/smtp.rb: use Socket.gethostname to get local host name.
-
-Thu May 18 13:34:57 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (ruby_connect): should not have replaced
- thread_write_select() by rb_thread_fd_writable().
-
-Thu May 18 09:01:25 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * configure.in, ext/extmk.rb.in, lib/mkmf.rb: remove BeOS R3 support.
- Make a shared library (libruby.so) only if the --enable-shared
- option is specified.
-
- * instruby.rb: no longer use libruby.so.LIB and import.h.
-
- * io.c: fix READ_DATA_PENDING definition for BeOS (PowerPC).
-
-Wed May 17 14:14:23 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_new_1): use /m instead of /p.
-
-Wed May 17 02:22:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_polling): wait 0.06 second to let other
- processes run.
-
- * process.c (rb_waitpid): avoid busy wait using rb_thread_polling.
-
- * file.c (rb_thread_flock): ditto.
-
- * parse.y (expr): avoid calling value_expr() twice.
-
-Wed May 17 00:45:57 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * io.c (rb_io_binmode): should check PLATFORMs, not O_BINARY, sigh...
-
-Wed May 17 00:40:15 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/config.h: add DLEXT2, now DLEXT on mswin32 is "so".
-
- * win32/config.status: ditto.
-
- * win32/ruby.def: add symbol "rb_big_divmod".
-
-Tue May 16 19:45:32 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * intern.h: use EXTERN instead of extern.
-
- * win32/ruby.def: add rb_defout, rb_stdout, ruby_errinfo,
- ruby_sourceline, ruby_sourcefile to work with eruby
- reported by Hiroshi Saito <HiroshiSaito@pob.org>.
- Export both ruby_xmalloc and xmalloc etc.
-
-Tue May 16 17:00:05 2000 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-
- * eval.c (rb_thread_select): should check whether fds are null.
-
-Tue May 16 11:51:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (pipe_open): synchronize subprocess stdout/stderr.
-
-Mon May 15 15:38:09 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.h: exported symbols should be for xmalloc etc. are now
- prefixed by 'ruby_', e.g. ruby_xmalloc().
-
- * eval.c (rb_thread_select): remove busy wait for select.
-
- * dir.c (glob): trailing path may be null, e.g. glob("**").
-
-Mon May 15 14:48:41 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * io.c (rb_io_pid): new method; returns nil if no process attached
- to the IO.
-
-Mon May 15 01:18:20 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_s_popen): _exit after Proc execution.
-
-Sun May 14 18:05:59 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * Makefile.in: missing/nt.c -> win32/win32.c
-
- * configure.in: bug fix; static linking on mingw32.
-
- * cygwin/GNUmakefile.in: remove VPATH.
-
- * ext/extmk.rb.in: Makefile set binmode with mingw32 on cygwin32.
-
- * lib/mkmf.rb: ditto.
-
- * win32/config.h: undef HAVE_SYS_FILE_H.
-
-Sun May 14 02:02:48 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * lib/irb/ruby-lex.rb: '/' should be escaped in character class.
-
-Sun May 14 00:54:43 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in, ...: support mingw32.
-
- * defines.h: ditto. undef EXTERN for tcl/tk on cygwin.
-
- * ext/*/extconf.rb: replace PLATFORM with RUBY_PLATFORM.
-
- * ext/socket/sockport.h: define IN_MULTICAST for missing IN_MULTICAST.
-
- * ext/tcltklib/tcltklib.c: remove declaration of rb_argv0.
-
- * file.c: should check S_IXGRP, S_ISGID, not NT.
-
- * io.c (rb_io_binmode): should check _IOBIN, O_BINARY, not PLATFORMs.
-
-Sat May 13 14:21:15 2000 Koji Arai <JCA02266@nifty.ne.jp>
-
- * io.c (rb_io_s_popen): should check whether a block is given.
-
-Fri May 12 17:33:44 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): charset_not should not exclude
- newline from matching set.
-
-Thu May 11 22:51:05 2000 Ryunosuke Ohshima <ryu@jaist.ac.jp>
-
- * pack.c (pack_pack): Bignum support.
-
- * pack.c (pack_unpack): ditto.
-
-Thu May 11 21:19:29 2000 Hiroshi Igarashi <iga@ruby-lang.org>
-
- * intern.h: add missing declarations of ruby API functions.
-
- * ruby.h: fix function name in declarations.
-
-Thu May 11 22:29:25 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/md5/depend: add $(topdir)/config.h dependency to md5c.o.
-
- * ext/md5/extconf.rb: new file to add -DHAVE_CONFIG_H flag for Alpha.
-
-Thu May 11 10:55:52 2000 Ryunosuke Ohshima <ryu@jaist.ac.jp>
-
- * pack.c (pack_pack): packing BER compressed integer by `w'.
-
- * pack.c (pack_unpack): unpacking BER.
-
-Thu May 11 00:37:55 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (parse_regx): remove in_brack.
-
-Wed May 10 12:51:18 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (proc_options): move adding RUBYLIB and "." to the load
- path after #! line parsing.
-
- * parse.y (parse_regx): should parse backslash escape like `\c['
- here to avoid causing `unterminated regexp' error.
-
-Wed May 10 00:19:53 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * MANIFEST, beos/GNUmakefile.in, configure.in: no longer need
- beos/GNUmakefile.in to support BeOS R4.5.2 (Intel) as a result
- of eban's Makefile.in change.
-
- * io.c: NOFILE is already defined on BeOS R4.5 (Intel) or later.
-
- * lib/matrix.rb: remove debug print.
-
- * regex.c: don't use nested comment.
-
-Tue May 9 17:08:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (massign): no longer convert nil into empty array.
-
- * io.c (rb_io_s_popen): optional 3rd argument to give proc, which
- will be executed in spawned child process.
-
-Mon May 8 23:47:39 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * eval.c (rb_callcc): prev & next should be initialized to zero.
-
-Mon May 8 23:17:36 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dln.c (dln_init): remove possible buffer overrun. This is
- suggested by Aleksi Niemela <aleksi.niemela@cinnober.com>.
-
- * dln.c (init_funcname): ditto.
-
-Sat May 6 23:35:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (lhs): should allow `obj.Attr = 5' type expression.
-
-Sat May 6 15:46:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/socket/extconf.rb: add a new configure option to force use
- of the WIDE Project's getaddrinfo(): --enbale-wide-getaddrinfo.
-
-Fri May 5 21:19:22 2000 MOROHOSHI Akihiko <moro@remus.dti.ne.jp>
-
- * parse.y (yylex): allow '$1foo' and such.
-
-Fri May 5 17:57:24 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.17.
-
- * lib/net/http.rb: write also port number in Host: field.
-
- * lib/net/http.rb: see Proxy-Connection: to decide socket connection.
-
-Fri May 5 03:25:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_fastmap): charset_not for multibyte
- characters excluded too many characters.
-
-Tue May 2 13:23:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_schedule): little bit more impartial context
- switching.
-
-Tue May 2 09:50:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * configure.in: add DLDLIBS to set platform specific library
- for extensions.
-
- * ext/extmk.rb.in: use @DLDLIBS@ instead of RUBY_PLATFORM choice.
-
- * lib/mkmf.rb: use CONFIG["DLDLIBS"] instead of RUBY_PLATFORM choice.
-
- * config_s.dj: add @DLDLIBS@.
-
- * win32/config.status: ditto.
-
- * win32/ruby.def: regular maintenance.
-
-Mon May 1 23:42:44 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in, eval.c: add DLEXT2. now DLEXT on Cygwin is "so".
-
- * defines.h: use dllimport, dllexport for Cygwin 1.1.x.
-
- * ruby.h: ditto.
-
- * cygwin/GNUmakefile.in: ditto.
-
- * ext/Win32API/Win32API.c: directly "call" in asm statement for
- gcc 2.95.x or newer.
-
-Sat Apr 29 04:58:12 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * array.c (rb_ary_unshift_m): performance improvement.
-
-Fri Apr 28 00:19:22 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * array.c (rb_ary_unshift_m): takes items to push.
-
-Wed Apr 26 15:23:02 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_succ): insert carrying character just before
- the leftmost alpha numeric character.
-
- * string.c (rb_str_succ): proper behavior for "".succ and "\377".succ.
-
- * string.c (rb_str_succ): use realloc and memmove.
-
-Tue Apr 25 18:28:45 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.16.
-
- * lib/net/smtp.rb: add SMTP AUTH
-
-Tue Apr 25 14:30:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_gets_internal): shortcut when rs == rb_default_rs.
-
-Sat Apr 22 23:14:41 2000 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
- * configure.in: MacOS X support.
-
-Sat Apr 22 16:37:10 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.15.
-
- * lib/net/http.rb: closing socket by watching both
- user header and server response
-
-Fri Apr 21 21:44:34 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * io.c (rb_io_s_pipe): should set FMODE_SYNC.
-
-Thu Apr 20 16:59:22 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (massign): `*lvalue = false' should assign `[false]' to
- lvalue.
-
-Wed Apr 19 08:35:08 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (rb_singleton_class): generate singleton class for
- special constants: nil, true, false.
-
-Wed Apr 19 02:09:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (rb_singleton_class): singleton method for nil, true,
- false is possible now.
-
- * eval.c (rb_eval): ditto.
-
-Tue Apr 18 18:54:25 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.14.
-
- * lib/net/http.rb: new method HTTP#head2.
-
- * lib/net/http.rb: get2/post2 does not raise exceptions.
-
-Mon Apr 17 15:16:31 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_close): to detect some exceptional status, writable
- IO should be flushed before close;
-
-Sat Apr 15 18:29:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_collect_bang): Array#filter renamed.
-
-Fri Apr 14 19:47:11 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.13.
-
- * lib/net/pop.rb: accept illegal timestamp
-
- * lib/net/http.rb: when body was chunked, does not set Content-Length:
-
-Tue Apr 11 21:14:42 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * config_s.dj: add @sitedir@.
- * configure.in: add --with-sitedir=DIR option.
- * instruby.rb: use CONFIG["sitedir"].
- * lib/mkmf.rb: support 'make site-install'.
- * win32/config.status: add @sitedir@.
-
-Tue Apr 11 16:25:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (rb_big_2comp): unnecessary lvalue cast removed.
-
-Tue Apr 11 02:25:53 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (env_fetch): new method.
-
- * marshal.c (marshal_dump): accepts depth = nil for unlimited depth.
-
-Sun Apr 9 20:49:19 2000 Dave Thomas <Dave@Thomases.com>
-
- * parse.y (str_extend): Allow class variables to be expanded.
-
-Fri Apr 7 02:03:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * error.c (rb_sys_fail): escape non-printable characters.
-
-Thu Apr 6 20:10:47 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/extmk.rb.in (create_makefile): BeOS --program-suffix support.
- * lib/mkmf.rb (create_makefile): ditto.
-
-Thu Apr 6 09:55:26 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * error.c (rb_sys_fail): need rb_exc_new2() call on BeOS.
-
-Mon Apr 3 17:22:27 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_reopen): support tempfile.
-
- * eval.c (catch_i): should supply argument.
-
-Sat Apr 1 22:50:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (r_object): wrong symbol restoration.
-
-Sat Apr 1 21:30:53 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * io.c (rb_io_printf, rb_f_printf): should use rb_io_write.
-
-Sat Apr 1 00:16:05 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (rb_gc_call_finalizer_at_exit): should be clear flags
- before calling finalizers.
-
- * eval.c (specific_eval): can be called without SecurityError, if
- $SAFE >= 4.
-
- * object.c (sym_inspect): inspect gives ":sym", to_s gives "sym".
-
-Fri Mar 31 22:07:04 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.12.
-
- * lib/net/protocol.rb: update Net::Protocol::Proxy#connect
-
- * lib/net/protocol.rb: ReplyCode is not a class
-
- * lib/net/http.rb: header value format was change:
- values do not include header name
-
- * lib/net/http.rb: header is not a Hash, but HTTPResponse
-
-Thu Mar 30 12:19:44 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * enum.c (enum_find): rb_eval_cmd() should be called with array.
-
-Tue Mar 28 13:57:05 2000 Clemens Hintze <c.hintze@gmx.net>
-
- * ext/dbm/dbm.c (fdbm_invert): should return new hash.
-
- * ext/gdbm/gdbm.c (fgdbm_invert): ditto.
-
-Tue Mar 28 00:58:03 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.11.
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: does not
- dispatch any commands while dispatching command.
-
- * lib/net/protocol.rb: failed to get error class of
- inherited ReplyCode
-
- * lib/net/http.rb: change feature of "get2", "post2"
-
-Mon Mar 27 01:34:58 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.10.
-
- * lib/net/http.rb: return value of 'head' was wrong.
-
-Sun Mar 26 17:47:35 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.9.
-
- * lib/net/smtp.rb: SMTP#do_ready wrongly took no arguments
-
-Sat Mar 25 23:21:10 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (w_object): symbols should be converted to ID before
- dumping out.
-
-Fri Mar 24 18:26:51 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (test_check): should have checked exact number of arguments.
-
-Fri Mar 24 21:02:11 2000 Koji Arai <JCA02266@nifty.ne.jp>
-
- * signal.c (trap): should treat some symbols as the signal.
-
-Fri Mar 24 06:58:03 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.8.
-
- * lib/net/http.rb: post, get2, post2, get_body
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: separate
- Command/Socket documentation.
-
-Thu Mar 23 02:26:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_fptr_finalize): fptr may be null.
-
- * io.c (rb_io_s_new): now calls `initialize'.
-
- * io.c (rb_io_initialize): actual open done in this method.
-
- * io.c (rb_file_initialize): ditto.
-
- * eval.c (rb_eval): class variables in singleton class definition
- is now handled properly (I hope).
-
-Wed Mar 22 21:49:36 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * st.c (st_delete_safe): skip already deleted entry.
-
- * hash.c (rb_hash_delete): modify brace miss.
-
-Wed Mar 22 08:53:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (exec_under): do not push cbase if ruby_cbase == under.
-
- * node.h (NEW_CREF0): preserve cbase nesting.
-
-Tue Mar 21 12:57:50 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (rb_class_s_new): Class::new should call `inherited'.
-
-Sat Mar 18 12:36:09 2000 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * eval.c (rb_backtrace, make_backtrace): removed unused variable
- `lev'.
-
- * eval.c (rb_attr): calls `method_added' at attribute definition.
-
- * eval.c (rb_mod_modfunc): calls `singleton_method_added' while
- `module_function'.
-
- * eval.c (rb_eval): parameter to `method_added' and
- `singleton_method_added' is Symbol.
-
- * eval.c (Init_eval): caches IDs for `method_added' and
- `singleton_method_added'.
-
-Sat Mar 18 11:25:10 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (rescue): allows `rescue Error in foo'. experimental.
- which is better this or preparing alias `exception' for `$!'?
-
-Fri Mar 17 15:02:45 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_autoload_id): defining new autoload should be
- prohibited for $SAFE > 4.
-
- * variable.c (rb_autoload_load): autoload should be possible for
- $SAFE > 4.
-
- * eval.c (call_trace_func): should handle T_ICLASS properly.
-
-Fri Mar 17 14:34:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_gsub): forgot to initialize str->orig.
-
-Fri Mar 17 01:24:59 2000 Dave Thomas <Dave@thomases.com>
-
- * string.c (rb_str_clone): forgot to copy str->orig if STR_NO_ORIG
- is set by Array#pack.
-
-Wed Mar 15 21:25:04 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * array.c (rb_ary_join): 'result' is always duplicated
- before concat string.
-
-Wed Mar 15 17:26:05 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (rb_hash_s_create): unexpected recursive call removed.
- this bug was found by Satoshi Nojo <nojo@t-samukawa.or.jp>.
-
-Wed Mar 15 13:12:39 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (Init_Thread): Thread.join removed finally.
-
- * string.c (rb_str_chomp_bang): forgot to call rb_str_modify().
-
-Mon Mar 13 16:12:13 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (block_pass): distinguish real orphan block and still
- on-stack block passed by block argument.
-
-Mon Mar 13 00:20:25 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (f_norm_arg): proper error message when constant comes
- in formal argument list. this message is suggested by Muvaw
- Pnazte <bugathlon@yahoo.com>.
-
- * eval.c (rb_f_raise): proper error message when the first
- argument is not an exception class/object.
-
- * string.c (rb_str_dup): dup now postpone buffer copy as long as
- possible. performance improved by lazy copying.
-
-Sun Mar 12 13:58:52 2000 Koji Arai <JCA02266@nifty.ne.jp>
-
- * signal.c (rb_f_kill): should treat some symbols as the signal.
-
-Sat Mar 11 22:03:03 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_gsub): performance tune by avoiding buffer copy.
-
- * eval.c (rb_f_missing): check if argv[0] is ID.
-
-Sat Mar 11 15:49:41 2000 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * struct.c (rb_struct_aref): struct aref by symbol.
-
-Sat Mar 11 05:07:11 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * process.c (proc_setpriority): should return 0, not nil.
-
- * process.c (proc_setpgid): ditto.
-
-Fri Mar 10 18:14:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (path_check_1): confusing buf and path. this bug found
- by <decoux@moulon.inra.fr>.
-
-Fri Mar 10 09:37:49 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * MANIFEST: add beos/GNUmakefile.in.
- * configure.in: support BeOS R4.5.2 (Intel).
- * beos/GNUmakefile.in: new file to support BeOS R4.5.2 (Intel).
-
-Thu Mar 9 11:13:32 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_fastmap): fixed embarrassing brace bug.
-
-Thu Mar 9 01:36:32 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * missing/flock.c: emulate missing flock() with fcntl().
-
-Thu Mar 9 00:29:35 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (sym_to_s): returns ":sym".
-
- * object.c (sym_id2name): separated from to_s; returns "sym".
-
-Wed Mar 8 19:16:19 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.7.
-
- * lib/net/http.rb (connecting): returns header
-
-Wed Mar 8 02:08:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y: escape expansion too early.
-
- * string.c (rb_f_scan): Kernel#scan added.
-
- * regex.c (re_compile_pattern): support \cX et al.
-
-Tue Mar 7 01:44:27 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (set_stdin): simplified procedure, allows $stdin = DATA;
- experimental.
-
- * io.c (set_outfile): ditto.
-
- * re.c (Init_Regexp): new method Regexp#last_match added; it's an
- alternative for $~.
-
- * configure.in (DEFAULT_KCODE): KCODE_NONE should be the default.
-
- * dir.c (dir_s_rmdir): should return 0 on success.
-
- * signal.c: remove CWGUSI support.
-
-Mon Mar 6 12:28:37 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (w_symbol): support symbol object.
-
- * util.c: make symbol as separated class.
-
- * error.c (Init_Exception): new exception RangeError.
-
- * ext/socket/socket.c (ip_addrsetup): should check length of hostname.
-
- * ext/socket/socket.c (ip_addrsetup): check newline at the end of
- hostname. These fixes suggested by Muvaw Pnazte <bugathlon@yahoo.com>.
-
-Sun Mar 5 20:35:45 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/Win32API/Win32API.c (Win32API_initialize): should call
- LoadLibrary() everytime and should assign the hdll to Win32API
- object(protect the hdll from GC).
-
-Sun Mar 5 18:49:06 2000 Nakada.Nobuyoshi <nobu.nokada@softhome.net>
-
- * misc/ruby-mode.el (ruby-parse-region): not treat method `begin'
- and `end' as reserved words.
-
- * misc/ruby-mode.el (ruby-font-lock-docs): ignore after `=begin'
- and `=end'.
-
- * misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
- added `yield' to keywords.
-
- * misc/ruby-mode.el (ruby-font-lock-keywords, hilit-set-mode-patterns):
- matches keywords at end of buffer.
-
-Sun Mar 5 18:08:53 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.6.
-
- * lib/net/http.rb: allow to omit 'start'
-
-Tue Feb 29 01:08:26 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * range.c (range_initialize): initialization done in `initialize';
- `initialize' should not be called more than once.
-
- * object.c (Init_Object): default `initialize' should take zero
- argument.
-
- * time.c (time_s_new): call `initialize' in Time::new.
-
-Sat Feb 26 22:39:31 2000 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * string.c (rb_str_times): fix String#* with huge string.
-
-Sat Feb 26 00:14:59 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dir.c (dir_s_new): call `initialize' in Dir::new.
-
-Fri Feb 25 23:01:49 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ruby.h: export ruby_safe_level by EXTERN for mswin32.
- * win32/ruby.def: regular maintenance.
-
-Fri Feb 25 22:12:46 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_reopen): IO#reopen should accept path as well.
-
- * string.c (rb_str_s_new): call `initialize' in String::new.
-
- * hash.c (rb_hash_s_new): call `initialize' in Hash::new.
-
- * array.c (rb_ary_s_new): call `initialize' in Array::new.
-
-Fri Feb 25 12:50:20 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_start_timer): interval changed to 10ms from 50ms.
-
-Fri Feb 25 06:42:26 2000 GOTOU Yuuzou <gotoyuzo@notwork.org>
-
- * ext/socket/socket.c (ip_addrsetup): hostp should remain NULL if
- host is nil.
-
-Thu Feb 24 16:53:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_schedule): priority check for sleep expired
- threads needed.
-
-Wed Feb 23 14:22:32 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_join): forgot to initialize a local variable
- `taint'.
-
-Tue Feb 22 07:40:55 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (Init_Regexp): renamed to MatchData, old name MatchingData
- remain as alias.
-
-Tue Feb 22 00:20:21 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.5.
-
- * lib/net/session.rb: rename to protocol.rb
-
- * lib/net/protocol.rb: ProtocolSocket -> Net::Socket
-
- * lib/net/protocol.rb: Net::Socket#write, write_pendstr
- can take block
-
- * lib/net/smtp.rb: new methods SMTP#ready SMTPCommand#write_mail
-
- * lib/net/pop.rb: POPMail#pop can take block
-
-Sat Feb 19 23:58:51 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): pop_loop should not pop at forward jump.
-
-Fri Feb 18 17:15:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (method_clone): method objects are now clonable.
-
-Fri Feb 18 00:27:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_shared_variable_declare): shared variable (aka
- class/module variable) introduced. prefix `@@'. experimental.
-
- * class.c (rb_scan_args): new format char '&'.
-
-Thu Feb 17 19:09:05 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/win32.c (mypopen): don't close handle if it is not assigned.
- * win32/win32.c (my_open_osfhandle): support O_NOINHERIT flag.
- * win32/win32.c (win32_getcwd): rename getcwd to win32_getcwd
- in order to avoid using the C/C++ runtime DLL's getcwd.
- Use CharNext() to process directory name.
- * win32/win32.h: map getcwd to win32_getcwd.
-
-Wed Feb 16 00:32:49 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (method_arity): nd_rest is -1 for no rest argument.
-
- * process.c (proc_waitpid): returns nil when waitpid(2) returns 0.
-
-Tue Feb 15 01:47:00 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * process.c (rb_f_waitpid): pid_t should be signed.
-
-Mon Feb 14 13:59:01 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): yylex yields wrong tokens for `:foo=~expr'.
-
- * ruby.c (load_file): exit if reading file is empty.
-
-Mon Feb 14 03:34:52 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): `foo.bar=1' should be <foo><.><bar><=><1>,
- not <foo><.><bar=><1>.
-
- * eval.c (rb_thread_restore_context): process according to
- RESTORE_* is moved after longjmp().
-
- * eval.c (thread_switch): new function to process RESTORE_*.
-
-Sun Feb 13 16:19:49 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ruby.c (require_libraries): don't access freed memory.
-
- * ruby.c (add_modules): ditto.
-
-Fri Feb 11 12:06:22 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (parse_quotedwords): %w() need to split not only by mere
- spaces, but by all whitespaces.
-
-Thu Feb 10 02:12:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_index_m): did not support negative offset.
-
-Wed Feb 9 21:54:26 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/getaddrinfo.c: gcc --traditional support.
- Rearrange headers to work AC_C_CONST.
- * ext/socket/getnameinfo.c: ditto.
- * ext/socket/socket.c: mswin32: use double instead of long long.
-
-Wed Feb 9 16:30:41 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (num_coerce): should return [y, x].
-
-Wed Feb 9 11:07:30 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (ruby_prog_init): loadpath structure changed.
-
-Tue Feb 8 02:07:33 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): optimize for \G at top.
-
- * regex.c (re_compile_pattern): \G introduced.
-
- * regex.c (re_match): ditto.
-
- * string.c (str_sub_bang): old behavior restored: bang method
- returns nil if string not changed.
-
- * regex.c (re_compile_pattern): support independent subexpression
- `(?>pattern)'.
-
- * regex.c (re_match): ditto.
-
-Mon Feb 7 15:51:08 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): now understands interrupts under Ruby.
-
-Mon Feb 7 07:51:52 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_uniq_bang): always return an Array.
-
- * array.c (rb_ary_compact_bang): ditto.
-
- * array.c (rb_ary_flatten_bang): ditto.
-
- * hash.c (rb_hash_reject): returns a Hash, not an Array.
-
- * hash.c (env_reject): ditto.
-
-Fri Feb 4 10:20:25 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (scan_once): scan now leaves information about the last
- successful pattern match in $&.
-
- * io.c (rb_io_close): should not check closed IO.
-
-Fri Feb 4 05:44:01 2000 Kentaro Inagaki <inagaki@tg.rim.or.jp>
-
- * ext/socket/socket.c (s_recv): TRAP_BEG after retry entry.
-
-Wed Feb 2 22:33:45 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (rb_thread_start): receives argument from outside, like
- `Thread::start(1,2,3){|a,b,c| ... }'.
-
-Wed Feb 2 22:14:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_regsub): should check regs->num_regs.
-
- * re.c (rb_reg_search): remove matchcache, use static struct
- re_register instead.
-
- * re.c (match_getter): avoid cloning match data.
-
-Wed Feb 2 17:12:15 2000 Dave Thomas <Dave@Thomases.com>
-
- * samples/eval.rb: Rescue new ScriptError exception
-
-Wed Feb 2 02:06:07 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_gsub_bang): gsub! now leaves information about the
- last successful pattern match in $&.
-
-Mon Jan 31 15:24:58 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_sub_bang): bang method returns string always.
- experimental.
-
-Sun Jan 30 17:58:09 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * eval.c: arrange to use setitimer(2) for BOW, DJGPP
-
- * defines.h: ditto. use random(3) on cygwin b20.1.
-
-Sun Jan 30 17:20:16 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * eval.c: use getrlimit(2) on DJGPP.
-
-Thu Jan 27 01:27:10 2000 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
-
- * dir.c (glob): glob pattern "/*" did not match.
-
-Wed Jan 26 22:30:47 2000 Shigeo Kobayashi <shigeo@tinyforest.gr.jp>
-
- * numeric.c (flo_modulo): wrong result for negative modulo.
-
-Wed Jan 26 02:01:57 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (test_c): should use S_ISCHR.
-
- * file.c (rb_stat_c): ditto.
-
- * string.c (rb_str_each_line): should propagate tainting.
-
-Tue Jan 25 04:01:34 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (rb_obj_freeze): all objects made freezable.
-
-Tue Jan 25 00:37:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: use AC_CHECK_TOOL for cross compiling.
-
-Mon Jan 24 19:01:54 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * array.c (rb_protect_inspect): should be checked by id of
- objects; not by object themselves.
-
-Mon Jan 24 18:48:08 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * eval.c (rb_eval): too many warnings; warned on every method
- overriding. should be on method discarding.
-
-Mon Jan 24 02:56:44 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): -2.abs should be `(-2).abs' to accomplish the
- principle of less surprise. `+2' too.
-
- * eval.c (rb_eval): when defining class is already there, and
- superclass differ, throw away the old class.
-
- * variable.c (rb_const_set): gives warning again on constant
- redefinition.
-
- * error.c (Init_Exception): SyntaxError, NameError, LoadError and
- NotImplementError are subclasses of ScriptError<Exception, not
- StandardError. experimental.
-
-Sat Jan 22 00:00:41 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (parse_quotedwords): no longer use `String#split'.
- and enable space escape within quoted word list.
- e.g. %w(a\ b\ c abc) => ["a b c", "abc"].
-
- * string.c (rb_str_slice_bang): new method `slice!'.
-
-Fri Jan 21 21:56:08 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.4.
-
- * lib/net/http.rb: can receive messages which have
- no Content-Length:.
-
-Fri Jan 21 16:15:59 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thgroup_s_new): new class ThreadGroup.
-
-Tue Jan 18 12:24:28 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * struct.c (Init_Struct): remove Struct's own hash and eql?.
-
-Sat Jan 15 22:21:08 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * eval.c (search_method): argument klass may be 0.
-
-Sat Jan 15 15:03:46 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * enum.c (enum_index): remove this method.
-
- * enum.c: remove use of pointers to local variables. find,
- find_all, min, max, index, member?, each_with_index,
-
- * eval.c (massign): multiple assignment does not use to_a anymore.
- experimental.
-
-Fri Jan 14 12:22:04 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_replace): use memmove instead of memcpy for
- overwrapping strings (e.g. a[1] = a).
-
-Thu Jan 13 11:12:40 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (arg_add): use new node, ARGSPUSH.
-
-Mon Jan 10 18:32:28 2000 Koji Arai <JCA02266@nifty.ne.jp>
-
- * marshal.c (w_object): forgot an argument to call w_ivar().
-
-Sun Jan 9 18:13:51 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * random.c: first was not defined unless HAVE_RANDOM.
-
-Sat Jan 8 19:02:49 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_sysread): raise IOError for buffered IO.
-
- * ext/socket/socket.c (s_recv): ditto.
-
-Fri Jan 7 00:59:29 2000 Masahiro Tomita <tommy@tmtm.org>
-
- * io.c (io_fread): TRAP_BEG/TRAP_END added around getc().
-
-Thu Jan 6 00:39:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * random.c (rb_f_rand): should be initialized unless srand is
- called before.
-
-Wed Jan 5 16:59:34 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.3.
-
- * lib/net/session.rb: Session -> Protocol, ...
-
- * lib/net/http.rb: HTTPCommand implementation was changed.
-
-Wed Jan 5 02:14:46 2000 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * parse.y: Fix SEGV on empty parens with UMINUS or UPLUS.
-
-Tue Jan 4 22:25:54 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (stmt): `() while cond' dumped core.
-
-Tue Jan 4 06:04:14 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * configure.in: modify for cross-compiling.
- use target_* instead of host_*.
- use AC_CANONICAL_TARGET.
-
- * Makefile.in: ditto.
-
- * cygwin/GNUmakefile.in: ditto.
-
-Sat Jan 1 13:26:14 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_yield_0): force_recycle ruby_dyna_vars to gain
- performance.
-
- * array.c (rb_ary_delete_at_m): takes same argument pattern with
- rb_ary_aref.
-
-Sat Jan 1 10:12:26 2000 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ruby.h,util.c (rb_special_const_p): peep hole optimization.
-
- * ruby.h,util.c (rb_test_false_or_nil): removed.
-
- * ruby.h (RTEST, SPECIAL_CONST_P): peep hole optimization.
-
- * ruby.h (FL_ABLE, FL_SET, FL_UNSET, FL_REVERSE): made expressions
- not statements.
-
- * ruby.h (OBJ_INFECT): newly added macro which copies taint from
- `s' to `x'.
-
-Sat Jan 1 02:04:18 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_safe_level): new method.
-
- * eval.c (rb_yield_0): recycle dyna_var_map to reduce object
- allocation.
-
-Fri Dec 31 00:52:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c: thread independent trace_func not needed.
-
-Thu Dec 30 14:47:31 1999 akira yamada <akira@ruby-lang.org>
-
- * configure.in: specifies -soname in LIBRUBY_DLDFLAGS on linux
- platforms.
-
-Thu Dec 30 10:51:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c,io.c,hash,c,re.c,string.c: `_m' suffix instead of
- `_method' for wrapper functions to implement method,
- e.g. `rb_str_join_m()'.
-
-Thu Dec 30 02:08:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (rb_cstr2inum): non-numeric format check added.
- currently it works only with base == 0 (i.e. Integer()).
-
- * bignum.c (rb_str2inum): now takes VALUE to 1st argument. null
- byte check added.
-
- * array.c (rb_ary_replace): unless replacement is an array,
- replacement shall be converted to array by `[replacement]', not
- by `replacement.to_a'.
-
- * array.c (rb_ary_plus): right operand must be an array.
-
- * array.c (rb_ary_concat): argument must be an array.
-
-Mon Dec 27 12:35:47 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/socket.c (sock_finalize): mswin32: fix socket handle leak.
-
- * win32/win32.c (myfdclose): ditto.
-
-Sun Dec 26 23:15:13 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/win32.c (mypopen): raise catchable error instead of rb_fatal.
- * win32/win32.c (mypclose): fix process handle leak.
-
-Sun Dec 26 16:17:11 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/Win32API/Win32API.c (Win32API_initialize): use UINT2NUM
- instead of INT2NUM to set __dll__ and __proc__.
-
-Sat Dec 25 00:08:59 1999 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
-
- * ext/Win32API/Win32API.c (Win32API_Call): remove 'dword ptr'
- from _asm.
-
-Fri Dec 24 10:26:47 1999 Koji Oda <oda@bsd1.qnes.nec.co.jp>
-
- * win32/win32.h: use "C++" linkage.
-
-Fri Dec 24 02:00:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (THREAD_ALLOC): should initialize th->trace.
-
-Fri Dec 24 00:43:39 1999 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
-
- * io.c (pipe_open): check for `fptr->f == NULL'.
- * win32/win32.c (mypopen): STDERR does not work during ` function.
-
-Wed Dec 22 22:50:40 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.2.
-
- * lib/net/http.rb: HTTP support is enhanced a little
-
- * lib/net/http.rb: support proxy
-
-Tue Dec 21 17:21:28 1999 Koji Oda <oda@bsd1.qnes.nec.co.jp>
-
- * ext/socket/socket.c (sock_finalize): mswin32: fix FILE* leak.
-
-Tue Dec 21 05:33:56 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.1.
-
- * lib/net/http.rb: support HTTP chunk
-
-Mon Dec 20 19:08:12 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (rb_file_s_expand_path): handle dir separator correctly.
-
-Sun Dec 19 22:56:31 1999 KANEKO Naoshi <wbs01621@mail.wbs.ne.jp>
-
- * lib/find.rb: support dosish root directory.
- * win32/Makefile: ditto.
- * win32/config.status: ditto.
- * win32/win32.c (opendir): ditto.
- * win32/win32.c (opendir): use CharPrev() to get last character
- of the directory name.
-
-Sat Dec 18 03:00:01 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (path_check_1): check should be done by absolute path.
-
- * marshal.c (r_ivar): should restore generic_ivar too.
-
- * marshal.c (w_ivar): should dump generic_ivar too.
-
-Fri Dec 17 22:46:46 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb, http.rb: 1.1.0.
-
- * lib/net/http.rb: test release
-
- * lib/net/session.rb: support class swapping
-
- * lib/net/session.rb: Socket#flush_rbuf
-
- * lib/net/session.rb: doquote -> Net.quote
-
-Fri Dec 17 19:27:43 1999 IWAMURO Motonori <iwa@mmp.fujitsu.co.jp>
-
- * eval.c (rb_load): should initialize ruby_frame->last_class.
-
-Wed Dec 15 01:35:29 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (proc_options): option to change directory changed to
- `-C' like tar.
-
- * ruby.c (proc_options): argv boundary check for `-X'.
-
-Mon Dec 13 15:15:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_adjust_startpos): separate startpos adjustment
- because of major performance drawback.
-
- * class.c (rb_singleton_class): tainted status of the singleton
- class must be synchronized with the object.
-
- * eval.c (rb_thread_schedule): implement thread priority.
-
-Sat Dec 11 03:34:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (mark_hashentry): key should be VALUE, not ID.
-
- * io.c (argf_eof): should check next_p too.
-
-Thu Dec 9 18:09:13 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * error.c (exc_set_backtrace): forgot to declare a VALUE argument.
-
-Thu Dec 9 14:19:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (rb_obj_taint): explicit tainting must be prohibited at
- level 4 to prevent polluting trusted object by untrusted code.
-
- * file.c: file operations (stat, lstat, chmod, chown, umask,
- truncate, flock) are prohibited in level 2 (was level 4).
-
-Wed Dec 8 11:48:23 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_f_require): prohibiting require() in the secure mode
- cause serious autoloading error.
-
- * variable.c (rb_obj_instance_variables): don't need to prohibit
- to get list of instance variable names of untainted objects.
-
- * variable.c (rb_ivar_get): don't need to prohibit to get instance
- variables of untainted objects.
-
- * variable.c (rb_mod_remove_const): should prohibit constant
- removals too.
-
-Wed Dec 8 09:23:01 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): should try autoloading before defining
- class/module at the toplevel.
-
-Tue Dec 7 22:15:30 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * configure.in: Modified rb_cv_rshift_sign detect routine and
- more simple/fast RSHIFT() for hpux-10.x.
-
-Tue Dec 7 11:16:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (Init_eval): calculate stack limit from rlimit where
- getrlimit(2) is available.
-
-Tue Dec 7 09:57:33 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * file.c (rb_file_ftype): should have removed mode_t.
-
-Mon Dec 6 15:55:30 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * numeric.c (fix_rshift): Fix -1 >> 32 returned 0 (should be -1).
-
- * numeric.c (fix_rshift): Fix 1 >> -1 returned 0 (should be 2).
-
-Mon Dec 6 11:47:23 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c (rb_f_sprintf): formatted string must be tainted if
- any of parameters is a tainted string.
-
- * file.c (rb_file_s_expand_path): expanded file path need not to
- be tainted always.
-
-Sun Dec 5 20:25:29 1999 Katsuhiro Ueno <unnie@blue.sky.or.jp>
-
- * eval.c (Init_Proc): simple typo.
-
- * gc.c (add_heap): sizeof(RVALUE*), not sizeof(RVALUE).
-
-Sat Dec 4 01:40:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): adjust startpos for multibyte match unless
- the first pattern is forced byte match.
-
- * bignum.c (rb_big_rand): should not use rand/random where drand48
- may be available. RANDOM_NUMBER should be provided from outside.
-
-Fri Dec 3 09:54:59 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (moreswitches): there may be trailing garbage at #!
- line.
-
- * eval.c (rb_f_require): should check require 'feature.o' too.
-
-Thu Dec 2 11:58:15 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * eval.c (rb_thread_loading): should maintain loading_tbl.
-
-Thu Dec 2 10:21:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_loading_done): wrong parameter to st_delete().
-
-Wed Dec 1 11:24:06 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ruby.c (process_sflag): process -s properly (should not force `--').
-
-Wed Dec 1 09:47:33 1999 Kazunori NISHI <kazunori@swlab.csce.kyushu-u.ac.jp>
-
- * string.c (rb_str_split_method): should increment end too.
-
-Tue Nov 30 18:00:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c: MARSHAL_MINOR incremented; format version is 4.2.
-
- * marshal.c (w_object): distinguish class and module.
-
- * marshal.c (w_object): save hash's default value.
-
- * marshal.c (r_object): restore hash's default value.
-
-Tue Nov 30 01:46:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_source): generated source string must be tainted if
- regex is tainted.
-
- * file.c (rb_file_s_basename): basename should not be tainted
- unless the original path is tainted.
-
- * file.c (rb_file_s_dirname): ditto.
-
-Mon Nov 29 20:42:13 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c (stat_new): Struct::Stat -> File::Stat; Stat is no longer
- a Struct.
-
-Mon Nov 29 15:28:52 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_path2class): evaluated value from path should be
- module or class.
-
-Fri Nov 26 18:12:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_exec_end_proc): should remove only end_procs defined
- within load wrapper.
-
- * eval.c (rb_load): save and restore ruby_wrapper around loading.
-
- * eval.c (rb_mark_end_proc): mark end procs registered by END{} or
- at_exit{}.
-
- * eval.c (rb_set_end_proc): should not call rb_global_variable()
- on heap address; it crashed mod_ruby.
-
-Mon Nov 22 14:07:24 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * ruby.c (proc_options): variable e_script should be visited by
- garbage collector.
-
-Sat Nov 20 10:10:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (inspect_i): value may be nil, check revised.
-
-Fri Nov 19 18:06:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dir.c (glob): recursive wildcard match by `**' ala zsh.
-
-Fri Nov 19 11:44:26 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * variable.c: was returning void value.
-
-Fri Nov 19 03:57:22 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * file.c: add methods Stat struct class to reduce stat(2).
-
-Thu Nov 18 16:18:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/pstore.rb: mutual lock by flock(2).
-
-Thu Nov 18 11:44:13 1999 Masahiro Tomita <tommy@tmtm.org>
-
- * io.c (read_all): should check bytes too.
-
-Wed Nov 17 02:40:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (Init_IO): $defout (alias of $>) added.
-
-Tue Nov 16 09:47:14 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/pstore.rb: add mutual lock using symlink.
-
-Mon Nov 15 16:50:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * enum.c (enum_grep): non matching grep returns an empty array, no
- longer returns nil.
-
- * enum.c (enum_grep): grep with block returns collection of
- evaluated values of block over matched elements.
-
-Mon Nov 15 04:50:33 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * re.c (rb_reg_source): should not call rb_reg_expr_str()
- everytime.
-
-Sat Nov 13 07:34:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_mod_constants): traverse superclasses to collect
- constants.
-
- * eval.c (assign): modified for shared variables.
-
- * eval.c (rb_eval): search nested scope, then superclasses to
- assign shared variables within methods.
-
- * eval.c (rb_eval): remove warnings from constants modification,
- because they are no longer constants.
-
- * parse.y (node_assign): modified for shared variables.
-
- * parse.y (assignable): allow constant assignment in methods;
- constants should be called `shared variable'.
-
-Fri Nov 12 23:52:19 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * process.c (rb_f_system): argument check for NT, __EMX__, DJGPP.
-
-Wed Nov 10 21:54:11 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * hash.c (rb_any_cmp): Fixed return without value.
-
-Wed Nov 10 17:57:06 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c: incorporate <yasuf@big.or.jp>'s sprintf patch at
- [ruby-dev:7754].
-
-Wed Nov 10 08:28:53 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_call0): supply class parameter for each invocation.
-
-Tue Nov 9 13:21:04 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * configure.in: AC_MINIX move to before AC_EXEEXT and AC_OBJEXT.
-
-Mon Nov 8 19:52:29 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * configure.in: Renamed AC_CHAR_UNSIGNED to AC_C_CHAR_UNSIGNED.
-
- * configure.in: Added default to AC_CHECK_SIZEOF().
-
-Mon Nov 8 14:28:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (stmt): rescue modifier added to the syntax.
-
- * keywords: kRESCUE_MOD added.
-
- * eval.c (rb_f_eval): fake outer scope when eval() called without
- bindings.
-
- * eval.c (rb_f_binding): should copy last_class in the outer frame too.
-
-Sun Nov 7 18:31:04 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-
- * eval.c (is_defined): last_class may be 0.
-
-Sat Nov 6 19:26:55 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * Makefile.in: Added depend entry make parse.@OBJEXT@ from parse.c
- for UCB make
-
-Thu Nov 4 17:41:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): \< (wordbeg), \> (wordend) disabled.
-
-Wed Nov 3 08:52:57 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-
- * io.c (Init_IO): forgot to use INT2FIX() around SEEK_SET, etc.
-
-Wed Nov 3 00:25:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_split_method): use mbclen2() to handle kcode
- option of regexp objects.
-
-Mon Nov 1 14:22:15 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * eval.c (rb_eval): reduce recursive calls to rb_eval()
- case of ||= and &&= .
-
-Sun Oct 31 13:12:42 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * regex.c (re_compile_pattern): wrong [\W] match.
-
-Fri Oct 29 16:57:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/nkf/lib/kconv.rb: new String methods (kconv, tojis, toeuc,
- tosjis).
-
- * time.c (time_s_at): now accepts optional second argument to
- specify micro second.
-
-Thu Oct 28 13:35:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_split_method): should be mbchar aware with
- single char separators.
-
-Wed Oct 27 12:57:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * random.c (rb_f_srand): random seed should be unsigned.
-
-Tue Oct 26 23:58:15 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_collect): collect for better performance.
-
-Tue Oct 26 19:20:54 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * marshal.c (r_object): should register class/module objects.
-
-Sat Oct 23 15:59:39 1999 Takaaki Tateishi <ttate@jaist.ac.jp>
-
- * process.c (rb_f_system): should require at least one argument.
-
-Sat Oct 23 12:42:44 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * enum.c (enum_collect): collect without block will collect
- elements in enumerable.
-
-Thu Oct 21 16:14:19 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (moreswitches): function to process string option;
- the name is stolen from perl (not implementation).
-
- * ruby.c (proc_options): use RUBYOPT environment variable to
- retrieve the default options.
-
- * dir.c (fnmatch): use eban's fnmatch; do not depend on system's
- fnmatch (which may have portability problem) anymore.
-
-Wed Oct 20 15:14:24 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (marshal_load): should protect the generated object
- table (arg->data) from GC.
-
-Mon Oct 18 16:15:52 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/nkf/nkf.c (rb_nkf_kconv): output should be NUL terminated.
-
-Mon Oct 18 09:03:01 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb: 1.0.3
-
- * lib/net/pop.rb: new methods POP3Command#uidl, POPMail#uidl.
-
-Sun Oct 17 03:35:33 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-
- * array.c (rb_ary_pop): forgot some freeze checks.
-
-Sat Oct 16 12:57:53 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * array.c (rb_ary_sort): always returns the copied array.
-
-Fri Oct 15 22:50:41 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * error.c (sys_nerr): on CYGWIN, it is _sys_nerr.
-
-Fri Oct 15 01:32:31 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * io.c (rb_io_ctl) :need to use NUM2ULONG, not NUM2INT.
-
- * ext/Win32API/Win32API.c (Win32API_Call): need to use NUM2ULONG,
- not NUM2INT.
-
-Fri Oct 15 00:22:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (Init_Regexp): super class of the MatchingData, which was
- Data, to be Object.
-
- * eval.c (ruby_run): evaluate required libraries before load &
- compiling the script.
-
- * parse.y (lex_getline): retrieve a line from the stream, saving
- lines in the table in debug mode.
-
- * eval.c (call_trace_func): treat the case ruby_sourcefile is null.
-
-Thu Oct 14 02:00:10 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (string): compile time string concatenation.
-
-Wed Oct 13 07:28:09 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb: 1.0.2
-
- * lib/net/session.rb: new method Session#set_pipe.
-
- * lib/net/session.rb, smtp.rb, pop.rb: add RD documentation.
-
-Wed Oct 13 02:17:05 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * array.c (rb_ary_plus): remove recursion.
-
- * array.c (rb_ary_sort_bang): detect modify attempt.
-
-Wed Oct 13 02:17:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (block_pass): should copy block to prevent modifications.
- tag in the structure should be updated from latest prot_tag.
-
- * eval.c (proc_s_new): tag in struct BLOCK should not point into
- unused stack.
-
- * dir.c (dir_s_glob): iterate over generated matching filenames if
- the block is given to the method.
-
- * array.c (rb_ary_at): new methods; at, first, last.
-
- * hash.c (rb_hash_fetch): raises exception unless the default
- value is supplied.
-
- * hash.c (rb_hash_s_create): need not remove nil from value.
-
- * hash.c (rb_hash_aset): setting value to nil does not remove key
- anymore.
-
-Tue Oct 12 22:29:04 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_read): length may be 0 or negative.
-
-Tue Oct 12 13:26:27 1999 Jun-ichiro itojun Hagino <itojun@itojun.org>
-
- * signal.c (posix_signal): RETSIGTYPE may be void.
-
-Tue Oct 12 03:28:03 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * array.c (rb_ary_delete_at): allows negative position.
-
-Mon Oct 11 17:42:25 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (rb_intern): should generate distinct ID_ATTRSET symbols
- for the name with multiple `='s at the end.
-
- * Makefile.in (CPPFLAGS): separate cpp flags from CFLAGS.
-
-Mon Oct 11 07:27:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): should not execute the `else' clause on the
- case the exceptions are handled by the `rescue' clause.
-
- * signal.c (Init_signal): ignore SIGPIPE by default.
-
-Wed Oct 6 17:13:19 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * ruby.c (addpath): rubylib_mangled_path() modified.
-
-Mon Oct 4 12:42:32 1999 Kazuhiko Izawa <izawa@erec.che.tohoku.ac.jp>
-
- * pack.c (pack_unpack): % in printf format should be %%.
-
-Mon Oct 4 10:01:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_obj_instance_variables): should always return
- array for all object can have instance variables now.
-
-Mon Oct 4 00:08:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (OFF16): need to adjust pointer address to pack/unpack on
- 64bit machines.
-
-Sun Oct 3 03:05:59 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * time.c (time_arg): mktime y2k problem.
-
-Sun Sep 26 16:54:45 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * parse.y (here_document): `\r' handling for here documents.
-
-Wed Sep 22 09:20:11 1999 Masahiro Tomita <tommy@tmtm.org>
-
- * ext/socket/socket.c: SOCKS5 support.
-
-Wed Sep 22 07:33:23 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb: 1.0.1
-
- * lib/net/pop.rb: APOP did not work.
-
- * lib/net/pop.rb: modify the way to make APOP challenge.
-
-Wed Sep 22 00:35:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_include): should return boolean value.
-
- * regex.c (re_compile_fastmap): wrong comparison with mbc.
-
- * eval.c (specific_eval): default sourcefile name should be
- "(eval)" for module_eval etc.
-
-Wed Sep 22 00:06:07 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/Makefile: update rules.
-
- * io.c (io_fread): should not assign in char, it maybe -1.
-
-Tue Sep 21 23:57:54 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (call_trace_func): should not propagate retval in
- trace_func.
-
-Mon Sep 20 21:35:39 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/win32.c (myselect): assume non socket files are always
- readable/writable.
-
-Mon Sep 20 01:08:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_fread): should not block other threads.
-
- * io.c (rb_io_synchronized): renamed from rb_io_unbuffered(); do
- not call setbuf(NULL) anymore.
-
-Sat Sep 18 13:45:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * stable version 1.4.2 released.
-
-Fri Sep 17 23:24:17 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * eval.c (rb_f_missing): dumped core if no argument given.
-
-Fri Sep 17 23:21:06 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * win32/win32.c (myselect): translate WSAEINTR, WSAENOTSOCK into
- UNIX errno constants.
-
-Fri Sep 17 00:52:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (arg): assignable() may return 0.
-
-Thu Sep 16 20:46:23 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * eval.c (rb_eval): was doubly evaluating the return expression.
-
-Thu Sep 16 18:40:08 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * stable version 1.4.1 released.
-
-Thu Sep 16 11:33:22 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * string.c (rb_str_match): should return nil.
-
-Wed Sep 15 22:46:37 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_s_quote): should quote `-' too.
-
-Tue Sep 14 15:23:22 1999 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
-
- * parse.y (yylex): no need to ignore `\r' here.
-
- * parse.y (nextc): strip `\r' from text.
-
- * parse.y (nextc): support `__END__\r\n' type terminator.
-
-Mon Sep 13 10:49:19 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * eval.c (rb_eval): needless RTEST(ruby_verbose) removed.
-
-Mon Sep 13 09:10:11 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/net/session.rb, smtp.rb, pop.rb: 1.0.0
-
-Wed Sep 8 11:37:38 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * time.c (make_time_t): bit more strict comparison.
-
-Tue Sep 7 00:50:56 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * range.c (range_each): use rb_str_upto() for strings.
-
- * string.c (rb_str_upto): set upper limit by comparing curr <= end.
-
- * range.c (range_each): should check equality to handle magic
- increment.
-
-Mon Sep 6 22:43:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): break/next/redo available within -n/-p loop.
-
-Fri Sep 3 11:14:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * compar.c (cmp_equal): should not raise exception; protect by
- rb_rescue().
-
-Thu Sep 2 05:23:05 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * file.c (rb_file_s_expand_path): use dirsep, instead of character
- literal '/'.
-
- * file.c (rb_file_s_expand_path): reduce multiple dirsep at the top.
-
-Wed Sep 1 00:28:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_call): call rb_undefined() if a method appears not to
- be exist explicitly from cache.
-
- * eval.c (rb_method_boundp): check method cache before calling
- rb_get_method_body().
-
- * eval.c (rb_get_method_body): store method non-existence
- information in the cache.
-
- * random.c (rb_f_srand): use getpid(2) to generate seed.
-
- * regex.c (re_match): do not apply partial mbc match for
- charset_not.
-
- * regex.c (re_compile_pattern): put extended literal prefix (0xff)
- only before numeric literals, not before all >0x80 char.
-
- * regex.c (re_compile_pattern): put numeric literal in extended
- charset region, not normal charset bits.
-
- * regex.c (re_compile_fastmap): calculate fastmap for charset and
- charset_not to treat numeric literal (e.g. \246) specially.
-
-Fri Aug 28 17:32:55 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-
- * eval.c (rb_eval): should set return value (nil) explicitly if a
- value is omitted for return statement.
-
-Sun Aug 26 20:26:40 2001 Koji Arai <JCA02266@nifty.ne.jp>
-
- * ext/readline/readline.c: restore terminal mode
- even if readline() interrupted.
-
- * ext/readline/readline.c: returned string need to
- be tainted.
-
- * ext/readline/readline.c: fixed memory leak.
-
- * ext/readline/readline.c: allow negative index.
-
- * ext/readline/readline.c: added Readline::HISTORY.size
- same as Readline::HISTORY.length
-
- * ext/readline/readline.c: allow conditional parsing
- of the ~/.inputrc file by `$if Ruby'.
-
- * ext/readline/extconf.rb: check whether the
- libreadline has the variable `rl_completion_append_character'
- (this feature was implemented from GNU readline 2.1).
-
-Thu Aug 26 15:06:11 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-
- * gc.c (rb_gc): local variables may be placed beyond stack_end, so
- use an address from alloca(1) on non C_ALLOCA platforms.
-
-Thu Aug 26 01:24:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c (rb_f_sprintf): "%%" is legal, but "%3.14%" is not.
-
-Mon Aug 23 00:00:54 1999 Tsukada Takuya <tsukada@fminn.nagano.nagano.jp>
-
- * regex.c (re_compile_fastmap): wrong macro caused memory leak.
-
-Sat Aug 21 11:30:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (ADJ): should not adjust addresses to data on heap.
-
-Fri Aug 20 20:50:58 1999 Kenji Nagasawa <kenn@hma.att.ne.jp>
-
- * defines.h (PATH_SEP): path separator is ";" for OS/2.
-
-Thu Aug 19 10:50:43 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * gc.c (rb_gc): add volatile to avoid GCC optimize bug(?).
-
-Wed Aug 18 23:48:10 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * due to disk trouble, some change records were lost. several
- modification made to eval.c, gc.c, io.c, pack.c,
- ext/extmk.rb.in, and lib/mkmf.rb.
-
-Fri Aug 13 15:41:39 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * stable version 1.4.0 released.
-
-Fri Aug 13 03:16:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (argf_forward): since $stdout may be non-IO, ARGF.file is
- not guaranteed to be IO. check and forwarding added to every ARGF
- method.
-
- * io.c (set_outfile): $stdout/$stderr may not be IO now.
-
- * io.c (set_stdin): $stdin may not be IO now.
-
- * range.c (rb_range_beg_len): round `end' to length as documented.
-
- * io.c (Init_IO): preserve original stdin/stdout/stderr.
-
-Thu Aug 12 13:44:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (Init_load): require receives 1 argument.
-
- * eval.c (frame_dup): should clear tmp to avoid dangling
- references.
-
-Wed Aug 11 13:33:13 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * eval.c (rb_eval): no automatic aggregate initialization.
-
- * eval.c (module_setup): ditto.
-
-Wed Aug 11 18:18:41 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * eval.c (yield_under_i): automatic aggregate initialization is an
- ANSI feature.
-
-Wed Aug 11 10:10:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): parse `[].length==0' as `([].length)==0', not
- `([].length=)=0'
-
- * parse.y (yylex): parse `[].length!=0' as `([].length)!=0', not
- `([].length!)=0'
-
- * parse.y (peek): peek-in lexical buffer.
-
-Wed Aug 11 00:34:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): bug on backward jump adjustment concerning
- stop_paren.
-
-Tue Aug 10 14:54:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/nkf/nkf.c (rb_nkf_guess): binary detection was wrong.
-
-Tue Aug 10 00:07:36 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_clone): should use CLONESETUP().
-
-Mon Aug 9 23:57:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.h (CLONESETUP): should have copied generic instance
- variables too.
-
-Mon Aug 9 10:46:54 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/extconf.rb: add check for <arpa/nameser.h> and
- <resolv.h>.
-
-Sat Aug 7 13:19:06 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * numeric.c (flo_cmp): comparing NaN should not return value.
- raises FloatDomainError.
-
-Sat Aug 7 03:09:08 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (blk_free): free copied frames too.
-
- * eval.c (frame_dup): should copy previous frames from stack to
- heap to preserve frame information.
-
-Fri Aug 6 15:01:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.3.7 - version 1.4 beta
-
- * ext/socket/socket.c (s_recv): UDPsocket#recvfrom now returns
- IPsocket#addr information.
-
- * array.c (rb_ary_subary): ary[-3,3] should not return nil.
-
-Thu Aug 5 10:58:01 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thread_mark): protect old ruby_frame from GC during it
- replaced by eval().
-
- * eval.c (eval): do not modify frame.prev; binding should preserve
- information about calling() too.
-
- * eval.c (rb_yield_0): no arity check for mere yield; but only for
- Proc#call.
-
-Tue Aug 3 22:07:13 1999 Kazuhiro HIWADA <hiwada@kuee.kyoto-u.ac.jp>
-
- * object.c (rb_mod_clone): should check if iv_tbl, m_tbl are
- initialized.
-
-Tue Aug 3 19:03:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (rb_any_cmp): use rb_with_disable_interrupt() to ensure
- clearance of rb_prohibit_interrupt even on failure.
-
- * eval.c (rb_with_disable_interrupt): new function added.
-
-Sat Jul 31 23:23:44 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_create_0): set THREAD_RAISED flag on thread
- termination by exception.
-
- * eval.c (rb_thread_join): `$!' may not be nil for the threads
- created in rescue clause.
-
- * eval.c (rb_thread_status): ditto.
-
- * eval.c (rb_thread_join): should re-raise exception for already
- dead threads too.
-
-Fri Jul 30 17:56:54 1999 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
-
- * object.c (rb_mod_ge): wrong comparison.
-
-Fri Jul 30 12:15:44 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/tcltklib/extconf.rb: win32 support.
-
- * lib/mkmf.rb: use append_library().
-
- * ext/extmk.rb.in: ditto.
-
-Fri Jul 30 02:11:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_delete): should return nil for deleting non
- existing item.
-
- * io.c (rb_io_close): call rb_sys_wait() on explicit close.
-
- * io.c (rb_io_fptr_close): do not call rb_sys_wait() on finalize.
-
- * eval.c (yield_under_i): cbase context should be maintained for
- Module#module_eval(). suggested by <inaba@st.rim.or.jp>.
-
-Wed Jul 28 01:18:28 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * Makefile.in: add -I$(hdrdir)/lib to install using ftools.
-
- * util.c: use HAVE_FCNTL_H, not HAVE_FCNTL
-
-Wed Jul 28 18:24:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.3.6 - version 1.4 alpha
-
-Tue Jul 27 09:38:08 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * eval.c (rb_eval): reduce recursive rb_eval() calls by
- NODE_BLOCKs.
-
-Tue Jul 27 01:20:40 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * file.c (rb_file_s_expand_path): drive letter patch.
-
-Mon Jul 26 02:36:31 1999 Shugo Maeda <shugo@netlab.co.jp>
-
- * eval.c (rb_load): should clear ruby_nerr.
-
- * eval.c (rb_thread_join): oldbt should not be empty to unshift.
-
-Sun Jul 25 12:09:16 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * dir.c (push_braces): should treat nested braces.
-
-Fri Jul 23 02:49:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (rb_hash_clear): dummy argument added; suggested by
- <eguchi@shizuokanet.ne.jp>. thanks.
-
-Thu Jul 22 19:37:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_join): get_backtrace() may return Qnil.
- typecheck added.
-
-Tue Jul 20 14:36:43 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * range.c (range_each): do not treat String specially (for future
- override).
-
-Tue Jul 20 02:28:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_gets): $_ should be nil, when get returns nil.
-
- * io.c (rb_f_gets): ditto.
-
-Mon Jul 19 17:13:09 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_fastmap): should continue fastmap compile
- for anychar_repeat, for it's repeat anyway.
-
-Mon Jul 26 13:33:45 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * lib/jcode.rb: replaced by faster code.
-
-Mon Jul 19 01:57:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/mkmf.rb: no longer use install program.
-
- * ext/extmk.rb.in: use miniruby to install programs.
-
-Sat Jul 17 00:06:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (ipaddr): don't do reverse lookup if
- attribute do_not_reverse_lookup is set for socket classes.
- Experimental. Note this is a global attribute.
-
-Fri Jul 16 22:18:29 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_eof): use feof() to check EOF already met.
-
- * io.c (read_all): should return nil at EOF.
-
-Fri Jul 16 13:39:42 1999 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/telnet.rb: version 0.231.
-
-Fri Jul 16 10:58:22 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * regex.c (re_match): debug print removed.
-
-Fri Jul 16 09:58:15 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * many files: clean up unused variables found by gcc -Wall.
-
- * lib/mkmf.rb: better cygwin support etc.
-
- * ext/extmk.rb.in: ditto.
-
- * instruby.rb: ditto.
-
-Fri Jul 16 01:37:50 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * string.c (rb_str_squeeze_bang): the type of local variable `c'
- should be int, not char.
-
- * string.c (rb_str_reverse): should always return copy.
-
-Thu Jul 15 23:25:57 1999 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
-
- * lib/debug.rb: better display & frame treatment.
-
-Thu Jul 15 21:16:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_each): returns self for normal termination;
- returns nil for break.
-
- * string.c: non bang methods (e.g. String#sub) should always
- return copy of the receiver.
-
-Thu Jul 15 21:09:15 1999 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-
- * eval.c (find_file): do not add empty string to the path.
-
- * configure.in (with-search-path): should not add empty string if
- the option is not supplied.
-
-Thu Jul 15 17:49:08 1999 Ryo HAYASAKA <hayasaka@univ21.u-aizu.ac.jp>
-
- * ext/tcltklib/tcltklib.c: move `#include "ruby.h"' forward.
-
-Thu Jul 15 16:54:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.3.5 - version 1.4 alpha
-
-Wed Jul 14 23:45:33 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * eval.c (ruby_init): initialize for the first time only.
-
-Tue Jul 13 00:15:19 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (rb_hash_index): re-defined; method to retrieve a key
- from the value.
-
- * hash.c (Init_Hash): member? should be re-defined for Hash.
-
-Tue Jul 12 13:54:51 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * io.c (rb_file_sysopen): wrong number of argument.
-
-Mon Jul 12 11:52:35 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_f_missing): class name included in message.
-
- * eval.c (print_undef): better error message.
-
-Sun Jul 11 05:36:17 1999 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
-
- * lib/debug.rb: patch to show proper position.
-
-Fri Jul 9 23:56:14 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * dln.c (dln_find_1): path conv. moved to conv_to_posix_path.
-
- * dln.c (conv_to_posix_path): path conv. should be done.
-
-Fri Jul 9 10:26:47 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * random.c (RANDOM_NUMBER): should place parentheses.
-
-Fri Jul 8 11:00:51 1999 Shugo Maeda <shugo@netlab.co.jp>
-
- * numeric.c (fix_div): division may be out of fixnum range.
-
- * bignum.c (bigdivmod): proper sign calculation to result.
-
-Wed Jul 7 18:27:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * st.c (st_delete_safe): was modifying wrong slot.
-
-Mon Jul 5 13:17:46 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (rb_gc_call_finalizer_at_exit): close all files at exit.
-
-Fri Jul 2 18:00:21 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * lib/Mail/README: Mail-0.3.0 added to the distribution.
-
-Fri Jul 2 01:45:32 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_fastmap): avoid allocation of register
- variables for each invocation of re_match(). Suggested by
- Zasukhin Ruslan <ruslan@paradigmasoft.com>. Thanks.
-
-Tue Jun 29 20:39:24 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * ext/tk/lib/tk.rb (TkVariable): bug fix; should value type check
- be added?
-
- * string.c (rb_str_each_line): a bug in paragraph mode.
-
- * ruby.c (load_file): shifted too much to skip #!.
-
-Tue Jun 29 06:50:21 1999 Wakou Aoyama <wakou@fsinet.or.jp>
-
- * lib/CGI.rb: 0.30 - cleanup release, incompatible.
-
- * lib/telnet.rb: 0.22 - timeout added.
-
-Tue Jun 29 10:49:25 1999 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
- * configure.in: better Rhapsody support.
-
- * lib/mkmf.rb: Rhapsody/NEXTSTEP support.
-
-Tue Jun 29 01:42:13 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/pty/pty.c (chld_changed): should use POSIX.1 style wait.
-
-Mon Jun 28 21:07:36 1999 KIMURA Koichi <kbk@kt.rim.or.jp>
-
- * ext/extmk.rb.nt: wrong result for have_library().
-
-Mon Jun 28 15:24:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * missing/isinf.c: OSF/1 raises SIGFPE on one()/zero().
-
- * regex.c (re_search): should search til EOS, for patterns may
- match beyond the end of range.
-
-Mon Jun 28 12:49:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_f_select): should not accept Time objects as an
- argument for it is time interval.
-
- * process.c (rb_f_sleep): ditto.
-
- * file.c (test_s): should return nil for false condition.
-
-Mon Jun 28 12:23:52 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * bignum.c (rb_dbl2big): typo.
-
- * file.c (rb_f_test): ditto.
-
- * string.c (rb_str_crypt): wrong message.
-
-Sun Jun 27 19:50:11 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * eval.c (rb_f_exit): should have treat signed integer status, not
- VALUE.
-
- * process.c (rb_f_exit_bang): should work like exit().
-
-Sun Jun 27 16:21:32 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * string.c (rb_str_rindex): wrong position to search.
-
-Sat Jun 26 04:05:30 1999 Takaaki Tateishi <ttate@jaist.ac.jp>
-
- * configure.in (configure_args): --with-search-path to specify
- additional ruby search path.
-
- * ruby.c (ruby_prog_init): additional search path.
-
-Fri Jun 25 13:09:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (pack_unpack): needed to initialize natint.
-
- * regex.c (re_compile_pattern): add start_paren to avoid too much
- finalization on maybe_finalize_jump.
-
-Fri Jun 25 13:07:20 1999 Koji Oda <oda@bsd1.qnes.nec.co.jp>
-
- * missing/isinf.c: include "config.h" added.
-
-Fri Jun 25 07:25:05 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * lib/mkmf.rb: initialize $(topdir).
-
- * ext/extmk.rb.in (install_rb): install lib/*.rb properly.
-
- * configure.in (linux): specifies -rpath on --enable-shared.
-
- * configure.in (aix): ruby.imp must reside in $(topdir).
-
-Thu Jun 24 19:11:29 1999 Yoshida Masato <yoshidam@yoshidam.net>
-
- * parse.y (rb_str_extend): multi-byte identifier in expression
- interpolation in strings.
-
- * parse.y (yylex): support multi-byte char identifiers.
-
-Thu Jun 24 15:27:13 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (f_arg): check duplicate argument names.
-
- * gc.c (rb_gc_mark): marking wrong member for NODE_ARGS.
-
- * string.c (rb_str_rindex): POSITION specifies start point, not
- end point.
-
-Thu Jun 24 13:00:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (print_mbc): wrong boundary.
-
- * pack.c (uv_to_utf8): raises ArgError for too big value.
-
-Thu Jun 24 11:02:51 1999 Yoshida Masato <yoshidam@yoshidam.net>
-
- * pack.c (uv_to_utf8): mask needed.
-
-Wed Jun 23 21:03:56 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * ruby.h (struct RFile): remove iv_tbl from struct. instance
- variables are handled as generic ivs.
-
-Wed Jun 23 22:06:26 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * pack.c (utf8_to_uv): pack to 7 bytes sequence.
-
- * pack.c (uv_to_utf8): wrong boundary.
-
- * pack.c (pack_unpack): should treat as unsigned long.
-
-Wed Jun 23 15:10:11 1999 Inaba Hiroto <inaba@sdd.tokyo-sc.toshiba.co.jp>
-
- * parse.y (parse_string): failed to parse nested braces.
-
- * parse.y (parse_regx): nested braces within #{} available.
-
-Wed Jun 23 11:18:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (slow_search): wrong shift width for mbcs.
-
- * eval.c (rb_thread_save_context): should not clear th->locals.
-
-Wed Jun 23 02:06:14 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): UMINUS binds too tight with digits. changed so
- that -2**2 => -4.
-
- * parse.y (close_paren): `do' for expr termination now works it
- used to be.
-
-Wed Jun 22 18:26:42 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * pack.c (pack_pack): should initialize local variable `j'.
-
-Wed Jun 22 15:24:59 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * parse.y (here_document): a bug for multiline heredoc.
-
-Tue Jun 22 15:06:36 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/socket/socket.c (ruby_socket): forgot to return fd
- explicitly.
-
-Tue Jun 22 13:34:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * rubyio.h (MakeOpenFile): should initialize member `iv_tbl'.
-
-Wed Jun 22 10:35:51 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * io.c (rb_io_gets_internal): getc(3) may not set errno on
- interrupt.
-
-Mon Jun 21 22:39:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (call_required_libraries): ruby_sourceline should be
- cleared before loading libraries.
-
- * io.c (set_stdin): do not use reopen(), so that we don't need to
- dup original stdin before assigning $stdin.
-
-Mon Jun 21 18:04:27 1999 Ryo HAYASAKA <hayasaka@univ21.u-aizu.ac.jp>
-
- * ext/dbm/dbm.c: include <cdefs.h> for solaris 2.6.
-
-Mon Jun 21 15:59:47 1999 Nobuyoshi Nakada <nobu.nokada@softhome.net>
-
- * ext/socket/socket.c (ip_addrsetup): forgot to put `else'.
-
-Mon Jun 21 15:38:37 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (fptr_finalize): remove rb_syswait() invocation to avoid
- wait4(2) within GC. rb_syswait() moved to rb_io_fptr_close().
-
-Mon Jun 21 12:05:59 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * dir.c (dir_s_glob): remove MAXPATHLEN restriction.
-
- * ext/md5/md5init.c (md5_hexdigest): should have used "%02x".
-
-Sun Jun 20 19:50:38 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * string.c (rb_str_each_line): should have checked string
- boundary.
-
-Sat Jun 19 22:24:12 1999 Kenji Nagasawa <kenn@hma.att.ne.jp>
-
- * OS/2 patch improved.
-
-Fri Jun 18 08:30:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (r_byte): add data length check.
-
- * ext/tcltklib/tcltklib.c (_timer_for_tcl): was doing busy-wait.
-
-Tue Jun 15 10:01:21 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * configure.in: remove trailing slash from interpreter embedded
- shared library path.
-
- * configure.in (INSTALL_DLLIB): install shared lib with 0555.
-
- * instruby.rb: changed mode for shared library into 0555.
-
-Fri Jun 11 23:27:00 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * ext/etc/etc.c (etc_passwd): should return nil, not exception for
- call after last passwd entry.
-
-Fri Jun 11 15:21:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (rb_gc_mark_locations): add safety margin 1.
-
- * eval.c (ruby_run): should protect toplevel node tree.
-
- * ext/etc/etc.c (etc_group): dumps core if there's no more group.
-
-Fri Jun 11 01:50:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (ruby_run): Init_stack() was called too late; local
- variables happened to be higher (or lower) than stack_start.
-
-Thu Jun 10 16:41:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c: do not call `initialize' for IO objects. So with Array,
- Hash, Range, and Time objects.
-
- * ext/curses/curses.c (curses_getch): made thread aware using
- rb_read_check().
-
- * ext/curses/curses.c (window_getch): ditto.
-
- * ext/curses/curses.c (curses_getstr): made (partially) thread
- aware using rb_read_check().
-
- * ext/curses/curses.c (window_getstr): ditto.
-
- * io.c (rb_read_check): new function to help making something
- (like extension libraries) thread aware.
-
- * eval.c (is_defined): `defined? super' should be true even for
- private superclass methods.
-
-Fri Jun 10 13:42:10 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * pack.c (pack_pack): template `Z' should be allowed.
-
-Wed Jun 9 13:26:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_loading): modified to avoid nested race
- condition of require().
-
- * ext/tcltklib/tcltklib.c (ip_invoke): queue invocation on non
- main threads.
-
- * ext/tcltklib/tcltklib.c (lib_mainloop): flush invocation
- queues periodically.
-
- * version.c (ruby_show_version): now print the message to stdout.
-
- * version.c (ruby_show_copyright): ditto.
-
-Tue Jun 8 00:00:34 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (pack_unpack): append sentinel (NUL) to the string.
-
- * ext/md5/md5init.c (md5_hexdigest): new method to obtain
- printable hash string.
-
- * ext/md5/md5init.c (md5_update): should return self.
-
- * pack.c (pack_pack): undocumented template 'U' for UTF8.
-
- * pack.c (pack_unpack): ditto.
-
- * marshal.c (r_byte): should replace getc() with rb_getc().
-
- * io.c (rb_getc): getc() replacement uses READ_DATA_PENDING() and
- rb_thread_wait_fd().
-
-Mon Jun 7 23:23:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (rb_mod_clone): should call CLOSESETUP().
-
- * eval.c (bind_clone): should call CLONESETUP() for new clone.
-
-Sat Jun 5 10:32:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_oct): binary (e.g. 0b10111) support.
-
- * variable.c (rb_const_set): raise warning, not exception.
-
- * parse.y (yycompile): initialize parser internal variables.
-
- * parse.y (close_paren): set lex_state to EXPR_PAREN after closing
- parenthesis.
-
- * parse.y (yylex): returns kDO for `do' right after method_call.
-
-Thu Jun 3 11:05:30 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * regex.c (read_backslash): should decode \b within class.
-
-Thu Jun 3 01:06:18 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * dln.c (dln_load): AIX improvement (aix_findmain removed).
-
-Wed Jun 2 00:41:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (pack_unpack): new undocumented template Z which strips
- stuff after first null.
-
- * pack.c (pack_pack): should preserve specified length of the
- resulting string.
-
-Tue Jun 1 15:29:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (ruby_socket): retry after GC, if socket(2)
- failed on EMFILE or ENFILE.
-
- * ext/socket/socket.c (sock_s_socketpair): ditto.
-
- * eval.c (module_setup): need to add PUSH_VAR/POP_VAR to clear
- dyna vars link list.
-
- * version.h (RUBY_RELEASE_CODE): integer macro constant for source
- version detection.
-
-Sun May 30 22:19:12 1999 Kenji Nagasawa <kenn@tcp-ip.or.jp>
-
- * ext/socket/socket.c: emx/gcc 0.9d now fixes things about
- AF_UNIX.
-
- * process.c: OS/2 EMX kludge.
-
- * Makefile.in (strncasecmp.o): added dependency.
-
-Mon May 31 16:06:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.3.4 - preliminary release for 1.4
-
-Mon May 31 15:57:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_fptr_close): close on IO which main_thread is
- waiting cause serious exception, that vanishes the actual fd
- closing. Invocation of rb_thread_fd_close() is deferred
- a little.
-
-Sat May 29 18:27:13 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * regex.c (re_match): stack boundary check needed.
-
-Sat May 29 12:27:00 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/tcltklib/tcltklib.c (ip_invoke): proper ref count management
- to avoid leak. I HATE REF COUNTING!!
-
- * eval.c (ruby_run): moved ruby_require_libraries() to handle `-r'
- from ruby_options() to avoid stack corruption for threads
- created in libraries.
-
-Sat May 29 02:22:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_yield_0): when `for' appeared in blocks, it
- introduced new scope for local variables.
-
-Fri May 28 17:16:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_squeeze_bang): squeeze AND of the arguments.
- UNDOCUMENTED.
-
- * string.c (rb_str_count): new UNDOCUMENTED method.
-
- * string.c (rb_str_delete_bang): delete AND of the arg ranges.
- UNDOCUMENTED FEATURE for 1.3.x.
-
- * ext/socket/socket.c (setipaddr): re-wrote using ip_addrsetup().
-
- * ext/socket/socket.c (ip_addrsetup): decode symbolic address
- <broadcast>.
-
-Thu May 27 12:27:42 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (tr_trans): should handle NUL (\0) within strings.
-
-Tue May 25 16:45:11 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_f_syscall): syscall may return values other than zero
- on success.
-
- * regex.c (re_match): handle empty loop properly (hopefully).
-
- * regex.c (re_match): remove empty group check, because it does
- not help non-grouping parentheses (?:..).
-
- * regex.c (re_compile_fastmap): treating try_next, finalize_push
- wrong way.
-
- * regex.c: remove some obsolete functions such as
- group_match_null_string_p().
-
-Mon May 24 14:47:54 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (read_backslash): read backslash by regex.
-
-Sun May 23 19:44:58 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ext/pty/pty.c (getDevice): portability patch.
-
-Fri May 21 23:01:26 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/getaddrinfo.c (GET_AI): should set error code.
-
-Thu May 20 03:43:44 1999 Jun-ichiro itojun Hagino <itojun@itojun.org>
-
- * ext/socket/socket.c: you should use sockaddr_storage to handle
- IPv6 addresses.
-
- * ext/socket/getaddrinfo.c (getaddrinfo): prevent retrieving
- AF_INET6 address if hints.ai_flags == AI_PASSIVE.
-
-Wed May 19 12:27:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (exec_end_proc): should protect exceptions.
-
- * gc.c (run_final): ditto.
-
- * parse.y (f_rest_arg): allow just * for rest arg.
-
- * parse.y (mlhs_basic): allow * without formal argument.
-
- * regex.c (re_match): the variable `part' should be initialized.
-
-Tue May 18 15:25:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): a bug in range adjustment.
-
-Tue May 18 11:35:59 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * dln.c (conv_to_posix_path): path_len argument added.
-
-Mon May 17 12:26:31 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (fix_rev): should treat Fixnum as signed long.
-
- * eval.c (massign): add strict number check for yield (and call).
-
- * eval.c (proc_arity): new method to return number of arguments.
-
- * eval.c (method_arity): new method to return number of arguments.
-
- * parse.y (read_escape): char may be unsigned.
-
- * string.c (rb_str_succ): ditto.
-
- * string.c (tr_trans): ditto.
-
- * object.c (Init_Object): methods `&', `|', `^' are added to nil.
-
- * range.c (rb_range_beg_len): it should be OK for [0..-len-1].
-
- * regex.c (re_search): search for byte literal within mbcs.
-
- * regex.c (is_in_list): parsh
-
- * regex.c (re_compile_fastmap): should have not alter the loop
- variable `j' if TRASLATE_P().
-
- * regex.c (re_compile_pattern): escaped characters should be read
- by PATFETCH_RAW(c).
-
-Sat May 15 11:23:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): endline2 (\Z) should not match at the point
- between a newline and end-of-line, like endline ($).
-
- * class.c (include_class_new): should initialize iv_tbl to share
- between module and iclass.
-
-Fri May 14 08:50:27 1999 Akira Endo <akendo@t3.rim.or.jp>
-
- * regex.c (re_compile_fastmap): it should be k != 0 to skip.
-
-Fri May 14 12:46:56 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_load): a bug in old marshal format support.
-
- * instruby.rb: make site_ruby directory.
-
-Fri May 14 10:18:02 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * regex.c (re_match): a bug in inline `.*' etc.
-
-Fri May 14 09:58:46 1999 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
-
- * ruby.c (addpath): should have specified string length.
-
-Thu May 13 10:40:44 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval_string_wrap): new function.
-
- * regex.c (re_compile_pattern): POSIX line match should alter
- behavior for `^' and `$' to begbuf and endbuf2 respectively.
-
- * ext/pty/pty.c: un-ANSI-fy function arguments.
-
-Wed May 12 14:19:38 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * struct.c (iv_get): in case of inheritance of generated struct
- class, __member__ and __size__ should also be inherited.
- Thanks for Pros Yeboah <yeboah@tu-harburg.de>.
-
- * io.c (rb_f_gets_internal): should check number of arguments
- before checking rb_rs == rb_default_rs. Thanks for Koji Arai
- <JCA02266@nifty.ne.jp>.
-
-Tue May 11 08:29:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): .?, .+ did not work.
-
-Mon May 10 00:59:33 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/jcode.rb: forgot to squeeze on reverse (complement) case.
-
- * string.c (tr_squeeze): should not set modify flag to be honest,
- if the string is not modified.
-
- * signal.c (Init_signal): SIGTERM should not be handled.
-
- * regex.c (re_match): seeking for longest match is now optional,
- which can be set using RE_OPTION_POSIXMATCH. This satisfies
- POSIX longest match as much as Emacs's posix-* functions, which
- are known to be incomplete.
-
-Sun May 9 13:04:01 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/socket.c (sock_s_getaddrinfo): conversion from
- Fixnums to C integers needed.
-
-Sun May 9 11:51:43 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * range.c (range_eqq): reverse condition.
-
- * range.c (range_s_new): default should be end inclusive.
-
-Sat May 8 03:27:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (thread_connect): replace nasty
- rb_thread_fd_writable() with rb_thread_select().
-
-Fri May 7 20:49:00 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * ext/socket/getaddrinfo.c (inet_pton): wrong parameter to
- inet_aton().
-
- * ext/socket/addrinfo.h (__P): silly cut and paste typo.
-
-Fri May 7 17:03:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * dir.c (glob): removed GPL'ed glob.c completely.
-
-Fri May 7 08:17:19 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/sdbm/extconf.rb: sdbm extension added to the distribution.
-
-Fri May 7 01:42:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (tcp_s_gethostbyname): avoid using struct
- sockaddr_storage.
-
-Thu May 6 13:21:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_indexes): should not use rb_ary_concat().
-
-Thu May 4 12:34:18 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * parse.y (parse_string): there should be newline escape by
- backslashes in strings.
-
- * parse.y (parse_qstring): ditto.
-
-Mon May 3 04:37:20 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * ext/tcltklib/extconf.rb: better search for libX11.
-
- * range.c (range_s_new): embarrassing =/== typo.
-
- * re.c (Init_Regexp): failed to set default kcode.
-
-Mon May 3 02:39:55 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * ext/socket/socket.c (open_inet): typo (res and res0).
-
-Tue May 4 02:07:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * mkconfig.rb: leave undefined $(VARIABLE) unexpanded in the
- Config::CONFIG hash table.
-
-Mon May 3 09:37:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): expand exactn{n} at compile time.
- handles stop_paren specially.
-
- * regex.c (re_compile_pattern): expand x{n} at compile time.
-
- * regex.c (re_search): posix line match should be checked.
-
- * regex.c (re_search): a bug in anchor condition.
-
-Fri Apr 30 18:57:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.3.3
-
- * string.c (rb_str_rindex): position should be END point, not
- START point.
-
- * re.c (rb_reg_search): pos means end point on reverse now.
-
- * array.c (rb_ary_s_create): should clear ary->ptr to avoid
- potential gc crash.
-
-Fri Apr 30 15:24:58 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/addrinfo.h: compatibility hack for ipv4.
-
- * ext/socket/socket.c: itojun's ipv6 patches applied.
-
- * ext/socket/extconf.rb: detect ipv6 features based on itojun's
- ipv6 patches.
-
- * ext/extmk.rb.in (enable_config): can handle --enable-xxx now.
-
- * lib/mkmf.rb (enable_config): ditto.
-
-Fri Apr 30 05:22:23 1999 Shugo Maeda <shugo@netlab.co.jp>
-
- * string.c (rb_str_aset): last index should not append.
-
-Thu Apr 29 18:55:31 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * dln.c (conv_to_posix_path): remove const from args.
-
- * ruby.c (rubylib_mangle): remove Fatal(), the obsolete function.
-
-Tue Apr 27 14:11:45 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (fname): lazy workaround for keywords did not work well.
-
- * ext/extmk.rb.in: `--with-xxx=yyy' argument configuration.
-
- * lib/mkmf.rb: ditto.
-
- * misc/ruby-mode.el: forgot to handle $`.
-
- * ext/extmk.rb.in: better AIX link support proposed by
- <komatsu@sarion.co.jp>.
-
-Mon Apr 26 16:46:59 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/extmk.rb.in: AIX shared library support modified.
-
- * ext/aix_mksym.rb: ditto.
-
- * configure.in: ditto.
-
- * sprintf.c (rb_f_sprintf): should allocate proper sized buffer
- for float numbers.
-
-Sat Apr 24 00:00:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (operation): syntax like `a.[]=(1,2)' is allowed.
-
-Fri Apr 23 23:54:09 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (argf_binmode): binmode method added to ARGF.
-
-Fri Apr 23 13:55:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_f_chomp): should assign the result to $_. or maybe
- sub/gsub/chop/chomp should NOT assign $_ altogether.
-
-Thu Apr 22 16:50:54 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_callcc): call scope_dup() for all scopes in
- the interpreter stack.
-
-Tue Apr 20 11:24:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_dump): `#' should be escaped.
-
-Tue Apr 20 02:32:42 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (parse_regx): option /p for posix match added.
-
- * re.c (rb_reg_desc): did not print options properly.
-
- * io.c (rb_file_s_open): initialize was called twice.
-
-Mon Apr 19 18:56:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * configure.in (DEFAULT_KCODE): can specify default code for
- $KCODE by --with-default-kcode=(euc|sjis|utf8|none).
-
- * regex.c (IS_A_LETTER): a byte sequence shorter than mbc should
- not match with \w etc.
-
-Mon Apr 19 13:49:11 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (eval): should restore ruby_dyna_vars.
-
-Fri Apr 16 21:40:43 1999 Nobuyoshi Nakada <gea02117@nifty.ne.jp>
-
- * io.c (f_backquote): pipe_open may return nil.
-
- * io.c (f_open): rb_io_open may return nil.
-
- * io.c (io_s_foreach): ditto.
-
- * io.c (io_s_readlines): ditto.
-
- * io.c (io_defset): wrong message.
-
-Fri Apr 16 15:09:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (rb_str2inum): strtoul() returns long, not int.
-
- * eval.c (rb_load): size of VALUE and ID may be different.
-
- * util.c (mmprepare): int is too small to cast from pointers.
-
- * config.guess: avoid 'linux-gnu' for alpha-unknown-linux.
-
-Thu Apr 15 23:46:20 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ruby.c (rubylib_mangle): mangle path by RUBYLIB_PREFIX.
-
-Wed Apr 14 23:52:51 1999 SHIROYAMA Takayuki <psi@fortune.nest.or.jp>
-
- * node.h (NODE_LMASK): should be long to avoid overflow.
-
-Wed Apr 14 13:14:35 1999 Katsuyuki Komatsu <komatsu@sarion.co.jp>
-
- * dln.c: AIX dynamic link.
-
- * ext/aix_ld.rb: ditto.
-
-Wed Apr 14 12:19:09 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/thread.rb: Queue#{enq,deq} added.
-
-Tue Apr 13 17:43:56 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (rb_hash_s_create): Hash::[] acts more like casting.
-
-Tue Apr 13 00:33:52 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_stdio_set): warning for assignment to the variables
- $std{in,out,err}.
-
-Mon Apr 12 23:12:32 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_reopen): check for reopening same IO.
-
-Fri Apr 9 17:45:11 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (rb_compile_string): bug for nested eval().
-
- * regex.c (re_match): should pop non-greedy stack items on
- failure, after best_regs are fixed.
-
-Thu Apr 8 17:30:40 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (PACK_LENGTH_ADJUST): need to adjust for `*' length.
-
-Tue Apr 6 23:28:44 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (void_check): add void context checks.
-
-Mon Apr 5 12:23:42 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_s_at): should copy gmt-mode.
-
- * eval.c (eval_node): preserve ruby_eval_tree.
-
-Fri Apr 2 14:00:34 1999 NAKAMURA, Hiroshi <nakahiro@sarion.co.jp>
-
- * lib/debug.rb: wrong command interpreting.
-
-Fri Apr 2 11:46:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.3.2
-
-Fri Apr 2 10:40:04 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_s_pipe): forgot to define IO::pipe.
-
-Thu Apr 1 14:40:46 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (assign): modified for rhs change.
-
- * parse.y (stmt): unparenthesisized method calls can be right hand
- side expression of the assignment.
-
-Sat Mar 27 22:42:47 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * ext/nkf/nkf.c (rb_nkf_kconv): check size output_ctr before
- decrement.
-
-Thu Mar 25 09:11:03 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_s_at): preserve gmt-mode for result.
-
- * parse.y (rb_compile_string): do not use cur_mid, use
- compile_for_eval instead.
-
- * st.c (PTR_NOT_EQUAL): wrong logical condition.
-
-Wed Mar 24 13:06:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yycompile): should clear cur_mid after compilation.
-
- * io.c (next_argv): need to check type for ARGV.shift.
-
- * eval.c (blk_copy_prev): need to preserve outer scope as well as
- outer frames.
-
- * parse.y (rb_compile_string): return can appear within eval().
-
-Tue Mar 23 10:15:07 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * configure.in: AC_C_CONST check added.
-
-Tue Mar 23 02:07:35 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_plus): preserve gmt-mode for result.
-
-Mon Mar 22 01:32:37 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): adjust line numbers before expression
- interpolation within strings.
-
- * eval.c (rb_eval): defined? returns nil for false condition.
-
- * numeric.c (num_nonzero_p): returns nil for false condition.
-
-Sat Mar 20 13:07:43 1999 Keiju Ishitsuka <keiju@rational.com>
-
- * lib/weakref.rb: avoid leak for two weakrefs for one object.
-
-Fri Mar 19 11:26:45 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * eval.c (ruby_run): needed to eval END{} on exit.
-
- * eval.c (rb_exit): ditto.
-
-Fri Mar 19 02:17:27 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * signal.c (Init_signal): handles terminating signals HUP, TERM,
- QUIT, PIPE, etc.
-
-Thu Mar 18 15:47:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (rb_big_and): bug in sign calculation.
-
- * bignum.c (rb_big_or): ditto.
-
- * io.c (rb_f_select): forgot to use to_io to retrieve IO, after
- calling select(2).
-
-Tue Mar 16 19:54:31 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/extmk.rb.in: static linking cause infinite make loop.
-
-Tue Mar 16 18:50:04 1999 Yoshida Masato <yoshidam@yoshidam.net>
-
- * ext/socket/socket.c (tcp_s_gethostbyname): typo, not NUM2INT(),
- but INT2NUM().
-
- * ext/socket/socket.c (mkhostent): ditto.
-
-Tue Mar 16 12:31:44 1999 Ryo HAYASAKA <hayasaka@cheer.u-aizu.ac.jp>
-
- * file.c (utime_internal): suppress warning by const.
-
- * time.c (time_gmtime): ditto.
-
-Tue Mar 16 10:23:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_clone): Time object can be cloned.
-
-Tue Mar 16 03:13:10 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * ruby.c (load_file): argv[argc] should be NULL.
-
-Mon Mar 15 22:12:08 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * sprintf.c (rb_f_sprintf): typo in arg_num check at exit.
-
-Mon Mar 15 16:42:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_dup): dup2 should copy class too.
-
-Mon Mar 15 15:12:53 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-
- * lib/mkmf.rb: install program relative path check.
-
-Mon Mar 15 14:05:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_s_new): 2nd argument is now option.
- Regexp::EXTENDED can be specified.
-
-Fri Mar 12 10:47:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_index): str.index("") should always match at
- offset point.
-
- * string.c (rb_str_upto): can specify end point exclusion.
-
- * string.c (rb_str_index): negative offset.
-
- * regex.c (re_match): begline should not match at the point
- between a newline and end-of-string. endline neither.
-
- * regex.c (re_compile_pattern): context_indep_anchors .
-
- * parse.y (parse_regx): need not to push backslashes before
- escaped characters.
-
- * eval.c (rb_thread_join): re-raises exception within target.
-
-Fri Mar 12 01:09:36 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * ext/readline/readline.c (readline_s_vi_editing_mode): wrong
- number of arguments.
-
-Fri Mar 12 02:12:50 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (PACK_ITEM_ADJUST): "a".unpack("C3") => [97, nil, nil]
-
-Thu Mar 11 18:23:50 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * ext/socket/socket.c (Init_socket): UDPsocket was omitted.
-
-Thu Mar 11 16:43:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (PACK_LENGTH_ADJUST): push fixed number of items per
- template to result array.
-
- * pack.c (pack_unpack): I/N/C etc. push nil in the array for "".
-
-Tue Mar 9 00:19:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (ruby_unsetenv): use ruby_setenv(name, 0).
-
- * hash.c (env_delete): ditto.
-
- * string.c (rb_str_upto): do not check `beg<end' to generate
- strings for the pattern like "a".upto("#a").
-
- * range.c (range_each): treat strings as special case.
-
- * range.c (range_each): no longer use upto for generic cases.
-
-Sun Mar 7 14:21:32 1999 IKARASHI Akira <ikarashi@itlb.te.noda.sut.ac.jp>
-
- * string.c (rb_str_index): wrong end point calculation.
-
-Sat Mar 6 02:19:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (match_index): MatchingData#index(n) added.
-
- * array.c (rb_ary_subseq): ary[n..-1] returns an sub-array unless
- n is too small negative index.
-
- * re.c (rb_reg_match_method): Regexp#match(str) added.
-
- * array.c (rb_ary_indexes): understands ranges as indexes.
-
- * re.c (match_size): MatchingData#size added.
-
-Fri Mar 5 01:04:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_fill): modified for range.
-
- * array.c (rb_ary_aset): a[n..m] revisited.
-
-Thu Mar 4 14:23:29 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_subseq): a[n..m] revisited.
-
- * parse.y (method_call): allow Const::method{}.
-
- * array.c (rb_ary_replace_method): should replace original array.
-
-Thu Mar 4 02:30:22 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * configure.in: remove --disable-thread, thread feature is no
- longer optional.
-
-Thu Mar 4 00:32:17 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-
- * parse.y (read_escape): wrong arguments for scan_oct,scan_hex.
-
-Wed Mar 3 11:51:53 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (Init_socket): rename class names as
- TCPsocket -> TCPSocket etc.
-
-Tue Mar 2 19:46:42 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * configure.in (LDSHARED): use gcc -Wl,-G for solaris with gcc.
-
-Tue Mar 2 17:04:19 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): backslashes do not concatenate comment lines
- anymore.
-
-Mon Mar 1 14:05:12 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_call0): adjust argv for optional arguments. super
- without arguments emit superclass method with the value from
- optional arguments. enabled as experiment.
-
-Sun Feb 28 14:04:07 1999 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * parse.y (nextc): backslash at the eof cause infinite loop
-
-Sun Feb 28 11:01:26 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * time.c (make_time_t): month range check added.
-
-Sat Feb 27 02:36:05 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (Init_Regexp): add escape as alias of quote.
-
- * re.c (rb_reg_s_quote): char-code can be specified now.
-
-Fri Feb 26 18:45:36 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-
- * eval.c (error_print): bug for error message with newlines.
-
-Fri Feb 26 12:00:04 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (make_time_t): future check modified to allow 1969-12-31
- at certain timezone.
-
- * time.c (time_arg): year >= 1000 should be past.
-
- * version.c (Init_version): constant RELEASE_DATE added.
-
-Fri Feb 26 01:08:30 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_substr): returns nil for out-of-range access.
-
- * array.c (rb_ary_subseq): returns nil for out-of-range access.
-
- * array.c (rb_ary_store): negative index message has changed.
-
- * string.c (rb_str_aset): reallocation needed.
-
- * string.c (rb_str_aset): allow char append to the string.
-
-Thu Feb 25 23:30:17 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * time.c (time_load): tm_year should be packed in 17 bits, not 18.
-
-Thu Feb 25 12:50:25 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * missing/dup2.c: replaced by public domain version.
-
- * time.c (make_time_t): add `future check' in loops.
-
- * object.c (rb_num2dbl): forbid implicit conversion from nil, or
- strings. thus `Time.now + str' should raise error.
-
- * object.c (rb_Float): convert nil into 0.0.
-
- * object.c (rb_Integer): conversion method improved.
-
-Thu Feb 25 03:27:50 1999 Shugo Maeda <shugo@netlab.co.jp>
-
- * eval.c (rb_call): should handle T_ICLASS properly.
-
-Thu Feb 25 00:04:00 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * error.c (Init_Exception): global function Exception() removed.
-
- * variable.c (rb_class2name): returns "nil"/"true"/"false" for them.
-
- * time.c (time_dump): time marshaling format compressed size from
- 11 bytes to 8 bytes. thanx to tadf@kt.rim.or.jp.
-
- * eval.c (rb_obj_call_init): should specify arguments explicitly.
-
-Wed Feb 24 15:43:28 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): comment concatenation requires preceding space
- before backslash at the end of line.
-
- * io.c (rb_f_pipe): global pipe is obsolete now.
-
- * object.c (Init_Object): remove true.to_i, false.to_i.
-
-Tue Feb 23 14:21:41 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): warn if identifier! immediately followed by `='.
-
-Tue Feb 23 12:32:41 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * eval.c (rb_load): tilde expansion moved to find_file.
-
- * eval.c (find_file): tilde expansion added.
-
-Tue Feb 23 10:50:20 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (require_method): require can handle multiple fnames.
-
- * hash.c (rb_hash_foreach_iter): hash key may be nil.
-
-Mon Feb 22 17:44:02 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): should not pop failure point on success for
- non-greedy matches.
-
- * io.c (Init_IO): remove global_functions getc, readchar, ungetc,
- seek, tell, rewind.
-
-Sat Feb 20 22:54:26 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (rb_num2long): no implicit conversion from boolean.
-
-Sat Feb 20 09:58:42 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * numeric.c (flo_to_s): portable Infinity and NaN support.
-
-Sat Feb 20 07:13:31 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * io.c (rb_file_sysopen): forgot to initialize a local variable.
-
-Fri Feb 19 23:05:07 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_subseq): range check changed.
-
- * marshal.c: increment MARSHAL_MINOR for Time format change.
-
- * time.c (time_old_load): support old marshal format.
-
- * time.c (time_load): changed for new format Y/M/D/h/m/s/usec.
-
- * time.c (time_dump): marshal dump format has changed.
-
-Fri Feb 19 00:25:57 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_arg): should reject "sep\0" and such.
-
- * time.c (time_plus): Time#+ should not receive Time object
- operand.
-
- * string.c (rb_str_substr): negative length raises exception now.
-
- * array.c (beg_len): if end == -1, it points end of the array.
-
- * array.c (rb_ary_subseq): negative length raises exception now.
-
-Thu Feb 18 20:57:04 1999 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * time.c (rb_strftime): strftime() may return 0 on success too.
-
- * time.c (time_strftime): `\0' within format string should not be
- omitted in the result.
-
- * time.c (rb_strftime): zero length format.
-
- * time.c (time_to_a): yday start with 1 now.
-
- * time.c (time_zone): support for long timezone name.
-
- * time.c (time_yday): yday start with 1 now.
-
- * time.c (time_minus): minus calculation was wrong.
-
- * time.c (time_minus): sec, usec should be at least `long', maybe
- they should be `time_t'.
-
- * time.c (time_plus): addition with float was wrong.
-
- * time.c (time_to_s): support for long timezone name.
-
- * time.c (time_gm_or_local): too far future check moved.
-
- * time.c (time_arg): treat 2 digit year as 69-99 => 1969-1999,
- 00-68 => 2000-2068
-
-Thu Feb 18 03:56:47 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * missing/fnmatch.c: moved to missing directory.
-
-Wed Feb 17 16:22:26 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * struct.c (rb_struct_alloc): actual initialization now be done in
- `initialize'.
-
-Wed Feb 17 09:47:15 1999 okabe katsuyuki <hgc02147@nifty.ne.jp>
-
- * regex.c (re_search): use mbclen() instead of ismbchar().
-
- * re.c (rb_reg_s_quote): should handle mbchars properly.
-
-Wed Feb 17 01:25:26 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): stop comment concatenation by backslash follows
- after >= 0x80 char. may cause problem with Latin chars.
-
- * eval.c (error_print): exception in rb_obj_as_string() caused
- SEGV. protect it by PUSH_TAG/POP_TAG.
-
- * error.c (exc_exception): `Exception#exception' should return self.
-
-Wed Feb 17 01:12:22 1999 Hirotaka Ichikawa <hirotaka.ichikawa@tosmec.toshiba.co.jp>
-
- * configure.in: BeOS patch.
-
-Tue Feb 16 14:25:00 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): should reallocate mbc space for
- character class unless current_mbctype is ASCII.
-
-Mon Feb 15 15:48:30 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * configure.in: specify `-Wl,-E' only for GNU ld.
-
-Mon Feb 15 11:43:22 1999 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
-
- * array.c (rb_inspecting_p): should return Qfalse.
-
-Sun Feb 14 22:36:40 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * sprintf.c (rb_f_sprintf): `%G' was omitted.
-
-Sun Feb 14 12:47:48 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * numeric.c (Init_Numeric): allow divide by zero on FreeBSD.
-
- * numeric.c (Init_Numeric): FloatDomainError added.
-
- * configure.in (AC_REPLACE_FUNCS): add checks for functions
- isinf, isnan, and finite.
-
-Sat Feb 13 01:24:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_create_0): should protect th->thread.
-
-Fri Feb 12 16:16:47 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-
- * string.c (rb_str_inspect): wrong mbc position.
-
-Fri Feb 12 16:21:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_fd_close):
-
- * io.c (rb_io_fptr_close): tell scheduler that fd is closed.
-
- * io.c (rb_io_reopen): ditto.
-
- * io.c (READ_CHECK): check if closed after thread context switch.
-
- * ext/socket/socket.c (bsock_close_read): do not check
- the return value from shutdown(2).
-
- * ext/socket/socket.c (bsock_close_write): ditto.
-
- * ext/socket/socket.c (sock_new): need to dup(fd) for close_read
- and close_write.
-
- * parse.y (here_document): handle newlines within #{}.
-
- * regex.h: should replace symbols for ruby.
-
-Fri Feb 12 00:46:28 1999 Shugo Maeda <shugo@netlab.co.jp>
-
- * marshal.c (r_object): should update the method name in message.
-
- * marshal.c (w_object): limit should be converted into Fixnum.
-
-Wed Feb 10 15:20:03 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): empty pattern should not cause infinite
- pattern match loop.
-
- * regex.c (re_compile_pattern): RE_OPTIMIZE_ANCHOR for /.*/, not
- for /(.|\n)/.
-
- * numeric.c (fix_pow): `fixnum**nil' should raise TypeError.
-
- * bignum.c (rb_big_pow): need to normalize results.
-
-Wed Feb 10 01:42:41 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * numeric.c (fix_pow): `(5**1).type' should be Integer.
-
-Tue Feb 9 01:22:49 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): do not ignore newlines in mbchars.
-
- * io.c (rb_file_s_open): mode can be specified by flags like
- open(2), e.g. File::open(path, File::CREAT|File::WRONLY).
-
- * io.c (rb_f_open): bit-wise mode flags for pipes
-
- * io.c (Init_IO): bit flags for open.
-
-Sat Feb 6 22:56:21 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_sub_bang): should not overwrite match data by
- regexp match within the block.
-
- * string.c (rb_str_gsub_bang): ditto.
-
-Sat Feb 6 03:06:17 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (match_getter): accessing $~ without matching caused SEGV.
-
-Fri Feb 5 22:11:08 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * parse.y (yylex): binary literal support, like 0b01001.
-
- * parse.y (yylex): octal numbers can contain `_'s.
-
- * parse.y (yylex): warns if non-octal number follows immediately
- after octal literal.
-
- * parse.y (yylex): now need at least one digit after prefix such
- as 0x, or 0b.
-
- * bignum.c (rb_str2inum): recognize binary numbers like 0b0101.
-
-Fri Feb 5 03:26:56 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
-
- * ruby.c (proc_options): -e without program prints error.
-
-Fri Feb 5 00:01:50 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (terms): needed to clear heredoc_end.
-
- * numeric.c (flo_div): allow float division by zero.
-
-Thu Feb 4 11:56:24 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * missing/strtod.c: for compatibility.
-
- * configure.in (strtod): add strtod compatible check.
-
- * numeric.c (rb_num2long): missing/vsnprintf.c does not support
- floating points.
-
- * numeric.c (flo_to_s): ditto.
-
-Wed Feb 3 23:02:12 1999 Yoshida Masato <yoshidam@yoshidam.net>
-
- * regex.c (re_compile_pattern): use ismbchar() to get next char.
-
- * regex.c (re_search): wrong mbchar shift.
-
- * re.c (rb_reg_search): needed to reset $KCODE after match.
-
- * regex.c (re_compile_fastmap): mbchars should match with \w.
-
-Wed Feb 3 22:35:12 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * parse.y (yylex): too big float raise warning, not error.
-
-Tue Feb 2 23:41:42 1999 Yoshida Masato <yoshidam@yoshidam.net>
-
- * regex.c (re_match): wrong boundary.
-
- * regex.c (IS_A_LETTER): re_mbctab[c] may not be 1 for mbc.
-
- * regex.c (re_search): mbchar support for shifting ranges.
-
- * regex.c (MBC2WC): wrong conversion.
-
-Wed Feb 3 15:03:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (parse_regx): need to escape parens if terminators are
- not any kind of parenthesis.
-
- * parse.y (parse_qstring): ditto.
-
- * parse.y (parse_string): ditto.
-
-Tue Feb 2 17:11:26 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * string.c (rb_str_gsub_bang): too small realloc condition.
-
-Mon Feb 1 10:01:17 1999 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * parse.y (yylex): range check for the float literal.
-
-Sat Jan 30 18:34:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (usage): -h option to show brief command description.
-
-Sat Jan 30 08:45:16 1999 IKARASHI Akira <ikarashi@itlb.te.noda.sut.ac.jp>
-
- * lib/cgi-lib.rb: cookie support added.
-
-Sat Jan 30 13:38:24 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): mbchars should match with \w
- within character class. Was matching with \W.
-
- * regex.c (re_match): \w should match with multi byte characters,
- not its first byte.
-
-Sat Jan 30 10:06:41 1999 Yoshida Masato <yoshidam@yoshidam.net>
-
- * re.c (rb_reg_s_new): UTF-8 flag handle (/u, /U).
-
- * re.c (rb_kcode): $KCODE handle for UTF-8.
-
-Sat Jan 30 01:51:16 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_delete_if): RTEST() missing.
-
- * hash.c (delete_if_i): ditto.
-
- * enum.c (Init_Enumerable): select (=find_all), detect (=find)
- added as aliases.
-
-Fri Jan 29 21:32:19 1999 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * hash.c (rb_f_setenv): SEGV caused by small typo.
-
-Fri Jan 29 00:15:58 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/parsedate.rb (parsedate): support date format like
- 23-Feb-93, which is required by HTTP/1.1.
-
- * variable.c (find_class_path): avoid calling rb_iv_set().
-
- * eval.c (backtrace): do not need to modify $SAFE internally.
-
- * variable.c (classname): inline __classid__ access.
-
- * eval.c (THREAD_ALLOC): needed to initialize wrapper.
-
- * lib/ftools.rb (makedirs): allows slash at the end of the path.
-
- * numeric.c (rb_fix_induced_from): ensure result to be Fixnum.
-
-Thu Jan 28 17:31:43 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (flo_to_s): float format changed to "%16.10g".
-
-Thu Jan 28 02:13:11 1999 Yoshinori Toki <toki@freedom.ne.jp>
-
- * array.c (rb_ary_store): expand allocated buffer by 3/2.
-
-Wed Jan 27 17:50:02 1999 Kazuhiro HIWADA <hiwada@kuee.kyoto-u.ac.jp>
-
- * bignum.c (dbl2big): raised error if double is too big to cast
- into long. check added.
-
-Wed Jan 27 03:16:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_mod_const_at): can't list constants of the
- untainted objects in safe mode.
-
- * class.c (method_list): can't list methods of untainted objects
- in safe mode.
-
-Tue Jan 26 02:40:41 1999 GOTO Kentaro <gotoken@math.sci.hokudai.ac.jp>
-
- * prec.c: Precision support for numbers.
-
-Thu Jan 21 19:08:14 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_f_raise): calls `exception' method, not `new'.
-
- * error.c (exc_exception): renamed from `new'.
-
-Wed Jan 20 03:39:48 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yycompile): rb_in_compile renamed to ruby_in_compile.
-
- * ruby.c (load_file): define DATA if __END__ appeared in script.
-
-Tue Jan 19 14:57:51 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (here_document): need to protect lex_lastline.
-
- * parse.y (yylex): disable %//, %'', %``.
-
-Tue Jan 19 05:01:16 1999 Koji Arai <JCA02266@nifty.ne.jp>
-
- * array.c (beg_len): round range value too much.
-
-Mon Jan 18 13:02:27 1999 Kuroda Jun <jkuro@dwe.co.jp>
-
- * hash.c (env_keys): strchr() may return NULL.
-
-Mon Jan 18 17:51:47 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * instruby.rb (wdir): install libruby.a in archdir.
-
- * lib/ftools.rb (install): removes file before installing.
-
-Mon Jan 18 16:55:31 1999 MAEDA shugo <shugo@aianet.ne.jp>
-
- * eval.c (rb_callcc): experimental continuation support.
-
-Sun Jan 17 19:45:37 1999 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * pack.c (pack_pack): nil packing caused SEGV.
-
-Sat Jan 16 13:18:03 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_concat): character (fixnum) can be append to
- strings
-
- * array.c (rb_ary_unshift): unshift returns array.
-
-Sat Jan 16 01:39:19 1999 Yoshida Masato <yoshidam@tau.bekkoame.ne.jp>
-
- * string.c (rb_str_split_method): UTF-8 support.
-
- * regex.c: UTF-8 support.
-
-Thu Jan 14 00:42:55 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_gsub_bang): forget to add offset for null match.
-
- * eval.c (rb_thread_local_aset): can't modify in tainted mode.
-
- * hash.c (env_each_key): avoid generating temporary array.
-
-Wed Jan 13 23:58:50 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (rb_f_setenv): name and value can be tainted.
-
-Wed Jan 6 02:42:08 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (Init_Bignum): forgot to define Bignum#===.
-
- * gc.c (gc_sweep): if add_heap() is called during GC, objects on
- allocated heap page(s) are not marked, should not be recycled.
-
- * gc.c (gc_sweep): should refer latest freelist.
-
- * gc.c (id2ref): modified to support performance patch.
-
- * object.c (rb_obj_id): performance patch (no bignum for id).
-
-Tue Jan 5 01:56:18 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * config.guess: merge up-to-date from autoconf 2.12.
-
- * array.c (rb_ary_join): avoid calling rb_protect_inspect() till
- it is really needed.
-
- * object.c (rb_obj_inspect): show detailed information for the
- instance variables (infinite loop can avoid now).
-
- * struct.c (rb_struct_inspect): avoid infinite loop.
-
-Sun Jan 3 01:37:58 1999 Takao KAWAMURA <kawamura@ike.tottori-u.ac.jp>
-
- * misc/ruby-mode.el (ruby-end-of-defun): moved too much.
-
- * misc/ruby-mode.el (ruby-mode-variables): set paragraph-separator
- for the mode.
-
- * misc/ruby-mode.el: proper font-lock for `def' and `nil' etc.
-
-Sat Jan 2 17:09:06 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_jump_tag): new api to invoke JUMP_TAG. tag values
- can obtained from rb_eval_string_protect()/rb_load_protect().
-
- * eval.c (rb_rescue): now catches all exceptions but SystemExit.
-
- * eval.c (rb_eval_string_protect): eval string with protection.
-
- * eval.c (rb_load_protect): load file with protection.
-
- * io.c (rb_io_puts): avoid infinite loop for cyclic arrays.
-
- * eval.c (rb_thread_local_aref): thread local hash tables.
-
- * object.c (rb_equal): check exact equal before calling `=='.
-
-Thu Dec 31 22:28:53 1998 MAEDA shugo <shugo@aianet.ne.jp>
-
- * eval.c (rb_f_require): feature names should be provided with
- DLEXT extension.
-
- * marshal.c (Init_marshal): need to provide `marshal.so'.
-
-Wed Dec 30 02:29:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (classname): do not call rb_ivar_set().
-
- * eval.c (ruby_run): finalizers were called too early.
-
-Fri Dec 25 12:19:30 1998 Fukuda Masaki <fukuda@wni.co.jp>
-
- * gc.c (rb_gc_mark): should not return on FL_EXIVAR.
-
-Fri Dec 25 11:56:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (gc_mark): proper scanning for temporary region.
-
- * eval.c (TMP_ALLOC): protection for C_ALLOCA was broken.
-
-Thu Dec 24 18:26:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * development version 1.3 released.
-
-Thu Dec 24 00:17:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_load): top self should be set properly.
-
- * variable.c (classname): check __classpath__ if it is defined.
-
- * variable.c (classname): invalid warning at -v with static linked
- ruby interpreter.
-
- * eval.c (is_defined): modified for expr::Const support.
-
- * eval.c (rb_eval): invoke method expr::Const if expr is not class
- nor module.
-
- * parse.y (primary): enable expr::identifier as method
- invocation.
-
-Wed Dec 23 03:04:36 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): avoid too many loop pops for (?:..).
-
-Tue Dec 22 18:01:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental version 1.1d1 released.
-
-Mon Dec 21 01:33:03 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (TMP_PROTECT): add volatile to ensure GC protection.
-
- * string.c (rb_str_gsub_bang): calculate buffer size properly.
-
- * parse.y (lex_get_str): needed to return Qnil at EOS.
-
- * eval.c (find_file): check policy modified, raise exception
- immediately for tainted load_path.
-
- * hash.c (rb_f_setenv): do not depend on setenv() nor putenv().
-
-Thu Dec 17 06:29:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/tk/tkutil.c (tk_s_new): use rb_obj_instance_eval(), instead
- of rb_yield_0().
-
- * eval.c (rb_f_require): forgot to call find_file in some cases.
-
- * eval.c (rb_f_require): `require "feature.so"' to load dynamic
- libraries. old `require "feature.o"' is still OK.
-
- * eval.c (rb_eval): yield without value dumped core.
-
-Wed Dec 16 16:28:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental version 1.1d0 (pre1.2) released.
-
-Wed Dec 16 10:43:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): bound check before calling re_match().
-
-Tue Dec 15 13:59:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * error.c (exc_to_s): returns class name for unset mesg.
-
- * error.c (exc_initialize): do not initialize @mesg by "".
-
- * parse.y (nextc): __END__ should handle CR+LF newlines.
-
-Wed Dec 9 13:37:12 1998 MAEDA shugo <shugo@aianet.ne.jp>
-
- * pack.c (encodes): use buffering for B-encoding.
-
- * pack.c (pack_pack): Q-encoding by 'M'.
-
-Tue Dec 8 14:10:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (generic_ivar_get): any object can have instance
- variables now. great improvement.
-
- * variable.c (rb_name_class): do not set __classpath__ by default,
- use __classid__ instead.
-
-Mon Dec 7 22:08:22 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.h (struct RFile): IO objects can have instance variables now.
-
- * parse.y (primary): allows `def obj::foo; .. end'.
-
-Mon Dec 7 18:24:50 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * ruby.c (set_arg0): $0 support for HP-UX.
-
-Mon Dec 7 01:30:28 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * dln.c (dln_strerror): better error messages on win32.
-
-Sat Dec 5 23:27:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (here_document): indentable here-doc delimiter by
- `<<-'. Proposed by Clemens <c.hintze@gmx.net>. Thanks.
-
-Thu Dec 3 16:50:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/extmk.rb.in (realclean): trouble on install.
-
-Sun Nov 29 22:25:39 1998 Takaaki Tateishi <ttate@jaist.ac.jp>
-
- * process.c (f_exec): check number of argument.
-
-Thu Nov 26 17:27:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c9 released.
-
-Wed Nov 25 13:07:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_dup): do not copy additional data (STR_NO_ORIG).
-
- * parse.y (yycompile): reduce known memory leak (hard to remove).
-
-Wed Nov 25 03:41:21 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * st.c (st_init_table_with_size): round size up to prime number.
-
-Sat Nov 21 23:27:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (rb_hash_aset): reduce copying key strings.
-
- * gc.c (looks_pointerp): declare as inline function if possible.
-
- * st.c (PTR_NOT_EQUAL): compare hash values first before calling
- comparing function.
-
- * st.c (ADD_DIRECT): save hash value in entries to reduce hash
- calculation.
-
- * string.c (rb_str_gsub_bang): avoid rb_scan_args() to speed-up.
-
- * string.c (rb_str_sub_bang): ditto.
-
-Sat Nov 21 18:44:06 1998 Masaki Fukushima <fukusima@goto.info.waseda.ac.jp>
-
- * time.c (time_s_now): had memory leak.
-
- * ext/md5/md5init.c (md5_new): had memory leak.
-
- * ext/md5/md5init.c (md5_clone): ditto.
-
-Fri Nov 20 23:23:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/delegate.rb: do not propagate hash and eql?.
-
-Thu Nov 19 01:40:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sample/ruby-mode.el (ruby-expr-beg): failed to find reserved
- word boundary.
-
- * eval.c (rb_eval): avoid calling `concat' method. calls
- rb_ary_concat() directly for efficiency.
-
- * eval.c (rb_eval): actual rest arguments extended arrays too much.
-
-Wed Nov 18 14:30:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (rb_define_global_function): global functions now be
- module function of the Kernel.
-
-Wed Nov 18 10:48:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (read_all): SEGV on large files.
-
-Tue Nov 17 18:11:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c8 released.
-
-Tue Nov 17 16:58:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (arg): assignment to attribute name start with capital
- should be allowed.
-
- * eval.c (thread_alloc): needed to mark terminated threads too.
-
-Tue Nov 17 12:33:48 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
-
- * ext/extmk.rb.in (create_makefile): Set `libdir' to `@libdir@',
- Set `pkglibdir' to `$libdir/$(RUBY_INSTALL_NAME)'.
-
-Tue Nov 17 10:30:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c (f_sprintf): %l%%c -> %%l%c
-
-Tue Nov 17 01:08:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (ret_args): distinguish `a' and `*a' for the arguments
- of yield and return.
-
- * eval.c (rb_eval): flip3 should work like sed.
-
- * eval.c (rb_eval): flip{2,3} now have independent state for each
- scope to work fine with thread.
-
-Mon Nov 16 23:26:29 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (primary): exec else clause if no exception raised.
-
-Sun Nov 15 15:44:07 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * ext/extmk.rb.in (install): bug in target.
-
-Sat Nov 14 11:02:05 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
-
- * Makefile.in (install): Give the argument `$(DESTDIR)' to
- `instruby.rb'.
-
- * instruby.rb: Recognize ARG[0] as `destdir'.
-
- * instruby.rb: Give the argument `destdir' to `extmk.rb'.
-
- * ext/extmk.rb.in: Recognize ARG[1] as `$destdir'.
-
- * instruby.rb: Create the installation directories (bindir, libdir,
- archdir, pkglibdir, archdir, and mandir) under `destdir', and
- install all files under there.
-
- * ext/extmk.rb.in: Likewise.
-
-Sat Nov 14 10:56:55 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
-
- * instruby.rb: Add the variable `pkglibdir'.
-
- * instruby.rb: Set the variable `libdir' to `$(libdir)', not
- `$(libdir)/$(ruby_install_name)'. `libruby.so' and `libruby.so.LIB'
- are installed at `libdir'.
-
- * instruby.rb: Set the variable `archdir' to `$(pkglibdir)/$(arch)'.
-
-Fri Nov 13 19:43:29 1998 KIMURA Koichi <kbk@kt.rim.or.jp>
-
- * missing/nt.c (SafeFree): wrong free offset.
-
-Thu Nov 12 20:11:53 1998 Koji Arai <JCA02266@nifty.ne.jp>
-
- * sample/ruby-mode.el: wrong highlight.
-
- * parse.y (parse_regx): newline in regexp was ignored.
-
-Wed Nov 11 10:54:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (here_document): <<'FOO' should not escape anything.
-
- * parse.y (here_document): bare << here-doc available, even though
- it's deprecated.
-
- * file.c (rb_file_s_readlink): return value should be tainted.
-
- * ext/etc/etc.c (setup_passwd): information (eg. GCOS name) should
- be tainted (modified at Perl Conference).
-
-Tue Nov 10 00:22:11 1998 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * configure.in: elf support for FreeBSD 3.x
-
-Tue Nov 10 00:05:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): here document available in eval.
-
-Mon Nov 9 17:55:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c7 released.
-
-Fri Nov 6 19:25:27 1998 Takao KAWAMURA <kawamura@ike.tottori-u.ac.jp>
-
- * sample/ruby-mode.el: font-lock patch.
-
-Thu Nov 5 15:42:22 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sample/README, lib/README: simple description for each file.
-
-Wed Nov 4 18:14:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (assign): attribute assignment should be called as public.
-
-Tue Nov 3 23:36:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_dump): dumps core for negative char value.
-
- * regex.c (re_compile_pattern): out of boundary access for empty
- regexp.
-
-Mon Nov 2 22:54:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_aset): `str[str]' replaces first match.
-
-Mon Nov 2 18:24:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thread_create): was accessing modified status.
-
-Sun Nov 1 01:18:52 1998 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * gc.c (xrealloc): size 0 needs round up to 1.
-
-Sat Oct 31 23:18:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_split_method): negative LIMIT means number of
- split fields are unlimited, as in perl.
-
- * string.c (rb_str_split_method): if LIMIT is unspecified,
- trailing null fields are stripped.
-
-Sat Oct 31 04:16:14 1998 Inaba Hiroto <inaba@st.rim.or.jp>
-
- * string.c (str_aref): regexp index SEGVed.
-
-Fri Oct 30 14:33:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (reg_match): returns nil for unmatch.
-
- * dir.c (dir_entries): new method.
-
- * eval.c (block_pass): do not push block, substitute it.
-
-Fri Oct 30 01:28:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * range.c (range_check): avoid <=> check for Fixnums.
-
- * array.c (rb_ary_aset): accept negative index.
-
-Wed Oct 28 22:00:54 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): access out of boundary fixed.
-
-Wed Oct 28 11:37:42 1998 TAMITO <tommy@valley.ne.jp>
-
- * io.c (f_select): fd number comparison bug.
-
-Tue Oct 27 23:07:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sample/ruby-mode.el (ruby-parse-region): forgot to support %w()
- style array literal.
-
- * eval.c (rb_eval): unused block raises warning.
-
-Mon Oct 26 09:37:53 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (dvar_asgn_push): dvar pushed too many times if
- variable-in-block first appear in loops.
-
-Sun Oct 25 22:59:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (set_list_bits): was using wrong offset.
-
-Thu Oct 22 00:07:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_obj_method): method retrieved from tainted object
- should be tainted too.
-
- * eval.c (method_call): safe_level should be restored during
- Method#call.
-
-Wed Oct 21 14:21:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (Init_IO): new constants IO::SEEK_{SET,CUR,END}.
-
- * io.c (rb_f_ungetc): ungetc pushes a char back into STDIN.
-
-Mon Oct 19 11:50:00 1998 Motoyuki Kasahara <m-kasahr@sra.co.jp>
-
- * ext/extmk.rb: Load '@top_srcdir@/lib/find.rb', not
- '../lib/find.rb'.
-
- * ext/extmk.rb: Distinguish between `top_srcdir' and `topdir'.
-
- * Makefile.in (CFLAGS): Add `-I.'.
-
- * Makefile.in (lex.c): Give `@srcdir@/keywords' to gperf, not
- `keywords'.
-
- * instruby.rb: Use `CONFIG["bindir"]', instead of `prefix + "/bin"'.
-
- * instruby.rb: Use `CONFIG["libdir"]', instead of `prefix + "/lib"'.
-
- * instruby.rb Use `CONFIG["mandir"]', instead of `prefix + "/man"'.
-
- * instruby.rb (wdir): Add the variable to preserve the current
- working directory.
-
- * instruby.rb: Chdir to wdir before install `config.h' and
- `rbconfig.rb'.
-
-Mon Oct 19 10:07:01 1998 EGUCHI Osamu <eguchi@shizuokanet.ne.jp>
-
- * eval.c (rb_eval): reduce recursive calls to rb_eval().
-
-Fri Oct 16 15:31:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_new_internal): timeval must be positive.
-
-Thu Oct 15 13:54:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (arg): local variables can be accessed within right side
- expression in assignment, notably in blocks.
-
-Wed Oct 14 00:18:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (Init_Array): Array#=== is now for equal check, not
- inclusion check.
-
- * parse.y (when_args): `when a, *b' style new syntax for array
- expansion in `case'.
-
-Tue Oct 13 14:30:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (rb_obj_untaint): taint marks can be unset.
-
- * eval.c (rb_eval): taint propagation for embedded strings.
-
-Mon Oct 12 13:27:15 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_call0): check stack depth more frequently.
-
-Mon Oct 12 08:08:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_p): can print even in secure mode.
-
-Sun Oct 11 22:50:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (rb_const_set): taint check for modification.
-
- * variable.c (rb_ivar_set): taint check for modification.
-
- * string.c (rb_str_modify): taint check for modification.
-
- * hash.c (rb_hash_modify): taint check for modification.
-
- * array.c (rb_ary_modify): taint check for modification.
-
- * ruby.h (FL_TAINT): taint for all objects, not only strings.
-
-Fri Oct 9 17:01:14 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (read_all): read() returns "" at immediate EOF.
-
- * io.c (io_read): read(nil) read all until EOF.
-
-Thu Oct 8 13:32:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_dump): marshal can dump Time object now.
-
- * marshal.c (Init_marshal): rename marshal methods `_dump_to' to
- `_dump', `_load_from' to `_load'.
-
- * parse.y (rb_intern): "+=".intern generates proper symbol.
-
-Mon Oct 5 18:31:53 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c6 released.
-
-Fri Oct 2 14:22:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): `/\s*(--)$/ =~ "- --"' did not match,
- because of wrong optimize condition.
-
-Mon Oct 1 01:55:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (rb_intern): should not raise exceptions.
-
- * parse.y (yylex): symbol like `:foo?=' should not be allowed.
-
- * ext/extmk.rb.in: makes *.a for static link modules.
-
-Wed Sep 30 14:13:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_start): supports making a subclass of the
- Thread class.
-
-Tue Sep 29 17:46:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_thread_join): join is now an instance method.
-
-Fri Sep 25 12:01:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): `@foo!' should be an error.
-
-Thu Sep 24 14:55:06 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * ext/etc/etc.c (Init_etc): wrong field definition.
-
-Thu Sep 17 17:09:05 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_reopen): was creating FILE* for wrong fd.
-
-Tue Sep 15 05:28:11 1998 Koji Arai <JCA02266@nifty.ne.jp>
-
- * regex.c (re_compile_pattern): forgot to fixup for the pattern
- like (?=(A)|(B)).
-
-Tue Sep 15 01:06:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (rb_io_gets_internal): do not set $_ by default, only
- gets/readline set the variable.
-
- * eval.c (rb_f_load): load toplevel class is set to anonymous
- module if safe_level >= 5, to encapsulate modification.
-
- * eval.c (rb_f_load): set frame properly.
-
- * string.c (rb_str_each_line): do not set $_.
-
-Mon Sep 14 14:42:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): beginning and end of the string, do not
- automatically match `\b'.
-
- * string.c (scan_once): consume at least on character.
-
- * regex.c (re_search): wrong behavior for negative range.
-
-Sat Sep 12 21:21:26 1998 Koji Arai <JCA02266@nifty.ne.jp>
-
- * regex.c (re_search): range value should be maintained.
-
-Thu Sep 10 10:55:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (backref_error): yyerror does not understand formats.
-
-Tue Sep 8 18:05:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c5 released.
-
-Tue Sep 8 10:03:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_each_line): wrong line splitting with newline at
- top of the string.
-
- * string.c: non bang methods return copied string.
-
- * eval.c (f_END): needed to initialize frame->argc;
-
-Fri Sep 4 11:27:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (bigadd): proper sign combination.
-
- * regex.c (re_search): wrong return value for \A.
-
-Thu Sep 3 14:08:14 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c4 released.
-
-Tue Sep 1 10:47:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (slow_search): do not compare llen and blen. llen may
- be longer than blen, if little contains 0xff.
-
- * regex.c (mbctab_euc): set 0x8e as multibyte character.
-
- * string.c (str_inspect): mask character for octal output.
-
-Mon Aug 31 15:32:41 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): use calculated offset if exactn is the
- first opcode in the compiled regexp.
-
- * regex.c (bm_search): use Boyer-Moore search for simple search.
-
- * regex.c (must_instr): wrong length check if pattern includes
- byte escape by 0xff.
-
- * regex.c (re_compile_pattern): need not to check current_mbctype.
-
-Sat Aug 29 16:31:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_check_safe_str): avoid calling rb_id2name() in normal
- cases to speed-up.
-
- * eval.c (thread_raise): do not save context of terminated thread.
-
- * regex.c (re_compile_pattern): mask \nnn over 256.
-
-Sat Aug 29 02:09:46 1998 Koji Arai <JCA02266@nifty.ne.jp>
-
- * sprintf.c (f_sprintf): wrong buffer size check.
-
-Fri Aug 28 01:57:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
-
-Fri Aug 28 12:25:33 1998 Hiroshi Igarashi <igarashi@ueda.info.waseda.ac.jp>
-
- * ruby.c (ruby_require_modules): load modules in appearing order.
-
-Fri Aug 28 01:57:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): accepts (?ix-ix) and (?ix-ix:...).
-
-Thu Aug 27 12:54:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c3 released.
-
-Wed Aug 26 14:40:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): check whether ruby_class is properly set,
- before accessing it.
-
- * eval.c (rb_obj_instance_eval): ruby_class should be Qnil for
- special objects like Fixnums.
-
- * ext/tkutil/tkutil.c (Init_tkutil): removes calls to
- rb_yield_0(). used instance_eval() instead in the tk.rb.
-
-Wed Aug 26 11:47:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): pop non-greedy stack elements on success.
-
-Wed Aug 26 09:25:35 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ruby.h: add #define environ for cygwin32.
-
-Tue Aug 25 08:57:41 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (rb_ary_sort_bang): temporarily freeze sorting array.
-
-Mon Aug 24 18:46:44 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * dln.c (dln_find_1): path check was too strict.
-
-Mon Aug 24 15:28:11 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * parse.y (f_arglist): opt_nl added after f_args.
-
-Fri Aug 21 01:06:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c: grand renaming on socket.c.
-
- * ext/socket/socket.c (inet_aton): supply inet_aton for those
- systems that do not have it.
-
- * ext/socket/socket.c (setipaddr): use inet_aton instead of
- inet_addr.
-
- * ext/socket/socket.c (tcp_s_gethostbyname): new method: works
- like Socket.gethostbyname but returning array contains ip-addrs
- as octet decimal string format like "127.0.0.1".
-
- * ext/socket/socket.c (mkhostent): return format changed to
- [host, aliases, type, ipaddr..] as documented.
-
-Wed Aug 19 00:31:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_ctl): forgot to place TRAP_END at right position.
-
-Fri Aug 14 11:01:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (call_trace_func): save __FILE__, __LINE__ before
- executing trace_func, since trace function should not corrupt
- line number information.
-
-Thu Aug 13 15:09:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (ary_s_new): was marking unallocated region on GC.
-
-Tue Aug 11 11:57:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c2 released.
-
-Mon Aug 10 14:05:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * process.c (f_system): removed fflush(stdin).
-
-Fri Aug 7 17:44:44 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * error.c (err_snprintf): replace sprintf for fixed sized buffer,
- with snprintf to avoid buffer over-run. For systems which does
- dot provide snprintf, missing/snprintf.c added.
-
-Wed Aug 5 00:47:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (rb_reg_search): recycle match object.
-
-Mon Aug 3 09:17:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (rb_str_gsub_bang): do not allocate temporary string.
-
- * string.c (rb_str_sub_bang): use inline replace.
-
-Wed Jul 29 00:36:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (hash_s_new): the default value can be specified.
-
- * hash.c (hash_default): method to set the default value.
-
- * hash.c (hash_aref): now returns the default value.
-
-Tue Jul 28 13:03:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (ary_s_new): argument to specify initial value is added.
-
- * array.c (ary_s_new): specifies size, not capacity.
-
-Mon Jul 27 12:39:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_replace): zero fill for expansion gap.
-
- * regex.c (mbctab_euc): set flags on for 0xA1-0xFE. suggested by
- <inaba@st.rim.or.jp>.
-
- * string.c (str_inspect): consider current_mbctype.
-
-Sun Jul 26 15:37:11 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * array.c (ary_s_new): Array.new(1<<30) dumps core.
-
-Fri Jul 24 13:40:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c1 released.
-
-Fri Jul 24 02:10:22 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (r_bytes2): allocated buffer size was too short.
-
- * marshal.c (w_object): saves all options, not only casefold flag.
-
- * re.c (reg_clone): now copies options properly.
-
- * re.c (reg_get_kcode): code number was wrong.
-
-Thu Jul 23 13:11:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_attr): argument should be symbol or string.
-
-Wed Jul 22 11:59:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (calculate_must_string): wrong offset added.
-
-Wed Jul 22 11:59:59 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * st.c (rehash): still had a GC problem. fixed.
-
-Tue Jul 21 13:19:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (gc_mark_threads): crashed on GC before thread allocation.
-
- * st.c (rehash): GC during rehash caused SEGV.
-
-Tue Jul 21 01:25:10 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c (f_sprintf): integer formatter totally re-written.
-
- * sprintf.c (remove_sign_bits): support uppercase hexadecimal.
-
-Sat Jul 18 00:14:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c (f_sprintf): proper sign position for %X and %O.
-
-Fri Jul 17 14:10:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1c0 released.
-
-Fri Jul 17 08:01:49 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * process.c (f_exec): Check_SafeStr() added.
-
- * process.c (f_system): Check_SafeStr() moved before fork().
-
-Thu Jul 16 22:58:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (scan_once): substrings to the block should not be
- tainted. use reg_nth_match(), not str_substr().
-
- * string.c (str_substr): needed to transfer taint.
-
-Thu Jul 16 16:15:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * gc.c (xmalloc): object allocation count added to GC trigger.
-
- * eval.c (thread_save_context): avoid marking uninitialized stack
- in thread_mark. GC may be triggered by REALLOC_N().
-
-Wed Jul 15 15:11:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_31.
-
-Wed Jul 15 15:05:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thread_create): exit() and abort() in threads now
- forwarded to main_thread.
-
-Tue Jul 14 14:03:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (obj_instance_variables): list names that is not
- instance variables.
-
- * gc.c (GC_MALLOC_LIMIT): choose smaller limit value.
-
-Mon Jul 13 12:39:38 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (str2cstr): should not return NULL.
-
-Fri Jul 10 11:51:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (gettable): needed to add dyna_in_block() check.
-
-Thu Jul 9 17:38:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_30.
-
-Thu Jul 9 16:01:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sprintf.c (fmt_setup): format specifier for long needed.
-
- * sprintf.c (f_sprintf): ditto.
-
- * numeric.c (fix2str): ditto.
-
- * eval.c (thread_create): no more ITIMER_REAL.
-
- * eval.c (thread_create): thread finalization needed before
- aborting thread if thread_abort is set.
-
-Wed Jul 8 18:17:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (big_pow): abandon power by bignum (too big).
-
-Tue Jul 7 13:58:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_catch): add C level catch/throw feature.
-
-Mon Jul 6 15:18:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (arg): proper return values for `||=' and `&&='.
-
-Fri Jul 3 16:05:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_29.
-
-Fri Jul 3 11:20:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (r_byte): byte should not extend sign bit.
-
- * numeric.c (fix_mul): use FIX2LONG() instead of FIX2INT() for
- 64bit architectures.
-
- * marshal.c (r_bytes): remove weird casting between pointer and int.
-
- * process.c (proc_setsid): new method Process#setsid().
-
-Thu Jul 2 12:49:21 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * marshal.c (w_object): remove `write_bignum' label for 64bit
- architectures.
-
- * marshal.c (r_bytes): needs int, not long.
-
-Wed Jul 1 14:21:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (flo_plus): should not allow addition with strings.
-
-Wed Jul 1 13:09:01 1998 Keiju ISHITSUKA <keiju@rational.com>
-
- * numeric.c (num_uminus): wrong coerce direction.
-
-Tue Jun 30 10:13:44 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (f_p): accepts arbitrary number of arguments.
-
- * eval.c (rb_yield_0): there's some case that iterator_p() returns
- true even if the_block was not set. check added.
-
-Tue Jun 30 01:05:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (BEGIN_CALLARGS): adjust the_block before evaluating the
- receiver's value and the arguments.
-
-Fri Jun 26 18:02:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_28.
-
-Fri Jun 26 11:01:26 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * string.c (str_aset_method): needed to convert to string.
-
-Thu Jun 25 02:05:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): optimize for `.*' at beginning of the
- pattern.
-
- * regex.c (re_search): optimize for character class repeat at
- beginning of the pattern.
-
- * regex.c (re_compile_pattern): detect optimization potential for
- the compiled patterns.
-
-Thu Jun 25 00:02:26 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * re.c (reg_s_new): flag value was wrong.
-
-Wed Jun 24 23:45:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_search): wrong anchor handling for reverse search.
-
-Wed Jun 24 02:18:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (mlhs): `((a,b)),c = [[1,2]],3' assigns a=1,b=2,c=3.
-
-Tue Jun 23 11:46:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): `&&=' and `||=' added.
-
-Sat Jun 20 02:53:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (assignable): nesting local variables should have higher
- priority than normal local variables for assignment too.
-
-Fri Jun 19 18:28:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_27.
-
-Fri Jun 19 14:34:49 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (assign): support hack for nested multiple assignment.
-
- * parse.y (mlhs): nested multiple assignment.
-
- * eval.c (rb_eval): in-block variables now honors static scope.
-
- * configure.in: RSHIFT check moved to configure.
-
-Thu Jun 18 16:46:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_26.
-
-Thu Jun 18 13:37:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (file_s_ftype): uses lstat(2) instead of stat(2).
-
- * dir.c (dir_s_glob): there can be buffer overrun, check added.
-
- * eval.c (f_binding): handles in-block variables declared after
- binding's generation.
-
- * numeric.c (flo_floor): floor, ceil, round added to Float.
-
-Wed Jun 17 11:20:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (gettable): nesting local variables should have higher
- priority than normal local variables.
-
-Tue Jun 16 12:30:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (str2inum): handles `+ddd'.
-
- * struct.c (make_struct): name parameter can be nil for unnamed
- structures.
-
-Mon Jun 15 16:30:10 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (class_s_inherited): prohibiting to make subclass of
- class Class.
-
- * object.c (module_s_new): support for making subclass of Module.
-
- * parse.y (yycompile): clear eval_tree before compiling.
-
-Fri Jun 12 17:58:18 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (eval): write back the_dyna_var into the block.
-
-Thu Jun 11 18:19:18 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_25.
-
- * eval.c (dvar_add_compiling): register dyna_var at compile time.
-
- * regex.c (re_compile_pattern): RE_DUP_MAX iteration is too big.
-
-Wed Jun 10 15:12:04 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_eof): do not block other threads.
-
- * signal.c (trap): reserve SIGALRM for thread.
-
- * eval.c (thread_create): use ITIMER_REAL also to avoid system
- call blocking.
-
- * io.c (f_syscall): add TRAP_BEG, TRAP_END around system calls.
-
- * io.c (io_ctl): add TRAP_BEG, TRAP_END around system calls.
-
- * enum.c (enum_collect): did not collect false values.
-
- * array.c (ary_new2): forgot to initialize capa field.
-
-Tue Jun 9 18:36:15 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * string.c (str_split_method): split dumped core for "\xff".
-
-Tue Jun 9 16:22:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_24.
-
-Tue Jun 9 16:04:07 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/kconv/kconv.c (kconv_guess): more precise decision for EUC,
- using jless algorithm (3 sequential EUC hiragana characters).
-
-Tue Jun 9 15:12:44 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/kconv/kconv.c (kconv_guess): wrong guess for EUC as SJIS in
- some cases (0xe0 - 0xef).
-
- * gc.c (xmalloc): insert size check for big (negative in signed)
- allocation size.
-
-Tue Jun 9 02:54:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/parsedate.rb: wday moved to the last in the return values.
-
-Mon Jun 8 10:40:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_split_method): split dumped core for "\0".
-
-Sat Jun 6 22:50:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (calculate_must_string): wrong condition for
- {start,stop}_nowidth.
-
- * regex.c (re_match): various features imported from GNU regex.c
- 0.12, such as nested grouping, avoiding infinite loop with empty
- match, etc.
-
- * regex.c (register_info_type): now use union.
-
- * regex.c (re_search): more precise anchor(^) check.
-
-Wed Jun 3 18:07:54 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (reg_raise): check rb_in_compile, not rb_in_eval.
-
-Mon Jun 1 05:26:06 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * string.c (trnext): casting to signed char* needed.
-
-Tue Jun 2 16:00:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c (udp_addrsetup): error check enhanced.
-
- * ext/socket/socket.c (sock_s_getservbyaname): use strtoul(), if
- possible.
-
-Sat May 30 07:10:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (reg_prepare_re): no more needless regular expression
- recompile on casefold conditions.
-
-Thu May 28 18:02:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (nil_plus): no more `+' method for nil.
-
-Wed May 27 17:33:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (hash_fetch): new method.
-
- * regex.c (re_search): check whether translate table is set.
-
-Tue May 26 11:39:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_23.
-
- * parse.y (yylex): no UPLUS/UMINUS for 1st argument if
- parenthesises are omitted.
-
-Tue May 26 01:09:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): (?XI) for turns off the
- corresponding option.
-
-Mon May 25 12:38:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): inline i option (?i).
-
- * regex.c (re_compile_pattern): inline x option (?x).
-
- * regex.c (re_compile_pattern): x option for regexp.
-
- * dir.c (dir_s_open): returns block's evaluated value.
-
- * io.c (f_open): returns block's evaluated value.
-
- * ext/curses/curses.c (curses_addstr): nil argument caused SEGV.
-
-Fri May 22 11:52:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): push mark on (?:), so that
- laststart check for {a,b} can be done.
-
-Thu May 21 17:31:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_match): wrong match (too non-greedy) for `{a,b}?'.
-
- * io.c (io_lineno): new method IO#lineno, IO#lineno=.
-
-Wed May 20 06:04:43 1998 MAEDA shugo <shugo@aianet.ne.jp>
-
- * BeOS patch.
-
-Wed May 20 16:32:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (BIGDN): use RSHIFT(), instead of mere `>>'.
-
-Tue May 19 16:36:26 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_22.
-
-Tue May 19 16:31:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (assignable): specification changed for in-block
- variable definition.
-
- * eval.c (dyna_var_asgn): error in in-block variables' compile
- time definition.
-
- * parse.y (str_extend): wrong nesting detection.
-
-Tue May 19 09:47:55 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * numeric.c (num2int): re-defined (extensions may use this).
-
-Mon May 18 16:40:50 1998 MAEDA shugo <shugo@aianet.ne.jp>
-
- * error.c (get_syserr): BeOS support.
-
- * configure.in: modified for BeOS.
-
- * string.c (str_dump): do not call isascii().
-
- * sprintf.c (remove_sign_bits): forgot to initialize end pointer.
-
- * glob.c: #include <alloca.h> added.
-
-Mon May 18 14:52:21 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_21.
-
-Mon May 18 03:27:57 1998 MAEDA shugo <shugo@aianet.ne.jp>
-
- * file.c (file_s_expand_path): optional second argument
- `default_directory' added.
-
-Sat May 16 22:06:52 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * error.c (RAISE_ERROR): wrong error message
-
-Fri May 15 14:43:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_20.
-
-Thu May 14 14:44:21 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * sun4 cc patches for intern.h and regex.h.
-
-Thu May 14 14:03:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * random.c (RANDOM_MAX): guessing proper maximum value for random
- numbers.
-
- * random.c (f_rand): use drand48 if possible.
-
-Wed May 13 19:05:20 1998 MAEDA shugo <shugo@aianet.ne.jp>
-
- * BeOS patches for io.c, error.c and config.guess.
-
-Wed May 13 14:56:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_19.
-
- * most of the Mac and BeOS patches merged, except path separators.
-
- * error.c (err_append): generated SyntaxError was String.
-
- * ruby.h: xxx2INT, xxx2UINT checks values as int, not long.
-
- * ruby.h: remove typedef's. INT, UINT, UCHAR, USHORT.
-
-Tue May 12 17:38:00 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_18.
-
-Tue May 12 11:38:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * error.c (syserr_errno): returns errno of the SystemCallError.
-
- * error.c (rb_sys_fail): saves errno in the Exception.
-
- * error.c (set_syserr): no need to protect syserr_list.
-
- * error.c (rb_sys_fail): no more bufsize limit.
-
- * error.c (set_syserr): integer value of errno can be accessed by
- Errno::EXXX::Errno.
-
-Sun May 10 03:10:33 1998 WATANABE Tetsuya <tetsu@jpn.hp.com>
-
- * io.c (io_tell etc.): moved from File class to IO class.
-
-Fri May 8 12:26:37 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (pack_unpack): should be unsigned int (was signed int).
-
-Thu May 7 16:34:10 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * pack.c (pack_pack): `V', `N' uses newly created NUM2UINT().
-
- * ruby.h (NUM2UINT): new macro.
-
- * bignum.c (big2uint): try to convert bignum into UINT.
-
- * re.c (reg_match): needed to return false for match with nil.
-
- * gc.c (obj_free): wrong condition to free string.
-
-Wed May 6 21:08:08 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ruby.c (ruby_process_options): modified for DJGPP.
-
-Wed May 6 15:48:03 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_17.
-
-Wed May 6 01:37:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c: remove global variable `errat'.
-
- * eval.c (rb_longjmp): embed error position information in the
- exception object.
-
-Sat May 2 12:20:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (reg_search): supports reverse search.
-
- * string.c (str_index_method): does update $~ etc.
-
- * eval.c (f_load): needed to clear the_dyna_vars.
-
- * eval.c (dyna_var_asgn): do not push dyna_var, which is id == 0.
-
- * error.c (Init_Exception): NotImplementError is no longer
- StandardError, which is not handled by default rescue.
-
-Fri May 1 00:35:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (proc_options): `-d' turns on verbose flag too.
-
- * error.c (exception): last argument may be the superclass of the
- defining exception(s).
-
- * io.c (Init_IO): EOFError is now subclass of the IOError.
-
- * io.c (Init_IO): forgot to define IOError.
-
- * error.c (Init_Exception): old Exception class renamed to
- StandardError. Exception now replaces old GlobalExit.
-
- * error.c (Init_Exception): Exception is now the root of the
- Global Exits. There's no longer GlobalExit class.
-
- * util.c (ruby_mktemp): check TMP, TMPDIR first.
-
-Thu Apr 30 01:08:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/tk.rb: call 'unknown', if proc not defined.
-
- * eval.c (handle_rescue): default rescue handles `Exceptional' not
- only the instance of the `Exception's.
-
- * eval.c (f_raise): exception can be any object.
-
- * time.c (time_gm_or_local): call time_gmtime or time_localtime.
-
- * eval.c (f_raise): raises TypeError if the class which is not a
- subclass of String is specified (checked in exc_new()).
-
- * error.c (exc_new): need to check whether invalid class (not a
- subclass of String) is specified.
-
-Wed Apr 29 21:05:44 1998 WATANABE Hirofumi <eban@os.rim.or.jp>
-
- * ruby.c (proc_options): option '-e' via tempfile.
-
-Tue Apr 28 15:27:58 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_16.
-
-Tue Apr 28 00:07:38 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (obj_is_proc): type check predicate.
-
- * eval.c (obj_is_block): ditto.
-
-Mon Apr 27 16:59:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/gtk/gtk.c (Init_gtk): use timeout, not idle to avoid
- consuming CPU too much.
-
- * lib/tk.rb: use tcltklib#_invoke instead of `_eval'.
-
-Mon Apr 27 16:59:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (ary_sort): use dup, not clone.
-
-Mon Apr 27 13:46:27 1998 Tadahiro Maebashi <maebashi@iij.ad.jp>
-
- * ext/tcltklib/tcltklib.c (ip_invoke): invoke tcl command
- directly. need not worry about escaping tcl characters.
-
-Mon Apr 27 12:04:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * random.c (f_rand): do not call srand() implicitly.
-
-Fri Apr 24 14:35:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_15.
-
- * parse.y (assignable): dyna_var_asgn actually defines nested
- local variables in outer context.
-
- * random.c (f_rand): call srand(), if it has not called yet.
-
- * random.c (f_srand): use tv_usec as the default seed.
-
- * eval.c (rb_eval): values of nested local variables should be
- independent.
-
- * eval.c (rb_yield_0): local variables wrong nested conditions.
-
-Wed Apr 22 23:27:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (select_get_io): get IO object by `to_io'.
-
- * io.c (io_to_io): method to retrieve IO object, from delegating
- object for example.
-
-Wed Apr 22 16:52:37 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_14.
-
- * string.c (str_modify): check for embedded pointer reference.
-
- * gc.c (obj_free): ditto.
-
- * pack.c (pack_pack): p/P template to embed pointers.
-
-Wed Apr 22 00:07:10 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * array.c (ary_rindex): embarrassing typo.
-
-Tue Apr 21 12:31:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_13.
-
- * configure.in (RUBY_LIB): supports --program-{prefix,suffix}.
-
- * array.c (ary_rindex): new method.
-
- * io.c (io_binmode): should return self.
-
-Tue Apr 21 08:23:04 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * parse.y (here_document): calling parse_string with wrong
- arguments.
-
- * struct.c (struct_aset): problem member assignment with name.
-
-Mon Apr 20 14:47:49 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_12.
-
- * time.c (time_arg): args may be string (support for reduced
- implicit type conversion).
-
- * lib/base64.rb: changed to use pack/unpack with `m' template.
-
-Mon Apr 20 06:23:20 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (mod_remove_const): new method.
-
-Sat Apr 18 03:53:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (hash_each_with_index): removed. use Enumerable's
- each_with_index instead.
-
- * class.c (rb_include_module): check for super modules, since
- module's included modules may be changed.
-
-Fri Apr 17 21:50:47 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * marshal.c (r_long): r_byte() may return signed byte.
-
-Fri Apr 17 11:58:30 1998 NAGAI Hidetoshi <nagai@dumbo.ai.kyutech.ac.jp>
-
- * ext/tcltklib/tcltklib.c (lib_mainloop): thread and interrupt check.
-
-Fri Apr 17 11:06:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (find_file): try to fopen() to check whether file exists.
-
- * ruby.c (load_file): ditto.
-
- * struct.c (struct_aset): struct member can be set by member name.
-
-Fri Apr 17 00:47:19 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/extmk.rb.in: added m68k-human support
-
- * file.c (LOCK_SH): defines moved.
-
- * array.c (ary_flatten_bang): simplified loop.
-
-Thu Apr 16 16:52:01 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_11.
-
- * lib/tk.rb: thread support (experimental - maybe slow).
-
- * eval.c (rb_longjmp): trace event on exception in raising
- context, just before raising exception.
-
- * struct.c (struct_s_members): forgot to check singletons.
-
- * struct.c (struct_aref): members can be accessed by names too.
-
- * array.c (ary_flatten): new method.
-
- * eval.c (rb_longjmp): prints exception information with `-d'.
-
- * object.c (any_to_s): remove class name restriction.
-
-Thu Apr 16 01:38:02 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (thread_flock): do not block other threads.
-
- * eval.c (thread_trap_eval): signals are now delivered to the
- current thread again. In case that the current thread is dead,
- signals are forwarded to the main thread.
-
- * string.c (str_new4): need not to duplicate frozen strings.
-
-Wed Apr 15 08:33:47 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * struct.c (struct_inspect): remove restriction for struct names.
-
-Wed Apr 15 02:55:02 1998 Kazuya 'Sharl' Masuda <sharl@www.ufo.co.jp>
-
- * x68 patches to config.sub, ext/extmk.rb.in
-
-Wed Apr 15 01:22:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_dup_frozen): do not duplicate frozen strings.
-
- * parse.y (yylex): allow nested parenthesises.
-
- * io.c (obj_displayln): prints newline after `display'ing the
- receiver.
-
- * io.c (io_puts): avoid generating "\n" each time. use RS_default
- instead.
-
- * io.c (f_p): ditto.
-
-Tue Apr 14 22:18:17 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * struct.c (struct_aref): should not subtract negative index.
-
-Tue Apr 14 11:34:50 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_10.
-
- * parse.y: token names prefixed by `t'.
-
- * struct.c (struct_s_def): supports subclassing of Struct.
-
- * io.c (io_s_new): supports subclassing of IO.
-
-Mon Apr 13 11:07:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (f_binding): need to restore method name.
-
- * eval.c (rb_call0): raises SystemStackError, not Fatal.
-
- * io.c (obj_display): same as `print self'.
-
- * io.c (f_p): can now be called in the method form.
-
- * re.c (reg_regsub): needed to be mbchar aware.
-
-Mon Apr 13 13:18:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thread_trap_eval): all signals delivered to main_thread.
-
-Mon Apr 13 12:47:03 1998 TAKAHASHI Masayoshi <maki@inac.co.jp>
-
- * re.c (kcode_set_option): did not set SJIS on SJIS condition.
-
-Sun Apr 12 22:14:07 1998 Kazunori NISHI <kazunori@swlab.csce.kyushu-u.ac.jp>
-
- * array.c (ary_uniq_bang): should be `==', not `='. embarrassing.
-
-Sat Apr 11 02:13:30 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (ary_subseq): SEGVed for `[][1,1]'.
-
-Fri Apr 10 21:29:06 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * array.c (ary_subseq): add check for beg larger than array length.
-
-Wed Apr 8 17:24:11 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * dir.c (dir_s_open): can be called with block (like IO#open).
-
- * dir.c (dir_s_chdir): print directory path on error.
-
- * dir.c (dir_s_chroot): ditto
-
- * dir.c (Init_Dir): needed to override `new'.
-
-Thu Apr 9 18:24:58 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_09.
-
- * string.c (str_cmp): do not depend on sentinel at the end of the
- strings.
-
- * string.c (str_chomp_bang): forgot to set the sentinel.
-
-Wed Apr 8 00:59:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * bignum.c (big2int): converted int may be too big to fit in
- signed int.
-
- * parse.y (arg): `foo += 1' should not cause an error.
-
- * variable.c (rb_const_defined): returned false even if the
- constant is defined at the top level.
-
- * eval.c (f_local_variables): dyna_var->id may be null. should
- have checked before calling str_new2().
-
-Tue Apr 7 01:15:15 1998 Kaneko Naoshi <wbs01621@mail.wbs.or.jp>
-
- * re.c (reg_regsub): need to check string boundary.
-
-Tue Apr 7 19:19:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_cmp): returns either 1, 0, -1.
-
- * array.c (ary_cmp): should check array length, too
-
-Tue Apr 7 18:50:16 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_08.
-
-Tue Apr 7 18:31:27 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * instruby.rb (mandir): dll installation for cygwin32
-
-Tue Apr 7 01:16:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * config.sub (maybe_os): TOWNS support?
-
- * config.guess: too strict check for libc versions on linuxes.
-
- * experimental release 1.1b9_07.
-
- * array.c (ary_cmp): compare each element using `<=>'.
-
- * hash.c (hash_each_with_index): yields [value, key] pair.
-
- * class.c (class_protected_instance_methods): list protected
- method names.
-
- * class.c (ins_methods_i): exclude protected methods.
-
- * eval.c (PUSH_BLOCK): dynamic variables can be accessed from
- eval() with bindings.
-
-Mon Apr 6 14:49:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thread_yield): must return evaluated value.
-
-Fri Apr 3 13:07:29 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thread_schedule): context switch bypassed on wrong
- conditions.
-
- * variable.c (rb_name_class): set classname by id before String
- class is initialized (1.0 behavior restored).
-
-Fri Apr 3 11:25:45 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (num2int): no implicit conversion from string.
-
- * numeric.c (num2int): check whether `to_i' returns an Integer.
-
- * numeric.c (num_zero_p): new method.
-
- * numeric.c (num_nonzero_p): new method. returns the receiver if
- it's not zero.
-
- * eval.c (obj_instance_eval): the_class should be the object's
- singleton class.
-
- * error.c (exc_s_new): message is converted into a string.
-
-Thu Apr 2 18:31:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (obj_call_init): every object call `initialize'.
-
-Wed Apr 1 08:51:53 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * parse.y (stmt): UNTIL_MOD should be for stmt, not only for expr.
-
-Wed Apr 1 01:20:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (true_and): boolean operators &, | and ^.
-
-Tue Mar 31 13:23:58 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (ary_compact_bang): returns nil, if it does not modify
- the array like String's bang methods.
-
- * array.c (ary_uniq_bang): new method to remove duplicate items.
-
- * eval.c (bind_s_new): new method.
-
- * numeric.c (num2int): raise exception if Fixnums too big to
- convert into `int' in case that sizeof(int) < sizeof(INT).
-
- * string.c (str_center): SEGV on negative width.
-
- * eval.c (eval): forgot to set sourcefile.
-
-Mon Mar 30 11:12:29 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (f_test): raises exception for unknown command.
-
- * eval.c (Init_eval): `class_eval': alias to the module_eval.
-
-Mon Mar 30 18:50:42 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * string.c (str_capitalize_bang): did not check string modification.
-
- * string.c (str_delete_bang): wrong conversion.
-
- * string.c (str_intern): typo in error message.
-
-Mon Mar 30 01:44:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (obj_instance_eval): accepts block as evaluation body.
- No compilation needed each time.
-
- * eval.c (mod_module_eval): ditto
-
- * file.c (file_s_umask): umask did not return old values, if no
- argument given.
-
-Sun Mar 29 00:54:23 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (f_throw): nil returned always.
-
-Sat Mar 28 20:40:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_06.
-
-Sat Mar 28 16:07:11 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * io.c (io_closed): should not cause exception for closed IO.
-
- * string.c (str_tr): returned nil for success.
-
-Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (f_local_variables): new method to return an array of
- local variable names.
-
- * variable.c (obj_instance_variables): now returns an array of
- variable names, as described in the reference.
-
- * eval.c (rb_attr): honors default method visibility of the
- current scope.
-
-Fri Mar 27 13:49:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_05.
-
- * ruby.c (ruby_prog_init): `site_ruby' added to load_path.
-
- * ruby.c (ruby_prog_init): load-path order changed. Paths in
- the RUBYLIB environment variable comes first in non-tainted
- mode.
-
-Thu Mar 26 11:51:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_call): new feature: `protected' methods.
-
- * string.c (str_dump): new method.
-
- * eval.c (block_pass): block argument can be nil, which means no
- block is supplied for the method.
-
-Wed Mar 25 21:20:13 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * string.c (str_reverse_bang): string copied to wrong place.
-
-Wed Mar 25 08:12:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (flo_modulo): caused SEGV if left operand is not a
- float value.
-
- * eval.c (f_eval): optional third and fourth argument to specify
- file-name and line-number.
-
- * eval.c (eval): file-name and line-number set properly.
-
- * parse.y (assign_in_cond): literal assignment is now warning, not
- compile error.
-
- * error.c (Warn): Warn() always print message, OTOH Waring()
- prints when verbose flag is set.
-
-Tue Mar 24 12:50:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (ruby_prog_init): `.' should come last in the load-path.
-
- * eval.c (Init_eval): `__send__', alias for `send'.
-
-Mon Mar 23 12:44:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_chomp_bang): now takes `rs' as an argument.
-
- * eval.c (thread_free): main_thread should not be freed.
-
-Fri Mar 20 16:40:34 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_chomp_bang): chomp! (and other ! methods) returns
- nil if it does not modify the string.
-
- * string.c (str_sub_iter_s): should check last pattern since it
- may be matched to null.
-
-Thu Mar 19 13:48:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_04.
-
- * parse.y (yylex): `10e0.9' should cause syntax error.
-
-Wed Mar 18 17:46:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (load_file): new file object constant DATA. Only
- available for the script from the file.
-
- * regex.c (re_match): forwarding failure point popped too much.
-
-Tue Mar 17 18:23:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * math.c (math_frexp): newly added.
-
- * math.c (math_ldexp): ditto.
-
- * bignum.c (bigdivmod): calculates modulo.
-
- * numeric.c (fix_remainder): returns reminder, formerly introduced
- as modulo.
-
- * numeric.c (fix_modulo): calculates proper `modulo'.
-
- * bignum.c (bigdivmod): wrong sign for reminder.
-
-Mon Mar 16 17:07:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_03.
-
-Mon Mar 16 16:33:53 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * io.c (pipe_finalize): needed to add pipe_finalize to pipes on
- cygwin32.
-
-Mon Mar 16 14:11:06 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (ins_methods_i): needed to consider NOEX_UNDEF.
-
-Mon Mar 16 13:23:53 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * io.c (io_check_closed): check for `fptr->f2 == NULL'.
-
- * io.c (io_fptr_close): ditto.
-
-Mon Mar 16 11:49:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (pipe_atexit): free()ing referencing pipe_list.
-
- * range.c (range_length): returns zero, if the first is greater
- than the last.
-
- * signal.c (trap_restore_mask): restore signal mask before raising
- exceptions and throws.
-
-Fri Mar 13 13:49:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_02.
-
- * object.c (mod_clone): need to dups constants and instance
- variables.
-
- * eval.c (rb_eval): forgot to initialize body for NODE_DEFS.
-
- * eval.c (rb_eval): retrieve self from calling frame, since self
- changes sometimes.
-
- * env.h (FRAME): need to save self in the calling frame.
-
- * io.c (f_gets_method): rs should be initialized by RS.
-
-Thu Mar 12 15:33:57 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * experimental release 1.1b9_01.
-
- * range.c (range_s_new): check values by `first <= last'.
-
- * parse.y (lastline_set): fixed offset for $_ and $~ in the local
- variable space.
-
-Wed Mar 11 02:14:17 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_gets): handle normal case specially for speed.
-
- * eval.c (rb_disable_super): function to disable superclass's
- method explicitly.
-
- * eval.c (rb_eval): inherits previous method definition's
- NOEX_UNDEF-ness, if exists.
-
- * class.c (rb_define_method): disables superclass's overriding
- method by default.
-
-Wed Mar 11 01:40:48 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * numeric.c (flo_gt,etc.): do not depend on `<=>', to handle NaN.
-
-Tue Mar 10 00:03:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (load_file): understands multiple options in #! line.
-
- * regex.c (re_compile_pattern): support for [:alpha:] etc.
-
-Mon Mar 9 16:53:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.h (GetOpenFile): embed io_check_closed in GetOpenFile.
-
- * sprintf.c (f_sprintf): zero padding failed for negative
- integers.
-
- * sprintf.c (remove_sign_bits): failed to remove some bits.
-
-Sat Mar 7 21:51:46 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * class.c (ins_methods_i): body may be NULL for some case.
-
-Fri Mar 6 17:23:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (mbcinit): table driven mbchar detection.
-
- * object.c (obj_alloc): check for allocating instance for the
- primitive classes (mostly perfect).
-
- * ext/curses/curses.c (curses_finalize): restore original state at
- interpreter termination.
-
- * ext/curses/curses.c (curses_addstr): forgot to check argument
- type (caused SEGV). now uses STR2CSTR() macro.
-
-Thu Mar 5 13:47:39 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (block_pass): accepts method object as block args.
-
- * eval.c (f_missing): use any_to_s() for stringify.
-
-Wed Mar 4 01:39:52 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (block_arg): new syntax - block argument in the
- calling arglist.
-
- * eval.c (rb_call): no module search. simplified a lot.
-
- * eval.c (rb_eval): block arg support.
-
- * parse.y (f_block_arg): new syntax - block argument in the
- formal arglist.
-
-Tue Mar 3 14:20:15 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (obj_method): returns bound method object.
-
- * eval.c (rb_call): argument check for empty methods.
-
- * ruby.h (NUM2CHR): new macro, originally from curses module.
-
-Tue Mar 3 13:03:35 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * io.c (io_putc): new method.
-
-Tue Mar 3 11:21:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_inspect): more strict charcode detection.
-
- * eval.c (thread_stop): stopping only thread raises ThreadError
- exception.
-
-Tue Mar 3 08:04:56 1998 Tadayoshi Funaba <tadf@kt.rim.or.jp>
-
- * struct.c (struct_alloc): incomplete struct initialization made
- GC to access unallocated addresses.
-
-Mon Mar 2 16:28:27 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (thread_stop_method): remove Thread#stop.
-
-Fri Feb 27 18:16:26 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b9 released.
-
-Fri Feb 27 09:36:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (hash_delete_nil): needed to compare value to nil, since
- nil is the valid key for hashes.
-
- * hash.c (hash_foreach_iter): rehashing causes IndexError.
-
- * hash.c (hash_foreach_iter): rehash check by pointer comparison.
-
-Thu Feb 26 17:22:13 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (fname): convert reswords into symbols.
-
- * parse.y (reswords): reserved words are now embedded in the
- syntax (sigh).
-
- * parse.y: now reserved words can be method names safely.
-
-Wed Feb 25 15:50:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (mod_module_eval): clear the_scope's PRIVATE flag before
- calling eval().
-
- * gc.c (gc_call_finalizer_at_exit): run finalizers before any data
- object being freed.
-
- * eval.c (rb_eval): needed to keep prot_tag->retval before
- evaluating the ensure clause.
-
-Tue Feb 24 11:16:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): reserved words can be appear as method names at
- right after 'def' and `.'(dot), like foo.next.
-
- * eval.c (return_check): checks for return out of thread (formerly
- done in return_value).
-
- * eval.c (POP_TAG): copy retval to outer level.
-
- * eval.c (return_value): just set retval, no check, no unwinding.
-
- * parse.y (nextc): line continuation by backslash at end of line.
-
- * regex.c (re_compile_pattern): forgot to clear pending_exact on
- closing parentheses.
-
- * parse.y (assignable): should not assign dyna_var to true, if it
- is already defined.
-
-Mon Feb 23 14:35:03 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (obj_is_kind_of): no longer accepts true/false/nil.
-
- * object.c ({true,false,nil}_to_i): can be converted into integers.
-
-Mon Feb 23 12:11:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (reg_s_quote): needed to be mbchar aware.
-
- * eval.c (proc_s_new): wrong iter mark.
-
-Sat Feb 21 22:59:30 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * io.c (f_syscall): no argument check.
-
-Fri Feb 20 10:17:51 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b8 released.
-
- * ext/kconv/kconv.c (kconv_kconv): default output code now be
- determined according to the value of $KCODE.
-
- * re.c (rb_get_kcode): can retrieve $KCODE from C code.
-
- * parse.y (stmt): if/unless modifiers returns nil, if condition is
- not established.
-
-Thu Feb 19 11:06:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/kconv/kconv.c (kconv_kconv): charcode can be specified by
- code name (JIS, SJIS, EUC like value of $KCODE).
-
- * regex.c (re_compile_pattern): forgot to fixup_jump for (?:..).
-
- * regex.c (re_compile_pattern): needed to clear pending_exact on
- non-registering grouping (?:...).
-
-Wed Feb 18 19:54:21 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (here_document): needed to set lex_state to EXPR_END.
-
-Wed Feb 18 18:45:10 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * patches for cygwin32 applied.
-
-Wed Feb 18 00:41:31 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_sub_s): needed to be mbchar aware to increment one
- character.
-
- * regex.c (re_match): \Z matches newline just before the end of
- the string.
-
-Tue Feb 17 00:04:32 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_arg): Time.gm and Time.local now understands
- Time#to_a format.
-
- * string.c (str_sub_s): replace happened twice for null pattern.
-
- * regex.c (re_search): null pattern should not match after newline
- at the end of string.
-
- * time.c (time_isdst): now returns boolean value.
-
- * error.c (rb_check_type): treat special constants in messages.
-
- * parse.y (yylex): new form `::Const' to see toplevel constants.
-
- * parse.y (cond): SEGV on `if ()'.
-
- * gc.c (obj_free): some data needed explicit free().
-
-Mon Feb 16 23:55:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (blk_free): release duplicated block informations.
-
- * eval.c (blk_copy_prev): duplicate outer block information into
- the heap, when proc/binding created.
-
-Mon Feb 16 14:38:25 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_mon): now 1 for January and so on.
-
- * time.c (time_year): year in 19xx (no + 1900 needed anymore).
-
-Mon Feb 16 13:28:33 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): need to fetch mbchar's second byte
- without translation.
-
-Mon Feb 16 12:29:27 1998 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * eval.c (f_pass_block): pass iterator block to other method.
-
-Fri Feb 13 08:16:11 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (parse_regx): handle \s before read_escape().
-
- * parse.y (read_escape): `\s' in strings as space.
-
-Tue Feb 10 17:29:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b7 released.
-
- * string.c (str_aset): string insertion by `str[n] = str2'.
-
- * string.c (str_oct): does recognize `0x'.
-
- * sprintf.c (f_sprintf): use base 10 for conversion from string to
- integer.
-
-Mon Feb 9 14:51:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * numeric.c (do_coerce): proper error message.
-
- * string.c (str_sum): bug - masked by wrong value. (sigh..)
-
-Sat Feb 7 15:11:14 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_empty): new method
-
-Fri Feb 6 01:42:15 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c (time_asctime): use asctime(3), not strftime(3).
-
-Thu Feb 5 18:58:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_fptr_close): do not free path on close().
-
- * array.c (ary_filter): new method.
-
- * enum.c (enum_each_with_index): new method.
-
-Thu Feb 5 14:10:35 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (primary): singleton class def can be appeared inside
- method bodies.
-
- * hash.c (hash_replace): replace content.
-
- * string.c (str_replace_method): replace content.
-
- * array.c (ary_replace_method): replace elements.
-
- * string.c (str_succ_bang): String#succ!
-
-Thu Feb 5 18:20:30 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * string.c (str_upcase_bang): multi byte character support.
-
-Wed Feb 4 13:55:26 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (ary_reverse): SEGV on empty array reverse.
-
-Tue Feb 3 12:24:07 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (match_to_a): non matching element should be nil.
-
- * ruby.c (ruby_load_script): load script after all initialization.
-
- * bignum.c (str2inum): need to interpret prefix `0' of `0x'.
-
-Tue Feb 3 10:00:18 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * numeric.c (fix_rshift): use `sizeof(INT)*8' instead of 32.
-
-Mon Feb 2 14:09:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (set_arg0): grab environment region too.
-
-Thu Jan 29 18:36:25 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * process.c (rb_proc_exec): check `sh' to be exist.
-
-Thu Jan 29 18:18:19 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_stdio_set): assignment to $stdin or $stdout does
- reopen() as well as $stderr.
-
-Thu Jan 29 14:18:40 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (mod_ancestors): should not include singleton classes.
-
- * object.c (obj_type): should not return internal class.
-
- * io.c (io_reopen): unwillingly closes stdio streams.
-
-Thu Jan 29 11:50:35 1998 Toshihiko SHIMOKAWA <toshi@csce.kyushu-u.ac.jp>
-
- * ext/socket/socket.c (udp_addrsetup): forgot to use htons().
-
-Tue Jan 27 23:15:24 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * keywords: __FILE__, __LINE__ are available again.
-
-Fri Jan 23 14:19:28 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b6 released.
-
- * object.c (mod_to_s): need to duplicate classpath.
-
- * error.c (exc_inspect): need to duplicate classpath.
-
-Thu Jan 22 00:37:47 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.h (STR2CSTR): new macro to retrieve char*.
-
- * class.c (rb_define_method): `initialize' should always be
- private, even if it defined by C extensions.
-
- * eval.c (rb_eval): `initialize' should always be private.
-
-Thu Jan 22 16:21:08 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): some singleton class def cause SEGV.
-
- * eval.c (TMP_ALLOC): replace ALLOCA_N, where thread context
- switch may happen.
-
-Wed Jan 21 01:43:42 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (PUSH_FRAME): do not use ALLOCA_N(). crash on some
- platforms that use missing/alloca.c.
-
- * regex.c (re_compile_pattern): too many pops for non register
- subexpr.
-
- * parse.y (yylex): open parentheses after identifiers are argument
- list, even if whitespaces have seen.
-
-Tue Jan 20 15:19:59 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (terms): quoted word list by %w(a b c).
-
- * ext/tcltklib/extconf.rb: more accurate check for tcl/tk libs.
-
- * file.c (rb_stat): most of the FileTest methods (and function
- `test') accept File objects as the argument.
-
-Tue Jan 19 18:19:24 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/extmk.rb.in (install): there should be no newline after install:
-
- * re.c (MIN): renamed from min(). there's a local variable named
- min in the file, so that some cpp will raise an error.
-
-Mon Jan 19 16:30:05 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b5 released.
-
- * process.c (rb_syswait): no exception raised.
-
-Fri Jan 16 00:43:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.h (CLONESETUP): copies its singleton classes too.
-
- * class.c (singleton_class_attached): saves binded object in the
- singleton classes.
-
- * eval.c (rb_eval): calls singleton_method_added even in the
- singleton class clauses.
-
-Fri Jan 15 23:22:43 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ruby.c (proc_options): -S does not recognize PATH.
-
-Thu Jan 15 02:03:12 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_clear_cache_by_id): clear only affected cache
- entries.
-
-Wed Jan 14 02:14:48 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c: new UDP/IP socket classes.
-
-Tue Jan 13 10:00:18 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_cmp): ignorecase($=) works wrong.
-
-Fri Jan 9 13:19:55 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b4 released.
-
- * eval.c (f_missing): class name omitted from the error message.
-
- * error.c (exc_inspect): description changed.
-
- * string.c (Init_String): GlobalExit's superclass did not filled,
- since GlobalExit created earlier than String.
-
-Thu Jan 8 12:10:09 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (aryset): expr in the brackets can be null.
-
-Wed Jan 7 21:13:56 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_reopen): keep stderr unclosed.
-
- * io.c (io_errset): keep stderr unclosed.
-
-Tue Jan 6 00:27:43 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y: syntax modified for `while expr do .. end' etc.
-
- * process.c (f_exec,f_system): can supply arbitrary name for the
- new process.
-
-Mon Jan 5 16:59:13 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * file.c (file_s_basename): removes any extension by ".*".
-
-Sun Jan 4 19:36:22 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * parse.y (yylex): needed to update lex_p (reading point).
-
-Sat Jan 3 19:14:14 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * class.c,object.c: duplicate defines mKernel and cFinxnum.
-
-Fri Jan 2 20:38:59 1998 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/curses/curses.c (NUM2CHAR): uses the first character for
- string arguments.
-
- * array.c (ary_fill): did not extend array for ranges.
-
- * array.c (beg_len): did not return end pos bigger than size.
-
-Fri Jan 2 02:09:16 1998 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * dir.c (dir_s_chdir): bug in nil check.
-
- * array.c (ary_fill): bug in nil check.
-
-Tue Dec 30 11:46:23 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * hash.c (env_path_tainted): checks directories in PATH
- environment variable are not world writable.
-
- * ruby.c (load_file): invoke specified interpreter if the #! line
- does not contain the word `ruby'.
-
-Fri Dec 26 03:26:41 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (uscore_get): type information included in the error
- message.
-
- * variable.c (f_untrace_var): does not free trace-data within
- trace procedure.
-
-Thu Dec 25 02:50:29 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b3 released.
-
- * ruby.h: inlining some functions on gcc 2.x
-
-Tue Dec 23 02:47:33 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): public/private information kept in the current
- scope, to remove undesired state from the class/module.
-
- * time.c (time_strftime): remove hidden limit of 100 bytes of
- result string, using malloc'ed buffer.
-
- * hash.c (hash_update): merges the contents of another hash,
- overriding existing keys.
-
- * regex.c (must_instr): totally re-written.
-
- * io.c (read_all): try to allocate proper sized buffer using
- fstat(2) for speedup.
-
-Sat Dec 20 00:27:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (must_instr): need to skip 2 bytes for mbchars.
-
-Fri Dec 19 01:18:29 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b2 released.
-
- * eval.c (check_errat): check and convert (if necessary) traceback
- information before assigning to the variable $@.
-
- * eval.c (f_raise): optional third argument to specify traceback
- information.
-
- * io.c (f_open): prevent infinite recursive call.
-
-Thu Dec 18 19:33:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_rindex): now accepts regexp as index.
-
-Thu Dec 18 18:42:50 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/socket/extconf.rb: modified to detect win32 socket lib.
-
-Thu Dec 18 00:25:03 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * re.c (reg_equal): checks for source and casefold and kcode matching.
-
- * marshal.c: became built-in module.
-
- * ext/marshal/marshal.c (r_object): displays struct name for
- non-compatible struct.
-
- * string.c (str_index_method): now searches character (fixnum) in
- the string.
-
- * string.c (str_include): redefine `include?'.
-
- * regex.c (re_match): start_nowidth saves current stack position
- to stop_nowidth.
-
- * regex.c (re_compile_pattern): add space to stop_nowidth to save
- runtime stack position.
-
-Tue Dec 16 14:57:43 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (scan_once): wrong exception for regexp that match with
- null string (use substr instead of subseq).
-
-Sat Dec 13 00:13:32 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (expr): remove bare assocs from expr rule.
-
- * rbconfig.rb: renamed from config.rb (it was too generic name).
-
-Fri Dec 12 00:50:25 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (expr): warns if BEGIN or END appear in the method
- bodies.
-
- * string.c (str_match): calls y =~ x if y is neither String nor
- Regexp so that eregex.rb works.
-
- * eval.c (f_at_exit): to register end proc.
-
- * class.c (rb_define_module_function): define 'function' method
- for the Module, not private method.
-
- * class.c (rb_define_function): function to define `function' method.
-
- * eval.c (rb_eval): inherit visibility from superclass's method
- except when it is set to `function'
-
- * eval.c (rb_eval): new visibility status `function'.
-
- * parse.y (yycompile): do not clear eval_tree. thus enable multiple
- command line script by option `-e'.
-
- * eval.c (rb_eval): END execute just once.
-
- * parse.y (expr): BEGIN/END built in the syntax.
-
-Thu Dec 11 13:14:35 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (mod_le): Module (or Class) comparison.
-
- * eval.c (rb_remove_method): raises NameError if named method does
- not exist.
-
- * ext/curses/curses.c: remove CHECK macro for BSD curses.
-
-Thu Dec 11 12:44:01 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * pack.c: sun4 cc patch
-
-Wed Dec 10 15:21:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/marshal/marshal.c (marshal_load): can supply evolution proc
- object as optional second argument.
-
- * re.c (reg_source): get source string of the regular expression.
-
-Tue Dec 9 10:05:17 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b1 released.
-
- * parse.y (tokadd): token buffer overrun.
-
- * ruby.c (ruby_prog_init): forgot to protect rb_argv0 from gc.
-
- * eval.c (ruby_run): call finalizers at process termination.
-
- * gc.c (gc_call_finalizer_at_exit): call free proc for every Data
- Wrapper, and finalizer for specified objects at termination.
-
- * version.c (show_version): version format changed.
-
- * regex.c (re_match): wrong match with non-greedy if they appear
- more than once in regular expressions.
-
- * sample/ruby-mode.el (ruby-expr-beg): forgot to handle modifiers.
-
-Mon Dec 8 19:00:15 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_puts): just put a newline if no argument given.
-
- * ext/tcltklib/tcltklib.c (lib_mainloop): thread-aware tk handle
- when $tk_thread_safe is set.
-
- * ext/tcltklib/tcltklib.c (lib_mainloop): use Tcl_DoOneEvent()
- instead of Tk_MainLoop().
-
-Mon Dec 6 07:11:16 1997 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * io.c (io_puts): core dumped without any argument.
-
-Fri Dec 5 18:17:17 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (mod_remove_method): remove (not undef) a method from the
- class/module.
-
- * variable.c (obj_remove_instance_variable): method to remove
- instance variables.
-
-Thu Dec 4 13:50:29 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1b0 released.
-
- * string.c (str_aref): called str_index for regexp.
-
-Mon Dec 1 15:24:41 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * compar.c (cmp_between): wrong comparison made.
-
-Wed Nov 26 18:18:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * lib/mkmf.rb: generate Makefile for extension modules out of ruby
- source tree. use like `ruby -r mkmf extconf.rb'.
-
- * numeric.c (fix2str): enlarge buffer to prevent overflow on some
- machines.
-
- * parse.y (here_document): wrong line number generated after here-doc.
-
-Fri Nov 21 13:17:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (yylex): skip multibyte characters in comments.
-
-Wed Nov 19 17:19:20 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (nil_to_a): nil.to_a => [].
-
- * parse.y (call_args): wrong node generation.
-
-Tue Nov 18 10:13:08 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * array.c (Init_Array): Array#=== works as Array#include?
-
- * regex.c (re_compile_pattern): insert initialize code for jump_n,
- before entering loops.
-
- * re.c (reg_search): does not save registers unless $& etc appear
- in the script.
-
-Mon Nov 17 13:01:43 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (is_defined): add defined? check for receivers and
- arguments for calls.
-
- * re.c (reg_search): cache last match object.
-
- * re.c (match_aref): $[0] etc. are available.
-
-Sat Nov 15 00:11:36 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * io.c (io_s_popen): "rb" detection
-
-Fri Nov 14 18:28:40 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (scan_once): returns whole match if the pattern does
- not contain any parentheses.
-
-Thu Nov 13 14:39:06 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (str_sub): returns copy of the receiver string, even if
- any substitution occurred.
-
- * regex.c (re_compile_pattern): no-width match by (?=..), (?!..).
-
-Wed Nov 12 13:44:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * time.c: remove coerce from Time class.
-
- * regex.c (re_match): non-greedy match by ??, *? +?, {n,m}?.
-
-Mon Nov 10 11:24:51 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): non-registering parens (?:..).
-
- * regex.c (re_compile_pattern): new meta character \< (wordbeg)
- and \> (wordend).
-
- * regex.c (re_compile_pattern): embedded comment for regular
- expression by (?#...).
-
-Fri Nov 7 16:58:24 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * regex.c (re_compile_pattern): perl5 regexp \A and \Z available.
-
- * regex.c (re_compile_pattern): can expand compile stack dynamically.
-
- * regex.c (PUSH_FAILURE_POINT): wrong compare condition.
-
-Wed Nov 2 16:00:00 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * string.c (str_sub_s): "".sub! "", "" => "\000"
-
-Fri Oct 31 15:52:10 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (assoc): keyword assoc like {fg->"black"}.
-
-Thu Oct 30 17:33:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_println): print with newline, which is not affected by
- the values of $/ and $\.
-
-Thu Oct 30 16:54:01 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * string.c (str_chop_bang): "".chop caused SEGV.
-
- * string.c (str_chomp_bang): method to chop out last newline.
-
-Mon Oct 27 13:49:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/extmk.rb.in: library may have pathname contains `.'
-
- * eval.c (rb_rescue): should not protect SystemError.
-
-Fri Oct 24 10:58:53 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_s_with_open_stream): ensures to close stream.
-
-Thu Oct 23 11:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_errset): value of $stderr can be changed (to any IO
- object).
-
- * io.c (next_argv): $< can be anything that responds to `write'.
-
- * file.c (file_s_with_open_file): ensures to close file.
-
- * error.c (exception): create error under the current class/module.
-
- * range.c (range_eqq): fixnum check for last needed too.
-
-Wed Oct 22 12:52:30 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/socket/socket.c: Socket::Constants added.
-
- * file.c: File::Constants added for inclusion.
-
- * array.c (ary_join): call ary_join() recursively for the 1st
- array element.
-
-Mon Oct 20 12:18:29 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ruby.c (load_file): wrong condition for #! check with -x.
-
- * file.c (file_s_dirname): did return "" for "/a".
-
-Fri Oct 17 14:29:09 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c: now works on alpha-linux.
-
- * bignum.c (bigadd): some undefined side effect order assumed.
-
-Wed Oct 15 17:49:24 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * intern.h: function prototypes added.
-
-Mon Oct 13 16:54:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (rb_define_class_id): call superclass's `inherited'
- method when making subclasses.
-
- * parse.y (nextc): clear lex_lastline at the end of file.
-
- * object.c (Init_Object): need to undef Class#append_features.
-
- * eval.c (rb_eval): no warning on extending classes or modules.
-
-Thu Oct 9 11:17:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (error_print): the exception name follows after the error
- message.
-
- * eval.c (compile_error): error message slightly changed.
-
- * parse.y (nextc): script parsing will be terminated by __END__ at
- beginning of line.
-
- * eval.c (compile_error): `__END__' is no longer a keyword.
-
- * parse.y (nextc): protect lastline read from script stream.
-
-Tue Oct 7 14:06:06 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha9 released.
-
- * eval.c (mod_append_features): renamed from extend_class.
-
- * eval.c (rb_eval): defining method calls `method_added'.
-
- * eval.c (ruby_options): exception while processing options must
- terminate the interpreter.
-
- * error.c (Init_Exception): wrong method configuration. `new'
- should have been a singleton method.
-
-Mon Oct 6 18:55:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/kconv/kconv.c (kconv_guess): code to guess character code
- from string.
-
-Mon Oct 6 18:38:17 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * pack.c: now encode/decode base64 by `m' template.
-
-Fri Oct 3 10:51:10 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * MANIFEST: needed to include lex.c in the distribution.
-
- * eval.c (ruby_options): f_require() called too early.
-
- * eval.c (rb_provide): module extensions should always be `.o'.
-
-Thu Oct 2 11:38:31 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha8 released.
-
- * ext/marshal/marshal.c (r_object): remove temporal regist for
- structs. (caused problem if structs form cycles.)
-
- * parse.y (match_gen): static binding for match(=~) calls
- with regexp literals.
-
-Wed Oct 1 15:26:55 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c: protect retval in struct tag from GC for C_ALLOCA.
-
- * eval.c: no more pointer value from setjmp/longjmp.
-
-Wed Oct 1 14:01:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/marshal/marshal.c (w_byte): argument must be char.
-
-Wed Oct 1 10:30:22 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (mod_const_at): global constants now belongs to the
- class Object.
-
- * object.c (Init_Object): new global constant NIL.
-
- * ext/marshal/marshal.c (marshal_dump): try to set binmode.
-
- * ext/marshal/marshal.c (r_object): forgot to re-regist structs in
- the object table.
-
- * eval.c (ruby_options): call Init_ext() before any require()
- calls by `-r'.
-
-Fri Sep 30 14:29:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/marshal/marshal.c (w_object): marshal dumped core.
-
-Tue Sep 30 10:27:39 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sample/test.rb: bignum test suits added.
-
- * eval.c (rb_eval): new pseudo variable `true' and `false'.
-
- * parse.y: new keywords `true' and `false' added.
-
-Mon Sep 29 13:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (forbid_setid): forbid some options in suid mode.
-
- * ruby.h (NUM2DBL): new macro to convert into doubles.
-
-Mon Sep 27 09:53:48 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
-
- * bignum.c: modified for speeding.
-
-Fri Sep 26 18:27:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * sample/from.rb: some extensions.
-
-Mon Sep 29 13:15:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.
-
-Fri Sep 26 14:41:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (ruby_run): deferred calling Init_ext() just before eval_node.
-
-Fri Sep 26 13:27:24 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * io.c (io_isatty): forgot to return TRUE value.
-
-Fri Sep 25 11:10:58 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
-
- * eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
- platforms.
-
-Wed Sep 24 17:43:13 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * string.c (Init_String): String#taint and String#taint? added.
-
- * class.c (mod_ancestors): ancestors include the class itself.
-
-Wed Sep 24 00:57:00 1997 Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
-
- * X68000 patch.
-
-Tue Sep 23 20:42:30 1997 EGUCHI Osamu <eguchi@shizuokanet.or.jp>
-
- * parse.y (node_newnode): SEGV on null node setup.
-
-Mon Sep 22 11:22:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (ruby_prog_init): wrong safe condition check.
-
-Sun Sep 21 14:46:02 1997 MAEDA shugo <shugo@po.aianet.ne.jp>
-
- * error.c (exc_inspect): garbage added to classpath.
-
-Fri Sep 19 11:49:23 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (newtok): forgot to adjust buffer size when shrinking
- the token buffer.
-
- * enum.c (enum_find): rb_eval_cmd() does not return value.
-
- * io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
- no longer used.
-
-Tue Sep 16 17:54:25 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * file.c (f_test): problem if wrong command specified.
-
- * ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.
-
- * ruby.c (ruby_prog_init): should not add path from environment
- variable, if ruby is running under setuid.
-
- * process.c (init_ids): check suid check for setuid/seteuid etc.
-
-Mon Sep 15 00:42:04 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * regex.c (re_compile_pattern): \w{3} and \W{3} did not work.
-
-Thu Sep 11 10:31:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha7 released.
-
- * ext/socket/socket.c (sock_new): no setbuf() for NT.
-
- * io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.
-
-Wed Sep 10 15:55:31 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ext/marshal/marshal.c (r_bytes0): extra big length check.
-
-Tue Sep 9 16:27:14 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (pipe_fptr_atexit): clean up popen()'ed fptr.
-
- * error.c (set_syserr): some system has error code that is bigger
- than sys_nerr. grrr.
-
-Mon Sep 8 18:33:33 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * io.c (io_s_new): dereferenced nil for optional mode.
-
-Fri Sep 5 10:26:03 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (class_instance_methods): do not include methods which
- are changed to private in subclasses.
-
-Thu Sep 4 12:38:53 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * variable.c (f_global_variables): list name of the global
- variables.
-
- * object.c (obj_id): returns unique integer.
-
-Wed Sep 3 14:05:16 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha6 released.
-
- * eval.c (mod_s_constants): context sensitive constant list.
-
- * variable.c (mod_constants): no more `all' option.
-
- * variable.c (mod_const_of): the values for autoload classes are
- their name strings.
-
- * class.c (class_instance_methods): no special treatment for
- singleton classes.
-
- * object.c (obj_singleton_methods): returns list of singleton
- method names.
-
- * parse.y (yylex): no here document after `class' keyword.
-
- * eval.c (f_load): expand path if fname begins with `~'.
-
-Tue Sep 2 13:19:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (ins_methods_i): do not list undef'ed methods.
-
-Mon Sep 1 13:42:48 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha5 released.
-
- * object.c (mod_attr_reader): create methods to define attribute
- reader/write/accessor.
-
- * class.c (rb_define_attr): always defines accessors.
-
- * eval.c (rb_call): alias occurred in the module body caused SEGV.
-
- * parse.y: did not generate here document strings properly.
-
-Mon Sep 1 11:43:57 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * parse.y (yylex): heredoc dropped an extra character.
-
-Fri Aug 29 11:10:21 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * class.c (class_instance_methods): same method names should not
- appear more than once.
-
- * parse.y (yylex): spaces can follow =begin/=end.
-
- * variable.c (find_class_path): look for class_tbl also for
- unnamed fundamental classes, such as Object, String, etc.
-
- * variable.c (rb_name_class): can't name class before String class
- is initialized.
-
- * inits.c (rb_call_inits): unrecognized dependency from GC to
- Array.
-
- * variable.c (find_class_path): could not find class if Object's
- iv_tbl is NULL.
-
-Thu Aug 28 13:12:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha4 released.
-
- * variable.c (mod_constants): wrong condition for singleton
- class.
-
- * parse.y (yylex): revised `=begin' skip code.
-
- * parse.y (here_document): forgot to free(eos).
-
- * parse.y (yylex): spaces after `<<' prohibited for here
- documents to avoid confusing with operator `<<'.
-
- * eval.c (is_defined): separated from rb_eval().
-
-Wed Aug 27 11:32:42 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha3 released.
-
- * variable.c (mod_name): returns name of the class/module.
-
- * parse.y (here_document): finally here document available now.
-
- * variable.c (fc_i): some classes/modules does not have iv_tbl.
-
- * variable.c (find_class_path): avoid infinite loop.
-
-Tue Aug 26 13:43:47 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (rb_eval): undef'ing non-existing method will raise
- NameError exception.
-
- * object.c (class_s_new): needed to create metaclass too.
-
- * eval.c (error_print): no class name print for anonymous class.
-
- * eval.c (rb_longjmp): proper exception raised if raise() called
- without arguments, with $! or $@ set.
-
- * object.c (Init_Object): superclass()'s method argument setting
- was wrong again.
-
- * class.c (mod_ancestors): list superclasses and included modules
- in priority order.
-
-Mon Aug 25 11:53:11 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha2 released.
-
- * sample/ruby-mode.el (ruby-parse-region): auto-indent now
- supports "\\" in the strings.
-
- * struct.c (struct_getmember): new API to get member value from C
- language side.
-
-Sat Aug 23 21:39:05 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * parse.y (assignable): remove unnecessary local variable
- initialize by nil.
-
-Fri Aug 22 14:26:40 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (error_print): modified exception print format.
-
-Thu Aug 21 16:10:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
- calculated with keyword operators.
-
-Thu Aug 21 11:36:58 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * parse.y (arg): ary[0] += 1 cause SEGV
-
-Wed Aug 20 17:28:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * ruby.c (ruby_process_options): require() all modules after
- processing all options
-
- * process.c (rb_proc_exec): more security checks added.
-
- * process.c (rb_proc_exec): insecure path on exec.
-
- * hash.c (f_getenv): PATH modification security check.
-
-Tue Aug 19 00:15:38 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha1 released.
-
- * eval.c (mod_eval): work as normal eval() if second binding
- argument given.
-
- * eval.c (rb_call): did not raise ArgumentError if too many
- arguments more than optional arguments (without rest arg).
-
- * eval.c (rb_eval): did not work well for op_asgn2 (attribute
- self assignment).
-
- * eval.c (Init_Thread): returns main thread.
-
-Mon Aug 18 09:25:56 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * object.c (inspect_i): did not display T_DATA instance variables.
-
- * parse.y: provides more accurate line number information.
-
- * eval.c (thread_value): include value's backtrace information in
- the variable `$@'.
-
- * eval.c (f_abort): print backtrace and exit.
-
-Sat Aug 16 00:17:44 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (class_new_instance): do not make instance from virtual
- classes.
-
- * object.c (class_s_new): do not make subclass of singleton class.
-
-Fri Aug 15 15:49:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * eval.c (call_trace_func): block context switch in the trace
- function.
-
- * eval.c (rb_eval): clear method cache at class extension.
-
- * object.c (obj_type): returns object's class even if it defines
- singleton methods.
-
-Fri Aug 15 19:40:43 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
-
- * ext/socket/socket.c (Init_socket): small typo caused SEGV.
-
-Wed Aug 13 17:51:46 1997 Yukihiro Matsumoto <matz@netlab.co.jp>
-
- * version 1.1 alpha0 released.
-
-Local variables:
-add-log-time-format: (lambda ()
- (let* ((time (current-time))
- (diff (+ (cadr time) 32400))
- (lo (% diff 65536))
- (hi (+ (car time) (/ diff 65536))))
- (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-end:
diff --git a/doc/NEWS-1.8.0 b/doc/NEWS-1.8.0
deleted file mode 100644
index b4445fa59f..0000000000
--- a/doc/NEWS-1.8.0
+++ /dev/null
@@ -1,837 +0,0 @@
-= command line options
-
-: -W option
-
- new option to specify warning level. -W0 to shut up warnings, -W1 for normal level,
- -W2 for verbose level. -w equals to -W2.
-
-= language syntax
-
-: arbitrary delimited string array
-
- %W(...) notation, word list literal like %w(...) with the
- exception that #{} interpolation is allowed.
-
-: arbitrary delimited symbol literl
-
- :"foo", :"foo#{bar}", etc.
-
-: expression interpolation in strings
-
- Now arbitrary statements are allowed inside #{} interpolation
- without escapes. In other hand, they can no longer access to
- variables defined in eval.
-
-: negative number literals
-
- Digits preceded minus sign is a literal integer.
-
-: array expansion
-
- Fixed with the following behavior:
-
- a = *[1]
- p a #=> [1]
-
- Now 1-element array in rhs is expanded properly.
-
- a = *[1]
- p a #=> 1
-
-: break and next
-
- Extended to take an optional expression, which is used as a value
- for termination.
-
-: direct assignment to Foo::Bar is allowed
-
- also, you can define "class Foo::Bar; end".
-
-= language core
-
-: $stdin, $stdout, $stderr
-
- can be assignable again. the original stdio are preserved as STDIN,
- STDOUT, STDERR.
-
-: $VERBOSE now has 3 levels
-
- nil - silence, false - medium (default), true - verbose
-
-: allocation framework
-
- any instance of class can be allocated by class.allocate,
- (except for a few classes).
-
-: comparison of exception classes in a rescue clause
-
- changed to use Module#=== for comparing $! with the exception
- class specified in each rescue clause.
-
- as the previous behavior was to use kind_of?, the effect is limited
- to the SystemCallError case. SystemCallError.=== has been newly
- defined to return true when the two have the same errno. With this
- change, SystemCallError's with the same errno, such as Errno::EAGAIN
- and Errno::EWOULDBLOCK, can both be rescued by listing just one of
- them.
-
-: constants lookup
-
- improved at the performance of searching by using an internal hash
- table.
-
- calls const_missing method of the class/module, if constant is not
- found in the look up path.
-
-: expression parenthesis in the first argument
-
- altered to get the following code (note the space after p):
-
- p ("xx"*2).to_i
-
- Interpreted as:
-
- p (("xx"*2).to_i)
-
- Instead of:
-
- (p("xx"*2)).to_i
-
-: implicit comparison in conditional expressions
-
- Obsoleted except when it is used in -e.
-
- : between Range and $.
- Use explicit comparison instead.
-
- : between Regexp and $_
- Use the unary method ~/re/ instead.
-
-: to_str
-
- added to get objects which define to_str() treated as String's.
-
- now almost all the built-in methods try each argument with to_str()
- when they expect it to be a String.
-
- foo = Object.new
- class <<foo
- def to_str
- "foo"
- end
- end
- p File.open(foo)
- => -:7:in `open': wrong argument type Object (expected String) (TypeError)
- ruby 1.6.4 (2001-04-19) [i586-linux]
- => -:7:in `open': No such file or directory - "foo" (Errno::ENOENT)
- ruby 1.7.0 (2001-05-02) [i586-linux]
-
-: multiple assignment behavior
-
- Fixed so that "*a = nil" results in "a == []".
-
-= changes in core class library
-
-: open
-
- Extended so that when the third argument is permission flags it
- calls open(2) instead of fopen(3).
-
-: sprintf
-
- new format specifier "%p" is available.
-
-: lambda and proc
-
- Proc object returns from these methods has the following attributes:
-
- * strict argument number check
- * break and return terminates the proc execution.
-
-: warn(message)
-
- a method to give warnings.
-
-: abort()
-
- takes optional terminate message argument.
-
-: Object#initialize_copy
-
- copy constructor for clone and dup.
-
-: Object#instance_variable_set, Object#instance_variable_get
-
- added.
-
-: Object#singleton_method_removed
-: Object#singleton_method_undefined
-
- Added.
-
-: Array#transpose
-
- added.
-
-: Array#fetch(index [, default])
-
- Added. If a default value isn't given, raises index error if index
- is out of range.
-
-: Array#insert(n, other, ...)
-
- Added. [ruby-talk:14289]
-
- This is much the same as (({ary[n,0] = [other,...]})) except
- returing self.
-
- ary = [0,1,2,3]
- ary[2, 0] = [4, 5, 6]
- p ary
-
- ary = [0,1,2,3]
- ary.insert(2, 4, 5, 6)
- p ary
-
-: Array#sort!
-
- Changed to always return self without checking whether the sequence
- of the elements was modified or not.
-
- Beware that this behavior is not guaranteed to continue in the
- future. Do not rely on its return value. [ruby-dev:12506]
-
-: Array#filter
-
- Previously deprecated, now removed. Use Array#collect!.
-
-: Array#pack, String#unpack
-
- Allows comment in template strings.
-
-: Array#pack, String#unpack
-
- New templates 'q' and 'Q' for 64bit integer (signed and unsigned respectively).
-
-: Array#new
-
- Now takes block to fill initial values. E.g.
-
- Array.new(10) { |i| i + 1 }
- => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-
-: Array#fill
-
- Takes block to get the values to fill.
-
-: Array#fetch
-
- Takes block to get the default value.
-
-: Array#zip
-
- added.
-
-: Hash#update
-
- Takes block to resolve key conflict.
-
-: Hash#merge and Hash#merge!
-
- update hash. Hash#merge! is a synonym of Hash#update.
-
-: String#split
-
- if "sep" argument is a string, regular expression meta characters
- are escaped internally.
-
-: String#rstrip
-
- chop off NULs at the end of strings.
-
-: String#to_i
-
- Now accepts optional base argument.
-
- "101".to_i(10) => 101
- "101".to_i(2) => 5
- "101".to_i(8) => 65
- "101".to_i(16) => 257
-
- A base argument of 0 guesses at the base.
-
- "101".to_i(0) => 101
- "0b101".to_i(0) => 5
- "0101".to_i(0) => 65
- "0x101".to_i(0) => 257
-
-: String#[regexp, nth]
-
- Extended to accepts optional second argument.
-
- It tries match between self and REGEXP, then returns the
- content of the NTH regexp register.
-
-: String#casecmp
-
- Added. This is a case insensitive version of String#<=>.
-
-: String#chomp
-
- If $/ == "\n", chops off last newlines (any of \n, \r, \r\n).
-
-: String#eql?
-
- Changed to be always case sensitive.
-
-: String#insert(n, other)
-
- Added.
-
- This is much the same as (({str[n, 0] = other})) except returing
- self.
-
-: String#lstrip, rstrip, lstrip!, rstrip!
-
- Added. These strip only left or right part of a string.
-
-: String#match
-
- Added.
-
-: String/Array methods
-
- Returns an instance of receivers class.
-
-: String.new
-
- The first argument becomes optional.
-
-: Symbol#intern
-
- Added.
-
-: Symbol.all_symbols
-
- Added. [ruby-dev:12921]
-
-: IO
-
- 64bit off_t support by Janathan Baker.
-
-: IO#read
-: IO#sysread
-
- takes optinal second argument for read buffer.
-
-: IO::sysopen
-
- New method to get a raw file descriptor.
-
-: IO#sysseek
-
- Added.
-
-: IO#fsync
-
- new method that copies all in-memory parts of a file to disk and
- waits until the device reports that all parts are on stable storage.
- Implemented with fsync(2) or equivalent.
-
-: IO.open
-
- Made public. Can only associate an IO object with a file number
- like IO.new and IO.for_fd, but can take a block.
-
-: IO.for_fd
-
- Added as a synonym for IO.new.
-
-: IO.read
-
- Added. Like IO.readlines, except it returns the entire file as a
- string. [ruby-talk:9460]
-
-: File#fnmatch, File::Constants::FNM_*
-
- Added. Refer to the fnmatch(3) manpage for details.
-
- Localism is FNM_DOTMATCH which has the opposite meaning of the
- commonly known FNM_PERIOD, which does not exist in Ruby.
-
- e.g.
-
- # exclude files matching "*.bak" case-insensitively.
- files.reject! {|fn| File.fnmatch?("*.bak", fn, File::FNM_CASEFOLD) }
-
-: File.lchmod
-: File.lchown
-
- Added.
-
-: File.open, IO.open
-
- File mode can be specified by flags like open(2),
- e.g. File::open(path, File::CREAT|File::WRONLY).
-
-: Regexp#options
-
- Added.
-
-: Regexp.last_match(n)
-
- Extended to take an optional argument.
-
-: MatchData#captures
-
- added.
-
-: Dir#path
-
- Added.
-
-: Dir.chdir
-
- Extended to take a block.
-
-: Dir.glob
-
- Made to support meta-character escaping by a backslash. Wildcards
- and spaces may now be escaped using a backslash.
-
-: Dir.open
-
- Changed to return what the block returns when a block is given, just
- as File.open does. (It always returned (({nil})) in 1.6 and
- prior)
-
-: Dir.chdir
-
- Changed to warn only when invoked from multiple threads or no block
- is given. [ruby-dev:13823]
-
- Dir.chdir('foo') {
- Dir.chdir('bar') { # previously warned
- puts Dir.pwd
- }
- }
-
-: Dir#pos=
-
- Returns the new position instead of self.
-
-: Dir::glob
-
- Now accepts optional FNM_* flags via the second argument, whereas
- Dir::[] doesn't.
-
- Dir.glob("makefile", File::FNM_CASEFOLD) #=> ['Makefile', 'makefile']
-
-: Class#inherited
-
- Method is called when Class is inherited by another class.
-
- class A; end
- def A.inherited(by)
- puts "A inherited by #{by.inspect}"
- end
- class B < A; end
-
- Prints out "A inherited by B"
-
-: Module#include?
-
- Added. [ruby-dev:13941]
-
-: Module#included
-
- Added. This is a hook called after Module#append_feature.
-
-: Module#method_removed
-: Module#method_undefined
-
- Added.
-
-: Module.new, Class.new
-
- Extended to take block.
-
-: Time
-
- Extended to accept a negative time_t. (Only when the platform
- supports it)
-
- p Time.at(-1)
- => Thu Jan 01 08:59:59 JST 1970
-
-: Time#to_a
-: Time#zone
-
- Made to return "UTC" under gmtime. It used to return a platform
- dependent value, typically "GMT", in 1.6 and prior.
-
-: Marshal to use marshal_dump and marshal_load
-
- if a dumping object responds to 'marshal_dump', Marshal.dump calls
- it, and dumps object returned. Marshal.load allocates a new instance
- using "allocate", then calls its "marshal_load" with dumped data.
- Marshal format version is now 4.8 (was 4.6 in 1.6.8).
-
-: Marshal
-
- Fixed not to dump anonymous classes/modules.
-
- Fixed with loading modules.
-
-: Thread#group
-
- new method to get belonging ThreadGroup.
-
-: Thread#terminate
-
- synonym of Thread#exit
-
-: Thread#join
-
- Optional argument limits maximum time to wait the thread in second.
- And returns nil if timed out.
-
-: ThreagGroup#enclose
-
- prohibits thread movement from/to enclosed groups.
-
-: Range#step([step=1])
-
- Added.
-
-: SystemCallError
-
- SystemCallError's "===" match (used in rescue also) is now based on its errno.
-
-: Interrupt
-
- Made a subclass of SignalException. (It was a subclass of
- Exception in 1.6 and prior)
-
-: NameError and NoMethodError
-
- Moved and now NoMethodError < NameError < StandardError.
-
-: NoMethodError
-
- Added. [ruby-dev:12763]
-
-: NotImplementError
-
- Finally obsoleted. Use NotImplementedError.
-
-: SystemCallError.===
-
- Added. (See the "Comparison of exception classes in a rescue clause"
- paragraph above) [ruby-dev:12670]
-
-: SystemExit#status
-
- Added.
-
-: Proc#==
-
- Added.
-
-: Method#==
-
- Added.
-
-: UnboundMethod is no longer subclass of Method
-
- class hierarchy changed.
-
-: Enumerable#all?
-: Enumerable#any?
-: Enumerable#inject
-: Enumerable#sort_by
-
- Added.
-
-: Math.acos(x)
-: Math.asin(x)
-: Math.atan(x)
-: Math.cosh(x)
-: Math.hypot(x,y)
-: Math.sinh(x)
-: Math.tanh(x)
-
- Added.
-
-: Process.abort
-: Process.exit
-
- synonym of Kernel#abort, and Kernel#exit respectively.
-
-: Process::detach(pid)
-
- new method to detach child process. child process will be "wait"ed
- automagically.
-
-: Process.times
-
- Moved from Time.times. (Time.times still remains but emits a
- warning)
-
-: Process.waitall
-
- Added.
-
-: Process::Status
-
- Added. (({$?})) is now an instance of this class.
-
-: Process::UID, Process::GID, Process::Sys,
-
- Added.
-
-: Signal
-
- Added. This module has module functions Signal.trap and Signal.list.
-
-= changes in bundled libraries
-
-: lib/cgi.rb
-
- cgi[name] returns CGI::QueryExtension::Value that wraps string
- value, no longer array.
-
-: lib/timeout
-
- timeout "function" wrapped in Timeout module.
-
-: TCPServer#accept, UNIXServer#accept, Socket#accept
-
- New methods to return an accepted socket fd.
-
-: Date and DateTime
-
- lib/date.rb now provides both Date and DateTime.
-
- Some methods have been renamed. But the old names are still alive.
-
- Some new methods have been added (Date::parse, Date#strftime, etc.).
-
- Date#mjd now returns the chronological modified Julian day number.
-
- All facilities about tjd have been removed.
-
-: Curses
-
- Updated. New methods and constants for using the mouse, character
- attributes, colors and key codes have been added.
-
-: Net::HTTP
-
- New version of Net::HTTP has introduced seriously incompatible
- changes. For details, see document embedded in net/http.rb itself.
-
-: Socket.pack_sockaddr_in, Socket.unpack_sockaddr_in
-
- Added. Utility for direct Socket access.
-
-: Socket.pack_sockaddr_un, Socket.unpack_sockaddr_un
-
- Added. Utility for direct Socket access.
-
-: TCPServer#listen, UNIXServer#listen
-
- Added.
-
-: TCPSocket.new
-: TCPSocket.open
-
- Extended to take an address and a port number for the local side in
- optional 3rd and 4th arguments.
-
-= newly bundled library
-
-: ext/bigdecimal
-
- variable precision decimal number
-
-: ext/dl
-
- an interface to the dynamic linker.
-
-: ext/enumerator
-
- a helper module for the Enumerable interface.
-
-: ext/io/wait
-
- IO wait methods.
-
-: ext/iconv
-
- wrapper library of (({iconv})).
-
-: ext/openssl
-
- OpenSSL for Ruby
-
-: ext/racc/cparse
-
- Racc runtime library in C. (Racc is a parser generator for ruby)
-
-: ext/stringio
-
- Pseudo (({IO})) class from/to (({String})).
-
-: ext/strscan
-
- Fast string scanner library.
-
-: ext/syck
-
- fast YAML parser.
-
-: lib/abbrev
-
- creates an abbreviation table from a list
-
-: lib/benchmark
-
- Ruby scripts benchmarker
-
-: lib/cgi/session/pstore
-
- cgi/session back-end using pstore
-
-: lib/csv
-
- reads/writes CSV files.
-
-: lib/date/format
-
- strftime for Date class
-
-: lib/drb
-
- dRuby or distributed Ruby
-
-: lib/fileutils
-
- file utility library.
-
-: lib/generator
-
- converts an internal iterator to an external iterator
-
-: lib/gserver
-
- generic server used by xmlrpc
-
-: lib/ipaddr
-
- manipulates IP address.
-
-: lib/multi-tk
-
- to allow safe Tk, etc.
-
-: lib/open-uri
-
- easy-to-use wrapper for net/http and net/ftp
-
-: lib/optparse
-
- command line options utility library
-
-: lib/pathname
-
- handles pathname in OO manner.
-
-: lib/pp
-
- prettyprinter for Ruby objects
-
-: lib/prettyprint
-
- implements prettyprint algorithm.
-
-: lib/profiler
-
- library to implement -r "profile"
-
-: lib/racc/parser
-
- RACC parser generator runtime in Ruby.
-
-: lib/scanf
-
- scan string and retrieve object with format
-
-: lib/set
-
- Set class
-
-: lib/runit
-
- RubyUnit compatible layer for test/unit
-
-: lib/test/unit
-
- unit testing framework for Ruby
-
-: lib/tmpdir
-
- get temporary directory path.
-
-: lib/tsort
-
- topological sorting library.
-
-: lib/rexml
-
- REXML XML library
-
-: lib/webrick
-
- generic internet server kit
-
-: lib/xmlrpc
-
- simple RPC via XML
-
-: lib/un
-
- used like 'ruby -run -e cp -- -p foo bar'. neat, isn't it?
-
-: lib/win32/registry
-
- win32/registry is registry accessor
-
-: lib/yaml
-
- YAML Ain't Mark-up Language
-
-= removed libraries
-
-: lib/ftplib
-
- use net/ftp instead.
-
-: lib/telnet
-
- use net/telnet instead.
-
-= new port
-
-: WindowsCE port
-: Win32 BCC
-
-= interpreter implementation
-
-: garbage collector
-
- faster, but uses more memory for the worst case.
-
-: string concatenation
-
- faster by avoiding too frequent realloc(3).
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.jp
index d928fddc5e..d928fddc5e 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.jp
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.jp
index 64d9ab29c8..64d9ab29c8 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.jp
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
index a42cd46680..528e5e17fb 100644
--- a/doc/irb/irb.rd
+++ b/doc/irb/irb.rd
@@ -1,9 +1,9 @@
irb -- interactive ruby
- $Release Version: 0.9 $
- $Revision$
- $Date$
- by Keiju ISHITSUKA(keiju@ishitsuka.com)
- by gotoken-san who is original translater from japanese version
+ $Release Version: 0.5 $
+ $Revision$
+ $Date$
+ by Keiju ISHITSUKA(keiju@ishitsuka.com)
+ translate from japanese by gotoken-san
=begin
= What is irb?
@@ -13,8 +13,14 @@ ruby expressions read from stdin.
= Invoking
+ % ruby -r irb -e0
% irb
+Either of the aboves. In the former style, options can be specified
+as follows:
+
+ % ruby -r irb -e0 -- -v
+
= Usage
Use of irb is easy if you know ruby. Executing irb, prompts are
@@ -42,12 +48,7 @@ is the standard default action if Readline is installed.
-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
@@ -55,7 +56,7 @@ is the standard default action if Readline is installed.
--prompt prompt-mode
--prompt-mode prompt-mode
switches prompt mode. Pre-defined prompt modes are
- `default', `simple', `xmp' and `inf-ruby'
+ `defalut', `simple', `xmp' and `inf-ruby'
--inf-ruby-mode uses prompt appreciate for inf-ruby-mode on emacs.
Suppresses --readline.
@@ -68,6 +69,8 @@ is the standard default action if Readline is installed.
--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
@@ -157,17 +160,12 @@ For irb commands, both simple name and `irb_'-prefixed name are prepared.
--- exit, quit, irb_exit
Quits (sub)irb.
+ if you've done cb (see below), exit from the binding mode.
--- 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.
@@ -195,6 +193,9 @@ For irb commands, both simple name and `irb_'-prefixed name are prepared.
nil: inspect mode in non math mode,
non inspect mode in math mode.
+--- conf.irb_level
+ The level of cb.
+
--- conf.math_mode
Whether bc mode or not.
@@ -221,20 +222,14 @@ For irb commands, both simple name and `irb_'-prefixed name are prepared.
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.
+ nil: intends to use readline except for inf-reuby-mode (default)
---- pushws, irb_pushws, irb_push_workspace [obj]
- same as UNIX-shell command pushd.
+--- conf.verbose=T/F
+ Whether verbose messages are display or not.
---- popws, irb_popws, irb_pop_workspace
- same as UNIX-shell command popd
+--- cb, irb_change_binding [obj]
+ Enter new binding which has a distinct scope of local variables.
+ If obj is given, obj will be self.
--- irb [obj]
Invoke subirb. If obj is given, obj will be self.
@@ -253,20 +248,10 @@ For irb commands, both simple name and `irb_'-prefixed name are prepared.
--- 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.
+ _ The latest value of evaluation (it is local)
+
= Session Example
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.jp
index 338dcc644e..8b0de3cc62 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.jp
@@ -1,19 +1,23 @@
irb -- interactive ruby
- $Release Version: 0.9.5 $
+ $Release Version: 0.6 $
$Revision$
$Date$
- by Keiju ISHITSUKA(keiju@ruby-lang.org)
+ by Keiju ISHITSUKA(keiju@ishitsuka.com)
=begin
= irb?
-irbinteractive ruby. ruby/
-.
+irbinteractive ruby. ruby/
+.
=
+ % ruby -r irb -e0
% irb
-.
+. irb,
+.
+
+ % ruby -r irb -e0 -- -v
=
@@ -43,22 +47,17 @@ irb, Ruby. irb
-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-modereadline
+ inf-reuby-modereadline
.
--prompt prompt-mode
--prompt-mode prompt-mode
.
- , default, simple, xmp, inf-ruby
+ , defalut, simple, xmp, inf-ruby
. default
.
@@ -112,7 +111,6 @@ irb``~/.irbrc''. ,
IRB.conf[:PROMPT][:MY_PROMPT] = { #
:PROMPT_I => nil, #
- :PROMPT_N => nil, #
:PROMPT_S => nil, #
:PROMPT_C => nil, #
:RETURN => " ==>%s\n" #
@@ -127,7 +125,7 @@ OK.
IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C, .
+PROMPT_I, PROMPT_S, PROMPT_C, .
%N .
%m main(self)to_s.
@@ -142,7 +140,6 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C, .
IRB.conf[:PROMPT_MODE][: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\n"
@@ -171,17 +168,13 @@ irb, `irb_'
--- exit, quit, irb_exit
.
irb, irb.
+ cb, .
--- conf, irb_context
irb. , conf
.
---- conf.eval_history = N
- .
- nnnil nn>0 nn==0
- nil().
-
---- Conf.back_trace_limit
+--- conf.back_trace_limit
n, n.
16
@@ -208,6 +201,9 @@ irb, `irb_'
nil: , inspect mode, math, non
inspect mode.
+--- conf.irb_level
+ . irbcb?
+
--- conf.math_mode
. bc(, )?
@@ -234,21 +230,15 @@ irb, `irb_'
readline?
true: readline.
false: readline.
- nil: ()inf-ruby-modereadline
+ nil: ()inf-reuby-modereadline
.
-#
-#--- conf.verbose=T/F
-# irb?
---- cws, chws, irb_cws, irb_chws, irb_change_workspace [obj]
- objself. obj, home workspace,
- irbmain objectself.
+--- conf.verbose=T/F
+ irb?
---- pushws, irb_pushws, irb_push_workspace [obj]
- UNIXpushd.
-
---- popws, irb_popws, irb_pop_workspace
- UNIXpopd.
+--- cb, irb_change_binding [obj]
+ binding. obj
+ , objself.
--- irb [obj]
irb. obj, objself.
@@ -267,22 +257,10 @@ irb, `irb_'
--- kill n, irb_kill n
irbkill. nfg.
---- souce, irb_source path
- UNIXsource. path
- .
-
---- irb_load path, prev
-
- Rubyloadirb.
=
---- _
- ().
---- __
- .
- __[line_no]. line_no
- -line_no.
+ _ ().
=
diff --git a/doc/shell.rd.ja b/doc/shell.rd.jp
index 073e71ea42..073e71ea42 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.jp
diff --git a/enum.c b/enum.c
index 2a29272ae9..4a97811384 100644
--- a/enum.c
+++ b/enum.c
@@ -6,13 +6,12 @@
$Date$
created at: Fri Oct 1 15:15:19 JST 1993
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
#include "ruby.h"
#include "node.h"
-#include "util.h"
VALUE rb_mEnumerable;
static ID id_each, id_eqq, id_cmp;
@@ -44,329 +43,141 @@ grep_iter_i(i, arg)
return Qnil;
}
-/*
- * call-seq:
- * 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
- * supplied, each matching element is passed to it, and the block's
- * result is stored in the output array.
- *
- * (1..100).grep 38..44 #=> [38, 39, 40, 41, 42, 43, 44]
- * c = IO.constants
- * c.grep(/SEEK/) #=> ["SEEK_END", "SEEK_SET", "SEEK_CUR"]
- * res = c.grep(/SEEK/) {|v| IO.const_get(v) }
- * res #=> [2, 0, 1]
- *
- */
-
static VALUE
enum_grep(obj, pat)
VALUE obj, pat;
{
- VALUE ary = rb_ary_new();
- VALUE arg[2];
-
- arg[0] = pat;
- arg[1] = ary;
+ VALUE tmp, arg[2];
- rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
-
- return ary;
+ arg[0] = pat; arg[1] = tmp = rb_ary_new();
+ if (rb_block_given_p()) {
+ rb_iterate(rb_each, obj, grep_iter_i, (VALUE)arg);
+ }
+ else {
+ rb_iterate(rb_each, obj, grep_i, (VALUE)arg);
+ }
+ return tmp;
}
static VALUE
find_i(i, memo)
VALUE i;
- VALUE *memo;
+ NODE *memo;
{
if (RTEST(rb_yield(i))) {
- *memo = i;
+ memo->u2.value = Qtrue;
+ memo->u1.value = i;
rb_iter_break();
}
return Qnil;
}
-/*
- * call-seq:
- * enum.detect(ifnone = nil) {| obj | block } => obj or nil
- * enum.find(ifnone = nil) {| obj | block } => obj or nil
- *
- * Passes each entry in <i>enum</i> to <em>block</em>. Returns the
- * first for which <em>block</em> is not <code>false</code>. If no
- * object matches, calls <i>ifnone</i> and returns its result when it
- * is specified, or returns <code>nil</code>
- *
- * (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(argc, argv, obj)
int argc;
VALUE* argv;
VALUE obj;
{
- VALUE memo = Qundef;
+ NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, Qfalse, 0);
VALUE if_none;
rb_scan_args(argc, argv, "01", &if_none);
- rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
- if (memo != Qundef) {
- return memo;
+ rb_iterate(rb_each, obj, find_i, (VALUE)memo);
+ if (memo->u2.value) {
+ rb_gc_force_recycle((VALUE)memo);
+ return memo->u1.value;
}
if (!NIL_P(if_none)) {
- return rb_funcall(if_none, rb_intern("call"), 0, 0);
+ rb_eval_cmd(if_none, rb_ary_new2(0));
}
+ rb_gc_force_recycle((VALUE)memo);
return Qnil;
}
static VALUE
-find_all_i(i, ary)
- VALUE i, ary;
+find_all_i(i, tmp)
+ VALUE i, tmp;
{
if (RTEST(rb_yield(i))) {
- rb_ary_push(ary, i);
+ rb_ary_push(tmp, i);
}
return Qnil;
}
-/*
- * call-seq:
- * enum.find_all {| obj | block } => array
- * enum.select {| obj | block } => array
- *
- * 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>).
- *
- * (1..10).find_all {|i| i % 3 == 0 } #=> [3, 6, 9]
- *
- */
-
static VALUE
enum_find_all(obj)
VALUE obj;
{
- VALUE ary = rb_ary_new();
-
- rb_iterate(rb_each, obj, find_all_i, ary);
+ VALUE tmp;
- return ary;
+ tmp = rb_ary_new();
+ rb_iterate(rb_each, obj, find_all_i, tmp);
+
+ return tmp;
}
static VALUE
-reject_i(i, ary)
- VALUE i, ary;
+reject_i(i, tmp)
+ VALUE i, tmp;
{
if (!RTEST(rb_yield(i))) {
- rb_ary_push(ary, i);
+ rb_ary_push(tmp, i);
}
return Qnil;
}
-/*
- * call-seq:
- * enum.reject {| obj | block } => array
- *
- * Returns an array for all elements of <i>enum</i> for which
- * <em>block</em> is false (see also <code>Enumerable#find_all</code>).
- *
- * (1..10).reject {|i| i % 3 == 0 } #=> [1, 2, 4, 5, 7, 8, 10]
- *
- */
-
static VALUE
enum_reject(obj)
VALUE obj;
{
- VALUE ary = rb_ary_new();
-
- rb_iterate(rb_each, obj, reject_i, ary);
+ VALUE tmp;
- return ary;
+ tmp = rb_ary_new();
+ rb_iterate(rb_each, obj, reject_i, tmp);
+
+ return tmp;
}
static VALUE
-collect_i(i, ary)
- VALUE i, ary;
+collect_i(i, tmp)
+ VALUE i, tmp;
{
- rb_ary_push(ary, rb_yield(i));
-
+ rb_ary_push(tmp, rb_yield(i));
return Qnil;
}
static VALUE
-collect_all(i, ary)
+enum_all(i, ary)
VALUE i, ary;
{
rb_ary_push(ary, i);
-
return Qnil;
}
-/*
- * call-seq:
- * enum.collect {| obj | block } => array
- * enum.map {| obj | block } => array
- *
- * Returns a new array with the results of running <em>block</em> once
- * for every element in <i>enum</i>.
- *
- * (1..4).collect {|i| i*i } #=> [1, 4, 9, 16]
- * (1..4).collect { "cat" } #=> ["cat", "cat", "cat", "cat"]
- *
- */
-
-static VALUE
-enum_collect(obj)
- VALUE obj;
-{
- VALUE ary = rb_ary_new();
-
- rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
-
- return ary;
-}
-
-/*
- * call-seq:
- * enum.to_a => array
- * enum.entries => array
- *
- * Returns an array containing the items in <i>enum</i>.
- *
- * (1..7).to_a #=> [1, 2, 3, 4, 5, 6, 7]
- * { 'a'=>1, 'b'=>2, 'c'=>3 }.to_a #=> [["a", 1], ["b", 2], ["c", 3]]
- */
static VALUE
enum_to_a(obj)
VALUE obj;
{
- VALUE ary = rb_ary_new();
+ VALUE ary;
- rb_iterate(rb_each, obj, collect_all, ary);
+ ary = rb_ary_new();
+ rb_iterate(rb_each, obj, enum_all, ary);
return ary;
}
static VALUE
-inject_i(i, memo)
- VALUE i;
- VALUE *memo;
-{
- if (*memo == Qundef) {
- *memo = i;
- }
- else {
- *memo = rb_yield_values(2, *memo, i);
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * enum.inject(initial) {| memo, obj | block } => obj
- * enum.inject {| memo, obj | block } => obj
- *
- * Combines the elements of <i>enum</i> by applying the block to an
- * accumulator value (<i>memo</i>) and each element in turn. At each
- * step, <i>memo</i> is set to the value returned by the block. The
- * first form lets you supply an initial value for <i>memo</i>. The
- * second form uses the first element of the collection as a the
- * initial value (and skips that element while iterating).
- *
- * # Sum some numbers
- * (5..10).inject {|sum, n| sum + n } #=> 45
- * # Multiply some numbers
- * (5..10).inject(1) {|product, n| product * n } #=> 151200
- *
- * # find the longest word
- * longest = %w{ cat sheep bear }.inject do |memo,word|
- * memo.length > word.length ? memo : word
- * end
- * longest #=> "sheep"
- *
- * # find the length of the longest word
- * longest = %w{ cat sheep bear }.inject(0) do |memo,word|
- * memo >= word.length ? memo : word.length
- * end
- * longest #=> 5
- *
- */
-
-static VALUE
-enum_inject(argc, argv, obj)
- int argc;
- VALUE *argv, obj;
-{
- VALUE memo = Qundef;
-
- if (rb_scan_args(argc, argv, "01", &memo) == 0)
- memo = Qundef;
- rb_iterate(rb_each, obj, inject_i, (VALUE)&memo);
- if (memo == Qundef) return Qnil;
- return memo;
-}
-
-static VALUE
-partition_i(i, ary)
- VALUE i, *ary;
-{
- if (RTEST(rb_yield(i))) {
- rb_ary_push(ary[0], i);
- }
- else {
- rb_ary_push(ary[1], i);
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * enum.partition {| obj | block } => [ true_array, false_array ]
- *
- * Returns two arrays, the first containing the elements of
- * <i>enum</i> for which the block evaluates to true, the second
- * containing the rest.
- *
- * (1..6).partition {|i| (i&1).zero?} #=> [[2, 4, 6], [1, 3, 5]]
- *
- */
-
-static VALUE
-enum_partition(obj)
+enum_collect(obj)
VALUE obj;
{
- VALUE ary[2];
+ VALUE tmp;
- ary[0] = rb_ary_new();
- ary[1] = rb_ary_new();
- rb_iterate(rb_each, obj, partition_i, (VALUE)ary);
+ tmp = rb_ary_new();
+ rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : enum_all, tmp);
- return rb_assoc_new(ary[0], ary[1]);
+ return tmp;
}
-/*
- * call-seq:
- * 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
- * the results of the supplied block. The block should return -1, 0, or
- * +1 depending on the comparison between <i>a</i> and <i>b</i>. As of
- * Ruby 1.8, the method <code>Enumerable#sort_by</code> implements a
- * 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]
- */
-
static VALUE
enum_sort(obj)
VALUE obj;
@@ -375,246 +186,18 @@ enum_sort(obj)
}
static VALUE
-sort_by_i(i, ary)
- VALUE i, ary;
-{
- VALUE v;
- NODE *memo;
-
- v = rb_yield(i);
- if (RBASIC(ary)->klass) {
- rb_raise(rb_eRuntimeError, "sort_by reentered");
- }
- memo = rb_node_newnode(NODE_MEMO, v, i, 0);
- rb_ary_push(ary, (VALUE)memo);
- return Qnil;
-}
-
-static int
-sort_by_cmp(aa, bb)
- NODE **aa, **bb;
-{
- VALUE a = aa[0]->u1.value;
- VALUE b = bb[0]->u1.value;
-
- return rb_cmpint(rb_funcall(a, id_cmp, 1, b), a, b);
-}
-
-/*
- * call-seq:
- * enum.sort_by {| obj | block } => array
- *
- * Sorts <i>enum</i> using a set of keys generated by mapping the
- * values in <i>enum</i> through the given block.
- *
- * %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
- *
- * require 'benchmark'
- * include Benchmark
- *
- * a = (1..100000).map {rand(100000)}
- *
- * bm(10) do |b|
- * b.report("Sort") { a.sort }
- * b.report("Sort by") { a.sort_by {|a| a} }
- * end
- *
- * <em>produces:</em>
- *
- * user system total real
- * Sort 0.180000 0.000000 0.180000 ( 0.175469)
- * Sort by 1.980000 0.040000 2.020000 ( 2.013586)
- *
- * However, consider the case where comparing the keys is a non-trivial
- * operation. The following code sorts some files on modification time
- * using the basic <code>sort</code> method.
- *
- * files = Dir["*"]
- * 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>
- * objects during every comparison. A slightly better technique is to
- * use the <code>Kernel#test</code> method to generate the modification
- * times directly.
- *
- * files = Dir["*"]
- * sorted = files.sort { |a,b|
- * test(?M, a) <=> test(?M, b)
- * }
- * sorted #=> ["mon", "tues", "wed", "thurs"]
- *
- * This still generates many unnecessary <code>Time</code> objects. A
- * more efficient technique is to cache the sort keys (modification
- * times in this case) before the sort. Perl users often call this
- * approach a Schwartzian Transform, after Randal Schwartz. We
- * construct a temporary array, where each element is an array
- * containing our sort key along with the filename. We sort this array,
- * and then extract the filename from the result.
- *
- * sorted = Dir["*"].collect { |f|
- * [test(?M, f), f]
- * }.sort.collect { |f| f[1] }
- * sorted #=> ["mon", "tues", "wed", "thurs"]
- *
- * This is exactly what <code>sort_by</code> does internally.
- *
- * sorted = Dir["*"].sort_by {|f| test(?M, f)}
- * sorted #=> ["mon", "tues", "wed", "thurs"]
- */
-
-static VALUE
-enum_sort_by(obj)
- VALUE obj;
-{
- VALUE ary;
- long i;
-
- if (TYPE(obj) == T_ARRAY) {
- ary = rb_ary_new2(RARRAY(obj)->len);
- }
- else {
- ary = rb_ary_new();
- }
- RBASIC(ary)->klass = 0;
- rb_iterate(rb_each, obj, sort_by_i, ary);
- if (RARRAY(ary)->len > 1) {
- qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp, 0);
- }
- if (RBASIC(ary)->klass) {
- rb_raise(rb_eRuntimeError, "sort_by reentered");
- }
- for (i=0; i<RARRAY(ary)->len; i++) {
- RARRAY(ary)->ptr[i] = RNODE(RARRAY(ary)->ptr[i])->u2.value;
- }
- RBASIC(ary)->klass = rb_cArray;
- return ary;
-}
-
-static VALUE
-all_iter_i(i, memo)
- VALUE i;
- VALUE *memo;
-{
- if (!RTEST(rb_yield(i))) {
- *memo = Qfalse;
- rb_iter_break();
- }
- return Qnil;
-}
-
-static VALUE
-all_i(i, memo)
- VALUE i;
- VALUE *memo;
-{
- if (!RTEST(i)) {
- *memo = Qfalse;
- rb_iter_break();
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * 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> (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
- *
- */
-
-static VALUE
-enum_all(obj)
- VALUE obj;
-{
- VALUE result = Qtrue;
-
- rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
- return result;
-}
-
-static VALUE
-any_iter_i(i, memo)
- VALUE i;
- VALUE *memo;
-{
- if (RTEST(rb_yield(i))) {
- *memo = Qtrue;
- rb_iter_break();
- }
- return Qnil;
-}
-
-static VALUE
-any_i(i, memo)
- VALUE i;
- VALUE *memo;
-{
- if (RTEST(i)) {
- *memo = Qtrue;
- rb_iter_break();
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * 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
- * 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
- *
- */
-
-static VALUE
-enum_any(obj)
- VALUE obj;
-{
- VALUE result = Qfalse;
-
- rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
- return result;
-}
-
-static VALUE
min_i(i, memo)
VALUE i;
- VALUE *memo;
+ NODE *memo;
{
VALUE cmp;
- if (*memo == Qundef) {
- *memo = i;
- }
+ if (NIL_P(memo->u1.value))
+ memo->u1.value = i;
else {
- cmp = rb_funcall(i, id_cmp, 1, *memo);
- if (rb_cmpint(cmp, i, *memo) < 0) {
- *memo = i;
- }
+ cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+ if (NUM2LONG(cmp) < 0)
+ memo->u1.value = i;
}
return Qnil;
}
@@ -622,77 +205,44 @@ min_i(i, memo)
static VALUE
min_ii(i, memo)
VALUE i;
- VALUE *memo;
+ NODE *memo;
{
VALUE cmp;
- if (*memo == Qundef) {
- *memo = i;
- }
+ if (NIL_P(memo->u1.value))
+ memo->u1.value = i;
else {
- cmp = rb_yield_values(2, i, *memo);
- if (rb_cmpint(cmp, i, *memo) < 0) {
- *memo = i;
- }
+ cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
+ if (NUM2LONG(cmp) < 0)
+ memo->u1.value = i;
}
return Qnil;
}
-
-/*
- * call-seq:
- * 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"
- */
-
static VALUE
enum_min(obj)
VALUE obj;
{
- VALUE result = Qundef;
+ NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
- rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
- if (result == Qundef) return Qnil;
- return result;
+ rb_iterate(rb_each, obj, rb_block_given_p()?min_ii:min_i, (VALUE)memo);
+ rb_gc_force_recycle((VALUE)memo);
+ return memo->u1.value;
}
-/*
- * call-seq:
- * enum.max => obj
- * enum.max {| a,b | block } => obj
- *
- * Returns the object in <i>enum</i> with the maximum value. The
- * first form assumes all objects implement <code>Comparable</code>;
- * the second uses the block to return <em>a <=> b</em>.
- *
- * a = %w(albatross dog horse)
- * a.max #=> "horse"
- * a.max {|a,b| a.length <=> b.length } #=> "albatross"
- */
-
static VALUE
max_i(i, memo)
VALUE i;
- VALUE *memo;
+ NODE *memo;
{
VALUE cmp;
- if (*memo == Qundef) {
- *memo = i;
- }
+ if (NIL_P(memo->u1.value))
+ memo->u1.value = i;
else {
- cmp = rb_funcall(i, id_cmp, 1, *memo);
- if (rb_cmpint(cmp, i, *memo) > 0) {
- *memo = i;
- }
+ cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+ if (NUM2LONG(cmp) > 0)
+ memo->u1.value = i;
}
return Qnil;
}
@@ -700,201 +250,78 @@ max_i(i, memo)
static VALUE
max_ii(i, memo)
VALUE i;
- VALUE *memo;
+ NODE *memo;
{
VALUE cmp;
- if (*memo == Qundef) {
- *memo = i;
- }
+ if (NIL_P(memo->u1.value))
+ memo->u1.value = i;
else {
- cmp = rb_yield_values(2, i, *memo);
- if (rb_cmpint(cmp, i, *memo) > 0) {
- *memo = i;
- }
+ cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
+ if (NUM2LONG(cmp) > 0)
+ memo->u1.value = i;
}
return Qnil;
}
-/*
- * call-seq:
- * 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"
- */
-
static VALUE
enum_max(obj)
VALUE obj;
{
- VALUE result = Qundef;
+ NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
- rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
- if (result == Qundef) return Qnil;
- return result;
+ rb_iterate(rb_each, obj, rb_block_given_p()?max_ii:max_i, (VALUE)memo);
+ rb_gc_force_recycle((VALUE)memo);
+ return memo->u1.value;
}
static VALUE
member_i(item, memo)
VALUE item;
- VALUE *memo;
+ NODE *memo;
{
- if (rb_equal(item, memo[0])) {
- memo[1] = Qtrue;
+ if (rb_equal(item, memo->u1.value)) {
+ memo->u2.value = Qtrue;
rb_iter_break();
}
return Qnil;
}
-/*
- * call-seq:
- * enum.include?(obj) => true or false
- * enum.member?(obj) => true or false
- *
- * Returns <code>true</code> if any member of <i>enum</i> equals
- * <i>obj</i>. Equality is tested using <code>==</code>.
- *
- * IO.constants.include? "SEEK_SET" #=> true
- * IO.constants.include? "SEEK_NO_FURTHER" #=> false
- *
- */
-
static VALUE
enum_member(obj, val)
VALUE obj, val;
{
- VALUE memo[2];
+ VALUE result;
+
+ NODE *memo = rb_node_newnode(NODE_MEMO, val, Qfalse, 0);
- memo[0] = val;
- memo[1] = Qfalse;
rb_iterate(rb_each, obj, member_i, (VALUE)memo);
- return memo[1];
+ result = memo->u2.value;
+ rb_gc_force_recycle((VALUE)memo);
+ return result;
}
static VALUE
each_with_index_i(val, memo)
VALUE val;
- VALUE *memo;
+ NODE *memo;
{
- rb_yield_values(2, val, INT2FIX(*memo));
- ++*memo;
+ rb_yield(rb_assoc_new(val, INT2FIX(memo->u3.cnt)));
+ memo->u3.cnt++;
return Qnil;
}
-/*
- * call-seq:
- * enum.each_with_index {|obj, i| block } -> enum
- *
- * Calls <em>block</em> with two arguments, the item and its index, for
- * each item in <i>enum</i>.
- *
- * hash = Hash.new
- * %w(cat dog wombat).each_with_index {|item, index|
- * hash[item] = index
- * }
- * hash #=> {"cat"=>0, "wombat"=>2, "dog"=>1}
- *
- */
-
static VALUE
enum_each_with_index(obj)
VALUE obj;
{
- VALUE memo = 0;
-
- rb_need_block();
- rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
- return obj;
-}
-
-static VALUE
-zip_i(val, memo)
- VALUE val;
- VALUE *memo;
-{
- VALUE result = memo[0];
- VALUE args = memo[1];
- int idx = memo[2]++;
- VALUE tmp;
- int i;
+ NODE *memo = rb_node_newnode(NODE_MEMO, 0, 0, 0);
- tmp = rb_ary_new2(RARRAY(args)->len + 1);
- rb_ary_store(tmp, 0, val);
- for (i=0; i<RARRAY(args)->len; i++) {
- rb_ary_push(tmp, rb_ary_entry(RARRAY(args)->ptr[i], idx));
- }
- if (rb_block_given_p()) {
- rb_yield(tmp);
- }
- else {
- rb_ary_push(result, tmp);
- }
+ rb_iterate(rb_each, obj, each_with_index_i, (VALUE)memo);
+ rb_gc_force_recycle((VALUE)memo);
return Qnil;
}
-/*
- * call-seq:
- * enum.zip(arg, ...) => array
- * enum.zip(arg, ...) {|arr| block } => nil
- *
- * Converts any arguments to arrays, then merges elements of
- * <i>enum</i> with corresponding elements from each argument. This
- * generates a sequence of <code>enum#size</code> <em>n</em>-element
- * arrays, where <em>n</em> is one more that the count of arguments. If
- * the size of any argument is less than <code>enum#size</code>,
- * <code>nil</code> values are supplied. If a block given, it is
- * invoked for each output array, otherwise an array of arrays is
- * returned.
- *
- * a = [ 4, 5, 6 ]
- * b = [ 7, 8, 9 ]
- *
- * (1..3).zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- * "cat\ndog".zip([1]) #=> [["cat\n", 1], ["dog", nil]]
- * (1..3).zip #=> [[1], [2], [3]]
- *
- */
-
-static VALUE
-enum_zip(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
-{
- int i;
- VALUE result;
- VALUE memo[3];
-
- for (i=0; i<argc; i++) {
- argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
- }
- result = rb_block_given_p() ? Qnil : rb_ary_new();
- memo[0] = result;
- memo[1] = rb_ary_new4(argc, argv);
- memo[2] = 0;
- rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
-
- return result;
-}
-
-/*
- * The <code>Enumerable</code> mixin provides collection classes with
- * several traversal and searching methods, and with the ability to
- * sort. The class must provide a method <code>each</code>, which
- * yields successive members of the collection. If
- * <code>Enumerable#max</code>, <code>#min</code>, or
- * <code>#sort</code> is used, the objects in the collection must also
- * implement a meaningful <code><=></code> operator, as these methods
- * rely on an ordering between members of the collection.
- */
-
void
Init_Enumerable()
{
@@ -904,7 +331,6 @@ Init_Enumerable()
rb_define_method(rb_mEnumerable,"entries", enum_to_a, 0);
rb_define_method(rb_mEnumerable,"sort", enum_sort, 0);
- rb_define_method(rb_mEnumerable,"sort_by", enum_sort_by, 0);
rb_define_method(rb_mEnumerable,"grep", enum_grep, 1);
rb_define_method(rb_mEnumerable,"find", enum_find, -1);
rb_define_method(rb_mEnumerable,"detect", enum_find, -1);
@@ -913,19 +339,13 @@ Init_Enumerable()
rb_define_method(rb_mEnumerable,"reject", enum_reject, 0);
rb_define_method(rb_mEnumerable,"collect", enum_collect, 0);
rb_define_method(rb_mEnumerable,"map", enum_collect, 0);
- rb_define_method(rb_mEnumerable,"inject", enum_inject, -1);
- rb_define_method(rb_mEnumerable,"partition", enum_partition, 0);
- rb_define_method(rb_mEnumerable,"all?", enum_all, 0);
- rb_define_method(rb_mEnumerable,"any?", enum_any, 0);
rb_define_method(rb_mEnumerable,"min", enum_min, 0);
rb_define_method(rb_mEnumerable,"max", enum_max, 0);
rb_define_method(rb_mEnumerable,"member?", enum_member, 1);
rb_define_method(rb_mEnumerable,"include?", enum_member, 1);
rb_define_method(rb_mEnumerable,"each_with_index", enum_each_with_index, 0);
- rb_define_method(rb_mEnumerable, "zip", enum_zip, -1);
id_eqq = rb_intern("===");
id_each = rb_intern("each");
id_cmp = rb_intern("<=>");
}
-
diff --git a/env.h b/env.h
index c50103f71e..7060fbec8f 100644
--- a/env.h
+++ b/env.h
@@ -6,7 +6,7 @@
$Date$
created at: Mon Jul 11 11:53:03 JST 1994
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
@@ -16,34 +16,34 @@
extern struct FRAME {
VALUE self;
int argc;
+ VALUE *argv;
ID last_func;
- ID orig_func;
VALUE last_class;
+ VALUE cbase;
struct FRAME *prev;
struct FRAME *tmp;
- struct RNode *node;
+ char *file;
+ int line;
int iter;
int flags;
- unsigned long uniq;
} *ruby_frame;
void rb_gc_mark_frame _((struct FRAME *));
-#define FRAME_DMETH 1
-#define FRAME_FUNC 2
+#define FRAME_ALLOCA 0
+#define FRAME_MALLOC 1
extern struct SCOPE {
struct RBasic super;
ID *local_tbl;
VALUE *local_vars;
- int flags;
+ int flag;
} *ruby_scope;
#define SCOPE_ALLOCA 0
#define SCOPE_MALLOC 1
#define SCOPE_NOSTACK 2
#define SCOPE_DONT_RECYCLE 4
-#define SCOPE_CLONE 8
extern int ruby_in_eval;
diff --git a/error.c b/error.c
index 608d1fa558..6a008cdac5 100644
--- a/error.c
+++ b/error.c
@@ -6,13 +6,13 @@
$Date$
created at: Mon Aug 9 16:11:34 JST 1993
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2000 Yukihiro Matsumoto
**********************************************************************/
#include "ruby.h"
#include "env.h"
-#include "st.h"
+#include "version.h"
#include <stdio.h>
#ifdef HAVE_STDARG_PROTOTYPES
@@ -22,44 +22,34 @@
#include <varargs.h>
#define va_init_list(a,b) va_start(a)
#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-extern const char ruby_version[], ruby_release_date[], ruby_platform[];
+#if defined __CYGWIN__
+# include <cygwin/version.h>
+# if (CYGWIN_VERSION_API_MAJOR > 0) || (CYGWIN_VERSION_API_MINOR >= 8)
+# define sys_nerr _sys_nerr
+# endif
+#endif
int ruby_nerrs;
-static int
-err_position(buf, len)
- char *buf;
- long len;
+static void
+err_snprintf(buf, len, fmt, args)
+ char *buf, *fmt;
+ int len;
+ va_list args;
{
- ruby_set_current_source();
+ int n;
+
if (!ruby_sourcefile) {
- return 0;
+ vsnprintf(buf, len, fmt, args);
+ return;
}
else if (ruby_sourceline == 0) {
- return snprintf(buf, len, "%s: ", ruby_sourcefile);
+ n = snprintf(buf, len, "%s: ", ruby_sourcefile);
}
else {
- return snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
+ n = snprintf(buf, len, "%s:%d: ", ruby_sourcefile, ruby_sourceline);
}
-}
-
-static void
-err_snprintf(buf, len, fmt, args)
- char *buf;
- long len;
- const char *fmt;
- va_list args;
-{
- long n;
-
- n = err_position(buf, len);
if (len > n) {
vsnprintf((char*)buf+n, len-n, fmt, args);
}
@@ -118,12 +108,11 @@ warn_print(fmt, args)
va_list args;
{
char buf[BUFSIZ];
- int len;
err_snprintf(buf, BUFSIZ, fmt, args);
- len = strlen(buf);
- buf[len++] = '\n';
- rb_write_error2(buf, len);
+ fputs(buf, stderr);
+ fputs("\n", stderr);
+ fflush(stderr);
}
void
@@ -138,8 +127,6 @@ rb_warn(fmt, va_alist)
char buf[BUFSIZ];
va_list args;
- if (NIL_P(ruby_verbose)) return;
-
snprintf(buf, BUFSIZ, "warning: %s", fmt);
va_init_list(args, fmt);
@@ -169,25 +156,6 @@ rb_warning(fmt, va_alist)
va_end(args);
}
-/*
- * call-seq:
- * warn(msg) => nil
- *
- * 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(self, mesg)
- VALUE self, mesg;
-{
- if (!NIL_P(ruby_verbose)) {
- rb_io_write(rb_stderr, mesg);
- rb_io_write(rb_stderr, rb_default_rs);
- }
- return Qnil;
-}
-
void
#ifdef HAVE_STDARG_PROTOTYPES
rb_bug(const char *fmt, ...)
@@ -199,18 +167,14 @@ rb_bug(fmt, va_alist)
{
char buf[BUFSIZ];
va_list args;
- FILE *out = stderr;
- int len = err_position(buf, BUFSIZ);
-
- if (fwrite(buf, 1, len, out) == len ||
- fwrite(buf, 1, len, (out = stdout)) == len) {
- fputs("[BUG] ", out);
- va_init_list(args, fmt);
- vfprintf(out, fmt, args);
- va_end(args);
- fprintf(out, "\nruby %s (%s) [%s]\n\n",
- ruby_version, ruby_release_date, ruby_platform);
- }
+
+ snprintf(buf, BUFSIZ, "[BUG] %s", fmt);
+ ruby_in_eval = 0;
+
+ va_init_list(args, fmt);
+ warn_print(buf, args);
+ va_end(args);
+ fprintf(stderr, "ruby %s (%s) [%s]\n", RUBY_VERSION, RUBY_RELEASE_DATE, RUBY_PLATFORM);
abort();
}
@@ -218,30 +182,30 @@ static struct types {
int type;
const char *name;
} 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_TRUE, "true"},
- {T_FALSE, "false"},
- {T_SYMBOL, "Symbol"}, /* :symbol */
- {T_DATA, "Data"}, /* internal use: wrapped C pointers */
- {T_MATCH, "MatchData"}, /* data of $~ */
- {T_VARMAP, "Varmap"}, /* internal use: dynamic variables */
- {T_SCOPE, "Scope"}, /* internal use: variable scope */
- {T_NODE, "Node"}, /* internal use: syntax tree node */
- {T_UNDEF, "undef"}, /* internal use: #undef; should not happen */
- {-1, 0}
+ 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_TRUE, "true",
+ T_FALSE, "false",
+ T_SYMBOL, "Symbol", /* :symbol */
+ T_DATA, "Data", /* internal use: wrapped C pointers */
+ T_MATCH, "Match", /* data of $~ */
+ T_VARMAP, "Varmap", /* internal use: dynamic variables */
+ T_SCOPE, "Scope", /* internal use: variable scope */
+ T_NODE, "Node", /* internal use: syntax tree node */
+ T_UNDEF, "undef", /* internal use: #undef; should not happen */
+ -1, 0,
};
void
@@ -266,14 +230,11 @@ rb_check_type(x, t)
else if (FIXNUM_P(x)) {
etype = "Fixnum";
}
- else if (SYMBOL_P(x)) {
- etype = "Symbol";
- }
else if (rb_special_const_p(x)) {
etype = RSTRING(rb_obj_as_string(x))->ptr;
}
else {
- etype = rb_obj_classname(x);
+ etype = rb_class2name(CLASS_OF(x));
}
rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
etype, type->name);
@@ -298,14 +259,12 @@ VALUE rb_eTypeError;
VALUE rb_eArgError;
VALUE rb_eIndexError;
VALUE rb_eRangeError;
-VALUE rb_eNameError;
-VALUE rb_eNoMethodError;
VALUE rb_eSecurityError;
VALUE rb_eNotImpError;
VALUE rb_eNoMemError;
-VALUE rb_cNameErrorMesg;
VALUE rb_eScriptError;
+VALUE rb_eNameError;
VALUE rb_eSyntaxError;
VALUE rb_eLoadError;
@@ -318,7 +277,10 @@ rb_exc_new(etype, ptr, len)
const char *ptr;
long len;
{
- return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
+ VALUE exc = rb_obj_alloc(etype);
+
+ rb_iv_set(exc, "mesg", rb_str_new(ptr, len));
+ return exc;
}
VALUE
@@ -333,17 +295,12 @@ VALUE
rb_exc_new3(etype, str)
VALUE etype, str;
{
- StringValue(str);
- return rb_exc_new(etype, RSTRING(str)->ptr, RSTRING(str)->len);
-}
+ char *s;
+ int len;
-/*
- * call-seq:
- * Exception.new(msg = nil) => exception
- *
- * Construct a new Exception object, optionally passing in
- * a message.
- */
+ s = rb_str2cstr(str, &len);
+ return rb_exc_new(etype, s, len);
+}
static VALUE
exc_initialize(argc, argv, exc)
@@ -351,88 +308,47 @@ exc_initialize(argc, argv, exc)
VALUE *argv;
VALUE exc;
{
- VALUE arg;
+ VALUE mesg;
- rb_scan_args(argc, argv, "01", &arg);
- rb_iv_set(exc, "mesg", arg);
- rb_iv_set(exc, "bt", Qnil);
+ if (rb_scan_args(argc, argv, "01", &mesg) == 1) {
+ STR2CSTR(mesg); /* ensure mesg can be converted to String */
+ }
+ rb_iv_set(exc, "mesg", mesg);
return exc;
}
-/*
- * Document-method: exception
- *
- * call-seq:
- * exc.exception(string) -> an_exception or exc
- *
- * With no argument, or if the argument is the same as the receiver,
- * return the receiver. Otherwise, create a new
- * exception object of the same class as the receiver, but with a
- * message equal to <code>string.to_str</code>.
- *
- */
-
static VALUE
exc_exception(argc, argv, self)
int argc;
VALUE *argv;
VALUE self;
{
- VALUE exc;
+ VALUE etype, exc;
if (argc == 0) return self;
if (argc == 1 && self == argv[0]) return self;
- exc = rb_obj_clone(self);
- exc_initialize(argc, argv, exc);
+ etype = CLASS_OF(self);
+ while (FL_TEST(etype, FL_SINGLETON)) {
+ etype = RCLASS(etype)->super;
+ }
+ exc = rb_obj_alloc(etype);
+ rb_obj_call_init(exc, argc, argv);
return exc;
}
-/*
- * call-seq:
- * exception.to_s => string
- *
- * Returns exception's message (or the name of the exception if
- * no message is set).
- */
-
static VALUE
exc_to_s(exc)
VALUE exc;
{
- VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
+ VALUE mesg = rb_iv_get(exc, "mesg");
- if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
+ if (NIL_P(mesg)) return rb_class_path(CLASS_OF(exc));
if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
return mesg;
}
-/*
- * call-seq:
- * exception.message => string
- * exception.to_str => string
- *
- * Returns the result of invoking <code>exception.to_s</code>.
- * Normally this returns the exception's message or name. By
- * supplying a to_str method, exceptions are agreeing to
- * be used where Strings are expected.
- */
-
-static VALUE
-exc_to_str(exc)
- VALUE exc;
-{
- return rb_funcall(exc, rb_intern("to_s"), 0, 0);
-}
-
-/*
- * call-seq:
- * exception.inspect => string
- *
- * Return this exception's class name an message
- */
-
static VALUE
exc_inspect(exc)
VALUE exc;
@@ -442,63 +358,34 @@ exc_inspect(exc)
klass = CLASS_OF(exc);
exc = rb_obj_as_string(exc);
if (RSTRING(exc)->len == 0) {
- return rb_str_dup(rb_class_name(klass));
+ return rb_str_dup(rb_class_path(klass));
}
- str = rb_str_buf_new2("#<");
- klass = rb_class_name(klass);
- rb_str_buf_append(str, klass);
- rb_str_buf_cat(str, ": ", 2);
- rb_str_buf_append(str, exc);
- rb_str_buf_cat(str, ">", 1);
+ str = rb_str_new2("#<");
+ klass = rb_class_path(klass);
+ rb_str_append(str, klass);
+ rb_str_cat(str, ": ", 2);
+ rb_str_append(str, exc);
+ rb_str_cat(str, ">", 1);
return str;
}
-/*
- * call-seq:
- * exception.backtrace => array
- *
- * Returns any backtrace associated with the exception. The backtrace
- * is an array of strings, each containing either ``filename:lineNo: in
- * `method''' or ``filename:lineNo.''
- *
- * def a
- * raise "boom"
- * end
- *
- * def b
- * a()
- * end
- *
- * begin
- * b()
- * rescue => detail
- * print detail.backtrace.join("\n")
- * end
- *
- * <em>produces:</em>
- *
- * prog.rb:2:in `a'
- * prog.rb:6:in `b'
- * prog.rb:10
-*/
-
static VALUE
exc_backtrace(exc)
VALUE exc;
{
- static ID bt;
+ ID bt = rb_intern("bt");
- if (!bt) bt = rb_intern("bt");
- return rb_attr_get(exc, bt);
+ if (!rb_ivar_defined(exc, bt)) return Qnil;
+ return rb_ivar_get(exc, bt);
}
-VALUE
-rb_check_backtrace(bt)
+static VALUE
+check_backtrace(bt)
VALUE bt;
{
- long i;
+ int i;
static char *err = "backtrace must be Array of String";
if (!NIL_P(bt)) {
@@ -517,469 +404,140 @@ rb_check_backtrace(bt)
return bt;
}
-/*
- * call-seq:
- * exc.set_backtrace(array) => array
- *
- * Sets the backtrace information associated with <i>exc</i>. The
- * argument must be an array of <code>String</code> objects in the
- * format described in <code>Exception#backtrace</code>.
- *
- */
-
static VALUE
exc_set_backtrace(exc, bt)
VALUE exc;
VALUE bt;
{
- return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
-}
-
-/*
- * call-seq:
- * SystemExit.new(status=0) => system_exit
- *
- * Create a new +SystemExit+ exception with the given status.
- */
-
-static VALUE
-exit_initialize(argc, argv, exc)
- int argc;
- VALUE *argv;
- VALUE exc;
-{
- 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);
- return exc;
-}
-
-
-/*
- * call-seq:
- * system_exit.status => fixnum
- *
- * Return the status value associated with this system exit.
- */
-
-static VALUE
-exit_status(exc)
- VALUE exc;
-{
- return rb_attr_get(exc, rb_intern("status"));
+ return rb_iv_set(exc, "bt", check_backtrace(bt));
}
+#ifdef __BEOS__
+typedef struct {
+ VALUE *list;
+ int n;
+} syserr_list_entry;
+
+typedef struct {
+ int ix;
+ int n;
+} syserr_index_entry;
+
+static VALUE syserr_error;
+static VALUE syserr_list_b_general[16+1];
+static VALUE syserr_list_b_os0[2+1];
+static VALUE syserr_list_b_os1[5+1];
+static VALUE syserr_list_b_os2[2+1];
+static VALUE syserr_list_b_os3[3+1];
+static VALUE syserr_list_b_os4[1+1];
+static VALUE syserr_list_b_app[15+1];
+static VALUE syserr_list_b_interface[0+1];
+static VALUE syserr_list_b_media[8+1];
+static VALUE syserr_list_b_midi[0+1];
+static VALUE syserr_list_b_storage[15+1];
+static VALUE syserr_list_b_posix[38+1];
+static VALUE syserr_list_b_mail[8+1];
+static VALUE syserr_list_b_print[1+1];
+static VALUE syserr_list_b_device[14+1];
+
+# define SYSERR_LIST_B(n) {(n), sizeof(n)/sizeof(VALUE)}
+static const syserr_list_entry syserr_list[] = {
+ SYSERR_LIST_B(syserr_list_b_general),
+ SYSERR_LIST_B(syserr_list_b_os0),
+ SYSERR_LIST_B(syserr_list_b_os1),
+ SYSERR_LIST_B(syserr_list_b_os2),
+ SYSERR_LIST_B(syserr_list_b_os3),
+ SYSERR_LIST_B(syserr_list_b_os4),
+ SYSERR_LIST_B(syserr_list_b_app),
+ SYSERR_LIST_B(syserr_list_b_interface),
+ SYSERR_LIST_B(syserr_list_b_media),
+ SYSERR_LIST_B(syserr_list_b_midi),
+ SYSERR_LIST_B(syserr_list_b_storage),
+ SYSERR_LIST_B(syserr_list_b_posix),
+ SYSERR_LIST_B(syserr_list_b_mail),
+ SYSERR_LIST_B(syserr_list_b_print),
+ SYSERR_LIST_B(syserr_list_b_device),
+};
+# undef SYSERR_LIST_B
-/*
- * call-seq:
- * system_exit.success? => true or false
- *
- * Returns +true+ if exiting successful, +false+ if not.
- */
-
-static VALUE
-exit_success_p(exc)
- VALUE exc;
-{
- VALUE status = rb_attr_get(exc, rb_intern("status"));
- if (NIL_P(status)) return Qtrue;
- if (status == INT2FIX(EXIT_SUCCESS)) return Qtrue;
- return Qfalse;
-}
-
-void
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_name_error(ID id, const char *fmt, ...)
+static const syserr_index_entry syserr_index[]= {
+ {0, 1}, {1, 5}, {6, 1}, {7, 1}, {8, 1}, {9, 1}, {10, 1}, {11, 1},
+ {12, 1}, {13, 1}, {14, 1}, {0, 0},
+};
#else
-rb_name_error(id, fmt, va_alist)
- ID id;
- const char *fmt;
- va_dcl
+static VALUE *syserr_list;
#endif
-{
- VALUE exc, argv[2];
- va_list args;
- char buf[BUFSIZ];
-
- va_init_list(args, fmt);
- vsnprintf(buf, BUFSIZ, fmt, args);
- va_end(args);
-
- argv[0] = rb_str_new2(buf);
- argv[1] = ID2SYM(id);
- exc = rb_class_new_instance(2, argv, rb_eNameError);
- rb_exc_raise(exc);
-}
-
-/*
- * call-seq:
- * NameError.new(msg [, name]) => name_error
- *
- * Construct a new NameError exception. If given the <i>name</i>
- * parameter may subsequently be examined using the <code>NameError.name</code>
- * method.
- */
-
-static VALUE
-name_err_initialize(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-{
- VALUE name;
-
- name = (argc > 1) ? argv[--argc] : Qnil;
- rb_call_super(argc, argv);
- rb_iv_set(self, "name", name);
- return self;
-}
-
-/*
- * call-seq:
- * name_error.name => string or nil
- *
- * Return the name associated with this NameError exception.
- */
-
-static VALUE
-name_err_name(self)
- VALUE self;
-{
- return rb_attr_get(self, rb_intern("name"));
-}
-
-/*
- * call-seq:
- * name_error.to_s => string
- *
- * Produce a nicely-formated string representing the +NameError+.
- */
-
-static VALUE
-name_err_to_s(exc)
- VALUE exc;
-{
- VALUE mesg = rb_attr_get(exc, rb_intern("mesg")), str = mesg;
-
- if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
- StringValue(str);
- if (str != mesg) {
- rb_iv_set(exc, "mesg", mesg = str);
- }
- if (OBJ_TAINTED(exc)) OBJ_TAINT(mesg);
- return mesg;
-}
-
-/*
- * call-seq:
- * NoMethodError.new(msg, name [, args]) => no_method_error
- *
- * Construct a NoMethodError exception for a method of the given name
- * called with the given arguments. The name may be accessed using
- * the <code>#name</code> method on the resulting object, and the
- * arguments using the <code>#args</code> method.
- */
-static VALUE
-nometh_err_initialize(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-{
- VALUE args = (argc > 2) ? argv[--argc] : Qnil;
- name_err_initialize(argc, argv, self);
- rb_iv_set(self, "args", args);
- return self;
-}
-
-/* :nodoc: */
-static void
-name_err_mesg_mark(ptr)
- VALUE *ptr;
-{
- rb_gc_mark_locations(ptr, ptr+3);
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_new(obj, mesg, recv, method)
- VALUE obj, mesg, recv, method;
-{
- VALUE *ptr = ALLOC_N(VALUE, 3);
-
- ptr[0] = mesg;
- ptr[1] = recv;
- ptr[2] = method;
- return Data_Wrap_Struct(rb_cNameErrorMesg, name_err_mesg_mark, -1, ptr);
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_to_str(obj)
- VALUE obj;
-{
- VALUE *ptr, mesg;
- Data_Get_Struct(obj, VALUE, ptr);
-
- mesg = ptr[0];
- if (NIL_P(mesg)) return Qnil;
- else {
- char *desc = 0;
- VALUE d = 0, args[3];
-
- obj = ptr[1];
- switch (TYPE(obj)) {
- case T_NIL:
- desc = "nil";
- break;
- case T_TRUE:
- desc = "true";
- break;
- case T_FALSE:
- desc = "false";
- break;
- default:
- d = rb_protect(rb_inspect, obj, 0);
- if (NIL_P(d) || RSTRING(d)->len > 65) {
- d = rb_any_to_s(obj);
- }
- desc = RSTRING(d)->ptr;
- break;
- }
- if (desc && desc[0] != '#') {
- d = rb_str_new2(desc);
- rb_str_cat2(d, ":");
- rb_str_cat2(d, rb_obj_classname(obj));
- }
- args[0] = mesg;
- args[1] = ptr[2];
- args[2] = d;
- mesg = rb_f_sprintf(3, args);
- }
- if (OBJ_TAINTED(obj)) OBJ_TAINT(mesg);
- return mesg;
-}
-
-/* :nodoc: */
-static VALUE
-name_err_mesg_load(klass, str)
- VALUE klass, str;
-{
- return str;
-}
-
-/*
- * call-seq:
- * no_method_error.args => obj
- *
- * Return the arguments passed in as the third parameter to
- * the constructor.
- */
-
-static VALUE
-nometh_err_args(self)
- VALUE self;
-{
- return rb_attr_get(self, rb_intern("args"));
-}
-
-void
-rb_invalid_str(str, type)
- const char *str, *type;
-{
- VALUE s = rb_str_inspect(rb_str_new2(str));
-
- rb_raise(rb_eArgError, "invalid value for %s: %s", type, RSTRING(s)->ptr);
-}
-
-/*
- * Document-module: Errno
- *
- * Ruby exception objects are subclasses of <code>Exception</code>.
- * However, operating systems typically report errors using plain
- * integers. Module <code>Errno</code> is created dynamically to map
- * these operating system errors to Ruby classes, with each error
- * number generating its own subclass of <code>SystemCallError</code>.
- * As the subclass is created in module <code>Errno</code>, its name
- * will start <code>Errno::</code>.
- *
- * The names of the <code>Errno::</code> classes depend on
- * the environment in which Ruby runs. On a typical Unix or Windows
- * platform, there are <code>Errno</code> classes such as
- * <code>Errno::EACCES</code>, <code>Errno::EAGAIN</code>,
- * <code>Errno::EINTR</code>, and so on.
- *
- * The integer operating system error number corresponding to a
- * particular error is available as the class constant
- * <code>Errno::</code><em>error</em><code>::Errno</code>.
- *
- * Errno::EACCES::Errno #=> 13
- * Errno::EAGAIN::Errno #=> 11
- * Errno::EINTR::Errno #=> 4
- *
- * The full list of operating system errors on your particular platform
- * are available as the constants of <code>Errno</code>.
- *
- * Errno.constants #=> E2BIG, EACCES, EADDRINUSE, EADDRNOTAVAIL, ...
- */
-
-static st_table *syserr_tbl;
+#if !defined NT && !defined sys_nerr
+extern int sys_nerr;
+#endif
static VALUE
-set_syserr(n, name)
- int n;
+set_syserr(i, name)
+ int i;
const char *name;
{
- VALUE error;
-
- if (!st_lookup(syserr_tbl, n, &error)) {
- error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
- rb_define_const(error, "Errno", INT2NUM(n));
- st_add_direct(syserr_tbl, n, error);
- }
- else {
- rb_define_const(rb_mErrno, name, error);
- }
- return error;
-}
-
-static VALUE
-get_syserr(n)
- int n;
-{
- VALUE error;
-
- if (!st_lookup(syserr_tbl, n, &error)) {
- char name[8]; /* some Windows' errno have 5 digits. */
-
- snprintf(name, sizeof(name), "E%03d", n);
- error = set_syserr(n, name);
+#ifdef __BEOS__
+ VALUE *list;
+ int ix, offset;
+#endif
+ VALUE error = rb_define_class_under(rb_mErrno, name, rb_eSystemCallError);
+ rb_define_const(error, "Errno", INT2FIX(i));
+#ifdef __BEOS__
+ if (i == B_ERROR) {
+ syserr_error = error;
+ rb_global_variable(&syserr_error);
+ return error;
+ }
+ i -= B_GENERAL_ERROR_BASE;
+ ix = (i >> 12) & 0xf;
+ offset = (i >> 8) & 0xf;
+ if (offset < syserr_index[ix].n) {
+ ix = syserr_index[ix].ix;
+ if ((i & 0xff) < syserr_list[ix + offset].n) {
+ list = syserr_list[ix + offset].list;
+ list[i & 0xff] = error;
+ rb_global_variable(&list[i & 0xff]);
+ }
+ }
+#else
+ if (i <= sys_nerr) {
+ syserr_list[i] = error;
}
- return error;
-}
-
-/*
- * call-seq:
- * SystemCallError.new(msg, errno) => system_call_error_subclass
- *
- * If _errno_ corresponds to a known system error code, constructs
- * the appropriate <code>Errno</code> class for that error, otherwise
- * constructs a generic <code>SystemCallError</code> object. The
- * error number is subsequently available via the <code>errno</code>
- * method.
- */
-
-static VALUE
-syserr_initialize(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-{
-#if !defined(_WIN32) && !defined(__VMS)
- char *strerror();
#endif
- char *err;
- VALUE mesg, error;
- VALUE klass = rb_obj_class(self);
-
- if (klass == rb_eSystemCallError) {
- 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), &klass)) {
- /* change class */
- if (TYPE(self) != T_OBJECT) { /* insurance to avoid type crash */
- rb_raise(rb_eTypeError, "invalid instance type");
- }
- RBASIC(self)->klass = klass;
- }
- }
- else {
- rb_scan_args(argc, argv, "01", &mesg);
- error = rb_const_get(klass, rb_intern("Errno"));
- }
- if (!NIL_P(error)) err = strerror(NUM2LONG(error));
- else err = "unknown error";
- if (!NIL_P(mesg)) {
- VALUE str = mesg;
- size_t len;
-
- StringValue(str);
- len = strlen(err)+RSTRING(str)->len+3;
- mesg = rb_str_new(0, len);
- snprintf(RSTRING(mesg)->ptr, len+1, "%s - %.*s", err,
- (int)RSTRING(str)->len, RSTRING(str)->ptr);
- rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
- }
- else {
- mesg = rb_str_new2(err);
- }
- rb_call_super(1, &mesg);
- rb_iv_set(self, "errno", error);
- return self;
+ return error;
}
-/*
- * call-seq:
- * system_call_error.errno => fixnum
- *
- * Return this SystemCallError's error number.
- */
-
static VALUE
syserr_errno(self)
VALUE self;
{
- return rb_attr_get(self, rb_intern("errno"));
+ return rb_iv_get(self, "errno");
}
-/*
- * call-seq:
- * system_call_error === other => true or false
- *
- * Return +true+ if the receiver is a generic +SystemCallError+, or
- * if the error numbers _self_ and _other_ are the same.
- */
-
-
+#ifdef __BEOS__
static VALUE
-syserr_eqq(self, exc)
- VALUE self, exc;
+get_syserr(int i)
{
- VALUE num, e;
-
- if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) return Qfalse;
- if (self == rb_eSystemCallError) return Qtrue;
-
- num = rb_attr_get(exc, rb_intern("errno"));
- if (NIL_P(num)) {
- VALUE klass = CLASS_OF(exc);
-
- while (TYPE(klass) == T_ICLASS || FL_TEST(klass, FL_SINGLETON)) {
- klass = (VALUE)RCLASS(klass)->super;
- }
- num = rb_const_get(klass, rb_intern("Errno"));
- }
- e = rb_const_get(self, rb_intern("Errno"));
- if (FIXNUM_P(num) ? num == e : rb_equal(num, e))
- return Qtrue;
- return Qfalse;
+ VALUE *list;
+ int ix, offset;
+
+ if (i == B_ERROR) return syserr_error;
+ i -= B_GENERAL_ERROR_BASE;
+ ix = (i >> 12) & 0xf;
+ offset = (i >> 8) & 0xf;
+ if (offset < syserr_index[ix].n) {
+ ix = syserr_index[ix].ix;
+ if ((i & 0xff) < syserr_list[ix + offset].n) {
+ list = syserr_list[ix + offset].list;
+ return list[i & 0xff];
+ }
+ }
+ return 0;
}
+#endif /* __BEOS__ */
-/*
- * Descendents of class <code>Exception</code> are used to communicate
- * between <code>raise</code> methods and <code>rescue</code>
- * statements in <code>begin/end</code> blocks. <code>Exception</code>
- * objects carry information about the exception---its type (the
- * exception's class name), an optional descriptive string, and
- * optional traceback information. Programs may subclass
- * <code>Exception</code> to add additional information.
- */
+static void init_syserr _((void));
void
Init_Exception()
@@ -989,57 +547,36 @@ Init_Exception()
rb_define_method(rb_eException, "exception", exc_exception, -1);
rb_define_method(rb_eException, "initialize", exc_initialize, -1);
rb_define_method(rb_eException, "to_s", exc_to_s, 0);
- rb_define_method(rb_eException, "to_str", exc_to_str, 0);
- rb_define_method(rb_eException, "message", exc_to_str, 0);
+ rb_define_method(rb_eException, "to_str", exc_to_s, 0);
+ rb_define_method(rb_eException, "message", exc_to_s, 0);
rb_define_method(rb_eException, "inspect", exc_inspect, 0);
rb_define_method(rb_eException, "backtrace", exc_backtrace, 0);
rb_define_method(rb_eException, "set_backtrace", exc_set_backtrace, 1);
rb_eSystemExit = rb_define_class("SystemExit", rb_eException);
- rb_define_method(rb_eSystemExit, "initialize", exit_initialize, -1);
- rb_define_method(rb_eSystemExit, "status", exit_status, 0);
- rb_define_method(rb_eSystemExit, "success?", exit_success_p, 0);
-
rb_eFatal = rb_define_class("fatal", rb_eException);
+ rb_eInterrupt = rb_define_class("Interrupt", rb_eException);
rb_eSignal = rb_define_class("SignalException", rb_eException);
- rb_eInterrupt = rb_define_class("Interrupt", rb_eSignal);
rb_eStandardError = rb_define_class("StandardError", rb_eException);
- rb_eTypeError = rb_define_class("TypeError", rb_eStandardError);
- rb_eArgError = rb_define_class("ArgumentError", rb_eStandardError);
- rb_eIndexError = rb_define_class("IndexError", rb_eStandardError);
- rb_eRangeError = rb_define_class("RangeError", rb_eStandardError);
- rb_eNameError = rb_define_class("NameError", rb_eStandardError);
- rb_define_method(rb_eNameError, "initialize", name_err_initialize, -1);
- rb_define_method(rb_eNameError, "name", name_err_name, 0);
- rb_define_method(rb_eNameError, "to_s", name_err_to_s, 0);
- rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cData);
- rb_define_singleton_method(rb_cNameErrorMesg, "!", name_err_mesg_new, 3);
- rb_define_method(rb_cNameErrorMesg, "to_str", name_err_mesg_to_str, 0);
- rb_define_method(rb_cNameErrorMesg, "_dump", name_err_mesg_to_str, 1);
- rb_define_singleton_method(rb_cNameErrorMesg, "_load", name_err_mesg_load, 1);
- rb_eNoMethodError = rb_define_class("NoMethodError", rb_eNameError);
- rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
- rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
+ rb_eTypeError = rb_define_class("TypeError", rb_eStandardError);
+ rb_eArgError = rb_define_class("ArgumentError", rb_eStandardError);
+ rb_eIndexError = rb_define_class("IndexError", rb_eStandardError);
+ rb_eRangeError = rb_define_class("RangeError", rb_eStandardError);
rb_eScriptError = rb_define_class("ScriptError", rb_eException);
rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
+ rb_eNameError = rb_define_class("NameError", rb_eScriptError);
rb_eLoadError = rb_define_class("LoadError", rb_eScriptError);
rb_eNotImpError = rb_define_class("NotImplementedError", rb_eScriptError);
+ /* backward compatibility -- will be removed in the future */
+ rb_define_global_const("NotImplementError", rb_eNotImpError);
rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
rb_eSecurityError = rb_define_class("SecurityError", rb_eStandardError);
rb_eNoMemError = rb_define_class("NoMemoryError", rb_eException);
- syserr_tbl = st_init_numtable();
- rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
- rb_define_method(rb_eSystemCallError, "initialize", syserr_initialize, -1);
- rb_define_method(rb_eSystemCallError, "errno", syserr_errno, 0);
- rb_define_singleton_method(rb_eSystemCallError, "===", syserr_eqq, 1);
-
- rb_mErrno = rb_define_module("Errno");
-
- rb_define_global_function("warn", rb_warn_m, 1);
+ init_syserr();
}
void
@@ -1083,7 +620,7 @@ void
rb_notimplement()
{
rb_raise(rb_eNotImpError,
- "%s() function is unimplemented on this machine",
+ "The %s() function is unimplemented on this machine",
rb_id2name(ruby_frame->last_func));
}
@@ -1111,68 +648,89 @@ void
rb_sys_fail(mesg)
const char *mesg;
{
+#ifndef NT
+ char *strerror();
+#endif
+ char *err;
+ char *buf;
+ extern int errno;
int n = errno;
- VALUE arg;
+ VALUE ee;
- errno = 0;
- if (n == 0) {
- rb_bug("rb_sys_fail(%s) - errno == 0", mesg ? mesg : "");
- }
+ err = strerror(errno);
+ if (mesg) {
+ volatile VALUE tmp = rb_str_inspect(rb_str_new2(mesg));
- arg = mesg ? rb_str_new2(mesg) : Qnil;
- rb_exc_raise(rb_class_new_instance(1, &arg, get_syserr(n)));
-}
+ buf = ALLOCA_N(char, strlen(err)+RSTRING(tmp)->len+4);
+ sprintf(buf, "%s - %s", err, RSTRING(tmp)->ptr);
+ }
+ else {
+ buf = ALLOCA_N(char, strlen(err)+1);
+ strcpy(buf, err);
+ }
-void
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_sys_warning(const char *fmt, ...)
+ errno = 0;
+#ifdef __BEOS__
+ ee = get_syserr(n);
+ if (!ee) {
+ char name[6];
+
+ sprintf(name, "E%03d", n);
+ ee = set_syserr(n, name);
+ }
#else
-rb_sys_warning(fmt, va_alist)
- const char *fmt;
- va_dcl
+ if (n > sys_nerr || !syserr_list[n]) {
+ char name[6];
+
+ sprintf(name, "E%03d", n);
+ ee = set_syserr(n, name);
+ }
+ else {
+ ee = syserr_list[n];
+ }
#endif
-{
- char buf[BUFSIZ];
- va_list args;
- int errno_save;
-
- errno_save = errno;
-
- if (!RTEST(ruby_verbose)) return;
-
- snprintf(buf, BUFSIZ, "warning: %s", fmt);
- snprintf(buf+strlen(buf), BUFSIZ-strlen(buf), ": %s", strerror(errno_save));
-
- va_init_list(args, fmt);
- warn_print(buf, args);
- va_end(args);
- errno = errno_save;
+ ee = rb_exc_new2(ee, buf);
+ rb_iv_set(ee, "errno", INT2FIX(n));
+ rb_exc_raise(ee);
}
void
rb_load_fail(path)
- const char *path;
+ char *path;
{
rb_loaderror("%s -- %s", strerror(errno), path);
}
void
rb_error_frozen(what)
- const char *what;
+ char *what;
{
rb_raise(rb_eTypeError, "can't modify frozen %s", what);
}
-void
-rb_check_frozen(obj)
- VALUE obj;
+static void
+init_syserr()
{
- if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj));
-}
+#ifdef __BEOS__
+ int i, ix, offset;
+#endif
+ rb_eSystemCallError = rb_define_class("SystemCallError", rb_eStandardError);
+ rb_define_method(rb_eSystemCallError, "errno", syserr_errno, 0);
+
+ rb_mErrno = rb_define_module("Errno");
+#ifdef __BEOS__
+ for (i = 0; syserr_index[i].n != 0; i++) {
+ ix = syserr_index[i].ix;
+ for (offset = 0; offset < syserr_index[i].n; offset++) {
+ MEMZERO(syserr_list[ix + offset].list, VALUE, syserr_list[ix + offset].n);
+ }
+ }
+ set_syserr(B_ERROR, "ERROR");
+#else
+ syserr_list = ALLOC_N(VALUE, sys_nerr+1);
+ MEMZERO(syserr_list, VALUE, sys_nerr+1);
+#endif
-void
-Init_syserr()
-{
#ifdef EPERM
set_syserr(EPERM, "EPERM");
#endif
@@ -1552,7 +1110,7 @@ err_append(s)
ruby_errinfo = rb_exc_new2(rb_eSyntaxError, s);
}
else {
- VALUE str = rb_obj_as_string(ruby_errinfo);
+ VALUE str = rb_str_to_str(ruby_errinfo);
rb_str_cat2(str, "\n");
rb_str_cat2(str, s);
@@ -1560,7 +1118,8 @@ err_append(s)
}
}
else {
- rb_write_error(s);
- rb_write_error("\n");
+ fputs(s, stderr);
+ fputs("\n", stderr);
+ fflush(stderr);
}
}
diff --git a/eval.c b/eval.c
index 505665d513..12baccb2d7 100644
--- a/eval.c
+++ b/eval.c
@@ -6,7 +6,7 @@
$Date$
created at: Thu Jun 10 14:22:17 JST 1993
- Copyright (C) 1993-2003 Yukihiro Matsumoto
+ Copyright (C) 1993-2001 Yukihiro Matsumoto
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
Copyright (C) 2000 Information-technology Promotion Agency, Japan
@@ -15,28 +15,13 @@
#include "ruby.h"
#include "node.h"
#include "env.h"
-#include "util.h"
#include "rubysig.h"
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifndef EXIT_SUCCESS
-#define EXIT_SUCCESS 0
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
-
#include <stdio.h>
-
+#include <setjmp.h>
#include "st.h"
#include "dln.h"
-#ifdef __APPLE__
-#include <crt_externs.h>
-#endif
-
/* Make alloca work the best possible way. */
#ifdef __GNUC__
# ifndef atarist
@@ -45,17 +30,17 @@
# endif
# endif /* atarist */
#else
-# ifdef HAVE_ALLOCA_H
+# if defined(HAVE_ALLOCA_H)
# include <alloca.h>
-# else
-# ifndef _AIX
-# ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca ();
-# endif
-# endif /* AIX */
-# endif /* HAVE_ALLOCA_H */
+# elif !defined(alloca)
+char *alloca();
+# endif
#endif /* __GNUC__ */
+#ifdef _AIX
+#pragma alloca
+#endif
+
#ifdef HAVE_STDARG_PROTOTYPES
#include <stdarg.h>
#define va_init_list(a,b) va_start(a,b)
@@ -80,159 +65,50 @@ char *strrchr _((const char*,const char));
#include "macruby_private.h"
#endif
-#ifdef __VMS
-#include "vmsruby_private.h"
+#ifndef setjmp
+#ifdef HAVE__SETJMP
+#define setjmp(env) _setjmp(env)
+#define longjmp(env,val) _longjmp(env,val)
#endif
-
-#ifdef USE_CONTEXT
-
-NORETURN(static void rb_jump_context(rb_jmpbuf_t, int));
-static inline void
-rb_jump_context(env, val)
- rb_jmpbuf_t env;
- int val;
-{
- env->status = val;
- setcontext(&env->context);
- abort(); /* ensure noreturn */
-}
-/*
- * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc,
- * IA64 register stack and SPARC register window combination problem.
- *
- * Assume following code sequence.
- *
- * 1. set a register in the register stack/window such as r32/l0.
- * 2. call getcontext.
- * 3. use the register.
- * 4. update the register for other use.
- * 5. call setcontext indirectly (or directly).
- *
- * This code should be run as 1->2->3->4->5->3->4.
- * But after second getcontext return (second 3),
- * the register is broken (updated).
- * It's because getcontext/setcontext doesn't preserve the content of the
- * register stack/window.
- *
- * setjmp also doesn't preserve the content of the register stack/window.
- * But it has not the problem because gcc knows setjmp may return twice.
- * gcc detects setjmp and generates setjmp safe code.
- *
- * So setjmp calls before and after the getcontext call makes the code
- * somewhat safe.
- * It fix the problem on IA64.
- * It is not required that setjmp is called at run time, since the problem is
- * register usage.
- *
- * Since the magic setjmp is not enough for SPARC,
- * inline asm is used to prohibit registers in register windows.
- *
- * Since the problem is fixed at gcc 4.0.3, the magic is applied only for
- * prior versions of gcc.
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21957
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127
- */
-# define GCC_VERSION_BEFORE(major, minor, patchlevel) \
- (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
- ((__GNUC__ < (major)) || \
- (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
- (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
-# if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__))
-# ifdef __pic__
-/*
- * %l7 is excluded for PIC because it is PIC register.
- * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
- */
-# define PRE_GETCONTEXT \
- ({ __asm__ volatile ("" : : : \
- "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
- "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \
- "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-# else
-# define PRE_GETCONTEXT \
- ({ __asm__ volatile ("" : : : \
- "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
- "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
- "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-# endif
-# define POST_GETCONTEXT PRE_GETCONTEXT
-# elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64)
-static jmp_buf function_call_may_return_twice_jmp_buf;
-int function_call_may_return_twice_false_1 = 0;
-int function_call_may_return_twice_false_2 = 0;
-# define PRE_GETCONTEXT \
- (function_call_may_return_twice_false_1 ? \
- setjmp(function_call_may_return_twice_jmp_buf) : \
- 0)
-# define POST_GETCONTEXT \
- (function_call_may_return_twice_false_2 ? \
- setjmp(function_call_may_return_twice_jmp_buf) : \
- 0)
-# elif defined(__FreeBSD__) && __FreeBSD__ < 7
-/*
- * workaround for FreeBSD/i386 getcontext/setcontext bug.
- * clear the carry flag by (0 ? ... : ...).
- * FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110
- * [ruby-dev:28263]
- */
-static int volatile freebsd_clear_carry_flag = 0;
-# define PRE_GETCONTEXT \
- (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0)
-# endif
-# ifndef PRE_GETCONTEXT
-# define PRE_GETCONTEXT 0
-# endif
-# ifndef POST_GETCONTEXT
-# define POST_GETCONTEXT 0
-# endif
-# define ruby_longjmp(env, val) rb_jump_context(env, val)
-# define ruby_setjmp(just_before_setjmp, j) ((j)->status = 0, \
- (just_before_setjmp), \
- PRE_GETCONTEXT, \
- getcontext(&(j)->context), \
- POST_GETCONTEXT, \
- (j)->status)
-#else
-# if !defined(setjmp) && defined(HAVE__SETJMP)
-# define ruby_setjmp(just_before_setjmp, env) \
- ((just_before_setjmp), _setjmp(env))
-# define ruby_longjmp(env,val) _longjmp(env,val)
-# else
-# define ruby_setjmp(just_before_setjmp, env) \
- ((just_before_setjmp), setjmp(env))
-# define ruby_longjmp(env,val) longjmp(env,val)
-# endif
#endif
#include <sys/types.h>
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#else
+#ifndef NT
+struct timeval {
+ long tv_sec; /* seconds */
+ long tv_usec; /* and microseconds */
+};
+#endif /* NT */
+#endif
#include <signal.h>
#include <errno.h>
-#if defined(__VMS)
-#pragma nostandard
-#endif
-
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
#include <sys/stat.h>
VALUE rb_cProc;
-VALUE rb_cBinding;
-static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
+static VALUE rb_cBinding;
+static VALUE proc_call _((VALUE,VALUE));
static VALUE rb_f_binding _((VALUE));
static void rb_f_END _((void));
static VALUE rb_f_block_given_p _((void));
static VALUE block_pass _((VALUE,NODE*));
-
-VALUE rb_cMethod;
+static VALUE rb_cMethod;
+static VALUE method_proc _((VALUE));
static VALUE method_call _((int, VALUE*, VALUE));
-VALUE rb_cUnboundMethod;
+static VALUE rb_cUnboundMethod;
static VALUE umethod_bind _((VALUE, VALUE));
static VALUE rb_mod_define_method _((int, VALUE*, VALUE));
-NORETURN(static void rb_raise_jump _((VALUE)));
-static VALUE rb_make_exception _((int argc, VALUE *argv));
static int scope_vmode;
#define SCOPE_PUBLIC 0
@@ -240,18 +116,15 @@ static int scope_vmode;
#define SCOPE_PROTECTED 2
#define SCOPE_MODFUNC 5
#define SCOPE_MASK 7
-#define SCOPE_SET(f) (scope_vmode=(f))
+#define SCOPE_SET(f) do {scope_vmode=(f);} while(0)
#define SCOPE_TEST(f) (scope_vmode&(f))
-VALUE (*ruby_sandbox_save)_((rb_thread_t));
-VALUE (*ruby_sandbox_restore)_((rb_thread_t));
-NODE* ruby_current_node;
int ruby_safe_level = 0;
/* safe-level:
0 - strings from streams/environment/ARGV are tainted (default)
1 - no dangerous operation by tainted value
2 - process/file operations prohibited
- 3 - all generated objects are tainted
+ 3 - all genetated objects are tainted
4 - no global (non-tainted) variable modification/no direct output
*/
@@ -263,25 +136,13 @@ rb_secure(level)
int level;
{
if (level <= ruby_safe_level) {
- if (ruby_frame->last_func) {
- rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
- rb_id2name(ruby_frame->last_func), ruby_safe_level);
- }
- else {
- rb_raise(rb_eSecurityError, "Insecure operation at level %d", ruby_safe_level);
- }
+ rb_raise(rb_eSecurityError, "Insecure operation `%s' at level %d",
+ rb_id2name(ruby_frame->last_func), ruby_safe_level);
}
}
void
-rb_secure_update(obj)
- VALUE obj;
-{
- if (!OBJ_TAINTED(obj)) rb_secure(4);
-}
-
-void
-rb_check_safe_obj(x)
+rb_check_safe_str(x)
VALUE x;
{
if (ruby_safe_level > 0 && OBJ_TAINTED(x)){
@@ -294,32 +155,24 @@ rb_check_safe_obj(x)
}
}
rb_secure(4);
-}
-
-void
-rb_check_safe_str(x)
- VALUE x;
-{
- rb_check_safe_obj(x);
if (TYPE(x)!= T_STRING) {
rb_raise(rb_eTypeError, "wrong argument type %s (expected String)",
- rb_obj_classname(x));
+ rb_class2name(CLASS_OF(x)));
}
}
-NORETURN(static void print_undef _((VALUE, ID)));
+static void print_undef _((VALUE, ID)) NORETURN;
static void
print_undef(klass, id)
VALUE klass;
ID id;
{
- rb_name_error(id, "undefined method `%s' for %s `%s'",
- rb_id2name(id),
- (TYPE(klass) == T_MODULE) ? "module" : "class",
- rb_class2name(klass));
+ rb_raise(rb_eNameError, "undefined method `%s' for %s `%s'",
+ rb_id2name(id),
+ (TYPE(klass) == T_MODULE)?"module":"class",
+ rb_class2name(klass));
}
-static ID removed, singleton_removed, undefined, singleton_undefined;
#define CACHE_SIZE 0x800
#define CACHE_MASK 0x7ff
@@ -335,35 +188,15 @@ struct cache_entry { /* method hash table. */
};
static struct cache_entry cache[CACHE_SIZE];
-static int ruby_running = 0;
void
rb_clear_cache()
{
- struct cache_entry *ent, *end;
-
- if (!ruby_running) return;
- ent = cache; end = ent + CACHE_SIZE;
- while (ent < end) {
- ent->mid = 0;
- ent++;
- }
-}
-
-static void
-rb_clear_cache_for_undef(klass, id)
- VALUE klass;
- ID id;
-{
struct cache_entry *ent, *end;
- if (!ruby_running) return;
ent = cache; end = ent + CACHE_SIZE;
while (ent < end) {
- if (ent->mid == id &&
- RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
- ent->mid = 0;
- }
+ ent->mid = 0;
ent++;
}
}
@@ -374,7 +207,6 @@ rb_clear_cache_by_id(id)
{
struct cache_entry *ent, *end;
- if (!ruby_running) return;
ent = cache; end = ent + CACHE_SIZE;
while (ent < end) {
if (ent->mid == id) {
@@ -385,31 +217,6 @@ rb_clear_cache_by_id(id)
}
void
-rb_clear_cache_by_class(klass)
- VALUE klass;
-{
- struct cache_entry *ent, *end;
-
- if (!ruby_running) return;
- ent = cache; end = ent + CACHE_SIZE;
- while (ent < end) {
- if (ent->klass == klass || ent->origin == klass) {
- ent->mid = 0;
- }
- ent++;
- }
-}
-
-static ID init, eqq, each, aref, aset, match, missing;
-static ID added, singleton_added;
-static ID __id__, __send__, respond_to;
-
-#define NOEX_TAINTED 8
-#define NOEX_SAFE(n) ((n) >> 4)
-#define NOEX_WITH(n, v) ((n) | (v) << 4)
-#define NOEX_WITH_SAFE(n) NOEX_WITH(n, ruby_safe_level)
-
-void
rb_add_method(klass, mid, node, noex)
VALUE klass;
ID mid;
@@ -419,49 +226,15 @@ rb_add_method(klass, mid, node, noex)
NODE *body;
if (NIL_P(klass)) klass = rb_cObject;
- if (ruby_safe_level >= 4 && (klass == rb_cObject || !OBJ_TAINTED(klass))) {
- rb_raise(rb_eSecurityError, "Insecure: can't define method");
- }
- if (!FL_TEST(klass, FL_SINGLETON) &&
- node && nd_type(node) != NODE_ZSUPER &&
- (mid == rb_intern("initialize" )|| mid == rb_intern("initialize_copy"))) {
- noex = NOEX_PRIVATE | noex;
+ if (klass == rb_cObject) {
+ rb_secure(4);
}
- else if (FL_TEST(klass, FL_SINGLETON) && node && nd_type(node) == NODE_CFUNC &&
- mid == rb_intern("allocate")) {
- rb_warn("defining %s.allocate is deprecated; use rb_define_alloc_func()",
- rb_class2name(rb_iv_get(klass, "__attached__")));
- mid = ID_ALLOCATOR;
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't define method");
}
if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
- rb_clear_cache_by_id(mid);
- body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
- st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
- if (node && mid != ID_ALLOCATOR && ruby_running) {
- if (FL_TEST(klass, FL_SINGLETON)) {
- rb_funcall(rb_iv_get(klass, "__attached__"), singleton_added, 1, ID2SYM(mid));
- }
- else {
- rb_funcall(klass, added, 1, ID2SYM(mid));
- }
- }
-}
-
-void
-rb_define_alloc_func(klass, func)
- VALUE klass;
- VALUE (*func) _((VALUE));
-{
- Check_Type(klass, T_CLASS);
- rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, NEW_CFUNC(func, 0), NOEX_PRIVATE);
-}
-
-void
-rb_undef_alloc_func(klass)
- VALUE klass;
-{
- Check_Type(klass, T_CLASS);
- rb_add_method(CLASS_OF(klass), ID_ALLOCATOR, 0, NOEX_UNDEF);
+ body = NEW_METHOD(node, noex);
+ st_insert(RCLASS(klass)->m_tbl, mid, body);
}
static NODE*
@@ -472,7 +245,7 @@ search_method(klass, id, origin)
NODE *body;
if (!klass) return 0;
- while (!st_lookup(RCLASS(klass)->m_tbl, id, (st_data_t *)&body)) {
+ while (!st_lookup(RCLASS(klass)->m_tbl, id, &body)) {
klass = RCLASS(klass)->super;
if (!klass) return 0;
}
@@ -501,57 +274,33 @@ rb_get_method_body(klassp, idp, noexp)
ent->mid = ent->mid0 = id;
ent->noex = 0;
ent->method = 0;
-
+
return 0;
}
- if (ruby_running) {
- /* store in cache */
- ent = cache + EXPR1(klass, id);
- ent->klass = klass;
- ent->noex = body->nd_noex;
- if (noexp) *noexp = body->nd_noex;
- body = body->nd_body;
- if (nd_type(body) == NODE_FBODY) {
- ent->mid = id;
- *klassp = body->nd_orig;
- ent->origin = body->nd_orig;
- *idp = ent->mid0 = body->nd_mid;
- body = ent->method = body->nd_head;
- }
- else {
- *klassp = origin;
- ent->origin = origin;
- ent->mid = ent->mid0 = id;
- ent->method = body;
- }
+ /* store in cache */
+ ent = cache + EXPR1(klass, id);
+ ent->klass = klass;
+ ent->noex = body->nd_noex;
+ body = body->nd_body;
+ if (nd_type(body) == NODE_FBODY) {
+ ent->mid = id;
+ *klassp = body->nd_orig;
+ ent->origin = body->nd_orig;
+ *idp = ent->mid0 = body->nd_mid;
+ body = ent->method = body->nd_head;
}
else {
- if (noexp) *noexp = body->nd_noex;
- body = body->nd_body;
- if (nd_type(body) == NODE_FBODY) {
- *klassp = body->nd_orig;
- *idp = body->nd_mid;
- body = body->nd_head;
- }
- else {
- *klassp = origin;
- }
+ *klassp = origin;
+ ent->origin = origin;
+ ent->mid = ent->mid0 = id;
+ ent->method = body;
}
+ if (noexp) *noexp = ent->noex;
return body;
}
-NODE*
-rb_method_node(klass, id)
- VALUE klass;
- ID id;
-{
- int noex;
-
- return rb_get_method_body(&klass, &id, &noex);
-}
-
static void
remove_method(klass, mid)
VALUE klass;
@@ -562,30 +311,15 @@ remove_method(klass, mid)
if (klass == rb_cObject) {
rb_secure(4);
}
- if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass)) {
rb_raise(rb_eSecurityError, "Insecure: can't remove method");
}
if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
- if (mid == __id__ || mid == __send__ || mid == init) {
- rb_warn("removing `%s' may cause serious problem", rb_id2name(mid));
- }
- if (st_lookup(RCLASS(klass)->m_tbl, mid, (st_data_t *)&body)) {
- if (!body || !body->nd_body) body = 0;
- else {
- st_delete(RCLASS(klass)->m_tbl, &mid, (st_data_t *)&body);
- }
- }
- if (!body) {
- rb_name_error(mid, "method `%s' not defined in %s",
- rb_id2name(mid), rb_class2name(klass));
- }
- rb_clear_cache_for_undef(klass, mid);
- if (FL_TEST(klass, FL_SINGLETON)) {
- rb_funcall(rb_iv_get(klass, "__attached__"), singleton_removed, 1, ID2SYM(mid));
- }
- else {
- rb_funcall(klass, removed, 1, ID2SYM(mid));
+ if (!st_delete(RCLASS(klass)->m_tbl, &mid, &body)) {
+ rb_raise(rb_eNameError, "method `%s' not defined in %s",
+ rb_id2name(mid), rb_class2name(klass));
}
+ rb_clear_cache_by_id(mid);
}
void
@@ -596,37 +330,34 @@ rb_remove_method(klass, name)
remove_method(klass, rb_intern(name));
}
-/*
- * call-seq:
- * remove_method(symbol) => self
- *
- * Removes the method identified by _symbol_ from the current
- * class. For an example, see <code>Module.undef_method</code>.
- */
-
static VALUE
-rb_mod_remove_method(argc, argv, mod)
- int argc;
- VALUE *argv;
- VALUE mod;
+rb_mod_remove_method(mod, name)
+ VALUE mod, name;
{
- int i;
-
- for (i=0; i<argc; i++) {
- remove_method(mod, rb_to_id(argv[i]));
- }
+ remove_method(mod, rb_to_id(name));
return mod;
}
-#undef rb_disable_super
-#undef rb_enable_super
-
void
rb_disable_super(klass, name)
VALUE klass;
const char *name;
{
- /* obsolete - no use */
+ VALUE origin;
+ NODE *body;
+ ID mid = rb_intern(name);
+
+ body = search_method(klass, mid, &origin);
+ if (!body || !body->nd_body) {
+ print_undef(klass, mid);
+ }
+ if (origin == klass) {
+ body->nd_noex |= NOEX_UNDEF;
+ }
+ else {
+ rb_add_method(klass, mid, 0, NOEX_UNDEF);
+ rb_clear_cache_by_id(mid);
+ }
}
void
@@ -634,7 +365,20 @@ rb_enable_super(klass, name)
VALUE klass;
const char *name;
{
- rb_warn("rb_enable_super() is obsolete");
+ VALUE origin;
+ NODE *body;
+ ID mid = rb_intern(name);
+
+ body = search_method(klass, mid, &origin);
+ if (!body) {
+ print_undef(klass, mid);
+ }
+ if (!body->nd_body) {
+ remove_method(klass, mid);
+ }
+ else {
+ body->nd_noex &= ~NOEX_UNDEF;
+ }
}
static void
@@ -653,7 +397,7 @@ rb_export_method(klass, name, noex)
if (!body && TYPE(klass) == T_MODULE) {
body = search_method(rb_cObject, name, &origin);
}
- if (!body || !body->nd_body) {
+ if (!body) {
print_undef(klass, name);
}
if (body->nd_noex != noex) {
@@ -662,6 +406,7 @@ rb_export_method(klass, name, noex)
}
else {
rb_add_method(klass, name, NEW_ZSUPER(), noex);
+ rb_clear_cache_by_id(name);
}
}
}
@@ -691,6 +436,10 @@ rb_method_boundp(klass, id, ex)
return Qfalse;
}
+static ID init, eqq, each, aref, aset, match, to_ary;
+static ID missing, added, singleton_added;
+static ID __id__, __send__;
+
void
rb_attr(klass, id, read, write, ex)
VALUE klass;
@@ -701,15 +450,12 @@ rb_attr(klass, id, read, write, ex)
char *buf;
ID attriv;
int noex;
- size_t len;
if (!ex) noex = NOEX_PUBLIC;
else {
if (SCOPE_TEST(SCOPE_PRIVATE)) {
noex = NOEX_PRIVATE;
- rb_warning((scope_vmode == SCOPE_MODFUNC) ?
- "attribute accessor as module_function" :
- "private attribute?");
+ rb_warning("private attribute?");
}
else if (SCOPE_TEST(SCOPE_PROTECTED)) {
noex = NOEX_PROTECTED;
@@ -719,22 +465,24 @@ rb_attr(klass, id, read, write, ex)
}
}
- if (!rb_is_local_id(id) && !rb_is_const_id(id)) {
- rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id));
- }
name = rb_id2name(id);
if (!name) {
rb_raise(rb_eArgError, "argument needs to be symbol or string");
}
- len = strlen(name)+2;
- buf = ALLOCA_N(char,len);
- snprintf(buf, len, "@%s", name);
+ buf = ALLOCA_N(char,strlen(name)+2);
+ sprintf(buf, "@%s", name);
attriv = rb_intern(buf);
if (read) {
rb_add_method(klass, id, NEW_IVAR(attriv), noex);
+ rb_clear_cache_by_id(id);
+ rb_funcall(klass, added, 1, ID2SYM(id));
}
if (write) {
- rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
+ sprintf(buf, "%s=", name);
+ id = rb_intern(buf);
+ rb_add_method(klass, id, NEW_ATTRSET(attriv), noex);
+ rb_clear_cache_by_id(id);
+ rb_funcall(klass, added, 1, ID2SYM(id));
}
}
@@ -745,8 +493,8 @@ extern NODE *ruby_eval_tree_begin;
extern NODE *ruby_eval_tree;
extern int ruby_nerrs;
-VALUE rb_eLocalJumpError;
-VALUE rb_eSysStackError;
+static VALUE rb_eLocalJumpError;
+static VALUE rb_eSysStackError;
extern VALUE ruby_top_self;
@@ -755,23 +503,29 @@ struct SCOPE *ruby_scope;
static struct FRAME *top_frame;
static struct SCOPE *top_scope;
-static unsigned long frame_unique = 0;
-
-#define PUSH_FRAME() do { \
+#define PUSH_FRAME() { \
struct FRAME _frame; \
_frame.prev = ruby_frame; \
_frame.tmp = 0; \
- _frame.node = ruby_current_node; \
+ _frame.file = ruby_sourcefile; \
+ _frame.line = ruby_sourceline; \
_frame.iter = ruby_iter->iter; \
+ _frame.cbase = ruby_frame->cbase; \
_frame.argc = 0; \
- _frame.flags = 0; \
- _frame.uniq = frame_unique++; \
- ruby_frame = &_frame
+ _frame.argv = 0; \
+ _frame.flags = FRAME_ALLOCA; \
+ ruby_frame = &_frame; \
#define POP_FRAME() \
- ruby_current_node = _frame.node; \
- ruby_frame = _frame.prev; \
-} while (0)
+ ruby_sourcefile = _frame.file; \
+ ruby_sourceline = _frame.line; \
+ ruby_frame = _frame.prev; }
+
+struct BLOCKTAG {
+ struct RBasic super;
+ long dst;
+ long flags;
+};
struct BLOCK {
NODE *var;
@@ -779,71 +533,75 @@ struct BLOCK {
VALUE self;
struct FRAME frame;
struct SCOPE *scope;
+ struct BLOCKTAG *tag;
VALUE klass;
- NODE *cref;
int iter;
int vmode;
int flags;
- int uniq;
struct RVarmap *dyna_vars;
VALUE orig_thread;
- VALUE wrapper;
- VALUE block_obj;
- struct BLOCK *outer;
struct BLOCK *prev;
};
#define BLOCK_D_SCOPE 1
-#define BLOCK_LAMBDA 2
+#define BLOCK_DYNAMIC 2
+#define BLOCK_ORPHAN 4
static struct BLOCK *ruby_block;
-static unsigned long block_unique = 1;
-#define PUSH_BLOCK(v,b) do { \
+static struct BLOCKTAG*
+new_blktag()
+{
+ NEWOBJ(blktag, struct BLOCKTAG);
+ OBJSETUP(blktag, 0, T_BLKTAG);
+ blktag->dst = 0;
+ blktag->flags = 0;
+ return blktag;
+}
+
+#define PUSH_BLOCK(v,b) { \
struct BLOCK _block; \
- _block.var = (v); \
- _block.body = (b); \
+ _block.tag = new_blktag(); \
+ _block.var = v; \
+ _block.body = b; \
_block.self = self; \
_block.frame = *ruby_frame; \
_block.klass = ruby_class; \
- _block.cref = ruby_cref; \
- _block.frame.node = ruby_current_node;\
+ _block.frame.file = ruby_sourcefile;\
+ _block.frame.line = ruby_sourceline;\
_block.scope = ruby_scope; \
_block.prev = ruby_block; \
- _block.outer = ruby_block; \
_block.iter = ruby_iter->iter; \
_block.vmode = scope_vmode; \
_block.flags = BLOCK_D_SCOPE; \
_block.dyna_vars = ruby_dyna_vars; \
- _block.wrapper = ruby_wrapper; \
- _block.block_obj = 0; \
- _block.uniq = (b)?block_unique++:0; \
- if (b) { \
- prot_tag->blkid = _block.uniq; \
- } \
- ruby_block = &_block
-
-#define POP_BLOCK() \
- ruby_block = _block.prev; \
+ ruby_block = &_block;
+
+#define POP_BLOCK_TAG(tag) do { \
+ if ((tag)->flags & BLOCK_DYNAMIC) \
+ (tag)->flags |= BLOCK_ORPHAN; \
+ else \
+ rb_gc_force_recycle((VALUE)tag); \
} while (0)
+#define POP_BLOCK() \
+ POP_BLOCK_TAG(_block.tag); \
+ ruby_block = _block.prev; \
+}
+
struct RVarmap *ruby_dyna_vars;
-#define PUSH_VARS() do { \
- struct RVarmap * volatile _old; \
- _old = ruby_dyna_vars; \
- ruby_dyna_vars = 0
-
-#define POP_VARS() \
- if (_old && (ruby_scope->flags & SCOPE_DONT_RECYCLE)) {\
- if (RBASIC(_old)->flags) /* unless it's already recycled */ \
- FL_SET(_old, DVAR_DONT_RECYCLE); \
- }\
- ruby_dyna_vars = _old; \
-} while (0)
+#define PUSH_VARS() { \
+ struct RVarmap * volatile _old; \
+ _old = ruby_dyna_vars; \
+ ruby_dyna_vars = 0;
-#define DVAR_DONT_RECYCLE FL_USER2
+#define POP_VARS() \
+ if (_old && (ruby_scope->flag & SCOPE_DONT_RECYCLE)) \
+ FL_SET(_old, DVAR_DONT_RECYCLE); \
+ ruby_dyna_vars = _old; \
+}
-#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH)
+#define DVAR_DONT_RECYCLE FL_USER2
static struct RVarmap*
new_dvar(id, value, prev)
@@ -921,7 +679,6 @@ dvar_asgn_internal(id, value, curr)
while (vars) {
if (curr && vars->id == 0) {
- /* first null is a dvar header */
n++;
if (n == 2) break;
}
@@ -940,7 +697,7 @@ dvar_asgn_internal(id, value, curr)
}
}
-static inline void
+void
dvar_asgn(id, value)
ID id;
VALUE value;
@@ -948,7 +705,7 @@ dvar_asgn(id, value)
dvar_asgn_internal(id, value, 0);
}
-static inline void
+static void
dvar_asgn_curr(id, value)
ID id;
VALUE value;
@@ -956,24 +713,6 @@ dvar_asgn_curr(id, value)
dvar_asgn_internal(id, value, 1);
}
-VALUE *
-rb_svar(cnt)
- int cnt;
-{
- struct RVarmap *vars = ruby_dyna_vars;
- ID id;
-
- if (!ruby_scope->local_tbl) return NULL;
- if (cnt >= ruby_scope->local_tbl[0]) return NULL;
- id = ruby_scope->local_tbl[cnt+1];
- while (vars) {
- if (vars->id == id) return &vars->val;
- vars = vars->next;
- }
- if (ruby_scope->local_vars == 0) return NULL;
- return &ruby_scope->local_vars[cnt];
-}
-
struct iter {
int iter;
struct iter *prev;
@@ -983,32 +722,30 @@ static struct iter *ruby_iter;
#define ITER_NOT 0
#define ITER_PRE 1
#define ITER_CUR 2
-#define ITER_PAS 3
-#define PUSH_ITER(i) do { \
+#define PUSH_ITER(i) { \
struct iter _iter; \
_iter.prev = ruby_iter; \
_iter.iter = (i); \
- ruby_iter = &_iter
+ ruby_iter = &_iter; \
#define POP_ITER() \
ruby_iter = _iter.prev; \
-} while (0)
+}
struct tag {
- rb_jmpbuf_t buf;
+ jmp_buf buf;
struct FRAME *frame;
struct iter *iter;
- VALUE tag;
+ ID tag;
VALUE retval;
struct SCOPE *scope;
- VALUE dst;
+ int dst;
struct tag *prev;
- int blkid;
};
static struct tag *prot_tag;
-#define PUSH_TAG(ptag) do { \
+#define PUSH_TAG(ptag) { \
struct tag _tag; \
_tag.retval = Qnil; \
_tag.frame = ruby_frame; \
@@ -1017,29 +754,29 @@ static struct tag *prot_tag;
_tag.scope = ruby_scope; \
_tag.tag = ptag; \
_tag.dst = 0; \
- _tag.blkid = 0; \
- prot_tag = &_tag
+ prot_tag = &_tag;
-#define PROT_NONE Qfalse /* 0 */
-#define PROT_THREAD Qtrue /* 2 */
-#define PROT_FUNC INT2FIX(0) /* 1 */
-#define PROT_LOOP INT2FIX(1) /* 3 */
-#define PROT_LAMBDA INT2FIX(2) /* 5 */
-#define PROT_YIELD INT2FIX(3) /* 7 */
+#define PROT_NONE 0
+#define PROT_FUNC -1
+#define PROT_THREAD -2
-#define EXEC_TAG() (FLUSH_REGISTER_WINDOWS, ruby_setjmp(((void)0), prot_tag->buf))
+#define EXEC_TAG() setjmp(prot_tag->buf)
-#define JUMP_TAG(st) do { \
+#define JUMP_TAG(st) { \
ruby_frame = prot_tag->frame; \
ruby_iter = prot_tag->iter; \
- ruby_longjmp(prot_tag->buf,(st)); \
-} while (0)
+ longjmp(prot_tag->buf,(st)); \
+}
#define POP_TAG() \
+ if (_tag.prev) \
+ _tag.prev->retval = _tag.retval;\
prot_tag = _tag.prev; \
-} while (0)
+}
-#define TAG_DST() (_tag.dst == (VALUE)ruby_frame->uniq)
+#define POP_TMPTAG() \
+ prot_tag = _tag.prev; \
+}
#define TAG_RETURN 0x1
#define TAG_BREAK 0x2
@@ -1054,164 +791,88 @@ static struct tag *prot_tag;
VALUE ruby_class;
static VALUE ruby_wrapper; /* security wrapper */
-#define PUSH_CLASS(c) do { \
+#define PUSH_CLASS() { \
VALUE _class = ruby_class; \
- ruby_class = (c)
-#define POP_CLASS() ruby_class = _class; \
-} while (0)
+#define POP_CLASS() ruby_class = _class; }
-NODE *ruby_cref = 0;
-NODE *ruby_top_cref;
-#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref)
+static NODE *ruby_cref = 0;
+static NODE *top_cref;
+#define PUSH_CREF(c) ruby_cref = rb_node_newnode(NODE_CREF,(c),0,ruby_cref)
#define POP_CREF() ruby_cref = ruby_cref->nd_next
-#define PUSH_SCOPE() do { \
+#define PUSH_SCOPE() { \
volatile int _vmode = scope_vmode; \
struct SCOPE * volatile _old; \
NEWOBJ(_scope, struct SCOPE); \
OBJSETUP(_scope, 0, T_SCOPE); \
_scope->local_tbl = 0; \
_scope->local_vars = 0; \
- _scope->flags = 0; \
+ _scope->flag = 0; \
_old = ruby_scope; \
ruby_scope = _scope; \
- scope_vmode = SCOPE_PUBLIC
-
-rb_thread_t rb_curr_thread;
-rb_thread_t rb_main_thread;
-#define main_thread rb_main_thread
-#define curr_thread rb_curr_thread
+ scope_vmode = SCOPE_PUBLIC;
+typedef struct thread * rb_thread_t;
+static rb_thread_t curr_thread = 0;
+static rb_thread_t main_thread;
static void scope_dup _((struct SCOPE *));
#define POP_SCOPE() \
- if (ruby_scope->flags & SCOPE_DONT_RECYCLE) {\
- if (_old) scope_dup(_old); \
+ if (ruby_scope->flag & SCOPE_DONT_RECYCLE) {\
+ if (_old) scope_dup(_old); \
} \
- if (!(ruby_scope->flags & SCOPE_MALLOC)) {\
+ if (!(ruby_scope->flag & SCOPE_MALLOC)) {\
ruby_scope->local_vars = 0; \
ruby_scope->local_tbl = 0; \
- if (!(ruby_scope->flags & SCOPE_DONT_RECYCLE) && \
- ruby_scope != top_scope) { \
+ if (!(ruby_scope->flag & SCOPE_DONT_RECYCLE) && \
+ ruby_scope != top_scope) { \
rb_gc_force_recycle((VALUE)ruby_scope);\
- } \
+ } \
} \
- ruby_scope->flags |= SCOPE_NOSTACK; \
+ ruby_scope->flag |= SCOPE_NOSTACK; \
ruby_scope = _old; \
scope_vmode = _vmode; \
-} while (0)
+}
static VALUE rb_eval _((VALUE,NODE*));
static VALUE eval _((VALUE,VALUE,VALUE,char*,int));
static NODE *compile _((VALUE, char*, int));
-static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int, int));
-
-#define YIELD_LAMBDA_CALL 1
-#define YIELD_PROC_CALL 2
-#define YIELD_PUBLIC_DEF 4
-#define YIELD_FUNC_AVALUE 1
-#define YIELD_FUNC_SVALUE 2
-
-static VALUE rb_call _((VALUE,VALUE,ID,int,const VALUE*,int,VALUE));
+static VALUE rb_yield_0 _((VALUE, VALUE, VALUE, int));
+static VALUE rb_call _((VALUE,VALUE,ID,int,VALUE*,int));
static VALUE module_setup _((VALUE,NODE*));
static VALUE massign _((VALUE,NODE*,VALUE,int));
static void assign _((VALUE,NODE*,VALUE,int));
-typedef struct event_hook {
- rb_event_hook_func_t func;
- rb_event_t events;
- struct event_hook *next;
-} rb_event_hook_t;
-
-static rb_event_hook_t *event_hooks;
-
-#define EXEC_EVENT_HOOK(event, node, self, id, klass) \
- do { \
- rb_event_hook_t *hook = event_hooks; \
- rb_event_hook_func_t hook_func; \
- rb_event_t events; \
- \
- while (hook) { \
- hook_func = hook->func; \
- events = hook->events; \
- hook = hook->next; \
- if (events & event) \
- (*hook_func)(event, node, self, id, klass); \
- } \
- } while (0)
-
static VALUE trace_func = 0;
static int tracing = 0;
-static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));
-
-#if 0
-#define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
- ruby_sourceline = nd_line(ruby_current_node))
-#else
-#define SET_CURRENT_SOURCE() ((void)0)
-#endif
-
-void
-ruby_set_current_source()
-{
- if (ruby_current_node) {
- ruby_sourcefile = ruby_current_node->nd_file;
- ruby_sourceline = nd_line(ruby_current_node);
- }
-}
-
-static void
-#ifdef HAVE_STDARG_PROTOTYPES
-warn_printf(const char *fmt, ...)
-#else
-warn_printf(fmt, va_alist)
- const char *fmt;
- va_dcl
-#endif
-{
- char buf[BUFSIZ];
- va_list args;
-
- va_init_list(args, fmt);
- vsnprintf(buf, BUFSIZ, fmt, args);
- va_end(args);
- rb_write_error(buf);
-}
-
-#define warn_print(x) rb_write_error(x)
-#define warn_print2(x,l) rb_write_error2(x,l)
+static void call_trace_func _((char*,char*,int,VALUE,ID,VALUE));
static void
error_pos()
{
- ruby_set_current_source();
if (ruby_sourcefile) {
if (ruby_frame->last_func) {
- warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
- rb_id2name(ruby_frame->orig_func));
+ fprintf(stderr, "%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
+ rb_id2name(ruby_frame->last_func));
}
else if (ruby_sourceline == 0) {
- warn_printf("%s", ruby_sourcefile);
+ fprintf(stderr, "%s", ruby_sourcefile);
}
else {
- warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+ fprintf(stderr, "%s:%d", ruby_sourcefile, ruby_sourceline);
}
}
}
-VALUE rb_check_backtrace(VALUE);
-
static VALUE
get_backtrace(info)
VALUE info;
{
if (NIL_P(info)) return Qnil;
- info = rb_funcall(info, rb_intern("backtrace"), 0);
- if (NIL_P(info)) return Qnil;
- return rb_check_backtrace(info);
+ return rb_funcall(info, rb_intern("backtrace"), 0);
}
static void
@@ -1225,9 +886,9 @@ static void
error_print()
{
VALUE errat = Qnil; /* OK */
- volatile VALUE eclass, e;
+ volatile VALUE eclass;
char *einfo;
- long elen;
+ int elen;
if (NIL_P(ruby_errinfo)) return;
@@ -1238,74 +899,69 @@ error_print()
else {
errat = Qnil;
}
- if (EXEC_TAG()) goto error;
- if (NIL_P(errat)){
- ruby_set_current_source();
+ POP_TAG();
+ if (NIL_P(errat)) {
if (ruby_sourcefile)
- warn_printf("%s:%d", ruby_sourcefile, ruby_sourceline);
+ fprintf(stderr, "%s:%d", ruby_sourcefile, ruby_sourceline);
else
- warn_printf("%d", ruby_sourceline);
- }
- else if (RARRAY(errat)->len == 0) {
- error_pos();
+ fprintf(stderr, "%d", ruby_sourceline);
}
else {
VALUE mesg = RARRAY(errat)->ptr[0];
if (NIL_P(mesg)) error_pos();
else {
- warn_print2(RSTRING(mesg)->ptr, RSTRING(mesg)->len);
+ fwrite(RSTRING(mesg)->ptr, 1, RSTRING(mesg)->len, stderr);
}
}
eclass = CLASS_OF(ruby_errinfo);
+ PUSH_TAG(PROT_NONE);
if (EXEC_TAG() == 0) {
- e = rb_funcall(ruby_errinfo, rb_intern("message"), 0, 0);
- StringValue(e);
- einfo = RSTRING(e)->ptr;
- elen = RSTRING(e)->len;
+ einfo = str2cstr(rb_obj_as_string(ruby_errinfo), &elen);
}
else {
einfo = "";
elen = 0;
}
- if (EXEC_TAG()) goto error;
+ POP_TAG();
if (eclass == rb_eRuntimeError && elen == 0) {
- warn_print(": unhandled exception\n");
+ fprintf(stderr, ": unhandled exception\n");
}
else {
VALUE epath;
- epath = rb_class_name(eclass);
+ epath = rb_class_path(eclass);
if (elen == 0) {
- warn_print(": ");
- warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
- warn_print("\n");
+ fprintf(stderr, ": ");
+ fwrite(RSTRING(epath)->ptr, 1, RSTRING(epath)->len, stderr);
+ putc('\n', stderr);
}
else {
char *tail = 0;
- long len = elen;
+ int len = elen;
if (RSTRING(epath)->ptr[0] == '#') epath = 0;
- if (tail = memchr(einfo, '\n', elen)) {
+ if (tail = strchr(einfo, '\n')) {
len = tail - einfo;
tail++; /* skip newline */
}
- warn_print(": ");
- warn_print2(einfo, len);
+ fprintf(stderr, ": ");
+ fwrite(einfo, 1, len, stderr);
if (epath) {
- warn_print(" (");
- warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
- warn_print(")\n");
+ fprintf(stderr, " (");
+ fwrite(RSTRING(epath)->ptr, 1, RSTRING(epath)->len, stderr);
+ fprintf(stderr, ")\n");
}
if (tail) {
- warn_print2(tail, elen-len-1);
+ fwrite(tail, 1, elen-len-1, stderr);
+ putc('\n', stderr);
}
}
}
if (!NIL_P(errat)) {
- long i;
+ int i;
struct RArray *ep = RARRAY(errat);
#define TRACE_MAX (TRACE_HEAD+TRACE_TAIL+5)
@@ -1315,48 +971,27 @@ error_print()
ep = RARRAY(errat);
for (i=1; i<ep->len; i++) {
if (TYPE(ep->ptr[i]) == T_STRING) {
- warn_printf("\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
+ fprintf(stderr, "\tfrom %s\n", RSTRING(ep->ptr[i])->ptr);
}
if (i == TRACE_HEAD && ep->len > TRACE_MAX) {
- warn_printf("\t ... %ld levels...\n",
+ fprintf(stderr, "\t ... %ld levels...\n",
ep->len - TRACE_HEAD - TRACE_TAIL);
i = ep->len - TRACE_TAIL;
}
}
}
- error:
- POP_TAG();
}
-#if defined(__APPLE__)
-#define environ (*_NSGetEnviron())
-#elif !defined(_WIN32) && !defined(__MACOS__) || defined(_WIN32_WCE)
+#if !defined(NT) && !defined(__MACOS__)
extern char **environ;
#endif
char **rb_origenviron;
void rb_call_inits _((void));
-void Init_stack _((VALUE*));
+void Init_stack _((void*));
void Init_heap _((void));
void Init_ext _((void));
-#ifdef HAVE_NATIVETHREAD
-static rb_nativethread_t ruby_thid;
-int
-is_ruby_native_thread() {
- return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT());
-}
-
-# ifdef HAVE_NATIVETHREAD_KILL
-void
-ruby_native_thread_kill(sig)
- int sig;
-{
- NATIVETHREAD_KILL(ruby_thid, sig);
-}
-# endif
-#endif
-
void
ruby_init()
{
@@ -1368,9 +1003,6 @@ ruby_init()
if (initialized)
return;
initialized = 1;
-#ifdef HAVE_NATIVETHREAD
- ruby_thid = NATIVETHREAD_CURRENT();
-#endif
ruby_frame = top_frame = &frame;
ruby_iter = &iter;
@@ -1381,7 +1013,7 @@ ruby_init()
rb_origenviron = environ;
#endif
- Init_stack((void*)&state);
+ Init_stack(0);
Init_heap();
PUSH_SCOPE();
ruby_scope->local_vars = 0;
@@ -1395,26 +1027,19 @@ ruby_init()
rb_call_inits();
ruby_class = rb_cObject;
ruby_frame->self = ruby_top_self;
- ruby_top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
- ruby_cref = ruby_top_cref;
+ top_cref = rb_node_newnode(NODE_CREF,rb_cObject,0,0);
+ ruby_cref = top_cref;
+ ruby_frame->cbase = (VALUE)ruby_cref;
rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
#ifdef __MACOS__
_macruby_init();
-#elif defined(__VMS)
- _vmsruby_init();
#endif
ruby_prog_init();
- ALLOW_INTS;
}
POP_TAG();
- if (state) {
- error_print();
- exit(EXIT_FAILURE);
- }
+ if (state) error_print();
POP_SCOPE();
ruby_scope = top_scope;
- top_scope->flags &= ~SCOPE_NOSTACK;
- ruby_running = 1;
}
static VALUE
@@ -1438,83 +1063,57 @@ int ruby_in_eval;
static void rb_thread_cleanup _((void));
static void rb_thread_wait_other_threads _((void));
-static int thread_set_raised();
-static int thread_reset_raised();
-
-static int thread_no_ensure _((void));
-
-static VALUE exception_error;
-static VALUE sysstack_error;
-
-static int
-sysexit_status(err)
- VALUE err;
-{
- VALUE st = rb_iv_get(err, "status");
- return NUM2INT(st);
-}
+static int exit_status;
static int
error_handle(ex)
int ex;
{
- int status = EXIT_FAILURE;
-
- if (thread_set_raised()) return EXIT_FAILURE;
switch (ex & TAG_MASK) {
case 0:
- status = EXIT_SUCCESS;
+ ex = 0;
break;
case TAG_RETURN:
error_pos();
- warn_print(": unexpected return\n");
+ fprintf(stderr, ": unexpected return\n");
+ ex = 1;
break;
case TAG_NEXT:
error_pos();
- warn_print(": unexpected next\n");
+ fprintf(stderr, ": unexpected next\n");
+ ex = 1;
break;
case TAG_BREAK:
error_pos();
- warn_print(": unexpected break\n");
+ fprintf(stderr, ": unexpected break\n");
+ ex = 1;
break;
case TAG_REDO:
error_pos();
- warn_print(": unexpected redo\n");
+ fprintf(stderr, ": unexpected redo\n");
+ ex = 1;
break;
case TAG_RETRY:
error_pos();
- warn_print(": retry outside of rescue clause\n");
- break;
- case TAG_THROW:
- if (prot_tag && prot_tag->frame && prot_tag->frame->node) {
- NODE *tag = prot_tag->frame->node;
- warn_printf("%s:%d: uncaught throw\n",
- tag->nd_file, nd_line(tag));
- }
- else {
- error_pos();
- warn_printf(": unexpected throw\n");
- }
+ fprintf(stderr, ": retry outside of rescue clause\n");
+ ex = 1;
break;
case TAG_RAISE:
case TAG_FATAL:
if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
- status = sysexit_status(ruby_errinfo);
- }
- else if (rb_obj_is_instance_of(ruby_errinfo, rb_eSignal)) {
- /* no message when exiting by signal */
+ ex = exit_status;
}
else {
error_print();
+ ex = 1;
}
break;
default:
rb_bug("Unknown longjmp status %d", ex);
break;
}
- thread_reset_raised();
- return status;
+ return ex;
}
void
@@ -1524,62 +1123,38 @@ ruby_options(argc, argv)
{
int state;
- Init_stack((void*)&state);
- PUSH_TAG(PROT_NONE);
+ PUSH_TAG(PROT_NONE)
if ((state = EXEC_TAG()) == 0) {
ruby_process_options(argc, argv);
}
- else {
+ POP_TAG();
+ if (state) {
trace_func = 0;
tracing = 0;
exit(error_handle(state));
}
- POP_TAG();
}
void rb_exec_end_proc _((void));
-static void
-ruby_finalize_0()
+void
+ruby_finalize()
{
PUSH_TAG(PROT_NONE);
if (EXEC_TAG() == 0) {
rb_trap_exit();
+ rb_exec_end_proc();
+ rb_gc_call_finalizer_at_exit();
}
POP_TAG();
- rb_exec_end_proc();
-}
-
-static void
-ruby_finalize_1()
-{
- signal(SIGINT, SIG_DFL);
- ruby_errinfo = 0;
- rb_gc_call_finalizer_at_exit();
- trace_func = 0;
- tracing = 0;
}
void
-ruby_finalize()
-{
- ruby_finalize_0();
- ruby_finalize_1();
-}
-
-int
-ruby_cleanup(ex)
+ruby_stop(ex)
int ex;
{
int state;
- volatile VALUE errs[2];
- int nerr;
- errs[1] = ruby_errinfo;
- ruby_safe_level = 0;
- Init_stack((void *)&state);
- ruby_finalize_0();
- errs[0] = ruby_errinfo;
PUSH_TAG(PROT_NONE);
PUSH_ITER(ITER_NOT);
if ((state = EXEC_TAG()) == 0) {
@@ -1588,85 +1163,33 @@ ruby_cleanup(ex)
}
else if (ex == 0) {
ex = state;
- }
+ }
POP_ITER();
- ruby_errinfo = errs[1];
- ex = error_handle(ex);
- ruby_finalize_1();
POP_TAG();
- for (nerr = 0; nerr < sizeof(errs) / sizeof(errs[0]); ++nerr) {
- VALUE err = errs[nerr];
-
- if (!RTEST(err)) continue;
-
- if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
- return sysexit_status(err);
- }
- else if (rb_obj_is_kind_of(err, rb_eSignal)) {
- VALUE sig = rb_iv_get(err, "signo");
- ruby_default_signal(NUM2INT(sig));
- }
- else if (ex == 0) {
- ex = 1;
- }
- }
-
-#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;
+ ex = error_handle(ex);
+ ruby_finalize();
+ exit(ex);
}
-static int
-ruby_exec_internal()
+void
+ruby_run()
{
int state;
+ static int ex;
+ volatile NODE *tmp;
+
+ if (ruby_nerrs > 0) exit(ruby_nerrs);
+ Init_stack(&tmp);
PUSH_TAG(PROT_NONE);
PUSH_ITER(ITER_NOT);
- /* default visibility is private at toplevel */
- SCOPE_SET(SCOPE_PRIVATE);
if ((state = EXEC_TAG()) == 0) {
eval_node(ruby_top_self, ruby_eval_tree);
}
POP_ITER();
POP_TAG();
- return state;
-}
-void
-ruby_stop(ex)
- int ex;
-{
- exit(ruby_cleanup(ex));
-}
-
-int
-ruby_exec()
-{
- volatile NODE *tmp;
-
- Init_stack((void*)&tmp);
- return ruby_exec_internal();
-}
-
-void
-ruby_run()
-{
- int state;
- static int ex;
-
- if (ruby_nerrs > 0) exit(EXIT_FAILURE);
- state = ruby_exec();
if (state && !ex) ex = state;
ruby_stop(ex);
}
@@ -1678,14 +1201,14 @@ compile_error(at)
VALUE str;
ruby_nerrs = 0;
- str = rb_str_buf_new2("compile error");
+ str = rb_str_new2("compile error");
if (at) {
- rb_str_buf_cat2(str, " in ");
- rb_str_buf_cat2(str, at);
+ rb_str_cat2(str, " in ");
+ rb_str_cat2(str, at);
}
- rb_str_buf_cat(str, "\n", 1);
+ rb_str_cat(str, "\n", 1);
if (!NIL_P(ruby_errinfo)) {
- rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+ rb_str_concat(str, ruby_errinfo);
}
rb_exc_raise(rb_exc_new3(rb_eSyntaxError, str));
}
@@ -1695,12 +1218,11 @@ rb_eval_string(str)
const char *str;
{
VALUE v;
- NODE *oldsrc = ruby_current_node;
+ char *oldsrc = ruby_sourcefile;
- ruby_current_node = 0;
- ruby_sourcefile = rb_source_filename("(eval)");
+ ruby_sourcefile = "(eval)";
v = eval(ruby_top_self, rb_str_new2(str), Qnil, 0, 0);
- ruby_current_node = oldsrc;
+ ruby_sourcefile = oldsrc;
return v;
}
@@ -1710,7 +1232,22 @@ rb_eval_string_protect(str, state)
const char *str;
int *state;
{
- return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
+ VALUE result; /* OK */
+ int status;
+
+ PUSH_TAG(PROT_NONE);
+ if ((status = EXEC_TAG()) == 0) {
+ result = rb_eval_string(str);
+ }
+ POP_TAG();
+ if (state) {
+ *state = status;
+ }
+ if (status != 0) {
+ return Qnil;
+ }
+
+ return result;
}
VALUE
@@ -1723,21 +1260,14 @@ rb_eval_string_wrap(str, state)
VALUE wrapper = ruby_wrapper;
VALUE val;
- PUSH_CLASS(ruby_wrapper = rb_module_new());
+ PUSH_CLASS();
+ ruby_class = ruby_wrapper = rb_module_new();
ruby_top_self = rb_obj_clone(ruby_top_self);
- rb_extend_object(ruby_top_self, ruby_wrapper);
- PUSH_FRAME();
- ruby_frame->last_func = 0;
- ruby_frame->last_class = 0;
- ruby_frame->self = self;
- PUSH_CREF(ruby_wrapper);
- PUSH_SCOPE();
+ rb_extend_object(self, ruby_class);
val = rb_eval_string_protect(str, &status);
ruby_top_self = self;
- POP_SCOPE();
- POP_FRAME();
POP_CLASS();
ruby_wrapper = wrapper;
if (state) {
@@ -1749,148 +1279,129 @@ rb_eval_string_wrap(str, state)
return val;
}
-NORETURN(static void localjump_error(const char*, VALUE, int));
-static void
-localjump_error(mesg, value, reason)
- const char *mesg;
- VALUE value;
- int reason;
-{
- VALUE exc = rb_exc_new2(rb_eLocalJumpError, mesg);
- ID id;
-
- rb_iv_set(exc, "@exit_value", value);
- switch (reason) {
- case TAG_BREAK:
- id = rb_intern("break"); break;
- case TAG_REDO:
- id = rb_intern("redo"); break;
- case TAG_RETRY:
- id = rb_intern("retry"); break;
- case TAG_NEXT:
- id = rb_intern("next"); break;
- case TAG_RETURN:
- id = rb_intern("return"); break;
- default:
- id = rb_intern("noreason"); break;
- }
- rb_iv_set(exc, "@reason", ID2SYM(id));
- rb_exc_raise(exc);
-}
-
-/*
- * call_seq:
- * local_jump_error.exit_value => obj
- *
- * Returns the exit value associated with this +LocalJumpError+.
- */
-static VALUE
-localjump_xvalue(exc)
- VALUE exc;
-{
- return rb_iv_get(exc, "@exit_value");
-}
-
-/*
- * call-seq:
- * local_jump_error.reason => symbol
- *
- * The reason this block was terminated:
- * :break, :redo, :retry, :next, :return, or :noreason.
- */
-
-static VALUE
-localjump_reason(exc)
- VALUE exc;
-{
- return rb_iv_get(exc, "@reason");
-}
-
-NORETURN(static void jump_tag_but_local_jump _((int,VALUE)));
static void
-jump_tag_but_local_jump(state, val)
+jump_tag_but_local_jump(state)
int state;
- VALUE val;
{
-
- if (val == Qundef) val = prot_tag->retval;
switch (state) {
case 0:
break;
case TAG_RETURN:
- localjump_error("unexpected return", val, state);
- break;
- case TAG_BREAK:
- localjump_error("unexpected break", val, state);
+ rb_raise(rb_eLocalJumpError, "unexpected return");
break;
case TAG_NEXT:
- localjump_error("unexpected next", val, state);
+ rb_raise(rb_eLocalJumpError, "unexpected next");
+ break;
+ case TAG_BREAK:
+ rb_raise(rb_eLocalJumpError, "unexpected break");
break;
case TAG_REDO:
- localjump_error("unexpected redo", Qnil, state);
+ rb_raise(rb_eLocalJumpError, "unexpected redo");
break;
case TAG_RETRY:
- localjump_error("retry outside of rescue clause", Qnil, state);
+ rb_raise(rb_eLocalJumpError, "retry outside of rescue clause");
break;
default:
+ JUMP_TAG(state);
break;
}
- JUMP_TAG(state);
}
VALUE
-rb_eval_cmd(cmd, arg, level)
+rb_eval_cmd(cmd, arg)
VALUE cmd, arg;
- int level;
{
int state;
- VALUE val = Qnil; /* OK */
+ VALUE val; /* OK */
struct SCOPE *saved_scope;
volatile int safe = ruby_safe_level;
- if (OBJ_TAINTED(cmd)) {
- level = 4;
- }
if (TYPE(cmd) != T_STRING) {
- PUSH_ITER(ITER_NOT);
- PUSH_TAG(PROT_NONE);
- ruby_safe_level = level;
- if ((state = EXEC_TAG()) == 0) {
- val = rb_funcall2(cmd, rb_intern("call"), RARRAY(arg)->len, RARRAY(arg)->ptr);
- }
- ruby_safe_level = safe;
- POP_TAG();
- POP_ITER();
- if (state) JUMP_TAG(state);
- return val;
+ return rb_funcall2(cmd, rb_intern("call"),
+ RARRAY(arg)->len, RARRAY(arg)->ptr);
}
+ PUSH_CLASS();
+ PUSH_TAG(PROT_NONE);
saved_scope = ruby_scope;
ruby_scope = top_scope;
- PUSH_FRAME();
- ruby_frame->last_func = 0;
- ruby_frame->last_class = 0;
- ruby_frame->self = ruby_top_self;
- PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
- ruby_safe_level = level;
+ ruby_class = rb_cObject;
+ if (OBJ_TAINTED(cmd)) {
+ ruby_safe_level = 4;
+ }
- PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
val = eval(ruby_top_self, cmd, Qnil, 0, 0);
}
- if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
- scope_dup(saved_scope);
+
+ if (ruby_scope->flag & SCOPE_DONT_RECYCLE)
+ scope_dup(saved_scope);
ruby_scope = saved_scope;
ruby_safe_level = safe;
POP_TAG();
- POP_FRAME();
+ POP_CLASS();
+
+ jump_tag_but_local_jump(state);
+ return val;
+}
+
+static VALUE
+rb_trap_eval(cmd, sig)
+ VALUE cmd;
+ int sig;
+{
+ int state;
+ VALUE val; /* OK */
+
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)));
+ }
+ POP_TAG();
+ if (state) {
+ rb_trap_immediate = 0;
+ JUMP_TAG(state);
+ }
+ return val;
+}
+
+static VALUE
+superclass(self, node)
+ VALUE self;
+ NODE *node;
+{
+ VALUE val; /* OK */
+ int state;
+
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ val = rb_eval(self, node);
+ }
+ POP_TAG();
+ if (state) {
+ superclass_error:
+ switch (nd_type(node)) {
+ case NODE_COLON2:
+ rb_raise(rb_eTypeError, "undefined superclass `%s'",
+ rb_id2name(node->nd_mid));
+ case NODE_CONST:
+ rb_raise(rb_eTypeError, "undefined superclass `%s'",
+ rb_id2name(node->nd_vid));
+ default:
+ rb_raise(rb_eTypeError, "superclass undefined");
+ }
+ JUMP_TAG(state);
+ }
+ if (TYPE(val) != T_CLASS) goto superclass_error;
+ if (FL_TEST(val, FL_SINGLETON)) {
+ rb_raise(rb_eTypeError, "can't make subclass of virtual class");
+ }
- if (state) jump_tag_but_local_jump(state, val);
return val;
}
-#define ruby_cbase (ruby_cref->nd_clss)
+#define ruby_cbase (RNODE(ruby_frame->cbase)->nd_clss)
static VALUE
ev_const_defined(cref, id, self)
@@ -1899,18 +1410,13 @@ ev_const_defined(cref, id, self)
VALUE self;
{
NODE *cbase = cref;
- VALUE result;
while (cbase && cbase->nd_next) {
struct RClass *klass = RCLASS(cbase->nd_clss);
- if (!NIL_P(klass)) {
- if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
- if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
- return Qfalse;
- }
- return Qtrue;
- }
+ if (NIL_P(klass)) return rb_const_defined(CLASS_OF(self), id);
+ if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, 0)) {
+ return Qtrue;
}
cbase = cbase->nd_next;
}
@@ -1927,102 +1433,43 @@ ev_const_get(cref, id, self)
VALUE result;
while (cbase && cbase->nd_next) {
- VALUE klass = cbase->nd_clss;
+ struct RClass *klass = RCLASS(cbase->nd_clss);
- if (!NIL_P(klass)) {
- while (RCLASS(klass)->iv_tbl &&
- st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
- if (result == Qundef) {
- if (!RTEST(rb_autoload_load(klass, id))) break;
- continue;
- }
- return result;
- }
+ if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id);
+ if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
+ return result;
}
cbase = cbase->nd_next;
}
- return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+ return rb_const_get(cref->nd_clss, id);
}
static VALUE
-cvar_cbase()
-{
- NODE *cref = ruby_cref;
-
- while (cref && cref->nd_next && (NIL_P(cref->nd_clss) || FL_TEST(cref->nd_clss, FL_SINGLETON))) {
- cref = cref->nd_next;
- if (!cref->nd_next) {
- rb_warn("class variable access from toplevel singleton method");
- }
- }
- if (NIL_P(cref->nd_clss)) {
- rb_raise(rb_eTypeError, "no class variables available");
- }
- return cref->nd_clss;
-}
-
-/*
- * call-seq:
- * Module.nesting => array
- *
- * Returns the list of +Modules+ nested at the point of call.
- *
- * module M1
- * module M2
- * $a = Module.nesting
- * end
- * end
- * $a #=> [M1::M2, M1]
- * $a[0].name #=> "M1::M2"
- */
-
-static VALUE
rb_mod_nesting()
{
- NODE *cbase = ruby_cref;
+ NODE *cbase = RNODE(ruby_frame->cbase);
VALUE ary = rb_ary_new();
while (cbase && cbase->nd_next) {
if (!NIL_P(cbase->nd_clss)) rb_ary_push(ary, cbase->nd_clss);
cbase = cbase->nd_next;
}
- if (ruby_wrapper && RARRAY(ary)->len == 0) {
- rb_ary_push(ary, ruby_wrapper);
- }
return ary;
}
-/*
- * call-seq:
- * Module.constants => array
- *
- * Returns an array of the names of all constants defined in the
- * system. This list includes the names of all modules and classes.
- *
- * p Module.constants.sort[1..5]
- *
- * <em>produces:</em>
- *
- * ["ARGV", "ArgumentError", "Array", "Bignum", "Binding"]
- */
-
static VALUE
rb_mod_s_constants()
{
- NODE *cbase = ruby_cref;
- void *data = 0;
+ NODE *cbase = RNODE(ruby_frame->cbase);
+ VALUE ary = rb_ary_new();
while (cbase) {
- if (!NIL_P(cbase->nd_clss)) {
- data = rb_mod_const_at(cbase->nd_clss, data);
- }
+ if (!NIL_P(cbase->nd_clss)) rb_mod_const_at(cbase->nd_clss, ary);
cbase = cbase->nd_next;
}
- if (!NIL_P(ruby_cbase)) {
- data = rb_mod_const_of(ruby_cbase, data);
- }
- return rb_const_list(data);
+ if (!NIL_P(ruby_cbase)) rb_mod_const_of(ruby_cbase, ary);
+ return ary;
}
void
@@ -2055,17 +1502,18 @@ rb_undef(klass, id)
VALUE origin;
NODE *body;
- if (ruby_cbase == rb_cObject && klass == rb_cObject) {
+ if (ruby_class == rb_cObject) {
rb_secure(4);
}
- if (ruby_safe_level >= 4 && !OBJ_TAINTED(klass)) {
- rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id));
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass)) {
+ rb_raise(rb_eSecurityError, "Insecure: can't undef");
}
rb_frozen_class_p(klass);
- if (id == __id__ || id == __send__ || id == init) {
- rb_warn("undefining `%s' may cause serious problem", rb_id2name(id));
+ if (id == __id__ || id == __send__) {
+ rb_warn("undefining `%s' may cause serious problem",
+ rb_id2name(id));
}
- body = search_method(klass, id, &origin);
+ body = search_method(ruby_class, id, &origin);
if (!body || !body->nd_body) {
char *s0 = " class";
VALUE c = klass;
@@ -2083,73 +1531,18 @@ rb_undef(klass, id)
else if (TYPE(c) == T_MODULE) {
s0 = " module";
}
- rb_name_error(id, "undefined method `%s' for%s `%s'",
- rb_id2name(id),s0,rb_class2name(c));
+ rb_raise(rb_eNameError, "undefined method `%s' for%s `%s'",
+ rb_id2name(id),s0,rb_class2name(c));
}
rb_add_method(klass, id, 0, NOEX_PUBLIC);
- if (FL_TEST(klass, FL_SINGLETON)) {
- rb_funcall(rb_iv_get(klass, "__attached__"),
- singleton_undefined, 1, ID2SYM(id));
- }
- else {
- rb_funcall(klass, undefined, 1, ID2SYM(id));
- }
-}
-
-/*
- * call-seq:
- * undef_method(symbol) => self
- *
- * Prevents the current class from responding to calls to the named
- * method. Contrast this with <code>remove_method</code>, which deletes
- * the method from the particular class; Ruby will still search
- * superclasses and mixed-in modules for a possible receiver.
- *
- * class Parent
- * def hello
- * puts "In parent"
- * end
- * end
- * class Child < Parent
- * def hello
- * puts "In child"
- * end
- * end
- *
- *
- * c = Child.new
- * c.hello
- *
- *
- * class Child
- * remove_method :hello # remove from child, still in parent
- * end
- * c.hello
- *
- *
- * class Child
- * undef_method :hello # prevent any calls to 'hello'
- * end
- * c.hello
- *
- * <em>produces:</em>
- *
- * In child
- * In parent
- * prog.rb:23: undefined method `hello' for #<Child:0x401b3bb4> (NoMethodError)
- */
+ rb_clear_cache_by_id(id);
+}
static VALUE
-rb_mod_undef_method(argc, argv, mod)
- int argc;
- VALUE *argv;
- VALUE mod;
+rb_mod_undef_method(mod, name)
+ VALUE mod, name;
{
- int i;
-
- for (i=0; i<argc; i++) {
- rb_undef(mod, rb_to_id(argv[i]));
- }
+ rb_undef(mod, rb_to_id(name));
return mod;
}
@@ -2159,8 +1552,7 @@ rb_alias(klass, name, def)
ID name, def;
{
VALUE origin;
- NODE *orig, *body, *node;
- VALUE singleton = 0;
+ NODE *orig, *body;
rb_frozen_class_p(klass);
if (name == def) return;
@@ -2176,9 +1568,6 @@ rb_alias(klass, name, def)
if (!orig || !orig->nd_body) {
print_undef(klass, def);
}
- if (FL_TEST(klass, FL_SINGLETON)) {
- singleton = rb_iv_get(klass, "__attached__");
- }
body = orig->nd_body;
orig->nd_cnt++;
if (nd_type(body) == NODE_FBODY) { /* was alias */
@@ -2187,47 +1576,10 @@ rb_alias(klass, name, def)
body = body->nd_head;
}
- rb_clear_cache_by_id(name);
- if (RTEST(ruby_verbose) && st_lookup(RCLASS(klass)->m_tbl, name, (st_data_t *)&node)) {
- if (node->nd_cnt == 0 && node->nd_body) {
- rb_warning("discarding old %s", rb_id2name(name));
- }
- }
st_insert(RCLASS(klass)->m_tbl, name,
- (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
- NOEX_WITH_SAFE(orig->nd_noex)));
-
- if (!ruby_running) return;
-
- if (singleton) {
- rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
- }
- else {
- rb_funcall(klass, added, 1, ID2SYM(name));
- }
-}
-
-/*
- * call-seq:
- * alias_method(new_name, old_name) => self
- *
- * Makes <i>new_name</i> a new copy of the method <i>old_name</i>. This can
- * be used to retain access to methods that are overridden.
- *
- * module Mod
- * alias_method :orig_exit, :exit
- * def exit(code=0)
- * puts "Exiting with code #{code}"
- * orig_exit(code)
- * end
- * end
- * include Mod
- * exit(99)
- *
- * <em>produces:</em>
- *
- * Exiting with code 99
- */
+ NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
+ rb_clear_cache_by_id(name);
+}
static VALUE
rb_mod_alias_method(mod, newname, oldname)
@@ -2240,9 +1592,9 @@ rb_mod_alias_method(mod, newname, oldname)
static NODE*
copy_node_scope(node, rval)
NODE *node;
- NODE *rval;
+ VALUE rval;
{
- NODE *copy = NEW_NODE(NODE_SCOPE,0,rval,node->nd_next);
+ NODE *copy = rb_node_newnode(NODE_SCOPE,0,rval,node->nd_next);
if (node->nd_tbl) {
copy->nd_tbl = ALLOC_N(ID, node->nd_tbl[0]+1);
@@ -2257,65 +1609,67 @@ copy_node_scope(node, rval)
#ifdef C_ALLOCA
# define TMP_PROTECT NODE * volatile tmp__protect_tmp=0
# define TMP_ALLOC(n) \
- (tmp__protect_tmp = NEW_NODE(NODE_ALLOCA, \
- ALLOC_N(VALUE,n),tmp__protect_tmp,n), \
+ (tmp__protect_tmp = rb_node_newnode(NODE_ALLOCA, \
+ ALLOC_N(VALUE,n),tmp__protect_tmp,n), \
(void*)tmp__protect_tmp->nd_head)
#else
# define TMP_PROTECT typedef int foobazzz
# define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
#endif
-#define SETUP_ARGS0(anode,extra) do {\
+#define SETUP_ARGS(anode) {\
NODE *n = anode;\
if (!n) {\
argc = 0;\
argv = 0;\
}\
else if (nd_type(n) == NODE_ARRAY) {\
- argc=anode->nd_alen;\
- if (argc > 0) {\
- int i;\
+ argc=n->nd_alen;\
+ if (argc > 0) {\
+ char *file = ruby_sourcefile;\
+ int line = ruby_sourceline;\
+ int i;\
n = anode;\
- argv = TMP_ALLOC(argc+extra);\
+ argv = TMP_ALLOC(argc);\
for (i=0;i<argc;i++) {\
argv[i] = rb_eval(self,n->nd_head);\
n=n->nd_next;\
}\
- }\
- else {\
+ ruby_sourcefile = file;\
+ ruby_sourceline = line;\
+ }\
+ else {\
argc = 0;\
argv = 0;\
- }\
+ }\
}\
else {\
- VALUE args = rb_eval(self,n);\
+ VALUE args = rb_eval(self,n);\
+ char *file = ruby_sourcefile;\
+ int line = ruby_sourceline;\
if (TYPE(args) != T_ARRAY)\
- args = rb_ary_to_ary(args);\
- argc = RARRAY(args)->len;\
- argv = TMP_ALLOC(argc+extra);\
+ args = rb_Array(args);\
+ argc = RARRAY(args)->len;\
+ argv = ALLOCA_N(VALUE, argc);\
MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
+ ruby_sourcefile = file;\
+ ruby_sourceline = line;\
}\
-} while (0)
-
-#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
+}
-#define BEGIN_CALLARGS do {\
+#define BEGIN_CALLARGS {\
struct BLOCK *tmp_block = ruby_block;\
- int tmp_iter = ruby_iter->iter;\
- switch (tmp_iter) {\
- case ITER_PRE:\
- if (ruby_block) ruby_block = ruby_block->outer;\
- case ITER_PAS:\
- tmp_iter = ITER_NOT;\
+ if (ruby_iter->iter == ITER_PRE) {\
+ ruby_block = ruby_block->prev;\
}\
- PUSH_ITER(tmp_iter)
+ PUSH_ITER(ITER_NOT);
#define END_CALLARGS \
ruby_block = tmp_block;\
POP_ITER();\
-} while (0)
+}
-#define MATCH_DATA *rb_svar(node->nd_cnt)
+#define MATCH_DATA ruby_scope->local_vars[node->nd_cnt]
static char* is_defined _((VALUE, NODE*, char*));
@@ -2332,20 +1686,20 @@ arg_defined(self, node, buf, type)
if (!node) return type; /* no args */
if (nd_type(node) == NODE_ARRAY) {
argc=node->nd_alen;
- if (argc > 0) {
+ if (argc > 0) {
for (i=0;i<argc;i++) {
if (!is_defined(self, node->nd_head, buf))
return 0;
node = node->nd_next;
}
- }
+ }
}
else if (!is_defined(self, node, buf)) {
return 0;
}
return type;
}
-
+
static char*
is_defined(self, node, buf)
VALUE self;
@@ -2355,15 +1709,13 @@ is_defined(self, node, buf)
VALUE val; /* OK */
int state;
- again:
- if (!node) return "expression";
switch (nd_type(node)) {
case NODE_SUPER:
case NODE_ZSUPER:
if (ruby_frame->last_func == 0) return 0;
else if (ruby_frame->last_class == 0) return 0;
- val = ruby_frame->last_class;
- if (rb_method_boundp(RCLASS(val)->super, ruby_frame->orig_func, 0)) {
+ else if (rb_method_boundp(RCLASS(ruby_frame->last_class)->super,
+ ruby_frame->last_func, 0)) {
if (nd_type(node) == NODE_SUPER) {
return arg_defined(self, node->nd_args, buf, "super");
}
@@ -2373,16 +1725,15 @@ is_defined(self, node, buf)
case NODE_VCALL:
case NODE_FCALL:
- val = self;
+ val = CLASS_OF(self);
goto check_bound;
- case NODE_ATTRASGN:
- val = self;
- if (node->nd_recv == (NODE *)1) goto check_bound;
case NODE_CALL:
+ if (!is_defined(self, node->nd_recv, buf)) return 0;
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
val = rb_eval(self, node->nd_recv);
+ val = CLASS_OF(val);
}
POP_TAG();
if (state) {
@@ -2390,27 +1741,8 @@ is_defined(self, node, buf)
return 0;
}
check_bound:
- {
- int call = nd_type(node)==NODE_CALL;
-
- val = CLASS_OF(val);
- if (call) {
- int noex;
- ID id = node->nd_mid;
-
- if (!rb_get_method_body(&val, &id, &noex))
- break;
- if ((noex & NOEX_PRIVATE))
- break;
- if ((noex & NOEX_PROTECTED) &&
- !rb_obj_is_kind_of(self, rb_class_real(val)))
- break;
- }
- else if (!rb_method_boundp(val, node->nd_mid, call))
- break;
- return arg_defined(self, node->nd_args, buf,
- nd_type(node) == NODE_ATTRASGN ?
- "assignment" : "method");
+ if (rb_method_boundp(val, node->nd_mid, nd_type(node)== NODE_CALL)) {
+ return arg_defined(self, node->nd_args, buf, "method");
}
break;
@@ -2444,7 +1776,6 @@ is_defined(self, node, buf)
case NODE_DASGN:
case NODE_DASGN_CURR:
case NODE_GASGN:
- case NODE_IASGN:
case NODE_CDECL:
case NODE_CVDECL:
case NODE_CVASGN:
@@ -2468,13 +1799,28 @@ is_defined(self, node, buf)
break;
case NODE_CONST:
- if (ev_const_defined(ruby_cref, node->nd_vid, self)) {
+ if (ev_const_defined(RNODE(ruby_frame->cbase), node->nd_vid, self)) {
return "constant";
}
break;
case NODE_CVAR:
- if (rb_cvar_defined(cvar_cbase(), node->nd_vid)) {
+ if (NIL_P(ruby_cbase)) {
+ if (rb_cvar_defined(CLASS_OF(self), node->nd_vid)) {
+ return "class variable";
+ }
+ break;
+ }
+ if (!FL_TEST(ruby_cbase, FL_SINGLETON)) {
+ if (rb_cvar_defined(ruby_cbase, node->nd_vid)) {
+ return "class variable";
+ }
+ break;
+ }
+ self = rb_iv_get(ruby_cbase, "__attached__");
+ /* fall through */
+ case NODE_CVAR2:
+ if (rb_cvar_defined(rb_cvar_singleton(self), node->nd_vid)) {
return "class variable";
}
break;
@@ -2493,41 +1839,30 @@ is_defined(self, node, buf)
switch (TYPE(val)) {
case T_CLASS:
case T_MODULE:
- if (rb_const_defined_from(val, node->nd_mid))
+ if (rb_const_defined_at(val, node->nd_mid))
return "constant";
- break;
default:
- if (rb_method_boundp(CLASS_OF(val), node->nd_mid, 1)) {
+ if (rb_method_boundp(val, node->nd_mid, 1)) {
return "method";
}
}
}
break;
- case NODE_COLON3:
- if (rb_const_defined_from(rb_cObject, node->nd_mid)) {
- return "constant";
- }
- break;
-
case NODE_NTH_REF:
if (RTEST(rb_reg_nth_defined(node->nd_nth, MATCH_DATA))) {
- sprintf(buf, "$%d", (int)node->nd_nth);
+ sprintf(buf, "$%d", node->nd_nth);
return buf;
}
break;
case NODE_BACK_REF:
if (RTEST(rb_reg_nth_defined(0, MATCH_DATA))) {
- sprintf(buf, "$%c", (char)node->nd_nth);
+ sprintf(buf, "$%c", node->nd_nth);
return buf;
}
break;
- case NODE_NEWLINE:
- node = node->nd_next;
- goto again;
-
default:
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
@@ -2548,169 +1883,57 @@ static int handle_rescue _((VALUE,NODE*));
static void blk_free();
static VALUE
-rb_obj_is_proc(proc)
- VALUE proc;
+rb_obj_is_block(block)
+ VALUE block;
{
- if (TYPE(proc) == T_DATA && RDATA(proc)->dfree == (RUBY_DATA_FUNC)blk_free) {
+ if (TYPE(block) == T_DATA && RDATA(block)->dfree == (RUBY_DATA_FUNC)blk_free) {
return Qtrue;
}
return Qfalse;
}
-void
-rb_add_event_hook(func, events)
- rb_event_hook_func_t func;
- rb_event_t events;
+static VALUE
+rb_obj_is_proc(proc)
+ VALUE proc;
{
- rb_event_hook_t *hook;
-
- hook = ALLOC(rb_event_hook_t);
- hook->func = func;
- hook->events = events;
- hook->next = event_hooks;
- event_hooks = hook;
+ if (rb_obj_is_block(proc) && rb_obj_is_kind_of(proc, rb_cProc)) {
+ return Qtrue;
+ }
+ return Qfalse;
}
-int
-rb_remove_event_hook(func)
- rb_event_hook_func_t func;
-{
- rb_event_hook_t *prev, *hook;
-
- prev = NULL;
- hook = event_hooks;
- while (hook) {
- if (hook->func == func) {
- if (prev) {
- prev->next = hook->next;
- }
- else {
- event_hooks = hook->next;
- }
- xfree(hook);
- return 0;
- }
- prev = hook;
- hook = hook->next;
- }
- return -1;
-}
-
-/*
- * call-seq:
- * set_trace_func(proc) => proc
- * set_trace_func(nil) => nil
- *
- * Establishes _proc_ as the handler for tracing, or disables
- * tracing if the parameter is +nil+. _proc_ takes up
- * to six parameters: an event name, a filename, a line number, an
- * object id, a binding, and the name of a class. _proc_ is
- * invoked whenever an event occurs. Events are: <code>c-call</code>
- * (call a C-language routine), <code>c-return</code> (return from a
- * C-language routine), <code>call</code> (call a Ruby method),
- * <code>class</code> (start a class or module definition),
- * <code>end</code> (finish a class or module definition),
- * <code>line</code> (execute code on a new line), <code>raise</code>
- * (raise an exception), and <code>return</code> (return from a Ruby
- * method). Tracing is disabled within the context of _proc_.
- *
- * class Test
- * def test
- * a = 1
- * b = 2
- * end
- * end
- *
- * set_trace_func proc { |event, file, line, id, binding, classname|
- * printf "%8s %s:%-2d %10s %8s\n", event, file, line, id, classname
- * }
- * t = Test.new
- * t.test
- *
- * line prog.rb:11 false
- * c-call prog.rb:11 new Class
- * c-call prog.rb:11 initialize Object
- * c-return prog.rb:11 initialize Object
- * c-return prog.rb:11 new Class
- * line prog.rb:12 false
- * call prog.rb:2 test Test
- * line prog.rb:3 test Test
- * line prog.rb:4 test Test
- * return prog.rb:4 test Test
- */
-
-
static VALUE
set_trace_func(obj, trace)
VALUE obj, trace;
{
- rb_event_hook_t *hook;
-
- rb_secure(4);
if (NIL_P(trace)) {
trace_func = 0;
- rb_remove_event_hook(call_trace_func);
return Qnil;
}
if (!rb_obj_is_proc(trace)) {
rb_raise(rb_eTypeError, "trace_func needs to be Proc");
}
- trace_func = trace;
- for (hook = event_hooks; hook; hook = hook->next) {
- if (hook->func == call_trace_func)
- return trace;
- }
- rb_add_event_hook(call_trace_func, RUBY_EVENT_ALL);
- return trace;
-}
-
-static char *
-get_event_name(rb_event_t event)
-{
- switch (event) {
- case RUBY_EVENT_LINE:
- return "line";
- case RUBY_EVENT_CLASS:
- return "class";
- case RUBY_EVENT_END:
- return "end";
- case RUBY_EVENT_CALL:
- return "call";
- case RUBY_EVENT_RETURN:
- return "return";
- case RUBY_EVENT_C_CALL:
- return "c-call";
- case RUBY_EVENT_C_RETURN:
- return "c-return";
- case RUBY_EVENT_RAISE:
- return "raise";
- default:
- return "unknown";
- }
+ return trace_func = trace;
}
static void
-call_trace_func(event, node, self, id, klass)
- rb_event_t event;
- NODE *node;
+call_trace_func(event, file, line, self, id, klass)
+ char *event;
+ char *file;
+ int line;
VALUE self;
ID id;
VALUE klass; /* OK */
{
- int state, raised;
+ int state;
struct FRAME *prev;
- NODE *node_save;
+ char *file_save = ruby_sourcefile;
+ int line_save = ruby_sourceline;
VALUE srcfile;
- char *event_name;
if (!trace_func) return;
if (tracing) return;
- if (ruby_in_compile) return;
- if (id == ID_ALLOCATOR) return;
- if (!(node_save = ruby_current_node)) {
- node_save = NEW_NEWLINE(0);
- }
tracing = 1;
prev = ruby_frame;
PUSH_FRAME();
@@ -2718,242 +1941,60 @@ call_trace_func(event, node, self, id, klass)
ruby_frame->prev = prev;
ruby_frame->iter = 0; /* blocks not available anyway */
- if (node) {
- ruby_current_node = node;
- ruby_frame->node = node;
- ruby_sourcefile = node->nd_file;
- ruby_sourceline = nd_line(node);
+ if (file) {
+ ruby_frame->line = ruby_sourceline = line;
+ ruby_frame->file = ruby_sourcefile = file;
}
if (klass) {
if (TYPE(klass) == T_ICLASS) {
klass = RBASIC(klass)->klass;
}
else if (FL_TEST(klass, FL_SINGLETON)) {
- klass = rb_iv_get(klass, "__attached__");
+ klass = self;
}
}
PUSH_TAG(PROT_NONE);
- raised = thread_reset_raised();
if ((state = EXEC_TAG()) == 0) {
srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)");
- event_name = get_event_name(event);
- proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name),
- srcfile,
- INT2FIX(ruby_sourceline),
- id?ID2SYM(id):Qnil,
- self?rb_f_binding(self):Qnil,
- klass),
- Qundef, 0);
- }
- if (raised) thread_set_raised();
- POP_TAG();
+ proc_call(trace_func, rb_ary_new3(6, rb_str_new2(event),
+ srcfile,
+ INT2FIX(ruby_sourceline),
+ id?ID2SYM(id):Qnil,
+ self?rb_f_binding(self):Qnil,
+ klass));
+ }
+ POP_TMPTAG(); /* do not propagate retval */
POP_FRAME();
tracing = 0;
- ruby_current_node = node_save;
- SET_CURRENT_SOURCE();
+ ruby_sourceline = line_save;
+ ruby_sourcefile = file_save;
if (state) JUMP_TAG(state);
}
-static VALUE
-avalue_to_svalue(v)
- VALUE v;
-{
- VALUE tmp, top;
-
- tmp = rb_check_array_type(v);
- if (NIL_P(tmp)) {
- return v;
- }
- if (RARRAY(tmp)->len == 0) {
- return Qundef;
- }
- if (RARRAY(tmp)->len == 1) {
- top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
- if (NIL_P(top)) {
- return RARRAY(tmp)->ptr[0];
- }
- if (RARRAY(top)->len > 1) {
- return v;
- }
- return top;
- }
- return tmp;
-}
-
-static VALUE
-svalue_to_avalue(v)
- VALUE v;
-{
- VALUE tmp, top;
-
- if (v == Qundef) return rb_ary_new2(0);
- tmp = rb_check_array_type(v);
- if (NIL_P(tmp)) {
- return rb_ary_new3(1, v);
- }
- if (RARRAY(tmp)->len == 1) {
- top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
- if (!NIL_P(top) && RARRAY(top)->len > 1) {
- return tmp;
- }
- return rb_ary_new3(1, v);
- }
- return tmp;
-}
-
-static VALUE
-svalue_to_mrhs(v, lhs)
- VALUE v;
- NODE *lhs;
-{
- VALUE tmp;
-
- if (v == Qundef) return rb_ary_new2(0);
- tmp = rb_check_array_type(v);
- if (NIL_P(tmp)) {
- return rb_ary_new3(1, v);
- }
- /* no lhs means splat lhs only */
- if (!lhs) {
- return rb_ary_new3(1, v);
- }
- return tmp;
-}
-
-static VALUE
-avalue_splat(v)
- VALUE v;
-{
- if (RARRAY(v)->len == 0) {
- return Qundef;
- }
- if (RARRAY(v)->len == 1) {
- return RARRAY(v)->ptr[0];
- }
- return v;
-}
-
-#if 1
-VALUE
-rb_Array(val)
- VALUE val;
-{
- VALUE tmp = rb_check_array_type(val);
-
- if (NIL_P(tmp)) {
- /* hack to avoid invoke Object#to_a */
- VALUE origin;
- ID id = rb_intern("to_a");
-
- if (search_method(CLASS_OF(val), id, &origin) &&
- RCLASS(origin)->m_tbl != RCLASS(rb_mKernel)->m_tbl) { /* exclude Kernel#to_a */
- val = rb_funcall(val, id, 0);
- if (TYPE(val) != T_ARRAY) {
- rb_raise(rb_eTypeError, "`to_a' did not return Array");
- }
- return val;
- }
- else {
- return rb_ary_new3(1, val);
- }
- }
- return tmp;
-}
-#endif
-
-static VALUE
-splat_value(v)
- VALUE v;
-{
- if (NIL_P(v)) return rb_ary_new3(1, Qnil);
- return rb_Array(v);
-}
-
-static VALUE
-class_prefix(self, cpath)
- VALUE self;
- NODE *cpath;
-{
- if (!cpath) {
- rb_bug("class path missing");
- }
- if (cpath->nd_head) {
- VALUE c = rb_eval(self, cpath->nd_head);
- switch (TYPE(c)) {
- case T_CLASS:
- case T_MODULE:
- break;
- default:
- rb_raise(rb_eTypeError, "%s is not a class/module",
- RSTRING(rb_obj_as_string(c))->ptr);
- }
- return c;
- }
- else if (nd_type(cpath) == NODE_COLON2) {
- return ruby_cbase;
- }
- else if (ruby_wrapper) {
- return ruby_wrapper;
- }
- else {
- return rb_cObject;
- }
-}
-
-#define return_value(v) do {\
- if ((prot_tag->retval = (v)) == Qundef) {\
- prot_tag->retval = Qnil;\
- }\
-} while (0)
-
-NORETURN(static void return_jump _((VALUE)));
-NORETURN(static void break_jump _((VALUE)));
-NORETURN(static void next_jump _((VALUE)));
-NORETURN(static void unknown_node _((NODE * volatile)));
-
-static void
-unknown_node(node)
- NODE *volatile node;
-{
- ruby_current_node = 0;
- if (node->flags == 0) {
- rb_bug("terminated node (0x%lx)", node);
- }
- else if (BUILTIN_TYPE(node) != T_NODE) {
- rb_bug("not a node 0x%02lx (0x%lx)", BUILTIN_TYPE(node), node);
- }
- else {
- rb_bug("unknown node type %d (0x%lx)", nd_type(node), node);
- }
-}
+static void return_check _((void));
+#define return_value(v) prot_tag->retval = (v)
static VALUE
rb_eval(self, n)
VALUE self;
NODE *n;
{
- NODE * volatile contnode = 0;
NODE * volatile node = n;
int state;
volatile VALUE result = Qnil;
-#define RETURN(v) do { \
- result = (v); \
- goto finish; \
-} while (0)
+#define RETURN(v) { result = (v); goto finish; }
again:
if (!node) RETURN(Qnil);
- ruby_current_node = node;
switch (nd_type(node)) {
case NODE_BLOCK:
- if (contnode) {
- result = rb_eval(self, node);
- break;
+ while (node->nd_next) {
+ rb_eval(self, node->nd_head);
+ node = node->nd_next;
}
- contnode = node->nd_next;
node = node->nd_head;
goto again;
@@ -2970,35 +2011,32 @@ rb_eval(self, n)
/* nodes for speed-up(default match) */
case NODE_MATCH:
- result = rb_reg_match2(node->nd_lit);
+ result = rb_reg_match2(node->nd_head->nd_lit);
break;
/* nodes for speed-up(literal match) */
case NODE_MATCH2:
- {
- VALUE l = rb_eval(self,node->nd_recv);
- VALUE r = rb_eval(self,node->nd_value);
- result = rb_reg_match(l, r);
- }
+ result = rb_reg_match(rb_eval(self,node->nd_recv),
+ rb_eval(self,node->nd_value));
break;
/* nodes for speed-up(literal match) */
case NODE_MATCH3:
- {
+ {
VALUE r = rb_eval(self,node->nd_recv);
VALUE l = rb_eval(self,node->nd_value);
- if (TYPE(l) == T_STRING) {
- result = rb_reg_match(r, l);
+ if (TYPE(r) == T_STRING) {
+ result = rb_reg_match(l, r);
}
else {
- result = rb_funcall(l, match, 1, r);
+ result = rb_funcall(r, match, 1, l);
}
}
break;
/* node for speed-up(top-level loop for -n/-p) */
case NODE_OPT_N:
- PUSH_TAG(PROT_LOOP);
+ PUSH_TAG(PROT_NONE);
switch (state = EXEC_TAG()) {
case 0:
opt_n_next:
@@ -3036,9 +2074,7 @@ rb_eval(self, n)
RETURN(Qfalse);
case NODE_IF:
- EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
- ruby_frame->last_func,
- ruby_frame->last_class);
+ ruby_sourceline = nd_line(node);
if (RTEST(rb_eval(self, node->nd_cond))) {
node = node->nd_body;
}
@@ -3054,14 +2090,18 @@ rb_eval(self, n)
if (nd_type(node) != NODE_WHEN) goto again;
tag = node->nd_head;
while (tag) {
- EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
- ruby_frame->last_func,
- ruby_frame->last_class);
- if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+ if (trace_func) {
+ call_trace_func("line", tag->nd_file, nd_line(tag), self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ }
+ ruby_sourcefile = tag->nd_file;
+ ruby_sourceline = nd_line(tag);
+ if (nd_type(tag->nd_head) == NODE_WHEN) {
VALUE v = rb_eval(self, tag->nd_head->nd_head);
- long i;
+ int i;
- if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+ if (TYPE(v) != T_ARRAY) v = rb_Array(v);
for (i=0; i<RARRAY(v)->len; i++) {
if (RTEST(RARRAY(v)->ptr[i])) {
node = node->nd_body;
@@ -3095,14 +2135,18 @@ rb_eval(self, n)
}
tag = node->nd_head;
while (tag) {
- EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
- ruby_frame->last_func,
- ruby_frame->last_class);
- if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
+ if (trace_func) {
+ call_trace_func("line", tag->nd_file, nd_line(tag), self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ }
+ ruby_sourcefile = tag->nd_file;
+ ruby_sourceline = nd_line(tag);
+ if (nd_type(tag->nd_head) == NODE_WHEN) {
VALUE v = rb_eval(self, tag->nd_head->nd_head);
- long i;
+ int i;
- if (TYPE(v) != T_ARRAY) v = rb_ary_to_ary(v);
+ if (TYPE(v) != T_ARRAY) v = rb_Array(v);
for (i=0; i<RARRAY(v)->len; i++) {
if (RTEST(rb_funcall2(RARRAY(v)->ptr[i], eqq, 1, &val))){
node = node->nd_body;
@@ -3124,10 +2168,10 @@ rb_eval(self, n)
RETURN(Qnil);
case NODE_WHILE:
- PUSH_TAG(PROT_LOOP);
- result = Qnil;
+ PUSH_TAG(PROT_NONE);
switch (state = EXEC_TAG()) {
case 0:
+ ruby_sourceline = nd_line(node);
if (node->nd_state && !RTEST(rb_eval(self, node->nd_cond)))
goto while_out;
do {
@@ -3145,22 +2189,17 @@ rb_eval(self, n)
state = 0;
goto while_next;
case TAG_BREAK:
- if (TAG_DST()) {
- state = 0;
- result = prot_tag->retval;
- }
- /* fall through */
+ state = 0;
default:
break;
}
while_out:
POP_TAG();
if (state) JUMP_TAG(state);
- RETURN(result);
+ RETURN(Qnil);
case NODE_UNTIL:
- PUSH_TAG(PROT_LOOP);
- result = Qnil;
+ PUSH_TAG(PROT_NONE);
switch (state = EXEC_TAG()) {
case 0:
if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
@@ -3180,18 +2219,14 @@ rb_eval(self, n)
state = 0;
goto until_next;
case TAG_BREAK:
- if (TAG_DST()) {
- state = 0;
- result = prot_tag->retval;
- }
- /* fall through */
+ state = 0;
default:
break;
}
until_out:
POP_TAG();
if (state) JUMP_TAG(state);
- RETURN(result);
+ RETURN(Qnil);
case NODE_BLOCK_PASS:
result = block_pass(self, node);
@@ -3200,42 +2235,52 @@ rb_eval(self, n)
case NODE_ITER:
case NODE_FOR:
{
- PUSH_TAG(PROT_LOOP);
+ iter_retry:
+ PUSH_TAG(PROT_FUNC);
PUSH_BLOCK(node->nd_var, node->nd_body);
state = EXEC_TAG();
if (state == 0) {
- iter_retry:
PUSH_ITER(ITER_PRE);
if (nd_type(node) == NODE_ITER) {
result = rb_eval(self, node->nd_iter);
}
else {
VALUE recv;
+ char *file = ruby_sourcefile;
+ int line = ruby_sourceline;
_block.flags &= ~BLOCK_D_SCOPE;
BEGIN_CALLARGS;
recv = rb_eval(self, node->nd_iter);
END_CALLARGS;
- ruby_current_node = node;
- SET_CURRENT_SOURCE();
- result = rb_call(CLASS_OF(recv),recv,each,0,0,0,self);
+ ruby_sourcefile = file;
+ ruby_sourceline = line;
+ result = rb_call(CLASS_OF(recv),recv,each,0,0,0);
}
POP_ITER();
}
- else if (state == TAG_BREAK && TAG_DST()) {
- result = prot_tag->retval;
- state = 0;
- }
- else if (state == TAG_RETRY) {
- state = 0;
- goto iter_retry;
+ else if (_block.tag->dst == state) {
+ state &= TAG_MASK;
+ if (state == TAG_RETURN) {
+ result = prot_tag->retval;
+ }
}
POP_BLOCK();
POP_TAG();
switch (state) {
case 0:
break;
+
+ case TAG_RETRY:
+ goto iter_retry;
+
+ case TAG_BREAK:
+ result = Qnil;
+ break;
+ case TAG_RETURN:
+ return_value(result);
+ /* fall through */
default:
JUMP_TAG(state);
}
@@ -3243,101 +2288,86 @@ rb_eval(self, n)
break;
case NODE_BREAK:
- break_jump(rb_eval(self, node->nd_stts));
+ JUMP_TAG(TAG_BREAK);
break;
case NODE_NEXT:
- CHECK_INTS;
- next_jump(rb_eval(self, node->nd_stts));
+ JUMP_TAG(TAG_NEXT);
break;
case NODE_REDO:
- CHECK_INTS;
JUMP_TAG(TAG_REDO);
break;
case NODE_RETRY:
- CHECK_INTS;
JUMP_TAG(TAG_RETRY);
break;
- case NODE_SPLAT:
- result = splat_value(rb_eval(self, node->nd_head));
- break;
-
- case NODE_TO_ARY:
- result = rb_ary_to_ary(rb_eval(self, node->nd_head));
- break;
-
- case NODE_SVALUE:
- result = avalue_splat(rb_eval(self, node->nd_head));
- if (result == Qundef) result = Qnil;
+ case NODE_RESTARGS:
+ result = rb_eval(self, node->nd_head);
+ if (TYPE(result) != T_ARRAY) {
+ result = rb_Array(result);
+ }
break;
case NODE_YIELD:
- if (node->nd_head) {
- result = rb_eval(self, node->nd_head);
- ruby_current_node = node;
+ if (node->nd_stts) {
+ result = rb_eval(self, node->nd_stts);
+ if (nd_type(node->nd_stts) == NODE_RESTARGS &&
+ RARRAY(result)->len == 1)
+ {
+ result = RARRAY(result)->ptr[0];
+ }
}
else {
- result = Qundef; /* no arg */
+ result = Qnil;
}
- SET_CURRENT_SOURCE();
- result = rb_yield_0(result, 0, 0, 0, node->nd_state);
+ result = rb_yield_0(result, 0, 0, 0);
break;
case NODE_RESCUE:
- {
+ retry_entry:
+ {
volatile VALUE e_info = ruby_errinfo;
- volatile int rescuing = 0;
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
- retry_entry:
result = rb_eval(self, node->nd_head);
}
- else if (rescuing) {
- if (rescuing < 0) {
- /* in rescue argument, just reraise */
- }
- else if (state == TAG_RETRY) {
- rescuing = state = 0;
- ruby_errinfo = e_info;
- goto retry_entry;
- }
- else if (state != TAG_RAISE) {
- result = prot_tag->retval;
- }
- }
- else if (state == TAG_RAISE) {
- NODE *resq = node->nd_resq;
+ POP_TAG();
+ if (state == TAG_RAISE) {
+ NODE * volatile resq = node->nd_resq;
- rescuing = -1;
+ ruby_sourceline = nd_line(node);
while (resq) {
- ruby_current_node = resq;
if (handle_rescue(self, resq)) {
state = 0;
- rescuing = 1;
- result = rb_eval(self, resq->nd_body);
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ result = rb_eval(self, resq->nd_body);
+ }
+ POP_TAG();
+ if (state == TAG_RETRY) {
+ state = 0;
+ ruby_errinfo = Qnil;
+ goto retry_entry;
+ }
+ if (state != TAG_RAISE) {
+ ruby_errinfo = e_info;
+ }
break;
}
resq = resq->nd_head; /* next rescue */
}
}
- else {
- result = prot_tag->retval;
- }
- POP_TAG();
- if (state != TAG_RAISE) ruby_errinfo = e_info;
- if (state) {
- JUMP_TAG(state);
- }
- /* no exception raised */
- if (!rescuing && (node = node->nd_else)) { /* else clause given */
- goto again;
+ else if (node->nd_else) { /* else clause given */
+ if (!state) { /* no exception raised */
+ result = rb_eval(self, node->nd_else);
+ }
}
+ if (state) JUMP_TAG(state);
}
- break;
+ break;
case NODE_ENSURE:
PUSH_TAG(PROT_NONE);
@@ -3345,7 +2375,7 @@ rb_eval(self, n)
result = rb_eval(self, node->nd_head);
}
POP_TAG();
- if (node->nd_ensr && !thread_no_ensure()) {
+ if (node->nd_ensr) {
VALUE retval = prot_tag->retval; /* save retval */
VALUE errinfo = ruby_errinfo;
@@ -3375,94 +2405,78 @@ rb_eval(self, n)
case NODE_DOT2:
case NODE_DOT3:
- {
- VALUE beg = rb_eval(self, node->nd_beg);
- VALUE end = rb_eval(self, node->nd_end);
- result = rb_range_new(beg, end, nd_type(node) == NODE_DOT3);
- }
+ result = rb_range_new(rb_eval(self, node->nd_beg),
+ rb_eval(self, node->nd_end),
+ nd_type(node) == NODE_DOT3);
+ if (node->nd_state) break;
+ if (nd_type(node->nd_beg) == NODE_LIT && FIXNUM_P(node->nd_beg->nd_lit) &&
+ nd_type(node->nd_end) == NODE_LIT && FIXNUM_P(node->nd_end->nd_lit))
+ {
+ nd_set_type(node, NODE_LIT);
+ node->nd_lit = result;
+ }
+ else {
+ node->nd_state = 1;
+ }
break;
case NODE_FLIP2: /* like AWK */
- {
- VALUE *flip = rb_svar(node->nd_cnt);
- if (!flip) rb_bug("unexpected local variable");
- if (!RTEST(*flip)) {
- if (RTEST(rb_eval(self, node->nd_beg))) {
- *flip = RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
- result = Qtrue;
- }
- else {
- result = Qfalse;
- }
+ if (ruby_scope->local_vars == 0) {
+ rb_bug("unexpected local variable");
+ }
+ if (!RTEST(ruby_scope->local_vars[node->nd_cnt])) {
+ if (RTEST(rb_eval(self, node->nd_beg))) {
+ ruby_scope->local_vars[node->nd_cnt] =
+ RTEST(rb_eval(self, node->nd_end))?Qfalse:Qtrue;
+ result = Qtrue;
}
else {
- if (RTEST(rb_eval(self, node->nd_end))) {
- *flip = Qfalse;
- }
- result = Qtrue;
+ result = Qfalse;
}
}
+ else {
+ if (RTEST(rb_eval(self, node->nd_end))) {
+ ruby_scope->local_vars[node->nd_cnt] = Qfalse;
+ }
+ result = Qtrue;
+ }
break;
case NODE_FLIP3: /* like SED */
- {
- VALUE *flip = rb_svar(node->nd_cnt);
- if (!flip) rb_bug("unexpected local variable");
- if (!RTEST(*flip)) {
- result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse;
- *flip = result;
- }
- else {
- if (RTEST(rb_eval(self, node->nd_end))) {
- *flip = Qfalse;
- }
- result = Qtrue;
+ if (ruby_scope->local_vars == 0) {
+ rb_bug("unexpected local variable");
+ }
+ if (!RTEST(ruby_scope->local_vars[node->nd_cnt])) {
+ result = RTEST(rb_eval(self, node->nd_beg)) ? Qtrue : Qfalse;
+ ruby_scope->local_vars[node->nd_cnt] = result;
+ }
+ else {
+ if (RTEST(rb_eval(self, node->nd_end))) {
+ ruby_scope->local_vars[node->nd_cnt] = Qfalse;
}
+ result = Qtrue;
}
break;
case NODE_RETURN:
- return_jump(rb_eval(self, node->nd_stts));
+ if (node->nd_stts) {
+ return_value(rb_eval(self, node->nd_stts));
+ }
+ else {
+ return_value(Qnil);
+ }
+ return_check();
+ JUMP_TAG(TAG_RETURN);
break;
case NODE_ARGSCAT:
- {
- VALUE args = rb_eval(self, node->nd_head);
- result = rb_ary_concat(args, splat_value(rb_eval(self, node->nd_body)));
- }
+ result = rb_ary_concat(rb_eval(self, node->nd_head),
+ rb_eval(self, node->nd_body));
break;
case NODE_ARGSPUSH:
- {
- VALUE args = rb_ary_dup(rb_eval(self, node->nd_head));
- result = rb_ary_push(args, rb_eval(self, node->nd_body));
- }
- break;
-
- case NODE_ATTRASGN:
- {
- VALUE recv;
- int argc; VALUE *argv; /* used in SETUP_ARGS */
- int scope;
- TMP_PROTECT;
-
- BEGIN_CALLARGS;
- if (node->nd_recv == (NODE *)1) {
- recv = self;
- scope = 1;
- }
- else {
- recv = rb_eval(self, node->nd_recv);
- scope = 0;
- }
- SETUP_ARGS(node->nd_args);
- END_CALLARGS;
-
- ruby_current_node = node;
- SET_CURRENT_SOURCE();
- rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,scope,self);
- result = argv[argc-1];
- }
+ result = rb_ary_push(rb_obj_dup(rb_eval(self, node->nd_head)),
+ rb_eval(self, node->nd_body));
break;
case NODE_CALL:
@@ -3476,9 +2490,7 @@ rb_eval(self, n)
SETUP_ARGS(node->nd_args);
END_CALLARGS;
- ruby_current_node = node;
- SET_CURRENT_SOURCE();
- result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0,self);
+ result = rb_call(CLASS_OF(recv),recv,node->nd_mid,argc,argv,0);
}
break;
@@ -3491,15 +2503,12 @@ rb_eval(self, n)
SETUP_ARGS(node->nd_args);
END_CALLARGS;
- ruby_current_node = node;
- SET_CURRENT_SOURCE();
- result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1,self);
+ result = rb_call(CLASS_OF(self),self,node->nd_mid,argc,argv,1);
}
break;
case NODE_VCALL:
- SET_CURRENT_SOURCE();
- result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2,self);
+ result = rb_call(CLASS_OF(self),self,node->nd_mid,0,0,2);
break;
case NODE_SUPER:
@@ -3508,43 +2517,25 @@ rb_eval(self, n)
int argc; VALUE *argv; /* used in SETUP_ARGS */
TMP_PROTECT;
- if (ruby_frame->last_class == 0) {
- if (ruby_frame->last_func) {
- rb_name_error(ruby_frame->last_func,
- "superclass method `%s' disabled",
- rb_id2name(ruby_frame->orig_func));
- }
- else {
- rb_raise(rb_eNoMethodError, "super called outside of method");
- }
+ if (ruby_frame->last_class == 0) {
+ rb_raise(rb_eNameError, "superclass method `%s' disabled",
+ rb_id2name(ruby_frame->last_func));
}
if (nd_type(node) == NODE_ZSUPER) {
argc = ruby_frame->argc;
- if (argc && DMETHOD_P()) {
- if (TYPE(RBASIC(ruby_scope)->klass) != T_ARRAY ||
- RARRAY(RBASIC(ruby_scope)->klass)->len != argc) {
- rb_raise(rb_eRuntimeError,
- "super: specify arguments explicitly");
- }
- argv = RARRAY(RBASIC(ruby_scope)->klass)->ptr;
- }
- else if (!ruby_scope->local_vars) {
- argc = 0;
- argv = 0;
- }
- else {
- argv = ruby_scope->local_vars + 2;
- }
+ argv = ruby_frame->argv;
}
else {
BEGIN_CALLARGS;
SETUP_ARGS(node->nd_args);
END_CALLARGS;
- ruby_current_node = node;
}
- SET_CURRENT_SOURCE();
- result = rb_call_super(argc, argv);
+ PUSH_ITER(ruby_iter->iter?ITER_PRE:ITER_NOT);
+ result = rb_call(RCLASS(ruby_frame->last_class)->super,
+ ruby_frame->self, ruby_frame->last_func,
+ argc, argv, 3);
+ POP_ITER();
}
break;
@@ -3562,6 +2553,7 @@ rb_eval(self, n)
if (node->nd_rval) {
saved_cref = ruby_cref;
ruby_cref = (NODE*)node->nd_rval;
+ ruby_frame->cbase = node->nd_rval;
}
if (node->nd_tbl) {
VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1);
@@ -3589,29 +2581,28 @@ rb_eval(self, n)
case NODE_OP_ASGN1:
{
int argc; VALUE *argv; /* used in SETUP_ARGS */
- VALUE recv, val, tmp;
+ VALUE recv, val;
NODE *rval;
TMP_PROTECT;
recv = rb_eval(self, node->nd_recv);
rval = node->nd_args->nd_head;
- SETUP_ARGS0(node->nd_args->nd_body, 1);
- val = rb_funcall3(recv, aref, argc, argv);
+ SETUP_ARGS(node->nd_args->nd_next);
+ val = rb_funcall2(recv, aref, argc-1, argv);
switch (node->nd_mid) {
case 0: /* OR */
- if (RTEST(val)) RETURN(val);
- val = rb_eval(self, rval);
- break;
+ if (RTEST(val)) RETURN(val);
+ val = rb_eval(self, rval);
+ break;
case 1: /* AND */
- if (!RTEST(val)) RETURN(val);
- val = rb_eval(self, rval);
- break;
+ if (!RTEST(val)) RETURN(val);
+ val = rb_eval(self, rval);
+ break;
default:
- tmp = rb_eval(self, rval);
- val = rb_funcall3(val, node->nd_mid, 1, &tmp);
+ val = rb_funcall(val, node->nd_mid, 1, rb_eval(self, rval));
}
- argv[argc] = val;
- rb_funcall2(recv, aset, argc+1, argv);
+ argv[argc-1] = val;
+ val = rb_funcall2(recv, aset, argc, argv);
result = val;
}
break;
@@ -3619,22 +2610,22 @@ rb_eval(self, n)
case NODE_OP_ASGN2:
{
ID id = node->nd_next->nd_vid;
- VALUE recv, val, tmp;
+ VALUE recv, val;
recv = rb_eval(self, node->nd_recv);
- val = rb_funcall3(recv, id, 0, 0);
+ val = rb_funcall(recv, id, 0);
switch (node->nd_next->nd_mid) {
case 0: /* OR */
- if (RTEST(val)) RETURN(val);
- val = rb_eval(self, node->nd_value);
- break;
+ if (RTEST(val)) RETURN(val);
+ val = rb_eval(self, node->nd_value);
+ break;
case 1: /* AND */
- if (!RTEST(val)) RETURN(val);
- val = rb_eval(self, node->nd_value);
- break;
+ if (!RTEST(val)) RETURN(val);
+ val = rb_eval(self, node->nd_value);
+ break;
default:
- tmp = rb_eval(self, node->nd_value);
- val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp);
+ val = rb_funcall(val, node->nd_next->nd_mid, 1,
+ rb_eval(self, node->nd_value));
}
rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
@@ -3649,7 +2640,7 @@ rb_eval(self, n)
goto again;
case NODE_OP_ASGN_OR:
- if ((node->nd_aid && !is_defined(self, node->nd_head, 0)) ||
+ if ((node->nd_aid && !rb_ivar_defined(self, node->nd_aid)) ||
!RTEST(result = rb_eval(self, node->nd_head))) {
node = node->nd_value;
goto again;
@@ -3657,7 +2648,7 @@ rb_eval(self, n)
break;
case NODE_MASGN:
- result = massign(self, node, rb_eval(self, node->nd_value), 0);
+ result = massign(self, node, rb_eval(self, node->nd_value),0);
break;
case NODE_LASGN:
@@ -3688,13 +2679,11 @@ rb_eval(self, n)
break;
case NODE_CDECL:
- result = rb_eval(self, node->nd_value);
- if (node->nd_vid == 0) {
- rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
- }
- else {
- rb_const_set(ruby_cbase, node->nd_vid, result);
+ if (NIL_P(ruby_class)) {
+ rb_raise(rb_eTypeError, "no class/module to define constant");
}
+ result = rb_eval(self, node->nd_value);
+ rb_const_set(ruby_class, node->nd_vid, result);
break;
case NODE_CVDECL:
@@ -3702,12 +2691,17 @@ rb_eval(self, n)
rb_raise(rb_eTypeError, "no class/module to define class variable");
}
result = rb_eval(self, node->nd_value);
- rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qtrue);
+ if (FL_TEST(ruby_cbase, FL_SINGLETON)) {
+ rb_cvar_declare(rb_cvar_singleton(rb_iv_get(ruby_cbase, "__attached__")),
+ node->nd_vid, result);
+ break;
+ }
+ rb_cvar_declare(ruby_cbase, node->nd_vid, result);
break;
case NODE_CVASGN:
result = rb_eval(self, node->nd_value);
- rb_cvar_set(cvar_cbase(), node->nd_vid, result, Qfalse);
+ rb_cvar_set(rb_cvar_singleton(self), node->nd_vid, result);
break;
case NODE_LVAR:
@@ -3730,18 +2724,29 @@ rb_eval(self, n)
break;
case NODE_CONST:
- result = ev_const_get(ruby_cref, node->nd_vid, self);
+ result = ev_const_get(RNODE(ruby_frame->cbase), node->nd_vid, self);
break;
- case NODE_CVAR:
- result = rb_cvar_get(cvar_cbase(), node->nd_vid);
+ case NODE_CVAR: /* normal method */
+ if (NIL_P(ruby_cbase)) {
+ result = rb_cvar_get(CLASS_OF(self), node->nd_vid);
+ break;
+ }
+ if (!FL_TEST(ruby_cbase, FL_SINGLETON)) {
+ result = rb_cvar_get(ruby_cbase, node->nd_vid);
+ break;
+ }
+ self = rb_iv_get(ruby_cbase, "__attached__");
+ /* fall through */
+ case NODE_CVAR2: /* singleton method */
+ result = rb_cvar_get(rb_cvar_singleton(self), node->nd_vid);
break;
case NODE_BLOCK_ARG:
if (ruby_scope->local_vars == 0)
rb_bug("unexpected block argument");
if (rb_block_given_p()) {
- result = rb_block_proc();
+ result = rb_f_lambda();
ruby_scope->local_vars[node->nd_cnt] = result;
}
else {
@@ -3754,26 +2759,19 @@ rb_eval(self, n)
VALUE klass;
klass = rb_eval(self, node->nd_head);
- if (rb_is_const_id(node->nd_mid)) {
- switch (TYPE(klass)) {
- case T_CLASS:
- case T_MODULE:
- result = rb_const_get_from(klass, node->nd_mid);
- break;
- default:
- rb_raise(rb_eTypeError, "%s is not a class/module",
- RSTRING(rb_obj_as_string(klass))->ptr);
- break;
- }
- }
- else {
- result = rb_funcall(klass, node->nd_mid, 0, 0);
+ switch (TYPE(klass)) {
+ case T_CLASS:
+ case T_MODULE:
+ break;
+ default:
+ return rb_funcall(klass, node->nd_mid, 0, 0);
}
+ result = rb_const_get(klass, node->nd_mid);
}
break;
case NODE_COLON3:
- result = rb_const_get_from(rb_cObject, node->nd_mid);
+ result = rb_const_get_at(rb_cObject, node->nd_mid);
break;
case NODE_NTH_REF:
@@ -3826,7 +2824,7 @@ rb_eval(self, n)
case NODE_ARRAY:
{
VALUE ary;
- long i;
+ int i;
i = node->nd_alen;
ary = rb_ary_new2(i);
@@ -3843,15 +2841,10 @@ rb_eval(self, n)
result = rb_str_new3(node->nd_lit);
break;
- case NODE_EVSTR:
- result = rb_obj_as_string(rb_eval(self, node->nd_body));
- break;
-
case NODE_DSTR:
case NODE_DXSTR:
case NODE_DREGX:
case NODE_DREGX_ONCE:
- case NODE_DSYM:
{
VALUE str, str2;
NODE *list = node->nd_next;
@@ -3863,8 +2856,23 @@ rb_eval(self, n)
case NODE_STR:
str2 = list->nd_head->nd_lit;
break;
+ case NODE_EVSTR:
+ result = ruby_errinfo;
+ ruby_errinfo = Qnil;
+ ruby_sourceline = nd_line(node);
+ ruby_in_eval++;
+ list->nd_head = compile(list->nd_head->nd_lit,
+ ruby_sourcefile,
+ ruby_sourceline);
+ ruby_eval_tree = 0;
+ ruby_in_eval--;
+ if (ruby_nerrs > 0) {
+ compile_error("string expansion");
+ }
+ if (!NIL_P(result)) ruby_errinfo = result;
+ /* fall through */
default:
- str2 = rb_eval(self, list->nd_head);
+ str2 = rb_obj_as_string(rb_eval(self, list->nd_head));
break;
}
rb_str_append(str, str2);
@@ -3875,23 +2883,17 @@ rb_eval(self, n)
switch (nd_type(node)) {
case NODE_DREGX:
result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
- node->nd_cflag);
+ node->nd_cflag);
break;
case NODE_DREGX_ONCE: /* regexp expand once */
result = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len,
- node->nd_cflag);
+ node->nd_cflag);
nd_set_type(node, NODE_LIT);
node->nd_lit = result;
break;
- case NODE_LIT:
- /* other thread may replace NODE_DREGX_ONCE to NODE_LIT */
- goto again;
case NODE_DXSTR:
result = rb_funcall(self, '`', 1, str);
break;
- case NODE_DSYM:
- result = rb_str_intern(str);
- break;
default:
result = str;
break;
@@ -3900,13 +2902,20 @@ rb_eval(self, n)
break;
case NODE_XSTR:
- result = rb_funcall(self, '`', 1, rb_str_new3(node->nd_lit));
+ result = rb_funcall(self, '`', 1, node->nd_lit);
break;
case NODE_LIT:
result = node->nd_lit;
break;
+ case NODE_ATTRSET:
+ if (ruby_frame->argc != 1)
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",
+ ruby_frame->argc);
+ result = rb_ivar_set(self, node->nd_vid, ruby_frame->argv[0]);
+ break;
+
case NODE_DEFN:
if (node->nd_defn) {
NODE *body, *defn;
@@ -3914,7 +2923,7 @@ rb_eval(self, n)
int noex;
if (NIL_P(ruby_class)) {
- rb_raise(rb_eTypeError, "no class/module to add method");
+ rb_raise(rb_eTypeError, "no class to add method");
}
if (ruby_class == rb_cObject && node->nd_mid == init) {
rb_warn("redefining Object#initialize may cause infinite loop");
@@ -3926,8 +2935,13 @@ rb_eval(self, n)
rb_frozen_class_p(ruby_class);
body = search_method(ruby_class, node->nd_mid, &origin);
if (body){
- if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0 && body->nd_body) {
- rb_warning("method redefined; discarding old %s", rb_id2name(node->nd_mid));
+ if (RTEST(ruby_verbose) && ruby_class == origin && body->nd_cnt == 0) {
+ rb_warning("discarding old %s", rb_id2name(node->nd_mid));
+ }
+ if (node->nd_noex) { /* toplevel */
+ /* should upgrade to rb_warn() if no super was called inside? */
+ rb_warning("overriding global function `%s'",
+ rb_id2name(node->nd_mid));
}
}
@@ -3937,18 +2951,30 @@ rb_eval(self, n)
else if (SCOPE_TEST(SCOPE_PROTECTED)) {
noex = NOEX_PROTECTED;
}
+ else if (ruby_class == rb_cObject) {
+ noex = node->nd_noex;
+ }
else {
noex = NOEX_PUBLIC;
}
- if (body && origin == ruby_class && body->nd_body == 0) {
- noex |= NOEX_NOSUPER;
+ if (body && origin == ruby_class && body->nd_noex & NOEX_UNDEF) {
+ noex |= NOEX_UNDEF;
}
defn = copy_node_scope(node->nd_defn, ruby_cref);
rb_add_method(ruby_class, node->nd_mid, defn, noex);
+ rb_clear_cache_by_id(node->nd_mid);
if (scope_vmode == SCOPE_MODFUNC) {
rb_add_method(rb_singleton_class(ruby_class),
node->nd_mid, defn, NOEX_PUBLIC);
+ rb_funcall(ruby_class, singleton_added, 1, ID2SYM(node->nd_mid));
+ }
+ if (FL_TEST(ruby_class, FL_SINGLETON)) {
+ rb_funcall(rb_iv_get(ruby_class, "__attached__"),
+ singleton_added, 1, ID2SYM(node->nd_mid));
+ }
+ else {
+ rb_funcall(ruby_class, added, 1, ID2SYM(node->nd_mid));
}
result = Qnil;
}
@@ -3960,20 +2986,20 @@ rb_eval(self, n)
VALUE klass;
NODE *body = 0, *defn;
- if (ruby_safe_level >= 4 && !OBJ_TAINTED(recv)) {
- rb_raise(rb_eSecurityError, "Insecure: can't define singleton method");
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(recv)) {
+ rb_raise(rb_eSecurityError, "Insecure; can't define singleton method");
}
if (FIXNUM_P(recv) || SYMBOL_P(recv)) {
rb_raise(rb_eTypeError,
"can't define singleton method \"%s\" for %s",
rb_id2name(node->nd_mid),
- rb_obj_classname(recv));
+ rb_class2name(CLASS_OF(recv)));
}
if (OBJ_FROZEN(recv)) rb_error_frozen("object");
klass = rb_singleton_class(recv);
- if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, (st_data_t *)&body)) {
- if (ruby_safe_level >= 4) {
+ if (st_lookup(RCLASS(klass)->m_tbl, node->nd_mid, &body)) {
+ if (rb_safe_level() >= 4) {
rb_raise(rb_eSecurityError, "redefining method prohibited");
}
if (RTEST(ruby_verbose)) {
@@ -3981,8 +3007,11 @@ rb_eval(self, n)
}
}
defn = copy_node_scope(node->nd_defn, ruby_cref);
- rb_add_method(klass, node->nd_mid, defn,
+ defn->nd_rval = (VALUE)ruby_cref;
+ rb_add_method(klass, node->nd_mid, defn,
NOEX_PUBLIC|(body?body->nd_noex&NOEX_UNDEF:0));
+ rb_clear_cache_by_id(node->nd_mid);
+ rb_funcall(recv, singleton_added, 1, ID2SYM(node->nd_mid));
result = Qnil;
}
break;
@@ -3991,7 +3020,7 @@ rb_eval(self, n)
if (NIL_P(ruby_class)) {
rb_raise(rb_eTypeError, "no class to undef method");
}
- rb_undef(ruby_class, rb_to_id(rb_eval(self, node->u2.node)));
+ rb_undef(ruby_class, node->nd_mid);
result = Qnil;
break;
@@ -3999,103 +3028,110 @@ rb_eval(self, n)
if (NIL_P(ruby_class)) {
rb_raise(rb_eTypeError, "no class to make alias");
}
- rb_alias(ruby_class, rb_to_id(rb_eval(self, node->u1.node)),
- rb_to_id(rb_eval(self, node->u2.node)));
+ rb_alias(ruby_class, node->nd_new, node->nd_old);
+ rb_funcall(ruby_class, added, 1, ID2SYM(node->nd_mid));
result = Qnil;
break;
case NODE_VALIAS:
- rb_alias_variable(node->u1.id, node->u2.id);
+ rb_alias_variable(node->nd_new, node->nd_old);
result = Qnil;
break;
case NODE_CLASS:
{
- VALUE super, klass, tmp, cbase;
- ID cname;
- int gen = Qfalse;
-
- cbase = class_prefix(self, node->nd_cpath);
- cname = node->nd_cpath->nd_mid;
+ VALUE super, klass, tmp;
- if (NIL_P(ruby_cbase)) {
+ if (NIL_P(ruby_class)) {
rb_raise(rb_eTypeError, "no outer class/module");
}
if (node->nd_super) {
- super = rb_eval(self, node->nd_super);
- rb_check_inheritable(super);
+ super = superclass(self, node->nd_super);
}
else {
super = 0;
}
- if (rb_const_defined_at(cbase, cname)) {
- klass = rb_const_get_at(cbase, cname);
+ klass = 0;
+ if ((ruby_class == rb_cObject) && rb_autoload_defined(node->nd_cname)) {
+ rb_autoload_load(node->nd_cname);
+ }
+ if (rb_const_defined_at(ruby_class, node->nd_cname)) {
+ klass = rb_const_get(ruby_class, node->nd_cname);
+ }
+ if (klass) {
if (TYPE(klass) != T_CLASS) {
rb_raise(rb_eTypeError, "%s is not a class",
- rb_id2name(cname));
+ rb_id2name(node->nd_cname));
}
if (super) {
- tmp = rb_class_real(RCLASS(klass)->super);
+ tmp = RCLASS(klass)->super;
+ if (FL_TEST(tmp, FL_SINGLETON)) {
+ tmp = RCLASS(tmp)->super;
+ }
+ while (TYPE(tmp) == T_ICLASS) {
+ tmp = RCLASS(tmp)->super;
+ }
if (tmp != super) {
- rb_raise(rb_eTypeError, "superclass mismatch for class %s",
- rb_id2name(cname));
+ super = tmp;
+ goto override_class;
}
- super = 0;
}
- if (ruby_safe_level >= 4) {
+ if (rb_safe_level() >= 4) {
rb_raise(rb_eSecurityError, "extending class prohibited");
}
+ rb_clear_cache();
}
else {
+ override_class:
if (!super) super = rb_cObject;
- klass = rb_define_class_id(cname, super);
- rb_set_class_path(klass, cbase, rb_id2name(cname));
- rb_const_set(cbase, cname, klass);
- gen = Qtrue;
+ klass = rb_define_class_id(node->nd_cname, super);
+ rb_const_set(ruby_class, node->nd_cname, klass);
+ rb_set_class_path(klass,ruby_class,rb_id2name(node->nd_cname));
}
if (ruby_wrapper) {
rb_extend_object(klass, ruby_wrapper);
rb_include_module(klass, ruby_wrapper);
}
- if (super && gen) {
- rb_class_inherited(super, klass);
- }
- result = module_setup(klass, node);
+
+ result = module_setup(klass, node->nd_body);
}
break;
case NODE_MODULE:
{
- VALUE module, cbase;
- ID cname;
+ VALUE module;
- if (NIL_P(ruby_cbase)) {
+ if (NIL_P(ruby_class)) {
rb_raise(rb_eTypeError, "no outer class/module");
}
- cbase = class_prefix(self, node->nd_cpath);
- cname = node->nd_cpath->nd_mid;
- if (rb_const_defined_at(cbase, cname)) {
- module = rb_const_get_at(cbase, cname);
+ module = 0;
+ if ((ruby_class == rb_cObject) && rb_autoload_defined(node->nd_cname)) {
+ rb_autoload_load(node->nd_cname);
+ }
+ if (rb_const_defined_at(ruby_class, node->nd_cname)) {
+ module = rb_const_get(ruby_class, node->nd_cname);
+ }
+ if (module) {
if (TYPE(module) != T_MODULE) {
rb_raise(rb_eTypeError, "%s is not a module",
- rb_id2name(cname));
+ rb_id2name(node->nd_cname));
}
- if (ruby_safe_level >= 4) {
+ if (rb_safe_level() >= 4) {
rb_raise(rb_eSecurityError, "extending module prohibited");
}
}
else {
- module = rb_define_module_id(cname);
- rb_set_class_path(module, cbase, rb_id2name(cname));
- rb_const_set(cbase, cname, module);
+ module = rb_define_module_id(node->nd_cname);
+ rb_const_set(ruby_class, node->nd_cname, module);
+ rb_set_class_path(module,ruby_class,rb_id2name(node->nd_cname));
}
if (ruby_wrapper) {
rb_extend_object(module, ruby_wrapper);
rb_include_module(module, ruby_wrapper);
}
- result = module_setup(module, node);
+ result = module_setup(module, node->nd_body);
}
break;
@@ -4103,21 +3139,24 @@ rb_eval(self, n)
{
VALUE klass;
- result = rb_eval(self, node->nd_recv);
- if (FIXNUM_P(result) || SYMBOL_P(result)) {
+ klass = rb_eval(self, node->nd_recv);
+ if (rb_special_const_p(klass)) {
rb_raise(rb_eTypeError, "no virtual class for %s",
- rb_obj_classname(result));
+ rb_class2name(CLASS_OF(klass)));
}
- if (ruby_safe_level >= 4 && !OBJ_TAINTED(result))
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(klass))
rb_raise(rb_eSecurityError, "Insecure: can't extend object");
- klass = rb_singleton_class(result);
-
+ if (FL_TEST(CLASS_OF(klass), FL_SINGLETON)) {
+ rb_clear_cache();
+ }
+ klass = rb_singleton_class(klass);
+
if (ruby_wrapper) {
rb_extend_object(klass, ruby_wrapper);
rb_include_module(klass, ruby_wrapper);
}
-
- result = module_setup(klass, node);
+
+ result = module_setup(klass, node->nd_body);
}
break;
@@ -4131,23 +3170,22 @@ rb_eval(self, n)
}
break;
- case NODE_NEWLINE:
- EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
- ruby_frame->last_func,
- ruby_frame->last_class);
+ case NODE_NEWLINE:
+ ruby_sourcefile = node->nd_file;
+ ruby_sourceline = node->nd_nth;
+ if (trace_func) {
+ call_trace_func("line", ruby_sourcefile, ruby_sourceline, self,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ }
node = node->nd_next;
goto again;
default:
- unknown_node(node);
+ rb_bug("unknown node type %d", nd_type(node));
}
finish:
CHECK_INTS;
- if (contnode) {
- node = contnode;
- contnode = 0;
- goto again;
- }
return result;
}
@@ -4156,17 +3194,20 @@ module_setup(module, n)
VALUE module;
NODE *n;
{
- NODE * volatile node = n->nd_body;
+ NODE * volatile node = n;
int state;
struct FRAME frame;
- VALUE result = Qnil; /* OK */
+ VALUE result; /* OK */
+ char *file = ruby_sourcefile;
+ int line = ruby_sourceline;
TMP_PROTECT;
frame = *ruby_frame;
frame.tmp = ruby_frame;
ruby_frame = &frame;
- PUSH_CLASS(module);
+ PUSH_CLASS();
+ ruby_class = module;
PUSH_SCOPE();
PUSH_VARS();
@@ -4183,11 +3224,15 @@ module_setup(module, n)
}
PUSH_CREF(module);
+ ruby_frame->cbase = (VALUE)ruby_cref;
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
- EXEC_EVENT_HOOK(RUBY_EVENT_CLASS, n, ruby_cbase,
- ruby_frame->last_func, ruby_frame->last_class);
- result = rb_eval(ruby_cbase, node->nd_next);
+ if (trace_func) {
+ call_trace_func("class", file, line, ruby_class,
+ ruby_frame->last_func,
+ ruby_frame->last_class);
+ }
+ result = rb_eval(ruby_class, node->nd_next);
}
POP_TAG();
POP_CREF();
@@ -4196,54 +3241,28 @@ module_setup(module, n)
POP_CLASS();
ruby_frame = frame.tmp;
- EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0,
- ruby_frame->last_func, ruby_frame->last_class);
+ if (trace_func) {
+ call_trace_func("end", file, line, 0,
+ ruby_frame->last_func, ruby_frame->last_class);
+ }
if (state) JUMP_TAG(state);
return result;
}
-static NODE *basic_respond_to = 0;
-
-int
-rb_obj_respond_to(obj, id, priv)
- VALUE obj;
- ID id;
- int priv;
-{
- VALUE klass = CLASS_OF(obj);
-
- if (rb_method_node(klass, respond_to) == basic_respond_to) {
- return rb_method_boundp(klass, id, !priv);
- }
- else {
- VALUE args[2];
- int n = 0;
- args[n++] = ID2SYM(id);
- if (priv) args[n++] = Qtrue;
- return rb_funcall2(obj, respond_to, n, args);
- }
-}
-
int
rb_respond_to(obj, id)
VALUE obj;
ID id;
{
- return rb_obj_respond_to(obj, id, Qfalse);
+ if (rb_method_boundp(CLASS_OF(obj), id, 0)) {
+ return Qtrue;
+ }
+ return Qfalse;
}
-/*
- * call-seq:
- * obj.respond_to?(symbol, include_private=false) => true or false
- *
- * Returns +true+> if _obj_ responds to the given
- * method. Private methods are included in the search only if the
- * optional second parameter evaluates to +true+.
- */
-
static VALUE
-obj_respond_to(argc, argv, obj)
+rb_obj_respond_to(argc, argv, obj)
int argc;
VALUE *argv;
VALUE obj;
@@ -4259,298 +3278,76 @@ obj_respond_to(argc, argv, obj)
return Qfalse;
}
-/*
- * call-seq:
- * mod.method_defined?(symbol) => true or false
- *
- * Returns +true+ if the named method is defined by
- * _mod_ (or its included modules and, if _mod_ is a class,
- * its ancestors). Public and protected methods are matched.
- *
- * module A
- * def method1() end
- * end
- * class B
- * def method2() end
- * end
- * class C < B
- * include A
- * def method3() end
- * end
- *
- * A.method_defined? :method1 #=> true
- * C.method_defined? "method1" #=> true
- * C.method_defined? "method2" #=> true
- * C.method_defined? "method3" #=> true
- * C.method_defined? "method4" #=> false
- */
-
static VALUE
rb_mod_method_defined(mod, mid)
VALUE mod, mid;
{
- return rb_method_boundp(mod, rb_to_id(mid), 1);
-}
-
-#define VISI_CHECK(x,f) (((x)&NOEX_MASK) == (f))
-
-/*
- * call-seq:
- * mod.public_method_defined?(symbol) => true or false
- *
- * Returns +true+ if the named public method is defined by
- * _mod_ (or its included modules and, if _mod_ is a class,
- * its ancestors).
- *
- * module A
- * def method1() end
- * end
- * class B
- * protected
- * def method2() end
- * end
- * class C < B
- * include A
- * def method3() end
- * end
- *
- * A.method_defined? :method1 #=> true
- * C.public_method_defined? "method1" #=> true
- * C.public_method_defined? "method2" #=> false
- * C.method_defined? "method2" #=> true
- */
-
-static VALUE
-rb_mod_public_method_defined(mod, mid)
- VALUE mod, mid;
-{
- ID id = rb_to_id(mid);
- int noex;
-
- if (rb_get_method_body(&mod, &id, &noex)) {
- if (VISI_CHECK(noex, NOEX_PUBLIC))
- return Qtrue;
- }
- return Qfalse;
-}
-
-/*
- * call-seq:
- * mod.private_method_defined?(symbol) => true or false
- *
- * Returns +true+ if the named private method is defined by
- * _ mod_ (or its included modules and, if _mod_ is a class,
- * its ancestors).
- *
- * module A
- * def method1() end
- * end
- * class B
- * private
- * def method2() end
- * end
- * class C < B
- * include A
- * def method3() end
- * end
- *
- * A.method_defined? :method1 #=> true
- * C.private_method_defined? "method1" #=> false
- * C.private_method_defined? "method2" #=> true
- * C.method_defined? "method2" #=> false
- */
-
-static VALUE
-rb_mod_private_method_defined(mod, mid)
- VALUE mod, mid;
-{
- ID id = rb_to_id(mid);
- int noex;
-
- if (rb_get_method_body(&mod, &id, &noex)) {
- if (VISI_CHECK(noex, NOEX_PRIVATE))
- return Qtrue;
- }
- return Qfalse;
-}
-
-/*
- * call-seq:
- * mod.protected_method_defined?(symbol) => true or false
- *
- * Returns +true+ if the named protected method is defined
- * by _mod_ (or its included modules and, if _mod_ is a
- * class, its ancestors).
- *
- * module A
- * def method1() end
- * end
- * class B
- * protected
- * def method2() end
- * end
- * class C < B
- * include A
- * def method3() end
- * end
- *
- * A.method_defined? :method1 #=> true
- * C.protected_method_defined? "method1" #=> false
- * C.protected_method_defined? "method2" #=> true
- * C.method_defined? "method2" #=> true
- */
-
-static VALUE
-rb_mod_protected_method_defined(mod, mid)
- VALUE mod, mid;
-{
- ID id = rb_to_id(mid);
- int noex;
-
- if (rb_get_method_body(&mod, &id, &noex)) {
- if (VISI_CHECK(noex, NOEX_PROTECTED))
- return Qtrue;
+ if (rb_method_boundp(mod, rb_to_id(mid), 1)) {
+ return Qtrue;
}
return Qfalse;
}
-NORETURN(static VALUE terminate_process _((int, VALUE)));
-static VALUE
-terminate_process(status, mesg)
- int status;
- VALUE mesg;
-{
- VALUE args[2];
- args[0] = INT2NUM(status);
- args[1] = mesg;
-
- rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
-}
-
void
rb_exit(status)
int status;
{
if (prot_tag) {
- terminate_process(status, rb_str_new("exit", 4));
+ VALUE exit;
+
+ exit_status = status;
+ exit = rb_exc_new(rb_eSystemExit, 0, 0);
+ rb_iv_set(exit, "status", INT2NUM(status));
+ rb_exc_raise(exit);
}
ruby_finalize();
exit(status);
}
-
-/*
- * call-seq:
- * exit(integer=0)
- * Kernel::exit(integer=0)
- * Process::exit(integer=0)
- *
- * Initiates the termination of the Ruby script by raising the
- * <code>SystemExit</code> exception. This exception may be caught. The
- * optional parameter is used to return a status code to the invoking
- * environment.
- *
- * begin
- * exit
- * puts "never get here"
- * rescue SystemExit
- * puts "rescued a SystemExit exception"
- * end
- * puts "after begin block"
- *
- * <em>produces:</em>
- *
- * rescued a SystemExit exception
- * after begin block
- *
- * Just prior to termination, Ruby executes any <code>at_exit</code> functions
- * (see Kernel::at_exit) and runs any object finalizers (see
- * ObjectSpace::define_finalizer).
- *
- * at_exit { puts "at_exit function" }
- * ObjectSpace.define_finalizer("string", proc { puts "in finalizer" })
- * exit
- *
- * <em>produces:</em>
- *
- * at_exit function
- * in finalizer
- */
-
-VALUE
-rb_f_exit(argc, argv)
+static VALUE
+rb_f_exit(argc, argv, obj)
int argc;
VALUE *argv;
+ VALUE obj;
{
VALUE status;
int istatus;
rb_secure(4);
if (rb_scan_args(argc, argv, "01", &status) == 1) {
- switch (status) {
- case Qtrue:
- istatus = EXIT_SUCCESS;
- break;
- case Qfalse:
- istatus = EXIT_FAILURE;
- break;
- default:
- istatus = NUM2INT(status);
-#if EXIT_SUCCESS != 0
- if (istatus == 0) istatus = EXIT_SUCCESS;
-#endif
- break;
- }
+ istatus = NUM2INT(status);
}
else {
- istatus = EXIT_SUCCESS;
+ istatus = 0;
}
rb_exit(istatus);
return Qnil; /* not reached */
}
-
-/*
- * call-seq:
- * abort
- * Kernel::abort
- * Process::abort
- *
- * Terminate execution immediately, effectively by calling
- * <code>Kernel.exit(1)</code>. If _msg_ is given, it is written
- * to STDERR prior to terminating.
- */
-
-VALUE
-rb_f_abort(argc, argv)
- int argc;
- VALUE *argv;
+static void
+rb_abort()
{
- rb_secure(4);
- if (argc == 0) {
- if (!NIL_P(ruby_errinfo)) {
- error_print();
- }
- rb_exit(EXIT_FAILURE);
+ if (!NIL_P(ruby_errinfo)) {
+ error_print();
}
- else {
- VALUE mesg;
+ rb_exit(1);
+}
- rb_scan_args(argc, argv, "1", &mesg);
- StringValue(mesg);
- rb_io_puts(1, &mesg, rb_stderr);
- terminate_process(EXIT_FAILURE, mesg);
- }
+static VALUE
+rb_f_abort()
+{
+ rb_secure(4);
+ rb_abort();
return Qnil; /* not reached */
}
void
rb_iter_break()
{
- break_jump(Qnil);
+ JUMP_TAG(TAG_BREAK);
}
-NORETURN(static void rb_longjmp _((int, VALUE)));
+static void rb_longjmp _((int, VALUE)) NORETURN;
static VALUE make_backtrace _((void));
static void
@@ -4560,16 +3357,11 @@ rb_longjmp(tag, mesg)
{
VALUE at;
- if (thread_set_raised()) {
- ruby_errinfo = exception_error;
- JUMP_TAG(TAG_FATAL);
- }
if (NIL_P(mesg)) mesg = ruby_errinfo;
if (NIL_P(mesg)) {
mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
}
- ruby_set_current_source();
if (ruby_sourcefile && !NIL_P(mesg)) {
at = get_backtrace(mesg);
if (NIL_P(at)) {
@@ -4583,30 +3375,15 @@ rb_longjmp(tag, mesg)
if (RTEST(ruby_debug) && !NIL_P(ruby_errinfo)
&& !rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
- VALUE e = ruby_errinfo;
- int status;
-
- PUSH_TAG(PROT_NONE);
- if ((status = EXEC_TAG()) == 0) {
- StringValue(e);
- warn_printf("Exception `%s' at %s:%d - %s\n",
- rb_obj_classname(ruby_errinfo),
- ruby_sourcefile, ruby_sourceline,
- RSTRING(e)->ptr);
- }
- POP_TAG();
- if (status == TAG_FATAL && ruby_errinfo == exception_error) {
- ruby_errinfo = mesg;
- }
- else if (status) {
- thread_reset_raised();
- JUMP_TAG(status);
- }
+ fprintf(stderr, "Exception `%s' at %s:%d - %s\n",
+ rb_class2name(CLASS_OF(ruby_errinfo)),
+ ruby_sourcefile, ruby_sourceline,
+ STR2CSTR(ruby_errinfo));
}
rb_trap_restore_mask();
- if (tag != TAG_FATAL) {
- EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
+ if (trace_func && tag != TAG_FATAL) {
+ call_trace_func("raise", ruby_sourcefile, ruby_sourceline,
ruby_frame->self,
ruby_frame->last_func,
ruby_frame->last_class);
@@ -4614,7 +3391,6 @@ rb_longjmp(tag, mesg)
if (!prot_tag) {
error_print();
}
- thread_reset_raised();
JUMP_TAG(tag);
}
@@ -4638,44 +3414,11 @@ rb_interrupt()
rb_raise(rb_eInterrupt, "");
}
-/*
- * call-seq:
- * raise
- * raise(string)
- * raise(exception [, string [, array]])
- * fail
- * fail(string)
- * fail(exception [, string [, array]])
- *
- * With no arguments, raises the exception in <code>$!</code> or raises
- * a <code>RuntimeError</code> if <code>$!</code> is +nil+.
- * With a single +String+ argument, raises a
- * +RuntimeError+ with the string as a message. Otherwise,
- * the first parameter should be the name of an +Exception+
- * class (or an object that returns an +Exception+ object when sent
- * an +exception+ message). The optional second parameter sets the
- * message associated with the exception, and the third parameter is an
- * array of callback information. Exceptions are caught by the
- * +rescue+ clause of <code>begin...end</code> blocks.
- *
- * raise "Failed to create socket"
- * raise ArgumentError, "No parameters", caller
- */
-
static VALUE
rb_f_raise(argc, argv)
int argc;
VALUE *argv;
{
- rb_raise_jump(rb_make_exception(argc, argv));
- return Qnil; /* not reached */
-}
-
-static VALUE
-rb_make_exception(argc, argv)
- int argc;
- VALUE *argv;
-{
VALUE mesg;
ID exception;
int n;
@@ -4705,23 +3448,15 @@ rb_make_exception(argc, argv)
mesg = rb_funcall(argv[0], exception, n, argv[1]);
break;
default:
- rb_raise(rb_eArgError, "wrong number of arguments");
+ rb_raise(rb_eArgError, "wrong # of arguments");
break;
}
if (argc > 0) {
if (!rb_obj_is_kind_of(mesg, rb_eException))
rb_raise(rb_eTypeError, "exception object expected");
- if (argc>2)
- set_backtrace(mesg, argv[2]);
+ set_backtrace(mesg, (argc>2)?argv[2]:Qnil);
}
- return mesg;
-}
-
-static void
-rb_raise_jump(mesg)
- VALUE mesg;
-{
if (ruby_frame != top_frame) {
PUSH_FRAME(); /* fake frame */
*ruby_frame = *_frame.prev->prev;
@@ -4729,6 +3464,8 @@ rb_raise_jump(mesg)
POP_FRAME();
}
rb_longjmp(TAG_RAISE, mesg);
+
+ return Qnil; /* not reached */
}
void
@@ -4741,8 +3478,7 @@ rb_jump_tag(tag)
int
rb_block_given_p()
{
- if (ruby_frame->iter == ITER_CUR && ruby_block)
- return Qtrue;
+ if (ruby_frame->iter) return Qtrue;
return Qfalse;
}
@@ -4752,187 +3488,38 @@ rb_iterator_p()
return rb_block_given_p();
}
-/*
- * call-seq:
- * block_given? => true or false
- * iterator? => true or false
- *
- * Returns <code>true</code> if <code>yield</code> would execute a
- * block in the current context. The <code>iterator?</code> form
- * is mildly deprecated.
- *
- * def try
- * if block_given?
- * yield
- * else
- * "no block"
- * end
- * end
- * try #=> "no block"
- * try { "hello" } #=> "hello"
- * try do "hello" end #=> "hello"
- */
-
-
static VALUE
rb_f_block_given_p()
{
- if (ruby_frame->prev && ruby_frame->prev->iter == ITER_CUR && ruby_block)
- return Qtrue;
+ if (ruby_frame->prev && ruby_frame->prev->iter) return Qtrue;
return Qfalse;
}
-VALUE rb_eThreadError;
-
-NORETURN(static void proc_jump_error(int, VALUE));
-static void
-proc_jump_error(state, result)
- int state;
- VALUE result;
-{
- char mesg[32];
- char *statement;
-
- switch (state) {
- case TAG_BREAK:
- statement = "break"; break;
- case TAG_RETURN:
- statement = "return"; break;
- case TAG_RETRY:
- statement = "retry"; break;
- default:
- statement = "local-jump"; break; /* should not happen */
- }
- snprintf(mesg, sizeof mesg, "%s from proc-closure", statement);
- localjump_error(mesg, result, state);
-}
-
-static void
-return_jump(retval)
- VALUE retval;
-{
- struct tag *tt = prot_tag;
- int yield = Qfalse;
-
- if (retval == Qundef) retval = Qnil;
- while (tt) {
- if (tt->tag == PROT_YIELD) {
- yield = Qtrue;
- tt = tt->prev;
- }
- if (tt->tag == PROT_FUNC && tt->frame->uniq == ruby_frame->uniq) {
- tt->dst = (VALUE)ruby_frame->uniq;
- tt->retval = retval;
- JUMP_TAG(TAG_RETURN);
- }
- if (tt->tag == PROT_LAMBDA && !yield) {
- tt->dst = (VALUE)tt->frame->uniq;
- tt->retval = retval;
- JUMP_TAG(TAG_RETURN);
- }
- if (tt->tag == PROT_THREAD) {
- rb_raise(rb_eThreadError, "return can't jump across threads");
- }
- tt = tt->prev;
- }
- localjump_error("unexpected return", retval, TAG_RETURN);
-}
-
-static void
-break_jump(retval)
- VALUE retval;
-{
- struct tag *tt = prot_tag;
-
- if (retval == Qundef) retval = Qnil;
- while (tt) {
- switch (tt->tag) {
- case PROT_THREAD:
- case PROT_YIELD:
- case PROT_LOOP:
- case PROT_LAMBDA:
- tt->dst = (VALUE)tt->frame->uniq;
- tt->retval = retval;
- JUMP_TAG(TAG_BREAK);
- break;
- case PROT_FUNC:
- tt = 0;
- continue;
- default:
- break;
- }
- tt = tt->prev;
- }
- localjump_error("unexpected break", retval, TAG_BREAK);
-}
-
-static void
-next_jump(retval)
- VALUE retval;
-{
- struct tag *tt = prot_tag;
-
- if (retval == Qundef) retval = Qnil;
- while (tt) {
- switch (tt->tag) {
- case PROT_THREAD:
- case PROT_YIELD:
- case PROT_LOOP:
- case PROT_LAMBDA:
- case PROT_FUNC:
- tt->dst = (VALUE)tt->frame->uniq;
- tt->retval = retval;
- JUMP_TAG(TAG_NEXT);
- break;
- default:
- break;
- }
- tt = tt->prev;
- }
- localjump_error("unexpected next", retval, TAG_NEXT);
-}
-
-void
-rb_need_block()
-{
- if (!rb_block_given_p()) {
- localjump_error("no block given", Qnil, 0);
- }
-}
-
static VALUE
-rb_yield_0(val, self, klass, flags, avalue)
+rb_yield_0(val, self, klass, acheck)
VALUE val, self, klass; /* OK */
- int flags, avalue;
+ int acheck;
{
NODE *node;
volatile VALUE result = Qnil;
- volatile VALUE old_cref;
- volatile VALUE old_wrapper;
- struct BLOCK * volatile block;
- struct SCOPE * volatile old_scope;
- int old_vmode;
+ struct BLOCK *block;
+ struct SCOPE *old_scope;
struct FRAME frame;
- NODE *cnode = ruby_current_node;
- int lambda = flags & YIELD_LAMBDA_CALL;
int state;
+ static unsigned serial = 1;
- rb_need_block();
+ if (!(rb_block_given_p() || rb_f_block_given_p()) || !ruby_block) {
+ rb_raise(rb_eLocalJumpError, "yield called out of block");
+ }
PUSH_VARS();
+ PUSH_CLASS();
block = ruby_block;
frame = block->frame;
frame.prev = ruby_frame;
- frame.node = cnode;
ruby_frame = &(frame);
- old_cref = (VALUE)ruby_cref;
- ruby_cref = block->cref;
- old_wrapper = ruby_wrapper;
- ruby_wrapper = block->wrapper;
old_scope = ruby_scope;
ruby_scope = block->scope;
- old_vmode = scope_vmode;
- scope_vmode = (flags & YIELD_PUBLIC_DEF) ? SCOPE_PUBLIC : block->vmode;
ruby_block = block->prev;
if (block->flags & BLOCK_D_SCOPE) {
/* put place holder for dynamic (in-block) local variables */
@@ -4942,87 +3529,53 @@ rb_yield_0(val, self, klass, flags, avalue)
/* FOR does not introduce new scope */
ruby_dyna_vars = block->dyna_vars;
}
- PUSH_CLASS(klass ? klass : block->klass);
- if (!klass) {
- self = block->self;
- }
+ ruby_class = klass?klass:block->klass;
+ if (!klass) self = block->self;
node = block->body;
if (block->var) {
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
- if (block->var == (NODE*)1) { /* no parameter || */
- if (lambda && RARRAY(val)->len != 0) {
- rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
- RARRAY(val)->len);
- }
- }
- else if (block->var == (NODE*)2) {
- if (TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
- rb_raise(rb_eArgError, "wrong number of arguments (%ld for 0)",
+ if (block->var == (NODE*)1) {
+ if (acheck && val != Qundef &&
+ TYPE(val) == T_ARRAY && RARRAY(val)->len != 0) {
+ rb_raise(rb_eArgError, "wrong # of arguments (%d for 0)",
RARRAY(val)->len);
}
}
- else if (nd_type(block->var) == NODE_MASGN) {
- if (!avalue) {
- val = svalue_to_mrhs(val, block->var->nd_head);
- }
- massign(self, block->var, val, lambda);
- }
else {
- int len = 0;
- if (avalue) {
- len = RARRAY(val)->len;
- if (len == 0) {
- goto zero_arg;
- }
- if (len == 1) {
+ if (nd_type(block->var) == NODE_MASGN)
+ massign(self, block->var, val, acheck);
+ else {
+ /* argument adjust for proc_call etc. */
+ if (acheck && val != Qundef &&
+ TYPE(val) == T_ARRAY && RARRAY(val)->len == 1) {
val = RARRAY(val)->ptr[0];
}
- else {
- goto multi_values;
- }
+ assign(self, block->var, val, acheck);
}
- else if (val == Qundef) {
- zero_arg:
- val = Qnil;
- multi_values:
- {
- ruby_current_node = block->var;
- rb_warn("multiple values for a block parameter (%d for 1)\n\tfrom %s:%d",
- len, cnode->nd_file, nd_line(cnode));
- ruby_current_node = cnode;
- }
- }
- assign(self, block->var, val, lambda);
}
}
POP_TAG();
if (state) goto pop_state;
}
- if (!node) {
- state = 0;
- goto pop_state;
+ else {
+ /* argument adjust for proc_call etc. */
+ if (acheck && val != Qundef &&
+ TYPE(val) == T_ARRAY && RARRAY(val)->len == 1) {
+ val = RARRAY(val)->ptr[0];
+ }
}
- ruby_current_node = node;
PUSH_ITER(block->iter);
- PUSH_TAG(lambda ? PROT_NONE : PROT_YIELD);
+ PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
redo:
- if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
- if (node->nd_state == YIELD_FUNC_AVALUE) {
- if (!avalue) {
- val = svalue_to_avalue(val);
- }
- }
- else {
- if (avalue) {
- val = avalue_to_svalue(val);
- }
- if (val == Qundef && node->nd_state != YIELD_FUNC_SVALUE)
- val = Qnil;
- }
+ if (!node) {
+ result = Qnil;
+ }
+ else if (nd_type(node) == NODE_CFUNC || nd_type(node) == NODE_IFUNC) {
+ if (val == Qundef) val = rb_ary_new2(0);
result = (*node->nd_cfnc)(val, node->nd_tval, self);
}
else {
@@ -5036,27 +3589,41 @@ rb_yield_0(val, self, klass, flags, avalue)
CHECK_INTS;
goto redo;
case TAG_NEXT:
- if (!lambda) {
- state = 0;
- result = prot_tag->retval;
- }
+ state = 0;
+ result = Qnil;
break;
case TAG_BREAK:
- if (TAG_DST()) {
- result = prot_tag->retval;
- }
- else {
- lambda = Qtrue; /* just pass TAG_BREAK */
- }
+ case TAG_RETURN:
+ state |= (serial++ << 8);
+ state |= 0x10;
+ block->tag->dst = state;
break;
default:
break;
}
}
POP_TAG();
- POP_ITER();
pop_state:
+ POP_ITER();
POP_CLASS();
+#if 0
+ if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
+ (!(ruby_scope->flags & SCOPE_DONT_RECYCLE) ||
+ !(block->tag->flags & BLOCK_DYNAMIC) ||
+ !FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE))) {
+ struct RVarmap *vars, *tmp;
+
+ if (ruby_dyna_vars->id == 0) {
+ vars = ruby_dyna_vars->next;
+ rb_gc_force_recycle((VALUE)ruby_dyna_vars);
+ while (vars && vars->id != 0) {
+ tmp = vars->next;
+ rb_gc_force_recycle((VALUE)vars);
+ vars = tmp;
+ }
+ }
+ }
+#else
if (ruby_dyna_vars && (block->flags & BLOCK_D_SCOPE) &&
!FL_TEST(ruby_dyna_vars, DVAR_DONT_RECYCLE)) {
struct RVarmap *vars = ruby_dyna_vars;
@@ -5064,45 +3631,31 @@ rb_yield_0(val, self, klass, flags, avalue)
if (ruby_dyna_vars->id == 0) {
vars = ruby_dyna_vars->next;
rb_gc_force_recycle((VALUE)ruby_dyna_vars);
- while (vars && vars->id != 0 && vars != block->dyna_vars) {
+ while (vars && vars->id != 0) {
struct RVarmap *tmp = vars->next;
rb_gc_force_recycle((VALUE)vars);
vars = tmp;
}
}
}
+#endif
POP_VARS();
ruby_block = block;
ruby_frame = ruby_frame->prev;
- ruby_cref = (NODE*)old_cref;
- ruby_wrapper = old_wrapper;
- if (ruby_scope->flags & SCOPE_DONT_RECYCLE)
- scope_dup(old_scope);
+ if (ruby_scope->flag & SCOPE_DONT_RECYCLE)
+ scope_dup(old_scope);
ruby_scope = old_scope;
- scope_vmode = old_vmode;
- switch (state) {
- case 0:
- break;
- case TAG_BREAK:
- if (!lambda) {
- struct tag *tt = prot_tag;
-
- while (tt) {
- if (tt->tag == PROT_LOOP && tt->blkid == ruby_block->uniq) {
- tt->dst = (VALUE)tt->frame->uniq;
- tt->retval = result;
- JUMP_TAG(TAG_BREAK);
- }
- tt = tt->prev;
+ if (state) {
+ if (!block->tag) {
+ switch (state & TAG_MASK) {
+ case TAG_BREAK:
+ case TAG_RETURN:
+ jump_tag_but_local_jump(state & TAG_MASK);
+ break;
}
- proc_jump_error(TAG_BREAK, result);
}
- /* fall through */
- default:
JUMP_TAG(state);
- break;
}
- ruby_current_node = cnode;
return result;
}
@@ -5110,109 +3663,70 @@ VALUE
rb_yield(val)
VALUE val;
{
- return rb_yield_0(val, 0, 0, 0, Qfalse);
-}
-
-VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_yield_values(int n, ...)
-#else
-rb_yield_values(n, va_alist)
- int n;
- va_dcl
-#endif
-{
- va_list args;
- VALUE ary;
-
- if (n == 0) {
- return rb_yield_0(Qundef, 0, 0, 0, Qfalse);
- }
- ary = rb_ary_new2(n);
- va_init_list(args, n);
- while (n--) {
- rb_ary_push(ary, va_arg(args, VALUE));
- }
- va_end(args);
- return rb_yield_0(ary, 0, 0, 0, Qtrue);
+ return rb_yield_0(val, 0, 0, 0);
}
-VALUE
-rb_yield_splat(values)
- VALUE values;
-{
- int avalue = Qfalse;
-
- if (TYPE(values) == T_ARRAY) {
- if (RARRAY(values)->len == 0) {
- values = Qundef;
- }
- else {
- avalue = Qtrue;
- }
- }
- return rb_yield_0(values, 0, 0, 0, avalue);
-}
-
-/*
- * call-seq:
- * loop {|| block }
- *
- * Repeatedly executes the block.
- *
- * loop do
- * print "Input: "
- * line = gets
- * break if !line or line =~ /^qQ/
- * # ...
- * end
- */
-
static VALUE
rb_f_loop()
{
for (;;) {
- rb_yield_0(Qundef, 0, 0, 0, Qfalse);
+ rb_yield_0(Qnil, 0, 0, 0);
CHECK_INTS;
}
return Qnil; /* dummy */
}
static VALUE
-massign(self, node, val, pcall)
+massign(self, node, val, check)
VALUE self;
NODE *node;
VALUE val;
- int pcall;
+ int check;
{
NODE *list;
- long i = 0, len;
+ int i = 0, len;
+ if (val == Qundef) {
+ val = rb_ary_new2(0);
+ }
+ else if (TYPE(val) != T_ARRAY) {
+ if (rb_respond_to(val, to_ary)) {
+ VALUE ary = rb_funcall(val, to_ary, 0);
+ if (TYPE(ary) != T_ARRAY) {
+ rb_raise(rb_eTypeError, "%s#to_ary should return Array",
+ rb_class2name(CLASS_OF(val)));
+ }
+ val = ary;
+ }
+ else {
+ val = rb_ary_new3(1, val);
+ }
+ }
len = RARRAY(val)->len;
list = node->nd_head;
- for (; list && i<len; i++) {
- assign(self, list->nd_head, RARRAY(val)->ptr[i], pcall);
+ for (i=0; list && i<len; i++) {
+ assign(self, list->nd_head, RARRAY(val)->ptr[i], check);
list = list->nd_next;
}
- if (pcall && list) goto arg_error;
+ if (check && list) goto arg_error;
if (node->nd_args) {
- if ((long)(node->nd_args) == -1) {
+ if (node->nd_args == (NODE*)-1) {
/* no check for mere `*' */
}
else if (!list && i<len) {
- assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), pcall);
+ assign(self, node->nd_args, rb_ary_new4(len-i, RARRAY(val)->ptr+i), check);
}
else {
- assign(self, node->nd_args, rb_ary_new2(0), pcall);
+ assign(self, node->nd_args, rb_ary_new2(0), check);
}
}
- else if (pcall && i < len) {
+ else if (check && i < len) {
goto arg_error;
}
while (list) {
i++;
- assign(self, list->nd_head, Qnil, pcall);
+ assign(self, list->nd_head, Qnil, check);
list = list->nd_next;
}
return val;
@@ -5222,21 +3736,17 @@ massign(self, node, val, pcall)
i++;
list = list->nd_next;
}
- rb_raise(rb_eArgError, "wrong number of arguments (%ld for %ld)", len, i);
+ rb_raise(rb_eArgError, "wrong # of arguments (%d for %d)", len, i);
}
static void
-assign(self, lhs, val, pcall)
+assign(self, lhs, val, check)
VALUE self;
NODE *lhs;
VALUE val;
- int pcall;
+ int check;
{
- ruby_current_node = lhs;
- if (val == Qundef) {
- rb_warning("assigning void value");
- val = Qnil;
- }
+ if (val == Qundef) val = Qnil;
switch (nd_type(lhs)) {
case NODE_GASGN:
rb_gvar_set(lhs->nd_entry, val);
@@ -5261,47 +3771,31 @@ assign(self, lhs, val, pcall)
break;
case NODE_CDECL:
- if (lhs->nd_vid == 0) {
- rb_const_set(class_prefix(self, lhs->nd_else), lhs->nd_else->nd_mid, val);
- }
- else {
- rb_const_set(ruby_cbase, lhs->nd_vid, val);
- }
+ rb_const_set(ruby_class, lhs->nd_vid, val);
break;
case NODE_CVDECL:
- if (RTEST(ruby_verbose) && FL_TEST(ruby_cbase, FL_SINGLETON)) {
- rb_warn("declaring singleton class variable");
+ if (!FL_TEST(ruby_cbase, FL_SINGLETON)) {
+ rb_cvar_declare(ruby_cbase, lhs->nd_vid, val);
+ break;
}
- rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qtrue);
- break;
-
+ self = rb_iv_get(ruby_cbase, "__attached__");
+ /* fall through */
case NODE_CVASGN:
- rb_cvar_set(cvar_cbase(), lhs->nd_vid, val, Qfalse);
+ rb_cvar_set(rb_cvar_singleton(self), lhs->nd_vid, val);
break;
case NODE_MASGN:
- massign(self, lhs, svalue_to_mrhs(val, lhs->nd_head), pcall);
+ massign(self, lhs, val, check);
break;
case NODE_CALL:
- case NODE_ATTRASGN:
{
VALUE recv;
- int scope;
- if (lhs->nd_recv == (NODE *)1) {
- recv = self;
- scope = 1;
- }
- else {
- recv = rb_eval(self, lhs->nd_recv);
- scope = 0;
- }
+ recv = rb_eval(self, lhs->nd_recv);
if (!lhs->nd_args) {
/* attr set */
- ruby_current_node = lhs;
- SET_CURRENT_SOURCE();
- rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, scope, self);
+ rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, 0);
}
else {
/* array set */
@@ -5309,10 +3803,8 @@ assign(self, lhs, val, pcall)
args = rb_eval(self, lhs->nd_args);
rb_ary_push(args, val);
- ruby_current_node = lhs;
- SET_CURRENT_SOURCE();
rb_call(CLASS_OF(recv), recv, lhs->nd_mid,
- RARRAY(args)->len, RARRAY(args)->ptr, scope, self);
+ RARRAY(args)->len, RARRAY(args)->ptr, 0);
}
}
break;
@@ -5325,7 +3817,7 @@ assign(self, lhs, val, pcall)
VALUE
rb_iterate(it_proc, data1, bl_proc, data2)
- VALUE (*it_proc) _((VALUE)), (*bl_proc)(ANYARGS);
+ VALUE (*it_proc)(), (*bl_proc)();
VALUE data1, data2;
{
int state;
@@ -5333,29 +3825,39 @@ rb_iterate(it_proc, data1, bl_proc, data2)
NODE *node = NEW_IFUNC(bl_proc, data2);
VALUE self = ruby_top_self;
- PUSH_TAG(PROT_LOOP);
- PUSH_BLOCK(0, node);
+ iter_retry:
PUSH_ITER(ITER_PRE);
+ PUSH_BLOCK(0, node);
+ PUSH_TAG(PROT_NONE);
+
state = EXEC_TAG();
if (state == 0) {
- iter_retry:
retval = (*it_proc)(data1);
}
- else if (state == TAG_BREAK && TAG_DST()) {
- retval = prot_tag->retval;
- state = 0;
- }
- else if (state == TAG_RETRY) {
- state = 0;
- goto iter_retry;
+ if (ruby_block->tag->dst == state) {
+ state &= TAG_MASK;
+ if (state == TAG_RETURN) {
+ retval = prot_tag->retval;
+ }
}
- POP_ITER();
- POP_BLOCK();
POP_TAG();
+ POP_BLOCK();
+ POP_ITER();
switch (state) {
case 0:
break;
+
+ case TAG_RETRY:
+ goto iter_retry;
+
+ case TAG_BREAK:
+ retval = Qnil;
+ break;
+
+ case TAG_RETURN:
+ return_value(retval);
+ /* fall through */
default:
JUMP_TAG(state);
}
@@ -5382,7 +3884,7 @@ handle_rescue(self, node)
if (!rb_obj_is_kind_of(argv[0], rb_cModule)) {
rb_raise(rb_eTypeError, "class or module required for rescue clause");
}
- if (RTEST(rb_funcall(*argv, eqq, 1, ruby_errinfo))) return 1;
+ if (rb_obj_is_kind_of(ruby_errinfo, argv[0])) return 1;
argv++;
}
return 0;
@@ -5390,10 +3892,10 @@ handle_rescue(self, node)
VALUE
#ifdef HAVE_STDARG_PROTOTYPES
-rb_rescue2(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*r_proc)(ANYARGS), VALUE data2, ...)
+rb_rescue2(VALUE (*b_proc)(), VALUE data1, VALUE (*r_proc)(), VALUE data2, ...)
#else
rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
- VALUE (*b_proc)(ANYARGS), (*r_proc)(ANYARGS);
+ VALUE (*b_proc)(), (*r_proc)();
VALUE data1, data2;
va_dcl
#endif
@@ -5401,23 +3903,17 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
int state;
volatile VALUE result;
volatile VALUE e_info = ruby_errinfo;
- volatile int handle = Qfalse;
- VALUE eclass;
va_list args;
PUSH_TAG(PROT_NONE);
- switch (state = EXEC_TAG()) {
- case TAG_RETRY:
- if (!handle) break;
- handle = Qfalse;
- state = 0;
- ruby_errinfo = Qnil;
- case 0:
+ if ((state = EXEC_TAG()) == 0) {
+ retry_entry:
result = (*b_proc)(data1);
- break;
- case TAG_RAISE:
- if (handle) break;
- handle = Qfalse;
+ }
+ else if (state == TAG_RAISE) {
+ int handle = Qfalse;
+ VALUE eclass;
+
va_init_list(args, data2);
while (eclass = va_arg(args, VALUE)) {
if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
@@ -5428,14 +3924,25 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
va_end(args);
if (handle) {
- state = 0;
if (r_proc) {
- result = (*r_proc)(data2, ruby_errinfo);
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ result = (*r_proc)(data2, ruby_errinfo);
+ }
+ POP_TAG();
+ if (state == TAG_RETRY) {
+ state = 0;
+ ruby_errinfo = Qnil;
+ goto retry_entry;
+ }
}
else {
result = Qnil;
+ state = 0;
+ }
+ if (state == 0) {
+ ruby_errinfo = e_info;
}
- ruby_errinfo = e_info;
}
}
POP_TAG();
@@ -5449,26 +3956,22 @@ rb_rescue(b_proc, data1, r_proc, data2)
VALUE (*b_proc)(), (*r_proc)();
VALUE data1, data2;
{
- return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
+ return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, 0);
}
-static VALUE cont_protect;
-
VALUE
rb_protect(proc, data, state)
- VALUE (*proc) _((VALUE));
+ VALUE (*proc)();
VALUE data;
int *state;
{
- VALUE result = Qnil; /* OK */
+ VALUE result; /* OK */
int status;
PUSH_TAG(PROT_NONE);
- cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0);
if ((status = EXEC_TAG()) == 0) {
result = (*proc)(data);
}
- cont_protect = ((NODE *)cont_protect)->u1.value;
POP_TAG();
if (state) {
*state = status;
@@ -5483,9 +3986,8 @@ rb_protect(proc, data, state)
VALUE
rb_ensure(b_proc, data1, e_proc, data2)
VALUE (*b_proc)();
- VALUE data1;
VALUE (*e_proc)();
- VALUE data2;
+ VALUE data1, data2;
{
int state;
volatile VALUE result = Qnil;
@@ -5497,10 +3999,9 @@ rb_ensure(b_proc, data1, e_proc, data2)
}
POP_TAG();
retval = prot_tag ? prot_tag->retval : Qnil; /* save retval */
- if (!thread_no_ensure()) {
(*e_proc)(data2);
- }
if (prot_tag) return_value(retval);
+
if (state) JUMP_TAG(state);
return result;
}
@@ -5510,176 +4011,163 @@ rb_with_disable_interrupt(proc, data)
VALUE (*proc)();
VALUE data;
{
- VALUE result = Qnil; /* OK */
+ VALUE result; /* OK */
int status;
DEFER_INTS;
- {
- int thr_critical = rb_thread_critical;
-
- rb_thread_critical = Qtrue;
- PUSH_TAG(PROT_NONE);
- if ((status = EXEC_TAG()) == 0) {
- result = (*proc)(data);
- }
- POP_TAG();
- rb_thread_critical = thr_critical;
+ PUSH_TAG(PROT_NONE);
+ if ((status = EXEC_TAG()) == 0) {
+ result = (*proc)(data);
}
- ENABLE_INTS;
+ POP_TAG();
+ ALLOW_INTS;
if (status) JUMP_TAG(status);
return result;
}
-static void
-stack_check()
-{
- static int overflowing = 0;
-
- if (!overflowing && ruby_stack_check()) {
- int state;
- overflowing = 1;
- PUSH_TAG(PROT_NONE);
- if ((state = EXEC_TAG()) == 0) {
- rb_exc_raise(sysstack_error);
- }
- POP_TAG();
- overflowing = 0;
- JUMP_TAG(state);
- }
-}
-
static int last_call_status;
#define CSTAT_PRIV 1
#define CSTAT_PROT 2
#define CSTAT_VCALL 4
-#define CSTAT_SUPER 8
-
-/*
- * call-seq:
- * obj.method_missing(symbol [, *args] ) => result
- *
- * Invoked by Ruby when <i>obj</i> is sent a message it cannot handle.
- * <i>symbol</i> is the symbol for the method called, and <i>args</i>
- * are any arguments that were passed to it. By default, the interpreter
- * raises an error when this method is called. However, it is possible
- * to override the method to provide more dynamic behavior.
- * The example below creates
- * a class <code>Roman</code>, which responds to methods with names
- * consisting of roman numerals, returning the corresponding integer
- * values.
- *
- * class Roman
- * def romanToInt(str)
- * # ...
- * end
- * def method_missing(methId)
- * str = methId.id2name
- * romanToInt(str)
- * end
- * end
- *
- * r = Roman.new
- * r.iv #=> 4
- * r.xxiii #=> 23
- * r.mm #=> 2000
- */
static VALUE
-rb_method_missing(argc, argv, obj)
+rb_f_missing(argc, argv, obj)
int argc;
VALUE *argv;
VALUE obj;
{
- ID id;
- VALUE exc = rb_eNoMethodError;
+ ID id;
+ volatile VALUE d = 0;
char *format = 0;
- NODE *cnode = ruby_current_node;
+ char *desc = "";
+ char *file = ruby_sourcefile;
+ int line = ruby_sourceline;
if (argc == 0 || !SYMBOL_P(argv[0])) {
rb_raise(rb_eArgError, "no id given");
}
- stack_check();
-
id = SYM2ID(argv[0]);
+ argc--; argv++;
- if (last_call_status & CSTAT_PRIV) {
- format = "private method `%s' called for %s";
- }
- else if (last_call_status & CSTAT_PROT) {
- format = "protected method `%s' called for %s";
- }
- else if (last_call_status & CSTAT_VCALL) {
- format = "undefined local variable or method `%s' for %s";
- exc = rb_eNameError;
- }
- else if (last_call_status & CSTAT_SUPER) {
- format = "super: no superclass method `%s'";
- }
- if (!format) {
- format = "undefined method `%s' for %s";
+ switch (TYPE(obj)) {
+ case T_NIL:
+ format = "undefined method `%s' for nil";
+ break;
+ case T_TRUE:
+ format = "undefined method `%s' for true";
+ break;
+ case T_FALSE:
+ format = "undefined method `%s' for false";
+ break;
+ case T_OBJECT:
+ d = rb_any_to_s(obj);
+ break;
+ default:
+ d = rb_inspect(obj);
+ break;
}
+ if (d) {
+ if (last_call_status & CSTAT_PRIV) {
+ format = "private method `%s' called for %s%s%s";
+ }
+ if (last_call_status & CSTAT_PROT) {
+ format = "protected method `%s' called for %s%s%s";
+ }
+ else if (last_call_status & CSTAT_VCALL) {
+ const char *mname = rb_id2name(id);
- ruby_current_node = cnode;
- {
- int n = 0;
- VALUE args[3];
-
- args[n++] = rb_funcall(rb_const_get(exc, rb_intern("message")), '!',
- 3, rb_str_new2(format), obj, argv[0]);
- args[n++] = argv[0];
- if (exc == rb_eNoMethodError) {
- args[n++] = rb_ary_new4(argc-1, argv+1);
+ if (('a' <= mname[0] && mname[0] <= 'z') || mname[0] == '_') {
+ format = "undefined local variable or method `%s' for %s%s%s";
+ }
+ }
+ if (!format) {
+ format = "undefined method `%s' for %s%s%s";
+ }
+ if (RSTRING(d)->len > 65) {
+ d = rb_any_to_s(obj);
}
- exc = rb_class_new_instance(n, args, exc);
- ruby_frame = ruby_frame->prev; /* pop frame for "method_missing" */
- rb_exc_raise(exc);
+ desc = RSTRING(d)->ptr;
}
+ ruby_sourcefile = file;
+ ruby_sourceline = line;
+ PUSH_FRAME(); /* fake frame */
+ *ruby_frame = *_frame.prev->prev;
+
+ rb_raise(rb_eNameError, format, rb_id2name(id),
+ desc, desc[0]=='#'?"":":",
+ desc[0]=='#'?"":rb_class2name(CLASS_OF(obj)));
+ POP_FRAME();
+
return Qnil; /* not reached */
}
static VALUE
-method_missing(obj, id, argc, argv, call_status)
+rb_undefined(obj, id, argc, argv, call_status)
VALUE obj;
ID id;
int argc;
- const VALUE *argv;
+ VALUE*argv;
int call_status;
{
VALUE *nargv;
- last_call_status = call_status;
+ nargv = ALLOCA_N(VALUE, argc+1);
+ nargv[0] = ID2SYM(id);
+ MEMCPY(nargv+1, argv, VALUE, argc);
- if (id == missing) {
- PUSH_FRAME();
- rb_method_missing(argc, argv, obj);
- POP_FRAME();
- }
- else if (id == ID_ALLOCATOR) {
- rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj));
- }
- if (argc < 0) {
- VALUE tmp;
+ last_call_status = call_status;
- argc = -argc-1;
- tmp = splat_value(argv[argc]);
- nargv = ALLOCA_N(VALUE, argc + RARRAY(tmp)->len + 1);
- MEMCPY(nargv+1, argv, VALUE, argc);
- MEMCPY(nargv+1+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
- argc += RARRAY(tmp)->len;
- }
- else {
- nargv = ALLOCA_N(VALUE, argc+1);
- MEMCPY(nargv+1, argv, VALUE, argc);
- }
- nargv[0] = ID2SYM(id);
return rb_funcall2(obj, missing, argc+1, nargv);
}
-static inline VALUE
+#ifdef DJGPP
+static int STACK_LEVEL_MAX = 65535;
+#else
+#ifdef __human68k__
+extern int _stacksize;
+# define STACK_LEVEL_MAX (_stacksize - 4096)
+#undef HAVE_GETRLIMIT
+#else
+#ifdef HAVE_GETRLIMIT
+static int STACK_LEVEL_MAX = 655300;
+#else
+# define STACK_LEVEL_MAX 655300
+#endif
+#endif
+#endif
+
+extern VALUE *rb_gc_stack_start;
+static int
+stack_length(p)
+ VALUE **p;
+{
+#ifdef C_ALLOCA
+ VALUE stack_end;
+ alloca(0);
+# define STACK_END (&stack_end)
+#else
+# if defined(__GNUC__) && (defined(__i386__) || defined(__m68k__))
+ VALUE *stack_end = __builtin_frame_address(0);
+# else
+ VALUE *stack_end = alloca(1);
+# endif
+# define STACK_END (stack_end)
+#endif
+ if (p) *p = STACK_END;
+
+#ifdef __sparc__
+ return rb_gc_stack_start - STACK_END + 0x80;
+#else
+ return (STACK_END < rb_gc_stack_start) ? rb_gc_stack_start - STACK_END
+ : STACK_END - rb_gc_stack_start;
+#endif
+}
+
+static VALUE
call_cfunc(func, recv, len, argc, argv)
VALUE (*func)();
VALUE recv;
@@ -5687,7 +4175,7 @@ call_cfunc(func, recv, len, argc, argv)
VALUE *argv;
{
if (len >= 0 && argc != len) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)",
argc, len);
}
@@ -5761,37 +4249,29 @@ call_cfunc(func, recv, len, argc, argv)
argv[11], argv[12], argv[13], argv[14]);
break;
default:
- rb_raise(rb_eArgError, "too many arguments (%d)", len);
+ rb_raise(rb_eArgError, "too many arguments(%d)", len);
break;
}
return Qnil; /* not reached */
}
static VALUE
-rb_call0(klass, recv, id, oid, argc, argv, body, flags)
+rb_call0(klass, recv, id, argc, argv, body, nosuper)
VALUE klass, recv;
ID id;
- ID oid;
int argc; /* OK */
VALUE *argv; /* OK */
- NODE * volatile body;
- int flags;
+ NODE *body; /* OK */
+ int nosuper;
{
NODE *b2; /* OK */
volatile VALUE result = Qnil;
int itr;
static int tick;
TMP_PROTECT;
- volatile int safe = -1;
- if (NOEX_SAFE(flags) > ruby_safe_level &&
- ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
- rb_raise(rb_eSecurityError, "calling insecure method: %s",
- rb_id2name(id));
- }
switch (ruby_iter->iter) {
case ITER_PRE:
- case ITER_PAS:
itr = ITER_CUR;
break;
case ITER_CUR:
@@ -5802,30 +4282,18 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
if ((++tick & 0xff) == 0) {
CHECK_INTS; /* better than nothing */
- stack_check();
- rb_gc_finalize_deferred();
- }
- if (argc < 0) {
- VALUE tmp;
- VALUE *nargv;
-
- argc = -argc-1;
- tmp = splat_value(argv[argc]);
- nargv = TMP_ALLOC(argc + RARRAY(tmp)->len);
- MEMCPY(nargv, argv, VALUE, argc);
- MEMCPY(nargv+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
- argc += RARRAY(tmp)->len;
- argv = nargv;
+ if (stack_length(0) > STACK_LEVEL_MAX) {
+ rb_raise(rb_eSysStackError, "stack level too deep");
+ }
}
PUSH_ITER(itr);
PUSH_FRAME();
ruby_frame->last_func = id;
- ruby_frame->orig_func = oid;
- ruby_frame->last_class = (flags & NOEX_NOSUPER)?0:klass;
+ ruby_frame->last_class = nosuper?0:klass;
ruby_frame->self = recv;
ruby_frame->argc = argc;
- ruby_frame->flags = 0;
+ ruby_frame->argv = argv;
switch (nd_type(body)) {
case NODE_CFUNC:
@@ -5833,22 +4301,25 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
int len = body->nd_argc;
if (len < -2) {
- rb_bug("bad argc (%d) specified for `%s(%s)'",
+ rb_bug("bad argc(%d) specified for `%s(%s)'",
len, rb_class2name(klass), rb_id2name(id));
}
- if (event_hooks) {
+ if (trace_func) {
int state;
+ char *file = ruby_frame->prev->file;
+ int line = ruby_frame->prev->line;
+ if (!file) {
+ file = ruby_sourcefile;
+ line = ruby_sourceline;
+ }
- EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node,
- recv, id, klass);
+ call_trace_func("c-call", 0, 0, recv, id, klass);
PUSH_TAG(PROT_FUNC);
if ((state = EXEC_TAG()) == 0) {
result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
}
POP_TAG();
- ruby_current_node = ruby_frame->node;
- EXEC_EVENT_HOOK(RUBY_EVENT_C_RETURN, ruby_current_node,
- recv, id, klass);
+ call_trace_func("c-return", 0, 0, recv, id, klass);
if (state) JUMP_TAG(state);
}
else {
@@ -5857,22 +4328,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
}
break;
+ /* for re-scoped/renamed method */
+ case NODE_ZSUPER:
/* for attr get/set */
- case NODE_IVAR:
- if (argc != 0) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
- }
- result = rb_attr_get(recv, body->nd_vid);
- break;
-
case NODE_ATTRSET:
- if (argc != 1)
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
- result = rb_ivar_set(recv, body->nd_vid, argv[0]);
- break;
-
- case NODE_ZSUPER:
- result = rb_call_super(argc, argv);
+ case NODE_IVAR:
+ result = rb_eval(recv, body);
break;
case NODE_DMETHOD:
@@ -5880,16 +4341,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
break;
case NODE_BMETHOD:
- ruby_frame->flags |= FRAME_DMETH;
- if (event_hooks) {
- struct BLOCK *data;
- Data_Get_Struct(body->nd_cval, struct BLOCK, data);
- EXEC_EVENT_HOOK(RUBY_EVENT_CALL, data->body, recv, id, klass);
- }
- result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass);
- if (event_hooks) {
- EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
- }
+ result = proc_call(body->nd_cval, rb_ary_new4(argc, argv));
break;
case NODE_SCOPE:
@@ -5899,11 +4351,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
NODE *saved_cref = 0;
PUSH_SCOPE();
+
if (body->nd_rval) {
saved_cref = ruby_cref;
ruby_cref = (NODE*)body->nd_rval;
+ ruby_frame->cbase = body->nd_rval;
}
- PUSH_CLASS(ruby_cbase);
if (body->nd_tbl) {
local_vars = TMP_ALLOC(body->nd_tbl[0]+1);
*local_vars++ = (VALUE)body;
@@ -5917,15 +4370,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
}
b2 = body = body->nd_next;
- if (NOEX_SAFE(flags) > ruby_safe_level) {
- safe = ruby_safe_level;
- ruby_safe_level = NOEX_SAFE(flags);
- }
PUSH_VARS();
PUSH_TAG(PROT_FUNC);
+
if ((state = EXEC_TAG()) == 0) {
NODE *node = 0;
- int i, nopt = 0;
+ int i;
if (nd_type(body) == NODE_ARGS) {
node = body;
@@ -5942,103 +4392,94 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
i = node->nd_cnt;
if (i > argc) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)",
argc, i);
}
- if (!node->nd_rest) {
+ if (node->nd_rest == -1) {
+ int opt = i;
NODE *optnode = node->nd_opt;
- nopt = i;
while (optnode) {
- nopt++;
+ opt++;
optnode = optnode->nd_next;
}
- if (nopt < argc) {
- rb_raise(rb_eArgError,
- "wrong number of arguments (%d for %d)",
- argc, nopt);
+ if (opt < argc) {
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for %d)",
+ argc, opt);
}
+ ruby_frame->argc = opt;
+ ruby_frame->argv = local_vars+2;
}
+
if (local_vars) {
if (i > 0) {
/* +2 for $_ and $~ */
MEMCPY(local_vars+2, argv, VALUE, i);
}
- }
- argv += i; argc -= i;
- if (node->nd_opt) {
- NODE *opt = node->nd_opt;
-
- while (opt && argc) {
- assign(recv, opt->nd_head, *argv, 1);
- argv++; argc--;
- ++i;
- opt = opt->nd_next;
- }
- if (opt) {
- rb_eval(recv, opt);
- while (opt) {
+ argv += i; argc -= i;
+ if (node->nd_opt) {
+ NODE *opt = node->nd_opt;
+
+ while (opt && argc) {
+ assign(recv, opt->nd_head, *argv, 1);
+ argv++; argc--;
opt = opt->nd_next;
- ++i;
}
+ rb_eval(recv, opt);
}
- }
- if (!node->nd_rest) {
- i = nopt;
- }
- else {
- VALUE v;
-
- if (argc > 0) {
- v = rb_ary_new4(argc,argv);
- i = -i - 1;
- }
- else {
- v = rb_ary_new2(0);
+ if (node->nd_rest >= 0) {
+ VALUE v;
+
+ if (argc > 0)
+ v = rb_ary_new4(argc,argv);
+ else
+ v = rb_ary_new2(0);
+ local_vars[node->nd_rest] = v;
}
- assign(recv, node->nd_rest, v, 1);
}
- ruby_frame->argc = i;
}
- if (event_hooks) {
- EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+
+ if (trace_func) {
+ call_trace_func("call", b2->nd_file, nd_line(b2),
+ recv, id, klass);
}
result = rb_eval(recv, body);
}
- else if (state == TAG_RETURN && TAG_DST()) {
+ else if (state == TAG_RETURN) {
result = prot_tag->retval;
state = 0;
}
POP_TAG();
- if (event_hooks) {
- EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
- }
POP_VARS();
- POP_CLASS();
POP_SCOPE();
ruby_cref = saved_cref;
- if (safe >= 0) ruby_safe_level = safe;
+ if (trace_func) {
+ char *file = ruby_frame->prev->file;
+ int line = ruby_frame->prev->line;
+ if (!file) {
+ file = ruby_sourcefile;
+ line = ruby_sourceline;
+ }
+ call_trace_func("return", file, line, recv, id, klass);
+ }
switch (state) {
case 0:
break;
- case TAG_BREAK:
- case TAG_RETURN:
- JUMP_TAG(state);
- break;
-
case TAG_RETRY:
- if (rb_block_given_p()) JUMP_TAG(state);
+ if (rb_block_given_p()) {
+ JUMP_TAG(state);
+ }
/* fall through */
default:
- jump_tag_but_local_jump(state, result);
+ jump_tag_but_local_jump(state);
break;
}
}
break;
default:
- unknown_node(body);
+ rb_bug("unknown node type %d", nd_type(body));
break;
}
POP_FRAME();
@@ -6047,13 +4488,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
}
static VALUE
-rb_call(klass, recv, mid, argc, argv, scope, self)
+rb_call(klass, recv, mid, argc, argv, scope)
VALUE klass, recv;
ID mid;
int argc; /* OK */
- const VALUE *argv; /* OK */
+ VALUE *argv; /* OK */
int scope;
- VALUE self;
{
NODE *body; /* OK */
int noex;
@@ -6061,14 +4501,13 @@ rb_call(klass, recv, mid, argc, argv, scope, self)
struct cache_entry *ent;
if (!klass) {
- rb_raise(rb_eNotImpError, "method `%s' called on terminated object (0x%lx)",
- rb_id2name(mid), recv);
+ rb_raise(rb_eNotImpError, "method call on terminated object");
}
/* is it in the method cache? */
ent = cache + EXPR1(klass, mid);
if (ent->mid == mid && ent->klass == klass) {
if (!ent->method)
- return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+ return rb_undefined(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
klass = ent->origin;
id = ent->mid0;
noex = ent->noex;
@@ -6076,30 +4515,28 @@ rb_call(klass, recv, mid, argc, argv, scope, self)
}
else if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
if (scope == 3) {
- return method_missing(recv, mid, argc, argv, CSTAT_SUPER);
+ rb_raise(rb_eNameError, "super: no superclass method `%s'",
+ rb_id2name(mid));
}
- return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
+ return rb_undefined(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
}
- if (mid != missing && scope == 0) {
+ if (mid != missing) {
/* receiver specified form for private method */
- if (noex & NOEX_PRIVATE)
- return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
+ if ((noex & NOEX_PRIVATE) && scope == 0)
+ return rb_undefined(recv, mid, argc, argv, CSTAT_PRIV);
- /* self must be kind of a specified form for protected method */
- if (noex & NOEX_PROTECTED) {
+ /* self must be kind of a specified form for private method */
+ if ((noex & NOEX_PROTECTED)) {
VALUE defined_class = klass;
-
- if (self == Qundef) self = ruby_frame->self;
- if (TYPE(defined_class) == T_ICLASS) {
+ while (TYPE(defined_class) == T_ICLASS)
defined_class = RBASIC(defined_class)->klass;
- }
- if (!rb_obj_is_kind_of(self, rb_class_real(defined_class)))
- return method_missing(recv, mid, argc, argv, CSTAT_PROT);
+ if (!rb_obj_is_kind_of(ruby_frame->self, defined_class))
+ return rb_undefined(recv, mid, argc, argv, CSTAT_PROT);
}
}
- return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
+ return rb_call0(klass, recv, id, argc, argv, body, noex & NOEX_UNDEF);
}
VALUE
@@ -6111,29 +4548,11 @@ rb_apply(recv, mid, args)
int argc;
VALUE *argv;
- argc = RARRAY(args)->len; /* Assigns LONG, but argc is INT */
+ argc = RARRAY(args)->len;
argv = ALLOCA_N(VALUE, argc);
MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);
- return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
-}
-
-/*
- * call-seq:
- * obj.send(symbol [, args...]) => obj
- * obj.__send__(symbol [, args...]) => obj
- *
- * Invokes the method identified by _symbol_, passing it any
- * arguments specified. You can use <code>\_\_send__</code> if the name
- * +send+ clashes with an existing method in _obj_.
- *
- * class Klass
- * def hello(*args)
- * "Hello " + args.join(' ')
- * end
- * end
- * k = Klass.new
- * k.send :hello, "gentle", "readers" #=> "Hello gentle readers"
- */
+ return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1);
+}
static VALUE
rb_f_send(argc, argv, recv)
@@ -6147,85 +4566,51 @@ rb_f_send(argc, argv, recv)
vid = *argv++; argc--;
PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
- vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1, Qundef);
+ vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1);
POP_ITER();
return vid;
}
-static VALUE
-vafuncall(recv, mid, n, ar)
- VALUE recv;
- ID mid;
- int n;
- va_list *ar;
-{
- VALUE *argv;
- if (n > 0) {
- long i;
-
- argv = ALLOCA_N(VALUE, n);
-
- for (i=0;i<n;i++) {
- argv[i] = va_arg(*ar, VALUE);
- }
- va_end(*ar);
- }
- else {
- argv = 0;
- }
-
- return rb_call(CLASS_OF(recv), recv, mid, n, argv, 1, Qundef);
-}
-
-VALUE
#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall(VALUE recv, ID mid, int n, ...)
+#include <stdarg.h>
+#define va_init_list(a,b) va_start(a,b)
#else
-rb_funcall(recv, mid, n, va_alist)
- VALUE recv;
- ID mid;
- int n;
- va_dcl
+#include <varargs.h>
+#define va_init_list(a,b) va_start(a)
#endif
-{
- va_list ar;
- va_init_list(ar, n);
-
- return vafuncall(recv, mid, n, &ar);
-}
VALUE
#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall_rescue(VALUE recv, ID mid, int n, ...)
+rb_funcall(VALUE recv, ID mid, int n, ...)
#else
-rb_funcall_rescue(recv, mid, n, va_alist)
+rb_funcall(recv, mid, n, va_alist)
VALUE recv;
ID mid;
int n;
va_dcl
#endif
{
- VALUE result = Qnil; /* OK */
- int status;
va_list ar;
+ VALUE *argv;
+
+ if (n > 0) {
+ int i;
- va_init_list(ar, n);
+ argv = ALLOCA_N(VALUE, n);
- PUSH_TAG(PROT_NONE);
- if ((status = EXEC_TAG()) == 0) {
- result = vafuncall(recv, mid, n, &ar);
+ va_init_list(ar, n);
+ for (i=0;i<n;i++) {
+ argv[i] = va_arg(ar, VALUE);
+ }
+ va_end(ar);
}
- POP_TAG();
- switch (status) {
- case 0:
- return result;
- case TAG_RAISE:
- return Qundef;
- default:
- JUMP_TAG(status);
+ else {
+ argv = 0;
}
+
+ return rb_call(CLASS_OF(recv), recv, mid, n, argv, 1);
}
VALUE
@@ -6233,9 +4618,9 @@ rb_funcall2(recv, mid, argc, argv)
VALUE recv;
ID mid;
int argc;
- const VALUE *argv;
+ VALUE *argv;
{
- return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1, Qundef);
+ return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 1);
}
VALUE
@@ -6243,31 +4628,27 @@ rb_funcall3(recv, mid, argc, argv)
VALUE recv;
ID mid;
int argc;
- const VALUE *argv;
+ VALUE *argv;
{
- return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0, Qundef);
+ return rb_call(CLASS_OF(recv), recv, mid, argc, argv, 0);
}
VALUE
rb_call_super(argc, argv)
int argc;
- const VALUE *argv;
+ VALUE *argv;
{
- VALUE result, self, klass;
-
- if (ruby_frame->last_class == 0) {
- rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
- rb_id2name(ruby_frame->orig_func));
- }
+ VALUE result;
- self = ruby_frame->self;
- klass = ruby_frame->last_class;
- if (RCLASS(klass)->super == 0) {
- return method_missing(self, ruby_frame->orig_func, argc, argv, CSTAT_SUPER);
+ if (ruby_frame->last_class == 0) {
+ rb_raise(rb_eNameError, "superclass method `%s' must be enabled by rb_enable_super()",
+ rb_id2name(ruby_frame->last_func));
}
- PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
- result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3, Qundef);
+ PUSH_ITER(ruby_iter->iter?ITER_PRE:ITER_NOT);
+ result = rb_call(RCLASS(ruby_frame->last_class)->super,
+ ruby_frame->self, ruby_frame->last_func,
+ argc, argv, 3);
POP_ITER();
return result;
@@ -6280,14 +4661,9 @@ backtrace(lev)
struct FRAME *frame = ruby_frame;
char buf[BUFSIZ];
VALUE ary;
- NODE *n;
ary = rb_ary_new();
- if (frame->last_func == ID_ALLOCATOR) {
- frame = frame->prev;
- }
if (lev < 0) {
- ruby_set_current_source();
if (frame->last_func) {
snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
ruby_sourcefile, ruby_sourceline,
@@ -6300,7 +4676,6 @@ backtrace(lev)
snprintf(buf, BUFSIZ, "%s:%d", ruby_sourcefile, ruby_sourceline);
}
rb_ary_push(ary, rb_str_new2(buf));
- if (lev < -1) return ary;
}
else {
while (lev-- > 0) {
@@ -6311,49 +4686,22 @@ backtrace(lev)
}
}
}
- for (; frame && (n = frame->node); frame = frame->prev) {
+ while (frame && frame->file) {
if (frame->prev && frame->prev->last_func) {
- if (frame->prev->node == n) {
- if (frame->prev->last_func == frame->last_func) continue;
- }
snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
- n->nd_file, nd_line(n),
+ frame->file, frame->line,
rb_id2name(frame->prev->last_func));
}
else {
- snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
+ snprintf(buf, BUFSIZ, "%s:%d", frame->file, frame->line);
}
rb_ary_push(ary, rb_str_new2(buf));
+ frame = frame->prev;
}
return ary;
}
-/*
- * call-seq:
- * caller(start=1) => array
- *
- * Returns the current execution stack---an array containing strings in
- * the form ``<em>file:line</em>'' or ``<em>file:line: in
- * `method'</em>''. The optional _start_ parameter
- * determines the number of initial stack entries to omit from the
- * result.
- *
- * def a(skip)
- * caller(skip)
- * end
- * def b(skip)
- * a(skip)
- * end
- * def c(skip)
- * b(skip)
- * end
- * c(0) #=> ["prog:2:in `a'", "prog:5:in `b'", "prog:8:in `c'", "prog:10"]
- * c(1) #=> ["prog:5:in `b'", "prog:8:in `c'", "prog:11"]
- * c(2) #=> ["prog:8:in `c'", "prog:12"]
- * c(3) #=> ["prog:13"]
- */
-
static VALUE
rb_f_caller(argc, argv)
int argc;
@@ -6366,7 +4714,7 @@ rb_f_caller(argc, argv)
if (NIL_P(level)) lev = 1;
else lev = NUM2INT(level);
- if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
+ if (lev < 0) rb_raise(rb_eArgError, "negative level(%d)", lev);
return backtrace(lev);
}
@@ -6374,7 +4722,7 @@ rb_f_caller(argc, argv)
void
rb_backtrace()
{
- long i;
+ int i;
VALUE ary;
ary = backtrace(-1);
@@ -6402,14 +4750,10 @@ compile(src, file, line)
int line;
{
NODE *node;
- int critical;
ruby_nerrs = 0;
- StringValue(src);
- critical = rb_thread_critical;
- rb_thread_critical = Qtrue;
+ Check_Type(src, T_STRING);
node = rb_compile_string(file, src, line);
- rb_thread_critical = critical;
if (ruby_nerrs == 0) return node;
return 0;
@@ -6421,24 +4765,27 @@ eval(self, src, scope, file, line)
char *file;
int line;
{
- struct BLOCK *data = NULL;
+ struct BLOCK *data;
volatile VALUE result = Qnil;
struct SCOPE * volatile old_scope;
struct BLOCK * volatile old_block;
struct RVarmap * volatile old_dyna_vars;
VALUE volatile old_cref;
int volatile old_vmode;
- volatile VALUE old_wrapper;
struct FRAME frame;
- NODE *nodesave = ruby_current_node;
+ char *filesave = ruby_sourcefile;
+ int linesave = ruby_sourceline;
volatile int iter = ruby_frame->iter;
- volatile int safe = ruby_safe_level;
int state;
+ if (file == 0) {
+ file = ruby_sourcefile;
+ line = ruby_sourceline;
+ }
if (!NIL_P(scope)) {
- if (!rb_obj_is_proc(scope)) {
+ if (!rb_obj_is_block(scope)) {
rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Binding)",
- rb_obj_classname(scope));
+ rb_class2name(CLASS_OF(scope)));
}
Data_Get_Struct(scope, struct BLOCK, data);
@@ -6455,14 +4802,7 @@ eval(self, src, scope, file, line)
old_vmode = scope_vmode;
scope_vmode = data->vmode;
old_cref = (VALUE)ruby_cref;
- ruby_cref = data->cref;
- old_wrapper = ruby_wrapper;
- ruby_wrapper = data->wrapper;
- if ((file == 0 || (line == 1 && strcmp(file, "(eval)") == 0)) && data->frame.node) {
- file = data->frame.node->nd_file;
- if (!file) file = "__builtin__";
- line = nd_line(data->frame.node);
- }
+ ruby_cref = (NODE*)ruby_frame->cbase;
self = data->self;
ruby_frame->iter = data->iter;
@@ -6472,12 +4812,9 @@ eval(self, src, scope, file, line)
ruby_frame->iter = ruby_frame->prev->iter;
}
}
- if (file == 0) {
- ruby_set_current_source();
- file = ruby_sourcefile;
- line = ruby_sourceline;
- }
- PUSH_CLASS(data ? data->klass : ruby_class);
+ PUSH_CLASS();
+ ruby_class = ruby_cbase;
+
ruby_in_eval++;
if (TYPE(ruby_class) == T_ICLASS) {
ruby_class = RBASIC(ruby_class)->klass;
@@ -6486,24 +4823,21 @@ eval(self, src, scope, file, line)
if ((state = EXEC_TAG()) == 0) {
NODE *node;
- ruby_safe_level = 0;
result = ruby_errinfo;
ruby_errinfo = Qnil;
node = compile(src, file, line);
- ruby_safe_level = safe;
if (ruby_nerrs > 0) {
compile_error(0);
}
if (!NIL_P(result)) ruby_errinfo = result;
- result = eval_node(self, node);
+ result = eval_node(self, node);
}
POP_TAG();
POP_CLASS();
ruby_in_eval--;
if (!NIL_P(scope)) {
- int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
+ int dont_recycle = ruby_scope->flag & SCOPE_DONT_RECYCLE;
- ruby_wrapper = old_wrapper;
ruby_cref = (NODE*)old_cref;
ruby_frame = frame.tmp;
ruby_scope = old_scope;
@@ -6512,37 +4846,47 @@ eval(self, src, scope, file, line)
data->vmode = scope_vmode; /* write back visibility mode */
scope_vmode = old_vmode;
if (dont_recycle) {
- struct tag *tag;
- struct RVarmap *vars;
-
- scope_dup(ruby_scope);
- for (tag=prot_tag; tag; tag=tag->prev) {
- scope_dup(tag->scope);
- }
- for (vars = ruby_dyna_vars; vars; vars = vars->next) {
- FL_SET(vars, DVAR_DONT_RECYCLE);
- }
+ struct tag *tag;
+ struct RVarmap *vars;
+
+ scope_dup(ruby_scope);
+ for (tag=prot_tag; tag; tag=tag->prev) {
+ scope_dup(tag->scope);
+ }
+ if (ruby_block) {
+ struct BLOCK *block = ruby_block;
+ while (block) {
+ block->tag->flags |= BLOCK_DYNAMIC;
+ block = block->prev;
+ }
+ }
+ for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+ FL_SET(vars, DVAR_DONT_RECYCLE);
+ }
}
}
else {
ruby_frame->iter = iter;
}
- ruby_current_node = nodesave;
- ruby_set_current_source();
+ ruby_sourcefile = filesave;
+ ruby_sourceline = linesave;
if (state) {
if (state == TAG_RAISE) {
+ VALUE err;
+ VALUE errat;
+
if (strcmp(file, "(eval)") == 0) {
- VALUE mesg, errat;
-
- errat = get_backtrace(ruby_errinfo);
- mesg = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
- if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) {
- if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
- rb_str_update(mesg, 0, 0, rb_str_new2(": "));
- rb_str_update(mesg, 0, 0, RARRAY(errat)->ptr[0]);
- }
- RARRAY(errat)->ptr[0] = RARRAY(backtrace(-2))->ptr[0];
+ if (ruby_sourceline > 1) {
+ errat = get_backtrace(ruby_errinfo);
+ err = RARRAY(errat)->ptr[0];
+ rb_str_cat2(err, ": ");
+ rb_str_append(err, ruby_errinfo);
}
+ else {
+ err = rb_str_dup(ruby_errinfo);
+ }
+ errat = Qnil;
+ rb_exc_raise(rb_exc_new3(CLASS_OF(ruby_errinfo), err));
}
rb_exc_raise(ruby_errinfo);
}
@@ -6552,25 +4896,6 @@ eval(self, src, scope, file, line)
return result;
}
-/*
- * call-seq:
- * eval(string [, binding [, filename [,lineno]]]) => obj
- *
- * Evaluates the Ruby expression(s) in <em>string</em>. If
- * <em>binding</em> is given, the evaluation is performed in its
- * context. The binding may be a <code>Binding</code> object or a
- * <code>Proc</code> object. If the optional <em>filename</em> and
- * <em>lineno</em> parameters are present, they will be used when
- * reporting syntax errors.
- *
- * def getBinding(str)
- * return binding
- * end
- * str = "hello"
- * eval "str + ' Fred'" #=> "hello Fred"
- * eval "str + ' Fred'", getBinding("bye") #=> "bye Fred"
- */
-
static VALUE
rb_f_eval(argc, argv, self)
int argc;
@@ -6582,23 +4907,20 @@ rb_f_eval(argc, argv, self)
int line = 1;
rb_scan_args(argc, argv, "13", &src, &scope, &vfile, &vline);
- if (ruby_safe_level >= 4) {
- StringValue(src);
- if (!NIL_P(scope) && !OBJ_TAINTED(scope)) {
- rb_raise(rb_eSecurityError, "Insecure: can't modify trusted binding");
- }
- }
- else {
- SafeStringValue(src);
- }
if (argc >= 3) {
- StringValue(vfile);
+ Check_Type(vfile, T_STRING);
+ file = RSTRING(vfile)->ptr;
}
if (argc >= 4) {
line = NUM2INT(vline);
}
- if (!NIL_P(vfile)) file = RSTRING(vfile)->ptr;
+ if (ruby_safe_level >= 4) {
+ Check_Type(src, T_STRING);
+ }
+ else {
+ Check_SafeStr(src);
+ }
if (NIL_P(scope) && ruby_frame->prev) {
struct FRAME *prev;
VALUE val;
@@ -6617,26 +4939,26 @@ rb_f_eval(argc, argv, self)
/* function to call func under the specified class/module context */
static VALUE
-exec_under(func, under, cbase, args)
+exec_under(func, under, args)
VALUE (*func)();
- VALUE under, cbase;
+ VALUE under;
void *args;
{
- VALUE val = Qnil; /* OK */
+ VALUE val; /* OK */
int state;
int mode;
- struct FRAME *f = ruby_frame;
- PUSH_CLASS(under);
+ PUSH_CLASS();
+ ruby_class = under;
PUSH_FRAME();
- ruby_frame->self = f->self;
- ruby_frame->last_func = f->last_func;
- ruby_frame->orig_func = f->orig_func;
- ruby_frame->last_class = f->last_class;
- ruby_frame->argc = f->argc;
- if (cbase) {
- PUSH_CREF(cbase);
+ ruby_frame->last_func = _frame.prev->last_func;
+ ruby_frame->last_class = _frame.prev->last_class;
+ ruby_frame->argc = _frame.prev->argc;
+ ruby_frame->argv = _frame.prev->argv;
+ if (ruby_cbase != under) {
+ ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,under,0,ruby_frame->cbase);
}
+ PUSH_CREF(under);
mode = scope_vmode;
SCOPE_SET(SCOPE_PUBLIC);
@@ -6645,7 +4967,7 @@ exec_under(func, under, cbase, args)
val = (*func)(args);
}
POP_TAG();
- if (cbase) POP_CREF();
+ POP_CREF();
SCOPE_SET(mode);
POP_FRAME();
POP_CLASS();
@@ -6658,11 +4980,6 @@ static VALUE
eval_under_i(args)
VALUE *args;
{
- struct FRAME *f = ruby_frame;
-
- if (f && (f = f->prev) && (f = f->prev)) {
- ruby_frame = f;
- }
return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]);
}
@@ -6676,23 +4993,49 @@ eval_under(under, self, src, file, line)
VALUE args[4];
if (ruby_safe_level >= 4) {
- StringValue(src);
+ Check_Type(src, T_STRING);
}
else {
- SafeStringValue(src);
+ Check_SafeStr(src);
}
args[0] = self;
args[1] = src;
args[2] = (VALUE)file;
args[3] = (VALUE)line;
- return exec_under(eval_under_i, under, under, args);
+ return exec_under(eval_under_i, under, args);
}
static VALUE
yield_under_i(self)
VALUE self;
{
- return rb_yield_0(self, self, ruby_class, YIELD_PUBLIC_DEF, Qfalse);
+ if (ruby_block->flags & BLOCK_DYNAMIC) {
+ struct BLOCK * volatile old_block = ruby_block;
+ struct BLOCK block;
+
+ /* cbase should be pointed from volatile local variable */
+ /* to be protected from GC. */
+ VALUE result;
+ int state;
+
+ block = *ruby_block;
+ /* copy the block to avoid modifying global data. */
+ block.frame.cbase = ruby_frame->cbase;
+ ruby_block = &block;
+
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ result = rb_yield_0(self, self, ruby_class, 0);
+ }
+ POP_TAG();
+ ruby_block = old_block;
+ if (state) JUMP_TAG(state);
+
+ return result;
+ }
+ /* static block, no need to restore */
+ ruby_block->frame.cbase = ruby_frame->cbase;
+ return rb_yield_0(self, self, ruby_class, 0);
}
/* block eval under the class/module context */
@@ -6700,7 +5043,7 @@ static VALUE
yield_under(under, self)
VALUE under, self;
{
- return exec_under(yield_under_i, under, 0, self);
+ return exec_under(yield_under_i, under, self);
}
static VALUE
@@ -6711,7 +5054,7 @@ specific_eval(argc, argv, klass, self)
{
if (rb_block_given_p()) {
if (argc > 0) {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+ rb_raise(rb_eArgError, "wrong # of arguments (%d for 0)", argc);
}
return yield_under(klass, self);
}
@@ -6724,48 +5067,23 @@ specific_eval(argc, argv, klass, self)
}
else {
if (ruby_safe_level >= 4) {
- StringValue(argv[0]);
+ Check_Type(argv[0], T_STRING);
}
else {
- SafeStringValue(argv[0]);
+ Check_SafeStr(argv[0]);
}
if (argc > 3) {
- rb_raise(rb_eArgError, "wrong number of arguments: %s(src) or %s{..}",
+ rb_raise(rb_eArgError, "wrong # of arguments: %s(src) or %s{..}",
rb_id2name(ruby_frame->last_func),
rb_id2name(ruby_frame->last_func));
}
+ if (argc > 1) file = STR2CSTR(argv[1]);
if (argc > 2) line = NUM2INT(argv[2]);
- if (argc > 1) {
- file = StringValuePtr(argv[1]);
- }
}
return eval_under(klass, self, argv[0], file, line);
}
}
-/*
- * call-seq:
- * obj.instance_eval(string [, filename [, lineno]] ) => obj
- * obj.instance_eval {| | block } => obj
- *
- * Evaluates a string containing Ruby source code, or the given block,
- * within the context of the receiver (_obj_). In order to set the
- * context, the variable +self+ is set to _obj_ while
- * the code is executing, giving the code access to _obj_'s
- * instance variables. In the version of <code>instance_eval</code>
- * that takes a +String+, the optional second and third
- * parameters supply a filename and starting line number that are used
- * when reporting compilation errors.
- *
- * class Klass
- * def initialize
- * @secret = 99
- * end
- * end
- * k = Klass.new
- * k.instance_eval { @secret } #=> 99
- */
-
VALUE
rb_obj_instance_eval(argc, argv, self)
int argc;
@@ -6774,40 +5092,17 @@ rb_obj_instance_eval(argc, argv, self)
{
VALUE klass;
- if (SPECIAL_CONST_P(self)) {
+ if (rb_special_const_p(self)) {
klass = Qnil;
}
else {
klass = rb_singleton_class(self);
}
+
return specific_eval(argc, argv, klass, self);
}
-/*
- * call-seq:
- * mod.class_eval(string [, filename [, lineno]]) => obj
- * mod.module_eval {|| block } => obj
- *
- * Evaluates the string or block in the context of _mod_. This can
- * be used to add methods to a class. <code>module_eval</code> returns
- * the result of evaluating its argument. The optional _filename_
- * and _lineno_ parameters set the text for error messages.
- *
- * class Thing
- * end
- * a = %q{def hello() "Hello there!" end}
- * Thing.module_eval(a)
- * puts Thing.new.hello()
- * Thing.module_eval("invalid code", "dummy", 123)
- *
- * <em>produces:</em>
- *
- * Hello there!
- * dummy:123:in `module_eval': undefined local variable
- * or method `code' for Thing:Class
- */
-
-VALUE
+static VALUE
rb_mod_module_eval(argc, argv, mod)
int argc;
VALUE *argv;
@@ -6818,39 +5113,35 @@ rb_mod_module_eval(argc, argv, mod)
VALUE rb_load_path;
-NORETURN(static void load_failed _((VALUE)));
-
void
rb_load(fname, wrap)
VALUE fname;
int wrap;
{
- VALUE tmp;
int state;
- volatile int prohibit_int = rb_prohibit_interrupt;
+ char *file;
volatile ID last_func;
- volatile VALUE wrapper = ruby_wrapper;
+ volatile VALUE wrapper = 0;
volatile VALUE self = ruby_top_self;
- NODE *volatile last_node;
NODE *saved_cref = ruby_cref;
+ TMP_PROTECT;
- if (wrap && ruby_safe_level >= 4) {
- StringValue(fname);
+ if (wrap) {
+ Check_Type(fname, T_STRING);
}
else {
- SafeStringValue(fname);
+ Check_SafeStr(fname);
}
- fname = rb_str_new4(fname);
- tmp = rb_find_file(fname);
- if (!tmp) {
- load_failed(fname);
+ file = rb_find_file(RSTRING(fname)->ptr);
+ if (!file) {
+ rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);
}
- fname = tmp;
ruby_errinfo = Qnil; /* ensure */
PUSH_VARS();
- PUSH_CLASS(ruby_wrapper);
- ruby_cref = ruby_top_cref;
+ PUSH_CLASS();
+ wrapper = ruby_wrapper;
+ ruby_cref = top_cref;
if (!wrap) {
rb_secure(4); /* should alter global state */
ruby_class = rb_cObject;
@@ -6860,56 +5151,53 @@ rb_load(fname, wrap)
/* load in anonymous module as toplevel */
ruby_class = ruby_wrapper = rb_module_new();
self = rb_obj_clone(ruby_top_self);
- rb_extend_object(self, ruby_wrapper);
+ rb_extend_object(self, ruby_class);
PUSH_CREF(ruby_wrapper);
}
- PUSH_ITER(ITER_NOT);
PUSH_FRAME();
ruby_frame->last_func = 0;
ruby_frame->last_class = 0;
ruby_frame->self = self;
+ ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,ruby_class,0,0);
PUSH_SCOPE();
+ if (ruby_class == rb_cObject && top_scope->local_tbl) {
+ int len = top_scope->local_tbl[0]+1;
+ ID *tbl = ALLOC_N(ID, len);
+ VALUE *vars = TMP_ALLOC(len);
+ *vars++ = 0;
+ MEMCPY(tbl, top_scope->local_tbl, ID, len);
+ MEMCPY(vars, top_scope->local_vars, VALUE, len-1);
+ ruby_scope->local_tbl = tbl; /* copy toplevel scope */
+ ruby_scope->local_vars = vars; /* will not alter toplevel variables */
+ }
/* default visibility is private at loading toplevel */
SCOPE_SET(SCOPE_PRIVATE);
+
PUSH_TAG(PROT_NONE);
state = EXEC_TAG();
last_func = ruby_frame->last_func;
- last_node = ruby_current_node;
- if (!ruby_current_node && ruby_sourcefile) {
- last_node = NEW_NEWLINE(0);
- }
- ruby_current_node = 0;
if (state == 0) {
NODE *node;
- volatile int critical;
DEFER_INTS;
ruby_in_eval++;
- critical = rb_thread_critical;
- rb_thread_critical = Qtrue;
- rb_load_file(RSTRING(fname)->ptr);
+ rb_load_file(file);
ruby_in_eval--;
node = ruby_eval_tree;
- rb_thread_critical = critical;
ALLOW_INTS;
if (ruby_nerrs == 0) {
eval_node(self, node);
}
}
ruby_frame->last_func = last_func;
- ruby_current_node = last_node;
- ruby_sourcefile = 0;
- ruby_set_current_source();
- if (ruby_scope->flags == SCOPE_ALLOCA && ruby_class == rb_cObject) {
+ if (ruby_scope->flag == SCOPE_ALLOCA && ruby_class == rb_cObject) {
if (ruby_scope->local_tbl) /* toplevel was empty */
free(ruby_scope->local_tbl);
}
POP_TAG();
- rb_prohibit_interrupt = prohibit_int;
ruby_cref = saved_cref;
POP_SCOPE();
POP_FRAME();
- POP_ITER();
POP_CLASS();
POP_VARS();
ruby_wrapper = wrapper;
@@ -6917,7 +5205,7 @@ rb_load(fname, wrap)
ruby_nerrs = 0;
rb_exc_raise(ruby_errinfo);
}
- if (state) jump_tag_but_local_jump(state, Qundef);
+ if (state) jump_tag_but_local_jump(state);
if (!NIL_P(ruby_errinfo)) /* exception during load */
rb_exc_raise(ruby_errinfo);
}
@@ -6938,21 +5226,6 @@ rb_load_protect(fname, wrap, state)
if (state) *state = status;
}
-/*
- * call-seq:
- * load(filename, wrap=false) => true
- *
- * Loads and executes the Ruby
- * program in the file _filename_. If the filename does not
- * resolve to an absolute path, the file is searched for in the library
- * directories listed in <code>$:</code>. If the optional _wrap_
- * parameter is +true+, the loaded script will be executed
- * under an anonymous module, protecting the calling program's global
- * namespace. In no circumstance will any local variables in the loaded
- * file be propagated to the loading environment.
- */
-
-
static VALUE
rb_f_load(argc, argv)
int argc;
@@ -6969,353 +5242,217 @@ VALUE ruby_dln_librefs;
static VALUE rb_features;
static st_table *loading_tbl;
-#define IS_SOEXT(e) (strcmp(e, ".so") == 0 || strcmp(e, ".o") == 0)
-#ifdef DLEXT2
-#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0 || strcmp(e, DLEXT2) == 0)
-#else
-#define IS_DLEXT(e) (strcmp(e, DLEXT) == 0)
-#endif
-
-
-static const char *const loadable_ext[] = {
- ".rb", DLEXT,
-#ifdef DLEXT2
- DLEXT2,
-#endif
- 0
-};
-
-static int rb_feature_p _((const char *, const char *, int));
-static int search_required _((VALUE, VALUE *, VALUE *));
-
static int
-rb_feature_p(feature, ext, rb)
- const char *feature, *ext;
- int rb;
+rb_feature_p(feature, wait)
+ const char *feature;
+ int wait;
{
- VALUE v;
- const char *f, *e;
- long i, len, elen;
+ VALUE *p, *pend;
+ char *f;
+ int len;
- if (ext) {
- len = ext - feature;
- elen = strlen(ext);
- }
- else {
- len = strlen(feature);
- elen = 0;
- }
- for (i = 0; i < RARRAY_LEN(rb_features); ++i) {
- v = RARRAY_PTR(rb_features)[i];
- f = StringValuePtr(v);
- if (RSTRING_LEN(v) < len || strncmp(f, feature, len) != 0)
- continue;
- if (!*(e = f + len)) {
- if (ext) continue;
- return 'u';
- }
- if (*e != '.') continue;
- if ((!rb || !ext) && (IS_SOEXT(e) || IS_DLEXT(e))) {
- return 's';
+ p = RARRAY(rb_features)->ptr;
+ pend = p + RARRAY(rb_features)->len;
+ while (p < pend) {
+ f = STR2CSTR(*p);
+ if (strcmp(f, feature) == 0) {
+ goto load_wait;
}
- if ((rb || !ext) && (strcmp(e, ".rb") == 0)) {
- return 'r';
+ len = strlen(feature);
+ if (strncmp(f, feature, len) == 0) {
+ if (strcmp(f+len, ".so") == 0) {
+ return Qtrue;
+ }
+ if (strcmp(f+len, ".rb") == 0) {
+ if (wait) goto load_wait;
+ return Qtrue;
+ }
}
+ p++;
}
+ return Qfalse;
+
+ load_wait:
if (loading_tbl) {
- if (st_lookup(loading_tbl, (st_data_t)feature, 0)) {
- if (!ext) return 'u';
- return strcmp(ext, ".rb") ? 's' : 'r';
- }
- else {
- char *buf;
-
- if (ext && *ext) return 0;
- buf = ALLOCA_N(char, len + DLEXT_MAXLEN + 1);
- MEMCPY(buf, feature, char, len);
- for (i = 0; (e = loadable_ext[i]) != 0; i++) {
- strncpy(buf + len, e, DLEXT_MAXLEN + 1);
- if (st_lookup(loading_tbl, (st_data_t)buf, 0)) {
- return i ? 's' : 'r';
+ char *ext = strrchr(f, '.');
+ if (ext && strcmp(ext, ".rb") == 0) {
+ rb_thread_t th;
+
+ while (st_lookup(loading_tbl, f, &th)) {
+ if (th == curr_thread) {
+ return Qtrue;
}
+ CHECK_INTS;
+ rb_thread_schedule();
}
}
}
- return 0;
+ return Qtrue;
}
int
rb_provided(feature)
const char *feature;
{
- const char *ext = strrchr(feature, '.');
-
- if (ext && !strchr(ext, '/')) {
- if (strcmp(".rb", ext) == 0) {
- if (rb_feature_p(feature, ext, Qtrue)) return Qtrue;
- return Qfalse;
- }
- else if (IS_SOEXT(ext) || IS_DLEXT(ext)) {
- if (rb_feature_p(feature, ext, Qfalse)) return Qtrue;
- return Qfalse;
- }
- }
- if (rb_feature_p(feature, feature + strlen(feature), Qtrue))
- return Qtrue;
-
- return Qfalse;
-}
-
-static void
-rb_provide_feature(feature)
- VALUE feature;
-{
- rb_ary_push(rb_features, feature);
+ return rb_feature_p(feature, Qfalse);
}
void
rb_provide(feature)
const char *feature;
{
- rb_provide_feature(rb_str_new2(feature));
-}
+ char *buf, *ext;
-static char *
-load_lock(ftptr)
- const char *ftptr;
-{
- st_data_t th;
-
- if (!loading_tbl ||
- !st_lookup(loading_tbl, (st_data_t)ftptr, &th))
- {
- /* loading ruby library should be serialized. */
- if (!loading_tbl) {
- loading_tbl = st_init_strtable();
- }
- /* partial state */
- ftptr = ruby_strdup(ftptr);
- st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
- return (char *)ftptr;
+ ext = strrchr(feature, '.');
+ if (ext && (strcmp(DLEXT, ext) == 0
+#ifdef DLEXT2
+ || strcmp(DLEXT2, ext) == 0
+#endif
+ )) {
+ buf = ALLOCA_N(char, strlen(feature)+4);
+ strcpy(buf, feature);
+ ext = strrchr(buf, '.');
+ strcpy(ext, ".so");
+ feature = buf;
}
- do {
- if ((rb_thread_t)th == curr_thread) return 0;
- CHECK_INTS;
- } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
- return 0;
+ if (rb_feature_p(feature, Qtrue)) return;
+ rb_ary_push(rb_features, rb_str_new2(feature));
}
-static void
-load_unlock(const char *ftptr)
-{
- if (ftptr) {
- st_data_t key = (st_data_t)ftptr;
-
- if (st_delete(loading_tbl, &key, 0)) {
- free((char *)key);
- }
- }
-}
-
-/*
- * call-seq:
- * require(string) => true or false
- *
- * Ruby tries to load the library named _string_, returning
- * +true+ if successful. If the filename does not resolve to
- * an absolute path, it will be searched for in the directories listed
- * in <code>$:</code>. If the file has the extension ``.rb'', it is
- * loaded as a source file; if the extension is ``.so'', ``.o'', or
- * ``.dll'', or whatever the default shared library extension is on
- * the current platform, Ruby loads the shared library as a Ruby
- * extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on
- * to the name. The name of the loaded feature is added to the array in
- * <code>$"</code>. A feature will not be loaded if it's name already
- * appears in <code>$"</code>. However, the file name is not converted
- * to an absolute path, so that ``<code>require 'a';require
- * './a'</code>'' will load <code>a.rb</code> twice.
- *
- * require "my-library.rb"
- * require "db-driver"
- */
-
VALUE
rb_f_require(obj, fname)
VALUE obj, fname;
{
- return rb_require_safe(fname, ruby_safe_level);
-}
-
-static int
-search_required(fname, featurep, path)
- VALUE fname, *featurep, *path;
-{
- VALUE tmp;
- char *ext, *ftptr;
- int type;
+ char *ext, *file, *feature, *buf; /* OK */
+ volatile VALUE load;
+ int state;
+ volatile int safe = ruby_safe_level;
- *featurep = fname;
- *path = 0;
- ext = strrchr(ftptr = RSTRING_PTR(fname), '.');
- if (ext && !strchr(ext, '/')) {
+ Check_SafeStr(fname);
+ if (rb_feature_p(RSTRING(fname)->ptr, Qtrue))
+ return Qfalse;
+ ext = strrchr(RSTRING(fname)->ptr, '.');
+ if (ext) {
+ feature = file = RSTRING(fname)->ptr;
if (strcmp(".rb", ext) == 0) {
- if (rb_feature_p(ftptr, ext, Qtrue)) return 'r';
- if ((*path = rb_find_file(fname)) != 0) return 'r';
- return 0;
- }
- else if (IS_SOEXT(ext)) {
- if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
- tmp = rb_str_new(RSTRING_PTR(fname), ext-RSTRING_PTR(fname));
- *featurep = tmp;
+ file = rb_find_file(file);
+ if (file) goto load_rb;
+ }
+ else if (strcmp(".so", ext) == 0 || strcmp(".o", ext) == 0) {
+ if (strcmp(ext, DLEXT) != 0) {
+ buf = ALLOCA_N(char, strlen(file)+sizeof(DLEXT)+4);
+ strcpy(buf, feature);
+ ext = strrchr(buf, '.');
+ strcpy(ext, DLEXT);
+ file = feature = buf;
+ }
+ file = rb_find_file(file);
+ if (file) goto load_dyna;
#ifdef DLEXT2
- OBJ_FREEZE(tmp);
- if (rb_find_file_ext(&tmp, loadable_ext+1)) {
- *featurep = tmp;
- *path = rb_find_file(tmp);
- return 's';
- }
-#else
- rb_str_cat2(tmp, DLEXT);
- OBJ_FREEZE(tmp);
- if (*path = rb_find_file(tmp)) {
- return 's';
- }
+ file = feature = RSTRING(fname)->ptr;
+ if (strcmp(ext, DLEXT2) != 0) {
+ buf = ALLOCA_N(char, strlen(file)+sizeof(DLEXT2)+4);
+ strcpy(buf, feature);
+ ext = strrchr(buf, '.');
+ strcpy(ext, DLEXT2);
+ file = feature = buf;
+ }
+ file = rb_find_file(file);
+ if (file) goto load_dyna;
#endif
}
- else if (IS_DLEXT(ext)) {
- if (rb_feature_p(ftptr, ext, Qfalse)) return 's';
- if ((*path = rb_find_file(fname)) != 0) return 's';
+ else if (strcmp(DLEXT, ext) == 0) {
+ feature = RSTRING(fname)->ptr;
+ file = rb_find_file(feature);
+ if (file) goto load_dyna;
}
+#ifdef DLEXT2
+ else if (strcmp(DLEXT2, ext) == 0) {
+ feature = RSTRING(fname)->ptr;
+ file = rb_find_file(feature);
+ if (file) goto load_dyna;
+ }
+#endif
}
- tmp = fname;
- type = rb_find_file_ext(&tmp, loadable_ext);
- *featurep = tmp;
- switch (type) {
- case 0:
- ftptr = RSTRING_PTR(tmp);
- return rb_feature_p(ftptr, 0, Qfalse);
-
- default:
- ext = strrchr(ftptr = RSTRING(tmp)->ptr, '.');
- if (rb_feature_p(ftptr, ext, !--type)) break;
- *path = rb_find_file(tmp);
+ buf = ALLOCA_N(char, strlen(RSTRING(fname)->ptr) + 5);
+ strcpy(buf, RSTRING(fname)->ptr);
+ strcat(buf, ".rb");
+ if (rb_find_file(buf)) {
+ fname = rb_str_new2(buf);
+ feature = buf;
+ goto load_rb;
+ }
+ strcpy(buf, RSTRING(fname)->ptr);
+ strcat(buf, DLEXT);
+ file = rb_find_file(buf);
+ if (file) {
+ feature = buf;
+ goto load_dyna;
}
- return type ? 's' : 'r';
-}
+#ifdef DLEXT2
+ strcpy(buf, RSTRING(fname)->ptr);
+ strcat(buf, DLEXT2);
+ file = rb_find_file(buf);
+ if (file) {
+ feature = buf;
+ goto load_dyna;
+ }
+#endif
+ rb_raise(rb_eLoadError, "No such file to load -- %s",
+ RSTRING(fname)->ptr);
-static void
-load_failed(fname)
- VALUE fname;
-{
- rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
-}
+ load_dyna:
+ rb_provide(feature);
-VALUE
-rb_require_safe(fname, safe)
- VALUE fname;
- int safe;
-{
- VALUE result = Qnil;
- volatile VALUE errinfo = ruby_errinfo;
- int state;
- struct {
- NODE *node;
- ID func;
- int vmode, safe;
- } volatile saved;
- char *volatile ftptr = 0;
-
- if (OBJ_TAINTED(fname)) {
- rb_check_safe_obj(fname);
- }
- StringValue(fname);
- fname = rb_str_new4(fname);
- saved.vmode = scope_vmode;
- saved.node = ruby_current_node;
- saved.func = ruby_frame->last_func;
- saved.safe = ruby_safe_level;
PUSH_TAG(PROT_NONE);
if ((state = EXEC_TAG()) == 0) {
- VALUE feature, path;
- long handle;
- int found;
-
- ruby_safe_level = safe;
- found = search_required(fname, &feature, &path);
- if (found) {
- if (!path || !(ftptr = load_lock(RSTRING_PTR(feature)))) {
- result = Qfalse;
- }
- else {
- ruby_safe_level = 0;
- switch (found) {
- case 'r':
- rb_load(path, 0);
- break;
+ void *handle;
- case 's':
- ruby_current_node = 0;
- ruby_sourcefile = rb_source_filename(RSTRING(path)->ptr);
- ruby_sourceline = 0;
- ruby_frame->last_func = 0;
- SCOPE_SET(SCOPE_PUBLIC);
- handle = (long)dln_load(RSTRING(path)->ptr);
- rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
- break;
- }
- rb_provide_feature(feature);
- result = Qtrue;
- }
- }
+ load = rb_str_new2(file);
+ file = RSTRING(load)->ptr;
+ handle = dln_load(file);
+ rb_ary_push(ruby_dln_librefs, INT2NUM((long)handle));
}
POP_TAG();
- ruby_current_node = saved.node;
- ruby_set_current_source();
- ruby_frame->last_func = saved.func;
- SCOPE_SET(saved.vmode);
- ruby_safe_level = saved.safe;
- load_unlock(ftptr);
if (state) JUMP_TAG(state);
- if (NIL_P(result)) {
- load_failed(fname);
+
+ return Qtrue;
+
+ load_rb:
+ ruby_safe_level = 0;
+ rb_provide(feature);
+ /* loading ruby library should be serialized. */
+ if (!loading_tbl) {
+ loading_tbl = st_init_strtable();
}
- ruby_errinfo = errinfo;
+ /* partial state */
+ st_insert(loading_tbl, strdup(feature), curr_thread);
- return result;
+ PUSH_TAG(PROT_NONE);
+ if ((state = EXEC_TAG()) == 0) {
+ rb_load(fname, 0);
+ }
+ POP_TAG();
+ st_delete(loading_tbl, &feature, 0); /* loading done */
+ free(feature);
+ ruby_safe_level = safe;
+ if (state) JUMP_TAG(state);
+
+ return Qtrue;
}
VALUE
rb_require(fname)
const char *fname;
{
- VALUE fn = rb_str_new2(fname);
- OBJ_FREEZE(fn);
- return rb_require_safe(fn, ruby_safe_level);
-}
-
-void
-ruby_init_ext(name, init)
- const char *name;
- void (*init) _((void));
-{
- ruby_current_node = 0;
- ruby_sourcefile = rb_source_filename(name);
- ruby_sourceline = 0;
- ruby_frame->last_func = 0;
- ruby_frame->orig_func = 0;
- SCOPE_SET(SCOPE_PUBLIC);
- if (load_lock(name)) {
- (*init)();
- rb_provide(name);
- load_unlock(name);
- }
+ return rb_f_require(Qnil, rb_str_new2(fname));
}
static void
secure_visibility(self)
VALUE self;
{
- if (ruby_safe_level >= 4 && !OBJ_TAINTED(self)) {
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(self)) {
rb_raise(rb_eSecurityError, "Insecure: can't change method visibility");
}
}
@@ -7333,19 +5470,8 @@ set_method_visibility(self, argc, argv, ex)
for (i=0; i<argc; i++) {
rb_export_method(self, rb_to_id(argv[i]), ex);
}
- rb_clear_cache_by_class(self);
}
-/*
- * call-seq:
- * public => self
- * public(symbol, ...) => self
- *
- * With no arguments, sets the default visibility for subsequently
- * defined methods to public. With arguments, sets the named methods to
- * have public visibility.
- */
-
static VALUE
rb_mod_public(argc, argv, module)
int argc;
@@ -7362,16 +5488,6 @@ rb_mod_public(argc, argv, module)
return module;
}
-/*
- * call-seq:
- * protected => self
- * protected(symbol, ...) => self
- *
- * With no arguments, sets the default visibility for subsequently
- * defined methods to protected. With arguments, sets the named methods
- * to have protected visibility.
- */
-
static VALUE
rb_mod_protected(argc, argv, module)
int argc;
@@ -7388,25 +5504,6 @@ rb_mod_protected(argc, argv, module)
return module;
}
-/*
- * call-seq:
- * private => self
- * private(symbol, ...) => self
- *
- * With no arguments, sets the default visibility for subsequently
- * defined methods to private. With arguments, sets the named methods
- * to have private visibility.
- *
- * module Mod
- * def a() end
- * def b() end
- * private
- * def c() end
- * private :a
- * end
- * Mod.private_instance_methods #=> ["a", "c"]
- */
-
static VALUE
rb_mod_private(argc, argv, module)
int argc;
@@ -7423,13 +5520,6 @@ rb_mod_private(argc, argv, module)
return module;
}
-/*
- * call-seq:
- * mod.public_class_method(symbol, ...) => mod
- *
- * Makes a list of existing class methods public.
- */
-
static VALUE
rb_mod_public_method(argc, argv, obj)
int argc;
@@ -7440,22 +5530,6 @@ rb_mod_public_method(argc, argv, obj)
return obj;
}
-/*
- * call-seq:
- * mod.private_class_method(symbol, ...) => mod
- *
- * Makes existing class methods private. Often used to hide the default
- * constructor <code>new</code>.
- *
- * class SimpleSingleton # Not thread safe
- * private_class_method :new
- * def SimpleSingleton.create(*args, &block)
- * @me = new(*args, &block) if ! @me
- * @me
- * end
- * end
- */
-
static VALUE
rb_mod_private_method(argc, argv, obj)
int argc;
@@ -7466,16 +5540,6 @@ rb_mod_private_method(argc, argv, obj)
return obj;
}
-/*
- * call-seq:
- * public
- * public(symbol, ...)
- *
- * With no arguments, sets the default visibility for subsequently
- * defined methods to public. With arguments, sets the named methods to
- * have public visibility.
- */
-
static VALUE
top_public(argc, argv)
int argc;
@@ -7492,42 +5556,6 @@ top_private(argc, argv)
return rb_mod_private(argc, argv, rb_cObject);
}
-/*
- * call-seq:
- * module_function(symbol, ...) => self
- *
- * Creates module functions for the named methods. These functions may
- * be called with the module as a receiver, and also become available
- * as instance methods to classes that mix in the module. Module
- * functions are copies of the original, and so may be changed
- * independently. The instance-method versions are made private. If
- * used with no arguments, subsequently defined methods become module
- * functions.
- *
- * module Mod
- * def one
- * "This is one"
- * end
- * module_function :one
- * end
- * class Cls
- * include Mod
- * def callOne
- * one
- * end
- * end
- * Mod.one #=> "This is one"
- * c = Cls.new
- * c.callOne #=> "This is one"
- * module Mod
- * def one
- * "This is the new one"
- * end
- * end
- * Mod.one #=> "This is one"
- * c.callOne #=> "This is the new one"
- */
-
static VALUE
rb_mod_modfunc(argc, argv, module)
int argc;
@@ -7550,40 +5578,18 @@ rb_mod_modfunc(argc, argv, module)
set_method_visibility(module, argc, argv, NOEX_PRIVATE);
for (i=0; i<argc; i++) {
- VALUE m = module;
-
id = rb_to_id(argv[i]);
- for (;;) {
- body = search_method(m, id, &m);
- if (body == 0) {
- body = search_method(rb_cObject, id, &m);
- }
- if (body == 0 || body->nd_body == 0) {
- rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
- }
- if (nd_type(body->nd_body) != NODE_ZSUPER) {
- break; /* normal case: need not to follow 'super' link */
- }
- m = RCLASS(m)->super;
- if (!m) break;
+ body = search_method(module, id, 0);
+ if (body == 0 || body->nd_body == 0) {
+ rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
}
rb_add_method(rb_singleton_class(module), id, body->nd_body, NOEX_PUBLIC);
+ rb_clear_cache_by_id(id);
+ rb_funcall(module, singleton_added, 1, ID2SYM(id));
}
return module;
}
-/*
- * call-seq:
- * append_features(mod) => mod
- *
- * When this module is included in another, Ruby calls
- * <code>append_features</code> in this module, passing it the
- * receiving module in _mod_. Ruby's default implementation is
- * to add 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#include</code>.
- */
-
static VALUE
rb_mod_append_features(module, include)
VALUE module, include;
@@ -7601,13 +5607,6 @@ rb_mod_append_features(module, include)
return module;
}
-/*
- * call-seq:
- * include(module, ...) => self
- *
- * Invokes <code>Module.append_features</code> on each parameter in turn.
- */
-
static VALUE
rb_mod_include(argc, argv, module)
int argc;
@@ -7616,10 +5615,9 @@ rb_mod_include(argc, argv, module)
{
int i;
- for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
- while (argc--) {
- rb_funcall(argv[argc], rb_intern("append_features"), 1, module);
- rb_funcall(argv[argc], rb_intern("included"), 1, module);
+ for (i=0; i<argc; i++) {
+ Check_Type(argv[i], T_MODULE);
+ rb_funcall(argv[i], rb_intern("append_features"), 1, module);
}
return module;
}
@@ -7635,6 +5633,32 @@ rb_obj_call_init(obj, argc, argv)
POP_ITER();
}
+VALUE
+rb_class_new_instance(argc, argv, klass)
+ int argc;
+ VALUE *argv;
+ VALUE klass;
+{
+ VALUE obj;
+
+ if (FL_TEST(klass, FL_SINGLETON)) {
+ rb_raise(rb_eTypeError, "can't create instance of virtual class");
+ }
+ obj = rb_obj_alloc(klass);
+ rb_obj_call_init(obj, argc, argv);
+
+ return obj;
+}
+
+static VALUE
+top_include(argc, argv)
+ int argc;
+ VALUE *argv;
+{
+ rb_secure(4);
+ return rb_mod_include(argc, argv, rb_cObject);
+}
+
void
rb_extend_object(obj, module)
VALUE obj, module;
@@ -7642,33 +5666,6 @@ rb_extend_object(obj, module)
rb_include_module(rb_singleton_class(obj), module);
}
-/*
- * call-seq:
- * extend_object(obj) => obj
- *
- * Extends the specified object by adding this module's constants and
- * methods (which are added as singleton methods). This is the callback
- * method used by <code>Object#extend</code>.
- *
- * module Picky
- * def Picky.extend_object(o)
- * if String === o
- * puts "Can't add Picky to a String"
- * else
- * puts "Picky added to #{o.class}"
- * super
- * end
- * end
- * end
- * (s = Array.new).extend Picky # Call Object.extend
- * (s = "quick brown fox").extend Picky
- *
- * <em>produces:</em>
- *
- * Picky added to Array
- * Can't add Picky to a String
- */
-
static VALUE
rb_mod_extend_object(mod, obj)
VALUE mod, obj;
@@ -7677,31 +5674,6 @@ rb_mod_extend_object(mod, obj)
return obj;
}
-/*
- * call-seq:
- * obj.extend(module, ...) => obj
- *
- * Adds to _obj_ the instance methods from each module given as a
- * parameter.
- *
- * module Mod
- * def hello
- * "Hello from Mod.\n"
- * end
- * end
- *
- * class Klass
- * def hello
- * "Hello from Klass.\n"
- * end
- * end
- *
- * k = Klass.new
- * k.hello #=> "Hello from Klass.\n"
- * k.extend(Mod) #=> #<Klass:0x401b3bc8>
- * k.hello #=> "Hello from Mod.\n"
- */
-
static VALUE
rb_obj_extend(argc, argv, obj)
int argc;
@@ -7711,39 +5683,15 @@ rb_obj_extend(argc, argv, obj)
int i;
if (argc == 0) {
- rb_raise(rb_eArgError, "wrong number of arguments (0 for 1)");
+ rb_raise(rb_eArgError, "wrong # of arguments(0 for 1)");
}
for (i=0; i<argc; i++) Check_Type(argv[i], T_MODULE);
- while (argc--) {
- rb_funcall(argv[argc], rb_intern("extend_object"), 1, obj);
- rb_funcall(argv[argc], rb_intern("extended"), 1, obj);
+ for (i=0; i<argc; i++) {
+ rb_funcall(argv[i], rb_intern("extend_object"), 1, obj);
}
return obj;
}
-/*
- * call-seq:
- * include(module, ...) => self
- *
- * Invokes <code>Module.append_features</code>
- * on each parameter in turn. Effectively adds the methods and constants
- * in each module to the receiver.
- */
-
-static VALUE
-top_include(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-{
- rb_secure(4);
- if (ruby_wrapper) {
- rb_warning("main#include in the wrapped load is effective only in wrapper module");
- return rb_mod_include(argc, argv, ruby_wrapper);
- }
- return rb_mod_include(argc, argv, rb_cObject);
-}
-
VALUE rb_f_trace_var();
VALUE rb_f_untrace_var();
@@ -7778,19 +5726,6 @@ errat_setter(val, id, var)
set_backtrace(ruby_errinfo, val);
}
-/*
- * call-seq:
- * local_variables => array
- *
- * Returns the names of the current local variables.
- *
- * fred = 1
- * for i in 1..10
- * # ...
- * end
- * local_variables #=> ["fred", "i"]
- */
-
static VALUE
rb_f_local_variables()
{
@@ -7803,14 +5738,14 @@ rb_f_local_variables()
if (tbl) {
n = *tbl++;
for (i=2; i<n; i++) { /* skip first 2 ($_ and $~) */
- if (!rb_is_local_id(tbl[i])) continue; /* skip flip states */
+ if (tbl[i] == 0) continue; /* skip flip states */
rb_ary_push(ary, rb_str_new2(rb_id2name(tbl[i])));
}
}
vars = ruby_dyna_vars;
while (vars) {
- if (vars->id && rb_is_local_id(vars->id)) { /* skip $_, $~ and flip states */
+ if (vars->id) {
rb_ary_push(ary, rb_str_new2(rb_id2name(vars->id)));
}
vars = vars->next;
@@ -7820,20 +5755,19 @@ rb_f_local_variables()
}
static VALUE rb_f_catch _((VALUE,VALUE));
-NORETURN(static VALUE rb_f_throw _((int,VALUE*)));
+static VALUE rb_f_throw _((int,VALUE*)) NORETURN;
struct end_proc_data {
void (*func)();
VALUE data;
- int safe;
struct end_proc_data *next;
};
-static struct end_proc_data *end_procs, *ephemeral_end_procs, *tmp_end_procs;
+static struct end_proc_data *end_procs, *ephemeral_end_procs;
void
rb_set_end_proc(func, data)
- void (*func) _((VALUE));
+ void (*func)();
VALUE data;
{
struct end_proc_data *link = ALLOC(struct end_proc_data);
@@ -7844,7 +5778,6 @@ rb_set_end_proc(func, data)
link->next = *list;
link->func = func;
link->data = data;
- link->safe = ruby_safe_level;
*list = link;
}
@@ -7863,15 +5796,8 @@ rb_mark_end_proc()
rb_gc_mark(link->data);
link = link->next;
}
- link = tmp_end_procs;
- while (link) {
- rb_gc_mark(link->data);
- link = link->next;
- }
}
-static void call_end_proc _((VALUE data));
-
static void
call_end_proc(data)
VALUE data;
@@ -7879,10 +5805,9 @@ call_end_proc(data)
PUSH_ITER(ITER_NOT);
PUSH_FRAME();
ruby_frame->self = ruby_frame->prev->self;
- ruby_frame->node = 0;
ruby_frame->last_func = 0;
ruby_frame->last_class = 0;
- proc_invoke(data, rb_ary_new2(0), Qundef, 0);
+ proc_call(data, Qundef);
POP_FRAME();
POP_ITER();
}
@@ -7892,41 +5817,17 @@ rb_f_END()
{
PUSH_FRAME();
ruby_frame->argc = 0;
- ruby_frame->iter = ITER_CUR;
- rb_set_end_proc(call_end_proc, rb_block_proc());
+ rb_set_end_proc(call_end_proc, rb_f_lambda());
POP_FRAME();
}
-/*
- * call-seq:
- * at_exit { block } -> proc
- *
- * Converts _block_ to a +Proc+ object (and therefore
- * binds it at the point of call) and registers it for execution when
- * the program exits. If multiple handlers are registered, they are
- * executed in reverse order of registration.
- *
- * def do_at_exit(str1)
- * at_exit { print str1 }
- * end
- * at_exit { puts "cruel world" }
- * do_at_exit("goodbye ")
- * exit
- *
- * <em>produces:</em>
- *
- * goodbye cruel world
- */
-
static VALUE
rb_f_at_exit()
{
VALUE proc;
- if (!rb_block_given_p()) {
- rb_raise(rb_eArgError, "called without a block");
- }
- proc = rb_block_proc();
+ proc = rb_f_lambda();
+
rb_set_end_proc(call_end_proc, proc);
return proc;
}
@@ -7934,47 +5835,26 @@ rb_f_at_exit()
void
rb_exec_end_proc()
{
- struct end_proc_data *link, *tmp;
+ struct end_proc_data *link;
int status;
- volatile int safe = ruby_safe_level;
- while (ephemeral_end_procs) {
- tmp_end_procs = link = ephemeral_end_procs;
- ephemeral_end_procs = 0;
- while (link) {
- PUSH_TAG(PROT_NONE);
- if ((status = EXEC_TAG()) == 0) {
- ruby_safe_level = link->safe;
- (*link->func)(link->data);
- }
- POP_TAG();
- if (status) {
- error_handle(status);
- }
- tmp = link;
- tmp_end_procs = link = link->next;
- free(tmp);
+ link = end_procs;
+ while (link) {
+ rb_protect((VALUE(*)())link->func, link->data, &status);
+ if (status) {
+ error_handle(status);
}
+ link = link->next;
}
- while (end_procs) {
- tmp_end_procs = link = end_procs;
- end_procs = 0;
- while (link) {
- PUSH_TAG(PROT_NONE);
- if ((status = EXEC_TAG()) == 0) {
- ruby_safe_level = link->safe;
- (*link->func)(link->data);
- }
- POP_TAG();
- if (status) {
- error_handle(status);
- }
- tmp = link;
- tmp_end_procs = link = link->next;
- free(tmp);
+ while (ephemeral_end_procs) {
+ link = ephemeral_end_procs;
+ ephemeral_end_procs = link->next;
+ rb_protect((VALUE(*)())link->func, link->data, &status);
+ if (status) {
+ error_handle(status);
}
+ free(link);
}
- ruby_safe_level = safe;
}
void
@@ -7987,13 +5867,10 @@ Init_eval()
aref = rb_intern("[]");
aset = rb_intern("[]=");
match = rb_intern("=~");
+ to_ary = rb_intern("to_ary");
missing = rb_intern("method_missing");
added = rb_intern("method_added");
singleton_added = rb_intern("singleton_method_added");
- removed = rb_intern("method_removed");
- singleton_removed = rb_intern("singleton_method_removed");
- undefined = rb_intern("method_undefined");
- singleton_undefined = rb_intern("singleton_method_undefined");
__id__ = rb_intern("__id__");
__send__ = rb_intern("__send__");
@@ -8010,27 +5887,24 @@ Init_eval()
rb_define_global_function("eval", rb_f_eval, -1);
rb_define_global_function("iterator?", rb_f_block_given_p, 0);
rb_define_global_function("block_given?", rb_f_block_given_p, 0);
- rb_define_global_function("method_missing", rb_method_missing, -1);
+ rb_define_global_function("method_missing", rb_f_missing, -1);
rb_define_global_function("loop", rb_f_loop, 0);
- rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1);
- respond_to = rb_intern("respond_to?");
- rb_global_variable((VALUE*)&basic_respond_to);
- basic_respond_to = rb_method_node(rb_cObject, respond_to);
-
+ rb_define_method(rb_mKernel, "respond_to?", rb_obj_respond_to, -1);
+
rb_define_global_function("raise", rb_f_raise, -1);
rb_define_global_function("fail", rb_f_raise, -1);
rb_define_global_function("caller", rb_f_caller, -1);
rb_define_global_function("exit", rb_f_exit, -1);
- rb_define_global_function("abort", rb_f_abort, -1);
+ rb_define_global_function("abort", rb_f_abort, 0);
rb_define_global_function("at_exit", rb_f_at_exit, 0);
rb_define_global_function("catch", rb_f_catch, 1);
rb_define_global_function("throw", rb_f_throw, -1);
- rb_define_global_function("global_variables", rb_f_global_variables, 0); /* in variable.c */
+ rb_define_global_function("global_variables", rb_f_global_variables, 0);
rb_define_global_function("local_variables", rb_f_local_variables, 0);
rb_define_method(rb_mKernel, "send", rb_f_send, -1);
@@ -8045,9 +5919,6 @@ Init_eval()
rb_define_private_method(rb_cModule, "private", rb_mod_private, -1);
rb_define_private_method(rb_cModule, "module_function", rb_mod_modfunc, -1);
rb_define_method(rb_cModule, "method_defined?", rb_mod_method_defined, 1);
- rb_define_method(rb_cModule, "public_method_defined?", rb_mod_public_method_defined, 1);
- rb_define_method(rb_cModule, "private_method_defined?", rb_mod_private_method_defined, 1);
- rb_define_method(rb_cModule, "protected_method_defined?", rb_mod_protected_method_defined, 1);
rb_define_method(rb_cModule, "public_class_method", rb_mod_public_method, -1);
rb_define_method(rb_cModule, "private_class_method", rb_mod_private_method, -1);
rb_define_method(rb_cModule, "module_eval", rb_mod_module_eval, -1);
@@ -8055,8 +5926,8 @@ Init_eval()
rb_undef_method(rb_cClass, "module_function");
- rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, -1);
- rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, -1);
+ rb_define_private_method(rb_cModule, "remove_method", rb_mod_remove_method, 1);
+ rb_define_private_method(rb_cModule, "undef_method", rb_mod_undef_method, 1);
rb_define_private_method(rb_cModule, "alias_method", rb_mod_alias_method, 2);
rb_define_private_method(rb_cModule, "define_method", rb_mod_define_method, -1);
@@ -8069,130 +5940,48 @@ Init_eval()
rb_define_method(rb_mKernel, "extend", rb_obj_extend, -1);
- rb_define_global_function("trace_var", rb_f_trace_var, -1); /* in variable.c */
- rb_define_global_function("untrace_var", rb_f_untrace_var, -1); /* in variable.c */
+ rb_define_global_function("trace_var", rb_f_trace_var, -1);
+ rb_define_global_function("untrace_var", rb_f_untrace_var, -1);
rb_define_global_function("set_trace_func", set_trace_func, 1);
rb_global_variable(&trace_func);
rb_define_virtual_variable("$SAFE", safe_getter, safe_setter);
-}
-
-/*
- * call-seq:
- * mod.autoload(name, filename) => nil
- *
- * Registers _filename_ to be loaded (using <code>Kernel::require</code>)
- * the first time that _name_ (which may be a <code>String</code> or
- * a symbol) is accessed in the namespace of _mod_.
- *
- * module A
- * end
- * A.autoload(:B, "b")
- * A::B.doit # autoloads "b"
- */
-static VALUE
-rb_mod_autoload(mod, sym, file)
- VALUE mod;
- VALUE sym;
- VALUE file;
-{
- ID id = rb_to_id(sym);
-
- Check_SafeStr(file);
- rb_autoload(mod, id, RSTRING(file)->ptr);
- return Qnil;
-}
-
-/*
- * call-seq:
- * mod.autoload?(name) => String or nil
- *
- * Returns _filename_ to be loaded if _name_ is registered as
- * +autoload+ in the namespace of _mod_.
- *
- * module A
- * end
- * A.autoload(:B, "b")
- * A.autoload?(:B) # => "b"
- */
-
-static VALUE
-rb_mod_autoload_p(mod, sym)
- VALUE mod, sym;
-{
- return rb_autoload_p(mod, rb_to_id(sym));
-}
+#ifdef HAVE_GETRLIMIT
+ {
+ struct rlimit rlim;
-/*
- * call-seq:
- * autoload(module, filename) => nil
- *
- * Registers _filename_ to be loaded (using <code>Kernel::require</code>)
- * the first time that _module_ (which may be a <code>String</code> or
- * a symbol) is accessed.
- *
- * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
- */
+ if (getrlimit(RLIMIT_STACK, &rlim) == 0) {
+ double space = (double)rlim.rlim_cur*0.2;
-static VALUE
-rb_f_autoload(obj, sym, file)
- VALUE obj;
- VALUE sym;
- VALUE file;
-{
- if (NIL_P(ruby_cbase)) {
- rb_raise(rb_eTypeError, "no class/module for autoload target");
+ if (space > 1024*1024) space = 1024*1024;
+ STACK_LEVEL_MAX = (rlim.rlim_cur - space) / sizeof(VALUE);
+ }
}
- return rb_mod_autoload(ruby_cbase, sym, file);
+#endif
}
-/*
- * call-seq:
- * autoload(module, filename) => nil
- *
- * Registers _filename_ to be loaded (using <code>Kernel::require</code>)
- * the first time that _module_ (which may be a <code>String</code> or
- * a symbol) is accessed.
- *
- * autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
- */
-
-static VALUE
-rb_f_autoload_p(obj, sym)
- VALUE obj;
- VALUE sym;
-{
- /* use ruby_cbase as same as rb_f_autoload. */
- if (NIL_P(ruby_cbase)) {
- return Qfalse;
- }
- return rb_mod_autoload_p(ruby_cbase, sym);
-}
+VALUE rb_f_autoload();
void
Init_load()
{
+ rb_load_path = rb_ary_new();
rb_define_readonly_variable("$:", &rb_load_path);
rb_define_readonly_variable("$-I", &rb_load_path);
rb_define_readonly_variable("$LOAD_PATH", &rb_load_path);
- rb_load_path = rb_ary_new();
- rb_define_readonly_variable("$\"", &rb_features);
- rb_define_readonly_variable("$LOADED_FEATURES", &rb_features);
rb_features = rb_ary_new();
+ rb_define_readonly_variable("$\"", &rb_features);
rb_define_global_function("load", rb_f_load, -1);
rb_define_global_function("require", rb_f_require, 1);
- rb_define_method(rb_cModule, "autoload", rb_mod_autoload, 2);
- rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1);
- rb_define_global_function("autoload", rb_f_autoload, 2);
- rb_define_global_function("autoload?", rb_f_autoload_p, 1);
+ rb_define_global_function("autoload", rb_f_autoload, 2);
rb_global_variable(&ruby_wrapper);
- rb_global_variable(&ruby_dln_librefs);
ruby_dln_librefs = rb_ary_new();
+ rb_global_variable(&ruby_dln_librefs);
}
static void
@@ -8202,8 +5991,8 @@ scope_dup(scope)
ID *tbl;
VALUE *vars;
- scope->flags |= SCOPE_DONT_RECYCLE;
- if (scope->flags & SCOPE_MALLOC) return;
+ scope->flag |= SCOPE_DONT_RECYCLE;
+ if (scope->flag & SCOPE_MALLOC) return;
if (scope->local_tbl) {
tbl = scope->local_tbl;
@@ -8211,7 +6000,7 @@ scope_dup(scope)
*vars++ = scope->local_vars[-1];
MEMCPY(vars, scope->local_vars, VALUE, tbl[0]);
scope->local_vars = vars;
- scope->flags |= SCOPE_MALLOC;
+ scope->flag |= SCOPE_MALLOC;
}
}
@@ -8221,40 +6010,35 @@ blk_mark(data)
{
while (data) {
rb_gc_mark_frame(&data->frame);
- rb_gc_mark((VALUE)data->scope);
- rb_gc_mark((VALUE)data->var);
- rb_gc_mark((VALUE)data->body);
- rb_gc_mark((VALUE)data->self);
- rb_gc_mark((VALUE)data->dyna_vars);
- rb_gc_mark((VALUE)data->cref);
- rb_gc_mark(data->wrapper);
- rb_gc_mark(data->block_obj);
+ rb_gc_mark(data->scope);
+ rb_gc_mark(data->var);
+ rb_gc_mark(data->body);
+ rb_gc_mark(data->self);
+ rb_gc_mark(data->dyna_vars);
+ rb_gc_mark(data->klass);
+ rb_gc_mark(data->tag);
data = data->prev;
}
}
static void
-frame_free(frame)
- struct FRAME *frame;
+blk_free(data)
+ struct BLOCK *data;
{
- struct FRAME *tmp;
+ struct FRAME *frame;
+ void *tmp;
- frame = frame->prev;
+ frame = data->frame.prev;
while (frame) {
+ if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
+ free(frame->argv);
tmp = frame;
frame = frame->prev;
free(tmp);
}
-}
-
-static void
-blk_free(data)
- struct BLOCK *data;
-{
- void *tmp;
-
while (data) {
- frame_free(&data->frame);
+ if (data->frame.argc > 0)
+ free(data->frame.argv);
tmp = data;
data = data->prev;
free(tmp);
@@ -8262,23 +6046,6 @@ blk_free(data)
}
static void
-frame_dup(frame)
- struct FRAME *frame;
-{
- struct FRAME *tmp;
-
- for (;;) {
- frame->tmp = 0; /* should not preserve tmp */
- if (!frame->prev) break;
- tmp = ALLOC(struct FRAME);
- *tmp = *frame->prev;
- frame->prev = tmp;
- frame = tmp;
- }
-}
-
-
-static void
blk_copy_prev(block)
struct BLOCK *block;
{
@@ -8288,8 +6055,12 @@ blk_copy_prev(block)
while (block->prev) {
tmp = ALLOC_N(struct BLOCK, 1);
MEMCPY(tmp, block->prev, struct BLOCK, 1);
+ if (tmp->frame.argc > 0) {
+ tmp->frame.argv = ALLOC_N(VALUE, tmp->frame.argc);
+ MEMCPY(tmp->frame.argv, block->prev->frame.argv, VALUE, tmp->frame.argc);
+ }
scope_dup(tmp->scope);
- frame_dup(&tmp->frame);
+ tmp->tag->flags |= BLOCK_DYNAMIC;
for (vars = tmp->dyna_vars; vars; vars = vars->next) {
if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
@@ -8301,75 +6072,52 @@ blk_copy_prev(block)
}
}
-
static void
-blk_dup(dup, orig)
- struct BLOCK *dup, *orig;
+frame_dup(frame)
+ struct FRAME *frame;
{
- MEMCPY(dup, orig, struct BLOCK, 1);
- frame_dup(&dup->frame);
+ VALUE *argv;
+ struct FRAME *tmp;
- if (dup->iter) {
- blk_copy_prev(dup);
- }
- else {
- dup->prev = 0;
+ for (;;) {
+ if (frame->argc > 0) {
+ argv = ALLOC_N(VALUE, frame->argc);
+ MEMCPY(argv, frame->argv, VALUE, frame->argc);
+ frame->argv = argv;
+ frame->flags = FRAME_MALLOC;
+ }
+ frame->tmp = 0; /* should not preserve tmp */
+ if (!frame->prev) break;
+ tmp = ALLOC(struct FRAME);
+ *tmp = *frame->prev;
+ frame->prev = tmp;
+ frame = tmp;
}
}
-/*
- * MISSING: documentation
- */
-
static VALUE
-proc_clone(self)
+bind_clone(self)
VALUE self;
{
struct BLOCK *orig, *data;
VALUE bind;
Data_Get_Struct(self, struct BLOCK, orig);
- bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
+ bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
CLONESETUP(bind, self);
- blk_dup(data, orig);
-
- return bind;
-}
-
-/*
- * MISSING: documentation
- */
-
-static VALUE
-proc_dup(self)
- VALUE self;
-{
- struct BLOCK *orig, *data;
- VALUE bind;
+ MEMCPY(data, orig, struct BLOCK, 1);
+ frame_dup(&data->frame);
- Data_Get_Struct(self, struct BLOCK, orig);
- bind = Data_Make_Struct(rb_obj_class(self),struct BLOCK,blk_mark,blk_free,data);
- blk_dup(data, orig);
+ if (data->iter) {
+ blk_copy_prev(data);
+ }
+ else {
+ data->prev = 0;
+ }
return bind;
}
-/*
- * call-seq:
- * binding -> a_binding
- *
- * Returns a +Binding+ object, describing the variable and
- * method bindings at the point of call. This object can be used when
- * calling +eval+ to execute the evaluated command in this
- * environment. Also see the description of class +Binding+.
- *
- * def getBinding(param)
- * return binding
- * end
- * b = getBinding("hello")
- * eval("param", b) #=> "hello"
- */
-
static VALUE
rb_f_binding(self)
VALUE self;
@@ -8383,13 +6131,11 @@ rb_f_binding(self)
*data = *ruby_block;
data->orig_thread = rb_thread_current();
- data->wrapper = ruby_wrapper;
data->iter = rb_f_block_given_p();
frame_dup(&data->frame);
if (ruby_frame->prev) {
data->frame.last_func = ruby_frame->prev->last_func;
data->frame.last_class = ruby_frame->prev->last_class;
- data->frame.orig_func = ruby_frame->prev->orig_func;
}
if (data->iter) {
@@ -8398,6 +6144,8 @@ rb_f_binding(self)
else {
data->prev = 0;
}
+ data->flags |= BLOCK_DYNAMIC;
+ data->tag->flags |= BLOCK_DYNAMIC;
for (p = data; p; p = p->prev) {
for (vars = p->dyna_vars; vars; vars = vars->next) {
@@ -8411,61 +6159,68 @@ rb_f_binding(self)
return bind;
}
-#define PROC_TSHIFT (FL_USHIFT+1)
-#define PROC_TMASK (FL_USER1|FL_USER2|FL_USER3)
-#define PROC_TMAX (PROC_TMASK >> PROC_TSHIFT)
-
-#define SAFE_LEVEL_MAX PROC_TMASK
+#define PROC_T3 FL_USER1
+#define PROC_T4 FL_USER2
+#define PROC_TMAX (FL_USER1|FL_USER2)
+#define PROC_TMASK (FL_USER1|FL_USER2)
static void
proc_save_safe_level(data)
VALUE data;
{
- int safe = ruby_safe_level;
- if (safe > PROC_TMAX) safe = PROC_TMAX;
- FL_SET(data, (safe << PROC_TSHIFT) & PROC_TMASK);
-}
-
-static int
-proc_get_safe_level(data)
- VALUE data;
-{
- return (RBASIC(data)->flags & PROC_TMASK) >> PROC_TSHIFT;
+ if (OBJ_TAINTED(data)) {
+ switch (rb_safe_level()) {
+ case 3:
+ FL_SET(data, PROC_T3);
+ break;
+ case 4:
+ FL_SET(data, PROC_T4);
+ break;
+ default:
+ if (rb_safe_level() > 4) {
+ FL_SET(data, PROC_TMAX);
+ }
+ break;
+ }
+ }
}
static void
proc_set_safe_level(data)
VALUE data;
{
- ruby_safe_level = proc_get_safe_level(data);
+ if (OBJ_TAINTED(data)) {
+ switch (RBASIC(data)->flags & PROC_TMASK) {
+ case PROC_T3:
+ ruby_safe_level = 3;
+ break;
+ case PROC_T4:
+ ruby_safe_level = 4;
+ break;
+ case PROC_TMAX:
+ ruby_safe_level = 5;
+ break;
+ }
+ }
}
static VALUE
-proc_alloc(klass, proc)
+proc_new(klass)
VALUE klass;
- int proc;
{
- volatile VALUE block;
+ volatile VALUE proc;
struct BLOCK *data, *p;
struct RVarmap *vars;
if (!rb_block_given_p() && !rb_f_block_given_p()) {
rb_raise(rb_eArgError, "tried to create Proc object without a block");
}
- if (proc && !rb_block_given_p()) {
- rb_warn("tried to create Proc object without a block");
- }
- if (!proc && ruby_block->block_obj && CLASS_OF(ruby_block->block_obj) == klass) {
- return ruby_block->block_obj;
- }
- block = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data);
+ proc = Data_Make_Struct(klass, struct BLOCK, blk_mark, blk_free, data);
*data = *ruby_block;
data->orig_thread = rb_thread_current();
- data->wrapper = ruby_wrapper;
data->iter = data->prev?Qtrue:Qfalse;
- data->block_obj = block;
frame_dup(&data->frame);
if (data->iter) {
blk_copy_prev(data);
@@ -8473,6 +6228,8 @@ proc_alloc(klass, proc)
else {
data->prev = 0;
}
+ data->flags |= BLOCK_DYNAMIC;
+ data->tag->flags |= BLOCK_DYNAMIC;
for (p = data; p; p = p->prev) {
for (vars = p->dyna_vars; vars; vars = vars->next) {
@@ -8481,79 +6238,35 @@ proc_alloc(klass, proc)
}
}
scope_dup(data->scope);
- proc_save_safe_level(block);
- if (proc) {
- data->flags |= BLOCK_LAMBDA;
- }
- else {
- ruby_block->block_obj = block;
- }
+ proc_save_safe_level(proc);
- return block;
+ return proc;
}
-/*
- * call-seq:
- * Proc.new {|...| block } => a_proc
- * Proc.new => a_proc
- *
- * Creates a new <code>Proc</code> object, bound to the current
- * context. <code>Proc::new</code> may be called without a block only
- * within a method with an attached block, in which case that block is
- * converted to the <code>Proc</code> object.
- *
- * def proc_from
- * Proc.new
- * end
- * proc = proc_from { "hello" }
- * proc.call #=> "hello"
- */
-
static VALUE
proc_s_new(argc, argv, klass)
int argc;
VALUE *argv;
VALUE klass;
{
- VALUE block = proc_alloc(klass, Qfalse);
+ VALUE proc = proc_new(klass);
- rb_obj_call_init(block, argc, argv);
- return block;
-}
-
-VALUE
-rb_block_proc()
-{
- return proc_alloc(rb_cProc, Qfalse);
+ rb_obj_call_init(proc, argc, argv);
+ return proc;
}
VALUE
rb_f_lambda()
{
- rb_warn("rb_f_lambda() is deprecated; use rb_block_proc() instead");
- return proc_alloc(rb_cProc, Qtrue);
-}
-
-/*
- * call-seq:
- * proc { |...| block } => a_proc
- * lambda { |...| block } => a_proc
- *
- * Equivalent to <code>Proc.new</code>, except the resulting Proc objects
- * check the number of parameters passed when called.
- */
-
-static VALUE
-proc_lambda()
-{
- return proc_alloc(rb_cProc, Qtrue);
+ return proc_new(rb_cProc);
}
static int
-block_orphan(data)
+blk_orphan(data)
struct BLOCK *data;
{
- if (data->scope->flags & SCOPE_NOSTACK) {
+ if (data->scope && data->scope != top_scope &&
+ (data->scope->flag & SCOPE_NOSTACK)) {
return 1;
}
if (data->orig_thread != rb_thread_current()) {
@@ -8563,160 +6276,86 @@ block_orphan(data)
}
static VALUE
-proc_invoke(proc, args, self, klass)
+callargs(args)
+ VALUE args;
+{
+ switch (RARRAY(args)->len) {
+ case 0:
+ return Qundef;
+ break;
+ default:
+ return args;
+ }
+}
+
+static VALUE
+proc_call(proc, args)
VALUE proc, args; /* OK */
- VALUE self, klass;
{
struct BLOCK * volatile old_block;
struct BLOCK _block;
struct BLOCK *data;
- volatile VALUE result = Qundef;
+ volatile VALUE result = Qnil;
int state;
+ volatile int orphan;
volatile int safe = ruby_safe_level;
- volatile VALUE old_wrapper = ruby_wrapper;
- volatile int pcall, avalue = Qtrue;
- volatile VALUE tmp = args;
if (rb_block_given_p() && ruby_frame->last_func) {
- if (klass != ruby_frame->last_class)
- klass = rb_obj_class(proc);
rb_warning("block for %s#%s is useless",
- rb_class2name(klass),
+ rb_class2name(CLASS_OF(proc)),
rb_id2name(ruby_frame->last_func));
}
Data_Get_Struct(proc, struct BLOCK, data);
- pcall = (data->flags & BLOCK_LAMBDA) ? YIELD_LAMBDA_CALL : 0;
- if (!pcall && RARRAY(args)->len == 1) {
- avalue = Qfalse;
- args = RARRAY(args)->ptr[0];
- }
+ orphan = blk_orphan(data);
- PUSH_VARS();
- ruby_wrapper = data->wrapper;
- ruby_dyna_vars = data->dyna_vars;
/* PUSH BLOCK from data */
old_block = ruby_block;
_block = *data;
- if (self != Qundef) _block.frame.self = self;
- if (klass) _block.frame.last_class = klass;
- _block.frame.argc = RARRAY(tmp)->len;
- _block.frame.flags = ruby_frame->flags;
- if (_block.frame.argc && DMETHOD_P()) {
- NEWOBJ(scope, struct SCOPE);
- OBJSETUP(scope, tmp, T_SCOPE);
- scope->local_tbl = _block.scope->local_tbl;
- scope->local_vars = _block.scope->local_vars;
- scope->flags |= SCOPE_CLONE;
- _block.scope = scope;
- }
- /* modify current frame */
ruby_block = &_block;
+ ruby_block->frame.iter = ITER_NOT;
+
PUSH_ITER(ITER_CUR);
ruby_frame->iter = ITER_CUR;
- PUSH_TAG(pcall ? PROT_LAMBDA : PROT_NONE);
+
+ if (args != Qundef && TYPE(args) == T_ARRAY) {
+ args = callargs(args);
+ }
+
+ PUSH_TAG(PROT_NONE);
state = EXEC_TAG();
if (state == 0) {
proc_set_safe_level(proc);
- result = rb_yield_0(args, self, (self!=Qundef)?CLASS_OF(self):0, pcall, avalue);
- }
- else if (TAG_DST()) {
- result = prot_tag->retval;
+ result = rb_yield_0(args, 0, 0, Qtrue);
}
POP_TAG();
+
POP_ITER();
+ if (ruby_block->tag->dst == state) {
+ state &= TAG_MASK;
+ }
ruby_block = old_block;
- ruby_wrapper = old_wrapper;
- POP_VARS();
ruby_safe_level = safe;
- switch (state) {
- case 0:
- break;
- case TAG_RETRY:
- proc_jump_error(TAG_RETRY, Qnil); /* xxx */
- JUMP_TAG(state);
- break;
- case TAG_NEXT:
- case TAG_BREAK:
- if (!pcall && result != Qundef) {
- proc_jump_error(state, result);
- }
- case TAG_RETURN:
- if (result != Qundef) {
- if (pcall) break;
- return_jump(result);
+ if (state) {
+ switch (state) {
+ case TAG_BREAK:
+ break;
+ case TAG_RETRY:
+ rb_raise(rb_eLocalJumpError, "retry from proc-closure");
+ break;
+ case TAG_RETURN:
+ if (orphan) { /* orphan procedure */
+ rb_raise(rb_eLocalJumpError, "return from proc-closure");
+ }
+ /* fall through */
+ default:
+ JUMP_TAG(state);
}
- default:
- JUMP_TAG(state);
}
return result;
}
-/* CHECKME: are the argument checking semantics correct? */
-
-/*
- * call-seq:
- * prc.call(params,...) => obj
- * prc[params,...] => obj
- *
- * Invokes the block, setting the block's parameters to the values in
- * <i>params</i> using something close to method calling semantics.
- * Generates a warning if multiple values are passed to a proc that
- * expects just one (previously this silently converted the parameters
- * to an array).
- *
- * For procs created using <code>Kernel.proc</code>, generates an
- * error if the wrong number of parameters
- * are passed to a proc with multiple parameters. For procs created using
- * <code>Proc.new</code>, extra parameters are silently discarded.
- *
- * Returns the value of the last expression evaluated in the block. See
- * also <code>Proc#yield</code>.
- *
- * a_proc = Proc.new {|a, *b| b.collect {|i| i*a }}
- * a_proc.call(9, 1, 2, 3) #=> [9, 18, 27]
- * a_proc[9, 1, 2, 3] #=> [9, 18, 27]
- * a_proc = Proc.new {|a,b| a}
- * a_proc.call(1,2,3)
- *
- * <em>produces:</em>
- *
- * prog.rb:5: wrong number of arguments (3 for 2) (ArgumentError)
- * from prog.rb:4:in `call'
- * from prog.rb:5
- */
-
-static VALUE
-proc_call(proc, args)
- VALUE proc, args; /* OK */
-{
- return proc_invoke(proc, args, Qundef, 0);
-}
-
-static VALUE bmcall _((VALUE, VALUE));
-static VALUE method_arity _((VALUE));
-
-/*
- * call-seq:
- * prc.arity -> fixnum
- *
- * Returns the number of arguments that would not be ignored. If the block
- * is declared to take no arguments, returns 0. If the block is known
- * to take exactly n arguments, returns n. If the block has optional
- * arguments, return -n-1, where n is the number of mandatory
- * arguments. A <code>proc</code> with no argument declarations
- * is the same a block declaring <code>||</code> as its arguments.
- *
- * Proc.new {}.arity #=> 0
- * Proc.new {||}.arity #=> 0
- * Proc.new {|a|}.arity #=> 1
- * Proc.new {|a,b|}.arity #=> 2
- * Proc.new {|a,b,c|}.arity #=> 3
- * Proc.new {|*a|}.arity #=> -1
- * Proc.new {|a,*b|}.arity #=> -2
- */
-
static VALUE
proc_arity(proc)
VALUE proc;
@@ -8726,18 +6365,11 @@ proc_arity(proc)
int n;
Data_Get_Struct(proc, struct BLOCK, data);
- if (data->var == 0) {
- if (data->body && nd_type(data->body) == NODE_IFUNC &&
- data->body->nd_cfnc == bmcall) {
- return method_arity(data->body->nd_tval);
- }
- return INT2FIX(-1);
- }
+ if (data->var == 0) return INT2FIX(-1);
if (data->var == (NODE*)1) return INT2FIX(0);
- if (data->var == (NODE*)2) return INT2FIX(0);
switch (nd_type(data->var)) {
default:
- return INT2FIX(1);
+ return INT2FIX(-1);
case NODE_MASGN:
list = data->var->nd_head;
n = 0;
@@ -8750,14 +6382,6 @@ proc_arity(proc)
}
}
-/*
- * call-seq:
- * prc == other_proc => true or false
- *
- * Return <code>true</code> if <i>prc</i> is the same object as
- * <i>other_proc</i>, or if they are both procs with the same body.
- */
-
static VALUE
proc_eq(self, other)
VALUE self, other;
@@ -8770,115 +6394,33 @@ proc_eq(self, other)
if (CLASS_OF(self) != CLASS_OF(other)) return Qfalse;
Data_Get_Struct(self, struct BLOCK, data);
Data_Get_Struct(other, struct BLOCK, data2);
- if (data->body != data2->body) return Qfalse;
- if (data->var != data2->var) return Qfalse;
- if (data->scope != data2->scope) return Qfalse;
- if (data->dyna_vars != data2->dyna_vars) return Qfalse;
- if (data->flags != data2->flags) return Qfalse;
-
- return Qtrue;
+ if (data->tag == data2->tag) return Qtrue;
+ return Qfalse;
}
-/*
- * call-seq:
- * prc.to_s => string
- *
- * Shows the unique identifier for this proc, along with
- * an indication of where the proc was defined.
- */
-
static VALUE
-proc_to_s(self)
- VALUE self;
+proc_to_s(self, other)
+ VALUE self, other;
{
struct BLOCK *data;
- NODE *node;
- char *cname = rb_obj_classname(self);
- const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
- long len = strlen(cname)+6+w; /* 6:tags 16:addr */
+ char *cname = rb_class2name(CLASS_OF(self));
VALUE str;
Data_Get_Struct(self, struct BLOCK, data);
- if ((node = data->frame.node) || (node = data->body)) {
- len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3;
- str = rb_str_new(0, len);
- snprintf(RSTRING(str)->ptr, len+1,
- "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
- node->nd_file, nd_line(node));
- }
- else {
- str = rb_str_new(0, len);
- snprintf(RSTRING(str)->ptr, len+1,
- "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
- }
+ str = rb_str_new(0, strlen(cname)+6+16+1); /* 6:tags 16:addr 1:eos */
+ sprintf(RSTRING(str)->ptr, "#<%s:0x%lx>", cname, data->tag);
RSTRING(str)->len = strlen(RSTRING(str)->ptr);
if (OBJ_TAINTED(self)) OBJ_TAINT(str);
return str;
}
-/*
- * call-seq:
- * prc.to_proc -> prc
- *
- * Part of the protocol for converting objects to <code>Proc</code>
- * objects. Instances of class <code>Proc</code> simply return
- * themselves.
- */
-
-static VALUE
-proc_to_self(self)
- VALUE self;
-{
- return self;
-}
-
-/*
- * call-seq:
- * prc.binding => binding
- *
- * Returns the binding associated with <i>prc</i>. Note that
- * <code>Kernel#eval</code> accepts either a <code>Proc</code> or a
- * <code>Binding</code> object as its second parameter.
- *
- * def fred(param)
- * proc {}
- * end
- *
- * b = fred(99)
- * eval("param", b.binding) #=> 99
- * eval("param", b) #=> 99
- */
-
-static VALUE
-proc_binding(proc)
- VALUE proc;
-{
- struct BLOCK *orig, *data;
- VALUE bind;
-
- Data_Get_Struct(proc, struct BLOCK, orig);
- bind = Data_Make_Struct(rb_cBinding,struct BLOCK,blk_mark,blk_free,data);
- MEMCPY(data, orig, struct BLOCK, 1);
- frame_dup(&data->frame);
-
- if (data->iter) {
- blk_copy_prev(data);
- }
- else {
- data->prev = 0;
- }
-
- return bind;
-}
-
static VALUE
block_pass(self, node)
VALUE self;
NODE *node;
{
- VALUE proc = rb_eval(self, node->nd_body); /* OK */
- VALUE b;
+ VALUE block = rb_eval(self, node->nd_body); /* OK */
struct BLOCK * volatile old_block;
struct BLOCK _block;
struct BLOCK *data;
@@ -8887,74 +6429,73 @@ block_pass(self, node)
volatile int orphan;
volatile int safe = ruby_safe_level;
- if (NIL_P(proc)) {
- PUSH_ITER(ITER_NOT);
- result = rb_eval(self, node->nd_iter);
- POP_ITER();
- return result;
+ if (NIL_P(block)) {
+ return rb_eval(self, node->nd_iter);
}
- if (!rb_obj_is_proc(proc)) {
- b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
- if (!rb_obj_is_proc(b)) {
- rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
- rb_obj_classname(proc));
- }
- proc = b;
+ if (rb_obj_is_kind_of(block, rb_cMethod)) {
+ block = method_proc(block);
}
-
- if (ruby_safe_level >= 1 && OBJ_TAINTED(proc) &&
- ruby_safe_level > proc_get_safe_level(proc)) {
- rb_raise(rb_eSecurityError, "Insecure: tainted block value");
+ else if (!rb_obj_is_proc(block)) {
+ rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)",
+ rb_class2name(CLASS_OF(block)));
}
- if (ruby_block && ruby_block->block_obj == proc) {
- PUSH_ITER(ITER_PAS);
- result = rb_eval(self, node->nd_iter);
- POP_ITER();
- return result;
- }
-
- Data_Get_Struct(proc, struct BLOCK, data);
- orphan = block_orphan(data);
+ Data_Get_Struct(block, struct BLOCK, data);
+ orphan = blk_orphan(data);
/* PUSH BLOCK from data */
old_block = ruby_block;
_block = *data;
- _block.outer = ruby_block;
- if (orphan) _block.uniq = block_unique++;
ruby_block = &_block;
PUSH_ITER(ITER_PRE);
- if (ruby_frame->iter == ITER_NOT)
- ruby_frame->iter = ITER_PRE;
+ ruby_frame->iter = ITER_PRE;
- PUSH_TAG(PROT_LOOP);
+ PUSH_TAG(PROT_NONE);
state = EXEC_TAG();
if (state == 0) {
- retry:
- proc_set_safe_level(proc);
+ proc_set_safe_level(block);
if (safe > ruby_safe_level)
ruby_safe_level = safe;
result = rb_eval(self, node->nd_iter);
}
- else if (state == TAG_BREAK && TAG_DST()) {
- result = prot_tag->retval;
- state = 0;
- }
- else if (state == TAG_RETRY) {
- state = 0;
- goto retry;
- }
POP_TAG();
POP_ITER();
+ if (_block.tag->dst == state) {
+ if (orphan) {
+ state &= TAG_MASK;
+ }
+ else {
+ struct BLOCK *ptr = old_block;
+
+ while (ptr) {
+ if (ptr->scope == _block.scope) {
+ ptr->tag->dst = state;
+ break;
+ }
+ ptr = ptr->prev;
+ }
+ if (!ptr) {
+ state &= TAG_MASK;
+ }
+ }
+ }
ruby_block = old_block;
ruby_safe_level = safe;
- switch (state) {/* escape from orphan block */
+ switch (state) {/* escape from orphan procedure */
case 0:
break;
+ case TAG_BREAK:
+ if (orphan) {
+ rb_raise(rb_eLocalJumpError, "break from proc-closure");
+ }
+ break;
+ case TAG_RETRY:
+ rb_raise(rb_eLocalJumpError, "retry from proc-closure");
+ break;
case TAG_RETURN:
if (orphan) {
- proc_jump_error(state, prot_tag->retval);
+ rb_raise(rb_eLocalJumpError, "return from proc-closure");
}
default:
JUMP_TAG(state);
@@ -8964,10 +6505,9 @@ block_pass(self, node)
}
struct METHOD {
- VALUE klass, rklass;
+ VALUE klass, oklass;
VALUE recv;
ID id, oid;
- int safe_level;
NODE *body;
};
@@ -8975,10 +6515,10 @@ static void
bm_mark(data)
struct METHOD *data;
{
- rb_gc_mark(data->rklass);
+ rb_gc_mark(data->oklass);
rb_gc_mark(data->klass);
rb_gc_mark(data->recv);
- rb_gc_mark((VALUE)data->body);
+ rb_gc_mark(data->body);
}
static VALUE
@@ -8990,12 +6530,12 @@ mnew(klass, obj, id, mklass)
NODE *body;
int noex;
struct METHOD *data;
- VALUE rklass = klass;
+ VALUE oklass = klass;
ID oid = id;
again:
if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
- print_undef(rklass, oid);
+ print_undef(oklass, oid);
}
if (nd_type(body) == NODE_ZSUPER) {
@@ -9003,87 +6543,18 @@ mnew(klass, obj, id, mklass)
goto again;
}
- while (rklass != klass &&
- (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
- rklass = RCLASS(rklass)->super;
- }
method = Data_Make_Struct(mklass, struct METHOD, bm_mark, free, data);
data->klass = klass;
data->recv = obj;
data->id = id;
data->body = body;
- data->rklass = rklass;
+ data->oklass = oklass;
data->oid = oid;
- data->safe_level = NOEX_WITH_SAFE(noex);
OBJ_INFECT(method, klass);
return method;
}
-
-/**********************************************************************
- *
- * Document-class : Method
- *
- * Method objects are created by <code>Object#method</code>, and are
- * associated with a particular object (not just with a class). They
- * may be used to invoke the method within the object, and as a block
- * associated with an iterator. They may also be unbound from one
- * object (creating an <code>UnboundMethod</code>) and bound to
- * another.
- *
- * class Thing
- * def square(n)
- * n*n
- * end
- * end
- * thing = Thing.new
- * meth = thing.method(:square)
- *
- * meth.call(9) #=> 81
- * [ 1, 2, 3 ].collect(&meth) #=> [1, 4, 9]
- *
- */
-
-/*
- * call-seq:
- * meth == other_meth => true or false
- *
- * Two method objects are equal if that are bound to the same
- * object and contain the same body.
- */
-
-
-static VALUE
-method_eq(method, other)
- VALUE method, other;
-{
- struct METHOD *m1, *m2;
-
- if (TYPE(other) != T_DATA || RDATA(other)->dmark != (RUBY_DATA_FUNC)bm_mark)
- return Qfalse;
- if (CLASS_OF(method) != CLASS_OF(other))
- return Qfalse;
-
- Data_Get_Struct(method, struct METHOD, m1);
- Data_Get_Struct(other, struct METHOD, m2);
-
- if (m1->klass != m2->klass || m1->rklass != m2->rklass ||
- m1->recv != m2->recv || m1->body != m2->body)
- return Qfalse;
-
- return Qtrue;
-}
-
-/*
- * call-seq:
- * meth.unbind => unbound_method
- *
- * Dissociates <i>meth</i> from it's current receiver. The resulting
- * <code>UnboundMethod</code> can subsequently be bound to a new object
- * of the same class (see <code>UnboundMethod</code>).
- */
-
static VALUE
method_unbind(obj)
VALUE obj;
@@ -9094,43 +6565,22 @@ method_unbind(obj)
Data_Get_Struct(obj, struct METHOD, orig);
method = Data_Make_Struct(rb_cUnboundMethod, struct METHOD, bm_mark, free, data);
data->klass = orig->klass;
- data->recv = Qundef;
+ data->recv = obj;
data->id = orig->id;
data->body = orig->body;
- data->rklass = orig->rklass;
+ data->oklass = orig->oklass;
data->oid = orig->oid;
OBJ_INFECT(method, obj);
return method;
}
-/*
- * call-seq:
- * obj.method(sym) => method
- *
- * Looks up the named method as a receiver in <i>obj</i>, returning a
- * <code>Method</code> object (or raising <code>NameError</code>). The
- * <code>Method</code> object acts as a closure in <i>obj</i>'s object
- * instance, so instance variables and the value of <code>self</code>
- * remain available.
- *
- * class Demo
- * def initialize(n)
- * @iv = n
- * end
- * def hello()
- * "Hello, @iv = #{@iv}"
- * end
- * end
- *
- * k = Demo.new(99)
- * m = k.method(:hello)
- * m.call #=> "Hello, @iv = 99"
- *
- * l = Demo.new('Fred')
- * m = l.method("hello")
- * m.call #=> "Hello, @iv = Fred"
- */
+static VALUE
+umethod_unbind(obj)
+ VALUE obj;
+{
+ return obj;
+}
static VALUE
rb_obj_method(obj, vid)
@@ -9140,50 +6590,14 @@ rb_obj_method(obj, vid)
return mnew(CLASS_OF(obj), obj, rb_to_id(vid), rb_cMethod);
}
-/*
- * call-seq:
- * mod.instance_method(symbol) => unbound_method
- *
- * Returns an +UnboundMethod+ representing the given
- * instance method in _mod_.
- *
- * class Interpreter
- * def do_a() print "there, "; end
- * def do_d() print "Hello "; end
- * def do_e() print "!\n"; end
- * def do_v() print "Dave"; end
- * Dispatcher = {
- * ?a => instance_method(:do_a),
- * ?d => instance_method(:do_d),
- * ?e => instance_method(:do_e),
- * ?v => instance_method(:do_v)
- * }
- * def interpret(string)
- * string.each_byte {|b| Dispatcher[b].bind(self).call }
- * end
- * end
- *
- *
- * interpreter = Interpreter.new
- * interpreter.interpret('dave')
- *
- * <em>produces:</em>
- *
- * Hello there, Dave!
- */
-
static VALUE
rb_mod_method(mod, vid)
VALUE mod;
VALUE vid;
{
- return mnew(mod, Qundef, rb_to_id(vid), rb_cUnboundMethod);
+ return mnew(mod, 0, rb_to_id(vid), rb_cUnboundMethod);
}
-/*
- * MISSING: documentation
- */
-
static VALUE
method_clone(self)
VALUE self;
@@ -9192,210 +6606,78 @@ method_clone(self)
struct METHOD *orig, *data;
Data_Get_Struct(self, struct METHOD, orig);
- clone = Data_Make_Struct(CLASS_OF(self),struct METHOD, bm_mark, free, data);
+ clone = Data_Make_Struct(CLASS_OF(self),struct METHOD,bm_mark,free,data);
CLONESETUP(clone, self);
*data = *orig;
return clone;
}
-/*
- * call-seq:
- * meth.call(args, ...) => obj
- * meth[args, ...] => obj
- *
- * Invokes the <i>meth</i> with the specified arguments, returning the
- * method's return value.
- *
- * m = 12.method("+")
- * m.call(3) #=> 15
- * m.call(20) #=> 32
- */
-
static VALUE
method_call(argc, argv, method)
int argc;
VALUE *argv;
VALUE method;
{
- VALUE result = Qnil; /* OK */
+ VALUE result;
struct METHOD *data;
- int safe;
+ int state;
+ volatile int safe = ruby_safe_level;
Data_Get_Struct(method, struct METHOD, data);
- if (data->recv == Qundef) {
- rb_raise(rb_eTypeError, "can't call unbound method; bind first");
- }
- if (OBJ_TAINTED(method)) {
- safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
+ PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+ PUSH_TAG(PROT_NONE);
+ if (OBJ_TAINTED(method) && ruby_safe_level < 4) {
+ ruby_safe_level = 4;
}
- else {
- safe = data->safe_level;
+ if ((state = EXEC_TAG()) == 0) {
+ result = rb_call0(data->klass,data->recv,data->id,argc,argv,data->body,0);
}
- PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
- result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,safe);
+ POP_TAG();
POP_ITER();
+ ruby_safe_level = safe;
+ if (state) JUMP_TAG(state);
return result;
}
-/**********************************************************************
- *
- * Document-class: UnboundMethod
- *
- * Ruby supports two forms of objectified methods. Class
- * <code>Method</code> is used to represent methods that are associated
- * with a particular object: these method objects are bound to that
- * object. Bound method objects for an object can be created using
- * <code>Object#method</code>.
- *
- * Ruby also supports unbound methods; methods objects that are not
- * associated with a particular object. These can be created either by
- * calling <code>Module#instance_method</code> or by calling
- * <code>unbind</code> on a bound method object. The result of both of
- * these is an <code>UnboundMethod</code> object.
- *
- * Unbound methods can only be called after they are bound to an
- * object. That object must be be a kind_of? the method's original
- * class.
- *
- * class Square
- * def area
- * @side * @side
- * end
- * def initialize(side)
- * @side = side
- * end
- * end
- *
- * area_un = Square.instance_method(:area)
- *
- * s = Square.new(12)
- * area = area_un.bind(s)
- * area.call #=> 144
- *
- * Unbound methods are a reference to the method at the time it was
- * objectified: subsequent changes to the underlying class will not
- * affect the unbound method.
- *
- * class Test
- * def test
- * :original
- * end
- * end
- * um = Test.instance_method(:test)
- * class Test
- * def test
- * :modified
- * end
- * end
- * t = Test.new
- * t.test #=> :modified
- * um.bind(t).call #=> :original
- *
- */
-
-/*
- * call-seq:
- * umeth.bind(obj) -> method
- *
- * Bind <i>umeth</i> to <i>obj</i>. If <code>Klass</code> was the class
- * from which <i>umeth</i> was obtained,
- * <code>obj.kind_of?(Klass)</code> must be true.
- *
- * class A
- * def test
- * puts "In test, class = #{self.class}"
- * end
- * end
- * class B < A
- * end
- * class C < B
- * end
- *
- *
- * um = B.instance_method(:test)
- * bm = um.bind(C.new)
- * bm.call
- * bm = um.bind(B.new)
- * bm.call
- * bm = um.bind(A.new)
- * bm.call
- *
- * <em>produces:</em>
- *
- * In test, class = C
- * In test, class = B
- * prog.rb:16:in `bind': bind argument must be an instance of B (TypeError)
- * from prog.rb:16
- */
+static VALUE
+umethod_call(argc, argv, method)
+ int argc;
+ VALUE *argv;
+ VALUE method;
+{
+ rb_raise(rb_eTypeError, "you cannot call unbound method; bind first");
+ return Qnil; /* not reached */
+}
static VALUE
umethod_bind(method, recv)
VALUE method, recv;
{
struct METHOD *data, *bound;
- VALUE rklass = CLASS_OF(recv);
Data_Get_Struct(method, struct METHOD, data);
- if (data->rklass != rklass) {
- if (FL_TEST(data->rklass, FL_SINGLETON)) {
- rb_raise(rb_eTypeError, "singleton method bound for a different object");
- }
- if (TYPE(data->rklass) == T_MODULE) {
- st_table *m_tbl = RCLASS(data->rklass)->m_tbl;
- while (RCLASS(rklass)->m_tbl != m_tbl) {
- rklass = RCLASS(rklass)->super;
- if (!rklass) goto not_instace;
- }
+ if (data->oklass != CLASS_OF(recv)) {
+ if (FL_TEST(data->oklass, FL_SINGLETON)) {
+ rb_raise(rb_eTypeError, "singleton method called for a different object");
+ }
+ if (FL_TEST(CLASS_OF(recv), FL_SINGLETON) &&
+ st_lookup(RCLASS(CLASS_OF(recv))->m_tbl, data->oid, 0)) {
+ rb_raise(rb_eTypeError, "method `%s' overridden", rb_id2name(data->oid));
}
- else if (!rb_obj_is_kind_of(recv, data->rklass)) {
- not_instace:
- rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
- rb_class2name(data->rklass));
+ if (!rb_obj_is_instance_of(recv, data->oklass)) {
+ rb_raise(rb_eTypeError, "first argument must be an instance of %s",
+ rb_class2name(data->oklass));
}
}
method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
*bound = *data;
bound->recv = recv;
- bound->rklass = rklass;
return method;
}
-/*
- * call-seq:
- * meth.arity => fixnum
- *
- * Returns an indication of the number of arguments accepted by a
- * method. Returns a nonnegative integer for methods that take a fixed
- * number of arguments. For Ruby methods that take a variable number of
- * arguments, returns -n-1, where n is the number of required
- * arguments. For methods written in C, returns -1 if the call takes a
- * variable number of arguments.
- *
- * class C
- * def one; end
- * def two(a); end
- * def three(*a); end
- * def four(a, b); end
- * def five(a, b, *c); end
- * def six(a, b, *c, &d); end
- * end
- * c = C.new
- * c.method(:one).arity #=> 0
- * c.method(:two).arity #=> 1
- * c.method(:three).arity #=> -1
- * c.method(:four).arity #=> 2
- * c.method(:five).arity #=> -3
- * c.method(:six).arity #=> -3
- *
- * "cat".method(:size).arity #=> 0
- * "cat".method(:replace).arity #=> 1
- * "cat".method(:squeeze).arity #=> -1
- * "cat".method(:count).arity #=> -1
- */
-
static VALUE
method_arity(method)
VALUE method;
@@ -9417,34 +6699,18 @@ method_arity(method)
return INT2FIX(1);
case NODE_IVAR:
return INT2FIX(0);
- case NODE_BMETHOD:
- return proc_arity(body->nd_cval);
- case NODE_DMETHOD:
- return method_arity(body->nd_cval);
- case NODE_SCOPE:
+ default:
body = body->nd_next; /* skip NODE_SCOPE */
if (nd_type(body) == NODE_BLOCK)
body = body->nd_head;
if (!body) return INT2FIX(0);
n = body->nd_cnt;
- if (body->nd_opt || body->nd_rest)
+ if (body->nd_opt || body->nd_rest != -1)
n = -n-1;
return INT2FIX(n);
- default:
- rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body));
- }
+ }
}
-/*
- * call-seq:
- * meth.to_s => string
- * meth.inspect => string
- *
- * Show the name of the underlying method.
- *
- * "cat".method(:count).inspect #=> "#<Method: String#count>"
- */
-
static VALUE
method_inspect(method)
VALUE method;
@@ -9452,61 +6718,34 @@ method_inspect(method)
struct METHOD *data;
VALUE str;
const char *s;
- char *sharp = "#";
Data_Get_Struct(method, struct METHOD, data);
- str = rb_str_buf_new2("#<");
- s = rb_obj_classname(method);
- rb_str_buf_cat2(str, s);
- rb_str_buf_cat2(str, ": ");
-
- if (FL_TEST(data->klass, FL_SINGLETON)) {
- VALUE v = rb_iv_get(data->klass, "__attached__");
-
- if (data->recv == Qundef) {
- rb_str_buf_append(str, rb_inspect(data->klass));
- }
- else if (data->recv == v) {
- rb_str_buf_append(str, rb_inspect(v));
- sharp = ".";
- }
- else {
- rb_str_buf_append(str, rb_inspect(data->recv));
- rb_str_buf_cat2(str, "(");
- rb_str_buf_append(str, rb_inspect(v));
- rb_str_buf_cat2(str, ")");
- sharp = ".";
- }
- }
- else {
- rb_str_buf_cat2(str, rb_class2name(data->rklass));
- if (data->rklass != data->klass) {
- VALUE klass = data -> klass;
- if (TYPE(klass) == T_ICLASS) {
- klass = RBASIC(klass)->klass;
- }
- rb_str_buf_cat2(str, "(");
- rb_str_buf_cat2(str, rb_class2name(klass));
- rb_str_buf_cat2(str, ")");
- }
- }
- rb_str_buf_cat2(str, sharp);
- rb_str_buf_cat2(str, rb_id2name(data->oid));
- rb_str_buf_cat2(str, ">");
+ str = rb_str_new2("#<");
+ s = rb_class2name(CLASS_OF(method));
+ rb_str_cat2(str, s);
+ rb_str_cat2(str, ": ");
+ s = rb_class2name(data->oklass);
+ rb_str_cat2(str, s);
+ rb_str_cat2(str, "(");
+ s = rb_class2name(data->klass);
+ rb_str_cat2(str, s);
+ rb_str_cat2(str, ")#");
+ s = rb_id2name(data->oid);
+ rb_str_cat2(str, s);
+ rb_str_cat2(str, ">");
return str;
}
static VALUE
-mproc(method)
- VALUE method;
+mproc()
{
VALUE proc;
/* emulate ruby's method call */
PUSH_ITER(ITER_CUR);
PUSH_FRAME();
- proc = rb_block_proc();
+ proc = rb_f_lambda();
POP_FRAME();
POP_ITER();
@@ -9517,100 +6756,36 @@ static VALUE
bmcall(args, method)
VALUE args, method;
{
- volatile VALUE a;
- VALUE ret;
-
- a = svalue_to_avalue(args);
- ret = method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
- a = Qnil; /* prevent tail call */
- return ret;
+ if (TYPE(args) == T_ARRAY) {
+ return method_call(RARRAY(args)->len, RARRAY(args)->ptr, method);
+ }
+ return method_call(1, &args, method);
}
-VALUE
-rb_proc_new(func, val)
- VALUE (*func)(ANYARGS); /* VALUE yieldarg[, VALUE procarg] */
- VALUE val;
+static VALUE
+umcall(args, method)
+ VALUE args, method;
{
- struct BLOCK *data;
- VALUE proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, func, val);
-
- Data_Get_Struct(proc, struct BLOCK, data);
- data->body->nd_state = YIELD_FUNC_AVALUE;
- return proc;
+ if (TYPE(args) == T_ARRAY) {
+ return umethod_call(RARRAY(args)->len, RARRAY(args)->ptr, method);
+ }
+ return umethod_call(1, &args, method);
}
-/*
- * call-seq:
- * meth.to_proc => prc
- *
- * Returns a <code>Proc</code> object corresponding to this method.
- */
-
static VALUE
method_proc(method)
VALUE method;
{
- VALUE proc;
- struct METHOD *mdata;
- struct BLOCK *bdata;
-
- proc = rb_iterate((VALUE(*)_((VALUE)))mproc, 0, bmcall, method);
- Data_Get_Struct(method, struct METHOD, mdata);
- Data_Get_Struct(proc, struct BLOCK, bdata);
- bdata->body->nd_file = mdata->body->nd_file;
- nd_set_line(bdata->body, nd_line(mdata->body));
- bdata->body->nd_state = YIELD_FUNC_SVALUE;
-
- return proc;
+ return rb_iterate(mproc, 0, bmcall, method);
}
static VALUE
-rb_obj_is_method(m)
- VALUE m;
+umethod_proc(method)
+ VALUE method;
{
- if (TYPE(m) == T_DATA && RDATA(m)->dmark == (RUBY_DATA_FUNC)bm_mark) {
- return Qtrue;
- }
- return Qfalse;
+ return rb_iterate(mproc, 0, umcall, method);
}
-/*
- * call-seq:
- * define_method(symbol, method) => new_method
- * define_method(symbol) { block } => proc
- *
- * Defines an instance method in the receiver. The _method_
- * parameter can be a +Proc+ or +Method+ object.
- * If a block is specified, it is used as the method body. This block
- * is evaluated using <code>instance_eval</code>, a point that is
- * tricky to demonstrate because <code>define_method</code> is private.
- * (This is why we resort to the +send+ hack in this example.)
- *
- * class A
- * def fred
- * puts "In Fred"
- * end
- * def create_method(name, &block)
- * self.class.send(:define_method, name, &block)
- * end
- * define_method(:wilma) { puts "Charge it!" }
- * end
- * class B < A
- * define_method(:barney, instance_method(:fred))
- * end
- * a = B.new
- * a.barney
- * a.wilma
- * a.create_method(:betty) { p self }
- * a.betty
- *
- * <em>produces:</em>
- *
- * In Fred
- * Charge it!
- * #<B:0x401b39e8>
- */
-
static VALUE
rb_mod_define_method(argc, argv, mod)
int argc;
@@ -9619,109 +6794,60 @@ rb_mod_define_method(argc, argv, mod)
{
ID id;
VALUE body;
- NODE *node;
- int noex;
if (argc == 1) {
id = rb_to_id(argv[0]);
- body = proc_lambda();
+ body = rb_f_lambda();
}
else if (argc == 2) {
id = rb_to_id(argv[0]);
body = argv[1];
- if (!rb_obj_is_method(body) && !rb_obj_is_proc(body)) {
- rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)",
- rb_obj_classname(body));
- }
}
else {
- rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)", argc);
+ }
+ if (TYPE(body) != T_DATA) {
+ /* type error */
+ rb_raise(rb_eTypeError, "wrong argument type (expected Proc)");
}
if (RDATA(body)->dmark == (RUBY_DATA_FUNC)bm_mark) {
- node = NEW_DMETHOD(method_unbind(body));
+ rb_add_method(mod, id, NEW_DMETHOD(method_unbind(body)), NOEX_PUBLIC);
}
else if (RDATA(body)->dmark == (RUBY_DATA_FUNC)blk_mark) {
- struct BLOCK *block;
-
- body = proc_clone(body);
- Data_Get_Struct(body, struct BLOCK, block);
- block->frame.last_func = id;
- block->frame.orig_func = id;
- block->frame.last_class = mod;
- node = NEW_BMETHOD(body);
+ rb_add_method(mod, id, NEW_BMETHOD(body), NOEX_PUBLIC);
}
else {
/* type error */
- rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)");
+ rb_raise(rb_eTypeError, "wrong argument type (expected Proc)");
}
- noex = NOEX_PUBLIC;
- if (ruby_cbase == mod) {
- if (SCOPE_TEST(SCOPE_PRIVATE)) {
- noex = NOEX_PRIVATE;
- }
- else if (SCOPE_TEST(SCOPE_PROTECTED)) {
- noex = NOEX_PROTECTED;
- }
- }
- rb_add_method(mod, id, node, noex);
+ rb_clear_cache_by_id(id);
return body;
}
-/*
- * <code>Proc</code> objects are blocks of code that have been bound to
- * a set of local variables. Once bound, the code may be called in
- * different contexts and still access those variables.
- *
- * def gen_times(factor)
- * return Proc.new {|n| n*factor }
- * end
- *
- * times3 = gen_times(3)
- * times5 = gen_times(5)
- *
- * times3.call(12) #=> 36
- * times5.call(5) #=> 25
- * times3.call(times5.call(4)) #=> 60
- *
- */
-
void
Init_Proc()
{
rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError);
- rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0);
- rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
-
- rb_global_variable(&exception_error);
- exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
-
rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
- rb_global_variable(&sysstack_error);
- sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
- OBJ_TAINT(sysstack_error);
rb_cProc = rb_define_class("Proc", rb_cObject);
- rb_undef_alloc_func(rb_cProc);
rb_define_singleton_method(rb_cProc, "new", proc_s_new, -1);
- rb_define_method(rb_cProc, "clone", proc_clone, 0);
- rb_define_method(rb_cProc, "dup", proc_dup, 0);
rb_define_method(rb_cProc, "call", proc_call, -2);
rb_define_method(rb_cProc, "arity", proc_arity, 0);
rb_define_method(rb_cProc, "[]", proc_call, -2);
rb_define_method(rb_cProc, "==", proc_eq, 1);
rb_define_method(rb_cProc, "to_s", proc_to_s, 0);
- rb_define_method(rb_cProc, "to_proc", proc_to_self, 0);
- rb_define_method(rb_cProc, "binding", proc_binding, 0);
-
- rb_define_global_function("proc", proc_lambda, 0);
- rb_define_global_function("lambda", proc_lambda, 0);
+ rb_define_global_function("proc", rb_f_lambda, 0);
+ rb_define_global_function("lambda", rb_f_lambda, 0);
+ rb_define_global_function("binding", rb_f_binding, 0);
+ rb_cBinding = rb_define_class("Binding", rb_cObject);
+ rb_undef_method(CLASS_OF(rb_cBinding), "new");
+ rb_define_method(rb_cBinding, "clone", bind_clone, 0);
rb_cMethod = rb_define_class("Method", rb_cObject);
- rb_undef_alloc_func(rb_cMethod);
rb_undef_method(CLASS_OF(rb_cMethod), "new");
- rb_define_method(rb_cMethod, "==", method_eq, 1);
rb_define_method(rb_cMethod, "clone", method_clone, 0);
rb_define_method(rb_cMethod, "call", method_call, -1);
rb_define_method(rb_cMethod, "[]", method_call, -1);
@@ -9732,121 +6858,16 @@ Init_Proc()
rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
- rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cObject);
- rb_undef_alloc_func(rb_cUnboundMethod);
- rb_undef_method(CLASS_OF(rb_cUnboundMethod), "new");
- rb_define_method(rb_cUnboundMethod, "==", method_eq, 1);
- rb_define_method(rb_cUnboundMethod, "clone", method_clone, 0);
- rb_define_method(rb_cUnboundMethod, "arity", method_arity, 0);
- rb_define_method(rb_cUnboundMethod, "inspect", method_inspect, 0);
- rb_define_method(rb_cUnboundMethod, "to_s", method_inspect, 0);
+ rb_cUnboundMethod = rb_define_class("UnboundMethod", rb_cMethod);
+ rb_define_method(rb_cUnboundMethod, "call", umethod_call, -1);
+ rb_define_method(rb_cUnboundMethod, "[]", umethod_call, -1);
+ rb_define_method(rb_cUnboundMethod, "to_proc", umethod_proc, 0);
rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
+ rb_define_method(rb_cUnboundMethod, "unbind", umethod_unbind, 0);
rb_define_method(rb_cModule, "instance_method", rb_mod_method, 1);
}
-/*
- * Objects of class <code>Binding</code> encapsulate the execution
- * context at some particular place in the code and retain this context
- * for future use. The variables, methods, value of <code>self</code>,
- * and possibly an iterator block that can be accessed in this context
- * are all retained. Binding objects can be created using
- * <code>Kernel#binding</code>, and are made available to the callback
- * of <code>Kernel#set_trace_func</code>.
- *
- * These binding objects can be passed as the second argument of the
- * <code>Kernel#eval</code> method, establishing an environment for the
- * evaluation.
- *
- * class Demo
- * def initialize(n)
- * @secret = n
- * end
- * def getBinding
- * return binding()
- * end
- * end
- *
- * k1 = Demo.new(99)
- * b1 = k1.getBinding
- * k2 = Demo.new(-3)
- * b2 = k2.getBinding
- *
- * eval("@secret", b1) #=> 99
- * eval("@secret", b2) #=> -3
- * eval("@secret") #=> nil
- *
- * Binding objects have no class-specific methods.
- *
- */
-
-void
-Init_Binding()
-{
- rb_cBinding = rb_define_class("Binding", rb_cObject);
- rb_undef_alloc_func(rb_cBinding);
- rb_undef_method(CLASS_OF(rb_cBinding), "new");
- rb_define_method(rb_cBinding, "clone", proc_clone, 0);
- rb_define_method(rb_cBinding, "dup", proc_dup, 0);
- rb_define_global_function("binding", rb_f_binding, 0);
-}
-
-/* Windows SEH refers data on the stack. */
-#undef SAVE_WIN32_EXCEPTION_LIST
-#if defined _WIN32 || defined __CYGWIN__
-#if defined __CYGWIN__
-typedef unsigned long DWORD;
-#endif
-
-static inline DWORD
-win32_get_exception_list()
-{
- DWORD p;
-# if defined _MSC_VER
-# ifdef _M_IX86
-# define SAVE_WIN32_EXCEPTION_LIST
-# if _MSC_VER >= 1310
- /* warning: unsafe assignment to fs:0 ... this is ok */
-# pragma warning(disable: 4733)
-# endif
- __asm mov eax, fs:[0];
- __asm mov p, eax;
-# endif
-# elif defined __GNUC__
-# ifdef __i386__
-# define SAVE_WIN32_EXCEPTION_LIST
- __asm__("movl %%fs:0,%0" : "=r"(p));
-# endif
-# elif defined __BORLANDC__
-# define SAVE_WIN32_EXCEPTION_LIST
- __emit__(0x64, 0xA1, 0, 0, 0, 0); /* mov eax, fs:[0] */
- p = _EAX;
-# endif
- return p;
-}
-
-static inline void
-win32_set_exception_list(p)
- DWORD p;
-{
-# if defined _MSC_VER
-# ifdef _M_IX86
- __asm mov eax, p;
- __asm mov fs:[0], eax;
-# endif
-# elif defined __GNUC__
-# ifdef __i386__
- __asm__("movl %0,%%fs:0" :: "r"(p));
-# endif
-# elif defined __BORLANDC__
- _EAX = p;
- __emit__(0x64, 0xA3, 0, 0, 0, 0); /* mov fs:[0], eax */
-# endif
-}
-
-#if !defined SAVE_WIN32_EXCEPTION_LIST && !defined _WIN32_WCE
-# error unsupported platform
-#endif
-#endif
+static VALUE rb_eThreadError;
int rb_thread_pending = 0;
@@ -9854,6 +6875,13 @@ VALUE rb_cThread;
extern VALUE rb_last_status;
+enum thread_status {
+ THREAD_TO_KILL,
+ THREAD_RUNNABLE,
+ THREAD_STOPPED,
+ THREAD_KILLED
+};
+
#define WAIT_FD (1<<0)
#define WAIT_SELECT (1<<1)
#define WAIT_TIME (1<<2)
@@ -9863,27 +6891,33 @@ extern VALUE rb_last_status;
/* +infty, for this purpose */
#define DELAY_INFTY 1E30
-#if !defined HAVE_PAUSE
-# if defined _WIN32 && !defined __CYGWIN__
-# define pause() Sleep(INFINITE)
-# else
-# define pause() sleep(0x7fffffff)
-# endif
-#endif
+/* typedef struct thread * rb_thread_t; */
-#define THREAD_RAISED 0x200 /* temporary flag */
-#define THREAD_TERMINATING 0x400 /* persistent flag */
-#define THREAD_NO_ENSURE 0x800 /* persistent flag */
-#define THREAD_FLAGS_MASK 0xc00 /* mask for persistent flags */
+struct thread {
+ struct thread *next, *prev;
+ jmp_buf context;
-#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
-#define END_FOREACH_FROM(f,x) } while (x != f)
+ VALUE result;
-#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x)
-#define END_FOREACH(x) END_FOREACH_FROM(curr_thread,x)
+ int stk_len;
+ int stk_max;
+ VALUE*stk_ptr;
+ VALUE*stk_pos;
-struct thread_status_t {
- NODE *node;
+ struct FRAME *frame;
+ struct SCOPE *scope;
+ struct RVarmap *dyna_vars;
+ struct BLOCK *block;
+ struct iter *iter;
+ struct tag *tag;
+ VALUE klass;
+ VALUE wrapper;
+ NODE *cref;
+
+ int flags; /* misc. states (vmode/rb_trap_immediate/raised) */
+
+ char *file;
+ int line;
int tracing;
VALUE errinfo;
@@ -9893,7 +6927,7 @@ struct thread_status_t {
int safe;
- enum rb_thread_status status;
+ enum thread_status status;
int wait_for;
int fd;
fd_set readfds;
@@ -9902,114 +6936,25 @@ struct thread_status_t {
int select_value;
double delay;
rb_thread_t join;
-};
-#define THREAD_COPY_STATUS(src, dst) (void)( \
- (dst)->node = (src)->node, \
- \
- (dst)->tracing = (src)->tracing, \
- (dst)->errinfo = (src)->errinfo, \
- (dst)->last_status = (src)->last_status, \
- (dst)->last_line = (src)->last_line, \
- (dst)->last_match = (src)->last_match, \
- \
- (dst)->safe = (src)->safe, \
- \
- (dst)->status = (src)->status, \
- (dst)->wait_for = (src)->wait_for, \
- (dst)->fd = (src)->fd, \
- (dst)->readfds = (src)->readfds, \
- (dst)->writefds = (src)->writefds, \
- (dst)->exceptfds = (src)->exceptfds, \
- (dst)->select_value = (src)->select_value, \
- (dst)->delay = (src)->delay, \
- (dst)->join = (src)->join, \
- 0)
+ int abort;
+ int priority;
+ int gid;
-static int
-thread_set_raised()
-{
- if (curr_thread->flags & THREAD_RAISED) return 1;
- curr_thread->flags |= THREAD_RAISED;
- return 0;
-}
+ st_table *locals;
-static int
-thread_reset_raised()
-{
- if (!(curr_thread->flags & THREAD_RAISED)) return 0;
- curr_thread->flags &= ~THREAD_RAISED;
- return 1;
-}
-
-static int
-thread_no_ensure()
-{
- return ((curr_thread->flags & THREAD_NO_ENSURE) == THREAD_NO_ENSURE);
-}
-
-static void rb_thread_ready _((rb_thread_t));
-
-static VALUE run_trap_eval _((VALUE));
-static VALUE
-run_trap_eval(arg)
- VALUE arg;
-{
- VALUE *p = (VALUE *)arg;
- return rb_eval_cmd(p[0], p[1], (int)p[2]);
-}
-
-static VALUE
-rb_trap_eval(cmd, sig, safe)
- VALUE cmd;
- int sig, safe;
-{
- int state;
- VALUE val = Qnil; /* OK */
- volatile struct thread_status_t save;
- VALUE arg[3];
-
- arg[0] = cmd;
- arg[1] = rb_ary_new3(1, INT2FIX(sig));
- arg[2] = (VALUE)safe;
- THREAD_COPY_STATUS(curr_thread, &save);
- rb_thread_ready(curr_thread);
- PUSH_ITER(ITER_NOT);
- val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
- POP_ITER();
- THREAD_COPY_STATUS(&save, curr_thread);
-
- if (state) {
- rb_trap_immediate = 0;
- rb_thread_ready(curr_thread);
- JUMP_TAG(state);
- }
+ VALUE thread;
+};
- if (curr_thread->status == THREAD_STOPPED) {
- rb_thread_schedule();
- }
- errno = EINTR;
+#define THREAD_RAISED 0x200 /* temporary flag */
+#define THREAD_TERMINATING 0x400 /* persistent flag */
+#define THREAD_FLAGS_MASK 0x400 /* mask for persistent flags */
- return val;
-}
+#define FOREACH_THREAD_FROM(f,x) x = f; do { x = x->next;
+#define END_FOREACH_FROM(f,x) } while (x != f)
-static const char *
-thread_status_name(status)
- enum rb_thread_status status;
-{
- switch (status) {
- case THREAD_RUNNABLE:
- return "run";
- case THREAD_STOPPED:
- return "sleep";
- case THREAD_TO_KILL:
- return "aborting";
- case THREAD_KILLED:
- return "dead";
- default:
- return "unknown";
- }
-}
+#define FOREACH_THREAD(x) FOREACH_THREAD_FROM(curr_thread,x)
+#define END_FOREACH(x) END_FOREACH_FROM(curr_thread,x)
/* $SAFE accessor */
void
@@ -10017,7 +6962,6 @@ rb_set_safe_level(level)
int level;
{
if (level > ruby_safe_level) {
- if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
ruby_safe_level = level;
curr_thread->safe = level;
}
@@ -10039,7 +6983,6 @@ safe_setter(val)
rb_raise(rb_eSecurityError, "tried to downgrade safe level from %d to %d",
ruby_safe_level, level);
}
- if (level > SAFE_LEVEL_MAX) level = SAFE_LEVEL_MAX;
ruby_safe_level = level;
curr_thread->safe = level;
}
@@ -10055,6 +6998,7 @@ timeofday()
#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
+
static void
thread_mark(th)
rb_thread_t th;
@@ -10068,17 +7012,14 @@ thread_mark(th)
rb_gc_mark(th->klass);
rb_gc_mark(th->wrapper);
- rb_gc_mark((VALUE)th->cref);
+ rb_gc_mark(th->cref);
- rb_gc_mark((VALUE)th->scope);
- rb_gc_mark((VALUE)th->dyna_vars);
+ rb_gc_mark(th->scope);
+ rb_gc_mark(th->dyna_vars);
rb_gc_mark(th->errinfo);
- rb_gc_mark(th->last_status);
rb_gc_mark(th->last_line);
rb_gc_mark(th->last_match);
rb_mark_tbl(th->locals);
- rb_gc_mark(th->thgroup);
- rb_gc_mark_maybe(th->sandbox);
/* mark data in copied stack */
if (th == curr_thread) return;
@@ -10089,11 +7030,6 @@ thread_mark(th)
#if defined(THINK_C) || defined(__human68k__)
rb_gc_mark_locations(th->stk_ptr+2, th->stk_ptr+th->stk_len+2);
#endif
-#ifdef __ia64
- if (th->bstr_ptr) {
- rb_gc_mark_locations(th->bstr_ptr, th->bstr_ptr+th->bstr_len);
- }
-#endif
}
frame = th->frame;
while (frame && frame != top_frame) {
@@ -10118,57 +7054,15 @@ thread_mark(th)
}
}
-static int
-mark_loading_thread(key, value, lev)
- ID key;
- VALUE value;
- int lev;
-{
- rb_gc_mark(((rb_thread_t)value)->thread);
- return ST_CONTINUE;
-}
-
void
rb_gc_mark_threads()
{
rb_thread_t th;
- /* static global mark */
- rb_gc_mark((VALUE)ruby_cref);
-
if (!curr_thread) return;
- rb_gc_mark(main_thread->thread);
- rb_gc_mark(curr_thread->thread);
- FOREACH_THREAD_FROM(main_thread, th) {
- switch (th->status) {
- case THREAD_TO_KILL:
- case THREAD_RUNNABLE:
- break;
- case THREAD_STOPPED:
- if (th->wait_for) break;
- default:
- continue;
- }
+ FOREACH_THREAD(th) {
rb_gc_mark(th->thread);
- } END_FOREACH_FROM(main_thread, th);
- if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0);
-}
-
-void
-rb_gc_abort_threads()
-{
- rb_thread_t th;
-
- if (!main_thread)
- return;
-
- FOREACH_THREAD_FROM(main_thread, th) {
- if (FL_TEST(th->thread, FL_MARK)) continue;
- if (th->status == THREAD_STOPPED) {
- th->status = THREAD_TO_KILL;
- rb_gc_mark(th->thread);
- }
- } END_FOREACH_FROM(main_thread, th);
+ } END_FOREACH(th);
}
static void
@@ -10177,10 +7071,6 @@ thread_free(th)
{
if (th->stk_ptr) free(th->stk_ptr);
th->stk_ptr = 0;
-#ifdef __ia64
- if (th->bstr_ptr) free(th->bstr_ptr);
- th->bstr_ptr = 0;
-#endif
if (th->locals) st_free_table(th->locals);
if (th->status != THREAD_KILLED) {
if (th->prev) th->prev->next = th->next;
@@ -10193,19 +7083,22 @@ static rb_thread_t
rb_thread_check(data)
VALUE data;
{
- if (TYPE(data) != T_DATA || RDATA(data)->dmark != (RUBY_DATA_FUNC)thread_mark) {
+ if (TYPE(data) != T_DATA || RDATA(data)->dfree != (RUBY_DATA_FUNC)thread_free) {
rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
- rb_obj_classname(data));
+ rb_class2name(CLASS_OF(data)));
}
return (rb_thread_t)RDATA(data)->data;
}
static VALUE rb_thread_raise _((int, VALUE*, rb_thread_t));
-static VALUE th_raise_exception;
-static NODE *th_raise_node;
+static int th_raise_argc;
+static VALUE th_raise_argv[2];
+static char *th_raise_file;
+static int th_raise_line;
static VALUE th_cmd;
-static int th_sig, th_safe;
+static int th_sig;
+static char *th_signm;
#define RESTORE_NORMAL 1
#define RESTORE_FATAL 2
@@ -10213,12 +7106,6 @@ static int th_sig, th_safe;
#define RESTORE_TRAP 4
#define RESTORE_RAISE 5
#define RESTORE_SIGNAL 6
-#define RESTORE_EXIT 7
-
-extern VALUE *rb_gc_stack_start;
-#ifdef __ia64
-extern VALUE *rb_gc_register_stack_start;
-#endif
static void
rb_thread_save_context(th)
@@ -10226,41 +7113,21 @@ rb_thread_save_context(th)
{
VALUE *pos;
int len;
- static VALUE tval;
- len = ruby_stack_length(&pos);
+ len = stack_length(&pos);
th->stk_len = 0;
- th->stk_pos = pos;
+ th->stk_pos = (rb_gc_stack_start<pos)?rb_gc_stack_start
+ :rb_gc_stack_start - len;
if (len > th->stk_max) {
- VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
- if (!ptr) rb_memerror();
- th->stk_ptr = ptr;
+ REALLOC_N(th->stk_ptr, VALUE, len);
th->stk_max = len;
}
th->stk_len = len;
- FLUSH_REGISTER_WINDOWS;
+ FLUSH_REGISTER_WINDOWS;
MEMCPY(th->stk_ptr, th->stk_pos, VALUE, th->stk_len);
-#ifdef __ia64
- th->bstr_pos = rb_gc_register_stack_start;
- len = (VALUE*)rb_ia64_bsp() - th->bstr_pos;
- th->bstr_len = 0;
- if (len > th->bstr_max) {
- VALUE *ptr = realloc(th->bstr_ptr, sizeof(VALUE) * len);
- if (!ptr) rb_memerror();
- th->bstr_ptr = ptr;
- th->bstr_max = len;
- }
- th->bstr_len = len;
- rb_ia64_flushrs();
- MEMCPY(th->bstr_ptr, th->bstr_pos, VALUE, th->bstr_len);
-#endif
-#ifdef SAVE_WIN32_EXCEPTION_LIST
- th->win32_exception_list = win32_get_exception_list();
-#endif
th->frame = ruby_frame;
th->scope = ruby_scope;
- ruby_scope->flags |= SCOPE_DONT_RECYCLE;
th->klass = ruby_class;
th->wrapper = ruby_wrapper;
th->cref = ruby_cref;
@@ -10273,26 +7140,18 @@ rb_thread_save_context(th)
th->tracing = tracing;
th->errinfo = ruby_errinfo;
th->last_status = rb_last_status;
- tval = rb_lastline_get();
- rb_lastline_set(th->last_line);
- th->last_line = tval;
- tval = rb_backref_get();
- rb_backref_set(th->last_match);
- th->last_match = tval;
+ th->last_line = rb_lastline_get();
+ th->last_match = rb_backref_get();
th->safe = ruby_safe_level;
- th->node = ruby_current_node;
- if (ruby_sandbox_save != NULL)
- {
- ruby_sandbox_save(th);
- }
+ th->file = ruby_sourcefile;
+ th->line = ruby_sourceline;
}
static int
-rb_thread_switch(n)
+thread_switch(n)
int n;
{
- rb_trap_immediate = (curr_thread->flags&0x100)?1:0;
switch (n) {
case 0:
return 0;
@@ -10303,23 +7162,17 @@ rb_thread_switch(n)
rb_interrupt();
break;
case RESTORE_TRAP:
- rb_trap_eval(th_cmd, th_sig, th_safe);
+ rb_trap_eval(th_cmd, th_sig);
+ errno = EINTR;
break;
case RESTORE_RAISE:
ruby_frame->last_func = 0;
- ruby_current_node = th_raise_node;
- rb_raise_jump(th_raise_exception);
+ ruby_sourcefile = th_raise_file;
+ ruby_sourceline = th_raise_line;
+ rb_f_raise(th_raise_argc, th_raise_argv);
break;
case RESTORE_SIGNAL:
- rb_thread_signal_raise(th_sig);
- break;
- case RESTORE_EXIT:
- ruby_errinfo = th_raise_exception;
- ruby_current_node = th_raise_node;
- if (!rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
- terminate_process(EXIT_FAILURE, ruby_errinfo);
- }
- rb_exc_raise(th_raise_exception);
+ rb_raise(rb_eSignal, "SIG%s", th_signm);
break;
case RESTORE_NORMAL:
default:
@@ -10329,24 +7182,41 @@ rb_thread_switch(n)
}
#define THREAD_SAVE_CONTEXT(th) \
- (rb_thread_switch((FLUSH_REGISTER_WINDOWS, ruby_setjmp(rb_thread_save_context(th), (th)->context))))
+ (rb_thread_save_context(th),thread_switch(setjmp((th)->context)))
-NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
-NORETURN(NOINLINE(static void rb_thread_restore_context_0(rb_thread_t,int,void*)));
-NORETURN(NOINLINE(static void stack_extend(rb_thread_t, int, VALUE *)));
+static void rb_thread_restore_context _((rb_thread_t,int));
static void
-rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
+stack_extend(th, exit)
+ rb_thread_t th;
+ int exit;
{
+ VALUE space[1024];
+
+ memset(space, 0, 1); /* prevent array from optimization */
+ rb_thread_restore_context(th, exit);
+}
+
+static void
+rb_thread_restore_context(th, exit)
+ rb_thread_t th;
+ int exit;
+{
+ VALUE v;
static rb_thread_t tmp;
static int ex;
- static VALUE tval;
- rb_trap_immediate = 0; /* inhibit interrupts from here */
- if (ruby_sandbox_restore != NULL)
- {
- ruby_sandbox_restore(th);
+ if (!th->stk_ptr) rb_bug("unsaved context");
+
+ if (&v < rb_gc_stack_start) {
+ /* Stack grows downward */
+ if (&v > th->stk_pos) stack_extend(th, exit);
}
+ else {
+ /* Stack grows upward */
+ if (&v < th->stk_pos + th->stk_len) stack_extend(th, exit);
+ }
+
ruby_frame = th->frame;
ruby_scope = th->scope;
ruby_class = th->klass;
@@ -10355,6 +7225,7 @@ rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
ruby_dyna_vars = th->dyna_vars;
ruby_block = th->block;
scope_vmode = th->flags&SCOPE_MASK;
+ rb_trap_immediate = (th->flags&0x100)?1:0;
ruby_iter = th->iter;
prot_tag = th->tag;
tracing = th->tracing;
@@ -10362,99 +7233,18 @@ rb_thread_restore_context_0(rb_thread_t th, int exit, void *vp)
rb_last_status = th->last_status;
ruby_safe_level = th->safe;
- ruby_current_node = th->node;
+ ruby_sourcefile = th->file;
+ ruby_sourceline = th->line;
-#ifdef SAVE_WIN32_EXCEPTION_LIST
- win32_set_exception_list(th->win32_exception_list);
-#endif
tmp = th;
ex = exit;
FLUSH_REGISTER_WINDOWS;
MEMCPY(tmp->stk_pos, tmp->stk_ptr, VALUE, tmp->stk_len);
-#ifdef __ia64
- MEMCPY(tmp->bstr_pos, tmp->bstr_ptr, VALUE, tmp->bstr_len);
-#endif
- tval = rb_lastline_get();
rb_lastline_set(tmp->last_line);
- tmp->last_line = tval;
- tval = rb_backref_get();
rb_backref_set(tmp->last_match);
- tmp->last_match = tval;
-
- ruby_longjmp(tmp->context, ex);
-}
-
-#ifdef __ia64
-#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
-#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
-static volatile int C(a), C(b), C(c), C(d), C(e);
-static volatile int C(f), C(g), C(h), C(i), C(j);
-static volatile int C(k), C(l), C(m), C(n), C(o);
-static volatile int C(p), C(q), C(r), C(s), C(t);
-int rb_dummy_false = 0;
-NORETURN(NOINLINE(static void register_stack_extend(rb_thread_t, int, void *, VALUE *)));
-static void
-register_stack_extend(rb_thread_t th, int exit, void *vp, VALUE *curr_bsp)
-{
- if (rb_dummy_false) {
- /* use registers as much as possible */
- E(a) = E(b) = E(c) = E(d) = E(e) =
- E(f) = E(g) = E(h) = E(i) = E(j) =
- E(k) = E(l) = E(m) = E(n) = E(o) =
- E(p) = E(q) = E(r) = E(s) = E(t) = 0;
- E(a) = E(b) = E(c) = E(d) = E(e) =
- E(f) = E(g) = E(h) = E(i) = E(j) =
- E(k) = E(l) = E(m) = E(n) = E(o) =
- E(p) = E(q) = E(r) = E(s) = E(t) = 0;
- }
- if (curr_bsp < th->bstr_pos+th->bstr_len) {
- register_stack_extend(th, exit, &exit, (VALUE*)rb_ia64_bsp());
- }
- rb_thread_restore_context_0(th, exit, &exit);
-}
-#undef C
-#undef E
-#endif
-
-# if defined(_MSC_VER) && _MSC_VER >= 1300
-__declspec(noinline) static void stack_extend(rb_thread_t, int, VALUE*);
-# endif
-static void
-stack_extend(rb_thread_t th, int exit, VALUE *addr_in_prev_frame)
-{
-#define STACK_PAD_SIZE 1024
- VALUE space[STACK_PAD_SIZE];
-
-#if STACK_GROW_DIRECTION < 0
- if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
-#elif STACK_GROW_DIRECTION > 0
- if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
-#else
- if (addr_in_prev_frame < rb_gc_stack_start) {
- /* Stack grows downward */
- if (addr_in_prev_frame > th->stk_pos) stack_extend(th, exit, &space[0]);
- }
- else {
- /* Stack grows upward */
- if (addr_in_prev_frame < th->stk_pos + th->stk_len) stack_extend(th, exit, &space[STACK_PAD_SIZE-1]);
- }
-#endif
-#ifdef __ia64
- register_stack_extend(th, exit, space, (VALUE*)rb_ia64_bsp());
-#else
- rb_thread_restore_context_0(th, exit, space);
-#endif
-}
-static void
-rb_thread_restore_context(th, exit)
- rb_thread_t th;
- int exit;
-{
- VALUE v;
- if (!th->stk_ptr) rb_bug("unsaved context");
- stack_extend(th, exit, &v);
+ longjmp(tmp->context, ex);
}
static void
@@ -10462,19 +7252,7 @@ rb_thread_ready(th)
rb_thread_t th;
{
th->wait_for = 0;
- if (th->status != THREAD_TO_KILL) {
- th->status = THREAD_RUNNABLE;
- }
-}
-
-static void
-rb_thread_die(th)
- rb_thread_t th;
-{
- th->thgroup = 0;
- th->status = THREAD_KILLED;
- if (th->stk_ptr) free(th->stk_ptr);
- th->stk_ptr = 0;
+ th->status = THREAD_RUNNABLE;
}
static void
@@ -10484,7 +7262,7 @@ rb_thread_remove(th)
if (th->status == THREAD_KILLED) return;
rb_thread_ready(th);
- rb_thread_die(th);
+ th->status = THREAD_KILLED;
th->prev->next = th->next;
th->next->prev = th->prev;
}
@@ -10503,11 +7281,7 @@ rb_thread_fd_close(fd)
rb_thread_t th;
FOREACH_THREAD(th) {
- if (((th->wait_for & WAIT_FD) && fd == th->fd) ||
- ((th->wait_for & WAIT_SELECT) && (fd < th->fd) &&
- (FD_ISSET(fd, &th->readfds) ||
- FD_ISSET(fd, &th->writefds) ||
- FD_ISSET(fd, &th->exceptfds)))) {
+ if ((th->wait_for & WAIT_FD) && fd == th->fd) {
VALUE exc = rb_exc_new2(rb_eIOError, "stream closed");
rb_thread_raise(1, &exc, th);
}
@@ -10515,31 +7289,18 @@ rb_thread_fd_close(fd)
END_FOREACH(th);
}
-NORETURN(static void rb_thread_main_jump _((VALUE, int)));
-static void
-rb_thread_main_jump(err, tag)
- VALUE err;
- int tag;
-{
- curr_thread = main_thread;
- th_raise_exception = err;
- th_raise_node = ruby_current_node;
- rb_thread_restore_context(main_thread, tag);
-}
-
-NORETURN(static void rb_thread_deadlock _((void)));
static void
rb_thread_deadlock()
{
- char msg[21+SIZEOF_LONG*2];
- VALUE e;
-
- sprintf(msg, "Thread(0x%lx): deadlock", curr_thread->thread);
- e = rb_exc_new2(rb_eFatal, msg);
if (curr_thread == main_thread) {
- rb_exc_raise(e);
+ rb_raise(rb_eFatal, "Thread: deadlock");
}
- rb_thread_main_jump(e, RESTORE_RAISE);
+ curr_thread = main_thread;
+ th_raise_argc = 1;
+ th_raise_argv[0] = rb_exc_new2(rb_eFatal, "Thread: deadlock");
+ th_raise_file = ruby_sourcefile;
+ th_raise_line = ruby_sourceline;
+ rb_thread_restore_context(main_thread, RESTORE_RAISE);
}
static void
@@ -10573,26 +7334,24 @@ match_fds(dst, src, max)
return Qfalse;
}
-static int
+static void
intersect_fds(src, dst, max)
fd_set *src, *dst;
int max;
{
- int i, n = 0;
+ int i;
for (i=0; i<=max; i++) {
if (FD_ISSET(i, dst)) {
if (FD_ISSET(i, src)) {
/* Wake up only one thread per fd. */
FD_CLR(i, src);
- n++;
}
else {
FD_CLR(i, dst);
}
}
}
- return n;
}
static int
@@ -10626,13 +7385,7 @@ rb_thread_schedule()
double delay, now; /* OK */
int n, max;
int need_select = 0;
- int select_timeout = 0;
-#ifdef HAVE_NATIVETHREAD
- if (!is_ruby_native_thread()) {
- rb_bug("cross-thread violation on rb_thread_schedule()");
- }
-#endif
rb_thread_pending = 0;
if (curr_thread == curr_thread->next
&& curr_thread->status == THREAD_RUNNABLE)
@@ -10675,9 +7428,6 @@ rb_thread_schedule()
copy_fds(&exceptfds, &th->exceptfds, th->fd);
if (max < th->fd) max = th->fd;
need_select = 1;
- if (th->wait_for & WAIT_TIME) {
- select_timeout = 1;
- }
th->select_value = 0;
}
if (th->wait_for & WAIT_TIME) {
@@ -10688,18 +7438,17 @@ rb_thread_schedule()
if (th_delay <= 0.0) {
th->status = THREAD_RUNNABLE;
found = 1;
- }
- else if (th_delay < delay) {
+ } else if (th_delay < delay) {
delay = th_delay;
need_select = 1;
}
- else if (th->delay == DELAY_INFTY) {
+ if (th->delay == DELAY_INFTY) {
need_select = 1;
}
}
}
END_FOREACH_FROM(curr, th);
-
+
/* Do the select if needed */
if (need_select) {
/* Convert delay to a timeval */
@@ -10720,13 +7469,8 @@ rb_thread_schedule()
n = select(max+1, &readfds, &writefds, &exceptfds, delay_ptr);
if (n < 0) {
- int e = errno;
-
if (rb_trap_pending) rb_trap_exec();
- if (e == EINTR) goto again;
-#ifdef ERESTART
- if (e == ERESTART) goto again;
-#endif
+ if (errno == EINTR) goto again;
FOREACH_THREAD_FROM(curr, th) {
if (th->wait_for & WAIT_SELECT) {
int v = 0;
@@ -10742,25 +7486,9 @@ rb_thread_schedule()
}
END_FOREACH_FROM(curr, th);
}
- if (select_timeout && n == 0) {
- if (now < 0.0) now = timeofday();
- FOREACH_THREAD_FROM(curr, th) {
- if (((th->wait_for&(WAIT_SELECT|WAIT_TIME)) == (WAIT_SELECT|WAIT_TIME)) &&
- th->delay <= now) {
- th->status = THREAD_RUNNABLE;
- th->wait_for = 0;
- th->select_value = 0;
- found = 1;
- intersect_fds(&readfds, &th->readfds, max);
- intersect_fds(&writefds, &th->writefds, max);
- intersect_fds(&exceptfds, &th->exceptfds, max);
- }
- }
- END_FOREACH_FROM(curr, th);
- }
if (n > 0) {
now = -1.0;
- /* Some descriptors are ready.
+ /* Some descriptors are ready.
Make the corresponding threads runnable. */
FOREACH_THREAD_FROM(curr, th) {
if ((th->wait_for&WAIT_FD) && FD_ISSET(th->fd, &readfds)) {
@@ -10778,9 +7506,9 @@ rb_thread_schedule()
/* Wake up only one thread per fd. */
th->status = THREAD_RUNNABLE;
th->wait_for = 0;
- n = intersect_fds(&readfds, &th->readfds, max) +
- intersect_fds(&writefds, &th->writefds, max) +
- intersect_fds(&exceptfds, &th->exceptfds, max);
+ intersect_fds(&readfds, &th->readfds, max);
+ intersect_fds(&writefds, &th->writefds, max);
+ intersect_fds(&exceptfds, &th->exceptfds, max);
th->select_value = n;
found = 1;
}
@@ -10798,42 +7526,29 @@ rb_thread_schedule()
next = th;
break;
}
- if (th->status == THREAD_RUNNABLE && th->stk_ptr) {
- if (!next || next->priority < th->priority)
+ if (th->status == THREAD_RUNNABLE) {
+ if (!next || next->priority < th->priority)
next = th;
}
}
- END_FOREACH_FROM(curr, th);
+ END_FOREACH_FROM(curr, th);
if (!next) {
/* raise fatal error to main thread */
- curr_thread->node = ruby_current_node;
- if (curr->next == curr) {
- TRAP_BEG;
- pause();
- TRAP_END;
- }
+ curr_thread->file = ruby_sourcefile;
+ curr_thread->line = ruby_sourceline;
FOREACH_THREAD_FROM(curr, th) {
- warn_printf("deadlock 0x%lx: %s:",
- th->thread, thread_status_name(th->status));
- if (th->wait_for & WAIT_FD) warn_printf("F(%d)", th->fd);
- if (th->wait_for & WAIT_SELECT) warn_printf("S");
- if (th->wait_for & WAIT_TIME) warn_printf("T(%f)", th->delay);
- if (th->wait_for & WAIT_JOIN)
- warn_printf("J(0x%lx)", th->join ? th->join->thread : 0);
- if (th->wait_for & WAIT_PID) warn_printf("P");
- if (!th->wait_for) warn_printf("-");
- warn_printf(" %s - %s:%d\n",
- th==main_thread ? "(main)" : "",
- th->node->nd_file, nd_line(th->node));
+ fprintf(stderr, "deadlock 0x%lx: %d:%d %s - %s:%d\n",
+ th->thread, th->status,
+ th->wait_for, th==main_thread?"(main)":"",
+ th->file, th->line);
}
END_FOREACH_FROM(curr, th);
next = main_thread;
+ next->gid = 0;
rb_thread_ready(next);
next->status = THREAD_TO_KILL;
- if (!rb_thread_dead(curr_thread)) {
- rb_thread_save_context(curr_thread);
- }
+ rb_thread_save_context(curr_thread);
rb_thread_deadlock();
}
next->wait_for = 0;
@@ -10864,7 +7579,6 @@ rb_thread_wait_fd(fd)
int fd;
{
if (rb_thread_critical) return;
- if (ruby_in_compile) return;
if (curr_thread == curr_thread->next) return;
if (curr_thread->status == THREAD_TO_KILL) return;
@@ -10881,8 +7595,6 @@ rb_thread_fd_writable(fd)
if (rb_thread_critical) return Qtrue;
if (curr_thread == curr_thread->next) return Qtrue;
if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
- if (curr_thread->status == THREAD_KILLED) return Qtrue;
-
curr_thread->status = THREAD_STOPPED;
FD_ZERO(&curr_thread->readfds);
FD_ZERO(&curr_thread->writefds);
@@ -10904,25 +7616,19 @@ rb_thread_wait_for(time)
curr_thread == curr_thread->next ||
curr_thread->status == THREAD_TO_KILL) {
int n;
- int thr_critical = rb_thread_critical;
#ifndef linux
double d, limit;
limit = timeofday()+(double)time.tv_sec+(double)time.tv_usec*1e-6;
#endif
for (;;) {
- rb_thread_critical = Qtrue;
TRAP_BEG;
n = select(0, 0, 0, 0, &time);
- rb_thread_critical = thr_critical;
TRAP_END;
if (n == 0) return;
if (n < 0) {
switch (errno) {
case EINTR:
-#ifdef ERESTART
- case ERESTART:
-#endif
- break;
+ return;
default:
rb_sys_fail("sleep");
}
@@ -10962,9 +7668,7 @@ rb_thread_select(max, read, write, except, timeout)
fd_set *read, *write, *except;
struct timeval *timeout;
{
-#ifndef linux
double limit;
-#endif
int n;
if (!read && !write && !except) {
@@ -10976,12 +7680,10 @@ rb_thread_select(max, read, write, except, timeout)
return 0;
}
-#ifndef linux
if (timeout) {
limit = timeofday()+
(double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
}
-#endif
if (rb_thread_critical ||
curr_thread == curr_thread->next ||
@@ -10993,36 +7695,33 @@ rb_thread_select(max, read, write, except, timeout)
tv = *timeout;
tvp = &tv;
}
-#else
- struct timeval *const tvp = timeout;
-#endif
for (;;) {
TRAP_BEG;
n = select(max, read, write, except, tvp);
TRAP_END;
- if (n < 0) {
- switch (errno) {
- case EINTR:
-#ifdef ERESTART
- case ERESTART:
-#endif
-#ifndef linux
- if (timeout) {
- double d = limit - timeofday();
+ if (n < 0 && errno == EINTR) {
+ if (timeout) {
+ double d = timeofday() - limit;
- tv.tv_sec = (unsigned int)d;
- tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
- if (tv.tv_sec < 0) tv.tv_sec = 0;
- if (tv.tv_usec < 0) tv.tv_usec = 0;
- }
-#endif
- continue;
- default:
- break;
+ tv.tv_sec = (unsigned int)d;
+ tv.tv_usec = (long)((d-(double)tv.tv_sec)*1e6);
}
+ continue;
+ }
+ return n;
+ }
+#else
+ for (;;) {
+ TRAP_BEG;
+ n = select(max, read, write, except, timeout);
+ TRAP_END;
+ if (n < 0 && errno == EINTR) {
+ continue;
}
return n;
}
+#endif
+
}
curr_thread->status = THREAD_STOPPED;
@@ -11046,162 +7745,54 @@ rb_thread_select(max, read, write, except, timeout)
return curr_thread->select_value;
}
-static int rb_thread_join _((rb_thread_t, double));
-
-static int
-rb_thread_join(th, limit)
- rb_thread_t th;
- double limit;
+static VALUE
+rb_thread_join(thread)
+ VALUE thread;
{
- enum rb_thread_status last_status = THREAD_RUNNABLE;
+ rb_thread_t th = rb_thread_check(thread);
+ enum thread_status last_status = THREAD_RUNNABLE;
if (rb_thread_critical) rb_thread_deadlock();
if (!rb_thread_dead(th)) {
if (th == curr_thread)
- rb_raise(rb_eThreadError, "thread 0x%lx tried to join itself",
- th->thread);
+ rb_raise(rb_eThreadError, "thread tried to join itself");
if ((th->wait_for & WAIT_JOIN) && th->join == curr_thread)
- rb_raise(rb_eThreadError, "Thread#join: deadlock 0x%lx - mutual join(0x%lx)",
- curr_thread->thread, th->thread);
+ rb_raise(rb_eThreadError, "Thread#join: deadlock - mutual join");
if (curr_thread->status == THREAD_TO_KILL)
last_status = THREAD_TO_KILL;
- if (limit == 0) return Qfalse;
curr_thread->status = THREAD_STOPPED;
curr_thread->join = th;
curr_thread->wait_for = WAIT_JOIN;
- curr_thread->delay = timeofday() + limit;
- if (limit < DELAY_INFTY) curr_thread->wait_for |= WAIT_TIME;
rb_thread_schedule();
curr_thread->status = last_status;
- if (!rb_thread_dead(th)) return Qfalse;
}
if (!NIL_P(th->errinfo) && (th->flags & THREAD_RAISED)) {
VALUE oldbt = get_backtrace(th->errinfo);
VALUE errat = make_backtrace();
- VALUE errinfo = rb_obj_dup(th->errinfo);
if (TYPE(oldbt) == T_ARRAY && RARRAY(oldbt)->len > 0) {
rb_ary_unshift(errat, rb_ary_entry(oldbt, 0));
}
- set_backtrace(errinfo, errat);
- rb_exc_raise(errinfo);
+ set_backtrace(th->errinfo, errat);
+ rb_exc_raise(th->errinfo);
}
- return Qtrue;
-}
-
-
-/*
- * call-seq:
- * thr.join => thr
- * thr.join(limit) => thr
- *
- * The calling thread will suspend execution and run <i>thr</i>. Does not
- * return until <i>thr</i> exits or until <i>limit</i> seconds have passed. If
- * the time limit expires, <code>nil</code> will be returned, otherwise
- * <i>thr</i> is returned.
- *
- * Any threads not joined will be killed when the main program exits. If
- * <i>thr</i> had previously raised an exception and the
- * <code>abort_on_exception</code> and <code>$DEBUG</code> flags are not set
- * (so the exception has not yet been processed) it will be processed at this
- * time.
- *
- * a = Thread.new { print "a"; sleep(10); print "b"; print "c" }
- * x = Thread.new { print "x"; Thread.pass; print "y"; print "z" }
- * x.join # Let x thread finish, a will be killed on exit.
- *
- * <em>produces:</em>
- *
- * axyz
- *
- * The following example illustrates the <i>limit</i> parameter.
- *
- * y = Thread.new { 4.times { sleep 0.1; puts 'tick... ' }}
- * puts "Waiting" until y.join(0.15)
- *
- * <em>produces:</em>
- *
- * tick...
- * Waiting
- * tick...
- * Waitingtick...
- *
- *
- * tick...
- */
-
-static VALUE
-rb_thread_join_m(argc, argv, thread)
- int argc;
- VALUE *argv;
- VALUE thread;
-{
- VALUE limit;
- double delay = DELAY_INFTY;
- rb_thread_t th = rb_thread_check(thread);
-
- rb_scan_args(argc, argv, "01", &limit);
- if (!NIL_P(limit)) delay = rb_num2dbl(limit);
- if (!rb_thread_join(th, delay))
- return Qnil;
return thread;
}
-
-/*
- * call-seq:
- * Thread.current => thread
- *
- * Returns the currently executing thread.
- *
- * Thread.current #=> #<Thread:0x401bdf4c run>
- */
-
VALUE
rb_thread_current()
{
return curr_thread->thread;
}
-
-/*
- * call-seq:
- * Thread.main => thread
- *
- * Returns the main thread for the process.
- *
- * Thread.main #=> #<Thread:0x401bdf4c run>
- */
-
VALUE
rb_thread_main()
{
return main_thread->thread;
}
-
-/*
- * call-seq:
- * Thread.list => array
- *
- * Returns an array of <code>Thread</code> objects for all threads that are
- * either runnable or stopped.
- *
- * Thread.new { sleep(200) }
- * Thread.new { 1000000.times {|i| i*i } }
- * Thread.new { Thread.stop }
- * Thread.list.each {|t| p t}
- *
- * <em>produces:</em>
- *
- * #<Thread:0x401b3e84 sleep>
- * #<Thread:0x401b3f38 run>
- * #<Thread:0x401b3fb0 sleep>
- * #<Thread:0x401bdf4c run>
- */
-
VALUE
rb_thread_list()
{
@@ -11212,7 +7803,6 @@ rb_thread_list()
switch (th->status) {
case THREAD_RUNNABLE:
case THREAD_STOPPED:
- case THREAD_TO_KILL:
rb_ary_push(ary, th->thread);
default:
break;
@@ -11223,65 +7813,19 @@ rb_thread_list()
return ary;
}
-
-/*
- * call-seq:
- * thr.wakeup => thr
- *
- * Marks <i>thr</i> as eligible for scheduling (it may still remain blocked on
- * I/O, however). Does not invoke the scheduler (see <code>Thread#run</code>).
- *
- * c = Thread.new { Thread.stop; puts "hey!" }
- * c.wakeup
- *
- * <em>produces:</em>
- *
- * hey!
- */
-
VALUE
rb_thread_wakeup(thread)
VALUE thread;
{
- if (!RTEST(rb_thread_wakeup_alive(thread)))
- rb_raise(rb_eThreadError, "killed thread");
- return thread;
-}
-
-VALUE
-rb_thread_wakeup_alive(thread)
- VALUE thread;
-{
rb_thread_t th = rb_thread_check(thread);
if (th->status == THREAD_KILLED)
- return Qnil;
+ rb_raise(rb_eThreadError, "killed thread");
rb_thread_ready(th);
return thread;
}
-
-/*
- * call-seq:
- * thr.run => thr
- *
- * Wakes up <i>thr</i>, making it eligible for scheduling. If not in a critical
- * section, then invokes the scheduler.
- *
- * a = Thread.new { puts "a"; Thread.stop; puts "c" }
- * Thread.pass
- * puts "Got here"
- * a.run
- * a.join
- *
- * <em>produces:</em>
- *
- * a
- * Got here
- * c
- */
-
VALUE
rb_thread_run(thread)
VALUE thread;
@@ -11292,84 +7836,26 @@ rb_thread_run(thread)
return thread;
}
-
-static void
-rb_kill_thread(th, flags)
- rb_thread_t th;
- int flags;
+static VALUE
+rb_thread_kill(thread)
+ VALUE thread;
{
+ rb_thread_t th = rb_thread_check(thread);
+
if (th != curr_thread && th->safe < 4) {
rb_secure(4);
}
if (th->status == THREAD_TO_KILL || th->status == THREAD_KILLED)
- return;
- if (th == th->next || th == main_thread) rb_exit(EXIT_SUCCESS);
+ return thread;
+ if (th == th->next || th == main_thread) rb_exit(0);
rb_thread_ready(th);
- th->flags |= flags;
+ th->gid = 0;
th->status = THREAD_TO_KILL;
if (!rb_thread_critical) rb_thread_schedule();
-}
-
-
-/*
- * call-seq:
- * thr.exit => thr
- * thr.kill => thr
- * thr.terminate => thr
- *
- * Terminates <i>thr</i> and schedules another thread to be run, returning
- * the terminated <code>Thread</code>. If this is the main thread, or the
- * last thread, exits the process.
- */
-
-VALUE
-rb_thread_kill(thread)
- VALUE thread;
-{
- rb_thread_t th = rb_thread_check(thread);
-
- rb_kill_thread(th, 0);
return thread;
}
-
-/*
- * call-seq:
- * thr.exit! => thr
- * thr.kill! => thr
- * thr.terminate! => thr
- *
- * Terminates <i>thr</i> without calling ensure clauses and schedules
- * another thread to be run, returning the terminated <code>Thread</code>.
- * If this is the main thread, or the last thread, exits the process.
- *
- * See <code>Thread#exit</code> for the safer version.
- */
-
-static VALUE
-rb_thread_kill_bang(thread)
- VALUE thread;
-{
- rb_thread_t th = rb_thread_check(thread);
- rb_kill_thread(th, THREAD_NO_ENSURE);
- return thread;
-}
-
-/*
- * call-seq:
- * Thread.kill(thread) => thread
- *
- * Causes the given <em>thread</em> to exit (see <code>Thread::exit</code>).
- *
- * count = 0
- * a = Thread.new { loop { count += 1 } }
- * sleep(0.1) #=> 0
- * Thread.kill(a) #=> #<Thread:0x401b3d30 dead>
- * count #=> 93947
- * a.alive? #=> false
- */
-
static VALUE
rb_thread_s_kill(obj, th)
VALUE obj, th;
@@ -11377,44 +7863,12 @@ rb_thread_s_kill(obj, th)
return rb_thread_kill(th);
}
-
-/*
- * call-seq:
- * Thread.exit => thread
- *
- * Terminates the currently running thread and schedules another thread to be
- * run. If this thread is already marked to be killed, <code>exit</code>
- * returns the <code>Thread</code>. If this is the main thread, or the last
- * thread, exit the process.
- */
-
static VALUE
rb_thread_exit()
{
return rb_thread_kill(curr_thread->thread);
}
-
-/*
- * call-seq:
- * Thread.pass => nil
- *
- * Invokes the thread scheduler to pass execution to another thread.
- *
- * a = Thread.new { print "a"; Thread.pass;
- * print "b"; Thread.pass;
- * print "c" }
- * b = Thread.new { print "x"; Thread.pass;
- * print "y"; Thread.pass;
- * print "z" }
- * a.join
- * b.join
- *
- * <em>produces:</em>
- *
- * axbycz
- */
-
static VALUE
rb_thread_pass()
{
@@ -11422,30 +7876,10 @@ rb_thread_pass()
return Qnil;
}
-
-/*
- * call-seq:
- * Thread.stop => nil
- *
- * Stops execution of the current thread, putting it into a ``sleep'' state,
- * and schedules execution of another thread. Resets the ``critical'' condition
- * to <code>false</code>.
- *
- * a = Thread.new { print "a"; Thread.stop; print "c" }
- * Thread.pass
- * print "b"
- * a.run
- * a.join
- *
- * <em>produces:</em>
- *
- * abc
- */
-
VALUE
rb_thread_stop()
{
- enum rb_thread_status last_status = THREAD_RUNNABLE;
+ enum thread_status last_status = THREAD_RUNNABLE;
rb_thread_critical = 0;
if (curr_thread == curr_thread->next) {
@@ -11486,16 +7920,21 @@ rb_thread_sleep(sec)
rb_thread_wait_for(rb_time_timeval(INT2FIX(sec)));
}
+#if !defined HAVE_PAUSE
+# if defined _WIN32 && !defined __CYGWIN__
+# define pause() Sleep(INFINITE)
+# else
+# define pause() sleep(0x7fffffff)
+# endif
+#endif
+
void
rb_thread_sleep_forever()
{
- int thr_critical = rb_thread_critical;
if (curr_thread == curr_thread->next ||
curr_thread->status == THREAD_TO_KILL) {
- rb_thread_critical = Qtrue;
TRAP_BEG;
pause();
- rb_thread_critical = thr_critical;
TRAP_END;
return;
}
@@ -11506,19 +7945,6 @@ rb_thread_sleep_forever()
rb_thread_schedule();
}
-
-/*
- * call-seq:
- * thr.priority => integer
- *
- * Returns the priority of <i>thr</i>. Default is inherited from the
- * current thread which creating the new thread, or zero for the
- * initial main thread; higher-priority threads will run before
- * lower-priority threads.
- *
- * Thread.current.priority #=> 0
- */
-
static VALUE
rb_thread_priority(thread)
VALUE thread;
@@ -11526,30 +7952,6 @@ rb_thread_priority(thread)
return INT2NUM(rb_thread_check(thread)->priority);
}
-
-/*
- * call-seq:
- * thr.priority= integer => thr
- *
- * Sets the priority of <i>thr</i> to <i>integer</i>. Higher-priority threads
- * will run before lower-priority threads.
- *
- * count1 = count2 = 0
- * a = Thread.new do
- * loop { count1 += 1 }
- * end
- * a.priority = -1
- *
- * b = Thread.new do
- * loop { count2 += 1 }
- * end
- * b.priority = -2
- * sleep 1 #=> 1
- * Thread.critical = 1
- * count1 #=> 622504
- * count2 #=> 5832
- */
-
static VALUE
rb_thread_priority_set(thread, prio)
VALUE thread, prio;
@@ -11561,22 +7963,9 @@ rb_thread_priority_set(thread, prio)
th->priority = NUM2INT(prio);
rb_thread_schedule();
- return prio;
+ return thread;
}
-
-/*
- * call-seq:
- * thr.safe_level => integer
- *
- * Returns the safe level in effect for <i>thr</i>. Setting thread-local safe
- * levels can help when implementing sandboxes which run insecure code.
- *
- * thr = Thread.new { $SAFE = 3; sleep }
- * Thread.current.safe_level #=> 0
- * thr.safe_level #=> 3
- */
-
static VALUE
rb_thread_safe_level(thread)
VALUE thread;
@@ -11585,77 +7974,28 @@ rb_thread_safe_level(thread)
th = rb_thread_check(thread);
if (th == curr_thread) {
- return INT2NUM(ruby_safe_level);
+ return INT2NUM(rb_safe_level());
}
return INT2NUM(th->safe);
}
-static int ruby_thread_abort;
-static VALUE thgroup_default;
-
-
-/*
- * call-seq:
- * Thread.abort_on_exception => true or false
- *
- * Returns the status of the global ``abort on exception'' condition. The
- * default is <code>false</code>. When set to <code>true</code>, or if the
- * global <code>$DEBUG</code> flag is <code>true</code> (perhaps because the
- * command line option <code>-d</code> was specified) all threads will abort
- * (the process will <code>exit(0)</code>) if an exception is raised in any
- * thread. See also <code>Thread::abort_on_exception=</code>.
- */
+static int thread_abort;
static VALUE
rb_thread_s_abort_exc()
{
- return ruby_thread_abort?Qtrue:Qfalse;
-}
-
-
-/*
- * call-seq:
- * Thread.abort_on_exception= boolean => true or false
- *
- * When set to <code>true</code>, all threads will abort if an exception is
- * raised. Returns the new state.
- *
- * Thread.abort_on_exception = true
- * t1 = Thread.new do
- * puts "In new thread"
- * raise "Exception from thread"
- * end
- * sleep(1)
- * puts "not reached"
- *
- * <em>produces:</em>
- *
- * In new thread
- * prog.rb:4: Exception from thread (RuntimeError)
- * from prog.rb:2:in `initialize'
- * from prog.rb:2:in `new'
- * from prog.rb:2
- */
+ return thread_abort?Qtrue:Qfalse;
+}
static VALUE
rb_thread_s_abort_exc_set(self, val)
VALUE self, val;
{
rb_secure(4);
- ruby_thread_abort = RTEST(val);
+ thread_abort = RTEST(val);
return val;
}
-
-/*
- * call-seq:
- * thr.abort_on_exception => true or false
- *
- * Returns the status of the thread-local ``abort on exception'' condition for
- * <i>thr</i>. The default is <code>false</code>. See also
- * <code>Thread::abort_on_exception=</code>.
- */
-
static VALUE
rb_thread_abort_exc(thread)
VALUE thread;
@@ -11663,16 +8003,6 @@ rb_thread_abort_exc(thread)
return rb_thread_check(thread)->abort?Qtrue:Qfalse;
}
-
-/*
- * call-seq:
- * thr.abort_on_exception= boolean => true or false
- *
- * When set to <code>true</code>, causes all threads (including the main
- * program) to abort if an exception is raised in <i>thr</i>. The process will
- * effectively <code>exit(0)</code>.
- */
-
static VALUE
rb_thread_abort_exc_set(thread, val)
VALUE thread, val;
@@ -11682,45 +8012,8 @@ rb_thread_abort_exc_set(thread, val)
return val;
}
-
-enum rb_thread_status
-rb_thread_status(thread)
- VALUE thread;
-{
- rb_thread_t th = rb_thread_check(thread);
- return th->status;
-}
-
-
-/*
- * call-seq:
- * thr.group => thgrp or nil
- *
- * Returns the <code>ThreadGroup</code> which contains <i>thr</i>, or nil if
- * the thread is not a member of any group.
- *
- * Thread.main.group #=> #<ThreadGroup:0x4029d914>
- */
-
-VALUE
-rb_thread_group(thread)
- VALUE thread;
-{
- VALUE group = rb_thread_check(thread)->thgroup;
- if (!group) {
- group = Qnil;
- }
- return group;
-}
-
-#ifdef __ia64
-# define IA64_INIT(x) x
-#else
-# define IA64_INIT(x)
-#endif
-
#define THREAD_ALLOC(th) do {\
- th = ALLOC(struct rb_thread);\
+ th = ALLOC(struct thread);\
\
th->next = 0;\
th->prev = 0;\
@@ -11733,9 +8026,6 @@ rb_thread_group(thread)
th->stk_len = 0;\
th->stk_max = 0;\
th->wait_for = 0;\
- IA64_INIT(th->bstr_ptr = 0);\
- IA64_INIT(th->bstr_len = 0);\
- IA64_INIT(th->bstr_max = 0);\
FD_ZERO(&th->readfds);\
FD_ZERO(&th->writefds);\
FD_ZERO(&th->exceptfds);\
@@ -11755,18 +8045,12 @@ rb_thread_group(thread)
th->errinfo = Qnil;\
th->last_status = 0;\
th->last_line = 0;\
- th->last_match = Qnil;\
+ th->last_match = 0;\
th->abort = 0;\
th->priority = 0;\
- th->thgroup = thgroup_default;\
+ th->gid = 1;\
th->locals = 0;\
- th->thread = 0;\
- if (curr_thread == 0) {\
- th->sandbox = Qnil;\
- } else {\
- th->sandbox = curr_thread->sandbox;\
- }\
-} while (0)
+} while(0)
static rb_thread_t
rb_thread_alloc(klass)
@@ -11785,9 +8069,7 @@ rb_thread_alloc(klass)
return th;
}
-static int thread_init = 0;
-
-#if defined(_THREAD_SAFE)
+#if defined(HAVE_SETITIMER)
static void
catch_timer(sig)
int sig;
@@ -11795,95 +8077,21 @@ catch_timer(sig)
#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
signal(sig, catch_timer);
#endif
- /* cause EINTR */
-}
-
-static int time_thread_alive_p = 0;
-static pthread_t time_thread;
-
-static void*
-thread_timer(dummy)
- void *dummy;
-{
-#ifdef _THREAD_SAFE
-#define test_cancel() pthread_testcancel()
-#else
-#define test_cancel() /* void */
-#endif
-
- sigset_t all_signals;
-
- sigfillset(&all_signals);
- pthread_sigmask(SIG_BLOCK, &all_signals, 0);
-
- for (;;) {
-#ifdef HAVE_NANOSLEEP
- struct timespec req, rem;
-
- test_cancel();
- req.tv_sec = 0;
- req.tv_nsec = 10000000;
- nanosleep(&req, &rem);
-#else
- struct timeval tv;
-
- test_cancel();
- tv.tv_sec = 0;
- tv.tv_usec = 10000;
- select(0, NULL, NULL, NULL, &tv);
-#endif
- if (!rb_thread_critical) {
- rb_thread_pending = 1;
- if (rb_trap_immediate) {
- pthread_kill(ruby_thid, SIGVTALRM);
- }
+ if (!rb_thread_critical) {
+ if (rb_trap_immediate) {
+ rb_thread_schedule();
}
+ else rb_thread_pending = 1;
}
-#undef test_cancel
-}
-
-void
-rb_thread_start_timer()
-{
-}
-
-void
-rb_thread_stop_timer()
-{
}
+#else
+int rb_thread_tick = THREAD_TICK;
+#endif
-void
-rb_child_atfork()
-{
- time_thread_alive_p = 0;
-}
+#define SCOPE_SHARED FL_USER1
-void
-rb_thread_cancel_timer()
-{
-#ifdef _THREAD_SAFE
- if( time_thread_alive_p )
- {
- pthread_cancel( time_thread );
- pthread_join( time_thread, NULL );
- time_thread_alive_p = 0;
- }
- thread_init = 0;
-#endif
-}
-#elif defined(HAVE_SETITIMER)
-static void
-catch_timer(sig)
- int sig;
-{
-#if !defined(POSIX_SIGNAL) && !defined(BSD_SIGNAL)
- signal(sig, catch_timer);
-#endif
- if (!rb_thread_critical) {
- rb_thread_pending = 1;
- }
- /* cause EINTR */
-}
+#if defined(HAVE_SETITIMER)
+static int thread_init = 0;
void
rb_thread_start_timer()
@@ -11908,62 +8116,34 @@ rb_thread_stop_timer()
tval.it_value = tval.it_interval;
setitimer(ITIMER_VIRTUAL, &tval, NULL);
}
-
-void
-rb_thread_cancel_timer()
-{
-}
-
-#else /* !(_THREAD_SAFE || HAVE_SETITIMER) */
-int rb_thread_tick = THREAD_TICK;
-
-void
-rb_thread_cancel_timer()
-{
-}
#endif
static VALUE
-rb_thread_start_0(fn, arg, th)
+rb_thread_start_0(fn, arg, th_arg)
VALUE (*fn)();
void *arg;
- rb_thread_t th;
+ rb_thread_t th_arg;
{
- volatile rb_thread_t th_save = th;
+ volatile rb_thread_t th = th_arg;
volatile VALUE thread = th->thread;
- struct BLOCK *volatile saved_block = 0;
- enum rb_thread_status status;
+ struct BLOCK* saved_block = 0;
+ enum thread_status status;
int state;
- if (OBJ_FROZEN(curr_thread->thgroup)) {
- rb_raise(rb_eThreadError,
- "can't start a new thread (frozen ThreadGroup)");
- }
-
+#if defined(HAVE_SETITIMER)
if (!thread_init) {
- thread_init = 1;
-#if defined(HAVE_SETITIMER) || defined(_THREAD_SAFE)
-#if defined(POSIX_SIGNAL)
+#ifdef POSIX_SIGNAL
posix_signal(SIGVTALRM, catch_timer);
#else
signal(SIGVTALRM, catch_timer);
#endif
-#ifdef _THREAD_SAFE
- pthread_create(&time_thread, 0, thread_timer, 0);
- time_thread_alive_p = 1;
- pthread_atfork(0, 0, rb_child_atfork);
-#else
+ thread_init = 1;
rb_thread_start_timer();
-#endif
-#endif
- }
-
- if (THREAD_SAVE_CONTEXT(curr_thread)) {
- return thread;
}
+#endif
- if (ruby_block) { /* should nail down higher blocks */
+ if (ruby_block) { /* should nail down higher scopes */
struct BLOCK dummy;
dummy.prev = ruby_block;
@@ -11971,6 +8151,10 @@ rb_thread_start_0(fn, arg, th)
saved_block = ruby_block = dummy.prev;
}
scope_dup(ruby_scope);
+ FL_SET(ruby_scope, SCOPE_SHARED);
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return thread;
+ }
if (!th->next) {
/* merge in thread list */
@@ -11979,7 +8163,7 @@ rb_thread_start_0(fn, arg, th)
th->next = curr_thread->next;
curr_thread->next = th;
th->priority = curr_thread->priority;
- th->thgroup = curr_thread->thgroup;
+ th->gid = curr_thread->gid;
}
PUSH_TAG(PROT_THREAD);
@@ -11988,52 +8172,48 @@ rb_thread_start_0(fn, arg, th)
curr_thread = th;
th->result = (*fn)(arg, th);
}
- th = th_save;
- }
- else if (TAG_DST()) {
- th = th_save;
- th->result = prot_tag->retval;
}
POP_TAG();
status = th->status;
- if (th == main_thread) ruby_stop(state);
- rb_thread_remove(th);
+ while (saved_block) {
+ struct BLOCK *tmp = saved_block;
- if (saved_block) {
- blk_free(saved_block);
+ if (tmp->frame.argc > 0)
+ free(tmp->frame.argv);
+ saved_block = tmp->prev;
+ free(tmp);
}
+ if (th == main_thread) ruby_stop(state);
+ rb_thread_remove(th);
if (state && status != THREAD_TO_KILL && !NIL_P(ruby_errinfo)) {
th->flags |= THREAD_RAISED;
- if (state == TAG_FATAL) {
+ if (state == TAG_FATAL) {
/* fatal error within this thread, need to stop whole script */
main_thread->errinfo = ruby_errinfo;
rb_thread_cleanup();
}
else if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
if (th->safe >= 4) {
- char buf[32];
-
- sprintf(buf, "Insecure exit at level %d", th->safe);
- th->errinfo = rb_exc_new2(rb_eSecurityError, buf);
- }
- else {
- /* delegate exception to main_thread */
- rb_thread_main_jump(ruby_errinfo, RESTORE_RAISE);
+ rb_raise(rb_eSecurityError, "Insecure exit at level %d",
+ ruby_safe_level);
}
+ /* delegate exception to main_thread */
+ rb_thread_raise(1, &ruby_errinfo, main_thread);
}
- else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
- /* exit on main_thread */
+ else if (th->safe < 4 &&
+ (thread_abort || th->abort || RTEST(ruby_debug))) {
+ VALUE err = rb_exc_new(rb_eSystemExit, 0, 0);
error_print();
- rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
+ /* exit on main_thread */
+ rb_thread_raise(1, &err, main_thread);
}
else {
th->errinfo = ruby_errinfo;
}
}
rb_thread_schedule();
- ruby_stop(0); /* last thread termination */
return 0; /* not reached */
}
@@ -12042,52 +8222,23 @@ rb_thread_create(fn, arg)
VALUE (*fn)();
void *arg;
{
- Init_stack((VALUE*)&arg);
return rb_thread_start_0(fn, arg, rb_thread_alloc(rb_cThread));
}
+int
+rb_thread_scope_shared_p()
+{
+ return FL_TEST(ruby_scope, SCOPE_SHARED);
+}
+
static VALUE
-rb_thread_yield(arg, th)
+rb_thread_yield(arg, th)
VALUE arg;
rb_thread_t th;
{
- const ID *tbl;
-
scope_dup(ruby_block->scope);
-
- tbl = ruby_scope->local_tbl;
- if (tbl) {
- int n = *tbl++;
- for (tbl += 2, n -= 2; n > 0; --n) { /* skip first 2 ($_ and $~) */
- ID id = *tbl++;
- if (id != 0 && !rb_is_local_id(id)) /* push flip states */
- rb_dvar_push(id, Qfalse);
- }
- }
- rb_dvar_push('_', Qnil);
- rb_dvar_push('~', Qnil);
- ruby_block->dyna_vars = ruby_dyna_vars;
-
- return rb_yield_0(arg, 0, 0, YIELD_LAMBDA_CALL, Qtrue);
-}
-
-/*
- * call-seq:
- * Thread.new([arg]*) {|args| block } => thread
- *
- * Creates and runs a new thread to execute the instructions given in
- * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
- * into the block.
- *
- * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
- * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
- * x.join # Let the threads finish before
- * a.join # main thread exits...
- *
- * <em>produces:</em>
- *
- * abxyzc
- */
+ return rb_yield_0(callargs(arg), 0, 0, Qtrue);
+}
static VALUE
rb_thread_s_new(argc, argv, klass)
@@ -12108,57 +8259,16 @@ rb_thread_s_new(argc, argv, klass)
return th->thread;
}
-
-/*
- * call-seq:
- * Thread.new([arg]*) {|args| block } => thread
- *
- * Creates and runs a new thread to execute the instructions given in
- * <i>block</i>. Any arguments passed to <code>Thread::new</code> are passed
- * into the block.
- *
- * x = Thread.new { sleep 0.1; print "x"; print "y"; print "z" }
- * a = Thread.new { print "a"; print "b"; sleep 0.2; print "c" }
- * x.join # Let the threads finish before
- * a.join # main thread exits...
- *
- * <em>produces:</em>
- *
- * abxyzc
- */
-
static VALUE
rb_thread_initialize(thread, args)
VALUE thread, args;
{
- rb_thread_t th;
-
if (!rb_block_given_p()) {
rb_raise(rb_eThreadError, "must be called with a block");
}
- th = rb_thread_check(thread);
- if (th->stk_max) {
- NODE *node = th->node;
- if (!node) {
- rb_raise(rb_eThreadError, "already initialized thread");
- }
- rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
- node->nd_file, nd_line(node));
- }
- return rb_thread_start_0(rb_thread_yield, args, th);
+ return rb_thread_start_0(rb_thread_yield, args, rb_thread_check(thread));
}
-
-/*
- * call-seq:
- * Thread.start([args]*) {|args| block } => thread
- * Thread.fork([args]*) {|args| block } => thread
- *
- * Basically the same as <code>Thread::new</code>. However, if class
- * <code>Thread</code> is subclassed, then calling <code>start</code> in that
- * subclass will not invoke the subclass's <code>initialize</code> method.
- */
-
static VALUE
rb_thread_start(klass, args)
VALUE klass, args;
@@ -12169,55 +8279,19 @@ rb_thread_start(klass, args)
return rb_thread_start_0(rb_thread_yield, args, rb_thread_alloc(klass));
}
-
-/*
- * call-seq:
- * thr.value => obj
- *
- * Waits for <i>thr</i> to complete (via <code>Thread#join</code>) and returns
- * its value.
- *
- * a = Thread.new { 2 + 2 }
- * a.value #=> 4
- */
-
static VALUE
rb_thread_value(thread)
VALUE thread;
{
rb_thread_t th = rb_thread_check(thread);
- while (!rb_thread_join(th, DELAY_INFTY));
+ rb_thread_join(thread);
return th->result;
}
-
-/*
- * call-seq:
- * thr.status => string, false or nil
- *
- * Returns the status of <i>thr</i>: ``<code>sleep</code>'' if <i>thr</i> is
- * sleeping or waiting on I/O, ``<code>run</code>'' if <i>thr</i> is executing,
- * ``<code>aborting</code>'' if <i>thr</i> is aborting, <code>false</code> if
- * <i>thr</i> terminated normally, and <code>nil</code> if <i>thr</i>
- * terminated with an exception.
- *
- * a = Thread.new { raise("die now") }
- * b = Thread.new { Thread.stop }
- * c = Thread.new { Thread.exit }
- * d = Thread.new { sleep }
- * Thread.critical = true
- * d.kill #=> #<Thread:0x401b3678 aborting>
- * a.status #=> nil
- * b.status #=> "sleep"
- * c.status #=> false
- * d.status #=> "aborting"
- * Thread.current.status #=> "run"
- */
-
static VALUE
-rb_thread_status_name(thread)
+rb_thread_status(thread)
VALUE thread;
{
rb_thread_t th = rb_thread_check(thread);
@@ -12228,23 +8302,12 @@ rb_thread_status_name(thread)
return Qfalse;
}
- return rb_str_new2(thread_status_name(th->status));
+ if (th->status == THREAD_STOPPED)
+ return rb_str_new2("sleep");
+ return rb_str_new2("run");
}
-
-/*
- * call-seq:
- * thr.alive? => true or false
- *
- * Returns <code>true</code> if <i>thr</i> is running or sleeping.
- *
- * thr = Thread.new { }
- * thr.join #=> #<Thread:0x401b3fb0 dead>
- * Thread.current.alive? #=> true
- * thr.alive? #=> false
- */
-
-VALUE
+static VALUE
rb_thread_alive_p(thread)
VALUE thread;
{
@@ -12254,19 +8317,6 @@ rb_thread_alive_p(thread)
return Qtrue;
}
-
-/*
- * call-seq:
- * thr.stop? => true or false
- *
- * Returns <code>true</code> if <i>thr</i> is dead or sleeping.
- *
- * a = Thread.new { Thread.stop }
- * b = Thread.current
- * a.stop? #=> true
- * b.stop? #=> false
- */
-
static VALUE
rb_thread_stop_p(thread)
VALUE thread;
@@ -12281,20 +8331,8 @@ rb_thread_stop_p(thread)
static void
rb_thread_wait_other_threads()
{
- rb_thread_t th;
- int found;
-
/* wait other threads to terminate */
while (curr_thread != curr_thread->next) {
- found = 0;
- FOREACH_THREAD(th) {
- if (th != curr_thread && th->status != THREAD_STOPPED) {
- found = 1;
- break;
- }
- }
- END_FOREACH(th);
- if (!found) return;
rb_thread_schedule();
}
}
@@ -12302,58 +8340,31 @@ rb_thread_wait_other_threads()
static void
rb_thread_cleanup()
{
- rb_thread_t curr, th;
+ rb_thread_t th;
- curr = curr_thread;
- while (curr->status == THREAD_KILLED) {
- curr = curr->prev;
+ while (curr_thread->status == THREAD_KILLED) {
+ curr_thread = curr_thread->prev;
}
- FOREACH_THREAD_FROM(curr, th) {
- if (th->status != THREAD_KILLED) {
+ FOREACH_THREAD(th) {
+ if (th != curr_thread && th->status != THREAD_KILLED) {
rb_thread_ready(th);
- if (th != main_thread) {
- th->thgroup = 0;
- th->priority = 0;
- th->status = THREAD_TO_KILL;
- RDATA(th->thread)->dfree = NULL;
- }
+ th->gid = 0;
+ th->priority = 0;
+ th->status = THREAD_TO_KILL;
}
}
- END_FOREACH_FROM(curr, th);
+ END_FOREACH(th);
}
int rb_thread_critical;
-
-/*
- * call-seq:
- * Thread.critical => true or false
- *
- * Returns the status of the global ``thread critical'' condition.
- */
-
static VALUE
rb_thread_critical_get()
{
return rb_thread_critical?Qtrue:Qfalse;
}
-
-/*
- * call-seq:
- * Thread.critical= boolean => true or false
- *
- * Sets the status of the global ``thread critical'' condition and returns
- * it. When set to <code>true</code>, prohibits scheduling of any existing
- * thread. Does not block new threads from being created and run. Certain
- * thread operations (such as stopping or killing a thread, sleeping in the
- * current thread, and raising an exception) may cause a thread to be scheduled
- * even when in a critical section. <code>Thread::critical</code> is not
- * intended for daily use: it is primarily there to support folks writing
- * threading libraries.
- */
-
static VALUE
rb_thread_critical_set(obj, val)
VALUE obj, val;
@@ -12370,10 +8381,8 @@ rb_thread_interrupt()
if (curr_thread == main_thread) {
rb_interrupt();
}
- if (!rb_thread_dead(curr_thread)) {
- if (THREAD_SAVE_CONTEXT(curr_thread)) {
- return;
- }
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return;
}
curr_thread = main_thread;
rb_thread_restore_context(curr_thread, RESTORE_INTERRUPT);
@@ -12381,69 +8390,56 @@ rb_thread_interrupt()
void
rb_thread_signal_raise(sig)
- int sig;
+ char *sig;
{
+ if (sig == 0) return; /* should not happen */
rb_thread_critical = 0;
if (curr_thread == main_thread) {
- VALUE argv[1];
-
rb_thread_ready(curr_thread);
- argv[0] = INT2FIX(sig);
- rb_exc_raise(rb_class_new_instance(1, argv, rb_eSignal));
+ rb_raise(rb_eSignal, "SIG%s", sig);
}
rb_thread_ready(main_thread);
- if (!rb_thread_dead(curr_thread)) {
- if (THREAD_SAVE_CONTEXT(curr_thread)) {
- return;
- }
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return;
}
- th_sig = sig;
+ th_signm = sig;
curr_thread = main_thread;
rb_thread_restore_context(curr_thread, RESTORE_SIGNAL);
}
void
-rb_thread_trap_eval(cmd, sig, safe)
+rb_thread_trap_eval(cmd, sig)
VALUE cmd;
- int sig, safe;
+ int sig;
{
+#if 0
rb_thread_critical = 0;
- if (curr_thread == main_thread) {
- rb_trap_eval(cmd, sig, safe);
+ if (!rb_thread_dead(curr_thread)) {
+ rb_thread_ready(curr_thread);
+ rb_trap_eval(cmd, sig);
return;
}
- if (!rb_thread_dead(curr_thread)) {
- if (THREAD_SAVE_CONTEXT(curr_thread)) {
- return;
- }
+ rb_thread_ready(main_thread);
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return;
}
th_cmd = cmd;
th_sig = sig;
- th_safe = safe;
curr_thread = main_thread;
rb_thread_restore_context(curr_thread, RESTORE_TRAP);
-}
-
-void
-rb_thread_signal_exit()
-{
- VALUE args[2];
-
+#else
rb_thread_critical = 0;
- if (curr_thread == main_thread) {
- rb_thread_ready(curr_thread);
- rb_exit(EXIT_SUCCESS);
- }
- args[0] = INT2NUM(EXIT_SUCCESS);
- args[1] = rb_str_new2("exit");
- rb_thread_ready(main_thread);
if (!rb_thread_dead(curr_thread)) {
if (THREAD_SAVE_CONTEXT(curr_thread)) {
return;
}
}
- rb_thread_main_jump(rb_class_new_instance(2, args, rb_eSystemExit),
- RESTORE_EXIT);
+ rb_thread_ready(main_thread);
+ th_cmd = cmd;
+ th_sig = sig;
+ curr_thread = main_thread;
+ rb_thread_restore_context(curr_thread, RESTORE_TRAP);
+#endif
}
static VALUE
@@ -12452,53 +8448,26 @@ rb_thread_raise(argc, argv, th)
VALUE *argv;
rb_thread_t th;
{
- volatile rb_thread_t th_save = th;
- VALUE exc;
-
- if (!th->next) {
- rb_raise(rb_eArgError, "unstarted thread");
- }
if (rb_thread_dead(th)) return Qnil;
- exc = rb_make_exception(argc, argv);
if (curr_thread == th) {
- rb_raise_jump(exc);
+ rb_f_raise(argc, argv);
}
- if (!rb_thread_dead(curr_thread)) {
- if (THREAD_SAVE_CONTEXT(curr_thread)) {
- return th_save->thread;
- }
+ if (THREAD_SAVE_CONTEXT(curr_thread)) {
+ return th->thread;
}
+ rb_scan_args(argc, argv, "11", &th_raise_argv[0], &th_raise_argv[1]);
rb_thread_ready(th);
curr_thread = th;
- th_raise_exception = exc;
- th_raise_node = ruby_current_node;
+ th_raise_argc = argc;
+ th_raise_file = ruby_sourcefile;
+ th_raise_line = ruby_sourceline;
rb_thread_restore_context(curr_thread, RESTORE_RAISE);
return Qnil; /* not reached */
}
-
-/*
- * call-seq:
- * thr.raise(exception)
- *
- * Raises an exception (see <code>Kernel::raise</code>) from <i>thr</i>. The
- * caller does not have to be <i>thr</i>.
- *
- * Thread.abort_on_exception = true
- * a = Thread.new { sleep(200) }
- * a.raise("Gotcha")
- *
- * <em>produces:</em>
- *
- * prog.rb:3: Gotcha (RuntimeError)
- * from prog.rb:2:in `initialize'
- * from prog.rb:2:in `new'
- * from prog.rb:2
- */
-
static VALUE
rb_thread_raise_m(argc, argv, thread)
int argc;
@@ -12523,7 +8492,7 @@ rb_thread_local_aref(thread, id)
VALUE val;
th = rb_thread_check(thread);
- if (ruby_safe_level >= 4 && th != curr_thread) {
+ if (rb_safe_level() >= 4 && th != curr_thread) {
rb_raise(rb_eSecurityError, "Insecure: thread locals");
}
if (!th->locals) return Qnil;
@@ -12533,28 +8502,6 @@ rb_thread_local_aref(thread, id)
return Qnil;
}
-
-/*
- * call-seq:
- * thr[sym] => obj or nil
- *
- * Attribute Reference---Returns the value of a thread-local variable, using
- * either a symbol or a string name. If the specified variable does not exist,
- * returns <code>nil</code>.
- *
- * a = Thread.new { Thread.current["name"] = "A"; Thread.stop }
- * b = Thread.new { Thread.current[:name] = "B"; Thread.stop }
- * c = Thread.new { Thread.current["name"] = "C"; Thread.stop }
- * Thread.list.each {|x| puts "#{x.inspect}: #{x[:name]}" }
- *
- * <em>produces:</em>
- *
- * #<Thread:0x401b3b3c sleep>: C
- * #<Thread:0x401b3bc8 sleep>: B
- * #<Thread:0x401b3c68 sleep>: A
- * #<Thread:0x401bdf4c run>:
- */
-
static VALUE
rb_thread_aref(thread, id)
VALUE thread, id;
@@ -12570,7 +8517,7 @@ rb_thread_local_aset(thread, id, val)
{
rb_thread_t th = rb_thread_check(thread);
- if (ruby_safe_level >= 4 && th != curr_thread) {
+ if (rb_safe_level() >= 4 && th != curr_thread) {
rb_raise(rb_eSecurityError, "Insecure: can't modify thread locals");
}
if (OBJ_FROZEN(thread)) rb_error_frozen("thread locals");
@@ -12579,7 +8526,7 @@ rb_thread_local_aset(thread, id, val)
th->locals = st_init_numtable();
}
if (NIL_P(val)) {
- st_delete(th->locals, (st_data_t*)&id, 0);
+ st_delete(th->locals, &id, 0);
return Qnil;
}
st_insert(th->locals, id, val);
@@ -12587,15 +8534,6 @@ rb_thread_local_aset(thread, id, val)
return val;
}
-
-/*
- * call-seq:
- * thr[sym] = obj => obj
- *
- * Attribute Assignment---Sets or creates the value of a thread-local variable,
- * using either a symbol or a string. See also <code>Thread#[]</code>.
- */
-
static VALUE
rb_thread_aset(thread, id, val)
VALUE thread, id, val;
@@ -12603,20 +8541,6 @@ rb_thread_aset(thread, id, val)
return rb_thread_local_aset(thread, rb_to_id(id), val);
}
-
-/*
- * call-seq:
- * thr.key?(sym) => true or false
- *
- * Returns <code>true</code> if the given string (or symbol) exists as a
- * thread-local variable.
- *
- * me = Thread.current
- * me[:oliver] = "a"
- * me.key?(:oliver) #=> true
- * me.key?(:stanley) #=> false
- */
-
static VALUE
rb_thread_key_p(thread, id)
VALUE thread, id;
@@ -12629,62 +8553,29 @@ rb_thread_key_p(thread, id)
return Qfalse;
}
-static int
-thread_keys_i(key, value, ary)
- ID key;
- VALUE value, ary;
-{
- rb_ary_push(ary, ID2SYM(key));
- return ST_CONTINUE;
-}
-
-
-/*
- * call-seq:
- * thr.keys => array
- *
- * Returns an an array of the names of the thread-local variables (as Symbols).
- *
- * thr = Thread.new do
- * Thread.current[:cat] = 'meow'
- * Thread.current["dog"] = 'woof'
- * end
- * thr.join #=> #<Thread:0x401b3f10 dead>
- * thr.keys #=> [:dog, :cat]
- */
-
-static VALUE
-rb_thread_keys(thread)
- VALUE thread;
-{
- rb_thread_t th = rb_thread_check(thread);
- VALUE ary = rb_ary_new();
-
- if (th->locals) {
- st_foreach(th->locals, thread_keys_i, ary);
- }
- return ary;
-}
-
-/*
- * call-seq:
- * thr.inspect => string
- *
- * Dump the name, id, and status of _thr_ to a string.
- */
-
static VALUE
rb_thread_inspect(thread)
VALUE thread;
{
- char *cname = rb_obj_classname(thread);
+ char *cname = rb_class2name(CLASS_OF(thread));
rb_thread_t th = rb_thread_check(thread);
- const char *status = thread_status_name(th->status);
+ char *status;
VALUE str;
- size_t len = strlen(cname)+7+16+9+1;
- str = rb_str_new(0, len); /* 7:tags 16:addr 9:status 1:nul */
- snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx %s>", cname, thread, status);
+ switch (th->status) {
+ case THREAD_RUNNABLE:
+ status = "run"; break;
+ case THREAD_STOPPED:
+ status = "sleep"; break;
+ case THREAD_TO_KILL:
+ status = "aborting"; break;
+ case THREAD_KILLED:
+ status = "dead"; break;
+ default:
+ status = "unknown"; break;
+ }
+ str = rb_str_new(0, strlen(cname)+7+16+9+1); /* 7:tags 16:addr 9:status 1:nul */
+ sprintf(RSTRING(str)->ptr, "#<%s:0x%lx %s>", cname, thread, status);
RSTRING(str)->len = strlen(RSTRING(str)->ptr);
OBJ_INFECT(str, thread);
@@ -12694,83 +8585,23 @@ rb_thread_inspect(thread)
void
rb_thread_atfork()
{
+#if 0 /* enable on 1.7 */
rb_thread_t th;
if (rb_thread_alone()) return;
FOREACH_THREAD(th) {
if (th != curr_thread) {
- rb_thread_die(th);
+ th->status = THREAD_KILLED;
}
}
END_FOREACH(th);
main_thread = curr_thread;
curr_thread->next = curr_thread;
curr_thread->prev = curr_thread;
+#endif
}
-
-/*
- * Document-class: Continuation
- *
- * Continuation objects are generated by
- * <code>Kernel#callcc</code>. They hold a return address and execution
- * context, allowing a nonlocal return to the end of the
- * <code>callcc</code> block from anywhere within a program.
- * Continuations are somewhat analogous to a structured version of C's
- * <code>setjmp/longjmp</code> (although they contain more state, so
- * you might consider them closer to threads).
- *
- * For instance:
- *
- * arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
- * callcc{|$cc|}
- * puts(message = arr.shift)
- * $cc.call unless message =~ /Max/
- *
- * <em>produces:</em>
- *
- * Freddie
- * Herbie
- * Ron
- * Max
- *
- * This (somewhat contrived) example allows the inner loop to abandon
- * processing early:
- *
- * callcc {|cont|
- * for i in 0..4
- * print "\n#{i}: "
- * for j in i*5...(i+1)*5
- * cont.call() if j == 17
- * printf "%3d", j
- * end
- * end
- * }
- * print "\n"
- *
- * <em>produces:</em>
- *
- * 0: 0 1 2 3 4
- * 1: 5 6 7 8 9
- * 2: 10 11 12 13 14
- * 3: 15 16
- */
-
-VALUE rb_cCont;
-
-/*
- * call-seq:
- * callcc {|cont| block } => obj
- *
- * Generates a <code>Continuation</code> object, which it passes to the
- * associated block. Performing a <em>cont</em><code>.call</code> will
- * cause the <code>callcc</code> to return (as will falling through the
- * end of the block). The value returned by the <code>callcc</code> is
- * the value of the block, or the value passed to
- * <em>cont</em><code>.call</code>. See class <code>Continuation</code>
- * for more details. Also see <code>Kernel::throw</code> for
- * an alternative mechanism for unwinding a call stack.
- */
+static VALUE rb_cCont;
static VALUE
rb_callcc(self)
@@ -12778,7 +8609,6 @@ rb_callcc(self)
{
volatile VALUE cont;
rb_thread_t th;
- volatile rb_thread_t th_save;
struct tag *tag;
struct RVarmap *vars;
@@ -12789,38 +8619,29 @@ rb_callcc(self)
for (tag=prot_tag; tag; tag=tag->prev) {
scope_dup(tag->scope);
}
+ if (ruby_block) {
+ struct BLOCK *block = ruby_block;
+
+ while (block) {
+ block->tag->flags |= BLOCK_DYNAMIC;
+ block = block->prev;
+ }
+ }
th->thread = curr_thread->thread;
- th->thgroup = cont_protect;
- for (vars = ruby_dyna_vars; vars; vars = vars->next) {
+ for (vars = th->dyna_vars; vars; vars = vars->next) {
if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
FL_SET(vars, DVAR_DONT_RECYCLE);
}
- th_save = th;
+
if (THREAD_SAVE_CONTEXT(th)) {
- return th_save->result;
+ return th->result;
}
else {
return rb_yield(cont);
}
}
-/*
- * call-seq:
- * cont.call(args, ...)
- * cont[args, ...]
- *
- * Invokes the continuation. The program continues from the end of the
- * <code>callcc</code> block. If no arguments are given, the original
- * <code>callcc</code> returns <code>nil</code>. If one argument is
- * given, <code>callcc</code> returns it. Otherwise, an array
- * containing <i>args</i> is returned.
- *
- * callcc {|cont| cont.call } #=> nil
- * callcc {|cont| cont.call 1 } #=> 1
- * callcc {|cont| cont.call 1, 2, 3 } #=> [1, 2, 3]
- */
-
static VALUE
rb_cont_call(argc, argv, cont)
int argc;
@@ -12832,15 +8653,12 @@ rb_cont_call(argc, argv, cont)
if (th->thread != curr_thread->thread) {
rb_raise(rb_eRuntimeError, "continuation called across threads");
}
- if (th->thgroup != cont_protect) {
- rb_raise(rb_eRuntimeError, "continuation called across trap");
- }
switch (argc) {
case 0:
th->result = Qnil;
break;
case 1:
- th->result = argv[0];
+ th->result = *argv;
break;
default:
th->result = rb_ary_new4(argc, argv);
@@ -12852,49 +8670,26 @@ rb_cont_call(argc, argv, cont)
}
struct thgroup {
- int enclosed;
- VALUE group;
+ int gid;
};
-
-/*
- * Document-class: ThreadGroup
- *
- * <code>ThreadGroup</code> provides a means of keeping track of a number of
- * threads as a group. A <code>Thread</code> can belong to only one
- * <code>ThreadGroup</code> at a time; adding a thread to a new group will
- * remove it from any previous group.
- *
- * Newly created threads belong to the same group as the thread from which they
- * were created.
- */
-
-static VALUE thgroup_s_alloc _((VALUE));
static VALUE
-thgroup_s_alloc(klass)
+thgroup_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
VALUE klass;
{
VALUE group;
struct thgroup *data;
+ static int serial = 1;
group = Data_Make_Struct(klass, struct thgroup, 0, free, data);
- data->enclosed = 0;
- data->group = group;
+ data->gid = serial++;
+ rb_obj_call_init(group, argc, argv);
return group;
}
-
-/*
- * call-seq:
- * thgrp.list => array
- *
- * Returns an array of all existing <code>Thread</code> objects that belong to
- * this group.
- *
- * ThreadGroup::Default.list #=> [#<Thread:0x401bdf4c run>]
- */
-
static VALUE
thgroup_list(group)
VALUE group;
@@ -12907,7 +8702,7 @@ thgroup_list(group)
ary = rb_ary_new();
FOREACH_THREAD(th) {
- if (th->thgroup == data->group) {
+ if (th->gid == data->gid) {
rb_ary_push(ary, th->thread);
}
}
@@ -12916,84 +8711,6 @@ thgroup_list(group)
return ary;
}
-
-/*
- * call-seq:
- * thgrp.enclose => thgrp
- *
- * Prevents threads from being added to or removed from the receiving
- * <code>ThreadGroup</code>. New threads can still be started in an enclosed
- * <code>ThreadGroup</code>.
- *
- * ThreadGroup::Default.enclose #=> #<ThreadGroup:0x4029d914>
- * thr = Thread::new { Thread.stop } #=> #<Thread:0x402a7210 sleep>
- * tg = ThreadGroup::new #=> #<ThreadGroup:0x402752d4>
- * tg.add thr
- *
- * <em>produces:</em>
- *
- * ThreadError: can't move from the enclosed thread group
- */
-
-static VALUE
-thgroup_enclose(group)
- VALUE group;
-{
- struct thgroup *data;
-
- Data_Get_Struct(group, struct thgroup, data);
- data->enclosed = 1;
-
- return group;
-}
-
-
-/*
- * call-seq:
- * thgrp.enclosed? => true or false
- *
- * Returns <code>true</code> if <em>thgrp</em> is enclosed. See also
- * ThreadGroup#enclose.
- */
-
-static VALUE
-thgroup_enclosed_p(group)
- VALUE group;
-{
- struct thgroup *data;
-
- Data_Get_Struct(group, struct thgroup, data);
- if (data->enclosed) return Qtrue;
- return Qfalse;
-}
-
-
-/*
- * call-seq:
- * thgrp.add(thread) => thgrp
- *
- * Adds the given <em>thread</em> to this group, removing it from any other
- * group to which it may have previously belonged.
- *
- * puts "Initial group is #{ThreadGroup::Default.list}"
- * tg = ThreadGroup.new
- * t1 = Thread.new { sleep }
- * t2 = Thread.new { sleep }
- * puts "t1 is #{t1}"
- * puts "t2 is #{t2}"
- * tg.add(t1)
- * puts "Initial group now #{ThreadGroup::Default.list}"
- * puts "tg group now #{tg.list}"
- *
- * <em>produces:</em>
- *
- * Initial group is #<Thread:0x401bdf4c>
- * t1 is #<Thread:0x401b3c90>
- * t2 is #<Thread:0x401b3c18>
- * Initial group now #<Thread:0x401b3c18>#<Thread:0x401bdf4c>
- * tg group now #<Thread:0x401b3c90>
- */
-
static VALUE
thgroup_add(group, thread)
VALUE group, thread;
@@ -13003,44 +8720,12 @@ thgroup_add(group, thread)
rb_secure(4);
th = rb_thread_check(thread);
- if (!th->next || !th->prev) {
- rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
- rb_obj_classname(thread));
- }
-
- if (OBJ_FROZEN(group)) {
- rb_raise(rb_eThreadError, "can't move to the frozen thread group");
- }
Data_Get_Struct(group, struct thgroup, data);
- if (data->enclosed) {
- rb_raise(rb_eThreadError, "can't move to the enclosed thread group");
- }
-
- if (!th->thgroup) {
- return Qnil;
- }
- if (OBJ_FROZEN(th->thgroup)) {
- rb_raise(rb_eThreadError, "can't move from the frozen thread group");
- }
- Data_Get_Struct(th->thgroup, struct thgroup, data);
- if (data->enclosed) {
- rb_raise(rb_eThreadError, "can't move from the enclosed thread group");
- }
- th->thgroup = group;
+ th->gid = data->gid;
return group;
}
-
-/*
- * +Thread+ encapsulates the behavior of a thread of
- * execution, including the main thread of the Ruby script.
- *
- * In the descriptions of the methods in this class, the parameter _sym_
- * refers to a symbol, which is either a quoted string or a
- * +Symbol+ (such as <code>:name</code>).
- */
-
void
Init_Thread()
{
@@ -13048,7 +8733,6 @@ Init_Thread()
rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
rb_cThread = rb_define_class("Thread", rb_cObject);
- rb_undef_alloc_func(rb_cThread);
rb_define_singleton_method(rb_cThread, "new", rb_thread_s_new, -1);
rb_define_method(rb_cThread, "initialize", rb_thread_initialize, -2);
@@ -13072,14 +8756,10 @@ Init_Thread()
rb_define_method(rb_cThread, "run", rb_thread_run, 0);
rb_define_method(rb_cThread, "wakeup", rb_thread_wakeup, 0);
rb_define_method(rb_cThread, "kill", rb_thread_kill, 0);
- rb_define_method(rb_cThread, "terminate", rb_thread_kill, 0);
rb_define_method(rb_cThread, "exit", rb_thread_kill, 0);
- rb_define_method(rb_cThread, "kill!", rb_thread_kill_bang, 0);
- rb_define_method(rb_cThread, "terminate!", rb_thread_kill_bang, 0);
- rb_define_method(rb_cThread, "exit!", rb_thread_kill_bang, 0);
rb_define_method(rb_cThread, "value", rb_thread_value, 0);
- rb_define_method(rb_cThread, "status", rb_thread_status_name, 0);
- rb_define_method(rb_cThread, "join", rb_thread_join_m, -1);
+ rb_define_method(rb_cThread, "status", rb_thread_status, 0);
+ rb_define_method(rb_cThread, "join", rb_thread_join, 0);
rb_define_method(rb_cThread, "alive?", rb_thread_alive_p, 0);
rb_define_method(rb_cThread, "stop?", rb_thread_stop_p, 0);
rb_define_method(rb_cThread, "raise", rb_thread_raise_m, -1);
@@ -13090,82 +8770,43 @@ Init_Thread()
rb_define_method(rb_cThread, "priority", rb_thread_priority, 0);
rb_define_method(rb_cThread, "priority=", rb_thread_priority_set, 1);
rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0);
- rb_define_method(rb_cThread, "group", rb_thread_group, 0);
rb_define_method(rb_cThread, "[]", rb_thread_aref, 1);
rb_define_method(rb_cThread, "[]=", rb_thread_aset, 2);
rb_define_method(rb_cThread, "key?", rb_thread_key_p, 1);
- rb_define_method(rb_cThread, "keys", rb_thread_keys, 0);
rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0);
+ /* allocate main thread */
+ main_thread = rb_thread_alloc(rb_cThread);
+ curr_thread = main_thread->prev = main_thread->next = main_thread;
+
rb_cCont = rb_define_class("Continuation", rb_cObject);
- rb_undef_alloc_func(rb_cCont);
rb_undef_method(CLASS_OF(rb_cCont), "new");
rb_define_method(rb_cCont, "call", rb_cont_call, -1);
- rb_define_method(rb_cCont, "[]", rb_cont_call, -1);
rb_define_global_function("callcc", rb_callcc, 0);
- rb_global_variable(&cont_protect);
cThGroup = rb_define_class("ThreadGroup", rb_cObject);
- rb_define_alloc_func(cThGroup, thgroup_s_alloc);
+ rb_define_singleton_method(cThGroup, "new", thgroup_s_new, -1);
rb_define_method(cThGroup, "list", thgroup_list, 0);
- rb_define_method(cThGroup, "enclose", thgroup_enclose, 0);
- rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0);
rb_define_method(cThGroup, "add", thgroup_add, 1);
- rb_global_variable(&thgroup_default);
- thgroup_default = rb_obj_alloc(cThGroup);
- rb_define_const(cThGroup, "Default", thgroup_default);
-
- /* allocate main thread */
- main_thread = rb_thread_alloc(rb_cThread);
- curr_thread = main_thread->prev = main_thread->next = main_thread;
+ rb_define_const(cThGroup, "Default", thgroup_s_new(0, 0, cThGroup));
}
-/*
- * call-seq:
- * catch(symbol) {| | block } > obj
- *
- * +catch+ executes its block. If a +throw+ is
- * executed, Ruby searches up its stack for a +catch+ block
- * with a tag corresponding to the +throw+'s
- * _symbol_. If found, that block is terminated, and
- * +catch+ returns the value given to +throw+. If
- * +throw+ is not called, the block terminates normally, and
- * the value of +catch+ is the value of the last expression
- * evaluated. +catch+ expressions may be nested, and the
- * +throw+ call need not be in lexical scope.
- *
- * def routine(n)
- * puts n
- * throw :done if n <= 0
- * routine(n-1)
- * end
- *
- *
- * catch(:done) { routine(3) }
- *
- * <em>produces:</em>
- *
- * 3
- * 2
- * 1
- * 0
- */
-
static VALUE
rb_f_catch(dmy, tag)
VALUE dmy, tag;
{
int state;
- VALUE val = Qnil; /* OK */
+ ID t;
+ VALUE val; /* OK */
- tag = ID2SYM(rb_to_id(tag));
- PUSH_TAG(tag);
+ t = rb_to_id(tag);
+ PUSH_TAG(t);
if ((state = EXEC_TAG()) == 0) {
- val = rb_yield_0(tag, 0, 0, 0, Qfalse);
+ val = rb_yield_0(tag, 0, 0, 0);
}
- else if (state == TAG_THROW && tag == prot_tag->dst) {
+ else if (state == TAG_THROW && t == prot_tag->dst) {
val = prot_tag->retval;
state = 0;
}
@@ -13177,64 +8818,50 @@ rb_f_catch(dmy, tag)
static VALUE
catch_i(tag)
- VALUE tag;
+ ID tag;
{
- return rb_funcall(Qnil, rb_intern("catch"), 1, tag);
+ return rb_funcall(Qnil, rb_intern("catch"), 1, ID2SYM(tag));
}
VALUE
-rb_catch(tag, func, data)
+rb_catch(tag, proc, data)
const char *tag;
- VALUE (*func)();
+ VALUE (*proc)();
VALUE data;
{
- return rb_iterate((VALUE(*)_((VALUE)))catch_i, ID2SYM(rb_intern(tag)), func, data);
+ return rb_iterate(catch_i, rb_intern(tag), proc, data);
}
-/*
- * call-seq:
- * throw(symbol [, obj])
- *
- * Transfers control to the end of the active +catch+ block
- * waiting for _symbol_. Raises +NameError+ if there
- * is no +catch+ block for the symbol. The optional second
- * parameter supplies a return value for the +catch+ block,
- * which otherwise defaults to +nil+. For examples, see
- * <code>Kernel::catch</code>.
- */
-
static VALUE
rb_f_throw(argc, argv)
int argc;
VALUE *argv;
{
VALUE tag, value;
+ ID t;
struct tag *tt = prot_tag;
rb_scan_args(argc, argv, "11", &tag, &value);
- tag = ID2SYM(rb_to_id(tag));
+ t = rb_to_id(tag);
while (tt) {
- if (tt->tag == tag) {
- tt->dst = tag;
- tt->retval = value;
+ if (tt->tag == t) {
+ tt->dst = t;
break;
}
if (tt->tag == PROT_THREAD) {
- rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%lx",
- rb_id2name(SYM2ID(tag)),
+ rb_raise(rb_eThreadError, "uncaught throw `%s' in thread 0x%x",
+ rb_id2name(t),
curr_thread);
}
tt = tt->prev;
}
if (!tt) {
- rb_name_error(SYM2ID(tag), "uncaught throw `%s'", rb_id2name(SYM2ID(tag)));
+ rb_raise(rb_eNameError, "uncaught throw `%s'", rb_id2name(t));
}
+ return_value(value);
rb_trap_restore_mask();
JUMP_TAG(TAG_THROW);
-#ifndef __GNUC__
- return Qnil; /* not reached */
-#endif
}
void
@@ -13243,8 +8870,26 @@ rb_throw(tag, val)
VALUE val;
{
VALUE argv[2];
+ ID t = rb_intern(tag);
- argv[0] = ID2SYM(rb_intern(tag));
+ argv[0] = ID2SYM(t);
argv[1] = val;
rb_f_throw(2, argv);
}
+
+static void
+return_check()
+{
+ struct tag *tt = prot_tag;
+
+ while (tt) {
+ if (tt->tag == PROT_FUNC) {
+ break;
+ }
+ if (tt->tag == PROT_THREAD) {
+ rb_raise(rb_eThreadError, "return from within thread 0x%x",
+ curr_thread);
+ }
+ tt = tt->prev;
+ }
+}
diff --git a/ext/.cvsignore b/ext/.cvsignore
index ab2424ff7a..d8b8a61d92 100644
--- a/ext/.cvsignore
+++ b/ext/.cvsignore
@@ -1,2 +1 @@
-extinit.c
-*.log
+extmk.rb
diff --git a/ext/.document b/ext/.document
deleted file mode 100644
index ba8182593e..0000000000
--- a/ext/.document
+++ /dev/null
@@ -1,11 +0,0 @@
-# Add files to this as they become documented
-
-enumerator/enumerator.c
-iconv/iconv.c
-nkf/lib/kconv.rb
-nkf/nkf.c
-socket/socket.c
-stringio/stringio.c
-strscan/strscan.c
-win32ole
-zlib/zlib.c
diff --git a/ext/Setup b/ext/Setup
index d0d6317a5e..039747115f 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -1,34 +1,15 @@
#option nodynamic
-#Win32API
-#bigdecimal
+#GD
#curses
#dbm
-#digest
-#digest/md5
-#digest/rmd160
-#digest/sha1
-#digest/sha2
-#dl
-#enumerator
#etc
#fcntl
-#gdbm
-#iconv
-#io/wait
-#nkf
+#kconv
+#md5
#pty
-#openssl
-#racc/cparse
-#readline
#sdbm
#socket
-#stringio
-#strscan
-#syck
-#syslog
-#tcltklib
-#thread
#tk
-#win32ole
-#zlib
+#tcltklib
+#gtk
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
deleted file mode 100644
index 6bda3a4cfb..0000000000
--- a/ext/Setup.atheos
+++ /dev/null
@@ -1,34 +0,0 @@
-option nodynamic
-
-#Win32API
-bigdecimal
-curses
-dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-dl
-enumerator
-etc
-fcntl
-gdbm
-iconv
-io/wait
-nkf
-pty
-#openssl
-racc/parse
-readline
-sdbm
-socket
-stringio
-strscan
-syck
-syslog
-#tcltklib
-thread
-#tk
-#win32ole
-zlib
diff --git a/ext/Setup.dj b/ext/Setup.dj
index 4f94788886..6c955cba1e 100644
--- a/ext/Setup.dj
+++ b/ext/Setup.dj
@@ -1,34 +1,15 @@
option nodynamic
-#Win32API
-bigdecimal
-curses
+#GD
+#curses
dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
-etc
-enumerator
-fcntl
gdbm
-#iconv
-#io/wait
+#etc
+fcntl
nkf
-#pty
-#openssl
-racc/cparse
+marshal
+md5
readline
sdbm
#socket
-stringio
-strscan
-syck
-#syslog
-#tcltklib
-thread
-#tk
-#win32ole
-zlib
+#tkutil
diff --git a/ext/Setup.emx b/ext/Setup.emx
index afc5923577..dbb4b7a61c 100644
--- a/ext/Setup.emx
+++ b/ext/Setup.emx
@@ -1,34 +1,16 @@
option nodynamic
#Win32API
-bigdecimal
curses
#dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
-enumerator
etc
fcntl
#gdbm
-#iconv
-#io/wait
+md5
nkf
#pty
-#openssl
-racc/cparse
#readline
#sdbm
socket
-stringio
-strscan
-#syck
-#syslog
#tcltklib
-thread
#tk
-#win32ole
-#zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index 9f8abf9b8d..cd7969bb73 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -1,34 +1,19 @@
#option nodynamic
+#GD
Win32API
-bigdecimal
#curses
#dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-dl
-enumerator
-etc
+#etc
fcntl
#gdbm
-#iconv
-#io/wait
+#gtk
+marshal
+md5
nkf
#pty
-#openssl
-racc/cparse
#readline
sdbm
socket
-stringio
-strscan
-syck
-#syslog
#tcltklib
-thread
#tk
-win32ole
-#zlib
diff --git a/ext/Setup.x68 b/ext/Setup.x68
index 0966e737e9..25adea2035 100644
--- a/ext/Setup.x68
+++ b/ext/Setup.x68
@@ -1,34 +1,12 @@
option nodynamic
-#Win32API
-bigdecimal
+#GD
#curses
dbm
-digest
-digest/md5
-digest/rmd160
-digest/sha1
-digest/sha2
-#dl
#etc
-enumerator
fcntl
-#gdbm
-#iconv
-#io/wait
-nkf
-#pty
-#openssl
-racc/cparse
-#readline
-#sdbm
+kconv
+marshal
+md5
#socket
-stringio
-strscan
-#syck
-#syslog
-#tcltklib
-thread
-#tk
-#win32ole
-#zlib
+#tkutil
diff --git a/ext/Win32API/.cvsignore b/ext/Win32API/.cvsignore
deleted file mode 100644
index 90c83ed9b1..0000000000
--- a/ext/Win32API/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-*.log
-*.def
diff --git a/ext/Win32API/MANIFEST b/ext/Win32API/MANIFEST
new file mode 100644
index 0000000000..7cc9ac445e
--- /dev/null
+++ b/ext/Win32API/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+depend
+MANIFEST
+Win32API.c
+extconf.rb
+getch.rb
+point.rb
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index a4fd0396f0..0ee28f05ac 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -2,17 +2,33 @@
Win32API - Ruby Win32 API Import Facility
*/
-#if !defined _MSC_VER && !defined _WIN32
+#if !defined _MSC_VER && !defined NT
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <stdio.h>
#endif
+#if defined(_MSC_VER)
+#if defined(_M_ALPHA)
+#ifdef __cplusplus
+extern "C" { long __asm(char *,...); };
+#else
+long __asm(char *,...);
+#endif
+#pragma intrinsic(__asm)
+#endif
+#endif
+
#define _T_VOID 0
#define _T_NUMBER 1
#define _T_POINTER 2
#define _T_INTEGER 3
+typedef char *ApiPointer(void);
+typedef long ApiNumber(void);
+typedef void ApiVoid(void);
+typedef int ApiInteger(void);
+
#include "ruby.h"
typedef struct {
@@ -46,19 +62,19 @@ Win32API_initialize(self, dllname, proc, import, export)
char *s;
int i;
int len;
- int ex = _T_VOID;
+ int ex;
- SafeStringValue(dllname);
- SafeStringValue(proc);
+ Check_SafeStr(dllname);
+ Check_SafeStr(proc);
hdll = LoadLibrary(RSTRING(dllname)->ptr);
if (!hdll)
rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
- rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, (void*)hdll));
- hproc = (HANDLE)GetProcAddress(hdll, RSTRING(proc)->ptr);
+ rb_iv_set(self, "__hdll__", Data_Wrap_Struct(self, 0, Win32API_FreeLibrary, hdll));
+ hproc = GetProcAddress(hdll, RSTRING(proc)->ptr);
if (!hproc) {
str = rb_str_new3(proc);
str = rb_str_cat(str, "A", 1);
- hproc = (HANDLE)GetProcAddress(hdll, RSTRING(str)->ptr);
+ hproc = GetProcAddress(hdll, RSTRING(str)->ptr);
if (!hproc)
rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
RSTRING(proc)->ptr, RSTRING(str)->ptr);
@@ -69,65 +85,60 @@ Win32API_initialize(self, dllname, proc, import, export)
a_import = rb_ary_new();
switch (TYPE(import)) {
- case T_NIL:
+ case T_NIL:
break;
- case T_ARRAY:
+ case T_ARRAY:
ptr = RARRAY(import)->ptr;
for (i = 0, len = RARRAY(import)->len; i < len; i++) {
- SafeStringValue(ptr[i]);
+ Check_SafeStr(ptr[i]);
switch (*(char *)RSTRING(ptr[i])->ptr) {
- case 'N': case 'n': case 'L': case 'l':
+ case 'N': case 'n': case 'L': case 'l':
rb_ary_push(a_import, INT2FIX(_T_NUMBER));
break;
- case 'P': case 'p':
+ case 'P': case 'p':
rb_ary_push(a_import, INT2FIX(_T_POINTER));
break;
- case 'I': case 'i':
+ case 'I': case 'i':
rb_ary_push(a_import, INT2FIX(_T_INTEGER));
break;
}
}
break;
- default:
- SafeStringValue(import);
+ default:
+ Check_SafeStr(import);
s = RSTRING(import)->ptr;
for (i = 0, len = RSTRING(import)->len; i < len; i++) {
switch (*s++) {
- case 'N': case 'n': case 'L': case 'l':
+ case 'N': case 'n': case 'L': case 'l':
rb_ary_push(a_import, INT2FIX(_T_NUMBER));
break;
- case 'P': case 'p':
+ case 'P': case 'p':
rb_ary_push(a_import, INT2FIX(_T_POINTER));
break;
- case 'I': case 'i':
+ case 'I': case 'i':
rb_ary_push(a_import, INT2FIX(_T_INTEGER));
break;
}
}
break;
}
-
- if (16 < RARRAY(a_import)->len) {
- rb_raise(rb_eRuntimeError, "too many parameters: %ld\n", RARRAY(a_import)->len);
- }
-
rb_iv_set(self, "__import__", a_import);
if (NIL_P(export)) {
ex = _T_VOID;
} else {
- SafeStringValue(export);
+ Check_SafeStr(export);
switch (*RSTRING(export)->ptr) {
- case 'V': case 'v':
+ case 'V': case 'v':
ex = _T_VOID;
break;
- case 'N': case 'n': case 'L': case 'l':
+ case 'N': case 'n': case 'L': case 'l':
ex = _T_NUMBER;
break;
- case 'P': case 'p':
+ case 'P': case 'p':
ex = _T_POINTER;
break;
- case 'I': case 'i':
+ case 'I': case 'i':
ex = _T_INTEGER;
break;
}
@@ -137,9 +148,6 @@ Win32API_initialize(self, dllname, proc, import, export)
return Qnil;
}
-#ifdef _MSC_VER
-#pragma optimize("g", off)
-#endif
static VALUE
Win32API_Call(argc, argv, obj)
int argc;
@@ -147,62 +155,146 @@ Win32API_Call(argc, argv, obj)
VALUE obj;
{
VALUE args;
- unsigned long ret;
- int i;
- struct {
- unsigned long params[16];
- } param;
-#define params param.params
- VALUE obj_proc = rb_iv_get(obj, "__proc__");
- VALUE obj_import = rb_iv_get(obj, "__import__");
- VALUE obj_export = rb_iv_get(obj, "__export__");
- FARPROC ApiFunction = (FARPROC)NUM2ULONG(obj_proc);
- int items = rb_scan_args(argc, argv, "0*", &args);
- int nimport = RARRAY(obj_import)->len;
+ FARPROC ApiFunction;
+ ApiPointer *ApiFunctionPointer;
+ ApiNumber *ApiFunctionNumber;
+ ApiVoid *ApiFunctionVoid;
+ ApiInteger *ApiFunctionInteger;
+
+ long lParam;
+ char *pParam;
+
+ VALUE Return;
+
+ VALUE obj_proc;
+ VALUE obj_import;
+ VALUE obj_export;
+ VALUE import_type;
+ int nimport, timport, texport, i;
+ int items;
+ int ret;
+
+ items = rb_scan_args(argc, argv, "0*", &args);
+
+ obj_proc = rb_iv_get(obj, "__proc__");
+
+ ApiFunction = (FARPROC)NUM2ULONG(obj_proc);
+
+ obj_import = rb_iv_get(obj, "__import__");
+ obj_export = rb_iv_get(obj, "__export__");
+ nimport = RARRAY(obj_import)->len;
+ texport = FIX2INT(obj_export);
if (items != nimport)
- rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
+ rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n",
nimport, items);
- for (i = 0; i < nimport; i++) {
- unsigned long lParam = 0;
- switch (FIX2INT(rb_ary_entry(obj_import, i))) {
+ if (0 < nimport) {
+ for (i = nimport - 1; 0 <= i; i--) {
VALUE str;
- case _T_NUMBER:
- case _T_INTEGER:
- default:
- lParam = NUM2ULONG(rb_ary_entry(args, i));
- break;
- case _T_POINTER:
- str = rb_ary_entry(args, i);
- if (NIL_P(str)) {
- lParam = 0;
- } else if (FIXNUM_P(str)) {
- lParam = NUM2ULONG(str);
- } else {
- StringValue(str);
- rb_str_modify(str);
- lParam = (unsigned long)StringValuePtr(str);
+ import_type = rb_ary_entry(obj_import, i);
+ timport = FIX2INT(import_type);
+ switch (timport) {
+ case _T_NUMBER:
+ case _T_INTEGER:
+ lParam = NUM2ULONG(rb_ary_entry(args, i));
+#if defined(_MSC_VER) || defined(__LCC__)
+#if defined(_M_IX86)
+ _asm {
+ mov eax, lParam
+ push eax
+ }
+#elif defined(_M_ALPHA)
+ __asm(
+ "ldl r0, 0(%0);"
+ "stq r0, -(sp);"
+ , lParam
+ );
+#else
+#error
+#endif
+#elif defined __GNUC__
+ asm volatile ("pushl %0" :: "g" (lParam));
+#else
+#error
+#endif
+ break;
+ case _T_POINTER:
+ str = rb_ary_entry(args, i);
+ if (NIL_P(str)) {
+ pParam = 0;
+ } else if (FIXNUM_P(str)){
+ pParam = (char *)NUM2ULONG(str);
+ } else {
+ Check_Type(str, T_STRING);
+ rb_str_modify(str);
+ pParam = RSTRING(str)->ptr;
+ }
+#if defined(_MSC_VER) || defined(__LCC__)
+#if defined(_M_IX86)
+ _asm {
+ mov eax, pParam
+ push eax
+ }
+#elif defined(_M_ALPHA)
+ __asm(
+ "ldl r0, 0(%0);"
+ "stq r0, -(sp);"
+ , pParam
+ );
+#else
+#error
+#endif
+#elif defined __GNUC__
+ asm volatile ("pushl %0" :: "g" (pParam));
+#else
+#error
+#endif
+ break;
}
- break;
}
- params[i] = lParam;
}
- ret = ApiFunction(param);
-
- switch (FIX2INT(obj_export)) {
+#if defined __GNUC__
+ asm volatile ("call *%1" : "=r" (ret) : "g" (ApiFunction));
+ switch (texport) {
case _T_NUMBER:
case _T_INTEGER:
- return INT2NUM(ret);
+ Return = INT2NUM(ret);
+ break;
+ case _T_POINTER:
+ Return = rb_str_new2((char *)ret);
+ break;
+ case _T_VOID:
+ default:
+ Return = INT2NUM(0);
+ break;
+ }
+#else
+ switch (texport) {
+ case _T_NUMBER:
+ ApiFunctionNumber = (ApiNumber *) ApiFunction;
+ Return = INT2NUM(ApiFunctionNumber());
+ break;
case _T_POINTER:
- return rb_str_new2((char *)ret);
+ ApiFunctionPointer = (ApiPointer *) ApiFunction;
+ Return = rb_str_new2((char *)ApiFunctionPointer());
+ break;
+ case _T_INTEGER:
+ ApiFunctionInteger = (ApiInteger *) ApiFunction;
+ Return = INT2NUM(ApiFunctionInteger());
+ break;
case _T_VOID:
default:
- return INT2NUM(0);
+ ApiFunctionVoid = (ApiVoid *) ApiFunction;
+ ApiFunctionVoid();
+ Return = INT2NUM(0);
+ break;
}
+#endif
+ return Return;
}
void
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
index 865788556f..5e42f62558 100644
--- a/ext/Win32API/extconf.rb
+++ b/ext/Win32API/extconf.rb
@@ -1,6 +1,7 @@
-require 'mkmf'
-
-dir_config("win32")
-if have_header("windows.h") and have_library("kernel32")
+case RUBY_PLATFORM
+when /cygwin/,/mingw/
+ $CFLAGS = "-fno-defer-pop -fno-omit-frame-pointer"
+ create_makefile("Win32API")
+when /win32/
create_makefile("Win32API")
end
diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb
deleted file mode 100644
index 2671551a33..0000000000
--- a/ext/Win32API/lib/win32/registry.rb
+++ /dev/null
@@ -1,831 +0,0 @@
-=begin
-= Win32 Registry I/F
-win32/registry is registry accessor library for Win32 platform.
-It uses Win32API to call Win32 Registry APIs.
-
-== example
- Win32::Registry::HKEY_CURRENT_USER.open('SOFTWARE\foo') do |reg|
- value = reg['foo'] # read a value
- value = reg['foo', Win32::Registry::REG_SZ] # read a value with type
- type, value = reg.read('foo') # read a value
- reg['foo'] = 'bar' # write a value
- reg['foo', Win32::Registry::REG_SZ] = 'bar' # write a value with type
- reg.write('foo', Win32::Registry::REG_SZ, 'bar') # write a value
-
- reg.each_value { |name, type, data| ... } # Enumerate values
- reg.each_key { |key, wtime| ... } # Enumerate subkeys
-
- reg.delete_value(name) # Delete a value
- reg.delete_key(name) # Delete a subkey
- reg.delete_key(name, true) # Delete a subkey recursively
- end
-
-= Reference
-
-== Win32::Registry class
-
-=== including modules
-
-* Enumerable
-* Registry::Constants
-
-=== class methods
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
---- Registry.open(key, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED) { |reg| ... }
- Open the registry key ((|subkey|)) under ((|key|)).
- ((|key|)) is Win32::Registry object of parent key.
- You can use predefined key HKEY_* (see ((<constants>)))
-
- ((|desired|)) and ((|opt|)) is access mask and key option.
- For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regopenkeyex.asp>)).
-
- If block is given, the key is closed automatically.
-
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
---- Registry.create(key, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED) { |reg| ... }
- Create or open the registry key ((|subkey|)) under ((|key|)).
- You can use predefined key HKEY_* (see ((<constants>)))
-
- If subkey is already exists, key is opened and Registry#((<created?>))
- method will return false.
-
- If block is given, the key is closed automatically.
-
---- Registry.expand_environ(str)
- Replace (({%\w+%})) into the environment value of ((|str|)).
- This method is used for REG_EXPAND_SZ.
-
- For detail, see ((<ExpandEnvironmentStrings|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/expandenvironmentstrings.asp>)) Win32 API.
-
---- Registry.type2name(type)
- Convert registry type value to readable string.
-
---- Registry.wtime2time(wtime)
- Convert 64-bit FILETIME integer into Time object.
-
---- Registry.time2wtime(time)
- Convert Time object or Integer object into 64-bit FILETIME.
-
-=== instance methods
---- open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
- Same as (({Win32::((<Registry.open>))(self, subkey, desired, opt)}))
-
---- create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
- Same as (({Win32::((<Registry.create>))(self, subkey, desired, opt)}))
-
---- close
- Close key.
-
- After closed, most method raises error.
-
---- read(name, *rtype)
- Read a registry value named ((|name|)) and return array of
- [ ((|type|)), ((|data|)) ].
- When name is nil, the `default' value is read.
-
- ((|type|)) is value type. (see ((<Win32::Registry::Constants module>)))
- ((|data|)) is value data, its class is:
- :REG_SZ, REG_EXPAND_SZ
- String
- :REG_MULTI_SZ
- Array of String
- :REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD
- Integer
- :REG_BINARY
- String (contains binary data)
-
- When ((|rtype|)) is specified, the value type must be included by
- ((|rtype|)) array, or TypeError is raised.
-
---- self[name, *rtype]
- Read a registry value named ((|name|)) and return its value data.
- The class of value is same as ((<read>)) method returns.
-
- If the value type is REG_EXPAND_SZ, returns value data whose environment
- variables are replaced.
- If the value type is neither REG_SZ, REG_MULTI_SZ, REG_DWORD,
- REG_DWORD_BIG_ENDIAN, nor REG_QWORD, TypeError is raised.
-
- The meaning of ((|rtype|)) is same as ((<read>)) method.
-
---- read_s(name)
---- read_i(name)
---- read_bin(name)
- Read a REG_SZ(read_s), REG_DWORD(read_i), or REG_BINARY(read_bin)
- registry value named ((|name|)).
-
- If the values type does not match, TypeError is raised.
-
---- read_s_expand(name)
- Read a REG_SZ or REG_EXPAND_SZ registry value named ((|name|)).
-
- If the value type is REG_EXPAND_SZ, environment variables are replaced.
- Unless the value type is REG_SZ or REG_EXPAND_SZ, TypeError is raised.
-
---- write(name, type, data)
- Write ((|data|)) to a registry value named ((|name|)).
- When name is nil, write to the `default' value.
-
- ((|type|)) is type value. (see ((<Registry::Constants module>)))
- Class of ((|data|)) must be same as which ((<read>))
- method returns.
-
---- self[name, wtype = nil] = value
- Write ((|value|)) to a registry value named ((|name|)).
-
- If ((|wtype|)) is specified, the value type is it.
- Otherwise, the value type is depend on class of ((|value|)):
- :Integer
- REG_DWORD
- :String
- REG_SZ
- :Array
- REG_MULTI_SZ
-
---- write_s(name, value)
---- write_i(name, value)
---- write_bin(name, value)
- Write ((|value|)) to a registry value named ((|name|)).
-
- The value type is REG_SZ(write_s), REG_DWORD(write_i), or
- REG_BINARY(write_bin).
-
---- each { |name, type, value| ... }
---- each_value { |name, type, value| ... }
- Enumerate values.
-
---- each_key { |subkey, wtime| ... }
- Enumerate subkeys.
-
- ((|subkey|)) is String which contains name of subkey.
- ((|wtime|)) is last write time as FILETIME (64-bit integer).
- (see ((<Registry.wtime2time>)))
-
---- delete(name)
---- delete_value(name)
- Delete a registry value named ((|name|)).
- We can not delete the `default' value.
-
---- delete_key(name, recursive = false)
- Delete a subkey named ((|name|)) and all its values.
-
- If ((|recursive|)) is false, the subkey must not have subkeys.
- Otherwise, this method deletes all subkeys and values recursively.
-
---- flush
- Write all the attributes into the registry file.
-
---- created?
- Returns if key is created ((*newly*)).
- (see ((<Registry.create>)))
-
---- open?
- Returns if key is not closed.
-
---- hkey
- Returns key handle value.
-
---- parent
- Win32::Registry object of parent key, or nil if predefeined key.
-
---- keyname
- Same as ((|subkey|)) value of ((<Registry.open>)) or
- ((<Registry.create>)) method.
-
---- disposition
- Disposition value (REG_CREATED_NEW_KEY or REG_OPENED_EXISTING_KEY).
-
---- name
---- to_s
- Full path of key such as (({'HKEY_CURRENT_USER\SOFTWARE\foo\bar'})).
-
---- info
- Returns key information as Array of:
- :num_keys
- The number of subkeys.
- :max_key_length
- Maximum length of name of subkeys.
- :num_values
- The number of values.
- :max_value_name_length
- Maximum length of name of values.
- :max_value_length
- Maximum length of value of values.
- :descriptor_length
- Length of security descriptor.
- :wtime
- Last write time as FILETIME(64-bit integer)
-
- For detail, see ((<RegQueryInfoKey|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/regqueryinfokey.asp>)) Win32 API.
-
---- num_keys
---- max_key_length
---- num_values
---- max_value_name_length
---- max_value_length
---- descriptor_length
---- wtime
- Returns an item of key information.
-
-=== constants
---- HKEY_CLASSES_ROOT
---- HKEY_CURRENT_USER
---- HKEY_LOCAL_MACHINE
---- HKEY_PERFORMANCE_DATA
---- HKEY_CURRENT_CONFIG
---- HKEY_DYN_DATA
- Win32::Registry object whose key is predefined key.
- For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/predefined_keys.asp>)).
-
-== Win32::Registry::Constants module
-
-For detail, see ((<MSDN Library|URL:http://msdn.microsoft.com/library/en-us/sysinfo/base/registry.asp>)).
-
---- HKEY_*
- Predefined key ((*handle*)).
- These are Integer, not Win32::Registry.
-
---- REG_*
- Registry value type.
-
---- KEY_*
- Security access mask.
-
---- KEY_OPTIONS_*
- Key options.
-
---- REG_CREATED_NEW_KEY
---- REG_OPENED_EXISTING_KEY
- If the key is created newly or opened existing key.
- See also Registry#((<disposition>)) method.
-
-=end
-
-require 'Win32API'
-
-module Win32
- class Registry
- module Constants
- HKEY_CLASSES_ROOT = 0x80000000
- HKEY_CURRENT_USER = 0x80000001
- HKEY_LOCAL_MACHINE = 0x80000002
- HKEY_USERS = 0x80000003
- HKEY_PERFORMANCE_DATA = 0x80000004
- HKEY_PERFORMANCE_TEXT = 0x80000050
- HKEY_PERFORMANCE_NLSTEXT = 0x80000060
- HKEY_CURRENT_CONFIG = 0x80000005
- HKEY_DYN_DATA = 0x80000006
-
- REG_NONE = 0
- REG_SZ = 1
- REG_EXPAND_SZ = 2
- REG_BINARY = 3
- REG_DWORD = 4
- REG_DWORD_LITTLE_ENDIAN = 4
- REG_DWORD_BIG_ENDIAN = 5
- REG_LINK = 6
- REG_MULTI_SZ = 7
- REG_RESOURCE_LIST = 8
- REG_FULL_RESOURCE_DESCRIPTOR = 9
- REG_RESOURCE_REQUIREMENTS_LIST = 10
- REG_QWORD = 11
- REG_QWORD_LITTLE_ENDIAN = 11
-
- STANDARD_RIGHTS_READ = 0x00020000
- STANDARD_RIGHTS_WRITE = 0x00020000
- KEY_QUERY_VALUE = 0x0001
- KEY_SET_VALUE = 0x0002
- KEY_CREATE_SUB_KEY = 0x0004
- KEY_ENUMERATE_SUB_KEYS = 0x0008
- KEY_NOTIFY = 0x0010
- KEY_CREATE_LINK = 0x0020
- KEY_READ = STANDARD_RIGHTS_READ |
- KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY
- KEY_WRITE = STANDARD_RIGHTS_WRITE |
- KEY_SET_VALUE | KEY_CREATE_SUB_KEY
- KEY_EXECUTE = KEY_READ
- KEY_ALL_ACCESS = KEY_READ | KEY_WRITE | KEY_CREATE_LINK
-
- REG_OPTION_RESERVED = 0x0000
- REG_OPTION_NON_VOLATILE = 0x0000
- REG_OPTION_VOLATILE = 0x0001
- REG_OPTION_CREATE_LINK = 0x0002
- REG_OPTION_BACKUP_RESTORE = 0x0004
- REG_OPTION_OPEN_LINK = 0x0008
- REG_LEGAL_OPTION = REG_OPTION_RESERVED |
- REG_OPTION_NON_VOLATILE | REG_OPTION_CREATE_LINK |
- REG_OPTION_BACKUP_RESTORE | REG_OPTION_OPEN_LINK
-
- REG_CREATED_NEW_KEY = 1
- REG_OPENED_EXISTING_KEY = 2
-
- REG_WHOLE_HIVE_VOLATILE = 0x0001
- REG_REFRESH_HIVE = 0x0002
- REG_NO_LAZY_FLUSH = 0x0004
- REG_FORCE_RESTORE = 0x0008
-
- MAX_KEY_LENGTH = 514
- MAX_VALUE_LENGTH = 32768
- end
- include Constants
- include Enumerable
-
- #
- # Error
- #
- class Error < ::StandardError
- FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
- def initialize(code)
- @code = code
- msg = "\0" * 1024
- len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
- super msg[0, len].tr("\r", '').chomp
- end
- attr_reader :code
- end
-
- #
- # Predefined Keys
- #
- class PredefinedKey < Registry
- def initialize(hkey, keyname)
- @hkey = hkey
- @parent = nil
- @keyname = keyname
- @disposition = REG_OPENED_EXISTING_KEY
- end
-
- # Predefined keys cannot be closed
- def close
- raise Error.new(5) ## ERROR_ACCESS_DENIED
- end
-
- # Fake class for Registry#open, Registry#create
- def class
- Registry
- end
-
- # Make all
- Constants.constants.grep(/^HKEY_/) do |c|
- Registry.const_set c, new(Constants.const_get(c), c)
- end
- end
-
- #
- # Win32 APIs
- #
- module API
- [
- %w/RegOpenKeyExA LPLLP L/,
- %w/RegCreateKeyExA LPLLLLPPP L/,
- %w/RegEnumValueA LLPPPPPP L/,
- %w/RegEnumKeyExA LLPPLLLP L/,
- %w/RegQueryValueExA LPLPPP L/,
- %w/RegSetValueExA LPLLPL L/,
- %w/RegDeleteValue LP L/,
- %w/RegDeleteKey LP L/,
- %w/RegFlushKey L L/,
- %w/RegCloseKey L L/,
- %w/RegQueryInfoKey LPPPPPPPPPPP L/,
- ].each do |fn|
- const_set fn[0].intern, Win32API.new('advapi32.dll', *fn)
- end
-
- module_function
-
- def check(result)
- raise Error, result, caller(2) if result != 0
- end
-
- def packdw(dw)
- [dw].pack('V')
- end
-
- def unpackdw(dw)
- dw += [0].pack('V')
- dw.unpack('V')[0]
- end
-
- def packqw(qw)
- [ qw & 0xFFFFFFFF, qw >> 32 ].pack('VV')
- end
-
- def unpackqw(qw)
- qw = qw.unpack('VV')
- (qw[1] << 32) | qw[0]
- end
-
- def OpenKey(hkey, name, opt, desired)
- result = packdw(0)
- check RegOpenKeyExA.call(hkey, name, opt, desired, result)
- unpackdw(result)
- end
-
- def CreateKey(hkey, name, opt, desired)
- result = packdw(0)
- disp = packdw(0)
- check RegCreateKeyExA.call(hkey, name, 0, 0, opt, desired,
- 0, result, disp)
- [ unpackdw(result), unpackdw(disp) ]
- end
-
- def EnumValue(hkey, index)
- name = ' ' * Constants::MAX_KEY_LENGTH
- size = packdw(Constants::MAX_KEY_LENGTH)
- check RegEnumValueA.call(hkey, index, name, size, 0, 0, 0, 0)
- name[0, unpackdw(size)]
- end
-
- def EnumKey(hkey, index)
- name = ' ' * Constants::MAX_KEY_LENGTH
- size = packdw(Constants::MAX_KEY_LENGTH)
- wtime = ' ' * 8
- check RegEnumKeyExA.call(hkey, index, name, size, 0, 0, 0, wtime)
- [ name[0, unpackdw(size)], unpackqw(wtime) ]
- end
-
- def QueryValue(hkey, name)
- type = packdw(0)
- size = packdw(0)
- check RegQueryValueExA.call(hkey, name, 0, type, 0, size)
- data = ' ' * unpackdw(size)
- check RegQueryValueExA.call(hkey, name, 0, type, data, size)
- [ unpackdw(type), data[0, unpackdw(size)] ]
- end
-
- def SetValue(hkey, name, type, data, size)
- check RegSetValueExA.call(hkey, name, 0, type, data, size)
- end
-
- def DeleteValue(hkey, name)
- check RegDeleteValue.call(hkey, name)
- end
-
- def DeleteKey(hkey, name)
- check RegDeleteKey.call(hkey, name)
- end
-
- def FlushKey(hkey)
- check RegFlushKey.call(hkey)
- end
-
- def CloseKey(hkey)
- check RegCloseKey.call(hkey)
- end
-
- def QueryInfoKey(hkey)
- subkeys = packdw(0)
- maxsubkeylen = packdw(0)
- values = packdw(0)
- maxvaluenamelen = packdw(0)
- maxvaluelen = packdw(0)
- secdescs = packdw(0)
- wtime = ' ' * 8
- check RegQueryInfoKey.call(hkey, 0, 0, 0, subkeys, maxsubkeylen, 0,
- values, maxvaluenamelen, maxvaluelen, secdescs, wtime)
- [ unpackdw(subkeys), unpackdw(maxsubkeylen), unpackdw(values),
- unpackdw(maxvaluenamelen), unpackdw(maxvaluelen),
- unpackdw(secdescs), unpackqw(wtime) ]
- end
- end
-
- #
- # utility functions
- #
- def self.expand_environ(str)
- str.gsub(/%([^%]+)%/) { ENV[$1] || $& }
- end
-
- @@type2name = { }
- %w[
- REG_NONE REG_SZ REG_EXPAND_SZ REG_BINARY REG_DWORD
- REG_DWORD_BIG_ENDIAN REG_LINK REG_MULTI_SZ
- REG_RESOURCE_LIST REG_FULL_RESOURCE_DESCRIPTOR
- REG_RESOURCE_REQUIREMENTS_LIST REG_QWORD
- ].each do |type|
- @@type2name[Constants.const_get(type)] = type
- end
-
- def self.type2name(type)
- @@type2name[type] || type.to_s
- end
-
- def self.wtime2time(wtime)
- Time.at((wtime - 116444736000000000) / 10000000)
- end
-
- def self.time2wtime(time)
- time.to_i * 10000000 + 116444736000000000
- end
-
- #
- # constructors
- #
- private_class_method :new
-
- def self.open(hkey, subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED)
- subkey = subkey.chomp('\\')
- newkey = API.OpenKey(hkey.hkey, subkey, opt, desired)
- obj = new(newkey, hkey, subkey, REG_OPENED_EXISTING_KEY)
- if block_given?
- begin
- yield obj
- ensure
- obj.close
- end
- else
- obj
- end
- end
-
- def self.create(hkey, subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED)
- newkey, disp = API.CreateKey(hkey.hkey, subkey, opt, desired)
- obj = new(newkey, hkey, subkey, disp)
- if block_given?
- begin
- yield obj
- ensure
- obj.close
- end
- else
- obj
- end
- end
-
- #
- # finalizer
- #
- @@final = proc { |hkey| proc { API.CloseKey(hkey[0]) if hkey[0] } }
-
- #
- # initialize
- #
- def initialize(hkey, parent, keyname, disposition)
- @hkey = hkey
- @parent = parent
- @keyname = keyname
- @disposition = disposition
- @hkeyfinal = [ hkey ]
- ObjectSpace.define_finalizer self, @@final.call(@hkeyfinal)
- end
- attr_reader :hkey, :parent, :keyname, :disposition
-
- #
- # attributes
- #
- def created?
- @disposition == REG_CREATED_NEW_KEY
- end
-
- def open?
- !@hkey.nil?
- end
-
- def name
- parent = self
- name = @keyname
- while parent = parent.parent
- name = parent.keyname + '\\' + name
- end
- name
- end
-
- def inspect
- "\#<Win32::Registry key=#{name.inspect}>"
- end
-
- #
- # marshalling
- #
- def _dump(depth)
- raise TypeError, "can't dump Win32::Registry"
- end
-
- #
- # open/close
- #
- def open(subkey, desired = KEY_READ, opt = REG_OPTION_RESERVED, &blk)
- self.class.open(self, subkey, desired, opt, &blk)
- end
-
- def create(subkey, desired = KEY_ALL_ACCESS, opt = REG_OPTION_RESERVED, &blk)
- self.class.create(self, subkey, desired, opt, &blk)
- end
-
- def close
- API.CloseKey(@hkey)
- @hkey = @parent = @keyname = nil
- @hkeyfinal[0] = nil
- end
-
- #
- # iterator
- #
- def each_value
- index = 0
- while true
- begin
- subkey = API.EnumValue(@hkey, index)
- rescue Error
- break
- end
- begin
- type, data = read(subkey)
- rescue Error
- next
- end
- yield subkey, type, data
- index += 1
- end
- index
- end
- alias each each_value
-
- def each_key
- index = 0
- while true
- begin
- subkey, wtime = API.EnumKey(@hkey, index)
- rescue Error
- break
- end
- yield subkey, wtime
- index += 1
- end
- index
- end
-
- def keys
- keys_ary = []
- each_key { |key,| keys_ary << key }
- keys_ary
- end
-
- #
- # reader
- #
- def read(name, *rtype)
- type, data = API.QueryValue(@hkey, name)
- unless rtype.empty? or rtype.include?(type)
- raise TypeError, "Type mismatch (expect #{rtype.inspect} but #{type} present)"
- end
- case type
- when REG_SZ, REG_EXPAND_SZ
- [ type, data.chop ]
- when REG_MULTI_SZ
- [ type, data.split(/\0/) ]
- when REG_BINARY
- [ type, data ]
- when REG_DWORD
- [ type, API.unpackdw(data) ]
- when REG_DWORD_BIG_ENDIAN
- [ type, data.unpack('N')[0] ]
- when REG_QWORD
- [ type, API.unpackqw(data) ]
- else
- raise TypeError, "Type #{type} is not supported."
- end
- end
-
- def [](name, *rtype)
- type, data = read(name, *rtype)
- case type
- when REG_SZ, REG_DWORD, REG_QWORD, REG_MULTI_SZ
- data
- when REG_EXPAND_SZ
- Registry.expand_environ(data)
- else
- raise TypeError, "Type #{type} is not supported."
- end
- end
-
- def read_s(name)
- read(name, REG_SZ)[1]
- end
-
- def read_s_expand(name)
- type, data = read(name, REG_SZ, REG_EXPAND_SZ)
- if type == REG_EXPAND_SZ
- Registry.expand_environ(data)
- else
- data
- end
- end
-
- def read_i(name)
- read(name, REG_DWORD, REG_DWORD_BIG_ENDIAN, REG_QWORD)[1]
- end
-
- def read_bin(name)
- read(name, REG_BINARY)[1]
- end
-
- #
- # writer
- #
- def write(name, type, data)
- case type
- when REG_SZ, REG_EXPAND_SZ
- data = data.to_s + "\0"
- when REG_MULTI_SZ
- data = data.to_a.join("\0") + "\0\0"
- when REG_BINARY
- data = data.to_s
- when REG_DWORD
- data = API.packdw(data.to_i)
- when REG_DWORD_BIG_ENDIAN
- data = [data.to_i].pack('N')
- when REG_QWORD
- data = API.packqw(data.to_i)
- else
- raise TypeError, "Unsupported type #{type}"
- end
- API.SetValue(@hkey, name, type, data, data.length)
- end
-
- def []=(name, rtype, value = nil)
- if value
- write name, rtype, value
- else
- case value = rtype
- when Integer
- write name, REG_DWORD, value
- when String
- write name, REG_SZ, value
- when Array
- write name, REG_MULTI_SZ, value
- else
- raise TypeError, "Unexpected type #{value.class}"
- end
- end
- value
- end
-
- def write_s(name, value)
- write name, REG_SZ, value.to_s
- end
-
- def write_i(name, value)
- write name, REG_DWORD, value.to_i
- end
-
- def write_bin(name, value)
- write name, REG_BINARY, value.to_s
- end
-
- #
- # delete
- #
- def delete_value(name)
- API.DeleteValue(@hkey, name)
- end
- alias delete delete_value
-
- def delete_key(name, recursive = false)
- if recursive
- open(name, KEY_ALL_ACCESS) do |reg|
- reg.keys.each do |key|
- begin
- reg.delete_key(key, true)
- rescue Error
- #
- end
- end
- end
- API.DeleteKey(@hkey, name)
- else
- begin
- API.EnumKey @hkey, 0
- rescue Error
- return API.DeleteKey(@hkey, name)
- end
- raise Error.new(5) ## ERROR_ACCESS_DENIED
- end
- end
-
- #
- # flush
- #
- def flush
- API.FlushKey @hkey
- end
-
- #
- # key information
- #
- def info
- API.QueryInfoKey(@hkey)
- end
- %w[
- num_keys max_key_length
- num_values max_value_name_length max_value_length
- descriptor_length wtime
- ].each_with_index do |s, i|
- eval <<-__END__
- def #{s}
- info[#{i}]
- end
- __END__
- end
- end
-end
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
deleted file mode 100644
index 6534d20760..0000000000
--- a/ext/Win32API/lib/win32/resolv.rb
+++ /dev/null
@@ -1,366 +0,0 @@
-=begin
-= Win32 DNS and DHCP I/F
-
-=end
-
-require 'win32/registry'
-
-module Win32
- module Resolv
- API = Registry::API
-
- def self.get_hosts_path
- path = get_hosts_dir
- path = File.join(path.gsub(/\\/, File::SEPARATOR), 'hosts')
- File.exist?(path) ? path : nil
- end
-
- def self.get_resolv_info
- search, nameserver = get_info
- if search.empty?
- search = nil
- else
- search.delete("")
- search.uniq!
- end
- if nameserver.empty?
- nameserver = nil
- else
- nameserver.delete("")
- nameserver.delete("0.0.0.0")
- nameserver.uniq!
- end
- [ search, nameserver ]
- end
-
-getv = Win32API.new('kernel32.dll', 'GetVersionExA', 'P', 'L')
-info = [ 148, 0, 0, 0, 0 ].pack('V5') + "\0" * 128
-getv.call(info)
-if info.unpack('V5')[4] == 2 # VER_PLATFORM_WIN32_NT
-#====================================================================
-# Windows NT
-#====================================================================
- module_eval <<-'__EOS__', __FILE__, __LINE__+1
- TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
-
- class << self
- private
- def get_hosts_dir
- Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
- reg.read_s_expand('DataBasePath')
- end
- end
-
- def get_info
- search = nil
- nameserver = []
- Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
- begin
- slist = reg.read_s('SearchList')
- search = slist.split(/,\s*/) unless slist.empty?
- rescue Registry::Error
- end
-
- if add_search = search.nil?
- search = []
- begin
- nvdom = reg.read_s('NV Domain')
- unless nvdom.empty?
- @search = [ nvdom ]
- if reg.read_i('UseDomainNameDevolution') != 0
- if /^[\w\d]+\./ =~ nvdom
- devo = $'
- end
- end
- end
- rescue Registry::Error
- end
- end
-
- reg.open('Interfaces') do |reg|
- reg.each_key do |iface,|
- reg.open(iface) do |regif|
- begin
- [ 'NameServer', 'DhcpNameServer' ].each do |key|
- ns = regif.read_s(key)
- unless ns.empty?
- nameserver.concat(ns.split(/[,\s]\s*/))
- break
- end
- end
- rescue Registry::Error
- end
-
- if add_search
- begin
- [ 'Domain', 'DhcpDomain' ].each do |key|
- dom = regif.read_s(key)
- unless dom.empty?
- search.concat(dom.split(/,\s*/))
- break
- end
- end
- rescue Registry::Error
- end
- end
- end
- end
- end
- search << devo if add_search and devo
- end
- [ search.uniq, nameserver.uniq ]
- end
- end
- __EOS__
-else
-#====================================================================
-# Windows 9x
-#====================================================================
- module_eval <<-'__EOS__', __FILE__, __LINE__+1
- TCPIP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\MSTCP'
- DHCP_9X = 'SYSTEM\CurrentControlSet\Services\VxD\DHCP'
- WINDOWS = 'Software\Microsoft\Windows\CurrentVersion'
-
- class << self
- # private
-
- def get_hosts_dir
- Registry::HKEY_LOCAL_MACHINE.open(WINDOWS) do |reg|
- reg.read_s_expand('SystemRoot')
- end
- end
-
- def get_info
- search = []
- nameserver = []
- begin
- Registry::HKEY_LOCAL_MACHINE.open(TCPIP_9X) do |reg|
- if reg.read_s("EnableDNS") == "1"
- domain = reg.read_s("Domain")
- ns = reg.read_s("NameServer")
- slist = reg.read_s("SearchList")
- search << domain unless domain.empty?
- search.concat(slist.split(/,\s*/))
- nameserver.concat(ns.split(/[,\s]\s*/))
- end
- end
- rescue Registry::Error
- end
-
- dhcpinfo = get_dhcpinfo
- search.concat(dhcpinfo[0])
- nameserver.concat(dhcpinfo[1])
- [ search, nameserver ]
- end
-
- def get_dhcpinfo
- macaddrs = {}
- ipaddrs = {}
- WsControl.get_iflist.each do |index, macaddr, *ipaddr|
- macaddrs[macaddr] = 1
- ipaddr.each { |ipaddr| ipaddrs[ipaddr] = 1 }
- end
- iflist = [ macaddrs, ipaddrs ]
-
- search = []
- nameserver = []
- version = -1
- Registry::HKEY_LOCAL_MACHINE.open(DHCP_9X) do |reg|
- begin
- version = API.unpackdw(reg.read_bin("Version"))
- rescue Registry::Error
- end
-
- reg.each_key do |key,|
- catch(:not_used) do
- reg.open(key) do |regdi|
- dom, ns = get_dhcpinfo_key(version, regdi, iflist)
- search << dom if dom
- nameserver.concat(ns) if ns
- end
- end
- end
- end
- [ search, nameserver ]
- end
-
- def get_dhcpinfo_95(reg)
- dhcp = reg.read_bin("DhcpInfo")
- [
- API.unpackdw(dhcp[4..7]),
- API.unpackdw(dhcp[8..11]),
- 1,
- dhcp[45..50],
- reg.read_bin("OptionInfo"),
- ]
- end
-
- def get_dhcpinfo_98(reg)
- [
- API.unpackdw(reg.read_bin("DhcpIPAddress")),
- API.unpackdw(reg.read_bin("DhcpSubnetMask")),
- API.unpackdw(reg.read_bin("HardwareType")),
- reg.read_bin("HardwareAddress"),
- reg.read_bin("OptionInfo"),
- ]
- end
-
- def get_dhcpinfo_key(version, reg, iflist)
- info = case version
- when 1
- get_dhcpinfo_95(reg)
- when 2
- get_dhcpinfo_98(reg)
- else
- begin
- get_dhcpinfo_98(reg)
- rescue Registry::Error
- get_dhcpinfo_95(reg)
- end
- end
- ipaddr, netmask, hwtype, macaddr, opt = info
- throw :not_used unless
- ipaddr and ipaddr != 0 and
- netmask and netmask != 0 and
- macaddr and macaddr.size == 6 and
- hwtype == 1 and
- iflist[0][macaddr] and iflist[1][ipaddr]
-
- size = opt.size
- idx = 0
- while idx <= size
- opttype = opt[idx]
- optsize = opt[idx + 1]
- optval = opt[idx + 2, optsize]
- case opttype
- when 0xFF ## term
- break
- when 0x0F ## domain
- domain = optval.chomp("\0")
- when 0x06 ## dns
- nameserver = optval.scan(/..../).collect { |addr|
- "%d.%d.%d.%d" % addr.unpack('C4')
- }
- end
- idx += optsize + 2
- end
- [ domain, nameserver ]
- rescue Registry::Error
- throw :not_used
- end
- end
-
- module WsControl
- WsControl = Win32API.new('wsock32.dll', 'WsControl', 'LLPPPP', 'L')
- WSAGetLastError = Win32API.new('wsock32.dll', 'WSAGetLastError', 'V', 'L')
-
- MAX_TDI_ENTITIES = 512
- IPPROTO_TCP = 6
- WSCTL_TCP_QUERY_INFORMATION = 0
- INFO_CLASS_GENERIC = 0x100
- INFO_CLASS_PROTOCOL = 0x200
- INFO_TYPE_PROVIDER = 0x100
- ENTITY_LIST_ID = 0
- GENERIC_ENTITY = 0
- CL_NL_ENTITY = 0x301
- IF_ENTITY = 0x200
- ENTITY_TYPE_ID = 1
- CL_NL_IP = 0x303
- IF_MIB = 0x202
- IF_MIB_STATS_ID = 1
- IP_MIB_ADDRTABLE_ENTRY_ID = 0x102
-
- def self.wsctl(tei_entity, tei_instance,
- toi_class, toi_type, toi_id,
- buffsize)
- reqinfo = [
- ## TDIEntityID
- tei_entity, tei_instance,
- ## TDIObjectID
- toi_class, toi_type, toi_id,
- ## TCP_REQUEST_INFORMATION_EX
- ""
- ].pack('VVVVVa16')
- reqsize = API.packdw(reqinfo.size)
- buff = "\0" * buffsize
- buffsize = API.packdw(buffsize)
- result = WsControl.call(
- IPPROTO_TCP,
- WSCTL_TCP_QUERY_INFORMATION,
- reqinfo, reqsize,
- buff, buffsize)
- if result != 0
- raise RuntimeError, "WsControl failed.(#{result})"
- end
- [ buff, API.unpackdw(buffsize) ]
- end
- private_class_method :wsctl
-
- def self.get_iflist
- # Get TDI Entity List
- entities, size =
- wsctl(GENERIC_ENTITY, 0,
- INFO_CLASS_GENERIC,
- INFO_TYPE_PROVIDER,
- ENTITY_LIST_ID,
- MAX_TDI_ENTITIES * 8) # sizeof(TDIEntityID)
- entities = entities[0, size].
- scan(/.{8}/).
- collect { |e| e.unpack('VV') }
-
- # Get MIB Interface List
- iflist = []
- ifcount = 0
- entities.each do |entity, instance|
- if( (entity & IF_ENTITY)>0 )
- ifcount += 1
- etype, = wsctl(entity, instance,
- INFO_CLASS_GENERIC,
- INFO_TYPE_PROVIDER,
- ENTITY_TYPE_ID,
- 4)
- if( (API.unpackdw(etype) & IF_MIB)==IF_MIB )
- ifentry, = wsctl(entity, instance,
- INFO_CLASS_PROTOCOL,
- INFO_TYPE_PROVIDER,
- IF_MIB_STATS_ID,
- 21 * 4 + 8 + 130) # sizeof(IFEntry)
- iflist << [
- API.unpackdw(ifentry[0,4]),
- ifentry[20, 6]
- ]
- end
- end
- end
-
- # Get IP Addresses
- entities.each do |entity, instance|
- if entity == CL_NL_ENTITY
- etype, = wsctl(entity, instance,
- INFO_CLASS_GENERIC,
- INFO_TYPE_PROVIDER,
- ENTITY_TYPE_ID,
- 4)
- if API.unpackdw(etype) == CL_NL_IP
- ipentries, = wsctl(entity, instance,
- INFO_CLASS_PROTOCOL,
- INFO_TYPE_PROVIDER,
- IP_MIB_ADDRTABLE_ENTRY_ID,
- 24 * (ifcount+1)) # sizeof(IPAddrEntry)
- ipentries.scan(/.{24}/) do |ipentry|
- ipaddr, index = ipentry.unpack('VV')
- if ifitem = iflist.assoc(index)
- ifitem << ipaddr
- end
- end
- end
- end
- end
- iflist
- end
- end
- __EOS__
-end
-#====================================================================
- end
-end
diff --git a/ext/aix_mksym.rb b/ext/aix_mksym.rb
new file mode 100644
index 0000000000..7e1af283dc
--- /dev/null
+++ b/ext/aix_mksym.rb
@@ -0,0 +1,33 @@
+
+def uniq(data)
+ last=nil
+ data.delete_if do |name|
+ if last == name
+ TRUE
+ else
+ last = name
+ FALSE
+ end
+ end
+end
+
+def extract(nm, out)
+ data = nm.readlines.collect{|line|
+ line = line.split
+ case line[1]
+ when "B", "D"
+ line[0]
+ else
+ next
+ end
+ }.compact!.sort!
+ uniq(data)
+ exp = open(out, "w")
+ exp.printf "#!\n"
+ for line in data
+ exp.printf "%s\n", line
+ end
+ exp.close
+ nm.close
+end
+extract(open("|/usr/ccs/bin/nm -p ../libruby.a"), "../ruby.imp")
diff --git a/ext/bigdecimal/.cvsignore b/ext/bigdecimal/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/bigdecimal/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/bigdecimal/README b/ext/bigdecimal/README
deleted file mode 100644
index a233f47f64..0000000000
--- a/ext/bigdecimal/README
+++ /dev/null
@@ -1,60 +0,0 @@
-
- Ruby BIGDECIMAL(Variable Precision) extension library.
- Copyright (C) 1999 by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
-
-BigDecimal is copyrighted free software by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-(see COPYING file), 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
- 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) rename any non-standard executables so the names do not conflict
- with standard executables, which must also be provided.
-
- d) make other distribution arrangements with the author.
-
- 3. You may distribute the software in object code or executable
- form, provided that you do at least ONE of the following:
-
- a) distribute the executables 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 executables 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).
-
- 5. 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.
-
-* The Author
-
-Feel free to send comments and bug reports to the author. Here is the
-author's latest mail address:
-
- shigeo@tinyforest.gr.jp
-
--------------------------------------------------------
-created at: Thu Dec 22 1999
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
deleted file mode 100644
index a4b769e8cf..0000000000
--- a/ext/bigdecimal/bigdecimal.c
+++ /dev/null
@@ -1,4695 +0,0 @@
-/*
- *
- * Ruby BigDecimal(Variable decimal precision) extension library.
- *
- * 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 this BigDecimal distribution.
- *
- * NOTE: Change log in this source removed to reduce source code size.
- * See rev. 1.25 if needed.
- *
- */
-
-#include "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"
-#include "version.h"
-
-/* #define ENABLE_NUMERIC_STRING */
-
-VALUE rb_cBigDecimal;
-
-#include "bigdecimal.h"
-
-/* MACRO's to guard objects from GC by keeping them in stack */
-#define ENTER(n) volatile VALUE vStack[n];int iStack=0
-#define PUSH(x) vStack[iStack++] = (unsigned long)(x);
-#define SAVE(p) PUSH(p->obj);
-#define GUARD_OBJ(p,y) {p=y;SAVE(p);}
-
-/*
- * ================== Ruby Interface part ==========================
- */
-#define DoSomeOne(x,y) rb_num_coerce_bin(x,y)
-
-#if 0
-/* 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.
- *
- * Documented by mathew <meta@pobox.com>.
- *
- * = Introduction
- *
- * Ruby provides built-in support for arbitrary precision integer arithmetic.
- * For example:
- *
- * 42**13 -> 1265437718438866624512
- *
- * BigDecimal provides similar support for very large or very accurate floating
- * point numbers.
- *
- * 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:
- *
- * sum = 0
- * for i in (1..10000)
- * sum = sum + 0.0001
- * end
- * print sum
- *
- * and contrast with the output from:
- *
- * require 'bigdecimal'
- *
- * sum = BigDecimal.new("0")
- * for i in (1..10000)
- * sum = sum + BigDecimal.new("0.0001")
- * end
- * print sum
- *
- * Similarly:
- *
- * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
- *
- * (1.2 - 1.0) == 0.2 -> false
- *
- * = Special features of accurate decimal arithmetic
- *
- * Because BigDecimal is more accurate than normal binary floating point
- * arithmetic, it requires some special values.
- *
- * == Infinity
- *
- * 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
- *
- * You can represent infinite numbers to BigDecimal using the strings
- * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
- *
- * == Not a Number
- *
- * 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
- *
- * You can also create undefined values. NaN is never considered to be the
- * same as any other value, even NaN itself:
- *
- * n = BigDecimal.new('NaN')
- *
- * n == 0.0 -> nil
- *
- * n == n -> nil
- *
- * == Positive and negative zero
- *
- * If a computation results in a value which is too small to be represented as
- * a BigDecimal within the currently specified limits of precision, zero must
- * be returned.
- *
- * If the value which is too small to be represented is negative, a BigDecimal
- * 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
- *
- * (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
- * comparison.
- *
- * Note also that in mathematics, there is no particular concept of negative
- * or positive zero; true mathematical zero has no sign.
- */
-void
-Init_BigDecimal()
-{
- /* This is a #if-ed out function to fool Rdoc into documenting the class. */
- /* The real init function is Init_bigdecimal() further down. */
-}
-#endif
-
-/*
- * 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)
-{
- /*
- * 1.0.0: Ruby 1.8.0
- * 1.0.1: Ruby 1.8.1
- */
- return rb_str_new2("1.0.1");
-}
-
-/*
- * VP routines used in BigDecimal part
- */
-static unsigned short VpGetException(void);
-static void VpSetException(unsigned short f);
-static void VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v);
-static int VpLimitRound(Real *c,U_LONG ixDigit);
-
-/*
- * **** BigDecimal part ****
- */
-
-static void
-BigDecimal_delete(Real *pv)
-{
- VpFree(pv);
-}
-
-static VALUE
-ToValue(Real *p)
-{
- if(VpIsNaN(p)) {
- VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
- } else if(VpIsPosInf(p)) {
- VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
- } else if(VpIsNegInf(p)) {
- VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
- }
- return p->obj;
-}
-
-static Real *
-GetVpValue(VALUE v, int must)
-{
- Real *pv;
- VALUE bg;
- char szD[128];
-
- switch(TYPE(v))
- {
- case T_DATA:
- if(RDATA(v)->dfree ==(void *) BigDecimal_delete) {
- Data_Get_Struct(v, Real, pv);
- 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));
-#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;
- }
-
-SomeOneMayDoIt:
- 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 */
-}
-
-/* call-seq:
- * BigDecimal.double_fig
- *
- * The BigDecimal.double_fig class method returns the number of digits a
- * Float number is allowed to have. The result depends upon the CPU and OS
- * in use.
- */
-static VALUE
-BigDecimal_double_fig(VALUE self)
-{
- return INT2FIX(VpDblFig());
-}
-
-/* call-seq:
- * precs
- *
- * Returns an Array of two Integer values.
- *
- * The first value is the current number of significant digits in the
- * BigDecimal. The second value is the maximum number of significant digits
- * for the BigDecimal.
- */
-static VALUE
-BigDecimal_prec(VALUE self)
-{
- ENTER(1);
- Real *p;
- VALUE obj;
-
- GUARD_OBJ(p,GetVpValue(self,1));
- obj = rb_assoc_new(INT2NUM(p->Prec*VpBaseFig()),
- INT2NUM(p->MaxPrec*VpBaseFig()));
- return obj;
-}
-
-static VALUE
-BigDecimal_hash(VALUE self)
-{
- ENTER(1);
- Real *p;
- U_LONG hash,i;
-
- GUARD_OBJ(p,GetVpValue(self,1));
- hash = (U_LONG)p->sign;
- /* hash!=2: the case for 0(1),NaN(0) or +-Infinity(3) is sign itself */
- 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);
-}
-
-static VALUE
-BigDecimal_dump(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- char sz[50];
- Real *vp;
- char *psz;
- VALUE dummy;
- rb_scan_args(argc, argv, "01", &dummy);
- GUARD_OBJ(vp,GetVpValue(self,1));
- sprintf(sz,"%lu:",VpMaxPrec(vp)*VpBaseFig());
- psz = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E")+strlen(sz));
- sprintf(psz,"%s",sz);
- VpToString(vp, psz+strlen(psz), 0, 0);
- return rb_str_new2(psz);
-}
-
-/*
- * Internal method used to provide marshalling support. See the Marshal module.
- */
-static VALUE
-BigDecimal_load(VALUE self, VALUE str)
-{
- ENTER(2);
- Real *pv;
- unsigned char *pch;
- unsigned char ch;
- unsigned long m=0;
-
- SafeStringValue(str);
- pch = (unsigned char *)RSTRING_PTR(str);
- /* First get max prec */
- while((*pch)!=(unsigned char)'\0' && (ch=*pch++)!=(unsigned char)':') {
- if(!ISDIGIT(ch)) {
- rb_raise(rb_eTypeError, "load failed: invalid character in the marshaled string");
- }
- m = m*10 + (unsigned long)(ch-'0');
- }
- if(m>VpBaseFig()) m -= VpBaseFig();
- GUARD_OBJ(pv,VpNewRbClass(m,(char *)pch,self));
- m /= VpBaseFig();
- if(m && pv->MaxPrec>m) pv->MaxPrec = m+1;
- return ToValue(pv);
-}
-
- /* 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)
-{
- VALUE which;
- VALUE val;
- unsigned long f,fo;
-
- if(rb_scan_args(argc,argv,"11",&which,&val)==1) val = Qnil;
-
- Check_Type(which, T_FIXNUM);
- f = (unsigned long)FIX2INT(which);
-
- if(f&VP_EXCEPTION_ALL) {
- /* Exception mode setting */
- fo = VpGetException();
- if(val==Qnil) return INT2FIX(fo);
- if(val!=Qfalse && val!=Qtrue) {
- rb_raise(rb_eTypeError, "second argument must be true or false");
- return Qnil; /* Not reached */
- }
- if(f&VP_EXCEPTION_INFINITY) {
- VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_INFINITY):
- (fo&(~VP_EXCEPTION_INFINITY))));
- }
- if(f&VP_EXCEPTION_NaN) {
- VpSetException((unsigned short)((val==Qtrue)?(fo|VP_EXCEPTION_NaN):
- (fo&(~VP_EXCEPTION_NaN))));
- }
- fo = VpGetException();
- 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 U_LONG
-GetAddSubPrec(Real *a, Real *b)
-{
- U_LONG mxs;
- U_LONG mx = a->Prec;
- S_INT d;
-
- 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+(U_LONG)d;
- if(mx<mxs) {
- return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
- }
- }
- return mx;
-}
-
-static S_INT
-GetPositiveInt(VALUE v)
-{
- S_INT n;
- Check_Type(v, T_FIXNUM);
- n = FIX2INT(v);
- if(n < 0) {
- rb_raise(rb_eArgError, "argument must be positive");
- }
- return n;
-}
-
-VP_EXPORT Real *
-VpNewRbClass(U_LONG mx, char *str, VALUE klass)
-{
- Real *pv = VpAlloc(mx,str);
- pv->obj = (VALUE)Data_Wrap_Struct(klass, 0, BigDecimal_delete, pv);
- return pv;
-}
-
-VP_EXPORT Real *
-VpCreateRbObject(U_LONG mx, const char *str)
-{
- Real *pv = VpAlloc(mx,str);
- pv->obj = (VALUE)Data_Wrap_Struct(rb_cBigDecimal, 0, BigDecimal_delete, pv);
- return pv;
-}
-
-/* Returns True if the value is Not a Number */
-static VALUE
-BigDecimal_IsNaN(VALUE self)
-{
- Real *p = GetVpValue(self,1);
- if(VpIsNaN(p)) return Qtrue;
- return Qfalse;
-}
-
-/* Returns True if the value is infinite */
-static VALUE
-BigDecimal_IsInfinite(VALUE self)
-{
- Real *p = GetVpValue(self,1);
- if(VpIsPosInf(p)) return INT2FIX(1);
- if(VpIsNegInf(p)) return INT2FIX(-1);
- return Qnil;
-}
-
-/* Returns True if the value is finite (not NaN or infinite) */
-static VALUE
-BigDecimal_IsFinite(VALUE self)
-{
- Real *p = GetVpValue(self,1);
- if(VpIsNaN(p)) return Qfalse;
- if(VpIsInf(p)) return Qfalse;
- return Qtrue;
-}
-
-/* Returns the value as an integer (Fixnum or Bignum).
- *
- * If the BigNumber is infinity or NaN, returns nil.
- */
-static VALUE
-BigDecimal_to_i(VALUE self)
-{
- ENTER(5);
- int e,n,i,nf;
- U_LONG v,b,j;
- char *psz,*pch;
- Real *p;
-
- GUARD_OBJ(p,GetVpValue(self,1));
-
- /* Infinity or NaN not converted. */
- if(VpIsNaN(p)) {
- VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'(Not a Number)",0);
- return Qnil;
- } else if(VpIsPosInf(p)) {
- VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
- return Qnil;
- } else if(VpIsNegInf(p)) {
- VpException(VP_EXCEPTION_INFINITY,"Computation results to '-Infinity'",0);
- return Qnil;
- }
-
- e = VpExponent10(p);
- if(e<=0) return INT2FIX(0);
- nf = VpBaseFig();
- if(e<=nf) {
- e = VpGetSign(p)*p->frac[0];
- return INT2FIX(e);
- }
- psz = ALLOCA_N(char,(unsigned int)(e+nf+2));
-
- n = (e+nf-1)/nf;
- pch = psz;
- if(VpGetSign(p)<0) *pch++ = '-';
- for(i=0;i<n;++i) {
- b = VpBaseVal()/10;
- if(i>=(int)p->Prec) {
- while(b) {
- *pch++ = '0';
- b /= 10;
- }
- continue;
- }
- v = p->frac[i];
- while(b) {
- j = v/b;
- *pch++ = (char)(j + '0');
- v -= j*b;
- b /= 10;
- }
- }
- *pch++ = 0;
- return rb_cstr2inum(psz,10);
-}
-
-static VALUE
-BigDecimal_induced_from(VALUE self, VALUE x)
-{
- Real *p = GetVpValue(x,1);
- return p->obj;
-}
-
-/* Returns a new Float object having approximately the same value as the
- * BigDecimal number. Normal accuracy limits and built-in errors of binary
- * Float arithmetic apply.
- */
-static VALUE
-BigDecimal_to_f(VALUE self)
-{
- ENTER(1);
- Real *p;
- double d, d2;
- S_LONG e;
-
- GUARD_OBJ(p,GetVpValue(self,1));
- if(VpVtoD(&d, &e, p)!=1) return rb_float_new(d);
- errno = 0;
- d2 = pow(10.0,(double)e);
- if((errno == ERANGE && e>0) || (d2>1.0 && (fabs(d) > (DBL_MAX / d2)))) {
- VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
- if(d>0.0) return rb_float_new(DBL_MAX);
- else return rb_float_new(-DBL_MAX);
- }
- return rb_float_new(d*d2);
-}
-
-/* The coerce method provides support for Ruby type coercion. It is not
- * enabled by default.
- *
- * This means that binary operations like + * / or - can often be performed
- * on a BigDecimal and an object of another type, if the other object can
- * be coerced into a BigDecimal value.
- *
- * e.g.
- * a = BigDecimal.new("1.0")
- * b = a / 2.0 -> 0.5
- *
- * Note that coercing a String to a BigDecimal is not supported by default;
- * it requires a special compile-time option when building Ruby.
- */
-static VALUE
-BigDecimal_coerce(VALUE self, VALUE other)
-{
- ENTER(2);
- VALUE obj;
- Real *b;
- if(TYPE(other) == T_FLOAT) {
- obj = rb_assoc_new(other, BigDecimal_to_f(self));
- } else {
- GUARD_OBJ(b,GetVpValue(other,1));
- obj = rb_assoc_new(b->obj, self);
- }
- return obj;
-}
-
-static VALUE
-BigDecimal_uplus(VALUE self)
-{
- return self;
-}
-
- /* call-seq:
- * add(value, digits)
- *
- * Add the specified value.
- *
- * e.g.
- * 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.
- */
-static VALUE
-BigDecimal_add(VALUE self, VALUE r)
-{
- ENTER(5);
- Real *c, *a, *b;
- 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==(-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);
-}
-
- /* call-seq:
- * sub(value, digits)
- *
- * Subtract the specified value.
- *
- * e.g.
- * 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.
- */
-static VALUE
-BigDecimal_sub(VALUE self, VALUE r)
-{
- ENTER(5);
- Real *c, *a, *b;
- 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==(-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);
-}
-
-static VALUE
-BigDecimalCmp(VALUE self, VALUE r,char op)
-{
- ENTER(5);
- S_INT e;
- Real *a, *b;
- GUARD_OBJ(a,GetVpValue(self,1));
- b = GetVpValue(r,0);
- if(!b) return rb_num_coerce_cmp(self,r);
- SAVE(b);
- e = VpComp(a, b);
- if(e==999) return Qnil;
- switch(op)
- {
- case '*': return INT2FIX(e); /* any op */
- case '=': if(e==0) return Qtrue ; return Qfalse;
- 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()");
-}
-
-/* Returns True if the value is zero. */
-static VALUE
-BigDecimal_zero(VALUE self)
-{
- Real *a = GetVpValue(self,1);
- return VpIsZero(a) ? Qtrue : Qfalse;
-}
-
-/* Returns True if the value is non-zero. */
-static VALUE
-BigDecimal_nonzero(VALUE self)
-{
- Real *a = GetVpValue(self,1);
- return VpIsZero(a) ? Qnil : self;
-}
-
-/* The comparison operator.
- * a <=> b is 0 if a == b, 1 if a > b, -1 if a < b.
- */
-static VALUE
-BigDecimal_comp(VALUE self, VALUE r)
-{
- return BigDecimalCmp(self, r, '*');
-}
-
-/*
- * Tests for value equality; returns true if the values are equal.
- *
- * The == and === operators and the eql? method have the same implementation
- * for BigDecimal.
- *
- * Values may be coerced to perform the comparison:
- *
- * BigDecimal.new('1.0') == 1.0 -> true
- */
-static VALUE
-BigDecimal_eq(VALUE self, VALUE r)
-{
- return BigDecimalCmp(self, r, '=');
-}
-
-/* call-seq:
- * a < b
- *
- * 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)
-{
- return BigDecimalCmp(self, 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 ==, coerce).
- */
-static VALUE
-BigDecimal_le(VALUE self, VALUE r)
-{
- return BigDecimalCmp(self, r, 'L');
-}
-
-/* call-seq:
- * a > b
- *
- * 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)
-{
- return BigDecimalCmp(self, 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 ==, coerce)
- */
-static VALUE
-BigDecimal_ge(VALUE self, VALUE r)
-{
- return BigDecimalCmp(self, r, 'G');
-}
-
-static VALUE
-BigDecimal_neg(VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- GUARD_OBJ(a,GetVpValue(self,1));
- GUARD_OBJ(c,VpCreateRbObject(a->Prec *(VpBaseFig() + 1), "0"));
- VpAsgn(c, a, -1);
- return ToValue(c);
-}
-
- /* call-seq:
- * mult(value, digits)
- *
- * Multiply by the specified value.
- *
- * e.g.
- * 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.
- */
-static VALUE
-BigDecimal_mult(VALUE self, VALUE r)
-{
- ENTER(5);
- Real *c, *a, *b;
- U_LONG mx;
-
- GUARD_OBJ(a,GetVpValue(self,1));
- b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r);
- SAVE(b);
-
- mx = a->Prec + b->Prec;
- GUARD_OBJ(c,VpCreateRbObject(mx *(VpBaseFig() + 1), "0"));
- VpMult(c, a, b);
- return ToValue(c);
-}
-
-static VALUE
-BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
-/* For c = self.div(r): with round operation */
-{
- ENTER(5);
- Real *a, *b;
- U_LONG mx;
-
- GUARD_OBJ(a,GetVpValue(self,1));
- b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r);
- SAVE(b);
- *div = b;
- mx =(a->MaxPrec + b->MaxPrec + 1) * VpBaseFig();
- GUARD_OBJ((*c),VpCreateRbObject(mx, "#0"));
- GUARD_OBJ((*res),VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
- VpDivd(*c, *res, a, b);
- return (VALUE)0;
-}
-
- /* call-seq:
- * div(value, digits)
- * quo(value)
- *
- * Divide by the specified value.
- *
- * 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.
- *
- * 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 div(value, 0) is the same as computing
- * the quotient; see divmod.
- */
-static VALUE
-BigDecimal_div(VALUE self, VALUE r)
-/* For c = self/r: with round operation */
-{
- ENTER(5);
- Real *c=NULL, *res=NULL, *div = NULL;
- r = BigDecimal_divide(&c, &res, &div, self, r);
- if(r!=(VALUE)0) return r; /* coerced by other */
- SAVE(c);SAVE(res);SAVE(div);
- /* a/b = c + r/b */
- /* c xxxxx
- r 00000yyyyy ==> (y/b)*BASE >= HALF_BASE
- */
- /* Round */
- if(VpHasVal(div)) { /* frac[0] must be zero for NaN,INF,Zero */
- VpInternalRound(c,0,c->frac[c->Prec-1],(VpBaseVal()*res->frac[0])/div->frac[0]);
- }
- return ToValue(c);
-}
-
-/*
- * %: mod = a%b = a - (a.to_f/b).floor * b
- * div = (a.to_f/b).floor
- */
-static VALUE
-BigDecimal_DoDivmod(VALUE self, VALUE r, Real **div, Real **mod)
-{
- ENTER(8);
- Real *c=NULL, *d=NULL, *res=NULL;
- Real *a, *b;
- U_LONG mx;
-
- GUARD_OBJ(a,GetVpValue(self,1));
- b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r);
- SAVE(b);
-
- if(VpIsNaN(a) || VpIsNaN(b)) goto NaN;
- if(VpIsInf(a) || VpIsInf(b)) goto NaN;
- if(VpIsZero(b)) goto NaN;
- if(VpIsZero(a)) {
- GUARD_OBJ(c,VpCreateRbObject(1, "0"));
- GUARD_OBJ(d,VpCreateRbObject(1, "0"));
- *div = d;
- *mod = c;
- return (VALUE)0;
- }
-
- mx = a->Prec;
- if(mx<b->Prec) mx = b->Prec;
- mx =(mx + 1) * VpBaseFig();
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
- VpDivd(c, res, a, b);
- mx = c->Prec *(VpBaseFig() + 1);
- GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
- VpActiveRound(d,c,VP_ROUND_DOWN,0);
- VpMult(res,d,b);
- VpAddSub(c,a,res,-1);
- if(!VpIsZero(c) && (VpGetSign(a)*VpGetSign(b)<0)) {
- VpAddSub(res,d,VpOne(),-1);
- VpAddSub(d ,c,b, 1);
- *div = res;
- *mod = d;
- } else {
- *div = d;
- *mod = c;
- }
- return (VALUE)0;
-
-NaN:
- GUARD_OBJ(c,VpCreateRbObject(1, "NaN"));
- GUARD_OBJ(d,VpCreateRbObject(1, "NaN"));
- *div = d;
- *mod = c;
- return (VALUE)0;
-}
-
-/* call-seq:
- * a % b
- * a.modulo(b)
- *
- * 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 */
-{
- ENTER(3);
- VALUE obj;
- Real *div=NULL, *mod=NULL;
-
- obj = BigDecimal_DoDivmod(self,r,&div,&mod);
- if(obj!=(VALUE)0) return obj;
- SAVE(div);SAVE(mod);
- return ToValue(mod);
-}
-
-static VALUE
-BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
-{
- ENTER(10);
- 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));
- b = GetVpValue(r,0);
- if(!b) return DoSomeOne(self,r);
- SAVE(b);
-
- mx =(a->MaxPrec + b->MaxPrec) *VpBaseFig();
- GUARD_OBJ(c ,VpCreateRbObject(mx, "0"));
- GUARD_OBJ(res,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
- GUARD_OBJ(rr ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
- GUARD_OBJ(ff ,VpCreateRbObject((mx+1) * 2 +(VpBaseFig() + 1), "#0"));
-
- VpDivd(c, res, a, b);
-
- mx = c->Prec *(VpBaseFig() + 1);
-
- GUARD_OBJ(d,VpCreateRbObject(mx, "0"));
- GUARD_OBJ(f,VpCreateRbObject(mx, "0"));
-
- VpActiveRound(d,c,VP_ROUND_DOWN,0); /* 0: round off */
-
- VpFrac(f, c);
- VpMult(rr,f,b);
- VpAddSub(ff,res,rr,1);
-
- *dv = d;
- *rv = ff;
- return (VALUE)0;
-}
-
-/* Returns the remainder from dividing by the value.
- *
- * If the values divided are of the same sign, the remainder is the same as
- * the modulus (see divmod).
- *
- * Otherwise, the remainder is the modulus minus the value divided by.
- */
-static VALUE
-BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
-{
- VALUE f;
- Real *d,*rv;
- f = BigDecimal_divremain(self,r,&d,&rv);
- if(f!=(VALUE)0) return f;
- return ToValue(rv);
-}
-
-/* Divides by the specified value, and returns the quotient and modulus
- * as BigDecimal numbers. The quotient is rounded towards negative infinity.
- *
- * For example:
- *
- * require 'bigdecimal'
- *
- * a = BigDecimal.new("42")
- * b = BigDecimal.new("9")
- *
- * q,m = a.divmod(b)
- *
- * c = q * b + m
- *
- * a == c -> true
- *
- * The quotient q is (a/b).floor, and the modulus is the amount that must be
- * added to q * b to get a.
- */
-static VALUE
-BigDecimal_divmod(VALUE self, VALUE r)
-{
- ENTER(5);
- VALUE obj;
- Real *div=NULL, *mod=NULL;
-
- obj = BigDecimal_DoDivmod(self,r,&div,&mod);
- if(obj!=(VALUE)0) return obj;
- SAVE(div);SAVE(mod);
- obj = rb_assoc_new(ToValue(div), ToValue(mod));
- return obj;
-}
-
-static VALUE
-BigDecimal_div2(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- VALUE b,n;
- int na = rb_scan_args(argc,argv,"11",&b,&n);
- if(na==1) { /* div in Float sense */
- VALUE obj;
- Real *div=NULL;
- Real *mod;
- obj = BigDecimal_DoDivmod(self,b,&div,&mod);
- if(obj!=(VALUE)0) return obj;
- return ToValue(div);
- } else { /* div in BigDecimal sense */
- U_LONG ix = (U_LONG)GetPositiveInt(n);
- if(ix==0) return BigDecimal_div(self,b);
- else {
- Real *res=NULL;
- Real *av=NULL, *bv=NULL, *cv=NULL;
- U_LONG mx = (ix+VpBaseFig()*2);
- U_LONG pl = VpSetPrecLimit(0);
-
- GUARD_OBJ(cv,VpCreateRbObject(mx,"0"));
- GUARD_OBJ(av,GetVpValue(self,1));
- GUARD_OBJ(bv,GetVpValue(b,1));
- mx = av->Prec + bv->Prec + 2;
- if(mx <= cv->MaxPrec) mx = cv->MaxPrec+1;
- GUARD_OBJ(res,VpCreateRbObject((mx * 2 + 2)*VpBaseFig(), "#0"));
- VpDivd(cv,res,av,bv);
- VpSetPrecLimit(pl);
- VpLeftRound(cv,VpGetRoundMode(),ix);
- return ToValue(cv);
- }
- }
-}
-
-static VALUE
-BigDecimal_add2(VALUE self, VALUE b, VALUE n)
-{
- ENTER(2);
- Real *cv;
- U_LONG mx = (U_LONG)GetPositiveInt(n);
- if(mx==0) return BigDecimal_add(self,b);
- else {
- U_LONG pl = VpSetPrecLimit(0);
- VALUE c = BigDecimal_add(self,b);
- VpSetPrecLimit(pl);
- GUARD_OBJ(cv,GetVpValue(c,1));
- VpLeftRound(cv,VpGetRoundMode(),mx);
- return ToValue(cv);
- }
-}
-
-static VALUE
-BigDecimal_sub2(VALUE self, VALUE b, VALUE n)
-{
- ENTER(2);
- Real *cv;
- U_LONG mx = (U_LONG)GetPositiveInt(n);
- if(mx==0) return BigDecimal_sub(self,b);
- else {
- U_LONG pl = VpSetPrecLimit(0);
- VALUE c = BigDecimal_sub(self,b);
- VpSetPrecLimit(pl);
- GUARD_OBJ(cv,GetVpValue(c,1));
- VpLeftRound(cv,VpGetRoundMode(),mx);
- return ToValue(cv);
- }
-}
-
-static VALUE
-BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
-{
- ENTER(2);
- Real *cv;
- U_LONG mx = (U_LONG)GetPositiveInt(n);
- if(mx==0) return BigDecimal_mult(self,b);
- else {
- U_LONG pl = VpSetPrecLimit(0);
- VALUE c = BigDecimal_mult(self,b);
- VpSetPrecLimit(pl);
- GUARD_OBJ(cv,GetVpValue(c,1));
- VpLeftRound(cv,VpGetRoundMode(),mx);
- return ToValue(cv);
- }
-}
-
-/* Returns the absolute value.
- *
- * BigDecimal('5').abs -> 5
- *
- * BigDecimal('-3').abs -> 3
- */
-static VALUE
-BigDecimal_abs(VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- 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,(S_INT)1);
- return ToValue(c);
-}
-
-/* call-seq:
- * sqrt(n)
- *
- * Returns the square root of the value.
- *
- * If n is specified, returns at least that many significant digits.
- */
-static VALUE
-BigDecimal_sqrt(VALUE self, VALUE nFig)
-{
- ENTER(5);
- Real *c, *a;
- S_INT mx, n;
-
- GUARD_OBJ(a,GetVpValue(self,1));
- mx = a->Prec *(VpBaseFig() + 1);
-
- n = GetPositiveInt(nFig) + VpDblFig() + 1;
- if(mx <= n) mx = n;
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- VpSqrt(c, a);
- return ToValue(c);
-}
-
-/* Return the integer part of the number.
- */
-static VALUE
-BigDecimal_fix(VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- U_LONG mx;
-
- GUARD_OBJ(a,GetVpValue(self,1));
- mx = a->Prec *(VpBaseFig() + 1);
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- VpActiveRound(c,a,VP_ROUND_DOWN,0); /* 0: round off */
- return ToValue(c);
-}
-
-/* call-seq:
- * 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
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.
- *
- * 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
- *
- * The value of the optional mode argument can be used to determine how
- * rounding is performed; see BigDecimal.mode.
- */
-static VALUE
-BigDecimal_round(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- int iLoc = 0;
- U_LONG mx;
- VALUE vLoc;
- VALUE vRound;
- U_LONG pl;
-
- int sw = VpGetRoundMode();
-
- int na = rb_scan_args(argc,argv,"02",&vLoc,&vRound);
- switch(na) {
- case 0:
- iLoc = 0;
- break;
- case 1:
- Check_Type(vLoc, T_FIXNUM);
- iLoc = FIX2INT(vLoc);
- break;
- case 2:
- 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);
- GUARD_OBJ(a,GetVpValue(self,1));
- mx = a->Prec *(VpBaseFig() + 1);
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- VpSetPrecLimit(pl);
- VpActiveRound(c,a,sw,iLoc);
- return ToValue(c);
-}
-
-/* call-seq:
- * truncate(n)
- *
- * Truncate to the nearest 1, returning the result as a BigDecimal.
- *
- * 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.
- *
- * 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
- */
-static VALUE
-BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- int iLoc;
- U_LONG mx;
- VALUE vLoc;
- U_LONG pl = VpSetPrecLimit(0);
-
- if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
- iLoc = 0;
- } else {
- Check_Type(vLoc, T_FIXNUM);
- iLoc = FIX2INT(vLoc);
- }
-
- GUARD_OBJ(a,GetVpValue(self,1));
- mx = a->Prec *(VpBaseFig() + 1);
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- VpSetPrecLimit(pl);
- VpActiveRound(c,a,VP_ROUND_DOWN,iLoc); /* 0: truncate */
- return ToValue(c);
-}
-
-/* Return the fractional part of the number.
- */
-static VALUE
-BigDecimal_frac(VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- U_LONG mx;
-
- GUARD_OBJ(a,GetVpValue(self,1));
- mx = a->Prec *(VpBaseFig() + 1);
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- VpFrac(c, a);
- return ToValue(c);
-}
-
-/* call-seq:
- * floor(n)
- *
- * Return the largest integer less than or equal to the value, as a BigDecimal.
- *
- * 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.
- *
- * 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
- */
-static VALUE
-BigDecimal_floor(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- U_LONG mx;
- int iLoc;
- VALUE vLoc;
- U_LONG pl = VpSetPrecLimit(0);
-
- if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
- iLoc = 0;
- } else {
- Check_Type(vLoc, T_FIXNUM);
- iLoc = FIX2INT(vLoc);
- }
-
- GUARD_OBJ(a,GetVpValue(self,1));
- mx = a->Prec *(VpBaseFig() + 1);
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- VpSetPrecLimit(pl);
- VpActiveRound(c,a,VP_ROUND_FLOOR,iLoc);
- return ToValue(c);
-}
-
-/* call-seq:
- * ceil(n)
- *
- * Return the smallest integer greater than or equal to the value, as a BigDecimal.
- *
- * 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.
- *
- * 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
- */
-static VALUE
-BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- Real *c, *a;
- U_LONG mx;
- int iLoc;
- VALUE vLoc;
- U_LONG pl = VpSetPrecLimit(0);
-
- if(rb_scan_args(argc,argv,"01",&vLoc)==0) {
- iLoc = 0;
- } else {
- Check_Type(vLoc, T_FIXNUM);
- iLoc = FIX2INT(vLoc);
- }
-
- GUARD_OBJ(a,GetVpValue(self,1));
- mx = a->Prec *(VpBaseFig() + 1);
- GUARD_OBJ(c,VpCreateRbObject(mx, "0"));
- VpSetPrecLimit(pl);
- VpActiveRound(c,a,VP_ROUND_CEIL,iLoc);
- return ToValue(c);
-}
-
-/* call-seq:
- * to_s(s)
- *
- * Converts the value to a string.
- *
- * The default format looks like 0.xxxxEnn.
- *
- * The optional parameter s consists of either an integer; or an optional '+'
- * or ' ', followed by an optional number, followed by an optional 'E' or 'F'.
- *
- * If there is a '+' at the start of s, positive values are returned with
- * a leading '+'.
- *
- * A space at the start of s returns positive values with a leading space.
- *
- * If s contains a number, a space is inserted after each group of that many
- * fractional digits.
- *
- * If s ends with an 'E', engineering notation (0.xxxxEnn) is used.
- *
- * If s ends with an 'F', conventional floating point notation is used.
- *
- * Examples:
- *
- * 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(' 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. */
- Real *vp;
- char *psz;
- char ch;
- 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(TYPE(f)==T_STRING) {
- SafeStringValue(f);
- psz = RSTRING_PTR(f);
- if(*psz==' ') {
- fPlus = 1; psz++;
- } else if(*psz=='+') {
- fPlus = 2; psz++;
- }
- while(ch=*psz++) {
- 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(fmt) {
- nc = VpNumOfChars(vp,"F");
- } else {
- nc = VpNumOfChars(vp,"E");
- }
- if(mc>0) nc += (nc + mc - 1) / mc + 1;
-
- psz = ALLOCA_N(char,(unsigned int)nc);
-
- if(fmt) {
- VpToFString(vp, psz, mc, fPlus);
- } else {
- VpToString (vp, psz, mc, fPlus);
- }
- return rb_str_new2(psz);
-}
-
-/* Splits a BigDecimal number into four parts, returned as an array of values.
- *
- * The first value represents the sign of the BigDecimal, and is -1 or 1, or 0
- * if the BigDecimal is Not a Number.
- *
- * The second value is a string representing the significant digits of the
- * BigDecimal, with no leading zeros.
- *
- * The third value is the base used for arithmetic (currently always 10) as an
- * Integer.
- *
- * The fourth value is an Integer exponent.
- *
- * If the BigDecimal can be represented as 0.xxxxxx*10**n, then xxxxxx is the
- * string of significant digits with no leading zeros, and n is the exponent.
- *
- * From these values, you can translate a BigDecimal to a float as follows:
- *
- * sign, significant_digits, base, exponent = a.split
- * f = sign * "0.#{significant_digits}".to_f * (base ** exponent)
- *
- * (Note that the to_f method is provided as a more convenient way to translate
- * a BigDecimal to a Float.)
- */
-static VALUE
-BigDecimal_split(VALUE self)
-{
- ENTER(5);
- Real *vp;
- VALUE obj,obj1;
- S_LONG e;
- S_LONG s;
- char *psz1;
-
- GUARD_OBJ(vp,GetVpValue(self,1));
- psz1 = ALLOCA_N(char,(unsigned int)VpNumOfChars(vp,"E"));
- VpSzMantissa(vp,psz1);
- s = 1;
- if(psz1[0]=='-') {
- s = -1; ++psz1;
- }
- if(psz1[0]=='N') s=0; /* NaN */
- e = VpExponent10(vp);
- obj1 = rb_str_new2(psz1);
- obj = rb_ary_new2(4);
- rb_ary_push(obj, INT2FIX(s));
- rb_ary_push(obj, obj1);
- rb_ary_push(obj, INT2FIX(10));
- rb_ary_push(obj, INT2NUM(e));
- return obj;
-}
-
-/* Returns the exponent of the BigDecimal number, as an Integer.
- *
- * If the number can be represented as 0.xxxxxx*10**n where xxxxxx is a string
- * of digits with no leading zeros, then n is the exponent.
- */
-static VALUE
-BigDecimal_exponent(VALUE self)
-{
- S_LONG e = VpExponent10(GetVpValue(self,1));
- return INT2NUM(e);
-}
-
-/* Returns debugging information about the value as a string of comma-separated
- * values in angle brackets with a leading #:
- *
- * BigDecimal.new("1234.5678").inspect ->
- * "#<BigDecimal:b7ea1130,'0.12345678E4',8(12)>"
- *
- * The first part is the address, the second is the value as a string, and
- * the final part ss(mm) is the current number of significant digits and the
- * maximum number of significant digits, respectively.
- */
-static VALUE
-BigDecimal_inspect(VALUE self)
-{
- ENTER(5);
- Real *vp;
- VALUE obj;
- unsigned int nc;
- char *psz1;
- char *pszAll;
-
- GUARD_OBJ(vp,GetVpValue(self,1));
- nc = VpNumOfChars(vp,"E");
- nc +=(nc + 9) / 10;
-
- psz1 = ALLOCA_N(char,nc);
- pszAll = ALLOCA_N(char,nc+256);
- VpToString(vp, psz1, 10, 0);
- sprintf(pszAll,"#<BigDecimal:%lx,'%s',%lu(%lu)>",self,psz1,VpPrec(vp)*VpBaseFig(),VpMaxPrec(vp)*VpBaseFig());
- obj = rb_str_new2(pszAll);
- return obj;
-}
-
-/* call-seq:
- * power(n)
- *
- * 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(VALUE self, VALUE p)
-{
- ENTER(5);
- Real *x, *y;
- S_LONG mp, ma, 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, n);
- return ToValue(y);
-}
-
-static VALUE
-BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- Real *pv;
- S_LONG mf;
- VALUE nFig;
- VALUE iniValue;
-
- if(rb_scan_args(argc,argv,"11",&iniValue,&nFig)==1) {
- mf = 0;
- } else {
- mf = GetPositiveInt(nFig);
- }
- 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_new(int argc, VALUE *argv, VALUE self)
-{
- ENTER(5);
- Real *pv;
- S_LONG mf;
- VALUE nFig;
- VALUE iniValue;
-
- 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:
- * BigDecimal.limit(digits)
- *
- * Limit the number of significant digits in newly created BigDecimal
- * numbers to the specified value. Rounding is performed as necessary,
- * as specified by BigDecimal.mode.
- *
- * A limit of 0, the default, means no upper limit.
- *
- * The limit specified by this method takes priority over any limit
- * specified to instance methods such as ceil, floor, truncate, or round.
- */
-static VALUE
-BigDecimal_limit(int argc, VALUE *argv, VALUE self)
-{
- VALUE nFig;
- VALUE nCur = INT2NUM(VpGetPrecLimit());
-
- if(rb_scan_args(argc,argv,"01",&nFig)==1) {
- int nf;
- if(nFig==Qnil) return nCur;
- Check_Type(nFig, T_FIXNUM);
- nf = FIX2INT(nFig);
- if(nf<0) {
- rb_raise(rb_eArgError, "argument must be positive");
- }
- VpSetPrecLimit(nf);
- }
- return nCur;
-}
-
-/* Returns the sign of the value.
- *
- * Returns a positive value if > 0, a negative value if < 0, and a
- * zero if == 0.
- *
- * The specific value returned indicates the type and sign of the BigDecimal,
- * as follows:
- *
- * BigDecimal::SIGN_NaN:: value is Not a Number
- * BigDecimal::SIGN_POSITIVE_ZERO:: value is +0
- * BigDecimal::SIGN_NEGATIVE_ZERO:: value is -0
- * BigDecimal::SIGN_POSITIVE_INFINITE:: value is +infinity
- * BigDecimal::SIGN_NEGATIVE_INFINITE:: value is -infinity
- * BigDecimal::SIGN_POSITIVE_FINITE:: value is positive
- * BigDecimal::SIGN_NEGATIVE_FINITE:: value is negative
- */
-static VALUE
-BigDecimal_sign(VALUE self)
-{ /* sign */
- int s = GetVpValue(self,1)->sign;
- return INT2FIX(s);
-}
-
-void
-Init_bigdecimal(void)
-{
- /* Initialize VP routines */
- VpInit((U_LONG)0);
-
- /* Class and method registration */
- rb_cBigDecimal = rb_define_class("BigDecimal",rb_cNumeric);
-
- /* 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, "induced_from",BigDecimal_induced_from, 1);
- rb_define_singleton_method(rb_cBigDecimal, "_load", BigDecimal_load, 1);
- rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
-
- /* Constants definition */
-
- /*
- * Base value used in internal calculations. On a 32 bit system, BASE
- * is 10000, indicating that calculation is done in groups of 4 digits.
- * (If it were larger, BASE**2 wouldn't fit in 32 bits, so you couldn't
- * guarantee that two groups could always be multiplied together without
- * overflow.)
- */
- rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((S_INT)VpBaseVal()));
-
- /* Exceptions */
-
- /*
- * 0xff: Determines whether overflow, underflow or zero divide result in
- * an exception being thrown. See BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL",INT2FIX(VP_EXCEPTION_ALL));
-
- /*
- * 0x02: Determines what happens when the result of a computation is not a
- * number (NaN). See BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN",INT2FIX(VP_EXCEPTION_NaN));
-
- /*
- * 0x01: Determines what happens when the result of a computation is
- * infinity. See BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY",INT2FIX(VP_EXCEPTION_INFINITY));
-
- /*
- * 0x04: Determines what happens when the result of a computation is an
- * underflow (a result too small to be represented). See BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW",INT2FIX(VP_EXCEPTION_UNDERFLOW));
-
- /*
- * 0x01: Determines what happens when the result of a computation is an
- * underflow (a result too large to be represented). See BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
-
- /*
- * 0x01: Determines what happens when a division by zero is performed.
- * See BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE",INT2FIX(VP_EXCEPTION_ZERODIVIDE));
-
- /*
- * 0x100: Determines what happens when a result must be rounded in order to
- * fit in the appropriate number of significant digits. See
- * BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "ROUND_MODE",INT2FIX(VP_ROUND_MODE));
-
- /* 1: Indicates that values should be rounded away from zero. See
- * BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "ROUND_UP",INT2FIX(VP_ROUND_UP));
-
- /* 2: Indicates that values should be rounded towards zero. See
- * BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "ROUND_DOWN",INT2FIX(VP_ROUND_DOWN));
-
- /* 3: Indicates that digits >= 5 should be rounded up, others rounded down.
- * See BigDecimal.mode. */
- rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP",INT2FIX(VP_ROUND_HALF_UP));
-
- /* 4: Indicates that digits >= 6 should be rounded up, others rounded down.
- * See BigDecimal.mode.
- */
- rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN",INT2FIX(VP_ROUND_HALF_DOWN));
- /* 5: Round towards +infinity. See BigDecimal.mode. */
- rb_define_const(rb_cBigDecimal, "ROUND_CEILING",INT2FIX(VP_ROUND_CEIL));
-
- /* 6: Round towards -infinity. See BigDecimal.mode. */
- rb_define_const(rb_cBigDecimal, "ROUND_FLOOR",INT2FIX(VP_ROUND_FLOOR));
-
- /* 7: Round towards the even neighbor. See BigDecimal.mode. */
- rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN",INT2FIX(VP_ROUND_HALF_EVEN));
-
- /* 0: Indicates that a value is not a number. See BigDecimal.sign. */
- rb_define_const(rb_cBigDecimal, "SIGN_NaN",INT2FIX(VP_SIGN_NaN));
-
- /* 1: Indicates that a value is +0. See BigDecimal.sign. */
- rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO",INT2FIX(VP_SIGN_POSITIVE_ZERO));
-
- /* -1: Indicates that a value is -0. See BigDecimal.sign. */
- rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO",INT2FIX(VP_SIGN_NEGATIVE_ZERO));
-
- /* 2: Indicates that a value is positive and finite. See BigDecimal.sign. */
- rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE",INT2FIX(VP_SIGN_POSITIVE_FINITE));
-
- /* -2: Indicates that a value is negative and finite. See BigDecimal.sign. */
- rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE",INT2FIX(VP_SIGN_NEGATIVE_FINITE));
-
- /* 3: Indicates that a value is positive and infinite. See BigDecimal.sign. */
- rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE",INT2FIX(VP_SIGN_POSITIVE_INFINITE));
-
- /* -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));
-
- /* instance methods */
- rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
-
- rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
- rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
- rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
- rb_define_method(rb_cBigDecimal, "div",BigDecimal_div2, -1);
- rb_define_method(rb_cBigDecimal, "hash", BigDecimal_hash, 0);
- rb_define_method(rb_cBigDecimal, "to_s", BigDecimal_to_s, -1);
- rb_define_method(rb_cBigDecimal, "to_i", BigDecimal_to_i, 0);
- rb_define_method(rb_cBigDecimal, "to_int", BigDecimal_to_i, 0);
- rb_define_method(rb_cBigDecimal, "split", BigDecimal_split, 0);
- rb_define_method(rb_cBigDecimal, "+", BigDecimal_add, 1);
- rb_define_method(rb_cBigDecimal, "-", BigDecimal_sub, 1);
- rb_define_method(rb_cBigDecimal, "+@", BigDecimal_uplus, 0);
- rb_define_method(rb_cBigDecimal, "-@", BigDecimal_neg, 0);
- rb_define_method(rb_cBigDecimal, "*", BigDecimal_mult, 1);
- rb_define_method(rb_cBigDecimal, "/", BigDecimal_div, 1);
- rb_define_method(rb_cBigDecimal, "quo", BigDecimal_div, 1);
- rb_define_method(rb_cBigDecimal, "%", BigDecimal_mod, 1);
- rb_define_method(rb_cBigDecimal, "modulo", BigDecimal_mod, 1);
- rb_define_method(rb_cBigDecimal, "remainder", BigDecimal_remainder, 1);
- rb_define_method(rb_cBigDecimal, "divmod", BigDecimal_divmod, 1);
- /* rb_define_method(rb_cBigDecimal, "dup", BigDecimal_dup, 0); */
- rb_define_method(rb_cBigDecimal, "to_f", BigDecimal_to_f, 0);
- rb_define_method(rb_cBigDecimal, "abs", BigDecimal_abs, 0);
- rb_define_method(rb_cBigDecimal, "sqrt", BigDecimal_sqrt, 1);
- rb_define_method(rb_cBigDecimal, "fix", BigDecimal_fix, 0);
- rb_define_method(rb_cBigDecimal, "round", BigDecimal_round, -1);
- 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, 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);
- rb_define_method(rb_cBigDecimal, "eql?", BigDecimal_eq, 1);
- rb_define_method(rb_cBigDecimal, "<", BigDecimal_lt, 1);
- rb_define_method(rb_cBigDecimal, "<=", BigDecimal_le, 1);
- rb_define_method(rb_cBigDecimal, ">", BigDecimal_gt, 1);
- rb_define_method(rb_cBigDecimal, ">=", BigDecimal_ge, 1);
- rb_define_method(rb_cBigDecimal, "zero?", BigDecimal_zero, 0);
- rb_define_method(rb_cBigDecimal, "nonzero?", BigDecimal_nonzero, 0);
- rb_define_method(rb_cBigDecimal, "coerce", BigDecimal_coerce, 1);
- rb_define_method(rb_cBigDecimal, "inspect", BigDecimal_inspect, 0);
- rb_define_method(rb_cBigDecimal, "exponent", BigDecimal_exponent, 0);
- rb_define_method(rb_cBigDecimal, "sign", BigDecimal_sign, 0);
- rb_define_method(rb_cBigDecimal, "nan?", BigDecimal_IsNaN, 0);
- rb_define_method(rb_cBigDecimal, "infinite?", BigDecimal_IsInfinite, 0);
- 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);
-}
-
-/*
- *
- * ============================================================================
- *
- * vp_ routines begin from here.
- *
- * ============================================================================
- *
- */
-#ifdef _DEBUG
-/*static int gfDebug = 1;*/ /* Debug switch */
-static int gfCheckVal = 1; /* Value checking flag in VpNmlz() */
-#endif /* _DEBUG */
-
-static U_LONG gnPrecLimit = 0; /* Global upper limit of the precision newly allocated */
-static U_LONG gfRoundMode = VP_ROUND_HALF_UP; /* Mode for general rounding operation */
-
-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 S_LONG DBLE_FIG = 8; /* figure of double */
-static U_LONG BASE1 = 1000L; /* =BASE/10 */
-
-static Real *VpConstOne; /* constant 1.0 */
-static Real *VpPt5; /* constant 0.5 */
-static U_LONG maxnr = 100; /* Maximum iterations for calcurating sqrt. */
- /* used in VpSqrt() */
-
-/* ETC */
-#define MemCmp(x,y,z) memcmp(x,y,z)
-#define StrCmp(x,y) strcmp(x,y)
-
-static int VpIsDefOP(Real *c,Real *a,Real *b,int sw);
-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,S_INT fFmt);
-static int VpRdup(Real *m,U_LONG ind_m);
-
-#ifdef _DEBUG
-static int gnAlloc=0; /* Memory allocation counter */
-#endif /* _DEBUG */
-
-VP_EXPORT void *
-VpMemAlloc(U_LONG mb)
-{
- void *p = xmalloc((unsigned int)mb);
- if(!p) {
- VpException(VP_EXCEPTION_MEMORY,"failed to allocate memory",1);
- }
- memset(p,0,mb);
-#ifdef _DEBUG
- gnAlloc++; /* Count allocation call */
-#endif /* _DEBUG */
- return p;
-}
-
-VP_EXPORT void
-VpFree(Real *pv)
-{
- if(pv != NULL) {
- xfree(pv);
-#ifdef _DEBUG
- gnAlloc--; /* Decrement allocation count */
- if(gnAlloc==0) {
- printf(" *************** All memories allocated freed ****************");
- getchar();
- }
- if(gnAlloc<0) {
- printf(" ??????????? Too many memory free calls(%d) ?????????????\n",gnAlloc);
- getchar();
- }
-#endif /* _DEBUG */
- }
-}
-
-/*
- * EXCEPTION Handling.
- */
-static unsigned short gfDoException = 0; /* Exception flag */
-
-static unsigned short
-VpGetException (void)
-{
- return gfDoException;
-}
-
-static void
-VpSetException(unsigned short f)
-{
- gfDoException = f;
-}
-
-/* These 2 functions added at v1.1.7 */
-VP_EXPORT U_LONG
-VpGetPrecLimit(void)
-{
- return gnPrecLimit;
-}
-
-VP_EXPORT U_LONG
-VpSetPrecLimit(U_LONG n)
-{
- U_LONG s = gnPrecLimit;
- gnPrecLimit = n;
- return s;
-}
-
-VP_EXPORT unsigned long
-VpGetRoundMode(void)
-{
- return gfRoundMode;
-}
-
-VP_EXPORT int
-VpIsRoundMode(unsigned long n)
-{
- if(n==VP_ROUND_UP || n!=VP_ROUND_DOWN ||
- n==VP_ROUND_HALF_UP || n!=VP_ROUND_HALF_DOWN ||
- n==VP_ROUND_CEIL || n!=VP_ROUND_FLOOR ||
- n==VP_ROUND_HALF_EVEN
- ) return 1;
- return 0;
-}
-
-VP_EXPORT unsigned long
-VpSetRoundMode(unsigned long n)
-{
- if(VpIsRoundMode(n)) gfRoundMode = n;
- return gfRoundMode;
-}
-
-/*
- * 0.0 & 1.0 generator
- * These gZero_..... and gOne_..... can be any name
- * referenced from nowhere except Zero() and One().
- * gZero_..... and gOne_..... must have global scope
- * (to let the compiler know they may be changed in outside
- * (... but not actually..)).
- */
-volatile double gZero_ABCED9B1_CE73__00400511F31D = 0.0;
-volatile double gOne_ABCED9B4_CE73__00400511F31D = 1.0;
-static double
-Zero(void)
-{
- return gZero_ABCED9B1_CE73__00400511F31D;
-}
-
-static double
-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.
- short sign;
- ==0 : NaN
- 1 : Positive zero
- -1 : Negative zero
- 2 : Positive number
- -2 : Negative number
- 3 : Positive infinite number
- -3 : Negative infinite number
- ----------------------------------------------------------------
-*/
-
-VP_EXPORT double
-VpGetDoubleNaN(void) /* Returns the value of NaN */
-{
- static double fNaN = 0.0;
- if(fNaN==0.0) fNaN = Zero()/Zero();
- return fNaN;
-}
-
-VP_EXPORT double
-VpGetDoublePosInf(void) /* Returns the value of +Infinity */
-{
- static double fInf = 0.0;
- if(fInf==0.0) fInf = One()/Zero();
- return fInf;
-}
-
-VP_EXPORT double
-VpGetDoubleNegInf(void) /* Returns the value of -Infinity */
-{
- static double fInf = 0.0;
- if(fInf==0.0) fInf = -(One()/Zero());
- return fInf;
-}
-
-VP_EXPORT double
-VpGetDoubleNegZero(void) /* Returns the value of -0 */
-{
- static double nzero = 1000.0;
- if(nzero!=0.0) nzero = (One()/VpGetDoubleNegInf());
- return nzero;
-}
-
-VP_EXPORT int
-VpIsNegDoubleZero(double v)
-{
- double z = VpGetDoubleNegZero();
- return MemCmp(&v,&z,sizeof(v))==0;
-}
-
-VP_EXPORT int
-VpException(unsigned short f, const char *str,int always)
-{
- VALUE exc;
- int fatal=0;
-
- if(f==VP_EXCEPTION_OP || f==VP_EXCEPTION_MEMORY) always = 1;
-
- if(always||(gfDoException&f)) {
- switch(f)
- {
- /*
- case VP_EXCEPTION_ZERODIVIDE:
- case VP_EXCEPTION_OVERFLOW:
- */
- case VP_EXCEPTION_INFINITY:
- exc = rb_eFloatDomainError;
- goto raise;
- case VP_EXCEPTION_NaN:
- exc = rb_eFloatDomainError;
- goto raise;
- case VP_EXCEPTION_UNDERFLOW:
- exc = rb_eFloatDomainError;
- goto raise;
- case VP_EXCEPTION_OP:
- exc = rb_eFloatDomainError;
- goto raise;
- case VP_EXCEPTION_MEMORY:
- fatal = 1;
- goto raise;
- default:
- fatal = 1;
- goto raise;
- }
- }
- return 0; /* 0 Means VpException() raised no exception */
-
-raise:
- if(fatal) rb_fatal("%s", str);
- else rb_raise(exc, "%s", str);
- return 0;
-}
-
-/* Throw exception or returns 0,when resulting c is Inf or NaN */
-/* sw=1:+ 2:- 3:* 4:/ */
-static int
-VpIsDefOP(Real *c,Real *a,Real *b,int sw)
-{
- if(VpIsNaN(a) || VpIsNaN(b)) {
- /* at least a or b is NaN */
- VpSetNaN(c);
- goto NaN;
- }
-
- if(VpIsInf(a)) {
- if(VpIsInf(b)) {
- switch(sw)
- {
- case 1: /* + */
- if(VpGetSign(a)==VpGetSign(b)) {
- VpSetInf(c,VpGetSign(a));
- goto Inf;
- } else {
- VpSetNaN(c);
- goto NaN;
- }
- case 2: /* - */
- if(VpGetSign(a)!=VpGetSign(b)) {
- VpSetInf(c,VpGetSign(a));
- goto Inf;
- } else {
- VpSetNaN(c);
- goto NaN;
- }
- break;
- case 3: /* * */
- VpSetInf(c,VpGetSign(a)*VpGetSign(b));
- goto Inf;
- break;
- case 4: /* / */
- VpSetNaN(c);
- goto NaN;
- }
- VpSetNaN(c);
- goto NaN;
- }
- /* Inf op Finite */
- switch(sw)
- {
- case 1: /* + */
- case 2: /* - */
- VpSetInf(c,VpGetSign(a));
- break;
- case 3: /* * */
- if(VpIsZero(b)) {
- VpSetNaN(c);
- goto NaN;
- }
- VpSetInf(c,VpGetSign(a)*VpGetSign(b));
- break;
- case 4: /* / */
- VpSetInf(c,VpGetSign(a)*VpGetSign(b));
- }
- goto Inf;
- }
-
- if(VpIsInf(b)) {
- switch(sw)
- {
- case 1: /* + */
- VpSetInf(c,VpGetSign(b));
- break;
- case 2: /* - */
- VpSetInf(c,-VpGetSign(b));
- break;
- case 3: /* * */
- if(VpIsZero(a)) {
- VpSetNaN(c);
- goto NaN;
- }
- VpSetInf(c,VpGetSign(a)*VpGetSign(b));
- break;
- case 4: /* / */
- VpSetZero(c,VpGetSign(a)*VpGetSign(b));
- }
- goto Inf;
- }
- return 1; /* Results OK */
-
-Inf:
- return VpException(VP_EXCEPTION_INFINITY,"Computation results to 'Infinity'",0);
-NaN:
- return VpException(VP_EXCEPTION_NaN,"Computation results to 'NaN'",0);
-}
-
-/*
- ----------------------------------------------------------------
-*/
-
-/*
- * returns number of chars needed to represent vp in specified format.
- */
-VP_EXPORT U_LONG
-VpNumOfChars(Real *vp,const char *pszFmt)
-{
- S_INT ex;
- U_LONG nc;
-
- if(vp == NULL) return BASE_FIG*2+6;
- if(!VpIsDef(vp)) return 32; /* not sure,may be OK */
-
- switch(*pszFmt)
- {
- case 'F':
- nc = BASE_FIG*(vp->Prec + 1)+2;
- ex = vp->exponent;
- if(ex<0) {
- nc += BASE_FIG*(-ex);
- } else {
- if(ex > (S_INT)vp->Prec) {
- nc += BASE_FIG*(ex - (S_INT)vp->Prec);
- }
- }
- break;
- case 'E':
- default:
- nc = BASE_FIG*(vp->Prec + 2)+6; /* 3: sign + exponent chars */
- }
- return nc;
-}
-
-/*
- * Initializer for Vp routines and constants used.
- * [Input]
- * BaseVal: Base value(assigned to BASE) for Vp calculation.
- * It must be the form BaseVal=10**n.(n=1,2,3,...)
- * If Base <= 0L,then the BASE will be calcurated so
- * 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 U_LONG word(LONG) in the computer used.
- *
- * [Returns]
- * DBLE_FIG ... OK
- */
-VP_EXPORT U_LONG
-VpInit(U_LONG BaseVal)
-{
- U_LONG w;
- double v;
-
- /* Setup +/- Inf NaN -0 */
- VpGetDoubleNaN();
- VpGetDoublePosInf();
- VpGetDoubleNegInf();
- VpGetDoubleNegZero();
-
- if(BaseVal <= 0) {
- /* 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;
- /* Allocates Vp constants. */
- VpConstOne = VpAlloc((U_LONG)1, "1");
- VpPt5 = VpAlloc((U_LONG)1, ".5");
-
-#ifdef _DEBUG
- gnAlloc = 0;
-#endif /* _DEBUG */
-
- /* Determine # of digits available in one 'double'. */
-
- v = 1.0;
- DBLE_FIG = 0;
- while(v + 1.0 > 1.0) {
- ++DBLE_FIG;
- v /= 10;
- }
-
-#ifdef _DEBUG
- if(gfDebug) {
- printf("VpInit: BaseVal = %lu\n", BaseVal);
- printf(" BASE = %lu\n", BASE);
- printf(" HALF_BASE = %lu\n", HALF_BASE);
- printf(" BASE1 = %lu\n", BASE1);
- printf(" BASE_FIG = %lu\n", BASE_FIG);
- printf(" DBLE_FIG = %lu\n", DBLE_FIG);
- }
-#endif /* _DEBUG */
-
- return DBLE_FIG;
-}
-
-VP_EXPORT Real *
-VpOne(void)
-{
- return VpConstOne;
-}
-
-/* If exponent overflows,then raise exception or returns 0 */
-static int
-AddExponent(Real *a,S_INT n)
-{
- S_INT e = a->exponent;
- S_INT m = e+n;
- S_INT eb,mb;
- if(e>0) {
- if(n>0) {
- mb = m*BASE_FIG;
- eb = e*BASE_FIG;
- if(mb<eb) goto overflow;
- }
- } else if(n<0) {
- mb = m*BASE_FIG;
- eb = e*BASE_FIG;
- if(mb>eb) goto underflow;
- }
- a->exponent = m;
- return 1;
-
-/* Overflow/Underflow ==> Raise exception or returns 0 */
-underflow:
- VpSetZero(a,VpGetSign(a));
- return VpException(VP_EXCEPTION_UNDERFLOW,"Exponent underflow",0);
-
-overflow:
- VpSetInf(a,VpGetSign(a));
- return VpException(VP_EXCEPTION_OVERFLOW,"Exponent overflow",0);
-}
-
-/*
- * Allocates variable.
- * [Input]
- * mx ... allocation unit, if zero then mx is determined by szVal.
- * The mx is the number of effective digits can to be stored.
- * szVal ... value assigned(char). If szVal==NULL,then zero is assumed.
- * If szVal[0]=='#' then Max. Prec. will not be considered(1.1.7),
- * full precision specified by szVal is allocated.
- *
- * [Returns]
- * Pointer to the newly allocated variable, or
- * NULL be returned if memory allocation is failed,or any error.
- */
-VP_EXPORT Real *
-VpAlloc(U_LONG mx, const char *szVal)
-{
- U_LONG i, ni, ipn, ipf, nf, ipe, ne, nalloc;
- char v,*psz;
- int sign=1;
- Real *vp = NULL;
- U_LONG mf = VpGetPrecLimit();
-
- mx = (mx + BASE_FIG - 1) / BASE_FIG + 1; /* Determine allocation unit. */
- 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) {
- mx = mf;
- }
- }
- } else {
- ++szVal;
- }
- } else {
- /* necessary to be able to store */
- /* at least mx digits. */
- /* szVal==NULL ==> allocate zero value. */
- 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. */
- return vp;
- }
-
- /* Skip all '_' after digit: 2006-6-30 */
- ni = 0;
- psz = ALLOCA_N(char,strlen(szVal)+1);
- i = 0;
- ipn = 0;
- while(psz[i]=szVal[ipn]) {
- if(ISDIGIT(psz[i])) ++ni;
- if(psz[i]=='_') {
- if(ni>0) {ipn++;continue;}
- psz[i]=0;
- break;
- }
- ++i; ++ipn;
- }
- /* Skip trailing spaces */
- 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 = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
- vp->MaxPrec = 1; /* set max precision */
- VpSetPosInf(vp);
- return vp;
- }
- 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 = (Real *) VpMemAlloc(sizeof(Real) + sizeof(U_LONG));
- vp->MaxPrec = 1; /* set max precision */
- VpSetNaN(vp);
- return vp;
- }
-
- /* check on number szVal[] */
- ipn = i = 0;
- if (szVal[i] == '-') {sign=-1;++i;}
- else if(szVal[i] == '+') ++i;
- /* Skip digits */
- ni = 0; /* digits in mantissa */
- while(v = szVal[i]) {
- if(!ISDIGIT(v)) break;
- ++i;
- ++ni;
- }
- nf = 0;
- ipf = 0;
- ipe = 0;
- ne = 0;
- if(v) {
- /* other than digit nor \0 */
- if(szVal[i] == '.') { /* xxx. */
- ++i;
- ipf = i;
- while(v = szVal[i]) { /* 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':
- ++i;
- ipe = i;
- v = szVal[i];
- if((v == '-') ||(v == '+')) ++i;
- while(v=szVal[i]) {
- if(!ISDIGIT(v)) break;
- ++i;
- ++ne;
- }
- break;
- default:
- break;
- }
- }
- nalloc =(ni + nf + BASE_FIG - 1) / BASE_FIG + 1; /* set effective allocation */
- /* units for szVal[] */
- if(mx <= 0) mx = 1;
- nalloc = Max(nalloc, mx);
- mx = nalloc;
- 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);
- return vp;
-}
-
-/*
- * Assignment(c=a).
- * [Input]
- * a ... RHSV
- * isw ... switch for assignment.
- * c = a when isw > 0
- * c = -a when isw < 0
- * if c->MaxPrec < a->Prec,then round operation
- * will be performed.
- * [Output]
- * c ... LHSV
- */
-VP_EXPORT int
-VpAsgn(Real *c, Real *a, int isw)
-{
- U_LONG n;
- if(VpIsNaN(a)) {
- VpSetNaN(c);
- return 0;
- }
- if(VpIsInf(a)) {
- VpSetInf(c,isw*VpGetSign(a));
- return 0;
- }
-
- /* check if the RHS is zero */
- if(!VpIsZero(a)) {
- c->exponent = a->exponent; /* store exponent */
- 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(U_LONG));
- /* Needs round ? */
- if(isw!=10) {
- /* Not in ActiveRound */
- if(c->Prec < a->Prec) {
- VpInternalRound(c,n,(n>0)?a->frac[n-1]:0,a->frac[n]);
- } else {
- VpLimitRound(c,0);
- }
- }
- } else {
- /* The value of 'a' is zero. */
- VpSetZero(c,isw*VpGetSign(a));
- return 1;
- }
- return c->Prec*BASE_FIG;
-}
-
-/*
- * c = a + b when operation = 1 or 2
- * = a - b when operation = -1 or -2.
- * Returns number of significant digits of c
- */
-VP_EXPORT int
-VpAddSub(Real *c, Real *a, Real *b, int operation)
-{
- S_INT sw, isw;
- Real *a_ptr, *b_ptr;
- U_LONG n, na, nb, i;
- U_LONG mrv;
-
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpAddSub(enter) a=% \n", a);
- VPrint(stdout, " b=% \n", b);
- printf(" operation=%d\n", operation);
- }
-#endif /* _DEBUG */
-
- if(!VpIsDefOP(c,a,b,(operation>0)?1:2)) return 0; /* No significant digits */
-
- /* check if a or b is zero */
- if(VpIsZero(a)) {
- /* a is zero,then assign b to c */
- if(!VpIsZero(b)) {
- VpAsgn(c, b, operation);
- } else {
- /* Both a and b are zero. */
- if(VpGetSign(a)<0 && operation*VpGetSign(b)<0) {
- /* -0 -0 */
- VpSetZero(c,-1);
- } else {
- VpSetZero(c,1);
- }
- return 1; /* 0: 1 significant digits */
- }
- return c->Prec*BASE_FIG;
- }
- if(VpIsZero(b)) {
- /* b is zero,then assign a to c. */
- VpAsgn(c, a, 1);
- return c->Prec*BASE_FIG;
- }
-
- if(operation < 0) sw = -1;
- else sw = 1;
-
- /* compare absolute value. As a result,|a_ptr|>=|b_ptr| */
- if(a->exponent > b->exponent) {
- a_ptr = a;
- b_ptr = b;
- } /* |a|>|b| */
- else if(a->exponent < b->exponent) {
- a_ptr = b;
- b_ptr = a;
- } /* |a|<|b| */
- else {
- /* Exponent part of a and b is the same,then compare fraction */
- /* part */
- na = a->Prec;
- nb = b->Prec;
- n = Min(na, nb);
- for(i=0;i < n; ++i) {
- if(a->frac[i] > b->frac[i]) {
- a_ptr = a;
- b_ptr = b;
- goto end_if;
- } else if(a->frac[i] < b->frac[i]) {
- a_ptr = b;
- b_ptr = a;
- goto end_if;
- }
- }
- if(na > nb) {
- a_ptr = a;
- b_ptr = b;
- goto end_if;
- } else if(na < nb) {
- a_ptr = b;
- b_ptr = a;
- goto end_if;
- }
- /* |a| == |b| */
- if(VpGetSign(a) + sw *VpGetSign(b) == 0) {
- VpSetZero(c,1); /* abs(a)=abs(b) and operation = '-' */
- return c->Prec*BASE_FIG;
- }
- a_ptr = a;
- b_ptr = b;
- }
-
-end_if:
- isw = VpGetSign(a) + sw *VpGetSign(b);
- /*
- * isw = 0 ...( 1)+(-1),( 1)-( 1),(-1)+(1),(-1)-(-1)
- * = 2 ...( 1)+( 1),( 1)-(-1)
- * =-2 ...(-1)+(-1),(-1)-( 1)
- * If isw==0, then c =(Sign a_ptr)(|a_ptr|-|b_ptr|)
- * else c =(Sign ofisw)(|a_ptr|+|b_ptr|)
- */
- if(isw) { /* addition */
- VpSetSign(c,(S_INT)1);
- mrv = VpAddAbs(a_ptr, b_ptr, c);
- VpSetSign(c,isw / 2);
- } else { /* subtraction */
- VpSetSign(c,(S_INT)1);
- mrv = VpSubAbs(a_ptr, b_ptr, c);
- if(a_ptr == a) {
- VpSetSign(c,VpGetSign(a));
- } else {
- VpSetSign(c,VpGetSign(a_ptr) * sw);
- }
- }
- VpInternalRound(c,0,(c->Prec>0)?c->frac[c->Prec-1]:0,mrv);
-
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpAddSub(result) c=% \n", c);
- VPrint(stdout, " a=% \n", a);
- VPrint(stdout, " b=% \n", b);
- printf(" operation=%d\n", operation);
- }
-#endif /* _DEBUG */
- return c->Prec*BASE_FIG;
-}
-
-/*
- * Addition of two variable precisional variables
- * a and b assuming abs(a)>abs(b).
- * c = abs(a) + abs(b) ; where |a|>=|b|
- */
-static U_LONG
-VpAddAbs(Real *a, Real *b, Real *c)
-{
- 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 _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpAddAbs called: a = %\n", a);
- VPrint(stdout, " b = %\n", b);
- }
-#endif /* _DEBUG */
-
- word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
- a_pos = ap;
- b_pos = bp;
- c_pos = cp;
- if(word_shift==-1L) return 0; /* Overflow */
- if(b_pos == -1L) goto Assign_a;
-
- mrv = av + bv; /* Most right val. Used for round. */
-
- /* Just assign the last few digits of b to c because a has no */
- /* corresponding digits to be added. */
- while(b_pos + word_shift > a_pos) {
- --c_pos;
- if(b_pos > 0) {
- c->frac[c_pos] = b->frac[--b_pos];
- } else {
- --word_shift;
- c->frac[c_pos] = 0;
- }
- }
-
- /* Just assign the last few digits of a to c because b has no */
- /* corresponding digits to be added. */
- bv = b_pos + word_shift;
- while(a_pos > bv) {
- c->frac[--c_pos] = a->frac[--a_pos];
- }
- carry = 0; /* set first carry be zero */
-
- /* Now perform addition until every digits of b will be */
- /* exhausted. */
- while(b_pos > 0) {
- c->frac[--c_pos] = a->frac[--a_pos] + b->frac[--b_pos] + carry;
- if(c->frac[c_pos] >= BASE) {
- c->frac[c_pos] -= BASE;
- carry = 1;
- } else {
- carry = 0;
- }
- }
-
- /* Just assign the first few digits of a with considering */
- /* the carry obtained so far because b has been exhausted. */
- while(a_pos > 0) {
- c->frac[--c_pos] = a->frac[--a_pos] + carry;
- if(c->frac[c_pos] >= BASE) {
- c->frac[c_pos] -= BASE;
- carry = 1;
- } else {
- carry = 0;
- }
- }
- if(c_pos) c->frac[c_pos - 1] += carry;
- goto Exit;
-
-Assign_a:
- VpAsgn(c, a, 1);
- mrv = 0;
-
-Exit:
-
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpAddAbs exit: c=% \n", c);
- }
-#endif /* _DEBUG */
- return mrv;
-}
-
-/*
- * c = abs(a) - abs(b)
- */
-static U_LONG
-VpSubAbs(Real *a, Real *b, Real *c)
-{
- 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 _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpSubAbs called: a = %\n", a);
- VPrint(stdout, " b = %\n", b);
- }
-#endif /* _DEBUG */
-
- word_shift = VpSetPTR(a, b, c, &ap, &bp, &cp, &av, &bv);
- a_pos = ap;
- b_pos = bp;
- c_pos = cp;
- if(word_shift==-1L) return 0; /* Overflow */
- if(b_pos == -1L) goto Assign_a;
-
- if(av >= bv) {
- mrv = av - bv;
- borrow = 0;
- } else {
- mrv = 0;
- borrow = 1;
- }
-
- /* Just assign the values which are the BASE subtracted by */
- /* each of the last few digits of the b because the a has no */
- /* corresponding digits to be subtracted. */
- if(b_pos + word_shift > a_pos) {
- while(b_pos + word_shift > a_pos) {
- --c_pos;
- if(b_pos > 0) {
- c->frac[c_pos] = BASE - b->frac[--b_pos] - borrow;
- } else {
- --word_shift;
- c->frac[c_pos] = BASE - borrow;
- }
- borrow = 1;
- }
- }
- /* Just assign the last few digits of a to c because b has no */
- /* corresponding digits to subtract. */
-
- bv = b_pos + word_shift;
- while(a_pos > bv) {
- c->frac[--c_pos] = a->frac[--a_pos];
- }
-
- /* Now perform subtraction until every digits of b will be */
- /* exhausted. */
- while(b_pos > 0) {
- --c_pos;
- if(a->frac[--a_pos] < b->frac[--b_pos] + borrow) {
- c->frac[c_pos] = BASE + a->frac[a_pos] - b->frac[b_pos] - borrow;
- borrow = 1;
- } else {
- c->frac[c_pos] = a->frac[a_pos] - b->frac[b_pos] - borrow;
- borrow = 0;
- }
- }
-
- /* Just assign the first few digits of a with considering */
- /* the borrow obtained so far because b has been exhausted. */
- while(a_pos > 0) {
- --c_pos;
- if(a->frac[--a_pos] < borrow) {
- c->frac[c_pos] = BASE + a->frac[a_pos] - borrow;
- borrow = 1;
- } else {
- c->frac[c_pos] = a->frac[a_pos] - borrow;
- borrow = 0;
- }
- }
- if(c_pos) c->frac[c_pos - 1] -= borrow;
- goto Exit;
-
-Assign_a:
- VpAsgn(c, a, 1);
- mrv = 0;
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpSubAbs exit: c=% \n", c);
- }
-#endif /* _DEBUG */
- return mrv;
-}
-
-/*
- * Note: If(av+bv)>= HALF_BASE,then 1 will be added to the least significant
- * digit of c(In case of addition).
- * ------------------------- figure of output -----------------------------------
- * a = xxxxxxxxxxx
- * b = xxxxxxxxxx
- * c =xxxxxxxxxxxxxxx
- * word_shift = | |
- * right_word = | | (Total digits in RHSV)
- * left_word = | | (Total digits in LHSV)
- * a_pos = |
- * b_pos = |
- * c_pos = |
- */
-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)
-{
- U_LONG left_word, right_word, word_shift;
- c->frac[0] = 0;
- *av = *bv = 0;
- word_shift =((a->exponent) -(b->exponent));
- left_word = b->Prec + word_shift;
- right_word = Max((a->Prec),left_word);
- left_word =(c->MaxPrec) - 1; /* -1 ... prepare for round up */
- /*
- * check if 'round' is needed.
- */
- if(right_word > left_word) { /* round ? */
- /*---------------------------------
- * Actual size of a = xxxxxxAxx
- * Actual size of b = xxxBxxxxx
- * Max. size of c = xxxxxx
- * Round off = |-----|
- * c_pos = |
- * right_word = |
- * a_pos = |
- */
- *c_pos = right_word = left_word + 1; /* Set resulting precision */
- /* be equal to that of c */
- if((a->Prec) >=(c->MaxPrec)) {
- /*
- * a = xxxxxxAxxx
- * c = xxxxxx
- * a_pos = |
- */
- *a_pos = left_word;
- *av = a->frac[*a_pos]; /* av is 'A' shown in above. */
- } else {
- /*
- * a = xxxxxxx
- * c = xxxxxxxxxx
- * a_pos = |
- */
- *a_pos = a->Prec;
- }
- if((b->Prec + word_shift) >= c->MaxPrec) {
- /*
- * a = xxxxxxxxx
- * b = xxxxxxxBxxx
- * c = xxxxxxxxxxx
- * b_pos = |
- */
- if(c->MaxPrec >=(word_shift + 1)) {
- *b_pos = c->MaxPrec - word_shift - 1;
- *bv = b->frac[*b_pos];
- } else {
- *b_pos = -1L;
- }
- } else {
- /*
- * a = xxxxxxxxxxxxxxxx
- * b = xxxxxx
- * c = xxxxxxxxxxxxx
- * b_pos = |
- */
- *b_pos = b->Prec;
- }
- } else { /* The MaxPrec of c - 1 > The Prec of a + b */
- /*
- * a = xxxxxxx
- * b = xxxxxx
- * c = xxxxxxxxxxx
- * c_pos = |
- */
- *b_pos = b->Prec;
- *a_pos = a->Prec;
- *c_pos = right_word + 1;
- }
- c->Prec = *c_pos;
- c->exponent = a->exponent;
- if(!AddExponent(c,(S_LONG)1)) return (-1L);
- return word_shift;
-}
-
-/*
- * Return number og significant digits
- * c = a * b , Where a = a0a1a2 ... an
- * b = b0b1b2 ... bm
- * c = c0c1c2 ... cl
- * a0 a1 ... an * bm
- * a0 a1 ... an * bm-1
- * . . .
- * . . .
- * a0 a1 .... an * b0
- * +_____________________________
- * c0 c1 c2 ...... cl
- * nc <---|
- * MaxAB |--------------------|
- */
-VP_EXPORT int
-VpMult(Real *c, Real *a, Real *b)
-{
- 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 _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpMult(Enter): a=% \n", a);
- VPrint(stdout, " b=% \n", b);
- }
-#endif /* _DEBUG */
-
- if(!VpIsDefOP(c,a,b,3)) return 0; /* No significant digit */
-
- if(VpIsZero(a) || VpIsZero(b)) {
- /* at least a or b is zero */
- VpSetZero(c,VpGetSign(a)*VpGetSign(b));
- return 1; /* 0: 1 significant digit */
- }
-
- if(VpIsOne(a)) {
- VpAsgn(c, b, VpGetSign(a));
- goto Exit;
- }
- if(VpIsOne(b)) {
- VpAsgn(c, a, VpGetSign(b));
- goto Exit;
- }
- if((b->Prec) >(a->Prec)) {
- /* Adjust so that digits(a)>digits(b) */
- w = a;
- a = b;
- b = w;
- }
- w = NULL;
- MxIndA = a->Prec - 1;
- MxIndB = b->Prec - 1;
- MxIndC = c->MaxPrec - 1;
- MxIndAB = a->Prec + b->Prec - 1;
-
- if(MxIndC < MxIndAB) { /* The Max. prec. of c < Prec(a)+Prec(b) */
- w = c;
- c = VpAlloc((U_LONG)((MxIndAB + 1) * BASE_FIG), "#0");
- MxIndC = MxIndAB;
- }
-
- /* set LHSV c info */
-
- c->exponent = a->exponent; /* set exponent */
- if(!AddExponent(c,b->exponent)) return 0;
- VpSetSign(c,VpGetSign(a)*VpGetSign(b)); /* set sign */
- Carry = 0;
- nc = ind_c = MxIndAB;
- 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 =((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 += s;
- c->frac[ind_c] -= (s * BASE);
- }
- if(Carry) {
- ii = ind_c;
- while((--ii) >= 0) {
- c->frac[ii] += Carry;
- if(c->frac[ii] >= BASE) {
- Carry = c->frac[ii] / BASE;
- c->frac[ii] -=(Carry * BASE);
- } else {
- break;
- }
- }
- }
- }
- }
- if(w != NULL) { /* free work variable */
- VpNmlz(c);
- VpAsgn(w, c, 1);
- VpFree(c);
- c = w;
- } else {
- VpLimitRound(c,0);
- }
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpMult(c=a*b): c=% \n", c);
- VPrint(stdout, " a=% \n", a);
- VPrint(stdout, " b=% \n", b);
- }
-#endif /*_DEBUG */
- return c->Prec*BASE_FIG;
-}
-
-/*
- * c = a / b, remainder = r
- */
-VP_EXPORT int
-VpDivd(Real *c, Real *r, Real *a, Real *b)
-{
- 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 _DEBUG
- if(gfDebug) {
- VPrint(stdout, " VpDivd(c=a/b) a=% \n", a);
- VPrint(stdout, " b=% \n", b);
- }
-#endif /*_DEBUG */
-
- VpSetNaN(r);
- if(!VpIsDefOP(c,a,b,4)) goto Exit;
- if(VpIsZero(a)&&VpIsZero(b)) {
- VpSetNaN(c);
- return VpException(VP_EXCEPTION_NaN,"(VpDivd) 0/0 not defined(NaN)",0);
- }
- if(VpIsZero(b)) {
- VpSetInf(c,VpGetSign(a)*VpGetSign(b));
- return VpException(VP_EXCEPTION_ZERODIVIDE,"(VpDivd) Divide by zero",0);
- }
- if(VpIsZero(a)) {
- /* numerator a is zero */
- VpSetZero(c,VpGetSign(a)*VpGetSign(b));
- VpSetZero(r,VpGetSign(a)*VpGetSign(b));
- goto Exit;
- }
- if(VpIsOne(b)) {
- /* divide by one */
- VpAsgn(c, a, VpGetSign(b));
- VpSetZero(r,VpGetSign(a));
- goto Exit;
- }
-
- word_a = a->Prec;
- word_b = b->Prec;
- word_c = c->MaxPrec;
- word_r = r->MaxPrec;
-
- ind_c = 0;
- ind_r = 1;
-
- if(word_a >= word_r) goto space_error;
-
- r->frac[0] = 0;
- while(ind_r <= word_a) {
- r->frac[ind_r] = a->frac[ind_r - 1];
- ++ind_r;
- }
-
- while(ind_r < word_r) r->frac[ind_r++] = 0;
- while(ind_c < word_c) c->frac[ind_c++] = 0;
-
- /* initial procedure */
- b1 = b1p1 = b->frac[0];
- if(b->Prec <= 1) {
- b1b2p1 = b1b2 = b1p1 * BASE;
- } else {
- b1p1 = b1 + 1;
- b1b2p1 = b1b2 = b1 * BASE + b->frac[1];
- if(b->Prec > 2) ++b1b2p1;
- }
-
- /* */
- /* loop start */
- ind_c = word_r - 1;
- nLoop = Min(word_c,ind_c);
- ind_c = 1;
- while(ind_c < nLoop) {
- if(r->frac[ind_c] == 0) {
- ++ind_c;
- continue;
- }
- 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;
- ind_a = ind_c + 2;
- while(ind_b < word_b) {
- if(r->frac[ind_a] < b->frac[ind_b]) goto div_b1p1;
- if(r->frac[ind_a] > b->frac[ind_b]) break;
- ++ind_a;
- ++ind_b;
- }
- /* The first few word digits of r and b is the same and */
- /* the first different word digit of w is greater than that */
- /* of b, so quotinet is 1 and just subtract b from r. */
- borrow = 0; /* quotient=1, then just r-b */
- ind_b = b->Prec - 1;
- ind_r = ind_c + ind_b;
- if(ind_r >= word_r) goto space_error;
- 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));
- borrow = 1;
- } else {
- r->frac[ind_r] = r->frac[ind_r] - b->frac[ind_b] - borrow;
- borrow = 0;
- }
- --ind_r;
- --ind_b;
- }
- ++(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;
- 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;
- c->frac[ind_c + 1] += q;
- ind_r = b->Prec + ind_c;
-
-sub_mult:
- borrow1 = borrow2 = 0;
- ind_b = word_b - 1;
- if(ind_r >= word_r) goto space_error;
- 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;
- else {
- borrow1 = qb / BASE;
- qb = qb - borrow1 * BASE;
- }
- if(r->frac[ind_r] < qb) {
- r->frac[ind_r] +=(BASE - qb);
- borrow2 = borrow2 + borrow1 + 1;
- } else {
- r->frac[ind_r] -= qb;
- borrow2 += borrow1;
- }
- if(borrow2) {
- if(r->frac[ind_r - 1] < borrow2) {
- r->frac[ind_r - 1] +=(BASE - borrow2);
- borrow2 = 1;
- } else {
- r->frac[ind_r - 1] -= borrow2;
- borrow2 = 0;
- }
- }
- --ind_r;
- --ind_b;
- }
-
- r->frac[ind_r] -= borrow2;
-carry:
- ind_r = ind_c;
- while(c->frac[ind_r] >= BASE) {
- c->frac[ind_r] -= BASE;
- --ind_r;
- ++(c->frac[ind_r]);
- }
- }
- /* End of operation, now final arrangement */
-out_side:
- c->Prec = word_c;
- c->exponent = a->exponent;
- if(!AddExponent(c,(S_LONG)2)) return 0;
- if(!AddExponent(c,-(b->exponent))) return 0;
-
- VpSetSign(c,VpGetSign(a)*VpGetSign(b));
- VpNmlz(c); /* normalize c */
- r->Prec = word_r;
- r->exponent = a->exponent;
- if(!AddExponent(r,(S_LONG)1)) return 0;
- VpSetSign(r,VpGetSign(a));
- VpNmlz(r); /* normalize r(remainder) */
- goto Exit;
-
-space_error:
-#ifdef _DEBUG
- if(gfDebug) {
- printf(" word_a=%lu\n", word_a);
- printf(" word_b=%lu\n", word_b);
- printf(" word_c=%lu\n", word_c);
- printf(" word_r=%lu\n", word_r);
- printf(" ind_r =%lu\n", ind_r);
- }
-#endif /* _DEBUG */
- rb_bug("ERROR(VpDivd): space for remainder too small.");
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, " VpDivd(c=a/b), c=% \n", c);
- VPrint(stdout, " r=% \n", r);
- }
-#endif /* _DEBUG */
- return c->Prec*BASE_FIG;
-}
-
-/*
- * Input a = 00000xxxxxxxx En(5 preceeding zeros)
- * Output a = xxxxxxxx En-5
- */
-static int
-VpNmlz(Real *a)
-{
- U_LONG ind_a, i;
-
- if(!VpIsDef(a)) goto NoVal;
- if(VpIsZero(a)) goto NoVal;
-
- ind_a = a->Prec;
- 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) {
- a->Prec -= i;
- 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));
- return 0;
-
-NoVal:
- a->frac[0] = 0;
- a->Prec=1;
- return 0;
-}
-
-/*
- * VpComp = 0 ... if a=b,
- * Pos ... a>b,
- * Neg ... a<b.
- * 999 ... result undefined(NaN)
- */
-VP_EXPORT int
-VpComp(Real *a, Real *b)
-{
- int val;
- U_LONG mx, ind;
- int e;
- val = 0;
- if(VpIsNaN(a)||VpIsNaN(b)) return 999;
- if(!VpIsDef(a)) {
- if(!VpIsDef(b)) e = a->sign - b->sign;
- else e = a->sign;
- if(e>0) return 1;
- else if(e<0) return -1;
- else return 0;
- }
- if(!VpIsDef(b)) {
- e = -b->sign;
- if(e>0) return 1;
- else return -1;
- }
- /* Zero check */
- if(VpIsZero(a)) {
- if(VpIsZero(b)) return 0; /* both zero */
- val = -VpGetSign(b);
- goto Exit;
- }
- if(VpIsZero(b)) {
- val = VpGetSign(a);
- goto Exit;
- }
-
- /* compare sign */
- if(VpGetSign(a) > VpGetSign(b)) {
- val = 1; /* a>b */
- goto Exit;
- }
- if(VpGetSign(a) < VpGetSign(b)) {
- val = -1; /* a<b */
- goto Exit;
- }
-
- /* a and b have same sign, && signe!=0,then compare exponent */
- if((a->exponent) >(b->exponent)) {
- val = VpGetSign(a);
- goto Exit;
- }
- if((a->exponent) <(b->exponent)) {
- val = -VpGetSign(b);
- goto Exit;
- }
-
- /* a and b have same exponent, then compare significand. */
- mx =((a->Prec) <(b->Prec)) ?(a->Prec) :(b->Prec);
- ind = 0;
- while(ind < mx) {
- if((a->frac[ind]) >(b->frac[ind])) {
- val = VpGetSign(a);
- goto Exit;
- }
- if((a->frac[ind]) <(b->frac[ind])) {
- val = -VpGetSign(b);
- goto Exit;
- }
- ++ind;
- }
- if((a->Prec) >(b->Prec)) {
- val = VpGetSign(a);
- } else if((a->Prec) <(b->Prec)) {
- val = -VpGetSign(b);
- }
-
-Exit:
- if (val> 1) val = 1;
- else if(val<-1) val = -1;
-
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, " VpComp a=%\n", a);
- VPrint(stdout, " b=%\n", b);
- printf(" ans=%d\n", val);
- }
-#endif /* _DEBUG */
- return (int)val;
-}
-
-#ifdef _DEBUG
-/*
- * cntl_chr ... ASCIIZ Character, print control characters
- * Available control codes:
- * % ... VP variable. To print '%', use '%%'.
- * \n ... new line
- * \b ... backspace
- * ... tab
- * Note: % must must not appear more than once
- * a ... VP variable to be printed
- */
-VP_EXPORT int
-VPrint(FILE *fp, char *cntl_chr, Real *a)
-{
- U_LONG i, j, nc, nd, ZeroSup;
- U_LONG n, m, e, nn;
-
- /* Check if NaN & Inf. */
- if(VpIsNaN(a)) {
- fprintf(fp,SZ_NaN);
- return 8;
- }
- if(VpIsPosInf(a)) {
- fprintf(fp,SZ_INF);
- return 8;
- }
- if(VpIsNegInf(a)) {
- fprintf(fp,SZ_NINF);
- return 9;
- }
- if(VpIsZero(a)) {
- fprintf(fp,"0.0");
- return 3;
- }
-
- j = 0;
- nd = nc = 0; /* nd : number of digits in fraction part(every 10 digits, */
- /* nd<=10). */
- /* nc : number of caracters printed */
- ZeroSup = 1; /* Flag not to print the leading zeros as 0.00xxxxEnn */
- while(*(cntl_chr + j)) {
- if((*(cntl_chr + j) == '%') &&(*(cntl_chr + j + 1) != '%')) {
- nc = 0;
- if(!VpIsZero(a)) {
- if(VpGetSign(a) < 0) {
- fprintf(fp, "-");
- ++nc;
- }
- nc += fprintf(fp, "0.");
- 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", nn); /* The reading zero(s) */
- /* as 0.00xx will not */
- /* be printed. */
- ++nd;
- ZeroSup = 0; /* Set to print succeeding zeros */
- }
- if(nd >= 10) { /* print ' ' after every 10 digits */
- nd = 0;
- nc += fprintf(fp, " ");
- }
- e = e - nn * m;
- m /= 10;
- }
- }
- nc += fprintf(fp, "E%ld", VpExponent10(a));
- } else {
- nc += fprintf(fp, "0.0");
- }
- } else {
- ++nc;
- if(*(cntl_chr + j) == '\\') {
- switch(*(cntl_chr + j + 1)) {
- case 'n':
- fprintf(fp, "\n");
- ++j;
- break;
- case 't':
- fprintf(fp, "\t");
- ++j;
- break;
- case 'b':
- fprintf(fp, "\n");
- ++j;
- break;
- default:
- fprintf(fp, "%c", *(cntl_chr + j));
- break;
- }
- } else {
- fprintf(fp, "%c", *(cntl_chr + j));
- if(*(cntl_chr + j) == '%') ++j;
- }
- }
- j++;
- }
- return (int)nc;
-}
-#endif /* _DEBUG */
-
-static void
-VpFormatSt(char *psz,S_INT fFmt)
-{
- U_LONG ie;
- U_LONG i;
- S_INT nf = 0;
- char ch;
-
- if(fFmt<=0) return;
-
- ie = strlen(psz);
- for(i = 0; i < ie; ++i) {
- ch = psz[i];
- if(!ch) break;
- if(ISSPACE(ch) || ch=='-' || ch=='+') continue;
- if(ch == '.') { nf = 0;continue;}
- if(ch == 'E') break;
- nf++;
- if(nf > fFmt) {
- memmove(psz + i + 1, psz + i, ie - i + 1);
- ++ie;
- nf = 0;
- psz[i] = ' ';
- }
- }
-}
-
-VP_EXPORT S_LONG
-VpExponent10(Real *a)
-{
- S_LONG ex;
- U_LONG n;
-
- if(!VpHasVal(a)) return 0;
-
- ex =(a->exponent) * BASE_FIG;
- n = BASE1;
- while((a->frac[0] / n) == 0) {
- --ex;
- n /= 10;
- }
- return ex;
-}
-
-VP_EXPORT void
-VpSzMantissa(Real *a,char *psz)
-{
- U_LONG i, ZeroSup;
- U_LONG n, m, e, nn;
-
- if(VpIsNaN(a)) {
- sprintf(psz,SZ_NaN);
- return;
- }
- if(VpIsPosInf(a)) {
- sprintf(psz,SZ_INF);
- return;
- }
- if(VpIsNegInf(a)) {
- sprintf(psz,SZ_NINF);
- return;
- }
-
- ZeroSup = 1; /* Flag not to print the leading zeros as 0.00xxxxEnn */
- if(!VpIsZero(a)) {
- if(VpGetSign(a) < 0) *psz++ = '-';
- n = a->Prec;
- for(i=0;i < n;++i) {
- m = BASE1;
- e = a->frac[i];
- while(m) {
- nn = e / m;
- if((!ZeroSup) || nn) {
- sprintf(psz, "%lu", nn); /* The reading zero(s) */
- psz += strlen(psz);
- /* as 0.00xx will be ignored. */
- ZeroSup = 0; /* Set to print succeeding zeros */
- }
- e = e - nn * m;
- m /= 10;
- }
- }
- *psz = 0;
- while(psz[-1]=='0') *(--psz) = 0;
- } else {
- if(VpIsPosZero(a)) sprintf(psz, "0");
- else sprintf(psz, "-0");
- }
-}
-
-VP_EXPORT int
-VpToSpecialString(Real *a,char *psz,int fPlus)
-/* fPlus =0:default, =1: set ' ' before digits , =2: set '+' before digits. */
-{
- if(VpIsNaN(a)) {
- sprintf(psz,SZ_NaN);
- return 1;
- }
-
- if(VpIsPosInf(a)) {
- if(fPlus==1) {
- *psz++ = ' ';
- } else if(fPlus==2) {
- *psz++ = '+';
- }
- sprintf(psz,SZ_INF);
- return 1;
- }
- if(VpIsNegInf(a)) {
- sprintf(psz,SZ_NINF);
- return 1;
- }
- if(VpIsZero(a)) {
- if(VpIsPosZero(a)) {
- if(fPlus==1) sprintf(psz, " 0.0");
- else if(fPlus==2) sprintf(psz, "+0.0");
- else sprintf(psz, "0.0");
- } else sprintf(psz, "-0.0");
- return 1;
- }
- return 0;
-}
-
-VP_EXPORT void
-VpToString(Real *a,char *psz,int fFmt,int fPlus)
-/* fPlus =0:default, =1: set ' ' before digits , =2:set '+' before digits. */
-{
- U_LONG i, ZeroSup;
- U_LONG n, m, e, nn;
- char *pszSav = psz;
- S_LONG ex;
-
- 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++ = '+';
-
- *psz++ = '0';
- *psz++ = '.';
- n = a->Prec;
- for(i=0;i < n;++i) {
- m = BASE1;
- e = a->frac[i];
- while(m) {
- nn = e / m;
- if((!ZeroSup) || nn) {
- sprintf(psz, "%lu", nn); /* The reading zero(s) */
- psz += strlen(psz);
- /* as 0.00xx will be ignored. */
- ZeroSup = 0; /* Set to print succeeding zeros */
- }
- e = e - nn * m;
- m /= 10;
- }
- }
- ex =(a->exponent) * BASE_FIG;
- n = BASE1;
- while((a->frac[0] / n) == 0) {
- --ex;
- n /= 10;
- }
- while(psz[-1]=='0') *(--psz) = 0;
- sprintf(psz, "E%ld", ex);
- if(fFmt) VpFormatSt(pszSav, fFmt);
-}
-
-VP_EXPORT void
-VpToFString(Real *a,char *psz,int fFmt,int fPlus)
-/* fPlus =0:default,=1: set ' ' before digits ,set '+' before digits. */
-{
- U_LONG i;
- U_LONG n, m, e, nn;
- char *pszSav = psz;
- S_LONG ex;
-
- if(VpToSpecialString(a,psz,fPlus)) return;
-
- if(VpGetSign(a) < 0) *psz++ = '-';
- else if(fPlus==1) *psz++ = ' ';
- else if(fPlus==2) *psz++ = '+';
-
- n = a->Prec;
- ex = a->exponent;
- if(ex<=0) {
- *psz++ = '0';*psz++ = '.';
- while(ex<0) {
- for(i=0;i<BASE_FIG;++i) *psz++ = '0';
- ++ex;
- }
- ex = -1;
- }
-
- for(i=0;i < n;++i) {
- --ex;
- if(i==0 && ex >= 0) {
- sprintf(psz, "%lu", a->frac[i]);
- psz += strlen(psz);
- } else {
- m = BASE1;
- e = a->frac[i];
- while(m) {
- nn = e / m;
- *psz++ = (char)(nn + '0');
- e = e - nn * m;
- m /= 10;
- }
- }
- if(ex == 0) *psz++ = '.';
- }
- while(--ex>=0) {
- m = BASE;
- while(m/=10) *psz++ = '0';
- if(ex == 0) *psz++ = '.';
- }
- *psz = 0;
- while(psz[-1]=='0') *(--psz) = 0;
- if(psz[-1]=='.') sprintf(psz, "0");
- if(fFmt) VpFormatSt(pszSav, fFmt);
-}
-
-/*
- * [Output]
- * a[] ... variable to be assigned the value.
- * [Input]
- * int_chr[] ... integer part(may include '+/-').
- * ni ... number of characters in int_chr[],not including '+/-'.
- * frac[] ... fraction part.
- * nf ... number of characters in frac[].
- * exp_chr[] ... exponent part(including '+/-').
- * ne ... number of characters in exp_chr[],not including '+/-'.
- */
-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)
-{
- U_LONG i, j, ind_a, ma, mi, me;
- U_LONG loc;
- S_INT e,es, eb, ef;
- S_INT sign, signe;
- /* get exponent part */
- e = 0;
- ma = a->MaxPrec;
- mi = ni;
- me = ne;
- signe = 1;
- memset(a->frac, 0, ma * sizeof(U_LONG));
- if(ne > 0) {
- i = 0;
- if(exp_chr[0] == '-') {
- signe = -1;
- ++i;
- ++me;
- } else if(exp_chr[0] == '+') {
- ++i;
- ++me;
- }
- while(i < me) {
- es = e*((S_INT)BASE_FIG);
- e = e * 10 + exp_chr[i] - '0';
- if(es>e*((S_INT)BASE_FIG)) {
- return VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
- }
- ++i;
- }
- }
-
- /* get integer part */
- i = 0;
- sign = 1;
- if(ni >= 0) {
- if(int_chr[0] == '-') {
- sign = -1;
- ++i;
- ++mi;
- } else if(int_chr[0] == '+') {
- ++i;
- ++mi;
- }
- }
-
- e = signe * e; /* e: The value of exponent part. */
- e = e + ni; /* set actual exponent size. */
-
- 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 / ((S_INT)BASE_FIG);
- ef = eb - ef * ((S_INT)BASE_FIG);
- if(ef) {
- ++j; /* Means to add one more preceeding zero */
- ++e;
- }
- }
-
- eb = e / ((S_INT)BASE_FIG);
-
- ind_a = 0;
- while(i < mi) {
- a->frac[ind_a] = 0;
- 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) {
- ++ind_a;
- if(ind_a >= ma) goto over_flow;
- j = 0;
- }
- }
- loc = 1;
-
- /* get fraction part */
-
- i = 0;
- while(i < nf) {
- while((j < (U_LONG)BASE_FIG) &&(i < nf)) {
- a->frac[ind_a] = a->frac[ind_a] * 10 + frac[i] - '0';
- ++j;
- ++i;
- }
- if(i < nf) {
- ++ind_a;
- if(ind_a >= ma) goto over_flow;
- j = 0;
- }
- }
- goto Final;
-
-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 < (U_LONG)BASE_FIG) {
- a->frac[ind_a] = a->frac[ind_a] * 10;
- ++j;
- }
- a->Prec = ind_a + 1;
- a->exponent = eb;
- VpSetSign(a,sign);
- VpNmlz(a);
- return 1;
-}
-
-/*
- * [Input]
- * *m ... Real
- * [Output]
- * *d ... fraction part of m(d = 0.xxxxxxx). where # of 'x's is fig.
- * *e ... U_LONG,exponent of m.
- * DBLE_FIG ... Number of digits in a double variable.
- *
- * m -> d*10**e, 0<d<BASE
- * [Returns]
- * 0 ... Zero
- * 1 ... Normal
- * 2 ... Infinity
- * -1 ... NaN
- */
-VP_EXPORT int
-VpVtoD(double *d, S_LONG *e, Real *m)
-{
- U_LONG ind_m, mm, fig;
- double div;
- int f = 1;
-
- if(VpIsNaN(m)) {
- *d = VpGetDoubleNaN();
- *e = 0;
- f = -1; /* NaN */
- goto Exit;
- } else
- if(VpIsPosZero(m)) {
- *d = 0.0;
- *e = 0;
- f = 0;
- goto Exit;
- } else
- if(VpIsNegZero(m)) {
- *d = VpGetDoubleNegZero();
- *e = 0;
- f = 0;
- goto Exit;
- } else
- if(VpIsPosInf(m)) {
- *d = VpGetDoublePosInf();
- *e = 0;
- f = 2;
- goto Exit;
- } else
- if(VpIsNegInf(m)) {
- *d = VpGetDoubleNegInf();
- *e = 0;
- f = 2;
- goto Exit;
- }
- /* Normal number */
- fig =(DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
- ind_m = 0;
- mm = Min(fig,(m->Prec));
- *d = 0.0;
- div = 1.;
- while(ind_m < mm) {
- div /=(double)((S_INT)BASE);
- *d = *d +((double) ((S_INT)m->frac[ind_m++])) * div;
- }
- *e = m->exponent * ((S_INT)BASE_FIG);
- *d *= VpGetSign(m);
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, " VpVtoD: m=%\n", m);
- printf(" d=%e * 10 **%ld\n", *d, *e);
- printf(" DBLE_FIG = %ld\n", DBLE_FIG);
- }
-#endif /*_DEBUG */
- return f;
-}
-
-/*
- * m <- d
- */
-VP_EXPORT void
-VpDtoV(Real *m, double d)
-{
- U_LONG i, ind_m, mm;
- U_LONG ne;
- double val, val2;
-
- if(isnan(d)) {
- VpSetNaN(m);
- goto Exit;
- }
- if(isinf(d)) {
- if(d>0.0) VpSetPosInf(m);
- else VpSetNegInf(m);
- goto Exit;
- }
-
- if(d == 0.0) {
- VpSetZero(m,1);
- goto Exit;
- }
- val =(d > 0.) ? d :(-d);
- ne = 0;
- if(val >= 1.0) {
- while(val >= 1.0) {
- val /=(double)((S_INT)BASE);
- ++ne;
- }
- } else {
- val2 = 1.0 /(double)((S_INT)BASE);
- while(val < val2) {
- val *=(double)((S_INT)BASE);
- --ne;
- }
- }
- /* Now val = 0.xxxxx*BASE**ne */
-
- mm = m->MaxPrec;
- memset(m->frac, 0, mm * sizeof(U_LONG));
- for(ind_m = 0;val > 0.0 && ind_m < mm;ind_m++) {
- 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;
- 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,
- (U_LONG)(val*((double)((S_INT)BASE))));
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- printf("VpDtoV d=%30.30e\n", d);
- VPrint(stdout, " m=%\n", m);
- }
-#endif /* _DEBUG */
- return;
-}
-
-/*
- * m <- ival
- */
-VP_EXPORT void
-VpItoV(Real *m, S_INT ival)
-{
- U_LONG mm, ind_m;
- U_LONG val, v1, v2, v;
- int isign;
- S_INT ne;
-
- if(ival == 0) {
- VpSetZero(m,1);
- goto Exit;
- }
- isign = 1;
- val = ival;
- if(ival < 0) {
- isign = -1;
- val =(U_LONG)(-ival);
- }
- ne = 0;
- ind_m = 0;
- mm = m->MaxPrec;
- while(ind_m < mm) {
- m->frac[ind_m] = 0;
- ++ind_m;
- }
- ind_m = 0;
- while(val > 0) {
- if(val) {
- v1 = val;
- v2 = 1;
- while(v1 >= BASE) {
- v1 /= BASE;
- v2 *= BASE;
- }
- val = val - v2 * v1;
- v = v1;
- } else {
- v = 0;
- }
- m->frac[ind_m] = v;
- ++ind_m;
- ++ne;
- }
- m->Prec = ind_m - 1;
- m->exponent = ne;
- VpSetSign(m,isign);
- VpNmlz(m);
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- printf(" VpItoV i=%d\n", ival);
- VPrint(stdout, " m=%\n", m);
- }
-#endif /* _DEBUG */
- return;
-}
-
-/*
- * y = SQRT(x), y*y - x =>0
- */
-VP_EXPORT int
-VpSqrt(Real *y, Real *x)
-{
- Real *f = NULL;
- Real *r = NULL;
- S_LONG y_prec, f_prec;
- S_LONG n;
- S_LONG e;
- S_LONG prec;
- S_LONG nr;
- double val;
-
- /* Zero, NaN or Infinity ? */
- if(!VpHasVal(x)) {
- if(VpIsZero(x)||VpGetSign(x)>0) {
- VpAsgn(y,x,1);
- goto Exit;
- }
- VpSetNaN(y);
- return VpException(VP_EXCEPTION_OP,"(VpSqrt) SQRT(NaN or negative value)",0);
- goto Exit;
- }
-
- /* Negative ? */
- if(VpGetSign(x) < 0) {
- VpSetNaN(y);
- return VpException(VP_EXCEPTION_OP,"(VpSqrt) SQRT(negative value)",0);
- }
-
- /* One ? */
- if(VpIsOne(x)) {
- VpSetOne(y);
- goto Exit;
- }
-
- 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");
-
- nr = 0;
- 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 /= ((S_LONG)BASE_FIG);
- n = e / 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 = (DBLE_FIG + BASE_FIG - 1) / BASE_FIG;
- y->MaxPrec = (U_LONG)Min(n , y_prec);
- f->MaxPrec = y->MaxPrec + 1;
- n = y_prec*((S_LONG)BASE_FIG);
- if((U_LONG)n<maxnr) n = (U_LONG)maxnr;
- do {
- y->MaxPrec *= 2;
- 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 */
- VpMult(f, VpPt5, r); /* f = 0.5*r */
- if(VpIsZero(f)) goto converge;
- VpAddSub(r, f, y, 1); /* r = y + f */
- VpAsgn(y, r, 1); /* y = r */
- if(f->exponent <= prec) goto converge;
- } while(++nr < n);
- /* */
-#ifdef _DEBUG
- if(gfDebug) {
- printf("ERROR(VpSqrt): did not converge within %ld iterations.\n",
- nr);
- }
-#endif /* _DEBUG */
- y->MaxPrec = y_prec;
-
-converge:
- VpChangeSign(y,(S_INT)1);
-#ifdef _DEBUG
- if(gfDebug) {
- VpMult(r, y, y);
- VpAddSub(f, x, r, -1);
- printf("VpSqrt: iterations = %lu\n", nr);
- VPrint(stdout, " y =% \n", y);
- VPrint(stdout, " x =% \n", x);
- VPrint(stdout, " x-y*y = % \n", f);
- }
-#endif /* _DEBUG */
- y->MaxPrec = y_prec;
-
-Exit:
- VpFree(f);
- VpFree(r);
- return 1;
-}
-
-/*
- *
- * f = 0: Round off/Truncate, 1: round up, 2:ceil, 3: floor, 4: Banker's rounding
- * nf: digit position for operation.
- *
- */
-VP_EXPORT int
-VpMidRound(Real *y, int f, int nf)
-/*
- * Round reletively from the decimal point.
- * f: rounding mode
- * nf: digit location to round from the the decimal point.
- */
-{
- /* fracf: any positive digit under rounding position? */
- /* exptoadd: number of digits needed to compensate negative nf */
- int n,i,ix,ioffset,fracf,exptoadd;
- U_LONG v,shifter;
- U_LONG div;
-
- nf += y->exponent*((int)BASE_FIG);
- exptoadd=0;
- if (nf < 0) {
- exptoadd = -nf;
- nf = 0;
- }
- /* ix: x->fraq[ix] contains round position */
- ix = nf/(int)BASE_FIG;
- if(((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
- ioffset = nf - ix*((int)BASE_FIG);
-
- v = y->frac[ix];
- /* drop digits after pointed digit */
- n = BASE_FIG - ioffset - 1;
- for(shifter=1,i=0;i<n;++i) shifter *= 10;
- fracf = (v%(shifter*10) > 0);
- v /= shifter;
- div = v/10;
- v = v - div*10;
- if (fracf == 0) {
- for(i=ix+1;i<y->Prec;i++) {
- if (y->frac[i]%BASE) {
- fracf = 1;
- break;
- }
- }
- }
- 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: /* Round half up */
- if(v>=5) ++div;
- break;
- case VP_ROUND_HALF_DOWN: /* Round half down */
- if(v>=6) ++div;
- break;
- case VP_ROUND_CEIL: /* ceil */
- if(fracf && (VpGetSign(y)>0)) ++div;
- break;
- 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((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) {
- if(ix) {
- y->frac[ix] = 0;
- VpRdup(y,ix);
- } else {
- S_INT s = VpGetSign(y);
- int e = y->exponent;
- VpSetOne(y);
- VpSetSign(y,s);
- y->exponent = e+1;
- }
- } else {
- y->frac[ix] = div;
- VpNmlz(y);
- }
- if (exptoadd > 0) {
- y->exponent += exptoadd/BASE_FIG;
- exptoadd %= BASE_FIG;
- for(i=0;i<exptoadd;i++) {
- y->frac[0] *= 10;
- if (y->frac[0] >= BASE) {
- y->frac[0] /= BASE;
- y->exponent++;
- }
- }
- }
- return 1;
-}
-
-VP_EXPORT int
-VpLeftRound(Real *y, int f, int nf)
-/*
- * Round from the left hand side of the digits.
- */
-{
- U_LONG v;
- if(!VpHasVal(y)) return 0; /* Unable to round */
- v = y->frac[0];
- nf -= VpExponent(y)*BASE_FIG;
- while(v=v/10) nf--;
- nf += (BASE_FIG-1);
- return VpMidRound(y,f,nf);
-}
-
-VP_EXPORT int
-VpActiveRound(Real *y, Real *x, int f, int nf)
-{
- /* First,assign whole value in truncation mode */
- if(VpAsgn(y, x, 10)<=1) return 0; /* Zero,NaN,or Infinity */
- return VpMidRound(y,f,nf);
-}
-
-static int
-VpLimitRound(Real *c,U_LONG ixDigit)
-{
- 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(),ix);
-}
-
-static void
-VpInternalRound(Real *c,int ixDigit,U_LONG vPrev,U_LONG v)
-{
- int f = 0;
-
- if(VpLimitRound(c,ixDigit)) return;
- if(!v) return;
-
- v /= BASE1;
- switch(gfRoundMode) {
- case VP_ROUND_DOWN:
- break;
- case VP_ROUND_UP:
- if(v) f = 1;
- break;
- case VP_ROUND_HALF_UP:
- if(v >= 5) f = 1;
- break;
- case VP_ROUND_HALF_DOWN:
- 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 */
- if(v>5) f = 1;
- else if(v==5 && vPrev%2) f = 1;
- break;
- }
- if(f) {
- VpRdup(c,ixDigit); /* round up */
- VpNmlz(c);
- }
-}
-
-/*
- * Rounds up m(plus one to final digit of m).
- */
-static int
-VpRdup(Real *m,U_LONG ind_m)
-{
- U_LONG carry;
-
- if(!ind_m) ind_m = m->Prec;
-
- carry = 1;
- 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(carry > 0) { /* Overflow,count exponent and set fraction part be 1 */
- if(!AddExponent(m,(S_LONG)1)) return 0;
- m->Prec = m->frac[0] = 1;
- } else {
- VpNmlz(m);
- }
- return 1;
-}
-
-/*
- * y = x - fix(x)
- */
-VP_EXPORT void
-VpFrac(Real *y, Real *x)
-{
- U_LONG my, ind_y, ind_x;
-
- if(!VpHasVal(x)) {
- VpAsgn(y,x,1);
- goto Exit;
- }
-
- if(x->exponent > 0 && (U_LONG)x->exponent >= x->Prec) {
- VpSetZero(y,VpGetSign(x));
- goto Exit;
- } else if(x->exponent <= 0) {
- VpAsgn(y, x, 1);
- goto Exit;
- }
-
- y->Prec = x->Prec -(U_LONG) x->exponent;
- y->Prec = Min(y->Prec, y->MaxPrec);
- y->exponent = 0;
- VpSetSign(y,VpGetSign(x));
- ind_y = 0;
- my = y->Prec;
- ind_x = x->exponent;
- while(ind_y < my) {
- y->frac[ind_y] = x->frac[ind_x];
- ++ind_y;
- ++ind_x;
- }
- VpNmlz(y);
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpFrac y=%\n", y);
- VPrint(stdout, " x=%\n", x);
- }
-#endif /* _DEBUG */
- return;
-}
-
-/*
- * y = x ** n
- */
-VP_EXPORT int
-VpPower(Real *y, Real *x, S_INT n)
-{
- U_LONG s, ss;
- S_LONG sign;
- Real *w1 = NULL;
- Real *w2 = NULL;
-
- if(VpIsZero(x)) {
- if(n==0) {
- VpSetOne(y);
- goto Exit;
- }
- sign = VpGetSign(x);
- if(n<0) {
- n = -n;
- if(sign<0) sign = (n%2)?(-1):(1);
- VpSetInf (y,sign);
- } else {
- if(sign<0) sign = (n%2)?(-1):(1);
- VpSetZero(y,sign);
- }
- goto Exit;
- }
- if(!VpIsDef(x)) {
- VpSetNaN(y); /* Not sure !!! */
- goto Exit;
- }
-
- if((x->exponent == 1) &&(x->Prec == 1) &&(x->frac[0] == 1)) {
- /* abs(x) = 1 */
- VpSetOne(y);
- if(VpGetSign(x) > 0) goto Exit;
- if((n % 2) == 0) goto Exit;
- VpSetSign(y,-(S_INT)1);
- goto Exit;
- }
-
- if(n > 0) sign = 1;
- else if(n < 0) {
- sign = -1;
- n = -n;
- } else {
- VpSetOne(y);
- goto Exit;
- }
-
- /* Allocate working variables */
-
- w1 = VpAlloc((y->MaxPrec + 2) * BASE_FIG, "#0");
- w2 = VpAlloc((w1->MaxPrec * 2 + 1) * BASE_FIG, "#0");
- /* calculation start */
-
- VpAsgn(y, x, 1);
- --n;
- while(n > 0) {
- VpAsgn(w1, x, 1);
- s = 1;
-loop1: ss = s;
- s += s;
- if(s >(U_LONG) n) goto out_loop1;
- VpMult(w2, w1, w1);
- VpAsgn(w1, w2, 1);
- goto loop1;
-out_loop1:
- n -= ss;
- VpMult(w2, y, w1);
- VpAsgn(y, w2, 1);
- }
- if(sign < 0) {
- VpDivd(w1, w2, VpConstOne, y);
- VpAsgn(y, w1, 1);
- }
-
-Exit:
-#ifdef _DEBUG
- if(gfDebug) {
- VPrint(stdout, "VpPower y=%\n", y);
- VPrint(stdout, "VpPower x=%\n", x);
- printf(" n=%d\n", n);
- }
-#endif /* _DEBUG */
- VpFree(w2);
- VpFree(w1);
- return 1;
-}
-
-#ifdef _DEBUG
-int
-VpVarCheck(Real * v)
-/*
- * Checks the validity of the Real variable v.
- * [Input]
- * v ... Real *, variable to be checked.
- * [Returns]
- * 0 ... correct v.
- * other ... error
- */
-{
- U_LONG i;
-
- if(v->MaxPrec <= 0) {
- 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(=%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[%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;
- }
- }
- return 0;
-}
-#endif /* _DEBUG */
diff --git a/ext/bigdecimal/bigdecimal.def b/ext/bigdecimal/bigdecimal.def
deleted file mode 100644
index 8450e164e6..0000000000
--- a/ext/bigdecimal/bigdecimal.def
+++ /dev/null
@@ -1,2 +0,0 @@
-EXPORTS
-Init_bigdecimal
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
deleted file mode 100644
index 4f77feab00..0000000000
--- a/ext/bigdecimal/bigdecimal.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- *
- * Ruby BigDecimal(Variable decimal precision) extension library.
- *
- * 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 this BigDecimal distribution.
- *
- * NOTES:
- * 2003-03-28 V1.0 checked in.
- *
- */
-
-#ifndef ____BIG_DECIMAL__H____
-#define ____BIG_DECIMAL__H____
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/*
- * NaN & Infinity
- */
-#define SZ_NaN "NaN"
-#define SZ_INF "Infinity"
-#define SZ_PINF "+Infinity"
-#define SZ_NINF "-Infinity"
-
-/*
- * #define VP_EXPORT other than static to let VP_ routines
- * be called from outside of this module.
- */
-#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)
-#define VP_EXCEPTION_NaN ((unsigned short)0x0002)
-#define VP_EXCEPTION_UNDERFLOW ((unsigned short)0x0004)
-#define VP_EXCEPTION_OVERFLOW ((unsigned short)0x0001) /* 0x0008) */
-#define VP_EXCEPTION_ZERODIVIDE ((unsigned short)0x0001) /* 0x0010) */
-
-/* Following 2 exceptions cann't controlled by user */
-#define VP_EXCEPTION_OP ((unsigned short)0x0020)
-#define VP_EXCEPTION_MEMORY ((unsigned short)0x0040)
-
-/* Computation mode */
-#define VP_ROUND_MODE ((unsigned short)0x0100)
-#define VP_ROUND_UP 1
-#define VP_ROUND_DOWN 2
-#define VP_ROUND_HALF_UP 3
-#define VP_ROUND_HALF_DOWN 4
-#define VP_ROUND_CEIL 5
-#define VP_ROUND_FLOOR 6
-#define VP_ROUND_HALF_EVEN 7
-
-#define VP_SIGN_NaN 0 /* NaN */
-#define VP_SIGN_POSITIVE_ZERO 1 /* Positive zero */
-#define VP_SIGN_NEGATIVE_ZERO -1 /* Negative zero */
-#define VP_SIGN_POSITIVE_FINITE 2 /* Positive finite number */
-#define VP_SIGN_NEGATIVE_FINITE -2 /* Negative finite number */
-#define VP_SIGN_POSITIVE_INFINITE 3 /* Positive infinite number */
-#define VP_SIGN_NEGATIVE_INFINITE -3 /* Negative infinite number */
-
-/*
- * VP representation
- * r = 0.xxxxxxxxx *BASE**exponent
- */
-typedef struct {
- VALUE obj; /* Back pointer(VALUE) for Ruby object. */
- U_LONG MaxPrec; /* Maximum precision size */
- /* This is the actual size of pfrac[] */
- /*(frac[0] to frac[MaxPrec] are available). */
- U_LONG Prec; /* Current precision size. */
- /* This indicates how much the. */
- /* the array frac[] is actually used. */
- S_INT exponent;/* Exponent part. */
- short sign; /* Attributes of the value. */
- /*
- * ==0 : NaN
- * 1 : Positive zero
- * -1 : Negative zero
- * 2 : Positive number
- * -2 : Negative number
- * 3 : Positive infinite number
- * -3 : Negative infinite number
- */
- short flag; /* Not used in vp_routines,space for user. */
- U_LONG frac[1]; /* Pointer to array of fraction part. */
-} Real;
-
-/*
- * ------------------
- * EXPORTables.
- * ------------------
- */
-
-VP_EXPORT Real *
-VpNewRbClass(U_LONG mx,char *str,VALUE klass);
-
-VP_EXPORT Real *VpCreateRbObject(U_LONG mx,const char *str);
-
-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);
-VP_EXPORT double VpGetDoublePosInf(void);
-VP_EXPORT double VpGetDoubleNegInf(void);
-VP_EXPORT double VpGetDoubleNegZero(void);
-
-/* These 2 functions added at v1.1.7 */
-VP_EXPORT U_LONG VpGetPrecLimit(void);
-VP_EXPORT U_LONG VpSetPrecLimit(U_LONG n);
-
-/* Round mode */
-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);
-VP_EXPORT int VpIsNegDoubleZero(double v);
-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(U_LONG mx, const char *szVal);
-VP_EXPORT int VpAsgn(Real *c,Real *a,int isw);
-VP_EXPORT int VpAddSub(Real *c,Real *a,Real *b,int operation);
-VP_EXPORT int VpMult(Real *c,Real *a,Real *b);
-VP_EXPORT int VpDivd(Real *c,Real *r,Real *a,Real *b);
-VP_EXPORT int VpComp(Real *a,Real *b);
-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,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);
-VP_EXPORT void VpItoV(Real *m,S_INT ival);
-VP_EXPORT int VpSqrt(Real *y,Real *x);
-VP_EXPORT int VpActiveRound(Real *y,Real *x,int f,int il);
-VP_EXPORT int VpMidRound(Real *y, int f, int nf);
-VP_EXPORT int VpLeftRound(Real *y, int f, int 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);
-
-/*
- * ------------------
- * MACRO definitions.
- * ------------------
- */
-#define Abs(a) (((a)>= 0)?(a):(-(a)))
-#define Max(a, b) (((a)>(b))?(a):(b))
-#define Min(a, b) (((a)>(b))?(b):(a))
-
-#define VpMaxPrec(a) ((a)->MaxPrec)
-#define VpPrec(a) ((a)->Prec)
-#define VpGetFlag(a) ((a)->flag)
-
-/* Sign */
-
-/* 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((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)->frac[0]=(a)->exponent=(a)->Prec=1;(a)->sign=VP_SIGN_POSITIVE_FINITE;}
-
-/* ZEROs */
-#define VpIsPosZero(a) ((a)->sign==VP_SIGN_POSITIVE_ZERO)
-#define VpIsNegZero(a) ((a)->sign==VP_SIGN_NEGATIVE_ZERO)
-#define VpIsZero(a) (VpIsPosZero(a) || VpIsNegZero(a))
-#define VpSetPosZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_ZERO)
-#define VpSetNegZero(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_ZERO)
-#define VpSetZero(a,s) ( ((s)>0)?VpSetPosZero(a):VpSetNegZero(a) )
-
-/* NaN */
-#define VpIsNaN(a) ((a)->sign==VP_SIGN_NaN)
-#define VpSetNaN(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NaN)
-
-/* Infinity */
-#define VpIsPosInf(a) ((a)->sign==VP_SIGN_POSITIVE_INFINITE)
-#define VpIsNegInf(a) ((a)->sign==VP_SIGN_NEGATIVE_INFINITE)
-#define VpIsInf(a) (VpIsPosInf(a) || VpIsNegInf(a))
-#define VpIsDef(a) ( !(VpIsNaN(a)||VpIsInf(a)) )
-#define VpSetPosInf(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_POSITIVE_INFINITE)
-#define VpSetNegInf(a) ((a)->frac[0]=0,(a)->Prec=1,(a)->sign=VP_SIGN_NEGATIVE_INFINITE)
-#define VpSetInf(a,s) ( ((s)>0)?VpSetPosInf(a):VpSetNegInf(a) )
-#define VpHasVal(a) (a->frac[0])
-#define VpIsOne(a) ((a->Prec==1)&&(a->frac[0]==1)&&(a->exponent==1))
-#define VpExponent(a) (a->exponent)
-#ifdef _DEBUG
-int VpVarCheck(Real * v);
-VP_EXPORT int VPrint(FILE *fp,char *cntl_chr,Real *a);
-#endif /* _DEBUG */
-
-#if defined(__cplusplus)
-} /* extern "C" { */
-#endif
-#endif /* ____BIG_DECIMAL__H____ */
diff --git a/ext/bigdecimal/bigdecimal_en.html b/ext/bigdecimal/bigdecimal_en.html
deleted file mode 100644
index c2b86faef6..0000000000
--- a/ext/bigdecimal/bigdecimal_en.html
+++ /dev/null
@@ -1,796 +0,0 @@
-<!-- saved from url=(0022)http://internet.e-mail -->
-<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 merchantibility 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 gretaer 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(}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 occures.<BR>
-EXCEPTION_ALL controls the execution for any exception defined occures.<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 mthods 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 1D<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>
-prec 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 +,-1 when a is -, nil otherwise.
-
-</BLOCKQUOTE>
-<LI><B>finite?</B></LI><BLOCKQUOTE>
-a.finite? returns true when a is neither 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 correcponding 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 mthod,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 comfirm 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 becomes larger.
-BigDecimal has not yet been compiled and tested on 64 bit integer system.
-It will be very nice if anyone try to run BigDecimal on 64 bit system and
- inform me the results.
-When BASE is 10000,an element of the array frac[] can have vale 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 araay 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 cource,exact "0.1" is printed if the rouding 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 representaion.
-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 notatin 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 siginificant 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 momories are 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 dirmeter(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
deleted file mode 100644
index 37bbcbbb09..0000000000
--- a/ext/bigdecimal/bigdecimal_ja.html
+++ /dev/null
@@ -1,799 +0,0 @@
-<!-- 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(_ZpgCu)</H1>
-<DIV align="right"><A HREF="./bigdecimal_en.html">English</A></DIV><BR>
-BigDecimal IuWFNgwXNvg Ruby _
-vZ@\gCuB
-Ruby eURLQB
-<UL>
-<LI><A HREF="http://www.ruby-lang.org/ja/">http://www.ruby-lang.org/ja/</A>FRubyy[W</LI>
-<LI><A HREF="http://kahori.com/ruby/ring/">http://kahori.com/ruby/ring/</A>FRubyy[WH</LI>
-</UL>
-<hr>
-<H2></H2>
-<UL>
-<LI><A HREF="#INTRO"></LI>
-<LI><A HREF="#SPEC">gp@\bh</A></LI>
-<LI><A HREF="#UNDEF">AA[</A></LI>
-<LI><A HREF="#STRUCT">\</A></LI>
-<LI><A HREF="#BASE">2i10i</A></LI>
-<LI><A HREF="#PREC">vZx</A></LI>
-</UL>
-
-<HR>
-<A NAME="#INTRO">
-<H2></H2>
-Ruby Bignum NXASvZB
-AC_ZpNXBA
-C_ZpgCu BigDecimal B
-sEA
-<A HREF="mailto:shigeo@tinyforest.gr.jp">shigeo@tinyforest.gr.jp</A>
-mBsCBAW
-BAB
-\AB
-<BR><BR>
-vOARzzE\BAB
-zzE Ruby B README B
-
-<hr>
-<H2>CXg[</H2>
-BigDecimal Ruby V<A HREF="http://www.ruby-lang.org/ja/">Rubyy[W</A>_E[hB
-_E[hVACXg[sB
-Ruby CXg[A BigDecimal pB
-\[Xt@C
-bigdecimal.c,bigdecimal.h
-QB<BR>
-
-<hr>
-<A NAME="#SPEC">
-<H2>gp@\bh</H2>
-uRubyvOA
-<CODE><PRE>
-require 'bigdecimal'
-a=BigDecimal::new("0.123456789123456789")
-b=BigDecimal("123456.78912345678",40)
-c=a+b
-</PRE></CODE>
-<br>
-gpB
-
-<H3>\bh</H3>
-\bhp\B
-uLv BigDecimal xB
-A]TvZB
-ARQrbgVXePOiSvZB]AA
-uLvS{B
-<P>
-\bhOA(C ) Ruby \[X`
-BA
-<CODE><PRE>
-require "bigdecimal/math.rb"
-</PRE></CODE>
-Asin cos gpB
-gp@A math.rb eQB
-
-AFloat \bh util.rb T|[gB
-p
-<CODE><PRE>
-require "bigdecimal/util.rb"
-</PRE></CODE>
-B util.rb eQB
-
-<H4><U>NX\bh</U></H4>
-<UL>
-<LI><B>new</B></LI><BLOCKQUOTE>
-V BigDecimal IuWFNgB<BR>
-a=BigDecimal::new(s[,n]) <BR>
-a=BigDecimal(s[,n])<BR>
-s \lwB
-Xy[XBAfo_
-IB
-n KvLia LjwB
-n 0 An l s LB
-s L n n=0 B
-a L n lpB
-LZsB
-<CODE><PRE>
-BigDecimal("1") / BigDecimal("3") # => 0.3333333333 33E0
-BigDecimal("1",10) / BigDecimal("3",10) # => 0.3333333333 3333333333 33333333E0
-</PRE></CODE>
-AXZL n o[W
-X\B
-</BLOCKQUOTE>
-
-<LI><B>mode</B></LI><BLOCKQUOTE>
-f = BigDecimal.mode(s[,v])<BR>
-BigDecimalsBQA nil w
-lB<BR>
-gp@`B
-<P>
-<B>[O]</B><P>
-vZ(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 wB<BR>
-EXCEPTION_INFINITY (}Infinity)wB<BR>
-EXCEPTION_UNDERFLOW wA_[t[wB<BR>
-EXCEPTION_OVERFLOW wI[o[t[wB<BR>
-EXCEPTION_ZERODIVIDE [ZswB<BR>
-EXCEPTION_ALL A\SgpB<BR><BR>
-
-flag true AwOsB<BR>
-flag falseiftHgjAOsBvZB<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>
-lAlBulvA
-BigDecimal::EXCEPTION_NaNulv & [O
-EXCEPTION_NaNB
-
-<P>
-<B>[w]</B><P>
-vZrwB
-<BLOCKQUOTE>
-f = BigDecimal::mode(BigDecimal::ROUND_MODE,flag)
-</BLOCKQUOTE>
-`wB<BR>
-Aflag (CX^X\bh)wB
-<TABLE>
-<TR><TD>ROUND_UP</TD><TD>SB</TD></TR>
-<TR><TD>ROUND_DOWN</TD><TD>S(truncate)B</TD></TR>
-<TR><TD>ROUND_HALF_UP</TD><TD>l(ftHg)B</TD></TR>
-<TR><TD>ROUND_HALF_DOWN</TD><TD>ZB</TD></TR>
-<TR><TD>ROUND_HALF_EVEN</TD><TD>lZBTPJ(Banker's rounding)B</TD></TR>
-<TR><TD>ROUND_CEILING</TD><TD>lJ(ceil)B</TD></TR>
-<TR><TD>ROUND_FLOOR</TD><TD>lJ(floor)B</TD></TR>
-
-</TABLE>
-lw flag lB
-Q nil wAlB
-mode \bhu[UwB
-u BigDecimal::limit truncate/round/ceil/floorA
-add/sub/mult/div CX^X\bhgpB
-</BLOCKQUOTE>
-<LI><B>limit([n])</B></LI><BLOCKQUOTE>
-BigDecimalIuWFNgnB
-lOlBlftHglOAB
-n wA n nil AB<BR>
-vZsA
- limit \B BigDecimal.mode w
-sB
-ACX^X\bh (truncate/round/ceil/floor/add/sub/mult/div)
- limit DB<BR>
-mf = BigDecimal::limit(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>double_fig</B></LI><BLOCKQUOTE>
-Ruby Float NXLB
-<CODE><PRE>
- p BigDecimal::double_fig # ==> 20 (depends on the CPU etc.)
-</PRE></CODE>
-double_fig C vOB
-<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>
-gplB 32 rbgn10000B<BR>
-b = BigDecimal::BASE<BR>
-</BLOCKQUOTE>
-</UL>
-
-<H4><U>CX^X\bh</U></H4>
-<UL>
-<LI><B>+</B></LI><BLOCKQUOTE>
-Zic = a + bj<BR>
-c xu<A HREF="#PREC">vZx</A>vQB
-</BLOCKQUOTE>
-
-<LI><B>-</B></LI><BLOCKQUOTE>
-Zic = a - bjA]ic = -aj<BR>
-c xu<A HREF="#PREC">vZx</A>vQB
-
-</BLOCKQUOTE>
-<LI><B>*</B></LI><BLOCKQUOTE>
-Z(c = a * b)<BR>
-cx(ax)+(bx)xB<br>
-u<A HREF="#PREC">vZx</A>vQB
-
-</BLOCKQUOTE>
-<LI><B>/</B></LI><BLOCKQUOTE>
-Z(c = a / b)<BR>
-c xu<A HREF="#PREC">vZx</A>vQB
-
-</BLOCKQUOTE>
-
-<LI><B>add(b,n)</B></LI><BLOCKQUOTE>
-gpB<BR>
-c = a.add(b,n)<BR>
-c = a + b n vZB<BR>
-a + b x n BigDecimal.mode w@B<BR>
-n [ + B
-</BLOCKQUOTE>
-<LI><B>sub(b,n)</B></LI><BLOCKQUOTE>
-gpB<BR>
-c = a.sub(b,n)<BR>
-c = a - b n vZB<BR>
-a - b x n BigDecimal.mode w@B<BR>
-n [ - B
-
-</BLOCKQUOTE>
-<LI><B>mult(b,n)</B></LI><BLOCKQUOTE>
-gpB<BR>
-c = a.mult(b,n)<BR>
-c = a * b n vZB<BR>
-a * b x n BigDecimal.mode w@B<BR>
-n [ * B
-
-</BLOCKQUOTE>
-<LI><B>div(b[,n])</B></LI><BLOCKQUOTE>
-gpB<BR>
-c = a.div(b,n)<BR>
-c = a / b n vZB
-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 ljB
-<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 AvZAliBigDecimal ljB
-<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>
-
-NX\bh BigDecimal::mode(BigDecimal::ROUND_MODE,flag) w
-ROUND_MODE ]sB
-BigDecimal::mode(BigDecimal::ROUND_MODE,flag) wAA
-wu_liBigDecimal ljvB<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>
-QwABigDecimal#mode wAw@
-sB
-<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 ljB<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 IuWFNgB
-lKv split \bhp
-B
-</BLOCKQUOTE>
-<LI><B>to_s[(n)]</B></LI><BLOCKQUOTE>
-(ftHg "0.xxxxxEn" `jB
-<CODE><PRE>
-BigDecimal("1.23456").to_s # ==> "0.123456E1"
-</PRE></CODE>
- n wA_EA n
-B
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s(10) # ==> "0.1234567890 123456789E0"
-</PRE></CODE>
- n \wB
-<CODE><PRE>
-BigDecimal("0.1234567890123456789").to_s("10") # ==> "0.1234567890 123456789E0"
-</PRE></CODE>
- '+'i ' 'jtAlA '+'i ' 'jt
-iA '-' tBjB
-<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) wA
-\`XB
-<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>
-wlB
-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) zB
-
-</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>
-() Al(<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- -1AO 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 \AiNaN
-0AO+1-1jA
-i"xxxxxxx"jAi10jAXw n z
-B<BR>
-a=BigDecimal::new("3.14159265")<BR>
-f,x,y,z = a.split<BR>
-Af=+1Ax="314159265"Ay=10Az=1B<BR>
-]A<BR>
-s = "0."+x<BR>
-b = f*(s.to_f)*(y**z)<BR>
- Float B
-</BLOCKQUOTE>
-<LI><B>inspect</B></LI><BLOCKQUOTE>
-fobOogpB<BR>
-p a=BigDecimal::new("3.14",10)<BR>
-A[0x112344:'0.314E1',4(12)]oB
-16iIuWFNgAhXA '0.314E1' lA
-4L(\)A
-IuWFNgB
-</BLOCKQUOTE>
-<LI><B>**</B></LI><BLOCKQUOTE>
-a n vZBB<BR>
-c = a ** n<BR>
- c L a n {B
-</BLOCKQUOTE>
-<LI><B>power</B></LI><BLOCKQUOTE>
-** Aa n vZBB<BR>
-c = a.power(n)<BR>
- c L a n {B
-</BLOCKQUOTE>
-<LI><B>sqrt</B></LI><BLOCKQUOTE>
-aL n in j
-j[g@vZB<BR>
-c = a.sqrt(n)<BR>
-</BLOCKQUOTE>
-
-<LI><B>divmod,quo,modulo,%,remainder</B></LI><BLOCKQUOTE>
- Float e\bhQB
-</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 gpB
-<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 IuWFNgZpZqABigDecimal IuWFNg
-EIuWFNg(Kv) BigDecimal vZB
-]ABigDecimal IuWFNgOlEu
-Z\B<BR>
-AijlB
-l bigfloat.c
-u/* #define ENABLE_NUMERIC_STRING */vRgOA
-RpCACXg[KvB
-l^KvBlA
-P~G[B"10XX"POA"XXXX"O
-B<BR>
-<CODE><PRE>
- a = BigDecimal.E(20)
- c = a * "0.123456789123456789123456789" # BigDecimal vZ
-</PRE></CODE>
-\A"Infinity"A"+Infinity"A"-Infinity"A"NaN"
-gp(E)BAmode \bh false
-wOB
-<BR>
-ABigDecimalNX coerceiRuby{QjT|[gB
-]ABigDecimal IuWFNgEvB
-A Ruby C^v^dlAvZB<BR>
-<CODE><PRE>
- a = BigDecimal.E(20)
- c = "0.123456789123456789123456789" * a # G[
-</PRE></CODE>
-KvvAl
- String IuWFNgpVNXA
-NX coerce T|[gB
-
-<hr>
-<A NAME="#UNDEF">
-<H2>AA[</H2>
-uv\B
- +Infinityij -Infinityij
-\LB
- 1.0/0.0 [vZB
-<BR><BR>
-uv 0.0/0.0 Infinity-Infinity `
-vZB NaNiNot a Numberj\LB
-NaN vZS NaN B NaN A
-vB
-<BR><BR>
-[ +0.0 -0.0 BA+0.0==-0.0 true B
-<BR><BR>
-InfinityANaNA +0.0 -0.0 vZg
-GBlAvOs
-mFiA^
-mjB
-
-<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(\vffrac)B
-TOIAB<BR><BR>
- <_> = 0.xxxxxxxxx*BASE**n<BR><BR>
-Ax\ABASEiPOiPOjAnw\
-lBBASEAl\BAzTCY
-BBASEsAfobO
-lA10000iBASEVpInit()IvZjB
-A32rbgB64rbglB
-cOA64rbgeXgiA
-jB
-BASE10000Az(frac)evfS
-i[B<BR><BR>
-_\(Real)B
-<BR>
-<CODE><PRE>
- typedef struct {
- unsigned long MaxPrec; // x(frac[]zTCY)
- unsigned long Prec; // x(frac[]gpTCY)
- short sign; // `B
- // ==0 : NaN
- // 1 : +0
- // -1 : -0
- // 2 : l
- // -2 : l
- // 3 : +Infinity
- // -3 : -Infinity
- unsigned short flag; // etbO
- int exponent; // wl(*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
-gp@gpB
-
-<hr>
-<A NAME="#BASE">
-<H2>2i10i</H2>
-BigDecimal <_> = 0.xxxxxxxxx*10**n 10i`lB
-AvZ@_\A <_> = 0.bbbbbbbb*2**n
-2i`(x 0 9 Ab 0 1 )B
-BigDecimal 10i\`pB
-<H4>10ibg</H4>
-<DL>
-<DT>fobO
-<DD>AvOyBfrac[0]=1234Afrac[1]=5678Afrac[2]=4321A
-exponent=1Asign=2 l 1234.56784321 B
-
-<DT>10i\Llm\
-<DD>AvOS
-vZBAsl
-t@C file vlB
-<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]AKvB
-BAx10i\L
-Kilj "0.1" \BA
-m 0.1 B
-
-<DT>LLij
-<DD>0.1 \zvfi frac[0]=1 jB
-zvf10ilIBA_Z
-Bt 0.1 2i\2iL 0.1
-B
-</DL>
-
-<H3>10ifbg</H3>
-bgAfbgB
-A10i2i
-B
-TRs[^10i\A
-BigDecimal pvZAvZx
- BigDecimal gpKvB
-
-<H3>H</H3>
-vZ2iglB
-vZ@f[^A
-10iBAdouble vZ@
-\B
-BigDecimal [UB
-fobOAf[^
-bgB
-
-<hr>
-<A NAME="#PREC">
-<H2>vZx</H2>
-c = a op b vZ(op + - * /)
-B<BR><BR>
-PDZ(a L)+(b L)A
-Z(a L)+(b L)iA]TA
-j c VB
-ZAox c B
- c = 0.1+0.1*10**(-100) Ac xPOOx
-B
-<BR><BR>
-QD c = a op b vZsB<BR><BR>
-AZZ c Kuovx
-(BigDecimal.limit w)B
-Z(a L)+(b L)
- c Ac = 1.0/3.0 vZA
- c xvZB<BR><BR>
-Ac x a b c Kv
-[B
-<BR><BR>
-Fu+,-,*,/vxiLjwB
-xRg[ACX^X\bhgpB<BR>
-<UL>
-<LI>add,sub,mult,div</LI><BLOCKQUOTE>
-\bh()wB
-<CODE><PRE>
- BigDecimal("2").div(3,12) # 2.0/3.0 => 0.6666666666 67E0
-</PRE></CODE>
-</BLOCKQUOTE>
-<LI>truncate,round,ceil,floor</LI><BLOCKQUOTE>
-\bh_uwB
-<CODE><PRE>
- BigDecimal("6.66666666666666").round(12) # => 0.6666666666 667E1
-</PRE></CODE>
-</BLOCKQUOTE>
-</UL>
-<H3>xRg[</H3>
-x(L)Rg[ addAsubAmultAdiv \bh
-gpB
-~vZvOA
-wB
-<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/depend b/ext/bigdecimal/depend
deleted file mode 100644
index 402cae95dd..0000000000
--- a/ext/bigdecimal/depend
+++ /dev/null
@@ -1 +0,0 @@
-bigdecimal.o: bigdecimal.c bigdecimal.h $(hdrdir)/ruby.h
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
deleted file mode 100644
index a68a656044..0000000000
--- a/ext/bigdecimal/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('bigdecimal')
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
deleted file mode 100644
index d80eeab901..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# require 'bigdecimal/jacobian'
-#
-# Provides methods to compute the Jacobian matrix of a set of equations at a
-# point x. In the methods below:
-#
-# f is an Object which is used to compute the Jacobian matrix of the equations.
-# It must provide the following methods:
-#
-# f.values(x):: returns the values of all functions at x
-#
-# f.zero:: returns 0.0
-# f.one:: returns 1.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.
-#
-# x is the point at which to compute the Jacobian.
-#
-# fx is f.values(x).
-#
-module Jacobian
- #--
- def isEqual(a,b,zero=0.0,e=1.0e-8)
- aa = a.abs
- bb = b.abs
- if aa == zero && bb == zero then
- true
- else
- if ((a-b)/(aa+bb)).abs < e then
- true
- else
- false
- end
- end
- end
- #++
-
- # Computes the derivative of f[i] at x[i].
- # fx is the value of f at x.
- def dfdxi(f,fx,x,i)
- nRetry = 0
- n = x.size
- xSave = x[i]
- ok = 0
- ratio = f.ten*f.ten*f.ten
- dx = x[i].abs/ratio
- dx = fx[i].abs/ratio if isEqual(dx,f.zero,f.zero,f.eps)
- dx = f.one/f.ten if isEqual(dx,f.zero,f.zero,f.eps)
- until ok>0 do
- s = f.zero
- deriv = []
- if(nRetry>100) then
- raize "Singular Jacobian matrix. No change at x[" + i.to_s + "]"
- end
- dx = dx*f.two
- x[i] += dx
- fxNew = f.values(x)
- for j in 0...n do
- if !isEqual(fxNew[j],fx[j],f.zero,f.eps) then
- ok += 1
- deriv <<= (fxNew[j]-fx[j])/dx
- else
- deriv <<= f.zero
- end
- end
- x[i] = xSave
- end
- deriv
- end
-
- # Computes the Jacobian of f at x. fx is the value of f at x.
- def jacobian(f,fx,x)
- n = x.size
- dfdx = Array::new(n*n)
- for i in 0...n do
- df = dfdxi(f,fx,x,i)
- for j in 0...n do
- dfdx[j*n+i] = df[j]
- end
- end
- dfdx
- end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
deleted file mode 100644
index 8f4888725e..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Solves a*x = b for x, using LU decomposition.
-#
-module LUSolve
- # Performs LU decomposition of the n by n matrix a.
- def ludecomp(a,n,zero=0,one=1)
- prec = BigDecimal.limit(nil)
- ps = []
- scales = []
- for i in 0...n do # pick up largest(abs. val.) element in each row.
- ps <<= i
- nrmrow = zero
- ixn = i*n
- for j in 0...n do
- biggst = a[ixn+j].abs
- nrmrow = biggst if biggst>nrmrow
- end
- if nrmrow>zero then
- scales <<= one.div(nrmrow,prec)
- else
- raise "Singular matrix"
- end
- end
- n1 = n - 1
- for k in 0...n1 do # Gaussian elimination with partial pivoting.
- biggst = zero;
- for i in k...n do
- size = a[ps[i]*n+k].abs*scales[ps[i]]
- if size>biggst then
- biggst = size
- pividx = i
- end
- end
- raise "Singular matrix" if biggst<=zero
- if pividx!=k then
- j = ps[k]
- ps[k] = ps[pividx]
- ps[pividx] = j
- end
- pivot = a[ps[k]*n+k]
- for i in (k+1)...n do
- psin = ps[i]*n
- a[psin+k] = mult = a[psin+k].div(pivot,prec)
- if mult!=zero then
- pskn = ps[k]*n
- for j in (k+1)...n do
- a[psin+j] -= mult.mult(a[pskn+j],prec)
- end
- end
- end
- end
- raise "Singular matrix" if a[ps[n1]*n+n1] == zero
- ps
- end
-
- # Solves a*x = b for x, using LU decomposition.
- #
- # a is a matrix, b is a constant vector, x is the solution vector.
- #
- # ps is the pivot, a vector which indicates the permutation of rows performed
- # during LU decomposition.
- def lusolve(a,b,ps,zero=0.0)
- prec = BigDecimal.limit(nil)
- n = ps.size
- x = []
- for i in 0...n do
- dot = zero
- psin = ps[i]*n
- for j in 0...i do
- dot = a[psin+j].mult(x[j],prec) + dot
- end
- x <<= b[ps[i]] - dot
- end
- (n-1).downto(0) do |i|
- dot = zero
- psin = ps[i]*n
- for j in (i+1)...n do
- dot = a[psin+j].mult(x[j],prec) + dot
- end
- x[i] = (x[i]-dot).div(a[psin+i],prec)
- end
- x
- end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
deleted file mode 100644
index f3248a3c5c..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ /dev/null
@@ -1,235 +0,0 @@
-#
-#--
-# Contents:
-# sqrt(x, prec)
-# 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)
-#
-# where:
-# x ... BigDecimal number to be computed.
-# |x| must be small enough to get convergence.
-# prec ... Number of digits to be obtained.
-#++
-#
-# Provides mathematical functions.
-#
-# Example:
-#
-# require "bigdecimal"
-# require "bigdecimal/math"
-#
-# include BigMath
-#
-# a = BigDecimal((PI(100)/2).to_s)
-# puts sin(a,100) # -> 0.10000000000000000000......E1
-#
-module BigMath
-
- # Computes the square root of x to the specified number of digits of
- # precision.
- #
- # BigDecimal.new('2').sqrt(16).to_s
- # -> "0.14142135623730950488016887242096975E1"
- #
- def sqrt(x,prec)
- x.sqrt(prec)
- end
-
- # Computes the sine of x to the specified number of digits of precision.
- #
- # If x is infinite or NaN, returns NaN.
- def sin(x, prec)
- raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
- return BigDecimal("NaN") if x.infinite? || x.nan?
- n = prec + BigDecimal.double_fig
- one = BigDecimal("1")
- two = BigDecimal("2")
- x1 = x
- x2 = x.mult(x,n)
- sign = 1
- y = x
- d = y
- i = one
- z = one
- while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
- m = BigDecimal.double_fig if m < BigDecimal.double_fig
- sign = -sign
- x1 = x2.mult(x1,n)
- i += two
- z *= (i-one) * i
- d = sign * x1.div(z,m)
- y += d
- end
- y
- end
-
- # Computes the cosine of x to the specified number of digits of precision.
- #
- # If x is infinite or NaN, returns NaN.
- def cos(x, prec)
- raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
- return BigDecimal("NaN") if x.infinite? || x.nan?
- n = prec + BigDecimal.double_fig
- one = BigDecimal("1")
- two = BigDecimal("2")
- x1 = one
- x2 = x.mult(x,n)
- sign = 1
- y = one
- d = y
- i = BigDecimal("0")
- z = one
- while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
- m = BigDecimal.double_fig if m < BigDecimal.double_fig
- sign = -sign
- x1 = x2.mult(x1,n)
- i += two
- z *= (i-one) * i
- d = sign * x1.div(z,m)
- y += d
- end
- y
- end
-
- # Computes the arctangent of x to the specified number of digits of precision.
- #
- # If x is infinite or NaN, returns NaN.
- # Raises an argument error if x > 1.
- def atan(x, prec)
- raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
- return BigDecimal("NaN") if x.infinite? || x.nan?
- raise ArgumentError, "x.abs must be less than 1.0" if x.abs>=1
- n = prec + BigDecimal.double_fig
- y = x
- d = y
- t = x
- r = BigDecimal("3")
- x2 = x.mult(x,n)
- while d.nonzero? && ((m = n - (y.exponent - d.exponent).abs) > 0)
- m = BigDecimal.double_fig if m < BigDecimal.double_fig
- t = -t.mult(x2,n)
- d = t.div(r,m)
- y += d
- r += 2
- end
- 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")
- 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
- y
- 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
- 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
- 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
- n = prec + BigDecimal.double_fig
- zero = BigDecimal("0")
- one = BigDecimal("1")
- two = BigDecimal("2")
-
- m25 = BigDecimal("-0.04")
- m57121 = BigDecimal("-57121")
-
- pi = zero
-
- d = one
- k = one
- w = one
- t = BigDecimal("-80")
- while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
- m = BigDecimal.double_fig if m < BigDecimal.double_fig
- t = t*m25
- d = t.div(k,m)
- k = k+two
- pi = pi + d
- end
-
- d = one
- k = one
- w = one
- t = BigDecimal("956")
- while d.nonzero? && ((m = n - (pi.exponent - d.exponent).abs) > 0)
- m = BigDecimal.double_fig if m < BigDecimal.double_fig
- t = t.div(m57121,n)
- d = t.div(k,m)
- pi = pi + d
- k = k+two
- end
- pi
- end
-
- # Computes e (the base of natural logarithms) to the specified number of
- # digits of precision.
- def E(prec)
- raise ArgumentError, "Zero or negative precision for E" if prec <= 0
- n = prec + BigDecimal.double_fig
- one = BigDecimal("1")
- 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
- i += 1
- z *= i
- d = one.div(z,m)
- y += d
- end
- y
- end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
deleted file mode 100644
index 59ac0f7f04..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# newton.rb
-#
-# Solves the nonlinear algebraic equation system f = 0 by Newton's method.
-# This program is not dependent on BigDecimal.
-#
-# To call:
-# n = nlsolve(f,x)
-# where n is the number of iterations required,
-# x is the initial value vector
-# f is an Object which is used to compute the values of the equations to be solved.
-# It must provide the following methods:
-#
-# f.values(x):: returns the values of all functions at x
-#
-# f.zero:: returns 0.0
-# f.one:: returns 1.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.
-#
-# On exit, x is the solution vector.
-#
-require "bigdecimal/ludcmp"
-require "bigdecimal/jacobian"
-
-module Newton
- include LUSolve
- include Jacobian
-
- def norm(fv,zero=0.0)
- s = zero
- n = fv.size
- for i in 0...n do
- s += fv[i]*fv[i]
- end
- s
- end
-
- def nlsolve(f,x)
- nRetry = 0
- n = x.size
-
- f0 = f.values(x)
- zero = f.zero
- one = f.one
- two = f.two
- p5 = one/two
- d = norm(f0,zero)
- minfact = f.ten*f.ten*f.ten
- minfact = one/minfact
- e = f.eps
- while d >= e do
- nRetry += 1
- # Not yet converged. => Compute Jacobian matrix
- dfdx = jacobian(f,f0,x)
- # Solve dfdx*dx = -f0 to estimate dx
- dx = lusolve(dfdx,f0,ludecomp(dfdx,n,zero,one),zero)
- fact = two
- xs = x.dup
- begin
- fact *= p5
- if fact < minfact then
- raise "Failed to reduce function values."
- end
- for i in 0...n do
- x[i] = xs[i] - dx[i]*fact
- end
- f0 = f.values(x)
- dn = norm(f0,zero)
- end while(dn>=d)
- d = dn
- end
- nRetry
- end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
deleted file mode 100644
index 09e926acd5..0000000000
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# 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
- def to_d
- BigDecimal(self.to_s)
- end
-end
-
-class String
- def to_d
- BigDecimal(self)
- end
-end
-
-class BigDecimal < Numeric
- # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
- # This method is deprecated; use BigDecimal#to_s("F") instead.
- def to_digits
- if self.nan? || self.infinite? || self.zero?
- self.to_s
- else
- i = self.to_i.to_s
- s,f,y,z = self.frac.split
- i + "." + ("0"*(-z)) + f
- end
- end
-
- # Converts a BigDecimal to a Rational.
- def to_r
- sign,digits,base,power = self.split
- numerator = sign*digits.to_i
- denomi_power = power - digits.size # base is always 10
- if denomi_power < 0
- Rational(numerator,base ** (-denomi_power))
- else
- Rational(numerator * (base ** denomi_power),1)
- end
- end
-end
-
-class Rational < Numeric
- # 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
- BigDecimal.new(num).div(self.denominator,nFig)
- end
-end
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
deleted file mode 100644
index 88a62ffa71..0000000000
--- a/ext/bigdecimal/sample/linear.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-# linear.rb
-#
-# Solves linear equation system(A*x = b) by LU decomposition method.
-# where A is a coefficient matrix,x is an answer vector,b is a constant vector.
-#
-# USAGE:
-# ruby linear.rb [input file solved]
-#
-
-require "bigdecimal"
-require "bigdecimal/ludcmp"
-
-#
-# NOTE:
-# Change following BigDecimal::limit() if needed.
-BigDecimal::limit(100)
-#
-
-include LUSolve
-def rd_order(na)
- printf("Number of equations ?") if(na <= 0)
- n = ARGF.gets().to_i
-end
-
-na = ARGV.size
-zero = BigDecimal::new("0.0")
-one = BigDecimal::new("1.0")
-
-while (n=rd_order(na))>0
- a = []
- as= []
- b = []
- if na <= 0
- # Read data from console.
- printf("\nEnter coefficient matrix element A[i,j]\n");
- for i in 0...n do
- for j in 0...n do
- printf("A[%d,%d]? ",i,j); s = ARGF.gets
- a << BigDecimal::new(s);
- as << BigDecimal::new(s);
- end
- printf("Contatant vector element b[%d] ? ",i); b << BigDecimal::new(ARGF.gets);
- end
- else
- # Read data from specified file.
- printf("Coefficient matrix and constant vector.\n");
- for i in 0...n do
- s = ARGF.gets
- printf("%d) %s",i,s)
- s = s.split
- for j in 0...n do
- a << BigDecimal::new(s[j]);
- as << BigDecimal::new(s[j]);
- end
- b << BigDecimal::new(s[n]);
- end
- end
- x = lusolve(a,b,ludecomp(a,n,zero,one),zero)
- printf("Answer(x[i] & (A*x-b)[i]) follows\n")
- for i in 0...n do
- printf("x[%d]=%s ",i,x[i].to_s)
- s = zero
- for j in 0...n do
- s = s + as[i*n+j]*x[j]
- end
- printf(" & %s\n",(s-b[i]).to_s)
- end
-end
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
deleted file mode 100644
index 7f729e6aaa..0000000000
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-# nlsolve.rb
-# An example for solving nonlinear algebraic equation system.
-#
-
-require "bigdecimal"
-require "bigdecimal/newton"
-include Newton
-
-class Function
- def initialize()
- @zero = BigDecimal::new("0.0")
- @one = BigDecimal::new("1.0")
- @two = BigDecimal::new("2.0")
- @ten = BigDecimal::new("10.0")
- @eps = BigDecimal::new("1.0e-16")
- end
- def zero;@zero;end
- def one ;@one ;end
- def two ;@two ;end
- def ten ;@ten ;end
- def eps ;@eps ;end
- def values(x) # <= defines functions solved
- f = []
- f1 = x[0]*x[0] + x[1]*x[1] - @two # f1 = x**2 + y**2 - 2 => 0
- f2 = x[0] - x[1] # f2 = x - y => 0
- f <<= f1
- f <<= f2
- f
- end
-end
- f = BigDecimal::limit(100)
- f = Function.new
- x = [f.zero,f.zero] # Initial values
- n = nlsolve(f,x)
- p x
diff --git a/ext/bigdecimal/sample/pi.rb b/ext/bigdecimal/sample/pi.rb
deleted file mode 100644
index 2f7dd27d60..0000000000
--- a/ext/bigdecimal/sample/pi.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/local/bin/ruby
-
-#
-# pi.rb
-#
-# Calculates 3.1415.... (the number of times that a circle's diameter
-# will fit around the circle) using J. Machin's formula.
-#
-
-require "bigdecimal"
-require "bigdecimal/math.rb"
-
-include BigMath
-
-if ARGV.size == 1
- print "PI("+ARGV[0]+"):\n"
- p PI(ARGV[0].to_i)
-else
- print "TRY: ruby pi.rb 1000 \n"
-end
diff --git a/ext/configsub.rb b/ext/configsub.rb
new file mode 100644
index 0000000000..315cdaf868
--- /dev/null
+++ b/ext/configsub.rb
@@ -0,0 +1,32 @@
+#!./miniruby -ps
+
+BEGIN {
+ CONFIG = {}
+
+ VERSION.scan(/(\d+)\.(\d+)\.(\d+)/) do
+ # overridden if config.status has version
+ CONFIG['MAJOR'] = $1
+ CONFIG['MINOR'] = $2
+ CONFIG['TEENY'] = $3
+ end
+
+ File.foreach($config || "config.status") do |$_|
+ next if /^#/
+ if /^s%@(\w+)@%(.*)%g/
+ name = $1
+ val = $2 || ""
+ next if /^(INSTALL|DEFS|configure_input|srcdir)$/ =~ name
+ val.gsub!(/\$\{([^{}]+)\}/) { "$(#{$1})" }
+ CONFIG[name] = val
+ end
+ end
+
+ CONFIG['top_srcdir'] = File.expand_path($srcdir || ".")
+ CONFIG['RUBY_INSTALL_NAME'] = $install_name if $install_name
+ CONFIG['RUBY_SO_NAME'] = $so_name if $so_name
+ $defout = open($output, 'w') if $output
+}
+
+gsub!(/@(\w+)@/) {CONFIG[$1] || $&}
+
+# vi:set sw=2:
diff --git a/ext/curses/.cvsignore b/ext/curses/.cvsignore
index 4088712231..f3c7a7c5da 100644
--- a/ext/curses/.cvsignore
+++ b/ext/curses/.cvsignore
@@ -1,3 +1 @@
Makefile
-mkmf.log
-*.def
diff --git a/ext/curses/MANIFEST b/ext/curses/MANIFEST
new file mode 100644
index 0000000000..e1a25d962d
--- /dev/null
+++ b/ext/curses/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+curses.c
+depend
+extconf.rb
+hello.rb
+rain.rb
+view.rb
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 9c51a2127f..4a8c46f483 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -1,93 +1,62 @@
-/* -*- C -*-
- * $Id$
- *
+/*
* ext/curses/curses.c
*
* by MAEDA Shugo (ender@pic-internet.or.jp)
- * modified by Yukihiro Matsumoto (matz@netlab.co.jp),
- * Toki Yoshinori,
- * Hitoshi Takahashi,
- * and Takaaki Tateishi (ttate@kt.jaist.ac.jp)
- *
- * maintainers:
- * - Takaaki Tateishi (ttate@kt.jaist.ac.jp)
+ * modified by Yukihiro Matsumoto (matz@netlab.co.jp)
*/
-#include "ruby.h"
-#include "rubyio.h"
-
-#if defined(HAVE_NCURSES_H)
+#ifdef HAVE_NCURSES_H
# include <ncurses.h>
-#elif defined(HAVE_NCURSES_CURSES_H)
-# include <ncurses/curses.h>
-#elif defined(HAVE_CURSES_COLR_CURSES_H)
-# ifdef HAVE_STDARG_PROTOTYPES
-# include <stdarg.h>
-# else
-# include <varargs.h>
-# endif
-# include <curses_colr/curses.h>
#else
-# include <curses.h>
-# if defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)
-# if !defined(_maxx)
-# define _maxx maxx
+# ifdef HAVE_NCURSES_CURSES_H
+# include <ncurses/curses.h>
+#else
+# ifdef HAVE_CURSES_COLR_CURSES_H
+# include <varargs.h>
+# include <curses_colr/curses.h>
+# else
+# include <curses.h>
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__) ) && !defined(_maxx)
+# define _maxx maxx
# endif
-# if !defined(_maxy)
-# define _maxy maxy
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)) && !defined(_maxy)
+# define _maxy maxy
# endif
-# if !defined(_begx)
-# define _begx begx
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)) && !defined(_begx)
+# define _begx begx
# endif
-# if !defined(_begy)
-# define _begy begy
+# if (defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)) && !defined(_begy)
+# define _begy begy
# endif
# endif
#endif
-
-#ifdef HAVE_INIT_COLOR
-# define USE_COLOR 1
-#endif
-
-/* supports only ncurses mouse routines */
-#ifdef NCURSES_MOUSE_VERSION
-# define USE_MOUSE 1
#endif
-#define NUM2CH NUM2LONG
-#define CH2FIX LONG2FIX
+#include "stdio.h"
+#include "ruby.h"
+#include "rubyio.h"
static VALUE mCurses;
-static VALUE mKey;
static VALUE cWindow;
-#ifdef USE_MOUSE
-static VALUE cMouseEvent;
-#endif
-static VALUE rb_stdscr;
+VALUE rb_stdscr;
struct windata {
WINDOW *window;
};
-#define CHECK(c) c
-
-static VALUE window_attroff();
-static VALUE window_attron();
-static VALUE window_attrset();
-
static void
no_window()
{
rb_raise(rb_eRuntimeError, "already closed window");
}
-#define GetWINDOW(obj, winp) do {\
- if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
- rb_raise(rb_eSecurityError, "Insecure: operation on untainted window");\
+#define GetWINDOW(obj, winp) {\
Data_Get_Struct(obj, struct windata, winp);\
if (winp->window == 0) no_window();\
-} while (0)
+}
+
+#define CHECK(c) c
static void
free_window(winp)
@@ -110,8 +79,7 @@ prep_window(class, window)
rb_raise(rb_eRuntimeError, "failed to create window");
}
- obj = rb_obj_alloc(class);
- Data_Get_Struct(obj, struct windata, winp);
+ obj = Data_Make_Struct(class, struct windata, 0, free_window, winp);
winp->window = window;
return obj;
@@ -123,19 +91,22 @@ prep_window(class, window)
static VALUE
curses_init_screen()
{
- rb_secure(4);
- if (rb_stdscr) return rb_stdscr;
initscr();
if (stdscr == 0) {
- rb_raise(rb_eRuntimeError, "can't initialize curses");
+ rb_raise(rb_eRuntimeError, "cannot initialize curses");
}
clear();
rb_stdscr = prep_window(cWindow, stdscr);
- return rb_stdscr;
+ return Qnil;
}
/* def stdscr */
-#define curses_stdscr curses_init_screen
+static VALUE
+curses_stdscr()
+{
+ if (rb_stdscr == 0) curses_init_screen();
+ return rb_stdscr;
+}
/* def close_screen */
static VALUE
@@ -145,12 +116,11 @@ curses_close_screen()
if (!isendwin())
#endif
endwin();
- rb_stdscr = 0;
return Qnil;
}
static void
-curses_finalize(VALUE dummy)
+curses_finalize()
{
if (stdscr
#ifdef HAVE_ISENDWIN
@@ -158,8 +128,6 @@ curses_finalize(VALUE dummy)
#endif
)
endwin();
- rb_stdscr = 0;
- rb_gc_unregister_address(&rb_stdscr);
}
/* def closed? */
@@ -181,26 +149,15 @@ static VALUE
curses_clear(obj)
VALUE obj;
{
- curses_stdscr();
wclear(stdscr);
return Qnil;
}
-/* def clrtoeol */
-static VALUE
-curses_clrtoeol()
-{
- curses_stdscr();
- clrtoeol();
- return Qnil;
-}
-
/* def refresh */
static VALUE
curses_refresh(obj)
VALUE obj;
{
- curses_stdscr();
refresh();
return Qnil;
}
@@ -210,7 +167,6 @@ static VALUE
curses_doupdate(obj)
VALUE obj;
{
- curses_stdscr();
#ifdef HAVE_DOUPDATE
doupdate();
#else
@@ -224,7 +180,6 @@ static VALUE
curses_echo(obj)
VALUE obj;
{
- curses_stdscr();
echo();
return Qnil;
}
@@ -234,7 +189,6 @@ static VALUE
curses_noecho(obj)
VALUE obj;
{
- curses_stdscr();
noecho();
return Qnil;
}
@@ -244,7 +198,6 @@ static VALUE
curses_raw(obj)
VALUE obj;
{
- curses_stdscr();
raw();
return Qnil;
}
@@ -254,7 +207,6 @@ static VALUE
curses_noraw(obj)
VALUE obj;
{
- curses_stdscr();
noraw();
return Qnil;
}
@@ -264,7 +216,6 @@ static VALUE
curses_cbreak(obj)
VALUE obj;
{
- curses_stdscr();
cbreak();
return Qnil;
}
@@ -274,7 +225,6 @@ static VALUE
curses_nocbreak(obj)
VALUE obj;
{
- curses_stdscr();
nocbreak();
return Qnil;
}
@@ -284,7 +234,6 @@ static VALUE
curses_nl(obj)
VALUE obj;
{
- curses_stdscr();
nl();
return Qnil;
}
@@ -294,7 +243,6 @@ static VALUE
curses_nonl(obj)
VALUE obj;
{
- curses_stdscr();
nonl();
return Qnil;
}
@@ -305,7 +253,6 @@ curses_beep(obj)
VALUE obj;
{
#ifdef HAVE_BEEP
- curses_stdscr();
beep();
#endif
return Qnil;
@@ -317,7 +264,6 @@ curses_flash(obj)
VALUE obj;
{
#ifdef HAVE_FLASH
- curses_stdscr();
flash();
#endif
return Qnil;
@@ -330,7 +276,6 @@ curses_ungetch(obj, ch)
VALUE ch;
{
#ifdef HAVE_UNGETCH
- curses_stdscr();
ungetch(NUM2INT(ch));
#else
rb_notimplement();
@@ -345,7 +290,6 @@ curses_setpos(obj, y, x)
VALUE y;
VALUE x;
{
- curses_stdscr();
move(NUM2INT(y), NUM2INT(x));
return Qnil;
}
@@ -373,8 +317,7 @@ static VALUE
curses_inch(obj)
VALUE obj;
{
- curses_stdscr();
- return CH2FIX(inch());
+ return CHR2FIX(inch());
}
/* def addch(ch) */
@@ -383,8 +326,7 @@ curses_addch(obj, ch)
VALUE obj;
VALUE ch;
{
- curses_stdscr();
- addch(NUM2CH(ch));
+ addch(NUM2CHR(ch));
return Qnil;
}
@@ -394,8 +336,7 @@ curses_insch(obj, ch)
VALUE obj;
VALUE ch;
{
- curses_stdscr();
- insch(NUM2CH(ch));
+ insch(NUM2CHR(ch));
return Qnil;
}
@@ -405,7 +346,6 @@ curses_addstr(obj, str)
VALUE obj;
VALUE str;
{
- curses_stdscr();
if (!NIL_P(str)) {
addstr(STR2CSTR(str));
}
@@ -418,8 +358,7 @@ curses_getch(obj)
VALUE obj;
{
rb_read_check(stdin);
- curses_stdscr();
- return UINT2NUM(getch());
+ return CHR2FIX(getch());
}
/* def getstr */
@@ -430,11 +369,7 @@ curses_getstr(obj)
char rtn[1024]; /* This should be big enough.. I hope */
rb_read_check(stdin);
-#if defined(HAVE_GETNSTR)
- getnstr(rtn,1023);
-#else
getstr(rtn);
-#endif
return rb_tainted_str_new2(rtn);
}
@@ -452,43 +387,12 @@ static VALUE
curses_deleteln(obj)
VALUE obj;
{
-#if defined(HAVE_DELETELN) || defined(deleteln)
+#ifdef HAVE_DELETELN
deleteln();
#endif
return Qnil;
}
-/* def insertln */
-static VALUE
-curses_insertln(obj)
- VALUE obj;
-{
-#if defined(HAVE_INSERTLN) || defined(insertln)
- insertln();
-#endif
- return Qnil;
-}
-
-/* def keyname */
-static VALUE
-curses_keyname(obj, c)
- VALUE obj;
- VALUE c;
-{
-#ifdef HAVE_KEYNAME
- const char *name;
-
- name = keyname(NUM2INT(c));
- if (name) {
- return rb_str_new2(name);
- } else {
- return Qnil;
- }
-#else
- return Qnil;
-#endif
-}
-
static VALUE
curses_lines()
{
@@ -501,315 +405,48 @@ curses_cols()
return INT2FIX(COLS);
}
-static VALUE
-curses_curs_set(VALUE obj, VALUE visibility)
-{
-#ifdef HAVE_CURS_SET
- int n;
- return (n = curs_set(NUM2INT(visibility)) != ERR) ? INT2FIX(n) : Qnil;
-#else
- return Qnil;
-#endif
-}
-
-static VALUE
-curses_scrl(VALUE obj, VALUE n)
-{
- /* may have to raise exception on ERR */
-#ifdef HAVE_SCRL
- return (scrl(NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-static VALUE
-curses_setscrreg(VALUE obj, VALUE top, VALUE bottom)
-{
- /* may have to raise exception on ERR */
-#ifdef HAVE_SETSCRREG
- return (setscrreg(NUM2INT(top), NUM2INT(bottom)) == OK) ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-static VALUE
-curses_attroff(VALUE obj, VALUE attrs)
-{
- return window_attroff(rb_stdscr,attrs);
- /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-static VALUE
-curses_attron(VALUE obj, VALUE attrs)
-{
- return window_attron(rb_stdscr,attrs);
- /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-static VALUE
-curses_attrset(VALUE obj, VALUE attrs)
-{
- return window_attrset(rb_stdscr,attrs);
- /* return INT2FIX(attroff(NUM2INT(attrs))); */
-}
-
-static VALUE
-curses_bkgdset(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_BKGDSET
- bkgdset(NUM2CH(ch));
-#endif
- return Qnil;
-}
-
-static VALUE
-curses_bkgd(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_BKGD
- return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-static VALUE
-curses_resizeterm(VALUE obj, VALUE lin, VALUE col)
-{
-#if defined(HAVE_RESIZETERM)
- return (resizeterm(NUM2INT(lin),NUM2INT(col)) == OK) ? Qtrue : Qfalse;
-#else
- return Qnil;
-#endif
-}
-
-#ifdef USE_COLOR
-static VALUE
-curses_start_color(VALUE obj)
-{
- /* may have to raise exception on ERR */
- return (start_color() == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_init_pair(VALUE obj, VALUE pair, VALUE f, VALUE b)
-{
- /* may have to raise exception on ERR */
- return (init_pair(NUM2INT(pair),NUM2INT(f),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_init_color(VALUE obj, VALUE color, VALUE r, VALUE g, VALUE b)
-{
- /* may have to raise exception on ERR */
- return (init_color(NUM2INT(color),NUM2INT(r),
- NUM2INT(g),NUM2INT(b)) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_has_colors(VALUE obj)
-{
- return has_colors() ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_can_change_color(VALUE obj)
-{
- return can_change_color() ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_color_content(VALUE obj, VALUE color)
-{
- short r,g,b;
-
- color_content(NUM2INT(color),&r,&g,&b);
- return rb_ary_new3(3,INT2FIX(r),INT2FIX(g),INT2FIX(b));
-}
-
-static VALUE
-curses_pair_content(VALUE obj, VALUE pair)
-{
- short f,b;
-
- pair_content(NUM2INT(pair),&f,&b);
- return rb_ary_new3(2,INT2FIX(f),INT2FIX(b));
-}
-
-static VALUE
-curses_color_pair(VALUE obj, VALUE attrs)
-{
- return INT2FIX(COLOR_PAIR(NUM2INT(attrs)));
-}
-
-static VALUE
-curses_pair_number(VALUE obj, VALUE attrs)
-{
- return INT2FIX(PAIR_NUMBER(NUM2INT(attrs)));
-}
-#endif /* USE_COLOR */
-
-#ifdef USE_MOUSE
-struct mousedata {
- MEVENT *mevent;
-};
-
-static void
-no_mevent()
-{
- rb_raise(rb_eRuntimeError, "no such mouse event");
-}
-
-#define GetMOUSE(obj, data) do {\
- if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)\
- rb_raise(rb_eSecurityError, "Insecure: operation on untainted mouse");\
- Data_Get_Struct(obj, struct mousedata, data);\
- if (data->mevent == 0) no_mevent();\
-} while (0)
-
-static void
-curses_mousedata_free(struct mousedata *mdata)
-{
- if (mdata->mevent)
- free(mdata->mevent);
-}
-
-static VALUE
-curses_getmouse(VALUE obj)
-{
- struct mousedata *mdata;
- VALUE val;
-
- val = Data_Make_Struct(cMouseEvent,struct mousedata,
- 0,curses_mousedata_free,mdata);
- mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
- return (getmouse(mdata->mevent) == OK) ? val : Qnil;
-}
-
-static VALUE
-curses_ungetmouse(VALUE obj, VALUE mevent)
-{
- struct mousedata *mdata;
-
- GetMOUSE(mevent,mdata);
- return (ungetmouse(mdata->mevent) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_mouseinterval(VALUE obj, VALUE interval)
-{
- return mouseinterval(NUM2INT(interval)) ? Qtrue : Qfalse;
-}
-
-static VALUE
-curses_mousemask(VALUE obj, VALUE mask)
-{
- return INT2NUM(mousemask(NUM2UINT(mask),NULL));
-}
-
-#define DEFINE_MOUSE_GET_MEMBER(func_name,mem) \
-static VALUE func_name (VALUE mouse) \
-{ \
- struct mousedata *mdata; \
- GetMOUSE(mouse, mdata); \
- return (UINT2NUM(mdata->mevent -> mem)); \
-}
-
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_id, id)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_x, x)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_y, y)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_z, z)
-DEFINE_MOUSE_GET_MEMBER(curs_mouse_bstate, bstate)
-#undef define_curs_mouse_member
-#endif /* USE_MOUSE */
-
-static VALUE
-curses_timeout(VALUE obj, VALUE delay)
-{
-#ifdef HAVE_TIMEOUT
- timeout(NUM2INT(delay));
- return Qnil;
-#else
- rb_notimplement();
-#endif
-}
-
-static VALUE
-curses_def_prog_mode(VALUE obj)
-{
-#ifdef HAVE_DEF_PROG_MODE
- return def_prog_mode() == OK ? Qtrue : Qfalse;
-#else
- rb_notimplement();
-#endif
-}
-
-static VALUE
-curses_reset_prog_mode(VALUE obj)
-{
-#ifdef HAVE_RESET_PROG_MODE
- return reset_prog_mode() == OK ? Qtrue : Qfalse;
-#else
- rb_notimplement();
-#endif
-}
-
/*-------------------------- class Window --------------------------*/
-/* def self.allocate */
-static VALUE
-window_s_allocate(VALUE class)
-{
- struct windata *winp;
-
- return Data_Make_Struct(class, struct windata, 0, free_window, winp);
-}
-
-/* def initialize(h, w, top, left) */
+/* def new(h, w, top, left) */
static VALUE
-window_initialize(obj, h, w, top, left)
- VALUE obj;
+window_s_new(class, h, w, top, left)
+ VALUE class;
VALUE h;
VALUE w;
VALUE top;
VALUE left;
{
- struct windata *winp;
+ VALUE win;
WINDOW *window;
-
- rb_secure(4);
- curses_init_screen();
- Data_Get_Struct(obj, struct windata, winp);
- if (winp->window) delwin(winp->window);
+ VALUE args[4];
+
window = newwin(NUM2INT(h), NUM2INT(w), NUM2INT(top), NUM2INT(left));
wclear(window);
- winp->window = window;
+ win = prep_window(class, window);
+ args[0] = h; args[1] = w; args[2] = top; args[3] = left;
- return obj;
+ return win;
}
-/* def subwin(height, width, top, left) */
+/* def subwin(h, w, top, left) */
static VALUE
-window_subwin(obj, height, width, top, left)
+window_subwin(obj, h, w, top, left)
VALUE obj;
- VALUE height;
- VALUE width;
+ VALUE h;
+ VALUE w;
VALUE top;
VALUE left;
{
struct windata *winp;
WINDOW *window;
VALUE win;
- int h, w, t, l;
+ VALUE args[4];
- h = NUM2INT(height);
- w = NUM2INT(width);
- t = NUM2INT(top);
- l = NUM2INT(left);
GetWINDOW(obj, winp);
- window = subwin(winp->window, h, w, t, l);
- win = prep_window(rb_obj_class(obj), window);
+ window = subwin(winp->window, NUM2INT(h), NUM2INT(w),
+ NUM2INT(top), NUM2INT(left));
+ win = prep_window(cWindow, window);
+ args[0] = h; args[1] = w; args[2] = top; args[3] = left;
return win;
}
@@ -841,19 +478,6 @@ window_clear(obj)
return Qnil;
}
-/* def clrtoeol */
-static VALUE
-window_clrtoeol(obj)
- VALUE obj;
-{
- struct windata *winp;
-
- GetWINDOW(obj, winp);
- wclrtoeol(winp->window);
-
- return Qnil;
-}
-
/* def refresh */
static VALUE
window_refresh(obj)
@@ -867,23 +491,22 @@ window_refresh(obj)
return Qnil;
}
-/* def noutrefresh */
+/* def box(vert, hor) */
static VALUE
-window_noutrefresh(obj)
+window_box(obj, vert, hor)
VALUE obj;
+ VALUE vert;
+ VALUE hor;
{
- struct windata *winp;
-
+ struct windata *winp;
+
GetWINDOW(obj, winp);
-#ifdef HAVE_DOUPDATE
- wnoutrefresh(winp->window);
-#else
- wrefresh(winp->window);
-#endif
-
+ box(winp->window, NUM2CHR(vert), NUM2CHR(hor));
+
return Qnil;
}
+
/* def move(y, x) */
static VALUE
window_move(obj, y, x)
@@ -945,19 +568,19 @@ window_maxy(obj)
VALUE obj;
{
struct windata *winp;
+ int x, y;
GetWINDOW(obj, winp);
-#if defined(getmaxy)
+#ifdef getmaxy
return INT2FIX(getmaxy(winp->window));
-#elif defined(getmaxyx)
- {
- int x, y;
- getmaxyx(winp->window, y, x);
- return INT2FIX(y);
- }
+#else
+#ifdef getmaxyx
+ getmaxyx(winp->window, y, x);
+ return INT2FIX(y);
#else
return INT2FIX(winp->window->_maxy+1);
#endif
+#endif
}
/* def maxx */
@@ -966,19 +589,19 @@ window_maxx(obj)
VALUE obj;
{
struct windata *winp;
+ int x, y;
GetWINDOW(obj, winp);
-#if defined(getmaxx)
+#ifdef getmaxx
return INT2FIX(getmaxx(winp->window));
-#elif defined(getmaxyx)
- {
- int x, y;
- getmaxyx(winp->window, y, x);
- return INT2FIX(x);
- }
+#else
+#ifdef getmaxyx
+ getmaxyx(winp->window, y, x);
+ return INT2FIX(x);
#else
return INT2FIX(winp->window->_maxx+1);
#endif
+#endif
}
/* def begy */
@@ -1015,42 +638,6 @@ window_begx(obj)
#endif
}
-/* def box(vert, hor) */
-static VALUE
-window_box(argc, argv, self)
- int argc;
- VALUE argv[], self;
-{
- struct windata *winp;
- VALUE vert, hor, corn;
-
- rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
-
- GetWINDOW(self, winp);
- box(winp->window, NUM2CH(vert), NUM2CH(hor));
-
- if (!NIL_P(corn)) {
- int cur_x, cur_y, x, y;
- chtype c;
-
- c = NUM2CH(corn);
- getyx(winp->window, cur_y, cur_x);
- x = NUM2INT(window_maxx(self)) - 1;
- y = NUM2INT(window_maxy(self)) - 1;
- wmove(winp->window, 0, 0);
- waddch(winp->window, c);
- wmove(winp->window, y, 0);
- waddch(winp->window, c);
- wmove(winp->window, y, x);
- waddch(winp->window, c);
- wmove(winp->window, 0, x);
- waddch(winp->window, c);
- wmove(winp->window, cur_y, cur_x);
- }
-
- return Qnil;
-}
-
/* def standout */
static VALUE
window_standout(obj)
@@ -1083,7 +670,7 @@ window_inch(obj)
struct windata *winp;
GetWINDOW(obj, winp);
- return CH2FIX(winch(winp->window));
+ return CHR2FIX(winch(winp->window));
}
/* def addch(ch) */
@@ -1095,7 +682,7 @@ window_addch(obj, ch)
struct windata *winp;
GetWINDOW(obj, winp);
- waddch(winp->window, NUM2CH(ch));
+ waddch(winp->window, NUM2CHR(ch));
return Qnil;
}
@@ -1109,7 +696,7 @@ window_insch(obj, ch)
struct windata *winp;
GetWINDOW(obj, winp);
- winsch(winp->window, NUM2CH(ch));
+ winsch(winp->window, NUM2CHR(ch));
return Qnil;
}
@@ -1148,7 +735,7 @@ window_getch(obj)
rb_read_check(stdin);
GetWINDOW(obj, winp);
- return UINT2NUM(wgetch(winp->window));
+ return CHR2FIX(wgetch(winp->window));
}
/* def getstr */
@@ -1161,11 +748,7 @@ window_getstr(obj)
GetWINDOW(obj, winp);
rb_read_check(stdin);
-#if defined(HAVE_WGETNSTR)
- wgetnstr(winp->window, rtn, 1023);
-#else
wgetstr(winp->window, rtn);
-#endif
return rb_tainted_str_new2(rtn);
}
@@ -1186,7 +769,7 @@ static VALUE
window_deleteln(obj)
VALUE obj;
{
-#if defined(HAVE_WDELETELN) || defined(wdeleteln)
+#ifdef HAVE_WDELETELN
struct windata *winp;
GetWINDOW(obj, winp);
@@ -1195,267 +778,11 @@ window_deleteln(obj)
return Qnil;
}
-/* def insertln */
-static VALUE
-window_insertln(obj)
- VALUE obj;
-{
-#if defined(HAVE_WINSERTLN) || defined(winsertln)
- struct windata *winp;
-
- GetWINDOW(obj, winp);
- winsertln(winp->window);
-#endif
- return Qnil;
-}
-
-static VALUE
-window_scrollok(VALUE obj, VALUE bf)
-{
- struct windata *winp;
-
- GetWINDOW(obj, winp);
- scrollok(winp->window, RTEST(bf) ? TRUE : FALSE);
- return Qnil;
-}
-
-static VALUE
-window_idlok(VALUE obj, VALUE bf)
-{
- struct windata *winp;
-
- GetWINDOW(obj, winp);
- idlok(winp->window, RTEST(bf) ? TRUE : FALSE);
- return Qnil;
-}
-
-static VALUE
-window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
-{
-#ifdef HAVE_WSETSCRREG
- struct windata *winp;
- int res;
-
- GetWINDOW(obj, winp);
- res = wsetscrreg(winp->window, NUM2INT(top), NUM2INT(bottom));
- /* may have to raise exception on ERR */
- return (res == OK) ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-static VALUE
-window_color_set(VALUE obj, VALUE col)
-{
- struct windata *winp;
- int res;
-
- GetWINDOW(obj, winp);
- res = wcolor_set(winp->window, NUM2INT(col), NULL);
- return (res == OK) ? Qtrue : Qfalse;
-}
-#endif /* USE_COLOR */
-
-static VALUE
-window_scroll(VALUE obj)
-{
- struct windata *winp;
-
- GetWINDOW(obj, winp);
- /* may have to raise exception on ERR */
- return (scroll(winp->window) == OK) ? Qtrue : Qfalse;
-}
-
-static VALUE
-window_scrl(VALUE obj, VALUE n)
-{
-#ifdef HAVE_WSCRL
- struct windata *winp;
-
- GetWINDOW(obj, winp);
- /* may have to raise exception on ERR */
- return (wscrl(winp->window,NUM2INT(n)) == OK) ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-static VALUE
-window_attroff(VALUE obj, VALUE attrs)
-{
-#ifdef HAVE_WATTROFF
- struct windata *winp;
-
- GetWINDOW(obj,winp);
- return INT2FIX(wattroff(winp->window,NUM2INT(attrs)));
-#else
- return Qtrue;
-#endif
-}
-
-static VALUE
-window_attron(VALUE obj, VALUE attrs)
-{
-#ifdef HAVE_WATTRON
- struct windata *winp;
- VALUE val;
-
- GetWINDOW(obj,winp);
- val = INT2FIX(wattron(winp->window,NUM2INT(attrs)));
- if( rb_block_given_p() ){
- rb_yield(val);
- wattroff(winp->window,NUM2INT(attrs));
- return val;
- }
- else{
- return val;
- }
-#else
- return Qtrue;
-#endif
-}
-
-static VALUE
-window_attrset(VALUE obj, VALUE attrs)
-{
-#ifdef HAVE_WATTRSET
- struct windata *winp;
-
- GetWINDOW(obj,winp);
- return INT2FIX(wattrset(winp->window,NUM2INT(attrs)));
-#else
- return Qtrue;
-#endif
-}
-
-static VALUE
-window_bkgdset(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_WBKGDSET
- struct windata *winp;
-
- GetWINDOW(obj,winp);
- wbkgdset(winp->window, NUM2CH(ch));
-#endif
- return Qnil;
-}
-
-static VALUE
-window_bkgd(VALUE obj, VALUE ch)
-{
-#ifdef HAVE_WBKGD
- struct windata *winp;
-
- GetWINDOW(obj,winp);
- return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
-#else
- return Qfalse;
-#endif
-}
-
-static VALUE
-window_getbkgd(VALUE obj)
-{
-#ifdef HAVE_WGETBKGD
- chtype c;
- struct windata *winp;
-
- GetWINDOW(obj,winp);
- return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
-#else
- return Qnil;
-#endif
-}
-
-static VALUE
-window_resize(VALUE obj, VALUE lin, VALUE col)
-{
-#if defined(HAVE_WRESIZE)
- struct windata *winp;
-
- GetWINDOW(obj,winp);
- return wresize(winp->window, NUM2INT(lin), NUM2INT(col)) == OK ? Qtrue : Qfalse;
-#else
- return Qnil;
-#endif
-}
-
-
-static VALUE
-window_keypad(VALUE obj, VALUE val)
-{
-#ifdef HAVE_KEYPAD
- struct windata *winp;
-
- GetWINDOW(obj,winp);
- /* keypad() of NetBSD's libcurses returns no value */
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
- keypad(winp->window,(RTEST(val) ? TRUE : FALSE));
- return Qnil;
-#else
- /* may have to raise exception on ERR */
- return (keypad(winp->window,RTEST(val) ? TRUE : FALSE)) == OK ?
- Qtrue : Qfalse;
-#endif
-#else
- rb_notimplement();
-#endif /* HAVE_KEYPAD */
-}
-
-static VALUE
-window_nodelay(VALUE obj, VALUE val)
-{
-#ifdef HAVE_NODELAY
- struct windata *winp;
- GetWINDOW(obj,winp);
-
- /* nodelay() of NetBSD's libcurses returns no value */
-#if defined(__NetBSD__) && !defined(NCURSES_VERSION)
- nodelay(winp->window, RTEST(val) ? TRUE : FALSE);
- return Qnil;
-#else
- return nodelay(winp->window,RTEST(val) ? TRUE : FALSE) == OK ? Qtrue : Qfalse;
-#endif
-#else
- rb_notimplement();
-#endif
-}
-
-static VALUE
-window_timeout(VALUE obj, VALUE delay)
-{
-#ifdef HAVE_WTIMEOUT
- struct windata *winp;
- GetWINDOW(obj,winp);
-
- wtimeout(winp->window,NUM2INT(delay));
- return Qnil;
-#else
- rb_notimplement();
-#endif
-}
-
/*------------------------- Initialization -------------------------*/
void
Init_curses()
{
- mCurses = rb_define_module("Curses");
- mKey = rb_define_module_under(mCurses, "Key");
-
- rb_gc_register_address(&rb_stdscr);
-
-#ifdef USE_MOUSE
- 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);
- rb_define_method(cMouseEvent, "x", curs_mouse_x, 0);
- rb_define_method(cMouseEvent, "y", curs_mouse_y, 0);
- rb_define_method(cMouseEvent, "z", curs_mouse_z, 0);
- rb_define_method(cMouseEvent, "bstate", curs_mouse_bstate, 0);
-#endif /* USE_MOUSE */
-
+ mCurses = rb_define_module("Curses");
rb_define_module_function(mCurses, "init_screen", curses_init_screen, 0);
rb_define_module_function(mCurses, "close_screen", curses_close_screen, 0);
rb_define_module_function(mCurses, "closed?", curses_closed, 0);
@@ -1463,7 +790,6 @@ Init_curses()
rb_define_module_function(mCurses, "refresh", curses_refresh, 0);
rb_define_module_function(mCurses, "doupdate", curses_doupdate, 0);
rb_define_module_function(mCurses, "clear", curses_clear, 0);
- rb_define_module_function(mCurses, "clrtoeol", curses_clrtoeol, 0);
rb_define_module_function(mCurses, "echo", curses_echo, 0);
rb_define_module_function(mCurses, "noecho", curses_noecho, 0);
rb_define_module_function(mCurses, "raw", curses_raw, 0);
@@ -1488,58 +814,18 @@ Init_curses()
rb_define_module_function(mCurses, "getstr", curses_getstr, 0);
rb_define_module_function(mCurses, "delch", curses_delch, 0);
rb_define_module_function(mCurses, "deleteln", curses_deleteln, 0);
- rb_define_module_function(mCurses, "insertln", curses_insertln, 0);
- rb_define_module_function(mCurses, "keyname", curses_keyname, 1);
rb_define_module_function(mCurses, "lines", curses_lines, 0);
rb_define_module_function(mCurses, "cols", curses_cols, 0);
- rb_define_module_function(mCurses, "curs_set", curses_curs_set, 1);
- rb_define_module_function(mCurses, "scrl", curses_scrl, 1);
- rb_define_module_function(mCurses, "setscrreg", curses_setscrreg, 2);
- rb_define_module_function(mCurses, "attroff", curses_attroff, 1);
- rb_define_module_function(mCurses, "attron", curses_attron, 1);
- rb_define_module_function(mCurses, "attrset", curses_attrset, 1);
- rb_define_module_function(mCurses, "bkgdset", curses_bkgdset, 1);
- rb_define_module_function(mCurses, "bkgd", curses_bkgd, 1);
- rb_define_module_function(mCurses, "resizeterm", curses_resizeterm, 2);
- rb_define_module_function(mCurses, "resize", curses_resizeterm, 2);
-#ifdef USE_COLOR
- rb_define_module_function(mCurses, "start_color", curses_start_color, 0);
- rb_define_module_function(mCurses, "init_pair", curses_init_pair, 3);
- rb_define_module_function(mCurses, "init_color", curses_init_color, 4);
- rb_define_module_function(mCurses, "has_colors?", curses_has_colors, 0);
- rb_define_module_function(mCurses, "can_change_color?",
- curses_can_change_color, 0);
- rb_define_module_function(mCurses, "color_content", curses_color_content, 1);
- rb_define_module_function(mCurses, "pair_content", curses_pair_content, 1);
- rb_define_module_function(mCurses, "color_pair", curses_color_pair, 1);
- rb_define_module_function(mCurses, "pair_number", curses_pair_number, 1);
-#endif /* USE_COLOR */
-#ifdef USE_MOUSE
- rb_define_module_function(mCurses, "getmouse", curses_getmouse, 0);
- rb_define_module_function(mCurses, "ungetmouse", curses_ungetmouse, 1);
- rb_define_module_function(mCurses, "mouseinterval", curses_mouseinterval, 1);
- rb_define_module_function(mCurses, "mousemask", curses_mousemask, 1);
-#endif /* USE_MOUSE */
-
- rb_define_module_function(mCurses, "timeout=", curses_timeout, 1);
- 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);
-
- 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);
+
+ cWindow = rb_define_class_under(mCurses, "Window", rb_cObject);
+ rb_define_singleton_method(cWindow, "new", window_s_new, 4);
rb_define_method(cWindow, "subwin", window_subwin, 4);
rb_define_method(cWindow, "close", window_close, 0);
rb_define_method(cWindow, "clear", window_clear, 0);
- rb_define_method(cWindow, "clrtoeol", window_clrtoeol, 0);
rb_define_method(cWindow, "refresh", window_refresh, 0);
- rb_define_method(cWindow, "noutrefresh", window_noutrefresh, 0);
- rb_define_method(cWindow, "box", window_box, -1);
+ rb_define_method(cWindow, "box", window_box, 2);
rb_define_method(cWindow, "move", window_move, 2);
rb_define_method(cWindow, "setpos", window_setpos, 2);
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
- rb_define_method(cWindow, "color_set", window_color_set, 1);
-#endif /* USE_COLOR && HAVE_WCOLOR_SET */
rb_define_method(cWindow, "cury", window_cury, 0);
rb_define_method(cWindow, "curx", window_curx, 0);
rb_define_method(cWindow, "maxy", window_maxy, 0);
@@ -1557,545 +843,6 @@ Init_curses()
rb_define_method(cWindow, "getstr", window_getstr, 0);
rb_define_method(cWindow, "delch", window_delch, 0);
rb_define_method(cWindow, "deleteln", window_deleteln, 0);
- rb_define_method(cWindow, "insertln", window_insertln, 0);
- rb_define_method(cWindow, "scroll", window_scroll, 0);
- rb_define_method(cWindow, "scrollok", window_scrollok, 1);
- rb_define_method(cWindow, "idlok", window_idlok, 1);
- rb_define_method(cWindow, "setscrreg", window_setscrreg, 2);
- rb_define_method(cWindow, "scrl", window_scrl, 1);
- rb_define_method(cWindow, "resize", window_resize, 2);
- rb_define_method(cWindow, "keypad", window_keypad, 1);
- rb_define_method(cWindow, "keypad=", window_keypad, 1);
-
- rb_define_method(cWindow, "attroff", window_attroff, 1);
- rb_define_method(cWindow, "attron", window_attron, 1);
- rb_define_method(cWindow, "attrset", window_attrset, 1);
- rb_define_method(cWindow, "bkgdset", window_bkgdset, 1);
- rb_define_method(cWindow, "bkgd", window_bkgd, 1);
- rb_define_method(cWindow, "getbkgd", window_getbkgd, 0);
-
- rb_define_method(cWindow, "nodelay=", window_nodelay, 1);
- rb_define_method(cWindow, "timeout=", window_timeout, 1);
-
-#define rb_curses_define_const(c) rb_define_const(mCurses,#c,UINT2NUM(c))
-
-#ifdef USE_COLOR
- rb_curses_define_const(A_ATTRIBUTES);
-#ifdef A_NORMAL
- rb_curses_define_const(A_NORMAL);
-#endif
- rb_curses_define_const(A_STANDOUT);
- rb_curses_define_const(A_UNDERLINE);
- rb_curses_define_const(A_REVERSE);
- rb_curses_define_const(A_BLINK);
- rb_curses_define_const(A_DIM);
- rb_curses_define_const(A_BOLD);
- rb_curses_define_const(A_PROTECT);
-#ifdef A_INVIS /* for NetBSD */
- rb_curses_define_const(A_INVIS);
-#endif
- rb_curses_define_const(A_ALTCHARSET);
- rb_curses_define_const(A_CHARTEXT);
-#ifdef A_HORIZONTAL
- rb_curses_define_const(A_HORIZONTAL);
-#endif
-#ifdef A_LEFT
- rb_curses_define_const(A_LEFT);
-#endif
-#ifdef A_LOW
- rb_curses_define_const(A_LOW);
-#endif
-#ifdef A_RIGHT
- rb_curses_define_const(A_RIGHT);
-#endif
-#ifdef A_TOP
- rb_curses_define_const(A_TOP);
-#endif
-#ifdef A_VERTICAL
- rb_curses_define_const(A_VERTICAL);
-#endif
- rb_curses_define_const(A_COLOR);
-
-#ifdef COLORS
- rb_curses_define_const(COLORS);
-#endif
- rb_curses_define_const(COLOR_BLACK);
- rb_curses_define_const(COLOR_RED);
- rb_curses_define_const(COLOR_GREEN);
- rb_curses_define_const(COLOR_YELLOW);
- rb_curses_define_const(COLOR_BLUE);
- rb_curses_define_const(COLOR_MAGENTA);
- rb_curses_define_const(COLOR_CYAN);
- rb_curses_define_const(COLOR_WHITE);
-#endif /* USE_COLOR */
-#ifdef USE_MOUSE
-#ifdef BUTTON1_PRESSED
- rb_curses_define_const(BUTTON1_PRESSED);
-#endif
-#ifdef BUTTON1_RELEASED
- rb_curses_define_const(BUTTON1_RELEASED);
-#endif
-#ifdef BUTTON1_CLICKED
- rb_curses_define_const(BUTTON1_CLICKED);
-#endif
-#ifdef BUTTON1_DOUBLE_CLICKED
- rb_curses_define_const(BUTTON1_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON1_TRIPLE_CLICKED
- rb_curses_define_const(BUTTON1_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON2_PRESSED
- rb_curses_define_const(BUTTON2_PRESSED);
-#endif
-#ifdef BUTTON2_RELEASED
- rb_curses_define_const(BUTTON2_RELEASED);
-#endif
-#ifdef BUTTON2_CLICKED
- rb_curses_define_const(BUTTON2_CLICKED);
-#endif
-#ifdef BUTTON2_DOUBLE_CLICKED
- rb_curses_define_const(BUTTON2_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON2_TRIPLE_CLICKED
- rb_curses_define_const(BUTTON2_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON3_PRESSED
- rb_curses_define_const(BUTTON3_PRESSED);
-#endif
-#ifdef BUTTON3_RELEASED
- rb_curses_define_const(BUTTON3_RELEASED);
-#endif
-#ifdef BUTTON3_CLICKED
- rb_curses_define_const(BUTTON3_CLICKED);
-#endif
-#ifdef BUTTON3_DOUBLE_CLICKED
- rb_curses_define_const(BUTTON3_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON3_TRIPLE_CLICKED
- rb_curses_define_const(BUTTON3_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON4_PRESSED
- rb_curses_define_const(BUTTON4_PRESSED);
-#endif
-#ifdef BUTTON4_RELEASED
- rb_curses_define_const(BUTTON4_RELEASED);
-#endif
-#ifdef BUTTON4_CLICKED
- rb_curses_define_const(BUTTON4_CLICKED);
-#endif
-#ifdef BUTTON4_DOUBLE_CLICKED
- rb_curses_define_const(BUTTON4_DOUBLE_CLICKED);
-#endif
-#ifdef BUTTON4_TRIPLE_CLICKED
- rb_curses_define_const(BUTTON4_TRIPLE_CLICKED);
-#endif
-#ifdef BUTTON_SHIFT
- rb_curses_define_const(BUTTON_SHIFT);
-#endif
-#ifdef BUTTON_CTRL
- rb_curses_define_const(BUTTON_CTRL);
-#endif
-#ifdef BUTTON_ALT
- rb_curses_define_const(BUTTON_ALT);
-#endif
-#ifdef ALL_MOUSE_EVENTS
- rb_curses_define_const(ALL_MOUSE_EVENTS);
-#endif
-#ifdef REPORT_MOUSE_POSITION
- rb_curses_define_const(REPORT_MOUSE_POSITION);
-#endif
-#endif /* USE_MOUSE */
-
-#if defined(KEY_MOUSE) && defined(USE_MOUSE)
- rb_curses_define_const(KEY_MOUSE);
- rb_define_const(mKey, "MOUSE", INT2NUM(KEY_MOUSE));
-#endif
-#ifdef KEY_MIN
- rb_curses_define_const(KEY_MIN);
- rb_define_const(mKey, "MIN", INT2NUM(KEY_MIN));
-#endif
-#ifdef KEY_BREAK
- rb_curses_define_const(KEY_BREAK);
- rb_define_const(mKey, "BREAK", INT2NUM(KEY_BREAK));
-#endif
-#ifdef KEY_DOWN
- rb_curses_define_const(KEY_DOWN);
- rb_define_const(mKey, "DOWN", INT2NUM(KEY_DOWN));
-#endif
-#ifdef KEY_UP
- rb_curses_define_const(KEY_UP);
- rb_define_const(mKey, "UP", INT2NUM(KEY_UP));
-#endif
-#ifdef KEY_LEFT
- rb_curses_define_const(KEY_LEFT);
- rb_define_const(mKey, "LEFT", INT2NUM(KEY_LEFT));
-#endif
-#ifdef KEY_RIGHT
- rb_curses_define_const(KEY_RIGHT);
- rb_define_const(mKey, "RIGHT", INT2NUM(KEY_RIGHT));
-#endif
-#ifdef KEY_HOME
- rb_curses_define_const(KEY_HOME);
- rb_define_const(mKey, "HOME", INT2NUM(KEY_HOME));
-#endif
-#ifdef KEY_BACKSPACE
- rb_curses_define_const(KEY_BACKSPACE);
- rb_define_const(mKey, "BACKSPACE", INT2NUM(KEY_BACKSPACE));
-#endif
-#ifdef KEY_F
- /* KEY_F(n) : 0 <= n <= 63 */
- {
- int i;
- char c[8];
- for( i=0; i<64; i++ ){
- sprintf(c, "KEY_F%d", i);
- rb_define_const(mCurses, c, INT2NUM(KEY_F(i)));
- sprintf(c, "F%d", i);
- rb_define_const(mKey, c, INT2NUM(KEY_F(i)));
- }
- }
-#endif
-#ifdef KEY_DL
- rb_curses_define_const(KEY_DL);
- rb_define_const(mKey, "DL", INT2NUM(KEY_DL));
-#endif
-#ifdef KEY_IL
- rb_curses_define_const(KEY_IL);
- rb_define_const(mKey, "IL", INT2NUM(KEY_IL));
-#endif
-#ifdef KEY_DC
- rb_curses_define_const(KEY_DC);
- rb_define_const(mKey, "DC", INT2NUM(KEY_DC));
-#endif
-#ifdef KEY_IC
- rb_curses_define_const(KEY_IC);
- rb_define_const(mKey, "IC", INT2NUM(KEY_IC));
-#endif
-#ifdef KEY_EIC
- rb_curses_define_const(KEY_EIC);
- rb_define_const(mKey, "EIC", INT2NUM(KEY_EIC));
-#endif
-#ifdef KEY_CLEAR
- rb_curses_define_const(KEY_CLEAR);
- rb_define_const(mKey, "CLEAR", INT2NUM(KEY_CLEAR));
-#endif
-#ifdef KEY_EOS
- rb_curses_define_const(KEY_EOS);
- rb_define_const(mKey, "EOS", INT2NUM(KEY_EOS));
-#endif
-#ifdef KEY_EOL
- rb_curses_define_const(KEY_EOL);
- rb_define_const(mKey, "EOL", INT2NUM(KEY_EOL));
-#endif
-#ifdef KEY_SF
- rb_curses_define_const(KEY_SF);
- rb_define_const(mKey, "SF", INT2NUM(KEY_SF));
-#endif
-#ifdef KEY_SR
- rb_curses_define_const(KEY_SR);
- rb_define_const(mKey, "SR", INT2NUM(KEY_SR));
-#endif
-#ifdef KEY_NPAGE
- rb_curses_define_const(KEY_NPAGE);
- rb_define_const(mKey, "NPAGE", INT2NUM(KEY_NPAGE));
-#endif
-#ifdef KEY_PPAGE
- rb_curses_define_const(KEY_PPAGE);
- rb_define_const(mKey, "PPAGE", INT2NUM(KEY_PPAGE));
-#endif
-#ifdef KEY_STAB
- rb_curses_define_const(KEY_STAB);
- rb_define_const(mKey, "STAB", INT2NUM(KEY_STAB));
-#endif
-#ifdef KEY_CTAB
- rb_curses_define_const(KEY_CTAB);
- rb_define_const(mKey, "CTAB", INT2NUM(KEY_CTAB));
-#endif
-#ifdef KEY_CATAB
- rb_curses_define_const(KEY_CATAB);
- rb_define_const(mKey, "CATAB", INT2NUM(KEY_CATAB));
-#endif
-#ifdef KEY_ENTER
- rb_curses_define_const(KEY_ENTER);
- rb_define_const(mKey, "ENTER", INT2NUM(KEY_ENTER));
-#endif
-#ifdef KEY_SRESET
- rb_curses_define_const(KEY_SRESET);
- rb_define_const(mKey, "SRESET", INT2NUM(KEY_SRESET));
-#endif
-#ifdef KEY_RESET
- rb_curses_define_const(KEY_RESET);
- rb_define_const(mKey, "RESET", INT2NUM(KEY_RESET));
-#endif
-#ifdef KEY_PRINT
- rb_curses_define_const(KEY_PRINT);
- rb_define_const(mKey, "PRINT", INT2NUM(KEY_PRINT));
-#endif
-#ifdef KEY_LL
- rb_curses_define_const(KEY_LL);
- rb_define_const(mKey, "LL", INT2NUM(KEY_LL));
-#endif
-#ifdef KEY_A1
- rb_curses_define_const(KEY_A1);
- rb_define_const(mKey, "A1", INT2NUM(KEY_A1));
-#endif
-#ifdef KEY_A3
- rb_curses_define_const(KEY_A3);
- rb_define_const(mKey, "A3", INT2NUM(KEY_A3));
-#endif
-#ifdef KEY_B2
- rb_curses_define_const(KEY_B2);
- rb_define_const(mKey, "B2", INT2NUM(KEY_B2));
-#endif
-#ifdef KEY_C1
- rb_curses_define_const(KEY_C1);
- rb_define_const(mKey, "C1", INT2NUM(KEY_C1));
-#endif
-#ifdef KEY_C3
- rb_curses_define_const(KEY_C3);
- rb_define_const(mKey, "C3", INT2NUM(KEY_C3));
-#endif
-#ifdef KEY_BTAB
- rb_curses_define_const(KEY_BTAB);
- rb_define_const(mKey, "BTAB", INT2NUM(KEY_BTAB));
-#endif
-#ifdef KEY_BEG
- rb_curses_define_const(KEY_BEG);
- rb_define_const(mKey, "BEG", INT2NUM(KEY_BEG));
-#endif
-#ifdef KEY_CANCEL
- rb_curses_define_const(KEY_CANCEL);
- rb_define_const(mKey, "CANCEL", INT2NUM(KEY_CANCEL));
-#endif
-#ifdef KEY_CLOSE
- rb_curses_define_const(KEY_CLOSE);
- rb_define_const(mKey, "CLOSE", INT2NUM(KEY_CLOSE));
-#endif
-#ifdef KEY_COMMAND
- rb_curses_define_const(KEY_COMMAND);
- rb_define_const(mKey, "COMMAND", INT2NUM(KEY_COMMAND));
-#endif
-#ifdef KEY_COPY
- rb_curses_define_const(KEY_COPY);
- rb_define_const(mKey, "COPY", INT2NUM(KEY_COPY));
-#endif
-#ifdef KEY_CREATE
- rb_curses_define_const(KEY_CREATE);
- rb_define_const(mKey, "CREATE", INT2NUM(KEY_CREATE));
-#endif
-#ifdef KEY_END
- rb_curses_define_const(KEY_END);
- rb_define_const(mKey, "END", INT2NUM(KEY_END));
-#endif
-#ifdef KEY_EXIT
- rb_curses_define_const(KEY_EXIT);
- rb_define_const(mKey, "EXIT", INT2NUM(KEY_EXIT));
-#endif
-#ifdef KEY_FIND
- rb_curses_define_const(KEY_FIND);
- rb_define_const(mKey, "FIND", INT2NUM(KEY_FIND));
-#endif
-#ifdef KEY_HELP
- rb_curses_define_const(KEY_HELP);
- rb_define_const(mKey, "HELP", INT2NUM(KEY_HELP));
-#endif
-#ifdef KEY_MARK
- rb_curses_define_const(KEY_MARK);
- rb_define_const(mKey, "MARK", INT2NUM(KEY_MARK));
-#endif
-#ifdef KEY_MESSAGE
- rb_curses_define_const(KEY_MESSAGE);
- rb_define_const(mKey, "MESSAGE", INT2NUM(KEY_MESSAGE));
-#endif
-#ifdef KEY_MOVE
- rb_curses_define_const(KEY_MOVE);
- rb_define_const(mKey, "MOVE", INT2NUM(KEY_MOVE));
-#endif
-#ifdef KEY_NEXT
- rb_curses_define_const(KEY_NEXT);
- rb_define_const(mKey, "NEXT", INT2NUM(KEY_NEXT));
-#endif
-#ifdef KEY_OPEN
- rb_curses_define_const(KEY_OPEN);
- rb_define_const(mKey, "OPEN", INT2NUM(KEY_OPEN));
-#endif
-#ifdef KEY_OPTIONS
- rb_curses_define_const(KEY_OPTIONS);
- rb_define_const(mKey, "OPTIONS", INT2NUM(KEY_OPTIONS));
-#endif
-#ifdef KEY_PREVIOUS
- rb_curses_define_const(KEY_PREVIOUS);
- rb_define_const(mKey, "PREVIOUS", INT2NUM(KEY_PREVIOUS));
-#endif
-#ifdef KEY_REDO
- rb_curses_define_const(KEY_REDO);
- rb_define_const(mKey, "REDO", INT2NUM(KEY_REDO));
-#endif
-#ifdef KEY_REFERENCE
- rb_curses_define_const(KEY_REFERENCE);
- rb_define_const(mKey, "REFERENCE", INT2NUM(KEY_REFERENCE));
-#endif
-#ifdef KEY_REFRESH
- rb_curses_define_const(KEY_REFRESH);
- rb_define_const(mKey, "REFRESH", INT2NUM(KEY_REFRESH));
-#endif
-#ifdef KEY_REPLACE
- rb_curses_define_const(KEY_REPLACE);
- rb_define_const(mKey, "REPLACE", INT2NUM(KEY_REPLACE));
-#endif
-#ifdef KEY_RESTART
- rb_curses_define_const(KEY_RESTART);
- rb_define_const(mKey, "RESTART", INT2NUM(KEY_RESTART));
-#endif
-#ifdef KEY_RESUME
- rb_curses_define_const(KEY_RESUME);
- rb_define_const(mKey, "RESUME", INT2NUM(KEY_RESUME));
-#endif
-#ifdef KEY_SAVE
- rb_curses_define_const(KEY_SAVE);
- rb_define_const(mKey, "SAVE", INT2NUM(KEY_SAVE));
-#endif
-#ifdef KEY_SBEG
- rb_curses_define_const(KEY_SBEG);
- rb_define_const(mKey, "SBEG", INT2NUM(KEY_SBEG));
-#endif
-#ifdef KEY_SCANCEL
- rb_curses_define_const(KEY_SCANCEL);
- rb_define_const(mKey, "SCANCEL", INT2NUM(KEY_SCANCEL));
-#endif
-#ifdef KEY_SCOMMAND
- rb_curses_define_const(KEY_SCOMMAND);
- rb_define_const(mKey, "SCOMMAND", INT2NUM(KEY_SCOMMAND));
-#endif
-#ifdef KEY_SCOPY
- rb_curses_define_const(KEY_SCOPY);
- rb_define_const(mKey, "SCOPY", INT2NUM(KEY_SCOPY));
-#endif
-#ifdef KEY_SCREATE
- rb_curses_define_const(KEY_SCREATE);
- rb_define_const(mKey, "SCREATE", INT2NUM(KEY_SCREATE));
-#endif
-#ifdef KEY_SDC
- rb_curses_define_const(KEY_SDC);
- rb_define_const(mKey, "SDC", INT2NUM(KEY_SDC));
-#endif
-#ifdef KEY_SDL
- rb_curses_define_const(KEY_SDL);
- rb_define_const(mKey, "SDL", INT2NUM(KEY_SDL));
-#endif
-#ifdef KEY_SELECT
- rb_curses_define_const(KEY_SELECT);
- rb_define_const(mKey, "SELECT", INT2NUM(KEY_SELECT));
-#endif
-#ifdef KEY_SEND
- rb_curses_define_const(KEY_SEND);
- rb_define_const(mKey, "SEND", INT2NUM(KEY_SEND));
-#endif
-#ifdef KEY_SEOL
- rb_curses_define_const(KEY_SEOL);
- rb_define_const(mKey, "SEOL", INT2NUM(KEY_SEOL));
-#endif
-#ifdef KEY_SEXIT
- rb_curses_define_const(KEY_SEXIT);
- rb_define_const(mKey, "SEXIT", INT2NUM(KEY_SEXIT));
-#endif
-#ifdef KEY_SFIND
- rb_curses_define_const(KEY_SFIND);
- rb_define_const(mKey, "SFIND", INT2NUM(KEY_SFIND));
-#endif
-#ifdef KEY_SHELP
- rb_curses_define_const(KEY_SHELP);
- rb_define_const(mKey, "SHELP", INT2NUM(KEY_SHELP));
-#endif
-#ifdef KEY_SHOME
- rb_curses_define_const(KEY_SHOME);
- rb_define_const(mKey, "SHOME", INT2NUM(KEY_SHOME));
-#endif
-#ifdef KEY_SIC
- rb_curses_define_const(KEY_SIC);
- rb_define_const(mKey, "SIC", INT2NUM(KEY_SIC));
-#endif
-#ifdef KEY_SLEFT
- rb_curses_define_const(KEY_SLEFT);
- rb_define_const(mKey, "SLEFT", INT2NUM(KEY_SLEFT));
-#endif
-#ifdef KEY_SMESSAGE
- rb_curses_define_const(KEY_SMESSAGE);
- rb_define_const(mKey, "SMESSAGE", INT2NUM(KEY_SMESSAGE));
-#endif
-#ifdef KEY_SMOVE
- rb_curses_define_const(KEY_SMOVE);
- rb_define_const(mKey, "SMOVE", INT2NUM(KEY_SMOVE));
-#endif
-#ifdef KEY_SNEXT
- rb_curses_define_const(KEY_SNEXT);
- rb_define_const(mKey, "SNEXT", INT2NUM(KEY_SNEXT));
-#endif
-#ifdef KEY_SOPTIONS
- rb_curses_define_const(KEY_SOPTIONS);
- rb_define_const(mKey, "SOPTIONS", INT2NUM(KEY_SOPTIONS));
-#endif
-#ifdef KEY_SPREVIOUS
- rb_curses_define_const(KEY_SPREVIOUS);
- rb_define_const(mKey, "SPREVIOUS", INT2NUM(KEY_SPREVIOUS));
-#endif
-#ifdef KEY_SPRINT
- rb_curses_define_const(KEY_SPRINT);
- rb_define_const(mKey, "SPRINT", INT2NUM(KEY_SPRINT));
-#endif
-#ifdef KEY_SREDO
- rb_curses_define_const(KEY_SREDO);
- rb_define_const(mKey, "SREDO", INT2NUM(KEY_SREDO));
-#endif
-#ifdef KEY_SREPLACE
- rb_curses_define_const(KEY_SREPLACE);
- rb_define_const(mKey, "SREPLACE", INT2NUM(KEY_SREPLACE));
-#endif
-#ifdef KEY_SRIGHT
- rb_curses_define_const(KEY_SRIGHT);
- rb_define_const(mKey, "SRIGHT", INT2NUM(KEY_SRIGHT));
-#endif
-#ifdef KEY_SRSUME
- rb_curses_define_const(KEY_SRSUME);
- rb_define_const(mKey, "SRSUME", INT2NUM(KEY_SRSUME));
-#endif
-#ifdef KEY_SSAVE
- rb_curses_define_const(KEY_SSAVE);
- rb_define_const(mKey, "SSAVE", INT2NUM(KEY_SSAVE));
-#endif
-#ifdef KEY_SSUSPEND
- rb_curses_define_const(KEY_SSUSPEND);
- rb_define_const(mKey, "SSUSPEND", INT2NUM(KEY_SSUSPEND));
-#endif
-#ifdef KEY_SUNDO
- rb_curses_define_const(KEY_SUNDO);
- rb_define_const(mKey, "SUNDO", INT2NUM(KEY_SUNDO));
-#endif
-#ifdef KEY_SUSPEND
- rb_curses_define_const(KEY_SUSPEND);
- rb_define_const(mKey, "SUSPEND", INT2NUM(KEY_SUSPEND));
-#endif
-#ifdef KEY_UNDO
- rb_curses_define_const(KEY_UNDO);
- rb_define_const(mKey, "UNDO", INT2NUM(KEY_UNDO));
-#endif
-#ifdef KEY_RESIZE
- rb_curses_define_const(KEY_RESIZE);
- rb_define_const(mKey, "RESIZE", INT2NUM(KEY_RESIZE));
-#endif
-#ifdef KEY_MAX
- rb_curses_define_const(KEY_MAX);
- rb_define_const(mKey, "MAX", INT2NUM(KEY_MAX));
-#endif
- {
- int c;
- char name[] = "KEY_CTRL_x";
- for( c = 'A'; c <= 'Z'; c++ ){
- sprintf(name, "KEY_CTRL_%c", c);
- rb_define_const(mCurses, name, INT2FIX(c - 'A' + 1));
- }
- }
-#undef rb_curses_define_const
rb_set_end_proc(curses_finalize, 0);
}
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 0124bbbf4a..c16ab00f28 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -6,26 +6,22 @@ dir_config('termcap')
make=false
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("ncurses", "initscr")
+if have_header("ncurses.h") and have_library("ncurses", "initscr")
make=true
-elsif have_header(*curses=%w"ncurses/curses.h") and have_library("ncurses", "initscr")
+elsif have_header("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")
+elsif have_header("curses_colr/curses.h") and have_library("cur_colr", "initscr")
make=true
+else
+ have_library("termcap", "tgetent")
+ if have_library("curses", "initscr")
+ make=true
+ end
end
if make
- for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set)
- have_func(f) || (have_macro(f, curses) && $defs.push(format("-DHAVE_%s", f.upcase)))
- end
- flag = "-D_XOPEN_SOURCE_EXTENDED"
- src = "int test_var[(sizeof(char*)>sizeof(int))*2-1];"
- if try_compile(cpp_include(%w[stdio.h stdlib.h]+curses)+src , flag)
- $defs << flag
+ for f in %w(isendwin ungetch beep doupdate flash deleteln wdeleteln)
+ have_func(f)
end
create_makefile("curses")
end
diff --git a/ext/curses/hello.rb b/ext/curses/hello.rb
index 7f57d801a3..a1915ce60d 100644
--- a/ext/curses/hello.rb
+++ b/ext/curses/hello.rb
@@ -7,7 +7,7 @@ def show_message(message)
width = message.length + 6
win = Window.new(5, width,
(lines - 5) / 2, (cols - width) / 2)
- win.box(?|, ?-)
+ win.box(?|, ?=)
win.setpos(2, 3)
win.addstr(message)
win.refresh
diff --git a/ext/curses/mouse.rb b/ext/curses/mouse.rb
deleted file mode 100644
index c42bc31f33..0000000000
--- a/ext/curses/mouse.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-include Curses
-
-def show_message(*msgs)
- message = msgs.join
- width = message.length + 6
- win = Window.new(5, width,
- (lines - 5) / 2, (cols - width) / 2)
- win.keypad = true
- win.attron(color_pair(COLOR_RED)){
- win.box(?|, ?-, ?+)
- }
- win.setpos(2, 3)
- win.addstr(message)
- win.refresh
- win.getch
- win.close
-end
-
-init_screen
-start_color
-init_pair(COLOR_BLUE,COLOR_BLUE,COLOR_WHITE)
-init_pair(COLOR_RED,COLOR_RED,COLOR_WHITE)
-crmode
-noecho
-stdscr.keypad(true)
-
-begin
- mousemask(BUTTON1_CLICKED|BUTTON2_CLICKED|BUTTON3_CLICKED|BUTTON4_CLICKED)
- setpos((lines - 5) / 2, (cols - 10) / 2)
- attron(color_pair(COLOR_BLUE)|A_BOLD){
- addstr("click")
- }
- refresh
- while( true )
- c = getch
- case c
- when KEY_MOUSE
- m = getmouse
- if( m )
- show_message("getch = #{c.inspect}, ",
- "mouse event = #{'0x%x' % m.bstate}, ",
- "axis = (#{m.x},#{m.y},#{m.z})")
- end
- break
- end
- end
- refresh
-ensure
- close_screen
-end
diff --git a/ext/curses/view.rb b/ext/curses/view.rb
index d9a82a57db..5ba1a8413c 100644
--- a/ext/curses/view.rb
+++ b/ext/curses/view.rb
@@ -49,7 +49,7 @@ while TRUE
n = 0
while TRUE
c = getch.chr
- if c =~ /[0-9]/
+ if c =~ "[0-9]" then
n = 10 * n + c.to_i
else
break
diff --git a/ext/curses/view2.rb b/ext/curses/view2.rb
deleted file mode 100644
index 18d9619216..0000000000
--- a/ext/curses/view2.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/local/bin/ruby
-
-require "curses"
-
-if ARGV.size != 1 then
- printf("usage: view file\n");
- exit
-end
-begin
- fp = open(ARGV[0], "r")
-rescue
- raise "cannot open file: #{ARGV[1]}"
-end
-
-# signal(SIGINT, finish)
-
-Curses.init_screen
-Curses.nonl
-Curses.cbreak
-Curses.noecho
-
-$screen = Curses.stdscr
-
-$screen.scrollok(true)
-#$screen.keypad(true)
-
-# slurp the file
-$data_lines = []
-fp.each_line { |l|
- $data_lines.push(l.chop)
-}
-fp.close
-
-$top = 0
-$data_lines[0..$screen.maxy-1].each_with_index{|line, idx|
- $screen.setpos(idx, 0)
- $screen.addstr(line)
-}
-$screen.setpos(0,0)
-$screen.refresh
-
-def scroll_up
- if( $top > 0 )
- $screen.scrl(-1)
- $top -= 1
- str = $data_lines[$top]
- if( str )
- $screen.setpos(0, 0)
- $screen.addstr(str)
- end
- return true
- else
- return false
- end
-end
-
-def scroll_down
- if( $top + $screen.maxy < $data_lines.length )
- $screen.scrl(1)
- $top += 1
- str = $data_lines[$top + $screen.maxy - 1]
- if( str )
- $screen.setpos($screen.maxy - 1, 0)
- $screen.addstr(str)
- end
- return true
- else
- return false
- end
-end
-
-while true
- result = true
- c = Curses.getch
- case c
- when Curses::KEY_DOWN, Curses::KEY_CTRL_N
- result = scroll_down
- when Curses::KEY_UP, Curses::KEY_CTRL_P
- result = scroll_up
- when Curses::KEY_NPAGE, ?\s # white space
- for i in 0..($screen.maxy - 2)
- if( ! scroll_down )
- if( i == 0 )
- result = false
- end
- break
- end
- end
- when Curses::KEY_PPAGE
- for i in 0..($screen.maxy - 2)
- if( ! scroll_up )
- if( i == 0 )
- result = false
- end
- break
- end
- end
- when Curses::KEY_LEFT, Curses::KEY_CTRL_T
- while( scroll_up )
- end
- when Curses::KEY_RIGHT, Curses::KEY_CTRL_B
- while( scroll_down )
- end
- when ?q
- break
- else
- $screen.setpos(0,0)
- $screen.addstr("[unknown key `#{Curses.keyname(c)}'=#{c}] ")
- end
- if( !result )
- Curses.beep
- end
- $screen.setpos(0,0)
-end
-Curses.close_screen
diff --git a/ext/dbm/.cvsignore b/ext/dbm/.cvsignore
index 4088712231..f3c7a7c5da 100644
--- a/ext/dbm/.cvsignore
+++ b/ext/dbm/.cvsignore
@@ -1,3 +1 @@
Makefile
-mkmf.log
-*.def
diff --git a/ext/dbm/MANIFEST b/ext/dbm/MANIFEST
new file mode 100644
index 0000000000..8beec6783d
--- /dev/null
+++ b/ext/dbm/MANIFEST
@@ -0,0 +1,4 @@
+MANIFEST
+dbm.c
+depend
+extconf.rb
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 69b7a6e7a7..b0446d1060 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -18,13 +18,11 @@
#ifdef HAVE_SYS_CDEFS_H
# include <sys/cdefs.h>
#endif
-#include DBM_HDR
+#include <ndbm.h>
#include <fcntl.h>
#include <errno.h>
-static VALUE rb_cDBM, rb_eDBMError;
-
-#define RUBY_DBM_RW_BIT 0x20000000
+VALUE cDBM, rb_eDBMError;
struct dbmdata {
int di_size;
@@ -34,7 +32,7 @@ struct dbmdata {
static void
closed_dbm()
{
- rb_raise(rb_eDBMError, "closed DBM file");
+ rb_raise(rb_eRuntimeError, "closed DBM file");
}
#define GetDBM(obj, dbmp) {\
@@ -43,11 +41,6 @@ closed_dbm()
if (dbmp->di_dbm == 0) closed_dbm();\
}
-#define GetDBM2(obj, data, dbm) {\
- GetDBM(obj, data);\
- (dbm) = dbmp->di_dbm;\
-}
-
static void
free_dbm(dbmp)
struct dbmdata *dbmp;
@@ -58,40 +51,17 @@ free_dbm(dbmp)
}
}
-static VALUE
-fdbm_close(obj)
- VALUE obj;
-{
- struct dbmdata *dbmp;
-
- GetDBM(obj, dbmp);
- dbm_close(dbmp->di_dbm);
- dbmp->di_dbm = 0;
-
- return Qnil;
-}
-
-static VALUE
-fdbm_closed(obj)
- VALUE obj;
-{
- struct dbmdata *dbmp;
-
- Data_Get_Struct(obj, struct dbmdata, dbmp);
- if (dbmp == 0)
- return Qtrue;
- if (dbmp->di_dbm == 0)
- return Qtrue;
-
- return Qfalse;
-}
+static VALUE fdbm_close _((VALUE));
-static VALUE fdbm_alloc _((VALUE));
static VALUE
-fdbm_alloc(klass)
+fdbm_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
VALUE klass;
{
- return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+ VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
+ rb_obj_call_init(obj, argc, argv);
+ return obj;
}
static VALUE
@@ -100,12 +70,12 @@ fdbm_initialize(argc, argv, obj)
VALUE *argv;
VALUE obj;
{
- VALUE file, vmode, vflags;
+ VALUE file, vmode;
DBM *dbm;
struct dbmdata *dbmp;
- int mode, flags = 0;
+ int mode;
- if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
+ if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
mode = 0666; /* default value */
}
else if (NIL_P(vmode)) {
@@ -114,27 +84,18 @@ fdbm_initialize(argc, argv, obj)
else {
mode = NUM2INT(vmode);
}
+ file = rb_str_to_str(file);
+ Check_SafeStr(file);
- if (!NIL_P(vflags))
- flags = NUM2INT(vflags);
-
- SafeStringValue(file);
-
- if (flags & RUBY_DBM_RW_BIT) {
- flags &= ~RUBY_DBM_RW_BIT;
- dbm = dbm_open(RSTRING(file)->ptr, flags, mode);
+ dbm = 0;
+ if (mode >= 0) {
+ dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
}
- else {
- dbm = 0;
- if (mode >= 0) {
- dbm = dbm_open(RSTRING(file)->ptr, O_RDWR|O_CREAT, mode);
- }
- if (!dbm) {
- dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
- }
- if (!dbm) {
- dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
- }
+ if (!dbm) {
+ dbm = dbm_open(RSTRING(file)->ptr, O_RDWR, 0);
+ }
+ if (!dbm) {
+ dbm = dbm_open(RSTRING(file)->ptr, O_RDONLY, 0);
}
if (!dbm) {
@@ -170,6 +131,19 @@ fdbm_s_open(argc, argv, klass)
}
static VALUE
+fdbm_close(obj)
+ VALUE obj;
+{
+ struct dbmdata *dbmp;
+
+ GetDBM(obj, dbmp);
+ dbm_close(dbmp->di_dbm);
+ dbmp->di_dbm = 0;
+
+ return Qnil;
+}
+
+static VALUE
fdbm_fetch(obj, keystr, ifnone)
VALUE obj, keystr, ifnone;
{
@@ -177,11 +151,12 @@ fdbm_fetch(obj, keystr, ifnone)
struct dbmdata *dbmp;
DBM *dbm;
- StringValue(keystr);
+ keystr = rb_str_to_str(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
value = dbm_fetch(dbm, key);
if (value.dptr == 0) {
if (ifnone == Qnil && rb_block_given_p())
@@ -222,11 +197,12 @@ fdbm_index(obj, valstr)
struct dbmdata *dbmp;
DBM *dbm;
- StringValue(valstr);
+ valstr = rb_str_to_str(valstr);
val.dptr = RSTRING(valstr)->ptr;
val.dsize = RSTRING(valstr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
if (val.dsize == RSTRING(valstr)->len &&
@@ -248,77 +224,12 @@ fdbm_indexes(argc, argv, obj)
new = rb_ary_new2(argc);
for (i=0; i<argc; i++) {
- rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
- }
-
- return new;
-}
-
-static VALUE
-fdbm_select(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
-{
- VALUE new = rb_ary_new2(argc);
- int i;
-
- if (rb_block_given_p()) {
- datum key, val;
- DBM *dbm;
- struct dbmdata *dbmp;
-
- if (argc > 0) {
- rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
- }
- GetDBM2(obj, dbmp, dbm);
- for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
- VALUE assoc, v;
- val = dbm_fetch(dbm, key);
- assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
- rb_tainted_str_new(val.dptr, val.dsize));
- v = rb_yield(assoc);
- if (RTEST(v)) {
- rb_ary_push(new, assoc);
- }
- GetDBM2(obj, dbmp, dbm);
- }
- }
- else {
- rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
-
- for (i=0; i<argc; i++) {
- rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
- }
- }
-
- return new;
-}
-
-static VALUE
-fdbm_values_at(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
-{
- VALUE new = rb_ary_new2(argc);
- int i;
-
- for (i=0; i<argc; i++) {
- rb_ary_push(new, fdbm_fetch(obj, argv[i], Qnil));
+ rb_ary_push(new, fdbm_fetch(obj, argv[i]));
}
return new;
}
-static void
-fdbm_modify(obj)
- VALUE obj;
-{
- rb_secure(4);
- if (OBJ_FROZEN(obj)) rb_error_frozen("DBM");
-}
-
static VALUE
fdbm_delete(obj, keystr)
VALUE obj, keystr;
@@ -326,23 +237,21 @@ fdbm_delete(obj, keystr)
datum key, value;
struct dbmdata *dbmp;
DBM *dbm;
- VALUE valstr;
- fdbm_modify(obj);
- StringValue(keystr);
+ rb_secure(4);
+ keystr = rb_str_to_str(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
value = dbm_fetch(dbm, key);
if (value.dptr == 0) {
- if (rb_block_given_p()) return rb_yield(keystr);
+ if (rb_block_given_p()) rb_yield(keystr);
return Qnil;
}
- /* need to save value before dbm_delete() */
- valstr = rb_tainted_str_new(value.dptr, value.dsize);
-
if (dbm_delete(dbm, key)) {
dbmp->di_size = -1;
rb_raise(rb_eDBMError, "dbm_delete failed");
@@ -350,7 +259,7 @@ fdbm_delete(obj, keystr)
else if (dbmp->di_size >= 0) {
dbmp->di_size--;
}
- return valstr;
+ return obj;
}
static VALUE
@@ -362,8 +271,9 @@ fdbm_shift(obj)
DBM *dbm;
VALUE keystr, valstr;
- fdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
dbmp->di_size = -1;
key = dbm_firstkey(dbm);
@@ -387,8 +297,9 @@ fdbm_delete_if(obj)
VALUE ret, ary = rb_ary_new();
int i, status = 0, n;
- fdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
n = dbmp->di_size;
dbmp->di_size = -1;
@@ -397,14 +308,12 @@ fdbm_delete_if(obj)
keystr = rb_tainted_str_new(key.dptr, key.dsize);
valstr = rb_tainted_str_new(val.dptr, val.dsize);
ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
- if (status != 0) break;
+ if (status != 0) goto delete;
if (RTEST(ret)) rb_ary_push(ary, keystr);
- GetDBM2(obj, dbmp, dbm);
}
-
+ delete:
for (i = 0; i < RARRAY(ary)->len; i++) {
keystr = RARRAY(ary)->ptr[i];
- StringValue(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
if (dbm_delete(dbm, key)) {
@@ -425,13 +334,17 @@ fdbm_clear(obj)
struct dbmdata *dbmp;
DBM *dbm;
- fdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
dbmp->di_size = -1;
while (key = dbm_firstkey(dbm), key.dptr) {
- if (dbm_delete(dbm, key)) {
- rb_raise(rb_eDBMError, "dbm_delete failed");
- }
+ do {
+ if (dbm_delete(dbm, key)) {
+ rb_raise(rb_eDBMError, "dbm_delete failed");
+ }
+ key = dbm_nextkey(dbm);
+ } while (key.dptr);
}
dbmp->di_size = 0;
@@ -448,7 +361,8 @@ fdbm_invert(obj)
VALUE keystr, valstr;
VALUE hash = rb_hash_new();
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
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);
@@ -458,8 +372,6 @@ fdbm_invert(obj)
return hash;
}
-static VALUE each_pair _((VALUE));
-
static VALUE
each_pair(obj)
VALUE obj;
@@ -506,18 +418,19 @@ fdbm_store(obj, keystr, valstr)
struct dbmdata *dbmp;
DBM *dbm;
- fdbm_modify(obj);
+ rb_secure(4);
keystr = rb_obj_as_string(keystr);
- valstr = rb_obj_as_string(valstr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
+ valstr = rb_obj_as_string(valstr);
val.dptr = RSTRING(valstr)->ptr;
val.dsize = RSTRING(valstr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
dbmp->di_size = -1;
+ dbm = dbmp->di_dbm;
if (dbm_store(dbm, key, val, DBM_REPLACE)) {
#ifdef HAVE_DBM_CLEARERR
dbm_clearerr(dbm);
@@ -538,8 +451,9 @@ fdbm_length(obj)
DBM *dbm;
int i = 0;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+ dbm = dbmp->di_dbm;
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
i++;
@@ -558,7 +472,7 @@ fdbm_empty_p(obj)
DBM *dbm;
int i = 0;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
if (dbmp->di_size < 0) {
dbm = dbmp->di_dbm;
@@ -581,11 +495,11 @@ fdbm_each_value(obj)
struct dbmdata *dbmp;
DBM *dbm;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
- GetDBM2(obj, dbmp, dbm);
}
return obj;
}
@@ -598,10 +512,10 @@ fdbm_each_key(obj)
struct dbmdata *dbmp;
DBM *dbm;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
- GetDBM2(obj, dbmp, dbm);
}
return obj;
}
@@ -615,14 +529,14 @@ fdbm_each_pair(obj)
struct dbmdata *dbmp;
VALUE keystr, valstr;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
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);
valstr = rb_tainted_str_new(val.dptr, val.dsize);
rb_yield(rb_assoc_new(keystr, valstr));
- GetDBM2(obj, dbmp, dbm);
}
return obj;
@@ -637,7 +551,8 @@ fdbm_keys(obj)
DBM *dbm;
VALUE ary;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
ary = rb_ary_new();
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
@@ -656,7 +571,9 @@ fdbm_values(obj)
DBM *dbm;
VALUE ary;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
ary = rb_ary_new();
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
@@ -674,11 +591,12 @@ fdbm_has_key(obj, keystr)
struct dbmdata *dbmp;
DBM *dbm;
- StringValue(keystr);
+ keystr = rb_str_to_str(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
val = dbm_fetch(dbm, key);
if (val.dptr) return Qtrue;
return Qfalse;
@@ -692,11 +610,12 @@ fdbm_has_value(obj, valstr)
struct dbmdata *dbmp;
DBM *dbm;
- StringValue(valstr);
+ valstr = rb_str_to_str(valstr);
val.dptr = RSTRING(valstr)->ptr;
val.dsize = RSTRING(valstr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
if (val.dsize == RSTRING(valstr)->len &&
@@ -715,12 +634,14 @@ fdbm_to_a(obj)
DBM *dbm;
VALUE ary;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
ary = rb_ary_new();
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
- rb_tainted_str_new(val.dptr, val.dsize)));
+ rb_tainted_str_new(val.dptr, val.dsize)));
}
return ary;
@@ -735,7 +656,9 @@ fdbm_to_hash(obj)
DBM *dbm;
VALUE hash;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
hash = rb_hash_new();
for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
val = dbm_fetch(dbm, key);
@@ -756,61 +679,48 @@ fdbm_reject(obj)
void
Init_dbm()
{
- rb_cDBM = rb_define_class("DBM", rb_cObject);
+ cDBM = rb_define_class("DBM", rb_cObject);
rb_eDBMError = rb_define_class("DBMError", rb_eStandardError);
- rb_include_module(rb_cDBM, rb_mEnumerable);
-
- rb_define_alloc_func(rb_cDBM, fdbm_alloc);
- rb_define_singleton_method(rb_cDBM, "open", fdbm_s_open, -1);
-
- rb_define_method(rb_cDBM, "initialize", fdbm_initialize, -1);
- rb_define_method(rb_cDBM, "close", fdbm_close, 0);
- rb_define_method(rb_cDBM, "closed?", fdbm_closed, 0);
- rb_define_method(rb_cDBM, "[]", fdbm_aref, 1);
- rb_define_method(rb_cDBM, "fetch", fdbm_fetch_m, -1);
- rb_define_method(rb_cDBM, "[]=", fdbm_store, 2);
- rb_define_method(rb_cDBM, "store", fdbm_store, 2);
- rb_define_method(rb_cDBM, "index", fdbm_index, 1);
- rb_define_method(rb_cDBM, "indexes", fdbm_indexes, -1);
- rb_define_method(rb_cDBM, "indices", fdbm_indexes, -1);
- rb_define_method(rb_cDBM, "select", fdbm_select, -1);
- rb_define_method(rb_cDBM, "values_at", fdbm_values_at, -1);
- rb_define_method(rb_cDBM, "length", fdbm_length, 0);
- rb_define_method(rb_cDBM, "size", fdbm_length, 0);
- rb_define_method(rb_cDBM, "empty?", fdbm_empty_p, 0);
- rb_define_method(rb_cDBM, "each", fdbm_each_pair, 0);
- rb_define_method(rb_cDBM, "each_value", fdbm_each_value, 0);
- rb_define_method(rb_cDBM, "each_key", fdbm_each_key, 0);
- rb_define_method(rb_cDBM, "each_pair", fdbm_each_pair, 0);
- rb_define_method(rb_cDBM, "keys", fdbm_keys, 0);
- rb_define_method(rb_cDBM, "values", fdbm_values, 0);
- rb_define_method(rb_cDBM, "shift", fdbm_shift, 0);
- rb_define_method(rb_cDBM, "delete", fdbm_delete, 1);
- rb_define_method(rb_cDBM, "delete_if", fdbm_delete_if, 0);
- 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, "include?", fdbm_has_key, 1);
- rb_define_method(rb_cDBM, "has_key?", fdbm_has_key, 1);
- rb_define_method(rb_cDBM, "member?", fdbm_has_key, 1);
- rb_define_method(rb_cDBM, "has_value?", fdbm_has_value, 1);
- rb_define_method(rb_cDBM, "key?", fdbm_has_key, 1);
- rb_define_method(rb_cDBM, "value?", fdbm_has_value, 1);
-
- rb_define_method(rb_cDBM, "to_a", fdbm_to_a, 0);
- rb_define_method(rb_cDBM, "to_hash", fdbm_to_hash, 0);
-
- /* flags for dbm_open() */
- rb_define_const(rb_cDBM, "READER", INT2FIX(O_RDONLY|RUBY_DBM_RW_BIT));
- rb_define_const(rb_cDBM, "WRITER", INT2FIX(O_RDWR|RUBY_DBM_RW_BIT));
- rb_define_const(rb_cDBM, "WRCREAT", INT2FIX(O_RDWR|O_CREAT|RUBY_DBM_RW_BIT));
- rb_define_const(rb_cDBM, "NEWDB", INT2FIX(O_RDWR|O_CREAT|O_TRUNC|RUBY_DBM_RW_BIT));
-
-#ifdef DB_VERSION_STRING
- rb_define_const(rb_cDBM, "VERSION", rb_str_new2(DB_VERSION_STRING));
-#endif
+ rb_include_module(cDBM, rb_mEnumerable);
+
+ rb_define_singleton_method(cDBM, "new", fdbm_s_new, -1);
+ rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+
+ rb_define_method(cDBM, "initialize", fdbm_initialize, -1);
+ rb_define_method(cDBM, "close", fdbm_close, 0);
+ rb_define_method(cDBM, "[]", fdbm_aref, 1);
+ rb_define_method(cDBM, "fetch", fdbm_fetch_m, -1);
+ rb_define_method(cDBM, "[]=", fdbm_store, 2);
+ rb_define_method(cDBM, "store", fdbm_store, 2);
+ rb_define_method(cDBM, "index", fdbm_index, 1);
+ rb_define_method(cDBM, "indexes", fdbm_indexes, -1);
+ rb_define_method(cDBM, "indices", fdbm_indexes, -1);
+ rb_define_method(cDBM, "length", fdbm_length, 0);
+ rb_define_alias(cDBM, "size", "length");
+ rb_define_method(cDBM, "empty?", fdbm_empty_p, 0);
+ rb_define_method(cDBM, "each", fdbm_each_pair, 0);
+ rb_define_method(cDBM, "each_value", fdbm_each_value, 0);
+ rb_define_method(cDBM, "each_key", fdbm_each_key, 0);
+ rb_define_method(cDBM, "each_pair", fdbm_each_pair, 0);
+ rb_define_method(cDBM, "keys", fdbm_keys, 0);
+ rb_define_method(cDBM, "values", fdbm_values, 0);
+ rb_define_method(cDBM, "shift", fdbm_shift, 0);
+ rb_define_method(cDBM, "delete", fdbm_delete, 1);
+ rb_define_method(cDBM, "delete_if", fdbm_delete_if, 0);
+ rb_define_method(cDBM, "reject!", fdbm_delete_if, 0);
+ rb_define_method(cDBM, "reject", fdbm_reject, 0);
+ rb_define_method(cDBM, "clear", fdbm_clear, 0);
+ rb_define_method(cDBM,"invert", fdbm_invert, 0);
+ rb_define_method(cDBM,"update", fdbm_update, 1);
+ rb_define_method(cDBM,"replace", fdbm_replace, 1);
+
+ rb_define_method(cDBM, "include?", fdbm_has_key, 1);
+ rb_define_method(cDBM, "has_key?", fdbm_has_key, 1);
+ rb_define_method(cDBM, "member?", fdbm_has_key, 1);
+ rb_define_method(cDBM, "has_value?", fdbm_has_value, 1);
+ rb_define_method(cDBM, "key?", fdbm_has_key, 1);
+ rb_define_method(cDBM, "value?", fdbm_has_value, 1);
+
+ rb_define_method(cDBM, "to_a", fdbm_to_a, 0);
+ rb_define_method(cDBM, "to_hash", fdbm_to_hash, 0);
}
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 0074ab605b..9ce235a2b5 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -1,53 +1,13 @@
require 'mkmf'
dir_config("dbm")
-
-if dblib = with_config("dbm-type", nil)
- dblib = dblib.split(/[ ,]+/)
-else
- dblib = %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
+if have_library("gdbm", "dbm_open")
+ gdbm = true
end
-
-headers = {
- "db" => ["db.h"],
- "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
- "db2" => ["db2/db.h", "db2.h", "db.h"],
- "dbm" => ["ndbm.h"],
- "gdbm" => ["gdbm-ndbm.h", "ndbm.h"],
- "gdbm_compat" => ["gdbm-ndbm.h", "ndbm.h"],
- "qdbm" => ["relic.h"],
-}
-
-def headers.db_check(db)
- db_prefix = nil
- have_gdbm = false
- hsearch = nil
-
- case db
- 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_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and
- hdr = self.fetch(db, ["ndbm.h"]).find {|hdr| have_type("DBM", hdr, hsearch)}
- have_func(db_prefix+"dbm_clearerr") unless have_gdbm
- $defs << hsearch if hsearch
- $defs << '-DDBM_HDR="<'+hdr+'>"'
- true
- else
- false
- end
-end
-
-if dblib.any? {|db| headers.db_check(db)}
- have_header("cdefs.h")
- have_header("sys/cdefs.h")
+gdbm or have_library("db", "dbm_open") or have_library("dbm", "dbm_open")
+have_header("cdefs.h")
+have_header("sys/cdefs.h")
+if have_header("ndbm.h") and have_func("dbm_open")
+ have_func("dbm_clearerr") unless gdbm
create_makefile("dbm")
end
diff --git a/ext/digest/.cvsignore b/ext/digest/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/bubblebabble/.cvsignore b/ext/digest/bubblebabble/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/bubblebabble/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c
deleted file mode 100644
index 3a03ceced0..0000000000
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/************************************************
-
- bubblebabble.c - BubbleBabble encoding support
-
- $Author$
- created at: Fri Oct 13 18:31:42 JST 2006
-
- Copyright (C) 2006 Akinori MUSHA
-
- $Id$
-
-************************************************/
-
-#include "ruby.h"
-#include "digest.h"
-
-static ID id_digest;
-
-static VALUE
-bubblebabble_str_new(VALUE str_digest)
-{
- char *digest;
- size_t digest_len;
- VALUE str;
- char *p;
- int i, j, seed = 1;
- static const char vowels[] = {
- 'a', 'e', 'i', 'o', 'u', 'y'
- };
- static const char consonants[] = {
- 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', 'n',
- 'p', 'r', 's', 't', 'v', 'z', 'x'
- };
-
- StringValue(str_digest);
- digest = RSTRING_PTR(str_digest);
- digest_len = RSTRING_LEN(str_digest);
-
- if ((LONG_MAX - 2) / 3 < (digest_len | 1)) {
- rb_raise(rb_eRuntimeError, "digest string too long");
- }
-
- str = rb_str_new(0, (digest_len | 1) * 3 + 2);
- p = RSTRING_PTR(str);
-
- i = j = 0;
- p[j++] = 'x';
-
- for (;;) {
- unsigned char byte1, byte2;
-
- if (i >= digest_len) {
- p[j++] = vowels[seed % 6];
- p[j++] = consonants[16];
- p[j++] = vowels[seed / 6];
- break;
- }
-
- byte1 = digest[i++];
- p[j++] = vowels[(((byte1 >> 6) & 3) + seed) % 6];
- p[j++] = consonants[(byte1 >> 2) & 15];
- p[j++] = vowels[((byte1 & 3) + (seed / 6)) % 6];
-
- if (i >= digest_len) {
- break;
- }
-
- byte2 = digest[i++];
- p[j++] = consonants[(byte2 >> 4) & 15];
- p[j++] = '-';
- p[j++] = consonants[byte2 & 15];
-
- seed = (seed * 5 + byte1 * 7 + byte2) % 36;
- }
-
- p[j] = 'x';
-
- return str;
-}
-
-/*
- * call-seq:
- * Digest.bubblebabble(string) -> bubblebabble_string
- *
- * Returns a BubbleBabble encoded version of a given _string_.
- */
-static VALUE
-rb_digest_s_bubblebabble(VALUE klass, VALUE str)
-{
- return bubblebabble_str_new(str);
-}
-
-/*
- * call-seq:
- * Digest::Class.bubblebabble(string, ...) -> hash_string
- *
- * Returns the BubbleBabble encoded hash value of a given _string_.
- */
-static VALUE
-rb_digest_class_s_bubblebabble(int argc, VALUE *argv, VALUE klass)
-{
- return bubblebabble_str_new(rb_funcall2(klass, id_digest, argc, argv));
-}
-
-/*
- * call-seq:
- * digest_obj.bubblebabble -> hash_string
- *
- * Returns the resulting hash value in a Bubblebabble encoded form.
- */
-static VALUE
-rb_digest_instance_bubblebabble(VALUE self)
-{
- return bubblebabble_str_new(rb_funcall(self, id_digest, 0));
-}
-
-/*
- * This module adds some methods to Digest classes to perform
- * BubbleBabble encoding.
- */
-void
-Init_bubblebabble(void)
-{
- VALUE mDigest, mDigest_Instance, cDigest_Class;
-
- rb_require("digest");
-
- mDigest = rb_path2class("Digest");
- mDigest_Instance = rb_path2class("Digest::Instance");
- cDigest_Class = rb_path2class("Digest::Class");
-
- /* Digest::bubblebabble() */
- rb_define_module_function(mDigest, "bubblebabble", rb_digest_s_bubblebabble, 1);
-
- /* Digest::Class::bubblebabble() */
- rb_define_singleton_method(cDigest_Class, "bubblebabble", rb_digest_class_s_bubblebabble, -1);
-
- /* Digest::Instance#bubblebabble() */
- rb_define_method(mDigest_Instance, "bubblebabble", rb_digest_instance_bubblebabble, 0);
-
- id_digest = rb_intern("digest");
-}
diff --git a/ext/digest/bubblebabble/depend b/ext/digest/bubblebabble/depend
deleted file mode 100644
index b20148ded4..0000000000
--- a/ext/digest/bubblebabble/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-bubblebabble.o: bubblebabble.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
- $(srcdir)/../defs.h
diff --git a/ext/digest/bubblebabble/extconf.rb b/ext/digest/bubblebabble/extconf.rb
deleted file mode 100644
index 53cb83934a..0000000000
--- a/ext/digest/bubblebabble/extconf.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-require 'mkmf'
-
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
-
-create_makefile('digest/bubblebabble')
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
deleted file mode 100644
index b9a3470e65..0000000000
--- a/ext/digest/defs.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#ifndef DEFS_H
-#define DEFS_H
-
-#include "ruby.h"
-#include <sys/types.h>
-
-#if defined(HAVE_SYS_CDEFS_H)
-# include <sys/cdefs.h>
-#endif
-#if !defined(__BEGIN_DECLS)
-# define __BEGIN_DECLS
-# define __END_DECLS
-#endif
-
-#if defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif !defined __CYGWIN__ || !defined __uint8_t_defined
- typedef unsigned char uint8_t;
- typedef unsigned int uint32_t;
-# if SIZEOF_LONG == 8
- typedef unsigned long uint64_t;
-# elif SIZEOF_LONG_LONG == 8
- typedef unsigned LONG_LONG uint64_t;
-# else
-# define NO_UINT64_T
-# endif
-#endif
-
-#endif /* DEFS_H */
diff --git a/ext/digest/depend b/ext/digest/depend
deleted file mode 100644
index 43601a208f..0000000000
--- a/ext/digest/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-digest.o: digest.c digest.h $(hdrdir)/ruby.h $(topdir)/config.h \
- $(hdrdir)/defines.h $(hdrdir)/intern.h
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
deleted file mode 100644
index 0b910e8c47..0000000000
--- a/ext/digest/digest.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/************************************************
-
- digest.c -
-
- $Author$
- created at: Fri May 25 08:57:27 JST 2001
-
- Copyright (C) 1995-2001 Yukihiro Matsumoto
- Copyright (C) 2001-2006 Akinori MUSHA
-
- $RoughId: digest.c,v 1.16 2001/07/13 15:38:27 knu Exp $
- $Id$
-
-************************************************/
-
-#include "digest.h"
-
-static VALUE rb_mDigest;
-static VALUE rb_mDigest_Instance;
-static VALUE rb_cDigest_Class;
-static VALUE rb_cDigest_Base;
-
-static ID id_reset, id_update, id_finish, id_digest, id_hexdigest, id_digest_length;
-static ID id_metadata;
-
-RUBY_EXTERN void Init_digest_base(void);
-
-/*
- * Document-module: Digest
- *
- * This module provides a framework for message digest libraries.
- */
-
-static VALUE
-hexencode_str_new(VALUE str_digest)
-{
- char *digest;
- size_t digest_len;
- int i;
- VALUE str;
- char *p;
- static const char hex[] = {
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
- 'a', 'b', 'c', 'd', 'e', 'f'
- };
-
- StringValue(str_digest);
- digest = RSTRING_PTR(str_digest);
- digest_len = RSTRING_LEN(str_digest);
-
- if (LONG_MAX / 2 < digest_len) {
- rb_raise(rb_eRuntimeError, "digest string too long");
- }
-
- str = rb_str_new(0, digest_len * 2);
-
- for (i = 0, p = RSTRING_PTR(str); i < digest_len; i++) {
- unsigned char byte = digest[i];
-
- p[i + i] = hex[byte >> 4];
- p[i + i + 1] = hex[byte & 0x0f];
- }
-
- return str;
-}
-
-/*
- * call-seq:
- * Digest.hexencode(string) -> hexencoded_string
- *
- * Generates a hex-encoded version of a given _string_.
- */
-static VALUE
-rb_digest_s_hexencode(VALUE klass, VALUE str)
-{
- return hexencode_str_new(str);
-}
-
-/*
- * Document-module: Digest::Instance
- *
- * This module provides instance methods for a digest implementation
- * object to calculate message digest values.
- */
-
-/*
- * call-seq:
- * digest_obj.update(string) -> digest_obj
- * digest_obj << string -> digest_obj
- *
- * Updates the digest using a given _string_ and returns self.
- *
- * The update() method and the left-shift operator are overridden by
- * each implementation subclass. (One should be an alias for the
- * other)
- */
-static VALUE
-rb_digest_instance_update(VALUE self, VALUE str)
-{
- rb_raise(rb_eRuntimeError, "%s does not implement update()", RSTRING_PTR(rb_inspect(self)));
-}
-
-/*
- * call-seq:
- * digest_obj.instance_eval { finish } -> digest_obj
- *
- * Finishes the digest and returns the resulting hash value.
- *
- * This method is overridden by each implementation subclass and often
- * made private, because some of those subclasses may leave internal
- * data uninitialized. Do not call this method from outside. Use
- * #digest!() instead, which ensures that internal data be reset for
- * security reasons.
- */
-static VALUE
-rb_digest_instance_finish(VALUE self)
-{
- rb_raise(rb_eRuntimeError, "%s does not implement finish()", RSTRING_PTR(rb_inspect(self)));
-}
-
-/*
- * call-seq:
- * digest_obj.reset -> digest_obj
- *
- * Resets the digest to the initial state and returns self.
- *
- * This method is overridden by each implementation subclass.
- */
-static VALUE
-rb_digest_instance_reset(VALUE self)
-{
- rb_raise(rb_eRuntimeError, "%s does not implement reset()", RSTRING_PTR(rb_inspect(self)));
-}
-
-/*
- * call-seq:
- * digest_obj.new -> another_digest_obj
- *
- * Returns a new, initialized copy of the digest object. Equivalent
- * to digest_obj.clone().reset().
- */
-static VALUE
-rb_digest_instance_new(VALUE self)
-{
- VALUE clone = rb_obj_clone(self);
- rb_funcall(clone, id_reset, 0);
- return clone;
-}
-
-/*
- * call-seq:
- * digest_obj.digest -> string
- * digest_obj.digest(string) -> string
- *
- * If none is given, returns the resulting hash value of the digest,
- * keeping the digest's state.
- *
- * If a _string_ is given, returns the hash value for the given
- * _string_, resetting the digest to the initial state before and
- * after the process.
- */
-static VALUE
-rb_digest_instance_digest(int argc, VALUE *argv, VALUE self)
-{
- VALUE str, value;
-
- if (rb_scan_args(argc, argv, "01", &str) > 0) {
- rb_funcall(self, id_reset, 0);
- rb_funcall(self, id_update, 1, str);
- value = rb_funcall(self, id_finish, 0);
- rb_funcall(self, id_reset, 0);
- } else {
- VALUE clone = rb_obj_clone(self);
-
- value = rb_funcall(clone, id_finish, 0);
- rb_funcall(clone, id_reset, 0);
- }
-
- return value;
-}
-
-/*
- * call-seq:
- * digest_obj.digest! -> string
- *
- * Returns the resulting hash value and resets the digest to the
- * initial state.
- */
-static VALUE
-rb_digest_instance_digest_bang(VALUE self)
-{
- VALUE value = rb_funcall(self, id_finish, 0);
- rb_funcall(self, id_reset, 0);
-
- return value;
-}
-
-/*
- * call-seq:
- * digest_obj.hexdigest -> string
- * digest_obj.hexdigest(string) -> string
- *
- * If none is given, returns the resulting hash value of the digest in
- * a hex-encoded form, keeping the digest's state.
- *
- * If a _string_ is given, returns the hash value for the given
- * _string_ in a hex-encoded form, resetting the digest to the initial
- * state before and after the process.
- */
-static VALUE
-rb_digest_instance_hexdigest(int argc, VALUE *argv, VALUE self)
-{
- VALUE str, value;
-
- if (rb_scan_args(argc, argv, "01", &str) > 0) {
- rb_funcall(self, id_reset, 0);
- rb_funcall(self, id_update, 1, str);
- value = rb_funcall(self, id_finish, 0);
- rb_funcall(self, id_reset, 0);
- } else {
- VALUE clone = rb_obj_clone(self);
-
- value = rb_funcall(clone, id_finish, 0);
- rb_funcall(clone, id_reset, 0);
- }
-
- return hexencode_str_new(value);
-}
-
-/*
- * call-seq:
- * digest_obj.hexdigest! -> string
- *
- * Returns the resulting hash value and resets the digest to the
- * initial state.
- */
-static VALUE
-rb_digest_instance_hexdigest_bang(VALUE self)
-{
- VALUE value = rb_funcall(self, id_finish, 0);
- rb_funcall(self, id_reset, 0);
-
- return hexencode_str_new(value);
-}
-
-/*
- * call-seq:
- * digest_obj.to_s -> string
- *
- * Returns digest_obj.hexdigest().
- */
-static VALUE
-rb_digest_instance_to_s(VALUE self)
-{
- return rb_funcall(self, id_hexdigest, 0);
-}
-
-/*
- * call-seq:
- * digest_obj.inspect -> string
- *
- * Creates a printable version of the digest object.
- */
-static VALUE
-rb_digest_instance_inspect(VALUE self)
-{
- VALUE str;
- size_t digest_len = 32; /* about this size at least */
- char *cname;
-
- cname = rb_obj_classname(self);
-
- /* #<Digest::ClassName: xxxxx...xxxx> */
- str = rb_str_buf_new(2 + strlen(cname) + 2 + digest_len * 2 + 1);
- rb_str_buf_cat2(str, "#<");
- rb_str_buf_cat2(str, cname);
- rb_str_buf_cat2(str, ": ");
- rb_str_buf_append(str, rb_digest_instance_hexdigest(0, 0, self));
- rb_str_buf_cat2(str, ">");
- return str;
-}
-
-/*
- * call-seq:
- * digest_obj == another_digest_obj -> boolean
- * digest_obj == string -> boolean
- *
- * If a string is given, checks whether it is equal to the hex-encoded
- * hash value of the digest object. If another digest instance is
- * given, checks whether they have the same hash value. Otherwise
- * returns false.
- */
-static VALUE
-rb_digest_instance_equal(VALUE self, VALUE other)
-{
- VALUE str1, str2;
-
- if (rb_obj_is_kind_of(other, rb_mDigest_Instance) == Qtrue) {
- str1 = rb_digest_instance_digest(0, 0, self);
- str2 = rb_digest_instance_digest(0, 0, other);
- } else {
- str1 = rb_digest_instance_to_s(self);
- str2 = other;
- }
-
- /* never blindly assume that subclass methods return strings */
- StringValue(str1);
- StringValue(str2);
-
- if (RSTRING_LEN(str1) == RSTRING_LEN(str2) &&
- rb_str_cmp(str1, str2) == 0) {
- return Qtrue;
- }
- return Qfalse;
-}
-
-/*
- * call-seq:
- * digest_obj.digest_length -> integer
- *
- * Returns the length of the hash value of the digest.
- *
- * This method should be overridden by each implementation subclass.
- * If not, digest_obj.digest().length() is returned.
- */
-static VALUE
-rb_digest_instance_digest_length(VALUE self)
-{
- /* subclasses really should redefine this method */
- VALUE digest = rb_digest_instance_digest(0, 0, self);
-
- /* never blindly assume that #digest() returns a string */
- StringValue(digest);
- return INT2NUM(RSTRING_LEN(digest));
-}
-
-/*
- * call-seq:
- * digest_obj.length -> integer
- * digest_obj.size -> integer
- *
- * Returns digest_obj.digest_length().
- */
-static VALUE
-rb_digest_instance_length(VALUE self)
-{
- return rb_funcall(self, id_digest_length, 0);
-}
-
-/*
- * call-seq:
- * digest_obj.block_length -> integer
- *
- * Returns the block length of the digest.
- *
- * This method is overridden by each implementation subclass.
- */
-static VALUE
-rb_digest_instance_block_length(VALUE self)
-{
- rb_raise(rb_eRuntimeError, "%s does not implement block_length()", RSTRING_PTR(rb_inspect(self)));
-}
-
-/*
- * Document-class: Digest::Class
- *
- * This module stands as a base class for digest implementation
- * classes.
- */
-
-/*
- * call-seq:
- * Digest::Class.digest(string, *parameters) -> hash_string
- *
- * Returns the hash value of a given _string_. This is equivalent to
- * Digest::Class.new(*parameters).digest(string), where extra
- * _parameters_, if any, are passed through to the constructor and the
- * _string_ is passed to #digest().
- */
-static VALUE
-rb_digest_class_s_digest(int argc, VALUE *argv, VALUE klass)
-{
- VALUE str;
- volatile VALUE obj;
-
- if (argc < 1) {
- rb_raise(rb_eArgError, "no data given");
- }
-
- str = *argv++;
- argc--;
-
- StringValue(str);
-
- obj = rb_obj_alloc(klass);
- rb_obj_call_init(obj, argc, argv);
-
- return rb_funcall(obj, id_digest, 1, str);
-}
-
-/*
- * call-seq:
- * Digest::Class.hexdigest(string[, ...]) -> hash_string
- *
- * Returns the hex-encoded hash value of a given _string_. This is
- * almost equivalent to
- * Digest.hexencode(Digest::Class.new(*parameters).digest(string)).
- */
-static VALUE
-rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
-{
- return hexencode_str_new(rb_funcall2(klass, id_digest, argc, argv));
-}
-
-/*
- * Document-class: Digest::Base
- *
- * This abstract class provides a common interface to message digest
- * implementation classes written in C.
- */
-
-static rb_digest_metadata_t *
-get_digest_base_metadata(VALUE klass)
-{
- VALUE p;
- VALUE obj;
- rb_digest_metadata_t *algo;
-
- for (p = klass; p; p = RCLASS(p)->super) {
- if (rb_ivar_defined(p, id_metadata)) {
- obj = rb_ivar_get(p, id_metadata);
- break;
- }
- }
-
- if (!p)
- rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
-
- Data_Get_Struct(obj, rb_digest_metadata_t, algo);
-
- switch (algo->api_version) {
- case 2:
- break;
-
- /*
- * put conversion here if possible when API is updated
- */
-
- default:
- rb_raise(rb_eRuntimeError, "Incompatible digest API version");
- }
-
- return algo;
-}
-
-static VALUE
-rb_digest_base_alloc(VALUE klass)
-{
- rb_digest_metadata_t *algo;
- VALUE obj;
- void *pctx;
-
- if (klass == rb_cDigest_Base) {
- rb_raise(rb_eNotImpError, "Digest::Base is an abstract class");
- }
-
- algo = get_digest_base_metadata(klass);
-
- pctx = xmalloc(algo->ctx_size);
- algo->init_func(pctx);
-
- obj = Data_Wrap_Struct(klass, 0, free, pctx);
-
- return obj;
-}
-
-/* :nodoc: */
-static VALUE
-rb_digest_base_copy(VALUE copy, VALUE obj)
-{
- rb_digest_metadata_t *algo;
- void *pctx1, *pctx2;
-
- if (copy == obj) return copy;
-
- rb_check_frozen(copy);
-
- algo = get_digest_base_metadata(rb_obj_class(copy));
-
- Data_Get_Struct(obj, void, pctx1);
- Data_Get_Struct(copy, void, pctx2);
- memcpy(pctx2, pctx1, algo->ctx_size);
-
- return copy;
-}
-
-/* :nodoc: */
-static VALUE
-rb_digest_base_reset(VALUE self)
-{
- rb_digest_metadata_t *algo;
- void *pctx;
-
- algo = get_digest_base_metadata(rb_obj_class(self));
-
- Data_Get_Struct(self, void, pctx);
-
- algo->init_func(pctx);
-
- return self;
-}
-
-/* :nodoc: */
-static VALUE
-rb_digest_base_update(VALUE self, VALUE str)
-{
- rb_digest_metadata_t *algo;
- void *pctx;
-
- algo = get_digest_base_metadata(rb_obj_class(self));
-
- Data_Get_Struct(self, void, pctx);
-
- StringValue(str);
- algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
-
- return self;
-}
-
-/* :nodoc: */
-static VALUE
-rb_digest_base_finish(VALUE self)
-{
- rb_digest_metadata_t *algo;
- void *pctx;
- VALUE str;
-
- algo = get_digest_base_metadata(rb_obj_class(self));
-
- Data_Get_Struct(self, void, pctx);
-
- str = rb_str_new(0, algo->digest_len);
- algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str));
-
- /* avoid potential coredump caused by use of a finished context */
- algo->init_func(pctx);
-
- return str;
-}
-
-/* :nodoc: */
-static VALUE
-rb_digest_base_digest_length(VALUE self)
-{
- rb_digest_metadata_t *algo;
-
- algo = get_digest_base_metadata(rb_obj_class(self));
-
- return INT2NUM(algo->digest_len);
-}
-
-/* :nodoc: */
-static VALUE
-rb_digest_base_block_length(VALUE self)
-{
- rb_digest_metadata_t *algo;
-
- algo = get_digest_base_metadata(rb_obj_class(self));
-
- return INT2NUM(algo->block_len);
-}
-
-void
-Init_digest(void)
-{
- id_reset = rb_intern("reset");
- id_update = rb_intern("update");
- id_finish = rb_intern("finish");
- id_digest = rb_intern("digest");
- id_hexdigest = rb_intern("hexdigest");
- id_digest_length = rb_intern("digest_length");
-
- /*
- * module Digest
- */
- rb_mDigest = rb_define_module("Digest");
-
- /* module functions */
- rb_define_module_function(rb_mDigest, "hexencode", rb_digest_s_hexencode, 1);
-
- /*
- * module Digest::Instance
- */
- rb_mDigest_Instance = rb_define_module_under(rb_mDigest, "Instance");
-
- /* instance methods that should be overridden */
- rb_define_method(rb_mDigest_Instance, "update", rb_digest_instance_update, 1);
- rb_define_method(rb_mDigest_Instance, "<<", rb_digest_instance_update, 1);
- rb_define_private_method(rb_mDigest_Instance, "finish", rb_digest_instance_finish, 0);
- rb_define_method(rb_mDigest_Instance, "reset", rb_digest_instance_reset, 0);
- rb_define_method(rb_mDigest_Instance, "digest_length", rb_digest_instance_digest_length, 0);
- rb_define_method(rb_mDigest_Instance, "block_length", rb_digest_instance_block_length, 0);
-
- /* instance methods that may be overridden */
- rb_define_method(rb_mDigest_Instance, "==", rb_digest_instance_equal, 1);
- rb_define_method(rb_mDigest_Instance, "inspect", rb_digest_instance_inspect, 0);
-
- /* instance methods that need not usually be overridden */
- rb_define_method(rb_mDigest_Instance, "new", rb_digest_instance_new, 0);
- rb_define_method(rb_mDigest_Instance, "digest", rb_digest_instance_digest, -1);
- rb_define_method(rb_mDigest_Instance, "digest!", rb_digest_instance_digest_bang, 0);
- rb_define_method(rb_mDigest_Instance, "hexdigest", rb_digest_instance_hexdigest, -1);
- rb_define_method(rb_mDigest_Instance, "hexdigest!", rb_digest_instance_hexdigest_bang, 0);
- rb_define_method(rb_mDigest_Instance, "to_s", rb_digest_instance_to_s, 0);
- rb_define_method(rb_mDigest_Instance, "length", rb_digest_instance_length, 0);
- rb_define_method(rb_mDigest_Instance, "size", rb_digest_instance_length, 0);
-
- /*
- * class Digest::Class
- */
- rb_cDigest_Class = rb_define_class_under(rb_mDigest, "Class", rb_cObject);
- rb_include_module(rb_cDigest_Class, rb_mDigest_Instance);
-
- /* class methods */
- rb_define_singleton_method(rb_cDigest_Class, "digest", rb_digest_class_s_digest, -1);
- rb_define_singleton_method(rb_cDigest_Class, "hexdigest", rb_digest_class_s_hexdigest, -1);
-
- id_metadata = rb_intern("metadata");
-
- /* class Digest::Base < Digest::Class */
- rb_cDigest_Base = rb_define_class_under(rb_mDigest, "Base", rb_cDigest_Class);
-
- rb_define_alloc_func(rb_cDigest_Base, rb_digest_base_alloc);
-
- rb_define_method(rb_cDigest_Base, "initialize_copy", rb_digest_base_copy, 1);
- rb_define_method(rb_cDigest_Base, "reset", rb_digest_base_reset, 0);
- rb_define_method(rb_cDigest_Base, "update", rb_digest_base_update, 1);
- rb_define_method(rb_cDigest_Base, "<<", rb_digest_base_update, 1);
- rb_define_private_method(rb_cDigest_Base, "finish", rb_digest_base_finish, 0);
- rb_define_method(rb_cDigest_Base, "digest_length", rb_digest_base_digest_length, 0);
- rb_define_method(rb_cDigest_Base, "block_length", rb_digest_base_block_length, 0);
-}
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
deleted file mode 100644
index 6e4906c859..0000000000
--- a/ext/digest/digest.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/************************************************
-
- digest.h - header file for ruby digest modules
-
- $Author$
- created at: Fri May 25 08:54:56 JST 2001
-
-
- Copyright (C) 2001-2006 Akinori MUSHA
-
- $RoughId: digest.h,v 1.3 2001/07/13 15:38:27 knu Exp $
- $Id$
-
-************************************************/
-
-#include "ruby.h"
-
-#define RUBY_DIGEST_API_VERSION 2
-
-typedef void (*rb_digest_hash_init_func_t)(void *);
-typedef void (*rb_digest_hash_update_func_t)(void *, unsigned char *, size_t);
-typedef void (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
-
-typedef struct {
- int api_version;
- size_t digest_len;
- size_t block_len;
- size_t ctx_size;
- rb_digest_hash_init_func_t init_func;
- rb_digest_hash_update_func_t update_func;
- rb_digest_hash_finish_func_t finish_func;
-} rb_digest_metadata_t;
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
deleted file mode 100644
index cf9127ecc0..0000000000
--- a/ext/digest/extconf.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# $RoughId: extconf.rb,v 1.6 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require "mkmf"
-
-$INSTALLFILES = {
- "digest.h" => "$(RUBYARCHDIR)"
-}
-
-create_makefile("digest")
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
deleted file mode 100644
index 0c4ee3c2cc..0000000000
--- a/ext/digest/lib/digest.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'digest.so'
-
-module Digest
- def self.const_missing(name)
- case name
- when :SHA256, :SHA384, :SHA512
- lib = 'digest/sha2.so'
- else
- lib = File.join('digest', name.to_s.downcase)
- end
-
- begin
- require lib
- rescue LoadError => e
- raise LoadError, "library not found for class Digest::#{name} -- #{lib}", caller(1)
- end
- unless Digest.const_defined?(name)
- raise NameError, "uninitialized constant Digest::#{name}", caller(1)
- end
- Digest.const_get(name)
- end
-
- class ::Digest::Class
- # creates a digest object and reads a given file, _name_.
- #
- # p Digest::SHA256.file("X11R6.8.2-src.tar.bz2").hexdigest
- # # => "f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534"
- def self.file(name)
- new.file(name)
- end
- end
-
- module Instance
- # updates the digest with the contents of a given file _name_ and
- # returns self.
- def file(name)
- File.open(name, "rb") {|f|
- buf = ""
- while f.read(16384, buf)
- update buf
- end
- }
- self
- end
- end
-end
-
-def Digest(name)
- Digest.const_get(name)
-end
diff --git a/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
deleted file mode 100644
index c399f2de1d..0000000000
--- a/ext/digest/lib/md5.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# just for compatibility; requiring "md5" is obsoleted
-#
-# $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require 'digest/md5'
-
-class MD5 < Digest::MD5
- class << self
- alias orig_new new
- def new(str = nil)
- if str
- orig_new.update(str)
- else
- orig_new
- end
- end
-
- def md5(*args)
- new(*args)
- end
- end
-end
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
deleted file mode 100644
index 4446e12e8d..0000000000
--- a/ext/digest/lib/sha1.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# just for compatibility; requiring "sha1" is obsoleted
-#
-# $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-require 'digest/sha1'
-
-class SHA1 < Digest::SHA1
- class << self
- alias orig_new new
- def new(str = nil)
- if str
- orig_new.update(str)
- else
- orig_new
- end
- end
-
- def sha1(*args)
- new(*args)
- end
- end
-end
diff --git a/ext/digest/md5/.cvsignore b/ext/digest/md5/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/md5/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
deleted file mode 100644
index 8eaec20b4b..0000000000
--- a/ext/digest/md5/depend
+++ /dev/null
@@ -1,6 +0,0 @@
-md5.o: md5.c md5.h $(srcdir)/../defs.h $(hdrdir)/ruby.h $(topdir)/config.h \
- $(hdrdir)/defines.h $(hdrdir)/intern.h
-md5init.o: md5init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h md5.h \
- $(srcdir)/../defs.h
-md5ossl.o: md5ossl.h
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
deleted file mode 100644
index 018f8ccb02..0000000000
--- a/ext/digest/md5/extconf.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# $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")
-
-if !with_config("bundled-md5") &&
- have_library("crypto") && have_header("openssl/md5.h")
- $objs << "md5ossl.#{$OBJEXT}"
-
-else
- $objs << "md5.#{$OBJEXT}"
-end
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-$preload = %w[digest]
-
-create_makefile("digest/md5")
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
deleted file mode 100644
index 993bc47a06..0000000000
--- a/ext/digest/md5/md5.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- Copyright (C) 1999, 2000 Aladdin Enterprises. All rights reserved.
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- L. Peter Deutsch
- ghost@aladdin.com
-
- */
-
-/*
- Independent implementation of MD5 (RFC 1321).
-
- This code implements the MD5 Algorithm defined in RFC 1321.
- It is derived directly from the text of the RFC and not from the
- reference implementation.
-
- The original and principal author of md5.c is L. Peter Deutsch
- <ghost@aladdin.com>. Other authors are noted in the change history
- that follows (in reverse chronological order):
-
- 2000-07-03 lpd Patched to eliminate warnings about "constant is
- unsigned in ANSI C, signed in traditional";
- made test program self-checking.
- 1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
- 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
- 1999-05-03 lpd Original version.
- */
-
-/*
- This code was modified for use in Ruby.
-
- - Akinori MUSHA <knu@idaemons.org>
- */
-
-/*$OrigId: md5c.c,v 1.2 2001/03/26 08:57:14 matz Exp $ */
-/*$RoughId: md5.c,v 1.2 2001/07/13 19:48:41 knu Exp $ */
-/*$Id$ */
-
-#include "md5.h"
-
-#ifdef TEST
-/*
- * Compile with -DTEST to create a self-contained executable test program.
- * The test program should print out the same values as given in section
- * A.5 of RFC 1321, reproduced below.
- */
-#include <string.h>
-main()
-{
- static const char *const test[7*2] = {
- "", "d41d8cd98f00b204e9800998ecf8427e",
- "a", "0cc175b9c0f1b6a831c399e269772661",
- "abc", "900150983cd24fb0d6963f7d28e17f72",
- "message digest", "f96b697d7cb7938d525a2f31aaf161d0",
- "abcdefghijklmnopqrstuvwxyz", "c3fcd3d76192e4007dfb496cca67e13b",
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
- "d174ab98d277d9f5a5611c2c9f419d9f",
- "12345678901234567890123456789012345678901234567890123456789012345678901234567890", "57edf4a22be3c955ac49da2e2107b67a"
- };
- int i;
-
- for (i = 0; i < 7*2; i += 2) {
- MD5_CTX state;
- uint8_t digest[16];
- char hex_output[16*2 + 1];
- int di;
-
- MD5_Init(&state);
- MD5_Update(&state, (const uint8_t *)test[i], strlen(test[i]));
- MD5_Final(digest, &state);
- printf("MD5 (\"%s\") = ", test[i]);
- for (di = 0; di < 16; ++di)
- sprintf(hex_output + di * 2, "%02x", digest[di]);
- puts(hex_output);
- if (strcmp(hex_output, test[i + 1]))
- printf("**** ERROR, should be: %s\n", test[i + 1]);
- }
- return 0;
-}
-#endif /* TEST */
-
-
-/*
- * For reference, here is the program that computed the T values.
- */
-#ifdef COMPUTE_T_VALUES
-#include <math.h>
-main()
-{
- int i;
- for (i = 1; i <= 64; ++i) {
- unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
-
- /*
- * The following nonsense is only to avoid compiler warnings about
- * "integer constant is unsigned in ANSI C, signed with -traditional".
- */
- if (v >> 31) {
- printf("#define T%d /* 0x%08lx */ (T_MASK ^ 0x%08lx)\n", i,
- v, (unsigned long)(unsigned int)(~v));
- } else {
- printf("#define T%d 0x%08lx\n", i, v);
- }
- }
- return 0;
-}
-#endif /* COMPUTE_T_VALUES */
-/*
- * End of T computation program.
- */
-#ifdef T_MASK
-#undef T_MASK
-#endif
-#define T_MASK ((uint32_t)~0)
-#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
-#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
-#define T3 0x242070db
-#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
-#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
-#define T6 0x4787c62a
-#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
-#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
-#define T9 0x698098d8
-#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
-#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
-#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
-#define T13 0x6b901122
-#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
-#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
-#define T16 0x49b40821
-#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
-#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
-#define T19 0x265e5a51
-#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
-#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
-#define T22 0x02441453
-#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
-#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
-#define T25 0x21e1cde6
-#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
-#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
-#define T28 0x455a14ed
-#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
-#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
-#define T31 0x676f02d9
-#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
-#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
-#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
-#define T35 0x6d9d6122
-#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
-#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
-#define T38 0x4bdecfa9
-#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
-#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
-#define T41 0x289b7ec6
-#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
-#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
-#define T44 0x04881d05
-#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
-#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
-#define T47 0x1fa27cf8
-#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
-#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
-#define T50 0x432aff97
-#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
-#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
-#define T53 0x655b59c3
-#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
-#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
-#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
-#define T57 0x6fa87e4f
-#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
-#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
-#define T60 0x4e0811a1
-#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
-#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
-#define T63 0x2ad7d2bb
-#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
-
-
-static void
-md5_process(MD5_CTX *pms, const uint8_t *data /*[64]*/)
-{
- uint32_t
- a = pms->state[0], b = pms->state[1],
- c = pms->state[2], d = pms->state[3];
- uint32_t t;
-
-#ifdef WORDS_BIGENDIAN
-
- /*
- * On big-endian machines, we must arrange the bytes in the right
- * order. (This also works on machines of unknown byte order.)
- */
- uint32_t X[16];
- const uint8_t *xp = data;
- int i;
-
- for (i = 0; i < 16; ++i, xp += 4)
- X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-
-#else
-
- /*
- * On little-endian machines, we can process properly aligned data
- * without copying it.
- */
- uint32_t xbuf[16];
- const uint32_t *X;
-
- if (!((data - (const uint8_t *)0) & 3)) {
- /* data are properly aligned */
- X = (const uint32_t *)data;
- } else {
- /* not aligned */
- memcpy(xbuf, data, 64);
- X = xbuf;
- }
-#endif
-
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
- /* Round 1. */
- /* Let [abcd k s i] denote the operation
- a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + F(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
- /* Do the following 16 operations. */
- SET(a, b, c, d, 0, 7, T1);
- SET(d, a, b, c, 1, 12, T2);
- SET(c, d, a, b, 2, 17, T3);
- SET(b, c, d, a, 3, 22, T4);
- SET(a, b, c, d, 4, 7, T5);
- SET(d, a, b, c, 5, 12, T6);
- SET(c, d, a, b, 6, 17, T7);
- SET(b, c, d, a, 7, 22, T8);
- SET(a, b, c, d, 8, 7, T9);
- SET(d, a, b, c, 9, 12, T10);
- SET(c, d, a, b, 10, 17, T11);
- SET(b, c, d, a, 11, 22, T12);
- SET(a, b, c, d, 12, 7, T13);
- SET(d, a, b, c, 13, 12, T14);
- SET(c, d, a, b, 14, 17, T15);
- SET(b, c, d, a, 15, 22, T16);
-#undef SET
-
- /* Round 2. */
- /* Let [abcd k s i] denote the operation
- a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + G(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
- /* Do the following 16 operations. */
- SET(a, b, c, d, 1, 5, T17);
- SET(d, a, b, c, 6, 9, T18);
- SET(c, d, a, b, 11, 14, T19);
- SET(b, c, d, a, 0, 20, T20);
- SET(a, b, c, d, 5, 5, T21);
- SET(d, a, b, c, 10, 9, T22);
- SET(c, d, a, b, 15, 14, T23);
- SET(b, c, d, a, 4, 20, T24);
- SET(a, b, c, d, 9, 5, T25);
- SET(d, a, b, c, 14, 9, T26);
- SET(c, d, a, b, 3, 14, T27);
- SET(b, c, d, a, 8, 20, T28);
- SET(a, b, c, d, 13, 5, T29);
- SET(d, a, b, c, 2, 9, T30);
- SET(c, d, a, b, 7, 14, T31);
- SET(b, c, d, a, 12, 20, T32);
-#undef SET
-
- /* Round 3. */
- /* Let [abcd k s t] denote the operation
- a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + H(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
- /* Do the following 16 operations. */
- SET(a, b, c, d, 5, 4, T33);
- SET(d, a, b, c, 8, 11, T34);
- SET(c, d, a, b, 11, 16, T35);
- SET(b, c, d, a, 14, 23, T36);
- SET(a, b, c, d, 1, 4, T37);
- SET(d, a, b, c, 4, 11, T38);
- SET(c, d, a, b, 7, 16, T39);
- SET(b, c, d, a, 10, 23, T40);
- SET(a, b, c, d, 13, 4, T41);
- SET(d, a, b, c, 0, 11, T42);
- SET(c, d, a, b, 3, 16, T43);
- SET(b, c, d, a, 6, 23, T44);
- SET(a, b, c, d, 9, 4, T45);
- SET(d, a, b, c, 12, 11, T46);
- SET(c, d, a, b, 15, 16, T47);
- SET(b, c, d, a, 2, 23, T48);
-#undef SET
-
- /* Round 4. */
- /* Let [abcd k s t] denote the operation
- a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
- t = a + I(b,c,d) + X[k] + Ti;\
- a = ROTATE_LEFT(t, s) + b
- /* Do the following 16 operations. */
- SET(a, b, c, d, 0, 6, T49);
- SET(d, a, b, c, 7, 10, T50);
- SET(c, d, a, b, 14, 15, T51);
- SET(b, c, d, a, 5, 21, T52);
- SET(a, b, c, d, 12, 6, T53);
- SET(d, a, b, c, 3, 10, T54);
- SET(c, d, a, b, 10, 15, T55);
- SET(b, c, d, a, 1, 21, T56);
- SET(a, b, c, d, 8, 6, T57);
- SET(d, a, b, c, 15, 10, T58);
- SET(c, d, a, b, 6, 15, T59);
- SET(b, c, d, a, 13, 21, T60);
- SET(a, b, c, d, 4, 6, T61);
- SET(d, a, b, c, 11, 10, T62);
- SET(c, d, a, b, 2, 15, T63);
- SET(b, c, d, a, 9, 21, T64);
-#undef SET
-
- /* Then perform the following additions. (That is increment each
- of the four registers by the value it had before this block
- was started.) */
- pms->state[0] += a;
- pms->state[1] += b;
- pms->state[2] += c;
- pms->state[3] += d;
-}
-
-void
-MD5_Init(MD5_CTX *pms)
-{
- pms->count[0] = pms->count[1] = 0;
- pms->state[0] = 0x67452301;
- pms->state[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
- pms->state[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
- pms->state[3] = 0x10325476;
-}
-
-void
-MD5_Update(MD5_CTX *pms, const uint8_t *data, size_t nbytes)
-{
- const uint8_t *p = data;
- size_t left = nbytes;
- size_t offset = (pms->count[0] >> 3) & 63;
- uint32_t nbits = (uint32_t)(nbytes << 3);
-
- if (nbytes <= 0)
- return;
-
- /* Update the message length. */
- pms->count[1] += nbytes >> 29;
- pms->count[0] += nbits;
- if (pms->count[0] < nbits)
- pms->count[1]++;
-
- /* Process an initial partial block. */
- if (offset) {
- size_t copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
- memcpy(pms->buffer + offset, p, copy);
- if (offset + copy < 64)
- return;
- p += copy;
- left -= copy;
- md5_process(pms, pms->buffer);
- }
-
- /* Process full blocks. */
- for (; left >= 64; p += 64, left -= 64)
- md5_process(pms, p);
-
- /* Process a final partial block. */
- if (left)
- memcpy(pms->buffer, p, left);
-}
-
-void
-MD5_Finish(MD5_CTX *pms, uint8_t *digest)
-{
- static const uint8_t pad[64] = {
- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
- };
- uint8_t data[8];
- size_t i;
-
- /* Save the length before padding. */
- for (i = 0; i < 8; ++i)
- data[i] = (uint8_t)(pms->count[i >> 2] >> ((i & 3) << 3));
- /* Pad to 56 bytes mod 64. */
- MD5_Update(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
- /* Append the length. */
- MD5_Update(pms, data, 8);
- for (i = 0; i < 16; ++i)
- digest[i] = (uint8_t)(pms->state[i >> 2] >> ((i & 3) << 3));
-}
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
deleted file mode 100644
index f4580ef5e7..0000000000
--- a/ext/digest/md5/md5.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- Copyright (C) 1999 Aladdin Enterprises. All rights reserved.
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- L. Peter Deutsch
- ghost@aladdin.com
-
- */
-/*
- Independent implementation of MD5 (RFC 1321).
-
- This code implements the MD5 Algorithm defined in RFC 1321.
- It is derived directly from the text of the RFC and not from the
- reference implementation.
-
- The original and principal author of md5.h is L. Peter Deutsch
- <ghost@aladdin.com>. Other authors are noted in the change history
- that follows (in reverse chronological order):
-
- 1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
- 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
- added conditionalization for C++ compilation from Martin
- Purschke <purschke@bnl.gov>.
- 1999-05-03 lpd Original version.
- */
-
-/* $OrigId: md5.h,v 1.2 2001/03/26 08:57:14 matz Exp $ */
-/* $RoughId: md5.h,v 1.3 2002/02/24 08:14:31 knu Exp $ */
-/* $Id$ */
-
-#ifndef MD5_INCLUDED
-# define MD5_INCLUDED
-
-#include "defs.h"
-
-/*
- * This code has some adaptations for the Ghostscript environment, but it
- * will compile and run correctly in any environment with 8-bit chars and
- * 32-bit ints. Specifically, it assumes that if the following are
- * defined, they have the same meaning as in Ghostscript: P1, P2, P3.
- */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
- uint32_t count[2]; /* message length in bits, lsw first */
- uint32_t state[4]; /* digest buffer */
- uint8_t buffer[64]; /* accumulate block */
-} MD5_CTX;
-
-#ifdef RUBY
-/* avoid name clash */
-#define MD5_Init rb_Digest_MD5_Init
-#define MD5_Update rb_Digest_MD5_Update
-#define MD5_Finish rb_Digest_MD5_Finish
-#endif
-
-void MD5_Init _((MD5_CTX *pms));
-void MD5_Update _((MD5_CTX *pms, const uint8_t *data, size_t nbytes));
-void MD5_Finish _((MD5_CTX *pms, uint8_t *digest));
-
-#define MD5_BLOCK_LENGTH 64
-#define MD5_DIGEST_LENGTH 16
-#define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1)
-
-#endif /* MD5_INCLUDED */
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
deleted file mode 100644
index 17658f4fce..0000000000
--- a/ext/digest/md5/md5init.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#if defined(HAVE_OPENSSL_MD5_H)
-#include "md5ossl.h"
-#else
-#include "md5.h"
-#endif
-
-static rb_digest_metadata_t md5 = {
- RUBY_DIGEST_API_VERSION,
- MD5_DIGEST_LENGTH,
- MD5_BLOCK_LENGTH,
- sizeof(MD5_CTX),
- (rb_digest_hash_init_func_t)MD5_Init,
- (rb_digest_hash_update_func_t)MD5_Update,
- (rb_digest_hash_finish_func_t)MD5_Finish,
-};
-
-/*
- * A class for calculating message digests using the MD5
- * Message-Digest Algorithm by RSA Data Security, Inc., described in
- * RFC1321.
- */
-void
-Init_md5()
-{
- VALUE mDigest, cDigest_Base, cDigest_MD5;
-
- rb_require("digest");
-
- mDigest = rb_path2class("Digest");
- cDigest_Base = rb_path2class("Digest::Base");
-
- cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
-
- rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
- Data_Wrap_Struct(rb_cObject, 0, 0, &md5));
-}
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
deleted file mode 100644
index d94ae2cd2f..0000000000
--- a/ext/digest/md5/md5ossl.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* $Id$ */
-
-#include "md5ossl.h"
-
-void
-MD5_Finish(MD5_CTX *pctx, unsigned char *digest)
-{
- MD5_Final(digest, pctx);
-}
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
deleted file mode 100644
index 1680c4f5c9..0000000000
--- a/ext/digest/md5/md5ossl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $Id$ */
-
-#ifndef MD5OSSL_H_INCLUDED
-#define MD5OSSL_H_INCLUDED
-
-#include <stddef.h>
-#include <openssl/md5.h>
-
-#define MD5_BLOCK_LENGTH MD5_CBLOCK
-
-void MD5_Finish(MD5_CTX *pctx, unsigned char *digest);
-
-#endif
diff --git a/ext/digest/rmd160/.cvsignore b/ext/digest/rmd160/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/rmd160/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
deleted file mode 100644
index a21d7188dc..0000000000
--- a/ext/digest/rmd160/depend
+++ /dev/null
@@ -1,6 +0,0 @@
-rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-rmd160init.o: rmd160init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
- rmd160.h $(srcdir)/../defs.h
-rmd160ossl.o: rmd160ossl.h $(srcdir)/../defs.h
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
deleted file mode 100644
index 09359944f2..0000000000
--- a/ext/digest/rmd160/extconf.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# $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")
-
-if !with_config("bundled-rmd160") &&
- have_library("crypto") && have_header("openssl/ripemd.h")
- $objs << "rmd160ossl.#{$OBJEXT}"
-else
- $objs << "rmd160.#{$OBJEXT}"
-end
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-$preload = %w[digest]
-
-create_makefile("digest/rmd160")
diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
deleted file mode 100644
index 88918728cd..0000000000
--- a/ext/digest/rmd160/rmd160.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/* $NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $ */
-/* $RoughId: rmd160.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id$ */
-
-/********************************************************************\
- *
- * FILE: rmd160.c
- *
- * CONTENTS: A sample C-implementation of the RIPEMD-160
- * hash-function.
- * TARGET: any computer with an ANSI C compiler
- *
- * AUTHOR: Antoon Bosselaers, ESAT-COSIC
- * (Arranged for libc by Todd C. Miller)
- * DATE: 1 March 1996
- * VERSION: 1.0
- *
- * Copyright (c) Katholieke Universiteit Leuven
- * 1996, All Rights Reserved
- *
-\********************************************************************/
-
-#include "rmd160.h"
-
-#ifndef lint
-/* __RCSID("$NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $"); */
-#endif /* not lint */
-
-/* header files */
-
-#ifdef HAVE_SYS_ENDIAN_H_
-#include <sys/endian.h>
-#endif
-
-#ifdef HAVE_MACHINE_ENDIAN_H_
-#include <machine/endian.h>
-#endif
-
-/* #include "namespace.h" */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond) assert(cond)
-#endif
-
-
-/********************************************************************/
-
-/* macro definitions */
-
-/* collect four bytes into one word: */
-#define BYTES_TO_DWORD(strptr) \
- (((uint32_t) *((strptr)+3) << 24) | \
- ((uint32_t) *((strptr)+2) << 16) | \
- ((uint32_t) *((strptr)+1) << 8) | \
- ((uint32_t) *(strptr)))
-
-/* ROL(x, n) cyclically rotates x over n bits to the left */
-/* x must be of an unsigned 32 bits type and 0 <= n < 32. */
-#define ROL(x, n) (((x) << (n)) | ((x) >> (32-(n))))
-
-/* the three basic functions F(), G() and H() */
-#define F(x, y, z) ((x) ^ (y) ^ (z))
-#define G(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define H(x, y, z) (((x) | ~(y)) ^ (z))
-#define I(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define J(x, y, z) ((x) ^ ((y) | ~(z)))
-
-/* the eight basic operations FF() through III() */
-#define FF(a, b, c, d, e, x, s) { \
- (a) += F((b), (c), (d)) + (x); \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define GG(a, b, c, d, e, x, s) { \
- (a) += G((b), (c), (d)) + (x) + 0x5a827999U; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define HH(a, b, c, d, e, x, s) { \
- (a) += H((b), (c), (d)) + (x) + 0x6ed9eba1U; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define II(a, b, c, d, e, x, s) { \
- (a) += I((b), (c), (d)) + (x) + 0x8f1bbcdcU; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define JJ(a, b, c, d, e, x, s) { \
- (a) += J((b), (c), (d)) + (x) + 0xa953fd4eU; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define FFF(a, b, c, d, e, x, s) { \
- (a) += F((b), (c), (d)) + (x); \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define GGG(a, b, c, d, e, x, s) { \
- (a) += G((b), (c), (d)) + (x) + 0x7a6d76e9U; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define HHH(a, b, c, d, e, x, s) { \
- (a) += H((b), (c), (d)) + (x) + 0x6d703ef3U; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define III(a, b, c, d, e, x, s) { \
- (a) += I((b), (c), (d)) + (x) + 0x5c4dd124U; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-#define JJJ(a, b, c, d, e, x, s) { \
- (a) += J((b), (c), (d)) + (x) + 0x50a28be6U; \
- (a) = ROL((a), (s)) + (e); \
- (c) = ROL((c), 10); \
-}
-
-/********************************************************************/
-
-void
-RMD160_Init(RMD160_CTX *context)
-{
-
- _DIAGASSERT(context != NULL);
-
- /* ripemd-160 initialization constants */
- context->state[0] = 0x67452301U;
- context->state[1] = 0xefcdab89U;
- context->state[2] = 0x98badcfeU;
- context->state[3] = 0x10325476U;
- context->state[4] = 0xc3d2e1f0U;
- context->length[0] = context->length[1] = 0;
- context->buflen = 0;
-}
-
-/********************************************************************/
-
-void
-RMD160_Transform(uint32_t state[5], const uint32_t block[16])
-{
- uint32_t aa, bb, cc, dd, ee;
- uint32_t aaa, bbb, ccc, ddd, eee;
-
- _DIAGASSERT(state != NULL);
- _DIAGASSERT(block != NULL);
-
- aa = aaa = state[0];
- bb = bbb = state[1];
- cc = ccc = state[2];
- dd = ddd = state[3];
- ee = eee = state[4];
-
- /* round 1 */
- FF(aa, bb, cc, dd, ee, block[ 0], 11);
- FF(ee, aa, bb, cc, dd, block[ 1], 14);
- FF(dd, ee, aa, bb, cc, block[ 2], 15);
- FF(cc, dd, ee, aa, bb, block[ 3], 12);
- FF(bb, cc, dd, ee, aa, block[ 4], 5);
- FF(aa, bb, cc, dd, ee, block[ 5], 8);
- FF(ee, aa, bb, cc, dd, block[ 6], 7);
- FF(dd, ee, aa, bb, cc, block[ 7], 9);
- FF(cc, dd, ee, aa, bb, block[ 8], 11);
- FF(bb, cc, dd, ee, aa, block[ 9], 13);
- FF(aa, bb, cc, dd, ee, block[10], 14);
- FF(ee, aa, bb, cc, dd, block[11], 15);
- FF(dd, ee, aa, bb, cc, block[12], 6);
- FF(cc, dd, ee, aa, bb, block[13], 7);
- FF(bb, cc, dd, ee, aa, block[14], 9);
- FF(aa, bb, cc, dd, ee, block[15], 8);
-
- /* round 2 */
- GG(ee, aa, bb, cc, dd, block[ 7], 7);
- GG(dd, ee, aa, bb, cc, block[ 4], 6);
- GG(cc, dd, ee, aa, bb, block[13], 8);
- GG(bb, cc, dd, ee, aa, block[ 1], 13);
- GG(aa, bb, cc, dd, ee, block[10], 11);
- GG(ee, aa, bb, cc, dd, block[ 6], 9);
- GG(dd, ee, aa, bb, cc, block[15], 7);
- GG(cc, dd, ee, aa, bb, block[ 3], 15);
- GG(bb, cc, dd, ee, aa, block[12], 7);
- GG(aa, bb, cc, dd, ee, block[ 0], 12);
- GG(ee, aa, bb, cc, dd, block[ 9], 15);
- GG(dd, ee, aa, bb, cc, block[ 5], 9);
- GG(cc, dd, ee, aa, bb, block[ 2], 11);
- GG(bb, cc, dd, ee, aa, block[14], 7);
- GG(aa, bb, cc, dd, ee, block[11], 13);
- GG(ee, aa, bb, cc, dd, block[ 8], 12);
-
- /* round 3 */
- HH(dd, ee, aa, bb, cc, block[ 3], 11);
- HH(cc, dd, ee, aa, bb, block[10], 13);
- HH(bb, cc, dd, ee, aa, block[14], 6);
- HH(aa, bb, cc, dd, ee, block[ 4], 7);
- HH(ee, aa, bb, cc, dd, block[ 9], 14);
- HH(dd, ee, aa, bb, cc, block[15], 9);
- HH(cc, dd, ee, aa, bb, block[ 8], 13);
- HH(bb, cc, dd, ee, aa, block[ 1], 15);
- HH(aa, bb, cc, dd, ee, block[ 2], 14);
- HH(ee, aa, bb, cc, dd, block[ 7], 8);
- HH(dd, ee, aa, bb, cc, block[ 0], 13);
- HH(cc, dd, ee, aa, bb, block[ 6], 6);
- HH(bb, cc, dd, ee, aa, block[13], 5);
- HH(aa, bb, cc, dd, ee, block[11], 12);
- HH(ee, aa, bb, cc, dd, block[ 5], 7);
- HH(dd, ee, aa, bb, cc, block[12], 5);
-
- /* round 4 */
- II(cc, dd, ee, aa, bb, block[ 1], 11);
- II(bb, cc, dd, ee, aa, block[ 9], 12);
- II(aa, bb, cc, dd, ee, block[11], 14);
- II(ee, aa, bb, cc, dd, block[10], 15);
- II(dd, ee, aa, bb, cc, block[ 0], 14);
- II(cc, dd, ee, aa, bb, block[ 8], 15);
- II(bb, cc, dd, ee, aa, block[12], 9);
- II(aa, bb, cc, dd, ee, block[ 4], 8);
- II(ee, aa, bb, cc, dd, block[13], 9);
- II(dd, ee, aa, bb, cc, block[ 3], 14);
- II(cc, dd, ee, aa, bb, block[ 7], 5);
- II(bb, cc, dd, ee, aa, block[15], 6);
- II(aa, bb, cc, dd, ee, block[14], 8);
- II(ee, aa, bb, cc, dd, block[ 5], 6);
- II(dd, ee, aa, bb, cc, block[ 6], 5);
- II(cc, dd, ee, aa, bb, block[ 2], 12);
-
- /* round 5 */
- JJ(bb, cc, dd, ee, aa, block[ 4], 9);
- JJ(aa, bb, cc, dd, ee, block[ 0], 15);
- JJ(ee, aa, bb, cc, dd, block[ 5], 5);
- JJ(dd, ee, aa, bb, cc, block[ 9], 11);
- JJ(cc, dd, ee, aa, bb, block[ 7], 6);
- JJ(bb, cc, dd, ee, aa, block[12], 8);
- JJ(aa, bb, cc, dd, ee, block[ 2], 13);
- JJ(ee, aa, bb, cc, dd, block[10], 12);
- JJ(dd, ee, aa, bb, cc, block[14], 5);
- JJ(cc, dd, ee, aa, bb, block[ 1], 12);
- JJ(bb, cc, dd, ee, aa, block[ 3], 13);
- JJ(aa, bb, cc, dd, ee, block[ 8], 14);
- JJ(ee, aa, bb, cc, dd, block[11], 11);
- JJ(dd, ee, aa, bb, cc, block[ 6], 8);
- JJ(cc, dd, ee, aa, bb, block[15], 5);
- JJ(bb, cc, dd, ee, aa, block[13], 6);
-
- /* parallel round 1 */
- JJJ(aaa, bbb, ccc, ddd, eee, block[ 5], 8);
- JJJ(eee, aaa, bbb, ccc, ddd, block[14], 9);
- JJJ(ddd, eee, aaa, bbb, ccc, block[ 7], 9);
- JJJ(ccc, ddd, eee, aaa, bbb, block[ 0], 11);
- JJJ(bbb, ccc, ddd, eee, aaa, block[ 9], 13);
- JJJ(aaa, bbb, ccc, ddd, eee, block[ 2], 15);
- JJJ(eee, aaa, bbb, ccc, ddd, block[11], 15);
- JJJ(ddd, eee, aaa, bbb, ccc, block[ 4], 5);
- JJJ(ccc, ddd, eee, aaa, bbb, block[13], 7);
- JJJ(bbb, ccc, ddd, eee, aaa, block[ 6], 7);
- JJJ(aaa, bbb, ccc, ddd, eee, block[15], 8);
- JJJ(eee, aaa, bbb, ccc, ddd, block[ 8], 11);
- JJJ(ddd, eee, aaa, bbb, ccc, block[ 1], 14);
- JJJ(ccc, ddd, eee, aaa, bbb, block[10], 14);
- JJJ(bbb, ccc, ddd, eee, aaa, block[ 3], 12);
- JJJ(aaa, bbb, ccc, ddd, eee, block[12], 6);
-
- /* parallel round 2 */
- III(eee, aaa, bbb, ccc, ddd, block[ 6], 9);
- III(ddd, eee, aaa, bbb, ccc, block[11], 13);
- III(ccc, ddd, eee, aaa, bbb, block[ 3], 15);
- III(bbb, ccc, ddd, eee, aaa, block[ 7], 7);
- III(aaa, bbb, ccc, ddd, eee, block[ 0], 12);
- III(eee, aaa, bbb, ccc, ddd, block[13], 8);
- III(ddd, eee, aaa, bbb, ccc, block[ 5], 9);
- III(ccc, ddd, eee, aaa, bbb, block[10], 11);
- III(bbb, ccc, ddd, eee, aaa, block[14], 7);
- III(aaa, bbb, ccc, ddd, eee, block[15], 7);
- III(eee, aaa, bbb, ccc, ddd, block[ 8], 12);
- III(ddd, eee, aaa, bbb, ccc, block[12], 7);
- III(ccc, ddd, eee, aaa, bbb, block[ 4], 6);
- III(bbb, ccc, ddd, eee, aaa, block[ 9], 15);
- III(aaa, bbb, ccc, ddd, eee, block[ 1], 13);
- III(eee, aaa, bbb, ccc, ddd, block[ 2], 11);
-
- /* parallel round 3 */
- HHH(ddd, eee, aaa, bbb, ccc, block[15], 9);
- HHH(ccc, ddd, eee, aaa, bbb, block[ 5], 7);
- HHH(bbb, ccc, ddd, eee, aaa, block[ 1], 15);
- HHH(aaa, bbb, ccc, ddd, eee, block[ 3], 11);
- HHH(eee, aaa, bbb, ccc, ddd, block[ 7], 8);
- HHH(ddd, eee, aaa, bbb, ccc, block[14], 6);
- HHH(ccc, ddd, eee, aaa, bbb, block[ 6], 6);
- HHH(bbb, ccc, ddd, eee, aaa, block[ 9], 14);
- HHH(aaa, bbb, ccc, ddd, eee, block[11], 12);
- HHH(eee, aaa, bbb, ccc, ddd, block[ 8], 13);
- HHH(ddd, eee, aaa, bbb, ccc, block[12], 5);
- HHH(ccc, ddd, eee, aaa, bbb, block[ 2], 14);
- HHH(bbb, ccc, ddd, eee, aaa, block[10], 13);
- HHH(aaa, bbb, ccc, ddd, eee, block[ 0], 13);
- HHH(eee, aaa, bbb, ccc, ddd, block[ 4], 7);
- HHH(ddd, eee, aaa, bbb, ccc, block[13], 5);
-
- /* parallel round 4 */
- GGG(ccc, ddd, eee, aaa, bbb, block[ 8], 15);
- GGG(bbb, ccc, ddd, eee, aaa, block[ 6], 5);
- GGG(aaa, bbb, ccc, ddd, eee, block[ 4], 8);
- GGG(eee, aaa, bbb, ccc, ddd, block[ 1], 11);
- GGG(ddd, eee, aaa, bbb, ccc, block[ 3], 14);
- GGG(ccc, ddd, eee, aaa, bbb, block[11], 14);
- GGG(bbb, ccc, ddd, eee, aaa, block[15], 6);
- GGG(aaa, bbb, ccc, ddd, eee, block[ 0], 14);
- GGG(eee, aaa, bbb, ccc, ddd, block[ 5], 6);
- GGG(ddd, eee, aaa, bbb, ccc, block[12], 9);
- GGG(ccc, ddd, eee, aaa, bbb, block[ 2], 12);
- GGG(bbb, ccc, ddd, eee, aaa, block[13], 9);
- GGG(aaa, bbb, ccc, ddd, eee, block[ 9], 12);
- GGG(eee, aaa, bbb, ccc, ddd, block[ 7], 5);
- GGG(ddd, eee, aaa, bbb, ccc, block[10], 15);
- GGG(ccc, ddd, eee, aaa, bbb, block[14], 8);
-
- /* parallel round 5 */
- FFF(bbb, ccc, ddd, eee, aaa, block[12] , 8);
- FFF(aaa, bbb, ccc, ddd, eee, block[15] , 5);
- FFF(eee, aaa, bbb, ccc, ddd, block[10] , 12);
- FFF(ddd, eee, aaa, bbb, ccc, block[ 4] , 9);
- FFF(ccc, ddd, eee, aaa, bbb, block[ 1] , 12);
- FFF(bbb, ccc, ddd, eee, aaa, block[ 5] , 5);
- FFF(aaa, bbb, ccc, ddd, eee, block[ 8] , 14);
- FFF(eee, aaa, bbb, ccc, ddd, block[ 7] , 6);
- FFF(ddd, eee, aaa, bbb, ccc, block[ 6] , 8);
- FFF(ccc, ddd, eee, aaa, bbb, block[ 2] , 13);
- FFF(bbb, ccc, ddd, eee, aaa, block[13] , 6);
- FFF(aaa, bbb, ccc, ddd, eee, block[14] , 5);
- FFF(eee, aaa, bbb, ccc, ddd, block[ 0] , 15);
- FFF(ddd, eee, aaa, bbb, ccc, block[ 3] , 13);
- FFF(ccc, ddd, eee, aaa, bbb, block[ 9] , 11);
- FFF(bbb, ccc, ddd, eee, aaa, block[11] , 11);
-
- /* combine results */
- ddd += cc + state[1]; /* final result for state[0] */
- state[1] = state[2] + dd + eee;
- state[2] = state[3] + ee + aaa;
- state[3] = state[4] + aa + bbb;
- state[4] = state[0] + bb + ccc;
- state[0] = ddd;
-}
-
-/********************************************************************/
-
-void
-RMD160_Update(RMD160_CTX *context, const uint8_t *data, size_t nbytes)
-{
- uint32_t X[16];
- uint32_t ofs = 0;
- uint32_t i;
-#ifdef WORDS_BIGENDIAN
- uint32_t j;
-#endif
-
- _DIAGASSERT(context != NULL);
- _DIAGASSERT(data != NULL);
-
- /* update length[] */
- if (context->length[0] + nbytes < context->length[0])
- context->length[1]++; /* overflow to msb of length */
- 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 += nbytes;
- }
- else
- {
- /* process first block */
- ofs = 64 - context->buflen;
- (void)memcpy(context->bbuffer + context->buflen, data, ofs);
-#ifndef WORDS_BIGENDIAN
- (void)memcpy(X, context->bbuffer, sizeof(X));
-#else
- for (j=0; j < 16; j++)
- X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
-#endif
- RMD160_Transform(context->state, X);
- nbytes -= ofs;
-
- /* process remaining complete blocks */
- for (i = 0; i < (nbytes >> 6); i++) {
-#ifndef WORDS_BIGENDIAN
- (void)memcpy(X, data + (64 * i) + ofs, sizeof(X));
-#else
- for (j=0; j < 16; j++)
- X[j] = BYTES_TO_DWORD(data + (64 * i) + (4 * j) + ofs);
-#endif
- RMD160_Transform(context->state, X);
- }
-
- /*
- * Put last bytes from data into context's buffer
- */
- context->buflen = nbytes & 63;
- memcpy(context->bbuffer, data + (64 * i) + ofs, context->buflen);
- }
-}
-
-/********************************************************************/
-
-void
-RMD160_Finish(RMD160_CTX *context, uint8_t digest[20])
-{
- uint32_t i;
- uint32_t X[16];
-#ifdef WORDS_BIGENDIAN
- uint32_t j;
-#endif
-
- _DIAGASSERT(digest != NULL);
- _DIAGASSERT(context != NULL);
-
- /* append the bit m_n == 1 */
- context->bbuffer[context->buflen] = (uint8_t)'\200';
-
- (void)memset(context->bbuffer + context->buflen + 1, 0,
- 63 - context->buflen);
-#ifndef WORDS_BIGENDIAN
- (void)memcpy(X, context->bbuffer, sizeof(X));
-#else
- for (j=0; j < 16; j++)
- X[j] = BYTES_TO_DWORD(context->bbuffer + (4 * j));
-#endif
- if ((context->buflen) > 55) {
- /* length goes to next block */
- RMD160_Transform(context->state, X);
- (void)memset(X, 0, sizeof(X));
- }
-
- /* append length in bits */
- X[14] = context->length[0] << 3;
- X[15] = (context->length[0] >> 29) |
- (context->length[1] << 3);
- RMD160_Transform(context->state, X);
-
- if (digest != NULL) {
- for (i = 0; i < 20; i += 4) {
- /* extracts the 8 least significant bits. */
- digest[i] = context->state[i>>2];
- digest[i + 1] = (context->state[i>>2] >> 8);
- digest[i + 2] = (context->state[i>>2] >> 16);
- digest[i + 3] = (context->state[i>>2] >> 24);
- }
- }
-}
-
-/************************ end of file rmd160.c **********************/
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
deleted file mode 100644
index 54d1ca9140..0000000000
--- a/ext/digest/rmd160/rmd160.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $NetBSD: rmd160.h,v 1.2 2000/07/07 10:47:06 ad Exp $ */
-/* $RoughId: rmd160.h,v 1.3 2002/02/24 08:14:31 knu Exp $ */
-/* $Id$ */
-
-/********************************************************************\
- *
- * FILE: rmd160.h
- *
- * CONTENTS: Header file for a sample C-implementation of the
- * RIPEMD-160 hash-function.
- * TARGET: any computer with an ANSI C compiler
- *
- * AUTHOR: Antoon Bosselaers, ESAT-COSIC
- * DATE: 1 March 1996
- * VERSION: 1.0
- *
- * Copyright (c) Katholieke Universiteit Leuven
- * 1996, All Rights Reserved
- *
-\********************************************************************/
-
-/*
- * from OpenBSD: rmd160.h,v 1.4 1999/08/16 09:59:04 millert Exp
- */
-
-#ifndef _RMD160_H_
-#define _RMD160_H_
-
-#include "defs.h"
-
-typedef struct {
- uint32_t state[5]; /* state (ABCDE) */
- uint32_t length[2]; /* number of bits */
- uint8_t bbuffer[64]; /* overflow buffer */
- uint32_t buflen; /* number of chars in bbuffer */
-} RMD160_CTX;
-
-#ifdef RUBY
-#define RMD160_Init rb_Digest_RMD160_Init
-#define RMD160_Transform rb_Digest_RMD160_Transform
-#define RMD160_Update rb_Digest_RMD160_Update
-#define RMD160_Finish rb_Digest_RMD160_Finish
-#endif
-
-__BEGIN_DECLS
-void RMD160_Init _((RMD160_CTX *));
-void RMD160_Transform _((uint32_t[5], const uint32_t[16]));
-void RMD160_Update _((RMD160_CTX *, const uint8_t *, size_t));
-void RMD160_Finish _((RMD160_CTX *, uint8_t[20]));
-__END_DECLS
-
-#define RMD160_BLOCK_LENGTH 64
-#define RMD160_DIGEST_LENGTH 20
-#define RMD160_DIGEST_STRING_LENGTH (RMD160_DIGEST_LENGTH * 2 + 1)
-
-#endif /* !_RMD160_H_ */
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
deleted file mode 100644
index 763867df86..0000000000
--- a/ext/digest/rmd160/rmd160init.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#if defined(HAVE_OPENSSL_RIPEMD_H)
-#include "rmd160ossl.h"
-#else
-#include "rmd160.h"
-#endif
-
-static rb_digest_metadata_t rmd160 = {
- RUBY_DIGEST_API_VERSION,
- RMD160_DIGEST_LENGTH,
- RMD160_BLOCK_LENGTH,
- sizeof(RMD160_CTX),
- (rb_digest_hash_init_func_t)RMD160_Init,
- (rb_digest_hash_update_func_t)RMD160_Update,
- (rb_digest_hash_finish_func_t)RMD160_Finish,
-};
-
-/*
- * A class for calculating message digests using RIPEMD-160
- * cryptographic hash function, designed by Hans Dobbertin, Antoon
- * Bosselaers, and Bart Preneel.
- */
-void
-Init_rmd160()
-{
- VALUE mDigest, cDigest_Base, cDigest_RMD160;
-
- rb_require("digest");
-
- mDigest = rb_path2class("Digest");
- cDigest_Base = rb_path2class("Digest::Base");
-
- cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
-
- rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
- Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160));
-}
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
deleted file mode 100644
index f24e63e3d8..0000000000
--- a/ext/digest/rmd160/rmd160ossl.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $Id$ */
-
-#include "defs.h"
-#include "rmd160ossl.h"
-
-void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
- RIPEMD160_Final((unsigned char *)buf, ctx);
-}
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
deleted file mode 100644
index 3df38a01c0..0000000000
--- a/ext/digest/rmd160/rmd160ossl.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* $Id$ */
-
-#ifndef RMD160OSSL_H_INCLUDED
-#define RMD160OSSL_H_INCLUDED
-
-#include <stddef.h>
-#include <openssl/ripemd.h>
-
-#define RMD160_CTX RIPEMD160_CTX
-
-#define RMD160_Init RIPEMD160_Init
-#define RMD160_Update RIPEMD160_Update
-
-#define RMD160_BLOCK_LENGTH RIPEMD160_CBLOCK
-#define RMD160_DIGEST_LENGTH RIPEMD160_DIGEST_LENGTH
-
-void RMD160_Finish(RMD160_CTX *ctx, char *buf);
-
-#endif
diff --git a/ext/digest/sha1/.cvsignore b/ext/digest/sha1/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/sha1/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
deleted file mode 100644
index 61607844d0..0000000000
--- a/ext/digest/sha1/depend
+++ /dev/null
@@ -1,6 +0,0 @@
-sha1.o: sha1.c sha1.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha1init.o: sha1init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
- sha1.h $(srcdir)/../defs.h
-sha1ossl.o: sha1ossl.h $(srcdir)/../defs.h
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
deleted file mode 100644
index 87b74c34af..0000000000
--- a/ext/digest/sha1/extconf.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# $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")
-
-if !with_config("bundled-sha1") &&
- have_library("crypto") && have_header("openssl/sha.h")
- $objs << "sha1ossl.#{$OBJEXT}"
-else
- $objs << "sha1.#{$OBJEXT}"
-end
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-$preload = %w[digest]
-
-create_makefile("digest/sha1")
diff --git a/ext/digest/sha1/sha1.c b/ext/digest/sha1/sha1.c
deleted file mode 100644
index 6196ca6b82..0000000000
--- a/ext/digest/sha1/sha1.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/* $NetBSD: sha1.c,v 1.2 2001/03/22 09:51:48 agc Exp $ */
-/* $OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $ */
-/* $RoughId: sha1.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id$ */
-
-/*
- * SHA-1 in C
- * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
- *
- * Test Vectors (from FIPS PUB 180-1)
- * "abc"
- * A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
- * "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- * 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
- * A million repetitions of "a"
- * 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
- */
-
-#include "sha1.h"
-
-#define SHA1HANDSOFF /* Copies data before messing with it. */
-
-#if defined(_KERNEL) || defined(_STANDALONE)
-#include <sys/param.h>
-#include <sys/systm.h>
-#define _DIAGASSERT(x) (void)0
-#else
-/* #include "namespace.h" */
-#include <assert.h>
-#include <string.h>
-#endif
-
-#ifndef _DIAGASSERT
-#define _DIAGASSERT(cond) assert(cond)
-#endif
-
-/*
- * XXX Kludge until there is resolution regarding mem*() functions
- * XXX in the kernel.
- */
-#if defined(_KERNEL) || defined(_STANDALONE)
-#define memcpy(s, d, l) bcopy((d), (s), (l))
-#endif
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/*
- * blk0() and blk() perform the initial expand.
- * I got the idea of expanding during the round function from SSLeay
- */
-#ifndef WORDS_BIGENDIAN
-# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
- |(rol(block->l[i],8)&0x00FF00FF))
-#else
-# define blk0(i) block->l[i]
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
- ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/*
- * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
- */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-
-typedef union {
- uint8_t c[64];
- uint32_t l[16];
-} CHAR64LONG16;
-
-#ifdef __sparc_v9__
-void do_R01(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-void do_R2(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-void do_R3(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-void do_R4(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *);
-
-#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
-#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
-#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
-#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
-#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
-
-void
-do_R01(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
- nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
- nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
- nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
- nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
- nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
-}
-
-void
-do_R2(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
- nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
- nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
- nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
- nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
- nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
-}
-
-void
-do_R3(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
- nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
- nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
- nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
- nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
- nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
-}
-
-void
-do_R4(uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d, uint32_t *e, CHAR64LONG16 *block)
-{
- nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
- nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
- nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
- nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
- nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
-}
-#endif
-
-/*
- * Hash a single 512-bit block. This is the core of the algorithm.
- */
-void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
-{
- uint32_t a, b, c, d, e;
- CHAR64LONG16 *block;
-
-#ifdef SHA1HANDSOFF
- CHAR64LONG16 workspace;
-#endif
-
- _DIAGASSERT(buffer != 0);
- _DIAGASSERT(state != 0);
-
-#ifdef SHA1HANDSOFF
- block = &workspace;
- (void)memcpy(block, buffer, 64);
-#else
- block = (CHAR64LONG16 *)(void *)buffer;
-#endif
-
- /* Copy context->state[] to working vars */
- a = state[0];
- b = state[1];
- c = state[2];
- d = state[3];
- e = state[4];
-
-#ifdef __sparc_v9__
- do_R01(&a, &b, &c, &d, &e, block);
- do_R2(&a, &b, &c, &d, &e, block);
- do_R3(&a, &b, &c, &d, &e, block);
- do_R4(&a, &b, &c, &d, &e, block);
-#else
- /* 4 rounds of 20 operations each. Loop unrolled. */
- R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
- R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
- R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
- R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
- R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
- R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
- R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
- R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
- R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
- R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
- R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
- R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
- R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
- R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
- R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
- R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
- R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
- R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
- R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
- R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-#endif
-
- /* Add the working vars back into context.state[] */
- state[0] += a;
- state[1] += b;
- state[2] += c;
- state[3] += d;
- state[4] += e;
-
- /* Wipe variables */
- a = b = c = d = e = 0;
-}
-
-
-/*
- * SHA1_Init - Initialize new context
- */
-void SHA1_Init(SHA1_CTX *context)
-{
-
- _DIAGASSERT(context != 0);
-
- /* SHA1 initialization constants */
- context->state[0] = 0x67452301;
- context->state[1] = 0xEFCDAB89;
- context->state[2] = 0x98BADCFE;
- context->state[3] = 0x10325476;
- context->state[4] = 0xC3D2E1F0;
- context->count[0] = context->count[1] = 0;
-}
-
-
-/*
- * Run your data through this.
- */
-void SHA1_Update(SHA1_CTX *context, const uint8_t *data, size_t len)
-{
- uint32_t i, j;
-
- _DIAGASSERT(context != 0);
- _DIAGASSERT(data != 0);
-
- j = context->count[0];
- if ((context->count[0] += len << 3) < j)
- context->count[1] += (len>>29)+1;
- j = (j >> 3) & 63;
- if ((j + len) > 63) {
- (void)memcpy(&context->buffer[j], data, (i = 64-j));
- SHA1_Transform(context->state, context->buffer);
- for ( ; i + 63 < len; i += 64)
- SHA1_Transform(context->state, &data[i]);
- j = 0;
- } else {
- i = 0;
- }
- (void)memcpy(&context->buffer[j], &data[i], len - i);
-}
-
-
-/*
- * Add padding and return the message digest.
- */
-void SHA1_Finish(SHA1_CTX* context, uint8_t digest[20])
-{
- size_t i;
- uint8_t finalcount[8];
-
- _DIAGASSERT(digest != 0);
- _DIAGASSERT(context != 0);
-
- for (i = 0; i < 8; i++) {
- finalcount[i] = (uint8_t)((context->count[(i >= 4 ? 0 : 1)]
- >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
- }
- SHA1_Update(context, (const uint8_t *)"\200", 1);
- while ((context->count[0] & 504) != 448)
- SHA1_Update(context, (const uint8_t *)"\0", 1);
- SHA1_Update(context, finalcount, 8); /* Should cause a SHA1_Transform() */
-
- if (digest) {
- for (i = 0; i < 20; i++)
- digest[i] = (uint8_t)
- ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
- }
-}
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
deleted file mode 100644
index 60e3b01fe2..0000000000
--- a/ext/digest/sha1/sha1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* $NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $ */
-/* $RoughId: sha1.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
-/* $Id$ */
-
-/*
- * SHA-1 in C
- * By Steve Reid <steve@edmweb.com>
- * 100% Public Domain
- */
-
-#ifndef _SYS_SHA1_H_
-#define _SYS_SHA1_H_
-
-#include "defs.h"
-
-typedef struct {
- uint32_t state[5];
- uint32_t count[2];
- uint8_t buffer[64];
-} SHA1_CTX;
-
-#ifdef RUBY
-/* avoid name clash */
-#define SHA1_Transform rb_Digest_SHA1_Transform
-#define SHA1_Init rb_Digest_SHA1_Init
-#define SHA1_Update rb_Digest_SHA1_Update
-#define SHA1_Finish rb_Digest_SHA1_Finish
-#endif
-
-void SHA1_Transform _((uint32_t state[5], const uint8_t buffer[64]));
-void SHA1_Init _((SHA1_CTX *context));
-void SHA1_Update _((SHA1_CTX *context, const uint8_t *data, size_t len));
-void SHA1_Finish _((SHA1_CTX *context, uint8_t digest[20]));
-
-#define SHA1_BLOCK_LENGTH 64
-#define SHA1_DIGEST_LENGTH 20
-#define SHA1_DIGEST_STRING_LENGTH (SHA1_DIGEST_LENGTH * 2 + 1)
-
-#endif /* _SYS_SHA1_H_ */
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
deleted file mode 100644
index b2146f05a9..0000000000
--- a/ext/digest/sha1/sha1init.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#if defined(HAVE_OPENSSL_SHA_H)
-#include "sha1ossl.h"
-#else
-#include "sha1.h"
-#endif
-
-static rb_digest_metadata_t sha1 = {
- RUBY_DIGEST_API_VERSION,
- SHA1_DIGEST_LENGTH,
- SHA1_BLOCK_LENGTH,
- sizeof(SHA1_CTX),
- (rb_digest_hash_init_func_t)SHA1_Init,
- (rb_digest_hash_update_func_t)SHA1_Update,
- (rb_digest_hash_finish_func_t)SHA1_Finish,
-};
-
-/*
- * A class for calculating message digests using the SHA-1 Secure Hash
- * Algorithm by NIST (the US' National Institute of Standards and
- * Technology), described in FIPS PUB 180-1.
- */
-void
-Init_sha1()
-{
- VALUE mDigest, cDigest_Base, cDigest_SHA1;
-
- rb_require("digest");
-
- mDigest = rb_path2class("Digest");
- cDigest_Base = rb_path2class("Digest::Base");
-
- cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
-
- rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
- Data_Wrap_Struct(rb_cObject, 0, 0, &sha1));
-}
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
deleted file mode 100644
index 452cf35084..0000000000
--- a/ext/digest/sha1/sha1ossl.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $Id$ */
-
-#include "defs.h"
-#include "sha1ossl.h"
-
-void
-SHA1_Finish(SHA1_CTX *ctx, char *buf)
-{
- SHA1_Final((unsigned char *)buf, ctx);
-}
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
deleted file mode 100644
index 8f9984cc64..0000000000
--- a/ext/digest/sha1/sha1ossl.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* $Id$ */
-
-#ifndef SHA1OSSL_H_INCLUDED
-#define SHA1OSSL_H_INCLUDED
-
-#include <stddef.h>
-#include <openssl/sha.h>
-
-#define SHA1_CTX SHA_CTX
-
-#ifdef SHA_BLOCK_LENGTH
-#define SHA1_BLOCK_LENGTH SHA_BLOCK_LENGTH
-#else
-#define SHA1_BLOCK_LENGTH SHA_CBLOCK
-#endif
-#define SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH
-
-void SHA1_Finish(SHA1_CTX *ctx, char *buf);
-
-#endif
diff --git a/ext/digest/sha2/.cvsignore b/ext/digest/sha2/.cvsignore
deleted file mode 100644
index 4088712231..0000000000
--- a/ext/digest/sha2/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-mkmf.log
-*.def
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
deleted file mode 100644
index 225d6ad52b..0000000000
--- a/ext/digest/sha2/depend
+++ /dev/null
@@ -1,5 +0,0 @@
-sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h
-sha2init.o: sha2init.c $(srcdir)/../digest.h $(hdrdir)/ruby.h \
- $(topdir)/config.h $(hdrdir)/defines.h $(hdrdir)/intern.h \
- sha2.h $(srcdir)/../defs.h
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
deleted file mode 100644
index c084a51a64..0000000000
--- a/ext/digest/sha2/extconf.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# $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 = [
- "sha2.#{$OBJEXT}",
- "sha2init.#{$OBJEXT}",
-]
-
-have_header("sys/cdefs.h")
-
-have_header("inttypes.h")
-
-have_header("unistd.h")
-
-$preload = %w[digest]
-
-if have_type("uint64_t", "defs.h", $defs.join(' '))
- create_makefile("digest/sha2")
-end
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
deleted file mode 100644
index 52dd639f9b..0000000000
--- a/ext/digest/sha2/lib/sha2.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-#--
-# sha2.rb - defines Digest::SHA2 class which wraps up the SHA256,
-# SHA384, and SHA512 classes.
-#++
-# Copyright (c) 2006 Akinori MUSHA <knu@iDaemons.org>
-#
-# All rights reserved. You can redistribute and/or modify it under the same
-# terms as Ruby.
-#
-# $Id$
-
-require 'digest'
-
-module Digest
- #
- # A meta digest provider class for SHA256, SHA384 and SHA512.
- #
- class SHA2 < Digest::Class
- # call-seq:
- # Digest::SHA2.new(bitlen = 256) -> digest_obj
- #
- # Creates a new SHA2 hash object with a given bit length.
- def initialize(bitlen = 256)
- case bitlen
- when 256
- @sha2 = Digest::SHA256.new
- when 384
- @sha2 = Digest::SHA384.new
- when 512
- @sha2 = Digest::SHA512.new
- else
- raise ArgumentError, "unsupported bit length: %s" % bitlen.inspect
- end
- @bitlen = bitlen
- end
-
- # :nodoc:
- def reset
- @sha2.reset
- self
- end
-
- # :nodoc:
- def update(str)
- @sha2.update(str)
- self
- end
- alias << update
-
- def finish
- @sha2.digest!
- end
- private :finish
-
- def block_length
- @sha2.block_length
- end
-
- def digest_length
- @sha2.digest_length
- end
-
- # :nodoc:
- def initialize_copy(other)
- @sha2 = other.instance_eval { @sha2.clone }
- end
-
- # :nodoc:
- def inspect
- "#<%s:%d %s>" % [self.class.name, @bitlen, hexdigest]
- end
- end
-end
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
deleted file mode 100644
index aca9ee926f..0000000000
--- a/ext/digest/sha2/sha2.c
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * sha2.c
- *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * 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 copyright holder nor the names of contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * 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.
- *
- */
-
-/* $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $ */
-/* $Id$ */
-
-#include "sha2.h"
-#include <stdio.h>
-#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
-#include <assert.h> /* assert() */
-
-/*
- * ASSERT NOTE:
- * Some sanity checking code is included using assert(). On my FreeBSD
- * system, this additional code can be removed by compiling with NDEBUG
- * defined. Check your own systems manpage on assert() to see how to
- * compile WITHOUT the sanity checking code on your system.
- *
- * UNROLLED TRANSFORM LOOP NOTE:
- * You can define SHA2_UNROLL_TRANSFORM to use the unrolled transform
- * loop version for the hash transform rounds (defined using macros
- * later in this file). Either define on the command line, for example:
- *
- * cc -DSHA2_UNROLL_TRANSFORM -o sha2 sha2.c sha2prog.c
- *
- * or define below:
- *
- * #define SHA2_UNROLL_TRANSFORM
- *
- */
-
-
-/*** SHA-256/384/512 Machine Architecture Definitions *****************/
-typedef uint8_t sha2_byte; /* Exactly 1 byte */
-typedef uint32_t sha2_word32; /* Exactly 4 bytes */
-typedef uint64_t sha2_word64; /* Exactly 8 bytes */
-
-#if defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
-#define ULL(number) number##ULL
-#else
-#define ULL(number) (uint64_t)(number)
-#endif
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-/* NOTE: Most of these are in sha2.h */
-#define SHA256_SHORT_BLOCK_LENGTH (SHA256_BLOCK_LENGTH - 8)
-#define SHA384_SHORT_BLOCK_LENGTH (SHA384_BLOCK_LENGTH - 16)
-#define SHA512_SHORT_BLOCK_LENGTH (SHA512_BLOCK_LENGTH - 16)
-
-
-/*** ENDIAN REVERSAL MACROS *******************************************/
-#ifndef WORDS_BIGENDIAN
-#define REVERSE32(w,x) { \
- sha2_word32 tmp = (w); \
- tmp = (tmp >> 16) | (tmp << 16); \
- (x) = ((tmp & 0xff00ff00UL) >> 8) | ((tmp & 0x00ff00ffUL) << 8); \
-}
-#define REVERSE64(w,x) { \
- sha2_word64 tmp = (w); \
- tmp = (tmp >> 32) | (tmp << 32); \
- tmp = ((tmp & ULL(0xff00ff00ff00ff00)) >> 8) | \
- ((tmp & ULL(0x00ff00ff00ff00ff)) << 8); \
- (x) = ((tmp & ULL(0xffff0000ffff0000)) >> 16) | \
- ((tmp & ULL(0x0000ffff0000ffff)) << 16); \
-}
-#endif
-
-/*
- * Macro for incrementally adding the unsigned 64-bit integer n to the
- * unsigned 128-bit integer (represented using a two-element array of
- * 64-bit words):
- */
-#define ADDINC128(w,n) { \
- (w)[0] += (sha2_word64)(n); \
- if ((w)[0] < (n)) { \
- (w)[1]++; \
- } \
-}
-
-/*
- * Macros for copying blocks of memory and for zeroing out ranges
- * of memory. Using these macros makes it easy to switch from
- * using memset()/memcpy() and using bzero()/bcopy().
- *
- * Please define either SHA2_USE_MEMSET_MEMCPY or define
- * SHA2_USE_BZERO_BCOPY depending on which function set you
- * choose to use:
- */
-#if !defined(SHA2_USE_MEMSET_MEMCPY) && !defined(SHA2_USE_BZERO_BCOPY)
-/* Default to memset()/memcpy() if no option is specified */
-#define SHA2_USE_MEMSET_MEMCPY 1
-#endif
-#if defined(SHA2_USE_MEMSET_MEMCPY) && defined(SHA2_USE_BZERO_BCOPY)
-/* Abort with an error if BOTH options are defined */
-#error Define either SHA2_USE_MEMSET_MEMCPY or SHA2_USE_BZERO_BCOPY, not both!
-#endif
-
-#ifdef SHA2_USE_MEMSET_MEMCPY
-#define MEMSET_BZERO(p,l) memset((p), 0, (l))
-#define MEMCPY_BCOPY(d,s,l) memcpy((d), (s), (l))
-#endif
-#ifdef SHA2_USE_BZERO_BCOPY
-#define MEMSET_BZERO(p,l) bzero((p), (l))
-#define MEMCPY_BCOPY(d,s,l) bcopy((s), (d), (l))
-#endif
-
-
-/*** THE SIX LOGICAL FUNCTIONS ****************************************/
-/*
- * Bit shifting and rotation (used by the six SHA-XYZ logical functions:
- *
- * NOTE: The naming of R and S appears backwards here (R is a SHIFT and
- * S is a ROTATION) because the SHA-256/384/512 description document
- * (see http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf) uses this
- * same "backwards" definition.
- */
-/* Shift-right (used in SHA-256, SHA-384, and SHA-512): */
-#define R(b,x) ((x) >> (b))
-/* 32-bit Rotate-right (used in SHA-256): */
-#define S32(b,x) (((x) >> (b)) | ((x) << (32 - (b))))
-/* 64-bit Rotate-right (used in SHA-384 and SHA-512): */
-#define S64(b,x) (((x) >> (b)) | ((x) << (64 - (b))))
-
-/* Two of six logical functions used in SHA-256, SHA-384, and SHA-512: */
-#define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z)))
-#define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
-
-/* Four of six logical functions used in SHA-256: */
-#define Sigma0_256(x) (S32(2, (x)) ^ S32(13, (x)) ^ S32(22, (x)))
-#define Sigma1_256(x) (S32(6, (x)) ^ S32(11, (x)) ^ S32(25, (x)))
-#define sigma0_256(x) (S32(7, (x)) ^ S32(18, (x)) ^ R(3 , (x)))
-#define sigma1_256(x) (S32(17, (x)) ^ S32(19, (x)) ^ R(10, (x)))
-
-/* Four of six logical functions used in SHA-384 and SHA-512: */
-#define Sigma0_512(x) (S64(28, (x)) ^ S64(34, (x)) ^ S64(39, (x)))
-#define Sigma1_512(x) (S64(14, (x)) ^ S64(18, (x)) ^ S64(41, (x)))
-#define sigma0_512(x) (S64( 1, (x)) ^ S64( 8, (x)) ^ R( 7, (x)))
-#define sigma1_512(x) (S64(19, (x)) ^ S64(61, (x)) ^ R( 6, (x)))
-
-/*** INTERNAL FUNCTION PROTOTYPES *************************************/
-/* NOTE: These should not be accessed directly from outside this
- * library -- they are intended for private internal visibility/use
- * only.
- */
-void SHA512_Last(SHA512_CTX*);
-void SHA256_Transform(SHA256_CTX*, const sha2_word32*);
-void SHA512_Transform(SHA512_CTX*, const sha2_word64*);
-
-
-/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
-/* Hash constant words K for SHA-256: */
-const static sha2_word32 K256[64] = {
- 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL,
- 0x3956c25bUL, 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL,
- 0xd807aa98UL, 0x12835b01UL, 0x243185beUL, 0x550c7dc3UL,
- 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, 0xc19bf174UL,
- 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL,
- 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL,
- 0x983e5152UL, 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL,
- 0xc6e00bf3UL, 0xd5a79147UL, 0x06ca6351UL, 0x14292967UL,
- 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, 0x53380d13UL,
- 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL,
- 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL,
- 0xd192e819UL, 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL,
- 0x19a4c116UL, 0x1e376c08UL, 0x2748774cUL, 0x34b0bcb5UL,
- 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, 0x682e6ff3UL,
- 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL,
- 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL
-};
-
-/* Initial hash value H for SHA-256: */
-const static sha2_word32 sha256_initial_hash_value[8] = {
- 0x6a09e667UL,
- 0xbb67ae85UL,
- 0x3c6ef372UL,
- 0xa54ff53aUL,
- 0x510e527fUL,
- 0x9b05688cUL,
- 0x1f83d9abUL,
- 0x5be0cd19UL
-};
-
-/* Hash constant words K for SHA-384 and SHA-512: */
-const static sha2_word64 K512[80] = {
- ULL(0x428a2f98d728ae22), ULL(0x7137449123ef65cd),
- ULL(0xb5c0fbcfec4d3b2f), ULL(0xe9b5dba58189dbbc),
- ULL(0x3956c25bf348b538), ULL(0x59f111f1b605d019),
- ULL(0x923f82a4af194f9b), ULL(0xab1c5ed5da6d8118),
- ULL(0xd807aa98a3030242), ULL(0x12835b0145706fbe),
- ULL(0x243185be4ee4b28c), ULL(0x550c7dc3d5ffb4e2),
- ULL(0x72be5d74f27b896f), ULL(0x80deb1fe3b1696b1),
- ULL(0x9bdc06a725c71235), ULL(0xc19bf174cf692694),
- ULL(0xe49b69c19ef14ad2), ULL(0xefbe4786384f25e3),
- ULL(0x0fc19dc68b8cd5b5), ULL(0x240ca1cc77ac9c65),
- ULL(0x2de92c6f592b0275), ULL(0x4a7484aa6ea6e483),
- ULL(0x5cb0a9dcbd41fbd4), ULL(0x76f988da831153b5),
- ULL(0x983e5152ee66dfab), ULL(0xa831c66d2db43210),
- ULL(0xb00327c898fb213f), ULL(0xbf597fc7beef0ee4),
- ULL(0xc6e00bf33da88fc2), ULL(0xd5a79147930aa725),
- ULL(0x06ca6351e003826f), ULL(0x142929670a0e6e70),
- ULL(0x27b70a8546d22ffc), ULL(0x2e1b21385c26c926),
- ULL(0x4d2c6dfc5ac42aed), ULL(0x53380d139d95b3df),
- ULL(0x650a73548baf63de), ULL(0x766a0abb3c77b2a8),
- ULL(0x81c2c92e47edaee6), ULL(0x92722c851482353b),
- ULL(0xa2bfe8a14cf10364), ULL(0xa81a664bbc423001),
- ULL(0xc24b8b70d0f89791), ULL(0xc76c51a30654be30),
- ULL(0xd192e819d6ef5218), ULL(0xd69906245565a910),
- ULL(0xf40e35855771202a), ULL(0x106aa07032bbd1b8),
- ULL(0x19a4c116b8d2d0c8), ULL(0x1e376c085141ab53),
- ULL(0x2748774cdf8eeb99), ULL(0x34b0bcb5e19b48a8),
- ULL(0x391c0cb3c5c95a63), ULL(0x4ed8aa4ae3418acb),
- ULL(0x5b9cca4f7763e373), ULL(0x682e6ff3d6b2b8a3),
- ULL(0x748f82ee5defb2fc), ULL(0x78a5636f43172f60),
- ULL(0x84c87814a1f0ab72), ULL(0x8cc702081a6439ec),
- ULL(0x90befffa23631e28), ULL(0xa4506cebde82bde9),
- ULL(0xbef9a3f7b2c67915), ULL(0xc67178f2e372532b),
- ULL(0xca273eceea26619c), ULL(0xd186b8c721c0c207),
- ULL(0xeada7dd6cde0eb1e), ULL(0xf57d4f7fee6ed178),
- ULL(0x06f067aa72176fba), ULL(0x0a637dc5a2c898a6),
- ULL(0x113f9804bef90dae), ULL(0x1b710b35131c471b),
- ULL(0x28db77f523047d84), ULL(0x32caab7b40c72493),
- ULL(0x3c9ebe0a15c9bebc), ULL(0x431d67c49c100d4c),
- ULL(0x4cc5d4becb3e42b6), ULL(0x597f299cfc657e2a),
- ULL(0x5fcb6fab3ad6faec), ULL(0x6c44198c4a475817)
-};
-
-/* Initial hash value H for SHA-384 */
-const static sha2_word64 sha384_initial_hash_value[8] = {
- ULL(0xcbbb9d5dc1059ed8),
- ULL(0x629a292a367cd507),
- ULL(0x9159015a3070dd17),
- ULL(0x152fecd8f70e5939),
- ULL(0x67332667ffc00b31),
- ULL(0x8eb44a8768581511),
- ULL(0xdb0c2e0d64f98fa7),
- ULL(0x47b5481dbefa4fa4)
-};
-
-/* Initial hash value H for SHA-512 */
-const static sha2_word64 sha512_initial_hash_value[8] = {
- ULL(0x6a09e667f3bcc908),
- ULL(0xbb67ae8584caa73b),
- ULL(0x3c6ef372fe94f82b),
- ULL(0xa54ff53a5f1d36f1),
- ULL(0x510e527fade682d1),
- ULL(0x9b05688c2b3e6c1f),
- ULL(0x1f83d9abfb41bd6b),
- ULL(0x5be0cd19137e2179)
-};
-
-
-/*** SHA-256: *********************************************************/
-void SHA256_Init(SHA256_CTX* context) {
- if (context == (SHA256_CTX*)0) {
- return;
- }
- MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH);
- MEMSET_BZERO(context->buffer, SHA256_BLOCK_LENGTH);
- context->bitcount = 0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-256 round macros: */
-
-#ifndef WORDS_BIGENDIAN
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \
- REVERSE32(*data++, W256[j]); \
- T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
- K256[j] + W256[j]; \
- (d) += T1; \
- (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
- j++
-
-
-#else
-
-#define ROUND256_0_TO_15(a,b,c,d,e,f,g,h) \
- T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + \
- K256[j] + (W256[j] = *data++); \
- (d) += T1; \
- (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
- j++
-
-#endif
-
-#define ROUND256(a,b,c,d,e,f,g,h) \
- s0 = W256[(j+1)&0x0f]; \
- s0 = sigma0_256(s0); \
- s1 = W256[(j+14)&0x0f]; \
- s1 = sigma1_256(s1); \
- T1 = (h) + Sigma1_256(e) + Ch((e), (f), (g)) + K256[j] + \
- (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0); \
- (d) += T1; \
- (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
- j++
-
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
- sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word32 T1, *W256;
- int j;
-
- W256 = (sha2_word32*)context->buffer;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
- /* Rounds 0 to 15 (unrolled): */
- ROUND256_0_TO_15(a,b,c,d,e,f,g,h);
- ROUND256_0_TO_15(h,a,b,c,d,e,f,g);
- ROUND256_0_TO_15(g,h,a,b,c,d,e,f);
- ROUND256_0_TO_15(f,g,h,a,b,c,d,e);
- ROUND256_0_TO_15(e,f,g,h,a,b,c,d);
- ROUND256_0_TO_15(d,e,f,g,h,a,b,c);
- ROUND256_0_TO_15(c,d,e,f,g,h,a,b);
- ROUND256_0_TO_15(b,c,d,e,f,g,h,a);
- } while (j < 16);
-
- /* Now for the remaining rounds to 64: */
- do {
- ROUND256(a,b,c,d,e,f,g,h);
- ROUND256(h,a,b,c,d,e,f,g);
- ROUND256(g,h,a,b,c,d,e,f);
- ROUND256(f,g,h,a,b,c,d,e);
- ROUND256(e,f,g,h,a,b,c,d);
- ROUND256(d,e,f,g,h,a,b,c);
- ROUND256(c,d,e,f,g,h,a,b);
- ROUND256(b,c,d,e,f,g,h,a);
- } while (j < 64);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
- sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word32 T1, T2, *W256;
- int j;
-
- W256 = (sha2_word32*)context->buffer;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
-#ifndef WORDS_BIGENDIAN
- /* Copy data while converting to host byte order */
- REVERSE32(*data++,W256[j]);
- /* Apply the SHA-256 compression function to update a..h */
- T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + W256[j];
-#else
- /* Apply the SHA-256 compression function to update a..h with copy */
- T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] + (W256[j] = *data++);
-#endif
- T2 = Sigma0_256(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 16);
-
- do {
- /* Part of the message block expansion: */
- s0 = W256[(j+1)&0x0f];
- s0 = sigma0_256(s0);
- s1 = W256[(j+14)&0x0f];
- s1 = sigma1_256(s1);
-
- /* Apply the SHA-256 compression function to update a..h */
- T1 = h + Sigma1_256(e) + Ch(e, f, g) + K256[j] +
- (W256[j&0x0f] += s1 + W256[(j+9)&0x0f] + s0);
- T2 = Sigma0_256(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 64);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
- unsigned int freespace, usedspace;
-
- if (len == 0) {
- /* Calling with no data is valid - we do nothing */
- return;
- }
-
- /* Sanity check: */
- assert(context != NULL && data != NULL);
-
- usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
- if (usedspace > 0) {
- /* Calculate how much free space is available in the buffer */
- freespace = SHA256_BLOCK_LENGTH - usedspace;
-
- if (len >= freespace) {
- /* Fill the buffer completely and process it */
- MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
- context->bitcount += freespace << 3;
- len -= freespace;
- data += freespace;
- SHA256_Transform(context, (sha2_word32*)context->buffer);
- } else {
- /* The buffer is not yet full */
- MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
- context->bitcount += len << 3;
- /* Clean up: */
- usedspace = freespace = 0;
- return;
- }
- }
- while (len >= SHA256_BLOCK_LENGTH) {
- /* Process as many complete blocks as we can */
- SHA256_Transform(context, (const sha2_word32*)data);
- context->bitcount += SHA256_BLOCK_LENGTH << 3;
- len -= SHA256_BLOCK_LENGTH;
- data += SHA256_BLOCK_LENGTH;
- }
- if (len > 0) {
- /* There's left-overs, so save 'em */
- MEMCPY_BCOPY(context->buffer, data, len);
- context->bitcount += len << 3;
- }
- /* Clean up: */
- usedspace = freespace = 0;
-}
-
-void SHA256_Finish(SHA256_CTX* context, sha2_byte digest[]) {
- sha2_word32 *d = (sha2_word32*)digest;
- unsigned int usedspace;
-
- /* Sanity check: */
- assert(context != NULL);
-
- /* If no digest buffer is passed, we don't bother doing this: */
- if (digest != (sha2_byte*)0) {
- usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH;
-#ifndef WORDS_BIGENDIAN
- /* Convert FROM host byte order */
- REVERSE64(context->bitcount,context->bitcount);
-#endif
- if (usedspace > 0) {
- /* Begin padding with a 1 bit: */
- context->buffer[usedspace++] = 0x80;
-
- if (usedspace <= SHA256_SHORT_BLOCK_LENGTH) {
- /* Set-up for the last transform: */
- MEMSET_BZERO(&context->buffer[usedspace], SHA256_SHORT_BLOCK_LENGTH - usedspace);
- } else {
- if (usedspace < SHA256_BLOCK_LENGTH) {
- MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
- }
- /* Do second-to-last transform: */
- SHA256_Transform(context, (sha2_word32*)context->buffer);
-
- /* And set-up for the last transform: */
- MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
- }
- } else {
- /* Set-up for the last transform: */
- MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
-
- /* Begin padding with a 1 bit: */
- *context->buffer = 0x80;
- }
- /* Set the bit count: */
- *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
-
- /* Final transform: */
- SHA256_Transform(context, (sha2_word32*)context->buffer);
-
-#ifndef WORDS_BIGENDIAN
- {
- /* Convert TO host byte order */
- int j;
- for (j = 0; j < 8; j++) {
- REVERSE32(context->state[j],context->state[j]);
- *d++ = context->state[j];
- }
- }
-#else
- MEMCPY_BCOPY(d, context->state, SHA256_DIGEST_LENGTH);
-#endif
- }
-
- /* Clean up state data: */
- MEMSET_BZERO(context, sizeof(SHA256_CTX));
- usedspace = 0;
-}
-
-/*** SHA-512: *********************************************************/
-void SHA512_Init(SHA512_CTX* context) {
- if (context == (SHA512_CTX*)0) {
- return;
- }
- MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH);
- MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH);
- context->bitcount[0] = context->bitcount[1] = 0;
-}
-
-#ifdef SHA2_UNROLL_TRANSFORM
-
-/* Unrolled SHA-512 round macros: */
-#ifndef WORDS_BIGENDIAN
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
- REVERSE64(*data++, W512[j]); \
- T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
- K512[j] + W512[j]; \
- (d) += T1, \
- (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)), \
- j++
-
-
-#else
-
-#define ROUND512_0_TO_15(a,b,c,d,e,f,g,h) \
- T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + \
- K512[j] + (W512[j] = *data++); \
- (d) += T1; \
- (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
- j++
-
-#endif
-
-#define ROUND512(a,b,c,d,e,f,g,h) \
- s0 = W512[(j+1)&0x0f]; \
- s0 = sigma0_512(s0); \
- s1 = W512[(j+14)&0x0f]; \
- s1 = sigma1_512(s1); \
- T1 = (h) + Sigma1_512(e) + Ch((e), (f), (g)) + K512[j] + \
- (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0); \
- (d) += T1; \
- (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
- j++
-
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
- sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word64 T1, *W512 = (sha2_word64*)context->buffer;
- int j;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
- ROUND512_0_TO_15(a,b,c,d,e,f,g,h);
- ROUND512_0_TO_15(h,a,b,c,d,e,f,g);
- ROUND512_0_TO_15(g,h,a,b,c,d,e,f);
- ROUND512_0_TO_15(f,g,h,a,b,c,d,e);
- ROUND512_0_TO_15(e,f,g,h,a,b,c,d);
- ROUND512_0_TO_15(d,e,f,g,h,a,b,c);
- ROUND512_0_TO_15(c,d,e,f,g,h,a,b);
- ROUND512_0_TO_15(b,c,d,e,f,g,h,a);
- } while (j < 16);
-
- /* Now for the remaining rounds up to 79: */
- do {
- ROUND512(a,b,c,d,e,f,g,h);
- ROUND512(h,a,b,c,d,e,f,g);
- ROUND512(g,h,a,b,c,d,e,f);
- ROUND512(f,g,h,a,b,c,d,e);
- ROUND512(e,f,g,h,a,b,c,d);
- ROUND512(d,e,f,g,h,a,b,c);
- ROUND512(c,d,e,f,g,h,a,b);
- ROUND512(b,c,d,e,f,g,h,a);
- } while (j < 80);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = 0;
-}
-
-#else /* SHA2_UNROLL_TRANSFORM */
-
-void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
- sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
- sha2_word64 T1, T2, *W512 = (sha2_word64*)context->buffer;
- int j;
-
- /* Initialize registers with the prev. intermediate value */
- a = context->state[0];
- b = context->state[1];
- c = context->state[2];
- d = context->state[3];
- e = context->state[4];
- f = context->state[5];
- g = context->state[6];
- h = context->state[7];
-
- j = 0;
- do {
-#ifndef WORDS_BIGENDIAN
- /* Convert TO host byte order */
- REVERSE64(*data++, W512[j]);
- /* Apply the SHA-512 compression function to update a..h */
- T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + W512[j];
-#else
- /* Apply the SHA-512 compression function to update a..h with copy */
- T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] + (W512[j] = *data++);
-#endif
- T2 = Sigma0_512(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 16);
-
- do {
- /* Part of the message block expansion: */
- s0 = W512[(j+1)&0x0f];
- s0 = sigma0_512(s0);
- s1 = W512[(j+14)&0x0f];
- s1 = sigma1_512(s1);
-
- /* Apply the SHA-512 compression function to update a..h */
- T1 = h + Sigma1_512(e) + Ch(e, f, g) + K512[j] +
- (W512[j&0x0f] += s1 + W512[(j+9)&0x0f] + s0);
- T2 = Sigma0_512(a) + Maj(a, b, c);
- h = g;
- g = f;
- f = e;
- e = d + T1;
- d = c;
- c = b;
- b = a;
- a = T1 + T2;
-
- j++;
- } while (j < 80);
-
- /* Compute the current intermediate hash value */
- context->state[0] += a;
- context->state[1] += b;
- context->state[2] += c;
- context->state[3] += d;
- context->state[4] += e;
- context->state[5] += f;
- context->state[6] += g;
- context->state[7] += h;
-
- /* Clean up */
- a = b = c = d = e = f = g = h = T1 = T2 = 0;
-}
-
-#endif /* SHA2_UNROLL_TRANSFORM */
-
-void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
- unsigned int freespace, usedspace;
-
- if (len == 0) {
- /* Calling with no data is valid - we do nothing */
- return;
- }
-
- /* Sanity check: */
- assert(context != NULL && data != NULL);
-
- usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
- if (usedspace > 0) {
- /* Calculate how much free space is available in the buffer */
- freespace = SHA512_BLOCK_LENGTH - usedspace;
-
- if (len >= freespace) {
- /* Fill the buffer completely and process it */
- MEMCPY_BCOPY(&context->buffer[usedspace], data, freespace);
- ADDINC128(context->bitcount, freespace << 3);
- len -= freespace;
- data += freespace;
- SHA512_Transform(context, (const sha2_word64*)context->buffer);
- } else {
- /* The buffer is not yet full */
- MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
- ADDINC128(context->bitcount, len << 3);
- /* Clean up: */
- usedspace = freespace = 0;
- return;
- }
- }
- while (len >= SHA512_BLOCK_LENGTH) {
- /* Process as many complete blocks as we can */
- SHA512_Transform(context, (const sha2_word64*)data);
- ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
- len -= SHA512_BLOCK_LENGTH;
- data += SHA512_BLOCK_LENGTH;
- }
- if (len > 0) {
- /* There's left-overs, so save 'em */
- MEMCPY_BCOPY(context->buffer, data, len);
- ADDINC128(context->bitcount, len << 3);
- }
- /* Clean up: */
- usedspace = freespace = 0;
-}
-
-void SHA512_Last(SHA512_CTX* context) {
- unsigned int usedspace;
-
- usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
-#ifndef WORDS_BIGENDIAN
- /* Convert FROM host byte order */
- REVERSE64(context->bitcount[0],context->bitcount[0]);
- REVERSE64(context->bitcount[1],context->bitcount[1]);
-#endif
- if (usedspace > 0) {
- /* Begin padding with a 1 bit: */
- context->buffer[usedspace++] = 0x80;
-
- if (usedspace <= SHA512_SHORT_BLOCK_LENGTH) {
- /* Set-up for the last transform: */
- MEMSET_BZERO(&context->buffer[usedspace], SHA512_SHORT_BLOCK_LENGTH - usedspace);
- } else {
- if (usedspace < SHA512_BLOCK_LENGTH) {
- MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
- }
- /* Do second-to-last transform: */
- SHA512_Transform(context, (const sha2_word64*)context->buffer);
-
- /* And set-up for the last transform: */
- MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
- }
- } else {
- /* Prepare for final transform: */
- MEMSET_BZERO(context->buffer, SHA512_SHORT_BLOCK_LENGTH);
-
- /* Begin padding with a 1 bit: */
- *context->buffer = 0x80;
- }
- /* Store the length of input data (in bits): */
- *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1];
- *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0];
-
- /* Final transform: */
- SHA512_Transform(context, (const sha2_word64*)context->buffer);
-}
-
-void SHA512_Finish(SHA512_CTX* context, sha2_byte digest[]) {
- sha2_word64 *d = (sha2_word64*)digest;
-
- /* Sanity check: */
- assert(context != NULL);
-
- /* If no digest buffer is passed, we don't bother doing this: */
- if (digest != (sha2_byte*)0) {
- SHA512_Last(context);
-
- /* Save the hash data for output: */
-#ifndef WORDS_BIGENDIAN
- {
- /* Convert TO host byte order */
- int j;
- for (j = 0; j < 8; j++) {
- REVERSE64(context->state[j],context->state[j]);
- *d++ = context->state[j];
- }
- }
-#else
- MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH);
-#endif
- }
-
- /* Zero out state data */
- MEMSET_BZERO(context, sizeof(SHA512_CTX));
-}
-
-/*** SHA-384: *********************************************************/
-void SHA384_Init(SHA384_CTX* context) {
- if (context == (SHA384_CTX*)0) {
- return;
- }
- MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH);
- MEMSET_BZERO(context->buffer, SHA384_BLOCK_LENGTH);
- context->bitcount[0] = context->bitcount[1] = 0;
-}
-
-void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) {
- SHA512_Update((SHA512_CTX*)context, data, len);
-}
-
-void SHA384_Finish(SHA384_CTX* context, sha2_byte digest[]) {
- sha2_word64 *d = (sha2_word64*)digest;
-
- /* Sanity check: */
- assert(context != NULL);
-
- /* If no digest buffer is passed, we don't bother doing this: */
- if (digest != (sha2_byte*)0) {
- SHA512_Last((SHA512_CTX*)context);
-
- /* Save the hash data for output: */
-#ifndef WORDS_BIGENDIAN
- {
- /* Convert TO host byte order */
- int j;
- for (j = 0; j < 6; j++) {
- REVERSE64(context->state[j],context->state[j]);
- *d++ = context->state[j];
- }
- }
-#else
- MEMCPY_BCOPY(d, context->state, SHA384_DIGEST_LENGTH);
-#endif
- }
-
- /* Zero out state data */
- MEMSET_BZERO(context, sizeof(SHA384_CTX));
-}
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
deleted file mode 100644
index 917d415b73..0000000000
--- a/ext/digest/sha2/sha2.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * sha2.h
- *
- * Version 1.0.0beta1
- *
- * Written by Aaron D. Gifford <me@aarongifford.com>
- *
- * Copyright 2000 Aaron D. Gifford. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * 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 copyright holder nor the names of contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * 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.
- *
- */
-
-/* $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
-/* $Id$ */
-
-#ifndef __SHA2_H__
-#define __SHA2_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "defs.h"
-
-
-/*** SHA-256/384/512 Various Length Definitions ***********************/
-#define SHA256_BLOCK_LENGTH 64
-#define SHA256_DIGEST_LENGTH 32
-#define SHA256_DIGEST_STRING_LENGTH (SHA256_DIGEST_LENGTH * 2 + 1)
-#define SHA384_BLOCK_LENGTH 128
-#define SHA384_DIGEST_LENGTH 48
-#define SHA384_DIGEST_STRING_LENGTH (SHA384_DIGEST_LENGTH * 2 + 1)
-#define SHA512_BLOCK_LENGTH 128
-#define SHA512_DIGEST_LENGTH 64
-#define SHA512_DIGEST_STRING_LENGTH (SHA512_DIGEST_LENGTH * 2 + 1)
-
-
-/*** SHA-256/384/512 Context Structures *******************************/
-
-typedef struct _SHA256_CTX {
- uint32_t state[8];
- uint64_t bitcount;
- uint8_t buffer[SHA256_BLOCK_LENGTH];
-} SHA256_CTX;
-typedef struct _SHA512_CTX {
- uint64_t state[8];
- uint64_t bitcount[2];
- uint8_t buffer[SHA512_BLOCK_LENGTH];
-} SHA512_CTX;
-
-typedef SHA512_CTX SHA384_CTX;
-
-
-#ifdef RUBY
-#define SHA256_Init rb_Digest_SHA256_Init
-#define SHA256_Update rb_Digest_SHA256_Update
-#define SHA256_Finish rb_Digest_SHA256_Finish
-
-#define SHA384_Init rb_Digest_SHA384_Init
-#define SHA384_Update rb_Digest_SHA384_Update
-#define SHA384_Finish rb_Digest_SHA384_Finish
-
-#define SHA512_Init rb_Digest_SHA512_Init
-#define SHA512_Update rb_Digest_SHA512_Update
-#define SHA512_Finish rb_Digest_SHA512_Finish
-#endif
-
-/*** SHA-256/384/512 Function Prototypes ******************************/
-void SHA256_Init _((SHA256_CTX *));
-void SHA256_Update _((SHA256_CTX*, const uint8_t*, size_t));
-void SHA256_Finish _((SHA256_CTX*, uint8_t[SHA256_DIGEST_LENGTH]));
-
-void SHA384_Init _((SHA384_CTX*));
-void SHA384_Update _((SHA384_CTX*, const uint8_t*, size_t));
-void SHA384_Finish _((SHA384_CTX*, uint8_t[SHA384_DIGEST_LENGTH]));
-
-void SHA512_Init _((SHA512_CTX*));
-void SHA512_Update _((SHA512_CTX*, const uint8_t*, size_t));
-void SHA512_Finish _((SHA512_CTX*, uint8_t[SHA512_DIGEST_LENGTH]));
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __SHA2_H__ */
-
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
deleted file mode 100644
index c83a29316a..0000000000
--- a/ext/digest/sha2/sha2init.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id$ */
-
-#include "digest.h"
-#include "sha2.h"
-
-#define FOREACH_BITLEN(func) func(256) func(384) func(512)
-
-#define DEFINE_ALGO_METADATA(bitlen) \
-static rb_digest_metadata_t sha##bitlen = { \
- RUBY_DIGEST_API_VERSION, \
- SHA##bitlen##_DIGEST_LENGTH, \
- SHA##bitlen##_BLOCK_LENGTH, \
- sizeof(SHA##bitlen##_CTX), \
- (rb_digest_hash_init_func_t)SHA##bitlen##_Init, \
- (rb_digest_hash_update_func_t)SHA##bitlen##_Update, \
- (rb_digest_hash_finish_func_t)SHA##bitlen##_Finish, \
-};
-
-FOREACH_BITLEN(DEFINE_ALGO_METADATA)
-
-/*
- * Classes for calculating message digests using the SHA-256/384/512
- * Secure Hash Algorithm(s) by NIST (the US' National Institute of
- * Standards and Technology), described in FIPS PUB 180-2.
- */
-void
-Init_sha2()
-{
- VALUE mDigest, cDigest_Base;
- ID id_metadata;
-
-#define DECLARE_ALGO_CLASS(bitlen) \
- VALUE cDigest_SHA##bitlen;
-
- FOREACH_BITLEN(DECLARE_ALGO_CLASS)
-
- rb_require("digest");
-
- id_metadata = rb_intern("metadata");
-
- mDigest = rb_path2class("Digest");
- cDigest_Base = rb_path2class("Digest::Base");
-
-#define DEFINE_ALGO_CLASS(bitlen) \
- cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
-\
- rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
- Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen));
-
- FOREACH_BITLEN(DEFINE_ALGO_CLASS)
-}
diff --git a/ext/digest/test.sh b/ext/digest/test.sh
deleted file mode 100644
index 328c7575e6..0000000000
--- a/ext/digest/test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $RoughId: test.sh,v 1.5 2001/07/13 15:38:27 knu Exp $
-# $Id$
-
-RUBY=${RUBY:=ruby}
-MAKE=${MAKE:=make}
-CFLAGS=${CFLAGS:=-Wall}
-
-${RUBY} extconf.rb --with-cflags="${CFLAGS}"
-${MAKE} clean
-${MAKE}
-
-for algo in md5 rmd160 sha1 sha2; do
- args=--with-cflags="${CFLAGS}"
-
- if [ $WITH_BUNDLED_ENGINES ]; then
- args="$args --with-bundled-$algo"
- fi
-
- (cd $algo &&
- ${RUBY} extconf.rb $args;
- ${MAKE} clean;
- ${MAKE})
- ln -sf ../../$algo/$algo.so lib/digest/
-done
-
-${RUBY} -I. -I./lib ../../test/digest/test_digest.rb
-
-rm lib/digest/*.so
diff --git a/ext/dl/.cvsignore b/ext/dl/.cvsignore
deleted file mode 100644
index 6d884b6cec..0000000000
--- a/ext/dl/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-mkmf.log
-dlconfig.h
-dlconfig.rb
-*.func
-*.o
-*~
-*.def
diff --git a/ext/dl/depend b/ext/dl/depend
deleted file mode 100644
index fba3df7a3d..0000000000
--- a/ext/dl/depend
+++ /dev/null
@@ -1,46 +0,0 @@
-LDSHARED_TEST = $(LDSHARED) $(LDFLAGS) test/test.o -o test/libtest.so $(LOCAL_LIBS)
-
-libtest.so: test/libtest.so
-
-test/libtest.so: test/test.o $(srcdir)/test/libtest.def
- $(RUBY) -rftools -e 'ARGV.each do|d|File.mkpath(File.dirname(d))end' $@
- $(LDSHARED_TEST:dl.def=test/libtest.def)
-
-test/test.o: $(srcdir)/test/test.c
- @$(RUBY) -rftools -e 'File.mkpath(*ARGV)' test
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/test/test.c -o $@
-
-test:: dl.so libtest.so force
- $(RUBY) -I. -I$(srcdir)/lib $(srcdir)/test/test.rb
-
-force:
-
-.PHONY: force test
-
-allclean: distclean
- @rm -f $(CLEANFILES) $(DISTCLEANFILES)
-
-$(OBJS): ./dlconfig.h
-
-sym.o: dl.h call.func
-
-dl.o: dl.h callback.func cbtable.func
-
-ptr.o: dl.h
-
-handle.o: dl.h
-
-call.func: $(srcdir)/mkcall.rb ./dlconfig.rb
- @echo "Generating call.func"
- @$(RUBY) $(srcdir)/mkcall.rb > $@
-
-callback.func: $(srcdir)/mkcallback.rb ./dlconfig.rb
- @echo "Generating callback.func"
- @$(RUBY) $(srcdir)/mkcallback.rb > $@
-
-cbtable.func: $(srcdir)/mkcbtable.rb ./dlconfig.rb
- @echo "Generating cbtable.func"
- @$(RUBY) $(srcdir)/mkcbtable.rb > $@
-
-debug:
- $(MAKE) CPPFLAGS="$(CPPFLAGS) -DDEBUG"
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
deleted file mode 100644
index 5ba3646ea3..0000000000
--- a/ext/dl/dl.c
+++ /dev/null
@@ -1,728 +0,0 @@
-/*
- * $Id$
- */
-
-#include <ruby.h>
-#include <rubyio.h>
-#include <ctype.h>
-#include "dl.h"
-
-VALUE rb_mDL;
-VALUE rb_eDLError;
-VALUE rb_eDLTypeError;
-
-static VALUE DLFuncTable;
-static void *rb_dl_callback_table[CALLBACK_TYPES][MAX_CALLBACK];
-static ID id_call;
-
-static int
-rb_dl_scan_callback_args(long stack[], const char *proto,
- int *argc, VALUE argv[])
-{
- int i;
- long *sp;
- VALUE val;
-
- sp = stack;
- for (i=1; proto[i]; i++) {
- switch (proto[i]) {
- case 'C':
- {
- char v;
- v = (char)(*sp);
- sp++;
- val = INT2NUM(v);
- }
- break;
- case 'H':
- {
- short v;
- v = (short)(*sp);
- sp++;
- val = INT2NUM(v);
- }
- break;
- case 'I':
- {
- int v;
- v = (int)(*sp);
- sp++;
- val = INT2NUM(v);
- }
- break;
- case 'L':
- {
- long v;
- v = (long)(*sp);
- sp++;
- val = INT2NUM(v);
- }
- break;
- case 'F':
- {
- float v;
- memcpy(&v, sp, sizeof(float));
- sp += sizeof(float)/sizeof(long);
- val = rb_float_new(v);
- }
- break;
- case 'D':
- {
- double v;
- memcpy(&v, sp, sizeof(double));
- sp += sizeof(double)/sizeof(long);
- val = rb_float_new(v);
- }
- break;
- case 'P':
- {
- void *v;
- memcpy(&v, sp, sizeof(void*));
- sp++;
- val = rb_dlptr_new(v, 0, 0);
- }
- break;
- case 'S':
- {
- char *v;
- memcpy(&v, sp, sizeof(void*));
- sp++;
- val = rb_tainted_str_new2(v);
- }
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type `%c'", proto[i]);
- break;
- }
- argv[i-1] = val;
- }
- *argc = (i - 1);
-
- return (*argc);
-}
-
-#include "callback.func"
-
-static void
-init_dl_func_table(){
-#include "cbtable.func"
-}
-
-void *
-dlmalloc(size_t size)
-{
- DEBUG_CODE2({
- void *ptr;
-
- printf("dlmalloc(%d)",size);
- ptr = xmalloc(size);
- printf(":0x%x\n",ptr);
- return ptr;
- },
- {
- return xmalloc(size);
- });
-}
-
-void *
-dlrealloc(void *ptr, size_t size)
-{
- DEBUG_CODE({
- printf("dlrealloc(0x%x,%d)\n",ptr,size);
- });
- return xrealloc(ptr, size);
-}
-
-void
-dlfree(void *ptr)
-{
- DEBUG_CODE({
- printf("dlfree(0x%x)\n",ptr);
- });
- xfree(ptr);
-}
-
-char*
-dlstrdup(const char *str)
-{
- char *newstr;
-
- newstr = (char*)dlmalloc(strlen(str)+1);
- strcpy(newstr,str);
-
- return newstr;
-}
-
-size_t
-dlsizeof(const char *cstr)
-{
- size_t size;
- int i, len, n, dlen;
- char *d;
-
- len = strlen(cstr);
- size = 0;
- for (i=0; i<len; i++) {
- n = 1;
- if (isdigit(cstr[i+1])) {
- dlen = 1;
- while (isdigit(cstr[i+dlen])) { dlen ++; };
- dlen --;
- d = ALLOCA_N(char, dlen + 1);
- strncpy(d, cstr + i + 1, dlen);
- d[dlen] = '\0';
- n = atoi(d);
- }
- else{
- dlen = 0;
- }
-
- switch (cstr[i]) {
- case 'I':
- DLALIGN(0,size,INT_ALIGN);
- case 'i':
- size += sizeof(int) * n;
- break;
- case 'L':
- DLALIGN(0,size,LONG_ALIGN);
- case 'l':
- size += sizeof(long) * n;
- break;
- case 'F':
- DLALIGN(0,size,FLOAT_ALIGN);
- case 'f':
- size += sizeof(float) * n;
- break;
- case 'D':
- DLALIGN(0,size,DOUBLE_ALIGN);
- case 'd':
- size += sizeof(double) * n;
- break;
- case 'C':
- case 'c':
- size += sizeof(char) * n;
- break;
- case 'H':
- DLALIGN(0,size,SHORT_ALIGN);
- case 'h':
- size += sizeof(short) * n;
- break;
- case 'P':
- case 'S':
- DLALIGN(0,size,VOIDP_ALIGN);
- case 'p':
- case 's':
- size += sizeof(void*) * n;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unexpected type '%c'", cstr[i]);
- break;
- }
- i += dlen;
- }
-
- return size;
-}
-
-static float *
-c_farray(VALUE v, long *size)
-{
- int i, len;
- float *ary;
- VALUE e;
-
- len = RARRAY(v)->len;
- *size = sizeof(float) * len;
- ary = dlmalloc(*size);
- for (i=0; i < len; i++) {
- e = rb_ary_entry(v, i);
- switch (TYPE(e)) {
- case T_FLOAT:
- ary[i] = (float)(RFLOAT(e)->value);
- break;
- case T_NIL:
- ary[i] = 0.0;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- break;
- }
- }
-
- return ary;
-}
-
-static double *
-c_darray(VALUE v, long *size)
-{
- int i, len;
- double *ary;
- VALUE e;
-
- len = RARRAY(v)->len;
- *size = sizeof(double) * len;
- ary = dlmalloc(*size);
- for (i=0; i < len; i++) {
- e = rb_ary_entry(v, i);
- switch (TYPE(e)) {
- case T_FLOAT:
- ary[i] = (double)(RFLOAT(e)->value);
- break;
- case T_NIL:
- ary[i] = 0.0;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- break;
- }
- }
-
- return ary;
-}
-
-static long *
-c_larray(VALUE v, long *size)
-{
- int i, len;
- long *ary;
- VALUE e;
-
- len = RARRAY(v)->len;
- *size = sizeof(long) * len;
- ary = dlmalloc(*size);
- for (i=0; i < len; i++) {
- e = rb_ary_entry(v, i);
- switch (TYPE(e)) {
- case T_FIXNUM:
- case T_BIGNUM:
- ary[i] = (long)(NUM2INT(e));
- break;
- case T_NIL:
- ary[i] = 0;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- break;
- }
- }
-
- return ary;
-}
-
-static int *
-c_iarray(VALUE v, long *size)
-{
- int i, len;
- int *ary;
- VALUE e;
-
- len = RARRAY(v)->len;
- *size = sizeof(int) * len;
- ary = dlmalloc(*size);
- for (i=0; i < len; i++) {
- e = rb_ary_entry(v, i);
- switch (TYPE(e)) {
- case T_FIXNUM:
- case T_BIGNUM:
- ary[i] = (int)(NUM2INT(e));
- break;
- case T_NIL:
- ary[i] = 0;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- break;
- }
- }
-
- return ary;
-}
-
-static short *
-c_harray(VALUE v, long *size)
-{
- int i, len;
- short *ary;
- VALUE e;
-
- len = RARRAY(v)->len;
- *size = sizeof(short) * len;
- ary = dlmalloc(*size);
- for (i=0; i < len; i++) {
- e = rb_ary_entry(v, i);
- switch (TYPE(e)) {
- case T_FIXNUM:
- case T_BIGNUM:
- ary[i] = (short)(NUM2INT(e));
- break;
- case T_NIL:
- ary[i] = 0;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- break;
- }
- }
-
- return ary;
-}
-
-static char *
-c_carray(VALUE v, long *size)
-{
- int i, len;
- char *ary;
- VALUE e;
-
- len = RARRAY(v)->len;
- *size = sizeof(char) * len;
- ary = dlmalloc(*size);
- for (i=0; i < len; i++) {
- e = rb_ary_entry(v, i);
- switch (TYPE(e)) {
- case T_FIXNUM:
- case T_BIGNUM:
- ary[i] = (char)(NUM2INT(e));
- break;
- case T_NIL:
- ary[i] = 0;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- break;
- }
- }
-
- return ary;
-}
-
-static void *
-c_parray(VALUE v, long *size)
-{
- int i, len;
- void **ary;
- VALUE e, tmp;
-
- len = RARRAY(v)->len;
- *size = sizeof(void*) * len;
- ary = dlmalloc(*size);
- for (i=0; i < len; i++) {
- e = rb_ary_entry(v, i);
- switch (TYPE(e)) {
- default:
- tmp = rb_check_string_type(e);
- if (NIL_P(tmp)) {
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- }
- e = tmp;
- /* fall through */
- case T_STRING:
- rb_check_safe_str(e);
- {
- char *str, *src;
- src = RSTRING(e)->ptr;
- str = dlstrdup(src);
- ary[i] = (void*)str;
- }
- break;
- case T_NIL:
- ary[i] = NULL;
- break;
- case T_DATA:
- if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
- struct ptr_data *pdata;
- Data_Get_Struct(e, struct ptr_data, pdata);
- ary[i] = (void*)(pdata->ptr);
- }
- else{
- e = rb_funcall(e, rb_intern("to_ptr"), 0);
- if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
- struct ptr_data *pdata;
- Data_Get_Struct(e, struct ptr_data, pdata);
- ary[i] = (void*)(pdata->ptr);
- }
- else{
- rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
- }
- }
- break;
- }
- }
-
- return ary;
-}
-
-void *
-rb_ary2cary(char t, VALUE v, long *size)
-{
- int len;
- VALUE val0;
-
- val0 = rb_check_array_type(v);
- if(NIL_P(val0)) {
- rb_raise(rb_eDLTypeError, "an array is expected.");
- }
- v = val0;
-
- len = RARRAY(v)->len;
- if (len == 0) {
- return NULL;
- }
-
- if (!size) {
- size = ALLOCA_N(long,1);
- }
-
- val0 = rb_ary_entry(v,0);
- switch (TYPE(val0)) {
- case T_FIXNUM:
- case T_BIGNUM:
- switch (t) {
- case 'C': case 'c':
- return (void*)c_carray(v,size);
- case 'H': case 'h':
- return (void*)c_harray(v,size);
- case 'I': case 'i':
- return (void*)c_iarray(v,size);
- case 'L': case 'l': case 0:
- return (void*)c_larray(v,size);
- default:
- rb_raise(rb_eDLTypeError, "type mismatch");
- }
- case T_STRING:
- return (void*)c_parray(v,size);
- case T_FLOAT:
- switch (t) {
- case 'F': case 'f':
- return (void*)c_farray(v,size);
- case 'D': case 'd': case 0:
- return (void*)c_darray(v,size);
- }
- rb_raise(rb_eDLTypeError, "type mismatch");
- case T_DATA:
- if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
- return (void*)c_parray(v,size);
- }
- else{
- val0 = rb_funcall(val0, rb_intern("to_ptr"), 0);
- if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
- return (void*)c_parray(v,size);
- }
- }
- rb_raise(rb_eDLTypeError, "type mismatch");
- case T_NIL:
- return (void*)c_parray(v, size);
- default:
- rb_raise(rb_eDLTypeError, "unsupported type");
- }
-}
-
-VALUE
-rb_str_to_ptr(VALUE self)
-{
- char *ptr;
- int len;
-
- len = RSTRING(self)->len;
- ptr = (char*)dlmalloc(len + 1);
- memcpy(ptr, RSTRING(self)->ptr, len);
- ptr[len] = '\0';
- return rb_dlptr_new((void*)ptr,len,dlfree);
-}
-
-VALUE
-rb_ary_to_ptr(int argc, VALUE argv[], VALUE self)
-{
- void *ptr;
- VALUE t;
- long size;
-
- switch (rb_scan_args(argc, argv, "01", &t)) {
- case 1:
- ptr = rb_ary2cary(StringValuePtr(t)[0], self, &size);
- break;
- case 0:
- ptr = rb_ary2cary(0, self, &size);
- break;
- }
- return ptr ? rb_dlptr_new(ptr, size, dlfree) : Qnil;
-}
-
-VALUE
-rb_io_to_ptr(VALUE self)
-{
- OpenFile *fptr;
- FILE *fp;
-
- GetOpenFile(self, fptr);
- fp = fptr->f;
-
- return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
-}
-
-VALUE
-rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
-{
- rb_secure(4);
- return rb_class_new_instance(argc, argv, rb_cDLHandle);
-}
-
-VALUE
-rb_dl_malloc(VALUE self, VALUE size)
-{
- rb_secure(4);
- return rb_dlptr_malloc(DLNUM2LONG(size), dlfree);
-}
-
-VALUE
-rb_dl_strdup(VALUE self, VALUE str)
-{
- SafeStringValue(str);
- return rb_dlptr_new(strdup(RSTRING(str)->ptr), RSTRING(str)->len, dlfree);
-}
-
-static VALUE
-rb_dl_sizeof(VALUE self, VALUE str)
-{
- return INT2NUM(dlsizeof(StringValuePtr(str)));
-}
-
-static VALUE
-rb_dl_callback(int argc, VALUE argv[], VALUE self)
-{
- VALUE type, proc;
- int rettype, entry, i;
- char fname[127];
-
- rb_secure(4);
- proc = Qnil;
- switch (rb_scan_args(argc, argv, "11", &type, &proc)) {
- case 1:
- if (rb_block_given_p()) {
- proc = rb_block_proc();
- }
- else{
- proc = Qnil;
- }
- default:
- break;
- }
-
- StringValue(type);
- switch (RSTRING(type)->ptr[0]) {
- case '0':
- rettype = 0x00;
- break;
- case 'C':
- rettype = 0x01;
- break;
- case 'H':
- rettype = 0x02;
- break;
- case 'I':
- rettype = 0x03;
- break;
- case 'L':
- rettype = 0x04;
- break;
- case 'F':
- rettype = 0x05;
- break;
- case 'D':
- rettype = 0x06;
- break;
- case 'P':
- rettype = 0x07;
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type `%c'", RSTRING(type)->ptr[0]);
- }
-
- entry = -1;
- for (i=0; i < MAX_CALLBACK; i++) {
- if (rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(rettype), INT2NUM(i))) == Qnil) {
- entry = i;
- break;
- }
- }
- if (entry < 0) {
- rb_raise(rb_eDLError, "too many callbacks are defined.");
- }
-
- rb_hash_aset(DLFuncTable,
- rb_assoc_new(INT2NUM(rettype),INT2NUM(entry)),
- rb_assoc_new(type,proc));
- sprintf(fname, "rb_dl_callback_func_%d_%d", rettype, entry);
- return rb_dlsym_new((void (*)())rb_dl_callback_table[rettype][entry],
- fname, RSTRING(type)->ptr);
-}
-
-static VALUE
-rb_dl_remove_callback(VALUE mod, VALUE sym)
-{
- freefunc_t f;
- int i, j;
-
- rb_secure(4);
- f = rb_dlsym2csym(sym);
- for (i=0; i < CALLBACK_TYPES; i++) {
- for (j=0; j < MAX_CALLBACK; j++) {
- if (rb_dl_callback_table[i][j] == f) {
- rb_hash_aset(DLFuncTable, rb_assoc_new(INT2NUM(i),INT2NUM(j)),Qnil);
- break;
- }
- }
- }
- return Qnil;
-}
-
-void
-Init_dl()
-{
- void Init_dlptr();
- void Init_dlsym();
- void Init_dlhandle();
-
- id_call = rb_intern("call");
-
- rb_mDL = rb_define_module("DL");
-
- rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
- rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
-
- DLFuncTable = rb_hash_new();
- init_dl_func_table();
- rb_define_const(rb_mDL, "FuncTable", DLFuncTable);
-
- rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
- rb_define_const(rb_mDL, "RTLD_LAZY", INT2NUM(RTLD_LAZY));
- rb_define_const(rb_mDL, "RTLD_NOW", INT2NUM(RTLD_NOW));
-
- rb_define_const(rb_mDL, "ALIGN_INT", INT2NUM(ALIGN_INT));
- rb_define_const(rb_mDL, "ALIGN_LONG", INT2NUM(ALIGN_LONG));
- rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
- rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
- rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
- rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
-
- rb_define_const(rb_mDL, "MAX_ARG", INT2NUM(MAX_ARG));
- rb_define_const(rb_mDL, "DLSTACK", rb_tainted_str_new2(DLSTACK_METHOD));
-
- rb_define_module_function(rb_mDL, "dlopen", rb_dl_dlopen, -1);
- rb_define_module_function(rb_mDL, "callback", rb_dl_callback, -1);
- rb_define_module_function(rb_mDL, "define_callback", rb_dl_callback, -1);
- rb_define_module_function(rb_mDL, "remove_callback", rb_dl_remove_callback, 1);
- rb_define_module_function(rb_mDL, "malloc", rb_dl_malloc, 1);
- rb_define_module_function(rb_mDL, "strdup", rb_dl_strdup, 1);
- rb_define_module_function(rb_mDL, "sizeof", rb_dl_sizeof, 1);
-
- Init_dlptr();
- Init_dlsym();
- Init_dlhandle();
-
- rb_define_const(rb_mDL, "FREE", rb_dlsym_new(dlfree, "free", "0P"));
-
- rb_define_method(rb_cString, "to_ptr", rb_str_to_ptr, 0);
- rb_define_method(rb_cArray, "to_ptr", rb_ary_to_ptr, -1);
- rb_define_method(rb_cIO, "to_ptr", rb_io_to_ptr, 0);
-}
diff --git a/ext/dl/dl.def b/ext/dl/dl.def
deleted file mode 100644
index cdab4af90d..0000000000
--- a/ext/dl/dl.def
+++ /dev/null
@@ -1,59 +0,0 @@
-EXPORTS
-Init_dl
-dlfree
-dlmalloc
-dlrealloc
-dlstrdup
-rb_ary_to_ptr
-rb_dl_dlopen
-rb_dl_malloc
-rb_dl_strdup
-rb_eDLError
-rb_eDLTypeError
-rb_io_to_ptr
-rb_mDL
-rb_str_to_ptr
-Init_dlhandle
-rb_cDLHandle
-rb_dlhandle_close
-rb_dlhandle_disable_close
-rb_dlhandle_enable_close
-rb_dlhandle_sym
-Init_dlptr
-rb_cDLPtrData
-rb_dlmem_each
-rb_dlptr2cptr
-rb_dlptr_malloc
-rb_dlptr_aref
-rb_dlptr_aset
-rb_dlptr_cmp
-rb_dlptr_define_data_type
-rb_dlptr_define_struct
-rb_dlptr_define_union
-rb_dlptr_eql
-rb_dlptr_free_get
-rb_dlptr_free_set
-rb_dlptr_get_data_type
-rb_dlptr_inspect
-rb_dlptr_minus
-rb_dlptr_new
-rb_dlptr_new2
-rb_dlptr_null_p
-rb_dlptr_plus
-rb_dlptr_ptr
-rb_dlptr_ref
-rb_dlptr_to_array
-rb_dlptr_to_i
-rb_dlptr_to_s
-rb_dlptr_to_str
-rb_mDLMemorySpace
-Init_dlsym
-rb_cDLSymbol
-rb_dlsym2csym
-rb_dlsym_call
-rb_dlsym_cproto
-rb_dlsym_inspect
-rb_dlsym_name
-rb_dlsym_new
-rb_dlsym_proto
-rb_dlsym_to_ptr
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
deleted file mode 100644
index 1faa316cf1..0000000000
--- a/ext/dl/dl.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#ifndef RUBY_DL_H
-#define RUBY_DL_H
-
-#include <ruby.h>
-#include <dlconfig.h>
-
-#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(HAVE_WINDOWS_H)
-# include <windows.h>
-# define dlclose(ptr) FreeLibrary((HINSTANCE)ptr)
-# define dlopen(name,flag) ((void*)LoadLibrary(name))
-# define dlerror() "unknown error"
-# define dlsym(handle,name) ((void*)GetProcAddress(handle,name))
-# define RTLD_LAZY -1
-# define RTLD_NOW -1
-# define RTLD_GLOBAL -1
-# endif
-#endif
-
-#if !defined(StringValue)
-# define StringValue(v) if(TYPE(v) != T_STRING) v = rb_str_to_str(v)
-#endif
-#if !defined(StringValuePtr)
-# define StringValuePtr(v) RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr
-#endif
-
-#ifdef DEBUG
-#define DEBUG_CODE(b) {printf("DEBUG:%d\n",__LINE__);b;}
-#define DEBUG_CODE2(b1,b2) {printf("DEBUG:%d\n",__LINE__);b1;}
-#else
-#define DEBUG_CODE(b)
-#define DEBUG_CODE2(b1,b2) b2
-#endif
-
-#define VOID_DLTYPE 0x00
-#define CHAR_DLTYPE 0x01
-#define SHORT_DLTYPE 0x02
-#define INT_DLTYPE 0x03
-#define LONG_DLTYPE 0x04
-#define FLOAT_DLTYPE 0x05
-#define DOUBLE_DLTYPE 0x06
-#define VOIDP_DLTYPE 0x07
-
-#define ARG_TYPE(x,i) (((x) & (0x07 << ((i)*3))) >> ((i)*3))
-#define PUSH_ARG(x,t) do{x <<= 3; x |= t;}while(0)
-#define PUSH_0(x) PUSH_ARG(x,VOID_DLTYPE)
-
-#if SIZEOF_INT == SIZEOF_LONG
-# define PUSH_I(x) PUSH_ARG(x,LONG_DLTYPE)
-# define ANY2I(x) x.l
-# define DLINT(x) (long)x
-#else
-# define PUSH_I(x) PUSH_ARG(x,INT_DLTYPE)
-# define ANY2I(x) x.i
-# define DLINT(x) (int)x
-#endif
-#define PUSH_L(x) PUSH_ARG(x,LONG_DLTYPE)
-#define ANY2L(x) x.l
-#define DLLONG(x) (long)x
-
-#if defined(WITH_TYPE_FLOAT)
-# if SIZEOF_FLOAT == SIZEOF_DOUBLE
-# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-# define ANY2F(x) (x.d)
-# define DLFLOAT(x) ((double)x)
-# else
-# define PUSH_F(x) PUSH_ARG(x,FLOAT_DLTYPE)
-# define ANY2F(x) (x.f)
-# define DLFLOAT(x) ((float)x)
-# endif
-#else
-# define PUSH_F(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-# define ANY2F(x) (x.d)
-# define DLFLOAT(x) ((double)x)
-#endif
-#define PUSH_D(x) PUSH_ARG(x,DOUBLE_DLTYPE)
-#define ANY2D(x) (x.d)
-#define DLDOUBLE(x) ((double)x)
-
-#if SIZEOF_INT == SIZEOF_VOIDP && SIZEOF_INT != SIZEOF_LONG
-# define PUSH_P(x) PUSH_ARG(x,INT_DLTYPE)
-# define ANY2P(x) (x.i)
-# define DLVOIDP(x) ((int)x)
-#elif SIZEOF_LONG == SIZEOF_VOIDP
-# define PUSH_P(x) PUSH_ARG(x,LONG_DLTYPE)
-# define ANY2P(x) (x.l)
-# define DLVOIDP(x) ((long)x)
-#else
-# define PUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
-# define ANY2P(x) (x.p)
-# define DLVOIDP(x) ((void*)p)
-#endif
-
-#if defined(WITH_TYPE_CHAR)
-# define PUSH_C(x) PUSH_ARG(x,CHAR_DLTYPE)
-# define ANY2C(x) (x.c)
-# define DLCHAR(x) ((char)x)
-#else
-# define PUSH_C(x) PUSH_I(x)
-# define ANY2C(x) ANY2I(x)
-# define DLCHAR(x) DLINT(x)
-#endif
-
-#if defined(WITH_TYPE_SHORT)
-# define PUSH_H(x) PUSH_ARG(x,SHORT_DLTYPE)
-# define ANY2H(x) (x.h)
-# define DLSHORT(x) ((short)x)
-#else
-# define PUSH_H(x) PUSH_I(x)
-# define ANY2H(x) ANY2I(x)
-# define DLSHORT(x) DLINT(x)
-#endif
-
-#define PUSH_S(x) PUSH_P(x)
-#define ANY2S(x) ANY2P(x)
-#define DLSTR(x) DLVOIDP(x)
-
-#define CBPUSH_0(x) PUSH_0(x)
-#define CBPUSH_C(x) PUSH_C(x)
-#define CBPUSH_H(x) PUSH_H(x)
-#define CBPUSH_I(x) PUSH_I(x)
-#define CBPUSH_L(x) PUSH_L(x)
-#define CBPUSH_F(x) PUSH_F(x)
-#define CBPUSH_D(x) PUSH_D(x)
-#if defined(WITH_CBTYPE_VOIDP)
-# define CBPUSH_P(x) PUSH_ARG(x,VOIDP_DLTYPE)
-#else
-# define CBPUSH_P(x) PUSH_P(x)
-#endif
-
-
-#if defined(USE_INLINE_ASM)
-# if defined(__i386__) && defined(__GNUC__)
-# define DLSTACK
-# define DLSTACK_METHOD "asm"
-# define DLSTACK_REVERSE
-# define DLSTACK_PROTO
-# define DLSTACK_ARGS
-# define DLSTACK_START(sym)
-# define DLSTACK_END(sym)
-# define DLSTACK_PUSH_C(x) asm volatile ("pushl %0" :: "g" (x));
-# define DLSTACK_PUSH_H(x) asm volatile ("pushl %0" :: "g" (x));
-# define DLSTACK_PUSH_I(x) asm volatile ("pushl %0" :: "g" (x));
-# define DLSTACK_PUSH_L(x) asm volatile ("pushl %0" :: "g" (x));
-# define DLSTACK_PUSH_P(x) asm volatile ("pushl %0" :: "g" (x));
-# define DLSTACK_PUSH_F(x) asm volatile ("flds %0"::"g"(x));\
- asm volatile ("subl $4,%esp");\
- asm volatile ("fstps (%esp)");
-# define DLSTACK_PUSH_D(x) asm volatile ("fldl %0"::"g"(x));\
- asm volatile ("subl $8,%esp");\
- asm volatile ("fstpl (%esp)")
-# else
-# error --with-asm is not supported on this machine
-# endif
-#elif defined(USE_DLSTACK)
-# define DLSTACK
-# define DLSTACK_GUARD
-# define DLSTACK_METHOD "dl"
-# define DLSTACK_PROTO long,long,long,long,long,\
- long,long,long,long,long,\
- long,long,long,long,long
-# define DLSTACK_ARGS stack[0],stack[1],stack[2],stack[3],stack[4],\
- stack[5],stack[6],stack[7],stack[8],stack[9],\
- stack[10],stack[11],stack[12],stack[13],stack[14]
-# define DLSTACK_SIZE (sizeof(long)*15)
-# define DLSTACK_START(sym)
-# define DLSTACK_END(sym)
-# define DLSTACK_PUSH_C(x) {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_H(x) {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_I(x) {long v=(long)x; memcpy(sp,&v,sizeof(long)); sp++;}
-# define DLSTACK_PUSH_L(x) memcpy(sp,&x,sizeof(long)); sp++;
-# define DLSTACK_PUSH_P(x) memcpy(sp,&x,sizeof(void*)); sp++;
-# define DLSTACK_PUSH_F(x) memcpy(sp,&x,sizeof(float)); sp+=sizeof(float)/sizeof(long);
-# define DLSTACK_PUSH_D(x) memcpy(sp,&x,sizeof(double)); sp+=sizeof(double)/sizeof(long);
-#else
-# define DLSTACK_METHOD "none"
-#endif
-
-extern VALUE rb_mDL;
-extern VALUE rb_mDLMemorySpace;
-extern VALUE rb_cDLHandle;
-extern VALUE rb_cDLSymbol;
-extern VALUE rb_cDLPtrData;
-extern VALUE rb_cDLStructData;
-
-extern VALUE rb_eDLError;
-extern VALUE rb_eDLTypeError;
-
-#if defined(LONG2NUM) && (SIZEOF_LONG == SIZEOF_VOIDP)
-# define DLLONG2NUM(x) LONG2NUM((long)x)
-# define DLNUM2LONG(x) (long)(NUM2LONG(x))
-#else
-# define DLLONG2NUM(x) INT2NUM((long)x)
-# define DLNUM2LONG(x) (long)(NUM2INT(x))
-#endif
-
-typedef struct { char c; void *x; } s_voidp;
-typedef struct { char c; short x; } s_short;
-typedef struct { char c; int x; } s_int;
-typedef struct { char c; long x; } s_long;
-typedef struct { char c; float x; } s_float;
-typedef struct { char c; double x; } s_double;
-
-#define ALIGN_VOIDP (sizeof(s_voidp) - sizeof(void *))
-#define ALIGN_SHORT (sizeof(s_short) - sizeof(short))
-#define ALIGN_INT (sizeof(s_int) - sizeof(int))
-#define ALIGN_LONG (sizeof(s_long) - sizeof(long))
-#define ALIGN_FLOAT (sizeof(s_float) - sizeof(float))
-#define ALIGN_DOUBLE (sizeof(s_double) - sizeof(double))
-
-/* for compatibility */
-#define VOIDP_ALIGN ALIGN_VOIDP
-#define SHORT_ALIGN ALIGN_SHORT
-#define INT_ALIGN ALIGN_INT
-#define LONG_ALIGN ALIGN_LONG
-#define FLOAT_ALIGN ALIGN_FLOAT
-#define DOUBLE_ALIGN ALIGN_DOUBLE
-
-#define DLALIGN(ptr,offset,align) {\
- while( (((unsigned long)((char *)ptr + offset)) % align) != 0 ) offset++;\
-}
-
-typedef void (*freefunc_t)(void *);
-#define DLFREEFUNC(func) ((freefunc_t)(func))
-
-typedef union {
- void* p;
- char c;
- short h;
- int i;
- long l;
- float f;
- double d;
- char *s;
-} ANY_TYPE;
-
-struct dl_handle {
- void *ptr;
- int open;
- int enable_close;
-};
-
-struct sym_data {
- void *func;
- char *name;
- char *type;
- int len;
-};
-
-enum DLPTR_CTYPE {
- DLPTR_CTYPE_UNKNOWN,
- DLPTR_CTYPE_STRUCT,
- DLPTR_CTYPE_UNION
-};
-
-struct ptr_data {
- void *ptr; /* a pointer to the data */
- freefunc_t free; /* free() */
- char *stype; /* array of type specifiers */
- int *ssize; /* size[i] = sizeof(type[i]) > 0 */
- int slen; /* the number of type specifiers */
- ID *ids;
- int ids_num;
- int ctype; /* DLPTR_CTYPE_UNKNOWN, DLPTR_CTYPE_STRUCT, DLPTR_CTYPE_UNION */
- long size;
-};
-
-#define RDLPTR(obj) ((struct ptr_data *)(DATA_PTR(obj)))
-#define RDLSYM(obj) ((struct sym_data *)(DATA_PTR(obj)))
-
-void dlfree(void*);
-void *dlmalloc(size_t);
-void *dlrealloc(void*,size_t);
-char *dlstrdup(const char *);
-size_t dlsizeof(const char *);
-
-void *rb_ary2cary(char t, VALUE ary, long *size);
-
-/*
-void rb_dlmem_delete(void *ptr);
-void rb_dlmem_aset(void *ptr, VALUE obj);
-VALUE rb_dlmem_aref(void *ptr);
-*/
-
-void dlptr_free(struct ptr_data *data);
-void dlptr_init(VALUE val);
-
-VALUE rb_dlptr_new(void *ptr, long size, freefunc_t func);
-VALUE rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func);
-VALUE rb_dlptr_malloc(long size, freefunc_t func);
-void *rb_dlptr2cptr(VALUE val);
-
-VALUE rb_dlsym_new(void (*func)(), const char *name, const char *type);
-freefunc_t rb_dlsym2csym(VALUE val);
-
-
-#endif /* RUBY_DL_H */
diff --git a/ext/dl/doc/dl.txt b/ext/dl/doc/dl.txt
deleted file mode 100644
index 893bd21d79..0000000000
--- a/ext/dl/doc/dl.txt
+++ /dev/null
@@ -1,266 +0,0 @@
-=begin
-
-= Ruby/DL
-
-Ruby/DL provides an interface to the dynamic linker such as dlopen() on UNIX
-and LoadLibrary() on Windows.
-
-= Building and Installing
-
- $ ruby extconf.rb # to create the Makefile
- $ make # to build the library 'dl.so'
- $ make libtest.so # to build the C library 'libtest.so' for the test script
- $ make test # to run the test script
- $ make install # to install the library
- $ make clean # to remove the created files without Makefile
- $ make distclean # to remove the all created files
-
-= Using Ruby/DL
-
-We should usually use DL::Importable module provided by "dl/import.rb".
-It has high-level functions to access library functions. We use
-DL::Importable module to extend a module as follows:
-
- require "dl/import"
- module LIBC
- extend DL::Importable
- end
-
-Now we can use methods dlload and extern in this module. We load the
-libraries using dlload, and define wrapper methods to library functions
-using extern respectively as follows:
-
- module LIBC
- extend DL::Importable
- dlload "libc.so.6","libm.so.6"
- extern "int strlen(char*)"
- end
- # Note that we should not include the module LIBC from some reason.
-
-We can call the library function strlen() using LIBC.strlen. If the first
-character of given function name is an uppercase, the first character of the
-defined method name becomes lowercase.
-We can also construct memory images of structures and unions using functions
-struct and union which are defined in "dl/struct.rb" as follows:
-
- require "dl/import"
- require "dl/struct"
- module LIBC
- extend DL::Importable
- Timeval = struct [ # define timeval structure.
- "long tv_sec",
- "long tv_uses",
- ]
- end
- val = LIBC::Timeval.malloc # allocate memory.
-
-Notice that the above example takes LIBC::Timeval.malloc to allocate memory,
-rather than LIBC::Timeval.new. It is because DL::Timeval.new is for wrapping
-an object, PtrData, which has already been created.
-
-We can define a callback using the module function "callback" as follows:
-
- module Foo
- extend DL::Importable
- def my_comp(str1,str2)
- str1 <=> str2
- end
- COMPARE = callback "int my_comp(char*,char*)"
- end
-
-where Foo::COMPARE is a Symbol object which invokes the method "my_comp".
-
-DL::Importable module is very useful. However, we sometimes encounter a case
-that we must directly use low-level functions such as dlsym(). In such case,
-we would use DL module functions. They are described in next section.
-
-= DL module
-
-Module DL consists of three classes, a few module functions and constants.
-The class Symbol represents the symbol we can call. The class PtrData
-indicates a memory block such as a pointer in C. An object instantiated from
-the class Handle keeps a handle to opened library.
-
-== Constants
-
-* VERSION
-* MAJOR_VERSION
-* MINOR_VERSION
-* PATCH_VERSION
-* RTLD_GLOBAL
-* RTLD_LAZY
-* RTLD_NOW
-* MAX_ARG
-* MAX_CBARG
-* MAX_CBENT
-
-== Functions
-
-* handle = dlopen(lib){|handle| ... }
- * is quite equal to `Handle.new(lib)'
-
-* sym = set_callback(cbtype, entry){|args| ... }
-* sym = set_callback(cbtype, entry, proc)
- * makes entry-th pre-defined function to call the proc or given block. the
- entry-th pre-defined function is specified by cbtype and entry. cbtype is a
- prototype of the callback. see also the section `Type specifiers' about
- cbtype.
-
-* sym = get_callback(cbtype, entry)
- * returns the Proc object which is given by the above function
- `set_callback'.
-
-* ptr = malloc(size, [free = nil])
- * allocates the size bytes, and returns the pointer as a PtrData object ptr.
-
-* ptr = strdup(str)
- * returns a PtrData object ptr which represents the pointer to a new string
- which is a duplicate of the string str.
-
-* size = sizeof(type)
- * returns the size of type. `sizeof("C") + sizeof("L")' is not equal to
- `sizeof("CL")'. the latter is assumed to returns the enough size of the
- structure `struct foo { char c; long l; }', but the size may not equal to
- `sizeof(foo)' of C.
-
-== Handle class
-
-* handle = Handle.new(lib){|handle| ... }
- * opens a library lib and returns a Handle object handle. if a block is
- given, the handle is automatically closed as the block ends.
-
-* Handle#close
- * closes the handle opened by the above Handle.new(lib).
-
-* sym = Handle#sym(func, prototype = "0"),
- sym = Handle#[func, prototype = nil]
-
- * obtains the pointer to a function called func and returns a Symbol object
- or a DataPtr object. prototype is a string which consists of type
- specifiers, it indicates the function's prototype. see also the section
- `Type specifiers'.
-
-== Symbol class
-
-* sym = Symbol.new(addr, type = nil, name = nil)
- * creates the Symbol object sym with the type type if type is not nil. addr
- is the address where the function is allocated. If type is nil, it returns
- a DataPtr object.
-
-* Symbol::char2type(char)
- * takes a character char that represents a type and returns the type
- specifier of the C language.
-
-* str = Symbol#proto()
- * returns the function prototype.
-
-* str = Symbol#name()
- * Returns the function name.
-
-* str = Symbol#cproto(),
- str = Symbol#to_s()
- * returns the prototype of the C language.
-
-* str = Symbol#inspect()
- * returns the inspectable string.
-
-* r,rs = Symbol#call(arg1,arg2,...,argN),
- r,rs = Symbol#[](arg1,arg2,...,argN)
- * calls the function with parameters arg1, arg2, ..., argN. and the result
- consists of the return value r and parameters rs. rs is an array.
-
-* ptr = Symbol#to_ptr
- * returns the corresponding PtrData object ptr.
-
-== PtrData class
-
-* ptr = PtrData.new(addr, [size = 0, free = nil])
- * returns the PtrData object representing the pointer which indicates the
- address addr. GC frees the memory using the free function.
-
-* PtrData#free=(sym)
- * If you specify a symbol object sym, GC frees the memory using the function
- represented by sym.
-
-* sym = PtrData#free
- * returns a symbol object sym which is used when GC frees the memory. it
- usually configured by `PtrData#free=' or `PtrData.new'.
-
-* size = PtrData#size, PtrData#size=(size)
- * gets and sets allocated size of the memory.
-
-* ary = PtrData#to_a(type, [size])
- * returns an array of the type which specified with type. type must be one of
- 'S','P','I','L','D' and 'F'.
-
-* str = PtrData#to_s([len])
- * returns a string which length is len. if len is omitted, the end of the
- string is '\0'.
-
-* ptr = PtrData#ptr,+@
- * returns the pointed value as a PtrData object ptr.
-
-* ptr = PtrData#ref,-@
- * returns the reference as a PtrData object ptr.
-
-* ptr = PtrData#+
- * returns the PtrData object
-
-* ptr = PtrData#-
- * returns the PtrData object
-
-* PtrData#struct!(type, *members)
- * defines the data type to get access to a structure member with a symbol.
- (see also PtrData#[])
-
-* PtrData#union!(type, *members)
- * defines the data type to get access to a union member with a symbol. (see
- also PtrData#[])
-
-* val = PtrData#[key], PtrData#[key, num = 0]
- * if the key is a string or symbol, this method returns the value of the
- structure/union member which has the type defined by PtrData#
- {struct!,union!}. if the key is a integer value and this object represents
- the pointer ptr, it returns the value of `(ptr + key).to_s(num)'
-
-* PtrData#[key,num]=val, PtrData#[key]=val
- * if the key is a string or symbol, this method substitute the value of the
- structure/union member with val. if the key is a integer value and val is a
- string, this method copies num bytes of val to the memory area ptr using
- memcpy(3).
-
-== Type specifiers
-
-the prototype consists of the following type specifiers, first element of
-prototype represents the type of return value, and remaining elements represent
-the type of each argument.
-
- C : char
- c : char *
- H : short
- h : short *
- I : int
- i : int *
- L : long
- l : long *
- F : float
- f : float *
- D : double
- d : double *
- S : const char *
- s : char *
- A : const type[]
- a : type[] (allocates new memory space)
- P : void * (same as 'p')
- p : void * (same as 'P')
- 0 : void function (this must be a first character of the prototype)
-
-the cbtype consists of type specifiers 0, C, I, H, L, F, D, S and P.
-for example:
-
- DL.callback('IPP'){|ptr1,ptr2|
- str1 = ptr1.ptr.to_s
- str2 = ptr2.ptr.to_s
- str1 <=> str2
- }
-=end
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
deleted file mode 100644
index beb15ab04c..0000000000
--- a/ext/dl/extconf.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-require 'mkmf'
-
-begin # for the exception SystemExit
-
-$:.unshift File.dirname(__FILE__)
-require 'type'
-
-if( ARGV.include?("--help") )
- print <<EOF
- --help print this messages
- --with-type-char strictly use type 'char'
- --with-type-short strictly use type 'short'
- --with-type-float strictly use type 'float'
- --with-args=<max_arg>
- --with-callback=<max_callback>
- --enable-asm use the embedded assembler for passing arguments.
- (this option is available for i386 machine now.)
- --enable-dlstack use a stack emulation for constructing function call.
-EOF
- exit(0)
-end
-
-($CPPFLAGS || $CFLAGS) << " -I."
-
-if (Config::CONFIG['CC'] =~ /gcc/) # from Win32API
- $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
-end
-
-$with_dlstack ||= true
-$with_asm = ! $with_dlstack
-
-$with_type_int = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_INT == SIZEOF_LONG
-#error int not needed
-#endif
-EOF
-
-$with_type_float = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_FLOAT == SIZEOF_DOUBLE
-#error float not needed
-#endif
-EOF
-
-$with_type_voidp = try_cpp(<<EOF)
-#include "config.h"
-#if SIZEOF_VOIDP == SIZEOF_INT || SIZEOF_VOIDP == SIZEOF_LONG
-#error void* not needed
-#endif
-EOF
-
-$with_type_char = DLTYPE[CHAR][:sym]
-$with_type_short = DLTYPE[SHORT][:sym]
-$with_type_long = DLTYPE[LONG][:sym]
-$with_type_double= DLTYPE[DOUBLE][:sym]
-$with_type_int &= DLTYPE[INT][:sym]
-$with_type_float &= DLTYPE[FLOAT][:sym]
-$with_type_voidp &= DLTYPE[VOIDP][:sym]
-
-$with_type_char = enable_config("type-char", $with_type_char)
-$with_type_short = enable_config("type-short", $with_type_short)
-$with_type_float = enable_config("type-float", $with_type_float)
-
-$with_asm = enable_config("asm", $with_asm)
-$with_dlstack = enable_config("dlstack", $with_dlstack)
-
-args = with_config("args")
-max_arg = nil
-if( $with_asm || $with_dlstack )
- $with_type_char = true
- $with_type_short = true
- $with_type_float = true
- max_arg = 0
-end
-if( args )
- max_arg = args.to_i
- if( !max_arg )
- print("--with-args=<max_arg>\n")
- exit(1)
- end
-end
-max_arg ||= 6
-
-max_callback = with_config("callback","10").to_i
-callback_types = DLTYPE.keys.length
-
-
-$dlconfig_h = <<EOF
-#define MAX_ARG #{max_arg}
-EOF
-
-def dlc_define(const)
- $dlconfig_h << "#if !defined(#{const})\n" +
- "# define #{const}\n" +
- "#endif\n"
-end
-
-$dlconfig_h << "#define MAX_CALLBACK #{max_callback}\n"
-$dlconfig_h << "#define CALLBACK_TYPES #{callback_types}\n"
-if( $with_dlstack )
- $dlconfig_h << "#define USE_DLSTACK\n"
-else
- if( $with_asm )
- $dlconfig_h << "#define USE_INLINE_ASM\n"
- end
-end
-if( $with_type_char )
- $dlconfig_h << "#define WITH_TYPE_CHAR\n"
-end
-if( $with_type_short )
- $dlconfig_h << "#define WITH_TYPE_SHORT\n"
-end
-if( $with_type_long )
- $dlconfig_h << "#define WITH_TYPE_LONG\n"
-end
-if( $with_type_double )
- $dlconfig_h << "#define WITH_TYPE_DOUBLE\n"
-end
-if( $with_type_float )
- $dlconfig_h << "#define WITH_TYPE_FLOAT\n"
-end
-if( $with_type_int )
- $dlconfig_h << "#define WITH_TYPE_INT\n"
-end
-if( $with_type_voidp )
- $dlconfig_h << "#define WITH_TYPE_VOIDP\n"
-end
-
-if( have_header("windows.h") )
- have_library("kernel32")
- have_func("GetLastError", "windows.h")
- dlc_define("HAVE_WINDOWS_H")
- have_windows_h = true
-end
-
-if( have_header("dlfcn.h") )
- dlc_define("HAVE_DLFCN_H")
- have_library("dl")
- have_func("dlopen")
- have_func("dlclose")
- have_func("dlsym")
- if( have_func("dlerror") )
- dlc_define("HAVE_DLERROR")
- end
-elsif ( have_windows_h )
- have_func("LoadLibrary")
- have_func("FreeLibrary")
- have_func("GetProcAddress")
-else
- exit(0)
-end
-
-def File.update(file, str)
- begin
- open(file){|f|f.read} == str
- rescue Errno::ENOENT
- false
- end or open(file, "w"){|f|f.print(str)}
-end
-
-File.update("dlconfig.h", <<EOF)
-#ifndef DLCONFIG_H
-#define DLCONFIG_H
-#{$dlconfig_h}
-#endif /* DLCONFIG_H */
-EOF
-
-File.update("dlconfig.rb", <<EOF)
-MAX_ARG = #{max_arg}
-MAX_CALLBACK = #{max_callback}
-CALLBACK_TYPES = #{callback_types}
-DLTYPE[CHAR][:sym] = #{$with_type_char}
-DLTYPE[SHORT][:sym] = #{$with_type_short}
-DLTYPE[INT][:sym] = #{$with_type_int}
-DLTYPE[LONG][:sym] = #{$with_type_long}
-DLTYPE[FLOAT][:sym] = #{$with_type_float}
-DLTYPE[DOUBLE][:sym]= #{$with_type_double}
-DLTYPE[VOIDP][:sym] = #{$with_type_voidp}
-EOF
-
-$INSTALLFILES = [
- ["./dlconfig.h", "$(archdir)$(target_prefix)", "."],
- ["dl.h", "$(archdir)$(target_prefix)", ""],
-]
-$cleanfiles = %w[test/test.o]
-$distcleanfiles = %w[call.func callback.func cbtable.func dlconfig.rb
-./dlconfig.h test/libtest.so test/*~ *~ mkmf.log]
-
-create_makefile('dl')
-rescue SystemExit
- # do nothing
-end
diff --git a/ext/dl/h2rb b/ext/dl/h2rb
deleted file mode 100644
index 00fbd60c82..0000000000
--- a/ext/dl/h2rb
+++ /dev/null
@@ -1,500 +0,0 @@
-#!/usr/bin/env ruby
-# -*- ruby -*-
-# $Id$
-
-require 'mkmf'
-require 'ftools'
-
-$recursive = false
-$force = false
-$conly = true
-$inc_path = []
-$infilename= nil
-$insert_require = true
-
-def valid_ruby_code?(code)
- begin
- eval("BEGIN {return true}; #{code}")
- rescue SyntaxError
- return false
- end
- return false
-end
-
-def print_usage
- print <<EOF
-h2rb [-r] [-I <path>] [-d] [<filename>]
-EOF
-end
-
-while( ARGV[0] )
- case( ARGV[0] )
- when "-r"
- ARGV.shift
- $recursive = true
- when "-R"
- ARGV.shift
- $recursive = false
- when "-l"
- ARGV.shift
- $insert_require = true
- when "-L"
- ARGV.shift
- $insert_require = false
- when "-c"
- ARGV.shift
- $conly = true
- when "-C"
- ARGV.shift
- $conly = false
- when "-f"
- ARGV.shift
- $force = true
- when "-F"
- ARGV.shift
- $force = false
- when "-I"
- ARGV.shift
- $inc_path << ARGV.shift
- when "-d"
- ARGV.shift
- $DEBUG = true
- when "-h","--help"
- print_usage()
- exit 0
- when /-.*/
- $stderr.print("unknown option '#{ARGV[0]}'.\n")
- print_usage()
- exit 0
- else
- $infilename = ARGV.shift
- end
-end
-
-$inc_dir = File.join(CONFIG["prefix"], "lib", "ruby",
- CONFIG["MAJOR"] + "." + CONFIG["MINOR"],
- "dl")
-
-class H2RBError < StandardError; end
-
-
-class H2RB
- def initialize(inc_dir = nil, inc_path = nil, insert_require = nil)
- @inc_path = inc_path || []
- @inc_dir = inc_dir || '.'
- @indent = 0
- @parsed_files = []
- @insert_require = insert_require || false
- end
-
- def find_path(file)
- if( ! file )
- return nil
- end
- if( File.exist?(file) )
- if( file[0] == ?/ )
- return file
- else
- return file
- end
- end
- @inc_path.each{|path|
- full = File.join(path, file)
- if( File.exist?(full) )
- return full
- end
- }
- return nil
- end
-
- def strip_comment(line)
- if( @commented )
- if( e = line.index("*/") )
- line[0..(e+1)] = ""
- @commented = false
- else
- line = ""
- end
- else
- if( s = line.index("/*") )
- if( e = line.index("*/") )
- line[s..(e+1)] = ""
- else
- line[s..-1] = ""
- @commented = true
- end
- elsif( s = line.index("//") )
- line[s..(-1)] = ""
- end
- end
-
- line.gsub!(/\s+$/,"")
- return line
- end
-
- def up_indent
- @indent += 1
- end
-
- def down_indent
- @indent -= 1
- if( @indent < 0 )
- raise
- end
- end
-
- def indent
- " " * @indent
- end
-
- def rescue_begin
- line = "#{indent}begin"
- up_indent
- return line
- end
-
- def rescue_nameerror
- down_indent
- line = [
- "#{indent}rescue NameError => e",
- "#{indent} raise e if( $DEBUG )",
- "#{indent}end"].join($/)
- return line
- end
-
- def parse_enum(line)
- if( line =~ /enum\s+(\S+\s+)?\{(.+)\}/ )
- enum_name = $1
- enum_block = $2
- if( enum_name )
- line = "#{indent}# -- enum #{enum_name}\n"
- else
- line = "#{indent}# -- enum\n"
- end
- enums = enum_block.split(/,/).collect{|e| e.strip}
- i = 0
- enums.each{|elem|
- var,val = elem.split(/=/).collect{|e| e.strip}
- if( val )
- i = val.to_i
- end
- line += "#{indent}#{var} = #{i.to_s}\n"
- i += 1
- }
- line += "#{indent}# -- end of enum"
- return line
- else
- return nil
- end
- end
-
- def parse_define(line)
- case line
- when /^#\s*define\s+(\S+)\(\)/
- line = nil
- when /^#\s*define\s+(\S+)\((.+)\)\s+(.+)$/
- if( @conly )
- line = nil
- else
- defname = $1
- defargs = $2
- defval = $3
- if( !valid_ruby_code?(defval) )
- defval = "nil # #{defval}"
- end
- if( defname[0,1] =~ /^[A-Z]$/ )
- line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
- else
- line = [
- "#{indent}def #{defname}(#{defargs})",
- "#{indent} #{defval}",
- "#{indent}end"
- ].join("\n")
- end
- end
- when /^#\s*define\s+(\S+)\((.+)\)$/
- if( @conly )
- line = nil
- else
- defname = $1
- defargs = $2
- defval = nil
- if( !valid_ruby_code?(defval) )
- defval = "nil # #{defval}"
- end
- if( defname[0,1] =~ /^[A-Z]$/ )
- line = "#{indent}#{defname} = proc{|#{defargs}| #{defval}}"
- else
- line = [
- "#{indent}def #{defname}(#{defargs})",
- "#{indent} #{defval}",
- "#{indent}end"
- ].join("\n")
- end
- end
- when /^#\s*define\s+(\S+)\s+(.+)$/
- defname = $1
- defval = $2
- if( !valid_ruby_code?(defval) )
- defval = "nil # #{defval}"
- end
- line = [rescue_begin, "#{indent}#{defname} = #{defval}", rescue_nameerror].join($/)
- when /^#\s*define\s+(\S+)$/
- defname = $1
- line = "#{indent}#{defname} = nil"
- else
- line = nil
- end
- return line
- end
-
- def parse_undef(line)
- case line
- when /^#\s*undef\s+([A-Z]\S+)$/
- defname = $1
- line = "#{indent}remove_const(:#{defname})"
- when /^#\s*undef\s+(\S+)$/
- defname = $1
- line = "#{indent}#{defname} = nil"
- else
- line = nil
- end
- return line
- end
-
- def parse_ifdef(line)
- case line
- when /^#\s*ifdef\s+(\S+)$/
- defname = $1
- line = [
- rescue_begin,
- "#{indent}if( defined?(#{defname}) && ! #{defname}.nil? )"].join($/)
- else
- line = nil
- end
- return line
- end
-
- def parse_ifndef(line)
- case line
- when /^#\s*ifndef\s+(\S+)$/
- defname = $1
- line = [
- rescue_begin,
- "#{indent}if( ! defined?(#{defname}) || #{defname}.nil? )"].join($/)
- else
- line = nil
- end
- return line
- end
-
- def parse_if(line)
- case line
- when /^#\s*if\s+(.+)$/
- cond = $1
- cond.gsub!(/defined(.+)/){ "defined?(#{$1}) && ! #{$1}.nil?" }
- if( valid_ruby_code?(cond) )
- line = "#{indent}if( #{cond} )"
- else
- line = "#{indent}if( false ) # #{cond}"
- end
- line = [rescue_begin, line].join($/)
- else
- line = nil
- end
- return line
- end
-
- def parse_elif(line)
- case line
- when /^#\s*elif\s+(.+)$/
- cond = $1
- cond.gsub!("defined","defined?")
- line = "#{indent}elsif( #{cond} )"
- else
- line = nil
- end
- return line
- end
-
- def parse_else(line)
- case line
- when /^#\s*else\s*/
- line = "#{indent}else"
- else
- line = nil
- end
- return line
- end
-
- def parse_endif(line)
- case line
- when /^#\s*endif\s*$/
- line = ["#{indent}end", rescue_nameerror].join($/)
- else
- line = nil
- end
- return line
- end
-
- def parse_include(line)
- if( ! @insert_require )
- return nil
- end
-
- file = nil
- case line
- when /^#\s*include "(.+)"$/
- file = $1
- line = "#{indent}require '#{file}'"
- when /^#\s*include \<(.+)\>$/
- file = $1
- line = "#{indent}require '#{file}'"
- else
- line = nil
- end
- if( @recursive && file && (!@parsed_files.include?(file)) )
- parse(file, @recursive, @force, @conly)
- end
- return line
- end
-
-
- def open_files(infilename)
- if( ! infilename )
- return [$stdin, $stdout]
- end
-
- old_infilename = infilename
- infilename = find_path(infilename)
- if( ! infilename )
- $stderr.print("'#{old_infilename}' was not found.\n")
- return [nil,nil]
- end
-
- if( infilename )
- if( infilename[0,1] == '/' )
- outfilename = File.join(@inc_dir, infilename[1..-1] + ".rb")
- else
- outfilename = infilename + ".rb"
- end
- File.mkpath(File.dirname(outfilename))
- else
- outfilename = nil
- end
-
- if( infilename )
- fin = File.open(infilename,"r")
- else
- fin = $stdin
- end
- if( outfilename )
- if( File.exist?(outfilename) && (!@force) )
- $stderr.print("'#{outfilename}' have already existed.\n")
- return [fin, nil]
- end
- fout = File.open(outfilename,"w")
- else
- fout = $stdout
- end
-
- $stderr.print("#{infilename} -> #{outfilename}\n")
- if( fout )
- dir = File.dirname(outfilename)
- if( dir[0,1] != "." && dir != "" )
- fout.print("if( ! $LOAD_PATH.include?('#{dir}') )\n",
- " $LOAD_PATH.push('#{dir}')\n",
- "end\n")
- end
- end
- return [fin,fout]
- end
-
- def parse(infilename = nil, recursive = false, force = false, conly = false)
- @commented = false
- @recursive = recursive
- @force = force
- @conly = conly
- @parsed_files << infilename
-
- fin,fout = open_files(infilename)
- if( !fin )
- return
- end
-
- begin
- line_number = 0
- pre_line = nil
- fin.each_line{|line|
- line_number += 1
- line.chop!
- if( $DEBUG )
- $stderr.print("#{line_number}:(#{@indent}):", line, "\n")
- end
-
- if( pre_line )
- line = pre_line + line
- pre_line = nil
- end
-
- if( line[-1,1] == "\\" )
- pre_line = line[0..-2]
- next
- end
-
- if( eidx = line.index("enum ") )
- pre_line = line[eidx .. -1]
- if( i = line.index("{") && j = line.index("}") )
- line = line[0..j]
- pre_line = nil
- else
- next
- end
- end
-
- line = strip_comment(line)
- case line
- when /^enum\s/
- line = parse_enum(line)
- when /^#\s*define\s/
- line = parse_define(line)
- when /^#\s*undef\s/
- line = parse_undef(line)
- when /^#\s*ifdef\s/
- line = parse_ifdef(line)
- up_indent
- when /^#\s*ifndef\s/
- line = parse_ifndef(line)
- up_indent
- when /^#\s*if\s/
- line = parse_if(line)
- up_indent
- when /^#\s*elif\s/
- down_indent
- line = parse_elif(line)
- up_indent
- when /^#\s*else/
- down_indent
- line = parse_else(line)
- up_indent
- when /^#\s*endif/
- down_indent
- line = parse_endif(line)
- when /^#\s*include\s/
- line = parse_include(line)
- else
- line = nil
- end
- if( line && fout )
- fout.print(line, " # #{line_number}",$/)
- end
- }
- ensure
- fin.close if fin
- fout.close if fout
- end
- end
-end
-
-h2rb = H2RB.new($inc_dir, $inc_path, $insert_require)
-h2rb.parse($infilename, $recursive, $force, $conly)
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
deleted file mode 100644
index 69d47caac0..0000000000
--- a/ext/dl/handle.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include "dl.h"
-
-VALUE rb_cDLHandle;
-
-void
-dlhandle_free(struct dl_handle *dlhandle)
-{
- if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
- dlclose(dlhandle->ptr);
- }
-}
-
-VALUE
-rb_dlhandle_close(VALUE self)
-{
- struct dl_handle *dlhandle;
-
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- dlhandle->open = 0;
- return INT2NUM(dlclose(dlhandle->ptr));
-}
-
-VALUE
-rb_dlhandle_s_allocate(VALUE klass)
-{
- VALUE obj;
- struct dl_handle *dlhandle;
-
- obj = Data_Make_Struct(rb_cDLHandle, struct dl_handle, 0,
- dlhandle_free, dlhandle);
- dlhandle->ptr = 0;
- dlhandle->open = 0;
- dlhandle->enable_close = 0;
-
- return obj;
-}
-
-VALUE
-rb_dlhandle_initialize(int argc, VALUE argv[], VALUE self)
-{
- void *ptr;
- struct dl_handle *dlhandle;
- VALUE lib, flag;
- char *clib;
- int cflag;
- const char *err;
-
- switch (rb_scan_args(argc, argv, "11", &lib, &flag)) {
- case 1:
- clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
- cflag = RTLD_LAZY | RTLD_GLOBAL;
- break;
- case 2:
- clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
- cflag = NUM2INT(flag);
- break;
- default:
- rb_bug("rb_dlhandle_new");
- }
-
- ptr = dlopen(clib, cflag);
-#if defined(HAVE_DLERROR)
- if (!ptr && (err = dlerror())) {
- rb_raise(rb_eRuntimeError, "%s", err);
- }
-#else
- if (!ptr) {
- err = dlerror();
- rb_raise(rb_eRuntimeError, "%s", err);
- }
-#endif
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
- dlclose(dlhandle->ptr);
- }
- dlhandle->ptr = ptr;
- dlhandle->open = 1;
- dlhandle->enable_close = 0;
-
- if (rb_block_given_p()) {
- rb_ensure(rb_yield, self, rb_dlhandle_close, self);
- }
-
- return Qnil;
-}
-
-VALUE
-rb_dlhandle_enable_close(VALUE self)
-{
- struct dl_handle *dlhandle;
-
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- dlhandle->enable_close = 1;
- return Qnil;
-}
-
-VALUE
-rb_dlhandle_disable_close(VALUE self)
-{
- struct dl_handle *dlhandle;
-
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- dlhandle->enable_close = 0;
- return Qnil;
-}
-
-VALUE
-rb_dlhandle_to_i(VALUE self)
-{
- struct dl_handle *dlhandle;
-
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- return DLLONG2NUM(dlhandle);
-}
-
-VALUE
-rb_dlhandle_to_ptr(VALUE self)
-{
- struct dl_handle *dlhandle;
-
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- return rb_dlptr_new(dlhandle, sizeof(dlhandle), 0);
-}
-
-VALUE
-rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
-{
- VALUE sym, type;
- void (*func)();
- VALUE val;
- struct dl_handle *dlhandle;
- void *handle;
- const char *name, *stype;
- const char *err;
-
- rb_secure(2);
- if (rb_scan_args(argc, argv, "11", &sym, &type) == 2) {
- SafeStringValue(type);
- stype = StringValuePtr(type);
- }
- else{
- stype = NULL;
- }
-
- if (sym == Qnil) {
-#if defined(RTLD_NEXT)
- name = RTLD_NEXT;
-#else
- name = NULL;
-#endif
- }
- else{
- SafeStringValue(sym);
- name = StringValuePtr(sym);
- }
-
- Data_Get_Struct(self, struct dl_handle, dlhandle);
- if (!dlhandle->open) {
- rb_raise(rb_eRuntimeError, "closed handle");
- }
- handle = dlhandle->ptr;
-
- func = dlsym(handle, name);
-#if defined(HAVE_DLERROR)
- if (!func && (err = dlerror()))
-#else
- if (!func)
-#endif
- {
-#if defined(__CYGWIN__) || defined(WIN32) || defined(__MINGW32__)
- {
- int len = strlen(name);
- char *name_a = (char*)dlmalloc(len+2);
- strcpy(name_a, name);
- name_a[len] = 'A';
- name_a[len+1] = '\0';
- func = dlsym(handle, name_a);
- dlfree(name_a);
-#if defined(HAVE_DLERROR)
- if (!func && (err = dlerror()))
-#else
- if (!func)
-#endif
- {
- rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
- }
- }
-#else
- rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
-#endif
- }
- val = rb_dlsym_new(func, name, stype);
-
- return val;
-}
-
-void
-Init_dlhandle()
-{
- rb_cDLHandle = rb_define_class_under(rb_mDL, "Handle", rb_cObject);
- rb_define_alloc_func(rb_cDLHandle, rb_dlhandle_s_allocate);
- rb_define_method(rb_cDLHandle, "initialize", rb_dlhandle_initialize, -1);
- rb_define_method(rb_cDLHandle, "to_i", rb_dlhandle_to_i, 0);
- rb_define_method(rb_cDLHandle, "to_ptr", rb_dlhandle_to_ptr, 0);
- rb_define_method(rb_cDLHandle, "close", rb_dlhandle_close, 0);
- rb_define_method(rb_cDLHandle, "sym", rb_dlhandle_sym, -1);
- rb_define_method(rb_cDLHandle, "[]", rb_dlhandle_sym, -1);
- rb_define_method(rb_cDLHandle, "disable_close", rb_dlhandle_disable_close, 0);
- rb_define_method(rb_cDLHandle, "enable_close", rb_dlhandle_enable_close, 0);
-}
diff --git a/ext/dl/install.rb b/ext/dl/install.rb
deleted file mode 100644
index 69b1834301..0000000000
--- a/ext/dl/install.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'mkmf'
-require 'ftools'
-
-SO_LIBS = ["dl.so"]
-
-$ruby_version = CONFIG['MAJOR'] + "." + CONFIG['MINOR']
-$prefix = CONFIG['prefix']
-$libdir = File.join($prefix,'lib')
-$rubylibdir = File.join($libdir, 'ruby', $ruby_version)
-$arch = CONFIG['arch']
-$archdir = File.join($rubylibdir, $arch)
-
-def find(dir, match = /./)
- Dir.chdir(dir)
- files = []
- Dir.new(".").each{|file|
- if( file != "." && file != ".." )
- case File.ftype(file)
- when "file"
- if( file =~ match )
- files.push(File.join(dir,file))
- end
- when "directory"
- files += find(file, match).collect{|f| File.join(dir,f)}
- end
- end
- }
- Dir.chdir("..")
- return files
-end
-
-def install()
- rb_files = find(File.join(".","lib"), /.rb$/)
-
- SO_LIBS.each{|f|
- File.makedirs($rubylibdir, "#{$archdir}")
- File.install(f, File.join($archdir,f), 0555, true)
- }
-
- rb_files.each{|f|
- origfile = f
- instfile = File.join($rubylibdir, origfile.sub("./lib/",""))
- instdir = File.dirname(instfile)
- File.makedirs(instdir)
- File.install(origfile, instfile, 0644, true)
- }
-end
-
-install()
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
deleted file mode 100644
index 01ee2490e8..0000000000
--- a/ext/dl/lib/dl/import.rb
+++ /dev/null
@@ -1,225 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-require 'dl/types'
-
-module DL
- module Importable
- LIB_MAP = {}
-
- module Internal
- def init_types()
- @types ||= ::DL::Types.new
- end
-
- def init_sym()
- @SYM ||= {}
- end
-
- def [](name)
- return @SYM[name.to_s][0]
- end
-
- def dlload(*libnames)
- if( !defined?(@LIBS) )
- @LIBS = []
- end
- libnames.each{|libname|
- if( !LIB_MAP[libname] )
- LIB_MAP[libname] = DL.dlopen(libname)
- end
- @LIBS.push(LIB_MAP[libname])
- }
- end
- alias dllink :dlload
-
- def parse_cproto(proto)
- proto = proto.gsub(/\s+/, " ").strip
- case proto
- when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
- ret = $1
- args = $2.strip()
- ret = ret.split(/\s+/)
- args = args.split(/\s*,\s*/)
- func = ret.pop()
- if( func =~ /^\*/ )
- func.gsub!(/^\*+/,"")
- ret.push("*")
- end
- ret = ret.join(" ")
- return [func, ret, args]
- else
- raise(RuntimeError,"can't parse the function prototype: #{proto}")
- end
- end
-
- # example:
- # extern "int strlen(char*)"
- #
- def extern(proto)
- func,ret,args = parse_cproto(proto)
- return import(func, ret, args)
- end
-
- # example:
- # callback "int method_name(int, char*)"
- #
- def callback(proto)
- func,ret,args = parse_cproto(proto)
-
- init_types()
- init_sym()
-
- rty,renc,rdec = @types.encode_return_type(ret)
- if( !rty )
- raise(TypeError, "unsupported type: #{ret}")
- end
- ty,enc,dec = encode_argument_types(args)
- symty = rty + ty
-
- module_eval("module_function :#{func}")
- sym = module_eval([
- "DL::callback(\"#{symty}\"){|*args|",
- " sym,rdec,enc,dec = @SYM['#{func}']",
- " args = enc.call(args) if enc",
- " r,rs = #{func}(*args)",
- " r = renc.call(r) if rdec",
- " rs = dec.call(rs) if (dec && rs)",
- " @retval = r",
- " @args = rs",
- " r",
- "}",
- ].join("\n"))
-
- @SYM[func] = [sym,rdec,enc,dec]
-
- return sym
- end
-
- # example:
- # typealias("uint", "unsigned int")
- #
- def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
- init_types()
- @types.typealias(alias_type, ty1, enc1, dec1,
- ty2||ty1, enc2, dec2)
- end
-
- # example:
- # symbol "foo_value"
- # symbol "foo_func", "IIP"
- #
- def symbol(name, ty = nil)
- sym = nil
- @LIBS.each{|lib|
- begin
- if( ty )
- sym = lib[name, ty]
- else
- sym = lib[name]
- end
- rescue
- next
- end
- }
- if( !sym )
- raise(RuntimeError, "can't find the symbol `#{name}'")
- end
- return sym
- end
-
- # example:
- # import("get_length", "int", ["void*", "int"])
- #
- def import(name, rettype, argtypes = nil)
- init_types()
- init_sym()
-
- rty,_,rdec = @types.encode_return_type(rettype)
- if( !rty )
- raise(TypeError, "unsupported type: #{rettype}")
- end
- ty,enc,dec = encode_argument_types(argtypes)
- symty = rty + ty
-
- sym = symbol(name, symty)
-
- mname = name.dup
- if( ?A <= mname[0] && mname[0] <= ?Z )
- mname[0,1] = mname[0,1].downcase
- end
- @SYM[mname] = [sym,rdec,enc,dec]
-
- module_eval [
- "def #{mname}(*args)",
- " sym,rdec,enc,dec = @SYM['#{mname}']",
- " args = enc.call(args) if enc",
- if( $DEBUG )
- " p \"[DL] call #{mname} with \#{args.inspect}\""
- else
- ""
- end,
- " r,rs = sym.call(*args)",
- if( $DEBUG )
- " p \"[DL] retval=\#{r.inspect} args=\#{rs.inspect}\""
- else
- ""
- end,
- " r = rdec.call(r) if rdec",
- " rs = dec.call(rs) if dec",
- " @retval = r",
- " @args = rs",
- " return r",
- "end",
- "module_function :#{mname}",
- ].join("\n")
-
- return sym
- end
-
- def _args_
- return @args
- end
-
- def _retval_
- return @retval
- end
-
- def encode_argument_types(tys)
- init_types()
- encty = []
- enc = nil
- dec = nil
- tys.each_with_index{|ty,idx|
- ty,c1,c2 = @types.encode_argument_type(ty)
- if( !ty )
- raise(TypeError, "unsupported type: #{ty}")
- end
- encty.push(ty)
- if( enc )
- if( c1 )
- conv1 = enc
- enc = proc{|v| v = conv1.call(v); v[idx] = c1.call(v[idx]); v}
- end
- else
- if( c1 )
- enc = proc{|v| v[idx] = c1.call(v[idx]); v}
- end
- end
- if( dec )
- if( c2 )
- conv2 = dec
- dec = proc{|v| v = conv2.call(v); v[idx] = c2.call(v[idx]); v}
- end
- else
- if( c2 )
- dec = proc{|v| v[idx] = c2.call(v[idx]); v}
- end
- end
- }
- return [encty.join, enc, dec]
- end
- end # end of Internal
- include Internal
- end # end of Importable
-end
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
deleted file mode 100644
index 33f303fe22..0000000000
--- a/ext/dl/lib/dl/struct.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-require 'dl/import'
-
-module DL
- module Importable
- module Internal
- def define_struct(contents)
- init_types()
- Struct.new(@types, contents)
- end
- alias struct define_struct
-
- def define_union(contents)
- init_types()
- Union.new(@types, contents)
- end
- alias union define_union
-
- class Memory
- def initialize(ptr, names, ty, len, enc, dec)
- @ptr = ptr
- @names = names
- @ty = ty
- @len = len
- @enc = enc
- @dec = dec
-
- # define methods
- @names.each{|name|
- instance_eval [
- "def #{name}",
- " v = @ptr[\"#{name}\"]",
- " if( @len[\"#{name}\"] )",
- " v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
- " else",
- " v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
- " end",
- " return v",
- "end",
- "def #{name}=(v)",
- " if( @len[\"#{name}\"] )",
- " v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
- " else",
- " v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
- " end",
- " @ptr[\"#{name}\"] = v",
- " return v",
- "end",
- ].join("\n")
- }
- end
-
- def to_ptr
- return @ptr
- end
-
- def size
- return @ptr.size
- end
- end
-
- class Struct
- def initialize(types, contents)
- @names = []
- @ty = {}
- @len = {}
- @enc = {}
- @dec = {}
- @size = 0
- @tys = ""
- @types = types
- parse(contents)
- end
-
- def size
- return @size
- end
-
- def members
- return @names
- end
-
- # ptr must be a PtrData object.
- def new(ptr)
- ptr.struct!(@tys, *@names)
- mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
- return mem
- end
-
- def malloc(size = nil)
- if( !size )
- size = @size
- end
- ptr = DL::malloc(size)
- return new(ptr)
- end
-
- def parse(contents)
- contents.each{|elem|
- name,ty,num,enc,dec = parse_elem(elem)
- @names.push(name)
- @ty[name] = ty
- @len[name] = num
- @enc[name] = enc
- @dec[name] = dec
- if( num )
- @tys += "#{ty}#{num}"
- else
- @tys += ty
- end
- }
- @size = DL.sizeof(@tys)
- end
-
- def parse_elem(elem)
- elem.strip!
- case elem
- when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)$/
- ty = ($1 + $2).strip
- name = $3
- num = nil;
- when /^([\w\d_\*]+)([\*\s]+)([\w\d_]+)\[(\d+)\]$/
- ty = ($1 + $2).strip
- name = $3
- num = $4.to_i
- else
- raise(RuntimeError, "invalid element: #{elem}")
- end
- ty,enc,dec = @types.encode_struct_type(ty)
- if( !ty )
- raise(TypeError, "unsupported type: #{ty}")
- end
- return [name,ty,num,enc,dec]
- end
- end # class Struct
-
- class Union < Struct
- def new
- ptr = DL::malloc(@size)
- ptr.union!(@tys, *@names)
- mem = Memory.new(ptr, @names, @ty, @len, @enc, @dec)
- return mem
- end
- end
- end # module Internal
- end # module Importable
-end # module DL
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
deleted file mode 100644
index 1144917dae..0000000000
--- a/ext/dl/lib/dl/types.rb
+++ /dev/null
@@ -1,245 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-
-module DL
- class Types
- TYPES = [
- # FORMAT:
- # ["alias name",
- # "type name", encoding_method, decoding_method, for function prototypes
- # "type name", encoding_method, decoding_method] for structures (not implemented)
-
- # for Windows
- ["DWORD", "unsigned long", nil, nil,
- "unsigned long", nil, nil],
- ["PDWORD", "unsigned long *", nil, nil,
- "unsigned long *", nil, nil],
- ["WORD", "unsigned short", nil, nil,
- "unsigned short", nil, nil],
- ["PWORD", "unsigned int *", nil, nil,
- "unsigned int *", nil, nil],
- ["BYTE", "unsigned char", nil, nil,
- "unsigned char", nil, nil],
- ["PBYTE", "unsigned char *", nil, nil,
- "unsigned char *", nil, nil],
- ["BOOL", "ibool", nil, nil,
- "ibool", nil, nil],
- ["ATOM", "int", nil, nil,
- "int", nil, nil],
- ["BYTE", "unsigned char", nil, nil,
- "unsigned char", nil, nil],
- ["PBYTE", "unsigned char *", nil, nil,
- "unsigned char *", nil, nil],
- ["UINT", "unsigned int", nil, nil,
- "unsigned int", nil, nil],
- ["ULONG", "unsigned long", nil, nil,
- "unsigned long", nil, nil],
- ["UCHAR", "unsigned char", nil, nil,
- "unsigned char", nil, nil],
- ["HANDLE", "unsigned long", nil, nil,
- "unsigned long", nil, nil],
- ["PHANDLE","void*", nil, nil,
- "void*", nil, nil],
- ["PVOID", "void*", nil, nil,
- "void*", nil, nil],
- ["LPCSTR", "char*", nil, nil,
- "char*", nil, nil],
- ["HDC", "unsigned int", nil, nil,
- "unsigned int", nil, nil],
- ["HWND", "unsigned int", nil, nil,
- "unsigned int", nil, nil],
-
- # Others
- ["uint", "unsigned int", nil, nil,
- "unsigned int", nil, nil],
- ["u_int", "unsigned int", nil, nil,
- "unsigned int", nil, nil],
- ["ulong", "unsigned long", nil, nil,
- "unsigned long", nil, nil],
- ["u_long", "unsigned long", nil, nil,
- "unsigned long", nil, nil],
-
- # DL::Importable primitive types
- ["ibool",
- "I",
- proc{|v| v ? 1 : 0},
- proc{|v| (v != 0) ? true : false},
- "I",
- proc{|v| v ? 1 : 0 },
- proc{|v| (v != 0) ? true : false} ],
- ["cbool",
- "C",
- proc{|v| v ? 1 : 0},
- proc{|v| (v != 0) ? true : false},
- "C",
- proc{|v,len| v ? 1 : 0},
- proc{|v,len| (v != 0) ? true : false}],
- ["lbool",
- "L",
- proc{|v| v ? 1 : 0},
- proc{|v| (v != 0) ? true : false},
- "L",
- proc{|v,len| v ? 1 : 0},
- proc{|v,len| (v != 0) ? true : false}],
- ["unsigned char",
- "C",
- proc{|v| [v].pack("C").unpack("c")[0]},
- proc{|v| [v].pack("c").unpack("C")[0]},
- "C",
- proc{|v| [v].pack("C").unpack("c")[0]},
- proc{|v| [v].pack("c").unpack("C")[0]}],
- ["unsigned short",
- "H",
- proc{|v| [v].pack("S").unpack("s")[0]},
- proc{|v| [v].pack("s").unpack("S")[0]},
- "H",
- proc{|v| [v].pack("S").unpack("s")[0]},
- proc{|v| [v].pack("s").unpack("S")[0]}],
- ["unsigned int",
- "I",
- proc{|v| [v].pack("I").unpack("i")[0]},
- proc{|v| [v].pack("i").unpack("I")[0]},
- "I",
- proc{|v| [v].pack("I").unpack("i")[0]},
- proc{|v| [v].pack("i").unpack("I")[0]}],
- ["unsigned long",
- "L",
- proc{|v| [v].pack("L").unpack("l")[0]},
- proc{|v| [v].pack("l").unpack("L")[0]},
- "L",
- proc{|v| [v].pack("L").unpack("l")[0]},
- proc{|v| [v].pack("l").unpack("L")[0]}],
- ["unsigned char ref",
- "c",
- proc{|v| [v].pack("C").unpack("c")[0]},
- proc{|v| [v].pack("c").unpack("C")[0]},
- nil, nil, nil],
- ["unsigned int ref",
- "i",
- proc{|v| [v].pack("I").unpack("i")[0]},
- proc{|v| [v].pack("i").unpack("I")[0]},
- nil, nil, nil],
- ["unsigned long ref",
- "l",
- proc{|v| [v].pack("L").unpack("l")[0]},
- proc{|v| [v].pack("l").unpack("L")[0]},
- nil, nil, nil],
- ["char ref", "c", nil, nil,
- nil, nil, nil],
- ["short ref", "h", nil, nil,
- nil, nil, nil],
- ["int ref", "i", nil, nil,
- nil, nil, nil],
- ["long ref", "l", nil, nil,
- nil, nil, nil],
- ["float ref", "f", nil, nil,
- nil, nil, nil],
- ["double ref","d", nil, nil,
- nil, nil, nil],
- ["char", "C", nil, nil,
- "C", nil, nil],
- ["short", "H", nil, nil,
- "H", nil, nil],
- ["int", "I", nil, nil,
- "I", nil, nil],
- ["long", "L", nil, nil,
- "L", nil, nil],
- ["float", "F", nil, nil,
- "F", nil, nil],
- ["double", "D", nil, nil,
- "D", nil, nil],
- [/^char\s*\*$/,"s",nil, nil,
- "S",nil, nil],
- [/^const char\s*\*$/,"S",nil, nil,
- "S",nil, nil],
- [/^.+\*$/, "P", nil, nil,
- "P", nil, nil],
- [/^.+\[\]$/, "a", nil, nil,
- "a", nil, nil],
- ["void", "0", nil, nil,
- nil, nil, nil],
- ]
-
- def initialize
- init_types()
- end
-
- def typealias(ty1, ty2, enc=nil, dec=nil, ty3=nil, senc=nil, sdec=nil)
- @TYDEFS.unshift([ty1, ty2, enc, dec, ty3, senc, sdec])
- end
-
- def init_types
- @TYDEFS = TYPES.dup
- end
-
- def encode_argument_type(alias_type)
- proc_encode = nil
- proc_decode = nil
- @TYDEFS.each{|aty,ty,enc,dec,_,_,_|
- if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
- alias_type = alias_type.gsub(aty,ty) if ty
- alias_type.strip! if alias_type
- if( proc_encode )
- if( enc )
- conv1 = proc_encode
- proc_encode = proc{|v| enc.call(conv1.call(v))}
- end
- else
- if( enc )
- proc_encode = enc
- end
- end
- if( proc_decode )
- if( dec )
- conv2 = proc_decode
- proc_decode = proc{|v| dec.call(conv2.call(v))}
- end
- else
- if( dec )
- proc_decode = dec
- end
- end
- end
- }
- return [alias_type, proc_encode, proc_decode]
- end
-
- def encode_return_type(ty)
- ty, enc, dec = encode_argument_type(ty)
- return [ty, enc, dec]
- end
-
- def encode_struct_type(alias_type)
- proc_encode = nil
- proc_decode = nil
- @TYDEFS.each{|aty,_,_,_,ty,enc,dec|
- if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
- alias_type = alias_type.gsub(aty,ty) if ty
- alias_type.strip! if alias_type
- if( proc_encode )
- if( enc )
- conv1 = proc_encode
- proc_encode = proc{|v| enc.call(conv1.call(v))}
- end
- else
- if( enc )
- proc_encode = enc
- end
- end
- if( proc_decode )
- if( dec )
- conv2 = proc_decode
- proc_decode = proc{|v| dec.call(conv2.call(v))}
- end
- else
- if( dec )
- proc_decode = dec
- end
- end
- end
- }
- return [alias_type, proc_encode, proc_decode]
- end
- end # end of Types
-end
diff --git a/ext/dl/lib/dl/win32.rb b/ext/dl/lib/dl/win32.rb
deleted file mode 100644
index 0fed47c324..0000000000
--- a/ext/dl/lib/dl/win32.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-
-class Win32API
- DLL = {}
-
- def initialize(dllname, func, import, export = "0")
- prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
- handle = DLL[dllname] ||= DL::Handle.new(dllname)
- @sym = handle.sym(func, prototype)
- end
-
- def call(*args)
- import = @sym.proto.split("", 2)[1]
- args.each_with_index do |x, i|
- args[i] = nil if x == 0 and import[i] == ?S
- args[i], = [x].pack("I").unpack("i") if import[i] == ?I
- end
- ret, = @sym.call(*args)
- return ret || 0
- end
-
- alias Call call
-end
diff --git a/ext/dl/mkcall.rb b/ext/dl/mkcall.rb
deleted file mode 100644
index 6a85570152..0000000000
--- a/ext/dl/mkcall.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def output_arg(x,i)
- "args[#{i}].#{DLTYPE[x][:stmem]}"
-end
-
-def output_args(types)
- t = []
- types[1..-1].each_with_index{|x,i| t.push(output_arg(x,i))}
- t.join(",")
-end
-
-def output_callfunc(types)
- t = types[0]
- stmem = DLTYPE[t][:stmem]
- ctypes = types2ctypes(types)
- if( t == VOID )
- callstm = "(*f)(#{output_args(types)})"
- else
- callstm = "ret.#{stmem} = (*f)(#{output_args(types)})"
- end
- [ "{",
- "#{ctypes[0]} (*f)(#{ctypes[1..-1].join(',')}) = func;",
- "#{callstm};",
- "}"].join(" ")
-end
-
-def output_case(types)
- num = types2num(types)
- callfunc_stm = output_callfunc(types)
-<<EOF
- case #{num}:
-#ifdef DEBUG
- printf("#{callfunc_stm}\\n");
-#endif
- #{callfunc_stm};
- break;
-EOF
-end
-
-def rec_output(types = [VOID])
- print output_case(types)
- if( types.length <= MAX_ARG )
- DLTYPE.keys.sort.each{|t|
- if( t != VOID && DLTYPE[t][:sym] )
- rec_output(types + [t])
- end
- }
- end
-end
-
-DLTYPE.keys.sort.each{|t|
- if( DLTYPE[t][:sym] )
- $stderr.printf(" #{DLTYPE[t][:ctype]}\n")
- rec_output([t])
- end
-}
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
deleted file mode 100644
index c9f92e4a0d..0000000000
--- a/ext/dl/mkcallback.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def mkfunc(rettype, fnum, argc)
- args = (0..(argc-1)).collect{|i| "long arg#{i}"}.join(", ")
-
- subst_code = (0..(argc-1)).collect{|i|
- " buff[#{i.to_s}] = arg#{i.to_s};"
- }.join("\n")
-
- ret_code =
- if( DLTYPE[rettype][:c2rb] )
- " return #{DLTYPE[rettype][:rb2c]['retval']};"
- else
- " /* no return value */"
- end
-
- code = [
- "static #{DLTYPE[rettype][:ctype]}",
- "rb_dl_callback_func_#{rettype.to_s}_#{fnum.to_s}(#{args})",
- "{",
- " VALUE retval, proto, proc, obj;",
- " VALUE argv[#{argc.to_s}];",
- " int argc;",
- " long buff[#{argc.to_s}];",
- "",
- subst_code,
- "",
- " obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
- " if(NIL_P(obj))",
- " rb_raise(rb_eDLError, \"callback function does not exist in DL::FuncTable\");",
- " Check_Type(obj, T_ARRAY);",
- " proto = rb_ary_entry(obj, 0);",
- " proc = rb_ary_entry(obj, 1);",
- " Check_Type(proto, T_STRING);",
- " if( RSTRING(proto)->len >= #{argc.to_s} )",
- " rb_raise(rb_eArgError, \"too many arguments\");",
- " rb_dl_scan_callback_args(buff, RSTRING(proto)->ptr, &argc, argv);",
- " retval = rb_funcall2(proc, id_call, argc, argv);",
- "",
- ret_code,
- "}",
- ].join("\n")
-
- return code
-end
-
-DLTYPE.keys.sort.each{|t|
- for n in 0..(MAX_CALLBACK - 1)
- print(mkfunc(t, n, 15), "\n\n")
- end
-}
diff --git a/ext/dl/mkcbtable.rb b/ext/dl/mkcbtable.rb
deleted file mode 100644
index 165c4bdc88..0000000000
--- a/ext/dl/mkcbtable.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- ruby -*-
-
-require 'mkmf'
-$:.unshift File.dirname(__FILE__)
-require 'type'
-require 'dlconfig'
-
-def mktable(rettype, fnum, argc)
- code =
- "rb_dl_callback_table[#{rettype}][#{fnum}] = &rb_dl_callback_func_#{rettype.to_s}_#{fnum};"
- return code
-end
-
-DLTYPE.keys.sort.each{|t|
- for n in 0..(MAX_CALLBACK - 1)
- print(mktable(t, n, 15), "\n")
- end
-}
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
deleted file mode 100644
index 5112151733..0000000000
--- a/ext/dl/ptr.c
+++ /dev/null
@@ -1,1068 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include <ctype.h>
-#include <version.h> /* for ruby version code */
-#include "dl.h"
-
-VALUE rb_cDLPtrData;
-VALUE rb_mDLMemorySpace;
-static VALUE DLMemoryTable;
-
-#ifndef T_SYMBOL
-# define T_SYMBOL T_FIXNUM
-#endif
-
-#if RUBY_VERSION_CODE < 171
-static VALUE
-rb_hash_delete(VALUE hash, VALUE key)
-{
- return rb_funcall(hash, rb_intern("delete"), 1, key);
-}
-#endif
-
-static void
-rb_dlmem_delete(void *ptr)
-{
- rb_secure(4);
- rb_hash_delete(DLMemoryTable, DLLONG2NUM(ptr));
-}
-
-static void
-rb_dlmem_aset(void *ptr, VALUE obj)
-{
- if (obj == Qnil) {
- rb_dlmem_delete(ptr);
- }
- else{
- rb_hash_aset(DLMemoryTable, DLLONG2NUM(ptr), DLLONG2NUM(obj));
- }
-}
-
-static VALUE
-rb_dlmem_aref(void *ptr)
-{
- VALUE val;
-
- val = rb_hash_aref(DLMemoryTable, DLLONG2NUM(ptr));
- return val == Qnil ? Qnil : (VALUE)DLNUM2LONG(val);
-}
-
-void
-dlptr_free(struct ptr_data *data)
-{
- if (data->ptr) {
- DEBUG_CODE({
- printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
- data->ptr);
- });
- rb_dlmem_delete(data->ptr);
- if (data->free) {
- DEBUG_CODE({
- printf("dlptr_free(): 0x%x(data->ptr:0x%x)\n",data->free,data->ptr);
- });
- (*(data->free))(data->ptr);
- }
- }
- if (data->stype) dlfree(data->stype);
- if (data->ssize) dlfree(data->ssize);
- if (data->ids) dlfree(data->ids);
-}
-
-void
-dlptr_init(VALUE val)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(val, struct ptr_data, data);
- DEBUG_CODE({
- printf("dlptr_init(): add the pointer `0x%x' to the MemorySpace\n",
- data->ptr);
- });
- rb_dlmem_aset(data->ptr, val);
- OBJ_TAINT(val);
-}
-
-VALUE
-rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
-{
- struct ptr_data *data;
- VALUE val;
-
- rb_secure(4);
- if (ptr) {
- val = rb_dlmem_aref(ptr);
- if (val == Qnil) {
- val = Data_Make_Struct(klass, struct ptr_data,
- 0, dlptr_free, data);
- data->ptr = ptr;
- data->free = func;
- data->ctype = DLPTR_CTYPE_UNKNOWN;
- data->stype = NULL;
- data->ssize = NULL;
- data->slen = 0;
- data->size = size;
- data->ids = NULL;
- data->ids_num = 0;
- dlptr_init(val);
- }
- else{
- if (func) {
- Data_Get_Struct(val, struct ptr_data, data);
- data->free = func;
- }
- }
- }
- else{
- val = Qnil;
- }
-
- return val;
-}
-
-VALUE
-rb_dlptr_new(void *ptr, long size, freefunc_t func)
-{
- return rb_dlptr_new2(rb_cDLPtrData, ptr, size, func);
-}
-
-VALUE
-rb_dlptr_malloc(long size, freefunc_t func)
-{
- void *ptr;
-
- rb_secure(4);
- ptr = dlmalloc((size_t)size);
- memset(ptr,0,(size_t)size);
- return rb_dlptr_new(ptr, size, func);
-}
-
-void *
-rb_dlptr2cptr(VALUE val)
-{
- struct ptr_data *data;
- void *ptr;
-
- if (rb_obj_is_kind_of(val, rb_cDLPtrData)) {
- Data_Get_Struct(val, struct ptr_data, data);
- ptr = data->ptr;
- }
- else if (val == Qnil) {
- ptr = NULL;
- }
- else{
- rb_raise(rb_eTypeError, "DL::PtrData was expected");
- }
-
- return ptr;
-}
-
-static VALUE
-rb_dlptr_s_allocate(VALUE klass)
-{
- VALUE obj;
- struct ptr_data *data;
-
- rb_secure(4);
- obj = Data_Make_Struct(klass, struct ptr_data, 0, dlptr_free, data);
- data->ptr = 0;
- data->free = 0;
- data->ctype = DLPTR_CTYPE_UNKNOWN;
- data->stype = NULL;
- data->ssize = NULL;
- data->slen = 0;
- data->size = 0;
- data->ids = NULL;
- data->ids_num = 0;
-
- return obj;
-}
-
-static VALUE
-rb_dlptr_initialize(int argc, VALUE argv[], VALUE self)
-{
- VALUE ptr, sym, size;
- struct ptr_data *data;
- void *p = NULL;
- freefunc_t f = NULL;
- long s = 0;
-
- switch (rb_scan_args(argc, argv, "12", &ptr, &size, &sym)) {
- case 1:
- p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
- break;
- case 2:
- p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
- s = DLNUM2LONG(size);
- break;
- case 3:
- p = (void*)(DLNUM2LONG(rb_Integer(ptr)));
- s = DLNUM2LONG(size);
- f = rb_dlsym2csym(sym);
- break;
- default:
- rb_bug("rb_dlptr_initialize");
- }
-
- if (p) {
- Data_Get_Struct(self, struct ptr_data, data);
- if (data->ptr && data->free) {
- /* Free previous memory. Use of inappropriate initialize may cause SEGV. */
- (*(data->free))(data->ptr);
- }
- data->ptr = p;
- data->size = s;
- data->free = f;
- }
-
- return Qnil;
-}
-
-static VALUE
-rb_dlptr_s_malloc(int argc, VALUE argv[], VALUE klass)
-{
- VALUE size, sym, obj;
- int s;
- freefunc_t f = NULL;
-
- switch (rb_scan_args(argc, argv, "11", &size, &sym)) {
- case 1:
- s = NUM2INT(size);
- break;
- case 2:
- s = NUM2INT(size);
- f = rb_dlsym2csym(sym);
- break;
- default:
- rb_bug("rb_dlptr_s_malloc");
- }
-
- obj = rb_dlptr_malloc(s,f);
-
- return obj;
-}
-
-VALUE
-rb_dlptr_to_i(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return DLLONG2NUM(data->ptr);
-}
-
-VALUE
-rb_dlptr_ptr(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return rb_dlptr_new(*((void**)(data->ptr)),0,0);
-}
-
-VALUE
-rb_dlptr_ref(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return rb_dlptr_new(&(data->ptr),0,0);
-}
-
-VALUE
-rb_dlptr_null_p(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- return data->ptr ? Qfalse : Qtrue;
-}
-
-VALUE
-rb_dlptr_free_set(VALUE self, VALUE val)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
-
- data->free = DLFREEFUNC(rb_dlsym2csym(val));
-
- return Qnil;
-}
-
-VALUE
-rb_dlptr_free_get(VALUE self)
-{
- struct ptr_data *pdata;
-
- Data_Get_Struct(self, struct ptr_data, pdata);
-
- return rb_dlsym_new(pdata->free,"(free)","0P");
-}
-
-VALUE
-rb_dlptr_to_array(int argc, VALUE argv[], VALUE self)
-{
- struct ptr_data *data;
- int n;
- int i;
- int t;
- VALUE ary;
- VALUE type, size;
-
- Data_Get_Struct(self, struct ptr_data, data);
-
- switch (rb_scan_args(argc, argv, "11", &type, &size)) {
- case 2:
- t = StringValuePtr(type)[0];
- n = NUM2INT(size);
- break;
- case 1:
- t = StringValuePtr(type)[0];
- switch (t) {
- case 'C':
- n = data->size;
- break;
- case 'H':
- n = data->size / sizeof(short);
- break;
- case 'I':
- n = data->size / sizeof(int);
- break;
- case 'L':
- n = data->size / sizeof(long);
- break;
- case 'F':
- n = data->size / sizeof(float);
- break;
- case 'D':
- n = data->size / sizeof(double);
- break;
- case 'P': case 'p':
- n = data->size / sizeof(void*);
- break;
- case 'S': case 's':
- for (n=0; ((void**)(data->ptr))[n]; n++) {};
- break;
- default:
- n = 0;
- }
- break;
- default:
- rb_bug("rb_dlptr_to_array");
- }
-
- ary = rb_ary_new();
-
- for (i=0; i < n; i++) {
- switch (t) {
- case 'C':
- rb_ary_push(ary, INT2NUM(((char*)(data->ptr))[i]));
- break;
- case 'H':
- rb_ary_push(ary, INT2NUM(((short*)(data->ptr))[i]));
- break;
- case 'I':
- rb_ary_push(ary, INT2NUM(((int*)(data->ptr))[i]));
- break;
- case 'L':
- rb_ary_push(ary, DLLONG2NUM(((long*)(data->ptr))[i]));
- break;
- case 'D':
- rb_ary_push(ary, rb_float_new(((double*)(data->ptr))[i]));
- break;
- case 'F':
- rb_ary_push(ary, rb_float_new(((float*)(data->ptr))[i]));
- break;
- case 'S':
- {
- char *str = ((char**)(data->ptr))[i];
- if (str) {
- rb_ary_push(ary, rb_tainted_str_new2(str));
- }
- else{
- rb_ary_push(ary, Qnil);
- }
- }
- break;
- case 's':
- {
- char *str = ((char**)(data->ptr))[i];
- if (str) {
- rb_ary_push(ary, rb_tainted_str_new2(str));
- xfree(str);
- }
- else{
- rb_ary_push(ary, Qnil);
- }
- }
- break;
- case 'P':
- rb_ary_push(ary, rb_dlptr_new(((void**)(data->ptr))[i],0,0));
- break;
- case 'p':
- rb_ary_push(ary,
- rb_dlptr_new(((void**)(data->ptr))[i],0,dlfree));
- break;
- }
- }
-
- return ary;
-}
-
-
-VALUE
-rb_dlptr_to_s(int argc, VALUE argv[], VALUE self)
-{
- struct ptr_data *data;
- VALUE arg1, val;
- int len;
-
- Data_Get_Struct(self, struct ptr_data, data);
- switch (rb_scan_args(argc, argv, "01", &arg1)) {
- case 0:
- val = rb_tainted_str_new2((char*)(data->ptr));
- break;
- case 1:
- len = NUM2INT(arg1);
- val = rb_tainted_str_new((char*)(data->ptr), len);
- break;
- default:
- rb_bug("rb_dlptr_to_s");
- }
-
- return val;
-}
-
-VALUE
-rb_dlptr_to_str(int argc, VALUE argv[], VALUE self)
-{
- struct ptr_data *data;
- VALUE arg1, val;
- int len;
-
- Data_Get_Struct(self, struct ptr_data, data);
- switch (rb_scan_args(argc, argv, "01", &arg1)) {
- case 0:
- val = rb_tainted_str_new((char*)(data->ptr),data->size);
- break;
- case 1:
- len = NUM2INT(arg1);
- val = rb_tainted_str_new((char*)(data->ptr), len);
- break;
- default:
- rb_bug("rb_dlptr_to_str");
- }
-
- return val;
-}
-
-VALUE
-rb_dlptr_inspect(VALUE self)
-{
- struct ptr_data *data;
- char str[1024];
-
- Data_Get_Struct(self, struct ptr_data, data);
- snprintf(str, 1023, "#<%s:0x%lx ptr=0x%lx size=%ld free=0x%lx>",
- rb_class2name(CLASS_OF(self)), data, data->ptr, data->size,
- (long)data->free);
- return rb_str_new2(str);
-}
-
-VALUE
-rb_dlptr_eql(VALUE self, VALUE other)
-{
- void *ptr1, *ptr2;
- ptr1 = rb_dlptr2cptr(self);
- ptr2 = rb_dlptr2cptr(other);
-
- return ptr1 == ptr2 ? Qtrue : Qfalse;
-}
-
-VALUE
-rb_dlptr_cmp(VALUE self, VALUE other)
-{
- void *ptr1, *ptr2;
- ptr1 = rb_dlptr2cptr(self);
- ptr2 = rb_dlptr2cptr(other);
- return DLLONG2NUM((long)ptr1 - (long)ptr2);
-}
-
-VALUE
-rb_dlptr_plus(VALUE self, VALUE other)
-{
- void *ptr;
- long num, size;
-
- ptr = rb_dlptr2cptr(self);
- size = RDLPTR(self)->size;
- num = DLNUM2LONG(other);
- return rb_dlptr_new((char *)ptr + num, size - num, 0);
-}
-
-VALUE
-rb_dlptr_minus(VALUE self, VALUE other)
-{
- void *ptr;
- long num, size;
-
- ptr = rb_dlptr2cptr(self);
- size = RDLPTR(self)->size;
- num = DLNUM2LONG(other);
- return rb_dlptr_new((char *)ptr - num, size + num, 0);
-}
-
-VALUE
-rb_dlptr_define_data_type(int argc, VALUE argv[], VALUE self)
-{
- VALUE data_type, type, rest, vid;
- struct ptr_data *data;
- int i, t, num;
- char *ctype;
-
- rb_scan_args(argc, argv, "11*", &data_type, &type, &rest);
- Data_Get_Struct(self, struct ptr_data, data);
-
- if (argc == 1 || (argc == 2 && type == Qnil)) {
- if (NUM2INT(data_type) == DLPTR_CTYPE_UNKNOWN) {
- data->ctype = DLPTR_CTYPE_UNKNOWN;
- data->slen = 0;
- data->ids_num = 0;
- if (data->stype) {
- dlfree(data->stype);
- data->stype = NULL;
- }
- if (data->ids) {
- dlfree(data->ids);
- data->ids = NULL;
- }
- return Qnil;
- }
- else{
- rb_raise(rb_eArgError, "wrong arguments");
- }
- }
-
- t = NUM2INT(data_type);
- StringValue(type);
- Check_Type(rest, T_ARRAY);
- num = RARRAY(rest)->len;
- for (i=0; i<num; i++) {
- rb_to_id(rb_ary_entry(rest,i));
- }
-
- data->ctype = t;
- data->slen = num;
- data->ids_num = num;
- if (data->stype) dlfree(data->stype);
- data->stype = (char*)dlmalloc(sizeof(char) * num);
- if (data->ssize) dlfree(data->ssize);
- data->ssize = (int*)dlmalloc(sizeof(int) * num);
- if (data->ids) dlfree(data->ids);
- data->ids = (ID*)dlmalloc(sizeof(ID) * data->ids_num);
-
- ctype = StringValuePtr(type);
- for (i=0; i<num; i++) {
- vid = rb_ary_entry(rest,i);
- data->ids[i] = rb_to_id(vid);
- data->stype[i] = *ctype;
- ctype ++;
- if (isdigit(*ctype)) {
- char *p, *d;
- for (p=ctype; isdigit(*p); p++) ;
- d = ALLOCA_N(char, p - ctype + 1);
- strncpy(d, ctype, p - ctype);
- d[p - ctype] = '\0';
- data->ssize[i] = atoi(d);
- ctype = p;
- }
- else{
- data->ssize[i] = 1;
- }
- }
-
- if (*ctype) {
- rb_raise(rb_eArgError, "too few/many arguments");
- }
-
- if (!data->size)
- data->size = dlsizeof(RSTRING(type)->ptr);
-
- return Qnil;
-}
-
-VALUE
-rb_dlptr_define_struct(int argc, VALUE argv[], VALUE self)
-{
- VALUE *pass_argv;
- int pass_argc, i;
-
- pass_argc = argc + 1;
- pass_argv = ALLOCA_N(VALUE, pass_argc);
- pass_argv[0] = INT2FIX(DLPTR_CTYPE_STRUCT);
- for (i=1; i<pass_argc; i++) {
- pass_argv[i] = argv[i-1];
- }
- return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
-}
-
-VALUE
-rb_dlptr_define_union(int argc, VALUE argv[], VALUE self)
-{
- VALUE *pass_argv;
- int pass_argc, i;
-
- pass_argc = argc + 1;
- pass_argv = ALLOCA_N(VALUE, pass_argc);
- pass_argv[0] = INT2FIX(DLPTR_CTYPE_UNION);
- for (i=1; i<pass_argc; i++) {
- pass_argv[i] = argv[i-1];
- }
- return rb_dlptr_define_data_type(pass_argc, pass_argv, self);
-}
-
-VALUE
-rb_dlptr_get_data_type(VALUE self)
-{
- struct ptr_data *data;
-
- Data_Get_Struct(self, struct ptr_data, data);
- if (data->stype)
- return rb_assoc_new(INT2FIX(data->ctype),
- rb_tainted_str_new(data->stype, data->slen));
- else
- return rb_assoc_new(INT2FIX(data->ctype), Qnil);
-}
-
-static VALUE
-cary2ary(void *ptr, char t, int len)
-{
- VALUE ary;
- VALUE elem;
- int i;
-
- if (len < 1)
- return Qnil;
-
- if (len == 1) {
- switch (t) {
- case 'I':
- elem = INT2NUM(*((int*)ptr));
- ptr = (char *)ptr + sizeof(int);
- break;
- case 'L':
- elem = DLLONG2NUM(*((long*)ptr));
- ptr = (char *)ptr + sizeof(long);
- break;
- case 'P':
- case 'S':
- elem = rb_dlptr_new(*((void**)ptr),0, 0);
- ptr = (char *)ptr + sizeof(void*);
- break;
- case 'F':
- elem = rb_float_new(*((float*)ptr));
- ptr = (char *)ptr + sizeof(float);
- break;
- case 'D':
- elem = rb_float_new(*((double*)ptr));
- ptr = (char *)ptr + sizeof(double);
- break;
- case 'C':
- elem = INT2NUM(*((char*)ptr));
- ptr = (char *)ptr + sizeof(char);
- break;
- case 'H':
- elem = INT2NUM(*((short*)ptr));
- ptr = (char *)ptr + sizeof(short);
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
- }
- return elem;
- }
-
- ary = rb_ary_new();
- for (i=0; i < len; i++) {
- switch (t) {
- case 'I':
- elem = INT2NUM(*((int*)ptr));
- ptr = (char *)ptr + sizeof(int);
- break;
- case 'L':
- elem = DLLONG2NUM(*((long*)ptr));
- ptr = (char *)ptr + sizeof(long);
- break;
- case 'P':
- case 'S':
- elem = rb_dlptr_new(*((void**)ptr), 0, 0);
- ptr = (char *)ptr + sizeof(void*);
- break;
- case 'F':
- elem = rb_float_new(*((float*)ptr));
- ptr = (char *)ptr + sizeof(float);
- break;
- case 'D':
- elem = rb_float_new(*((float*)ptr));
- ptr = (char *)ptr + sizeof(double);
- break;
- case 'C':
- elem = INT2NUM(*((char*)ptr));
- ptr = (char *)ptr + sizeof(char);
- break;
- case 'H':
- elem = INT2NUM(*((short*)ptr));
- ptr = (char *)ptr + sizeof(short);
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type '%c'", t);
- }
- rb_ary_push(ary, elem);
- }
-
- return ary;
-}
-
-VALUE
-rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
-{
- VALUE key = Qnil, num = Qnil;
- ID id;
- struct ptr_data *data;
- int i;
- int offset;
-
- if (rb_scan_args(argc, argv, "11", &key, &num) == 1) {
- num = INT2NUM(0);
- }
-
- if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
- VALUE pass[1];
- pass[0] = num;
- return rb_dlptr_to_str(1, pass, rb_dlptr_plus(self, key));
- }
- rb_to_id(key);
- if (! (TYPE(key) == T_STRING || TYPE(key) == T_SYMBOL)) {
- rb_raise(rb_eTypeError, "the key must be a string or symbol");
- }
-
- id = rb_to_id(key);
- Data_Get_Struct(self, struct ptr_data, data);
- offset = 0;
- switch (data->ctype) {
- case DLPTR_CTYPE_STRUCT:
- for (i=0; i < data->ids_num; i++) {
- switch (data->stype[i]) {
- case 'I':
- DLALIGN(data->ptr,offset,INT_ALIGN);
- break;
- case 'L':
- DLALIGN(data->ptr,offset,LONG_ALIGN);
- break;
- case 'P':
- case 'S':
- DLALIGN(data->ptr,offset,VOIDP_ALIGN);
- break;
- case 'F':
- DLALIGN(data->ptr,offset,FLOAT_ALIGN);
- break;
- case 'D':
- DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
- break;
- case 'C':
- break;
- case 'H':
- DLALIGN(data->ptr,offset,SHORT_ALIGN);
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
- }
- if (data->ids[i] == id) {
- return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
- }
- switch (data->stype[i]) {
- case 'I':
- offset += sizeof(int) * data->ssize[i];
- break;
- case 'L':
- offset += sizeof(long) * data->ssize[i];
- break;
- case 'P':
- case 'S':
- offset += sizeof(void*) * data->ssize[i];
- break;
- case 'F':
- offset += sizeof(float) * data->ssize[i];
- break;
- case 'D':
- offset += sizeof(double) * data->ssize[i];
- break;
- case 'C':
- offset += sizeof(char) * data->ssize[i];
- break;
- case 'H':
- offset += sizeof(short) * data->ssize[i];
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
- }
- }
- break;
- case DLPTR_CTYPE_UNION:
- for (i=0; i < data->ids_num; i++) {
- if (data->ids[i] == id) {
- return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
- }
- }
- break;
- } /* end of switch */
-
- rb_raise(rb_eNameError, "undefined key `%s' for %s",
- rb_id2name(id), rb_class2name(CLASS_OF(self)));
-
- return Qnil;
-}
-
-static void *
-ary2cary(char t, VALUE val, long *size)
-{
- void *ptr;
-
- if (TYPE(val) == T_ARRAY) {
- ptr = rb_ary2cary(t, val, size);
- }
- else{
- ptr = rb_ary2cary(t, rb_ary_new3(1, val), size);
- }
- return ptr;
-}
-
-VALUE
-rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
-{
- VALUE key = Qnil, num = Qnil, val = Qnil;
- ID id;
- struct ptr_data *data;
- int i;
- int offset;
- long memsize;
- void *memimg;
-
- rb_secure(4);
- switch (rb_scan_args(argc, argv, "21", &key, &num, &val)) {
- case 2:
- val = num;
- num = Qnil;
- break;
- }
-
- if (TYPE(key) == T_FIXNUM || TYPE(key) == T_BIGNUM) {
- void *dst, *src;
- long len;
-
- StringValue(val);
- Data_Get_Struct(self, struct ptr_data, data);
- dst = (void*)((long)(data->ptr) + DLNUM2LONG(key));
- src = RSTRING(val)->ptr;
- len = RSTRING(val)->len;
- if (num == Qnil) {
- memcpy(dst, src, len);
- }
- else{
- long n = NUM2INT(num);
- memcpy(dst, src, n < len ? n : len);
- if (n > len) MEMZERO((char*)dst + len, char, n - len);
- }
- return val;
- }
-
- id = rb_to_id(key);
- Data_Get_Struct(self, struct ptr_data, data);
- switch (data->ctype) {
- case DLPTR_CTYPE_STRUCT:
- offset = 0;
- for (i=0; i < data->ids_num; i++) {
- switch (data->stype[i]) {
- case 'I':
- DLALIGN(data->ptr,offset,INT_ALIGN);
- break;
- case 'L':
- DLALIGN(data->ptr,offset,LONG_ALIGN);
- break;
- case 'P':
- case 'S':
- DLALIGN(data->ptr,offset,VOIDP_ALIGN);
- break;
- case 'D':
- DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
- break;
- case 'F':
- DLALIGN(data->ptr,offset,FLOAT_ALIGN);
- break;
- case 'C':
- break;
- case 'H':
- DLALIGN(data->ptr,offset,SHORT_ALIGN);
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
- }
- if (data->ids[i] == id) {
- memimg = ary2cary(data->stype[i], val, &memsize);
- memcpy((char *)data->ptr + offset, memimg, memsize);
- dlfree(memimg);
- return val;
- }
- switch (data->stype[i]) {
- case 'I':
- case 'i':
- offset += sizeof(int) * data->ssize[i];
- break;
- case 'L':
- case 'l':
- offset += sizeof(long) * data->ssize[i];
- break;
- case 'P':
- case 'p':
- case 'S':
- case 's':
- offset += sizeof(void*) * data->ssize[i];
- break;
- case 'D':
- case 'd':
- offset += sizeof(double) * data->ssize[i];
- break;
- case 'F':
- case 'f':
- offset += sizeof(float) * data->ssize[i];
- break;
- case 'C':
- case 'c':
- offset += sizeof(char) * data->ssize[i];
- break;
- case 'H':
- case 'h':
- offset += sizeof(short) * data->ssize[i];
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
- }
- }
- return val;
- /* break; */
- case DLPTR_CTYPE_UNION:
- for (i=0; i < data->ids_num; i++) {
- if (data->ids[i] == id) {
- switch (data->stype[i]) {
- case 'I': case 'i':
- memsize = sizeof(int) * data->ssize[i];
- break;
- case 'L': case 'l':
- memsize = sizeof(long) * data->ssize[i];
- break;
- case 'P': case 'p':
- case 'S': case 's':
- memsize = sizeof(void*) * data->ssize[i];
- break;
- case 'F': case 'f':
- memsize = sizeof(float) * data->ssize[i];
- break;
- case 'D': case 'd':
- memsize = sizeof(double) * data->ssize[i];
- break;
- case 'C': case 'c':
- memsize = sizeof(char) * data->ssize[i];
- break;
- case 'H': case 'h':
- memsize = sizeof(short) * data->ssize[i];
- break;
- default:
- rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
- }
- memimg = ary2cary(data->stype[i], val, NULL);
- memcpy(data->ptr, memimg, memsize);
- dlfree(memimg);
- }
- }
- return val;
- /* break; */
- }
-
- rb_raise(rb_eNameError, "undefined key `%s' for %s",
- rb_id2name(id), rb_class2name(CLASS_OF(self)));
-
- return Qnil;
-}
-
-VALUE
-rb_dlptr_size(int argc, VALUE argv[], VALUE self)
-{
- VALUE size;
-
- if (rb_scan_args(argc, argv, "01", &size) == 0){
- return DLLONG2NUM(RDLPTR(self)->size);
- }
- else{
- RDLPTR(self)->size = DLNUM2LONG(size);
- return size;
- }
-}
-
-static VALUE
-dlmem_each_i(VALUE assoc, void *data)
-{
- VALUE key, val;
- key = rb_ary_entry(assoc, 0);
- val = rb_ary_entry(assoc, 1);
- rb_yield(rb_assoc_new(key,(VALUE)DLNUM2LONG(val)));
- return Qnil;
-}
-
-VALUE
-rb_dlmem_each(VALUE self)
-{
- rb_iterate(rb_each, DLMemoryTable, dlmem_each_i, 0);
- return Qnil;
-}
-
-void
-Init_dlptr()
-{
- rb_cDLPtrData = rb_define_class_under(rb_mDL, "PtrData", rb_cObject);
- rb_define_alloc_func(rb_cDLPtrData, rb_dlptr_s_allocate);
- rb_define_singleton_method(rb_cDLPtrData, "malloc", rb_dlptr_s_malloc, -1);
- rb_define_method(rb_cDLPtrData, "initialize", rb_dlptr_initialize, -1);
- rb_define_method(rb_cDLPtrData, "free=", rb_dlptr_free_set, 1);
- rb_define_method(rb_cDLPtrData, "free", rb_dlptr_free_get, 0);
- rb_define_method(rb_cDLPtrData, "to_i", rb_dlptr_to_i, 0);
- rb_define_method(rb_cDLPtrData, "ptr", rb_dlptr_ptr, 0);
- rb_define_method(rb_cDLPtrData, "+@", rb_dlptr_ptr, 0);
- rb_define_method(rb_cDLPtrData, "ref", rb_dlptr_ref, 0);
- rb_define_method(rb_cDLPtrData, "-@", rb_dlptr_ref, 0);
- rb_define_method(rb_cDLPtrData, "null?", rb_dlptr_null_p, 0);
- rb_define_method(rb_cDLPtrData, "to_a", rb_dlptr_to_array, -1);
- rb_define_method(rb_cDLPtrData, "to_s", rb_dlptr_to_s, -1);
- rb_define_method(rb_cDLPtrData, "to_str", rb_dlptr_to_str, -1);
- rb_define_method(rb_cDLPtrData, "inspect", rb_dlptr_inspect, 0);
- rb_define_method(rb_cDLPtrData, "<=>", rb_dlptr_cmp, 1);
- rb_define_method(rb_cDLPtrData, "==", rb_dlptr_eql, 1);
- rb_define_method(rb_cDLPtrData, "eql?", rb_dlptr_eql, 1);
- rb_define_method(rb_cDLPtrData, "+", rb_dlptr_plus, 1);
- rb_define_method(rb_cDLPtrData, "-", rb_dlptr_minus, 1);
- rb_define_method(rb_cDLPtrData, "define_data_type",
- rb_dlptr_define_data_type, -1);
- rb_define_method(rb_cDLPtrData, "struct!", rb_dlptr_define_struct, -1);
- rb_define_method(rb_cDLPtrData, "union!", rb_dlptr_define_union, -1);
- rb_define_method(rb_cDLPtrData, "data_type", rb_dlptr_get_data_type, 0);
- rb_define_method(rb_cDLPtrData, "[]", rb_dlptr_aref, -1);
- rb_define_method(rb_cDLPtrData, "[]=", rb_dlptr_aset, -1);
- rb_define_method(rb_cDLPtrData, "size", rb_dlptr_size, -1);
- rb_define_method(rb_cDLPtrData, "size=", rb_dlptr_size, -1);
-
- rb_mDLMemorySpace = rb_define_module_under(rb_mDL, "MemorySpace");
- DLMemoryTable = rb_hash_new();
- rb_define_const(rb_mDLMemorySpace, "MemoryTable", DLMemoryTable);
- rb_define_module_function(rb_mDLMemorySpace, "each", rb_dlmem_each, 0);
-}
diff --git a/ext/dl/sample/c++sample.C b/ext/dl/sample/c++sample.C
deleted file mode 100644
index d083d337a7..0000000000
--- a/ext/dl/sample/c++sample.C
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <stdio.h>
-
-class Person {
-private:
- const char *name;
- int age;
-
-public:
- Person(const char *name, int age);
- const char * get_name();
- int get_age();
- void set_age(int i);
-};
-
-Person::Person(const char *name, int age)
- : name(name), age(age)
-{
- /* empty */
-}
-
-const char *
-Person::get_name()
-{
- return name;
-}
-
-int
-Person::get_age(){
- return age;
-}
-
-void
-Person::set_age(int i){
- age = i;
-}
diff --git a/ext/dl/sample/c++sample.rb b/ext/dl/sample/c++sample.rb
deleted file mode 100644
index 29887df845..0000000000
--- a/ext/dl/sample/c++sample.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-=begin
- This script shows how to deal with C++ classes using Ruby/DL.
- You must build a dynamic loadable library using "c++sample.C"
- to run this script as follows:
- $ g++ -o libsample.so -shared c++sample.C
-=end
-
-require 'dl'
-require 'dl/import'
-require 'dl/struct'
-
-# Give a name of dynamic loadable library
-LIBNAME = ARGV[0] || "libsample.so"
-
-class Person
- module Core
- extend DL::Importable
-
- dlload LIBNAME
-
- # mangled symbol names
- extern "void __6PersonPCci(void *, const char *, int)"
- extern "const char *get_name__6Person(void *)"
- extern "int get_age__6Person(void *)"
- extern "void set_age__6Personi(void *, int)"
-
- Data = struct [
- "char *name",
- "int age",
- ]
- end
-
- def initialize(name, age)
- @ptr = Core::Data.alloc
- Core::__6PersonPCci(@ptr, name, age)
- end
-
- def get_name()
- str = Core::get_name__6Person(@ptr)
- if( str )
- str.to_s
- else
- nil
- end
- end
-
- def get_age()
- Core::get_age__6Person(@ptr)
- end
-
- def set_age(age)
- Core::set_age__6Personi(@ptr, age)
- end
-end
-
-obj = Person.new("ttate", 1)
-p obj.get_name()
-p obj.get_age()
-obj.set_age(10)
-p obj.get_age()
diff --git a/ext/dl/sample/drives.rb b/ext/dl/sample/drives.rb
deleted file mode 100644
index 8a590404b1..0000000000
--- a/ext/dl/sample/drives.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- ruby -*-
-# drives.rb -- find existing drives and show the drive type.
-
-require 'dl'
-require 'dl/import'
-
-module Kernel32
- extend DL::Importable
-
- dlload "kernel32"
-
- extern "long GetLogicalDrives()"
- extern "int GetDriveType(char*)"
- extern "long GetDiskFreeSpace(char*, long ref, long ref, long ref, long ref)"
-end
-
-include Kernel32
-
-buff = Kernel32.getLogicalDrives()
-
-i = 0
-ds = []
-while( i < 26 )
- mask = (1 << i)
- if( buff & mask > 0 )
- ds.push((65+i).chr)
- end
- i += 1
-end
-
-=begin
-From the cygwin's /usr/include/w32api/winbase.h:
-#define DRIVE_UNKNOWN 0
-#define DRIVE_NO_ROOT_DIR 1
-#define DRIVE_REMOVABLE 2
-#define DRIVE_FIXED 3
-#define DRIVE_REMOTE 4
-#define DRIVE_CDROM 5
-#define DRIVE_RAMDISK 6
-=end
-
-types = [
- "unknown",
- "no root dir",
- "Removable",
- "Fixed",
- "Remote",
- "CDROM",
- "RAM",
-]
-print("Drive : Type (Free Space/Available Space)\n")
-ds.each{|d|
- t = Kernel32.getDriveType(d + ":\\")
- Kernel32.getDiskFreeSpace(d + ":\\", 0, 0, 0, 0)
- _,sec_per_clus,byte_per_sec,free_clus,total_clus = Kernel32._args_
- fbytes = sec_per_clus * byte_per_sec * free_clus
- tbytes = sec_per_clus * byte_per_sec * total_clus
- unit = "B"
- if( fbytes > 1024 && tbytes > 1024 )
- fbytes = fbytes / 1024
- tbytes = tbytes / 1024
- unit = "K"
- end
- if( fbytes > 1024 && tbytes > 1024 )
- fbytes = fbytes / 1024
- tbytes = tbytes / 1024
- unit = "M"
- end
- print("#{d} : #{types[t]} (#{fbytes} #{unit}/#{tbytes} #{unit})\n")
-}
diff --git a/ext/dl/sample/getch.rb b/ext/dl/sample/getch.rb
deleted file mode 100644
index 3f7261c979..0000000000
--- a/ext/dl/sample/getch.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'dl'
-
-crtdll = DL::dlopen("crtdll")
-getch = crtdll['_getch', 'L']
-print(getch.call, "\n")
diff --git a/ext/dl/sample/libc.rb b/ext/dl/sample/libc.rb
deleted file mode 100644
index a1f6fbe543..0000000000
--- a/ext/dl/sample/libc.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require "dl/import"
-require "dl/struct"
-
-module LIBC
- extend DL::Importable
-
- begin
- dlload "libc.so.6"
- rescue
- dlload "libc.so.5"
- end
-
- extern "int atoi(char*)"
- extern "ibool isdigit(int)"
- extern "int gettimeofday(struct timeval *, struct timezone *)"
- extern "char* strcat(char*, char*)"
- extern "FILE* fopen(char*, char*)"
- extern "int fclose(FILE*)"
- extern "int fgetc(FILE*)"
- extern "int strlen(char*)"
- extern "void qsort(void*, int, int, void*)"
-
- def str_qsort(ary, comp)
- len = ary.length
- r,rs = qsort(ary, len, DL.sizeof('P'), comp)
- return rs[0].to_a('S', len)
- end
-
- Timeval = struct [
- "long tv_sec",
- "long tv_usec",
- ]
-
- Timezone = struct [
- "int tz_minuteswest",
- "int tz_dsttime",
- ]
-
- def my_compare(ptr1, ptr2)
- ptr1.ptr.to_s <=> ptr2.ptr.to_s
- end
- COMPARE = callback("int my_compare(char**, char**)")
-end
-
-
-$cb1 = DL.callback('IPP'){|ptr1, ptr2|
- str1 = ptr1.ptr.to_s
- str2 = ptr2.ptr.to_s
- str1 <=> str2
-}
-
-p LIBC.atoi("10")
-
-p LIBC.isdigit(?1)
-
-p LIBC.isdigit(?a)
-
-p LIBC.strcat("a", "b")
-
-ary = ["a","c","b"]
-ptr = ary.to_ptr
-LIBC.qsort(ptr, ary.length, DL.sizeof('P'), LIBC::COMPARE)
-p ptr.to_a('S', ary.length)
-
-tv = LIBC::Timeval.malloc
-tz = LIBC::Timezone.malloc
-LIBC.gettimeofday(tv, tz)
-
-p Time.at(tv.tv_sec)
diff --git a/ext/dl/sample/msgbox.rb b/ext/dl/sample/msgbox.rb
deleted file mode 100644
index 091e646091..0000000000
--- a/ext/dl/sample/msgbox.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# This script works on Windows.
-
-require 'dl'
-
-User32 = DL.dlopen("user32")
-Kernel32 = DL.dlopen("kernel32")
-
-MB_OK = 0
-MB_OKCANCEL = 1
-
-message_box = User32['MessageBoxA', 'ILSSI']
-r,rs = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
-
-case r
-when 1
- print("OK!\n")
-when 2
- print("Cancel!\n")
-end
diff --git a/ext/dl/sample/msgbox2.rb b/ext/dl/sample/msgbox2.rb
deleted file mode 100644
index e49846cc5e..0000000000
--- a/ext/dl/sample/msgbox2.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# This script works on Windows.
-
-require 'dl/win32'
-
-MB_OK = 0
-MB_OKCANCEL = 1
-
-message_box = Win32API.new("user32",'MessageBoxA', 'ISSI', 'I')
-r = message_box.call(0, 'ok?', 'error', MB_OKCANCEL)
-
-case r
-when 1
- print("OK!\n")
-when 2
- print("Cancel!\n")
-else
- p r
-end
diff --git a/ext/dl/sample/stream.rb b/ext/dl/sample/stream.rb
deleted file mode 100644
index 179836999d..0000000000
--- a/ext/dl/sample/stream.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- ruby -*-
-# Display a file name and stream names of a file with those size.
-
-require 'dl'
-require 'dl/import'
-
-module NTFS
- extend DL::Importable
-
- dlload "kernel32.dll"
-
- OPEN_EXISTING = 3
- GENERIC_READ = 0x80000000
- BACKUP_DATA = 0x00000001
- BACKUP_ALTERNATE_DATA = 0x00000004
- FILE_SHARE_READ = 0x00000001
- FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
-
- typealias "LPSECURITY_ATTRIBUTES", "void*"
-
- extern "BOOL BackupRead(HANDLE, PBYTE, DWORD, PDWORD, BOOL, BOOL, PVOID)"
- extern "BOOL BackupSeek(HANDLE, DWORD, DWORD, PDWORD, PDWORD, PVOID)"
- extern "BOOL CloseHandle(HANDLE)"
- extern "HANDLE CreateFile(LPCSTR, DWORD, DWORD, LPSECURITY_ATTRIBUTES,
- DWORD, DWORD, HANDLE)"
-
- module_function
-
- def streams(filename)
- status = []
- h = createFile(filename,GENERIC_READ,FILE_SHARE_READ,nil,
- OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,0)
- if( h != 0 )
- begin
- # allocate the memory for backup data used in backupRead().
- data = DL.malloc(DL.sizeof("L5"))
- data.struct!("LLLLL", :id, :attrs, :size_low, :size_high, :name_size)
-
- # allocate memories for references to long values used in backupRead().
- context = DL.malloc(DL.sizeof("L"))
- lval = DL.malloc(DL.sizeof("L"))
-
- while( backupRead(h, data, data.size, lval, false, false, context) )
- size = data[:size_low] + (data[:size_high] << (DL.sizeof("I") * 8))
- case data[:id]
- when BACKUP_ALTERNATE_DATA
- stream_name = DL.malloc(data[:name_size])
- backupRead(h, stream_name, stream_name.size,
- lval, false, false, context)
- name = stream_name[0, stream_name.size]
- name.tr!("\000","")
- if( name =~ /^:(.*?):.*$/ )
- status.push([$1,size])
- end
- when BACKUP_DATA
- status.push([nil,size])
- else
- raise(RuntimeError, "unknown data type #{data[:id]}.")
- end
- l1 = DL.malloc(DL.sizeof("L"))
- l2 = DL.malloc(DL.sizeof("L"))
- if( !backupSeek(h, data[:size_low], data[:size_high], l1, l2, context) )
- break
- end
- end
- ensure
- backupRead(h, nil, 0, lval, true, false, context)
- closeHandle(h)
- end
- return status
- else
- raise(RuntimeError, "can't open #{filename}.\n")
- end
- end
-end
-
-ARGV.each{|filename|
- if( File.exist?(filename) )
- NTFS.streams(filename).each{|name,size|
- if( name )
- print("#{filename}:#{name}\t#{size}bytes\n")
- else
- print("#{filename}\t#{size}bytes\n")
- end
- }
- end
-}
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
deleted file mode 100644
index 01e0474f58..0000000000
--- a/ext/dl/sym.c
+++ /dev/null
@@ -1,992 +0,0 @@
-/* -*- C -*-
- * $Id$
- */
-
-#include <ruby.h>
-#include <errno.h>
-#include "dl.h"
-
-VALUE rb_cDLSymbol;
-
-static const char *
-char2type(int ch)
-{
- switch (ch) {
- case '0':
- return "void";
- case 'P':
- return "void *";
- case 'p':
- return "void *";
- case 'C':
- return "char";
- case 'c':
- return "char *";
- case 'H':
- return "short";
- case 'h':
- return "short *";
- case 'I':
- return "int";
- case 'i':
- return "int *";
- case 'L':
- return "long";
- case 'l':
- return "long *";
- case 'F':
- return "double";
- case 'f':
- return "double *";
- case 'D':
- return "double";
- case 'd':
- return "double *";
- case 'S':
- return "const char *";
- case 's':
- return "char *";
- case 'A':
- return "[]";
- case 'a':
- return "[]"; /* ?? */
- }
- return NULL;
-}
-
-void
-dlsym_free(struct sym_data *data)
-{
- if( data->name ){
- DEBUG_CODE({
- printf("dlsym_free(): free(data->name:%s)\n",data->name);
- });
- free(data->name);
- }
- if( data->type ){
- DEBUG_CODE({
- printf("dlsym_free(): free(data->type:%s)\n",data->type);
- });
- free(data->type);
- }
-}
-
-VALUE
-rb_dlsym_new(void (*func)(), const char *name, const char *type)
-{
- VALUE val;
- struct sym_data *data;
- const char *ptype;
-
- rb_secure(4);
- if( !type || !type[0] ){
- return rb_dlptr_new((void*)func, 0, 0);
- }
-
- for( ptype = type; *ptype; ptype ++ ){
- if( ! char2type(*ptype) ){
- rb_raise(rb_eDLTypeError, "unknown type specifier '%c'", *ptype);
- }
- }
-
- if( func ){
- val = Data_Make_Struct(rb_cDLSymbol, struct sym_data, 0, dlsym_free, data);
- data->func = func;
- data->name = name ? strdup(name) : NULL;
- data->type = type ? strdup(type) : NULL;
- data->len = type ? strlen(type) : 0;
-#if !(defined(DLSTACK))
- if( data->len - 1 > MAX_ARG ){
- rb_raise(rb_eDLError, "maximum number of arguments is %d.", MAX_ARG);
- }
-#endif
- }
- else{
- val = Qnil;
- }
-
- return val;
-}
-
-freefunc_t
-rb_dlsym2csym(VALUE val)
-{
- struct sym_data *data;
- freefunc_t func;
-
- if( rb_obj_is_kind_of(val, rb_cDLSymbol) ){
- Data_Get_Struct(val, struct sym_data, data);
- func = data->func;
- }
- else if( val == Qnil ){
- func = NULL;
- }
- else{
- rb_raise(rb_eTypeError, "DL::Symbol was expected");
- }
-
- return func;
-}
-
-VALUE
-rb_dlsym_s_allocate(VALUE klass)
-{
- VALUE obj;
- struct sym_data *data;
-
- obj = Data_Make_Struct(klass, struct sym_data, 0, dlsym_free, data);
- data->func = 0;
- data->name = 0;
- data->type = 0;
- data->len = 0;
-
- return obj;
-}
-
-VALUE
-rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
-{
- VALUE addr, name, type;
- struct sym_data *data;
- void *saddr;
- const char *sname, *stype;
-
- rb_scan_args(argc, argv, "12", &addr, &name, &type);
-
- saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
- if (!NIL_P(name)) StringValue(name);
- stype = NIL_P(type) ? NULL : StringValuePtr(type);
- sname = NIL_P(name) ? NULL : RSTRING(name)->ptr;
-
- if( saddr ){
- Data_Get_Struct(self, struct sym_data, data);
- if( data->name ) free(data->name);
- if( data->type ) free(data->type);
- data->func = saddr;
- data->name = sname ? strdup(sname) : 0;
- data->type = stype ? strdup(stype) : 0;
- data->len = stype ? strlen(stype) : 0;
- }
-
- return Qnil;
-}
-
-VALUE
-rb_s_dlsym_char2type(VALUE self, VALUE ch)
-{
- const char *type;
-
- type = char2type(StringValuePtr(ch)[0]);
-
- if (type == NULL)
- return Qnil;
- else
- return rb_str_new2(type);
-}
-
-VALUE
-rb_dlsym_name(VALUE self)
-{
- struct sym_data *sym;
-
- Data_Get_Struct(self, struct sym_data, sym);
- return sym->name ? rb_tainted_str_new2(sym->name) : Qnil;
-}
-
-VALUE
-rb_dlsym_proto(VALUE self)
-{
- struct sym_data *sym;
-
- Data_Get_Struct(self, struct sym_data, sym);
- return sym->type ? rb_tainted_str_new2(sym->type) : Qnil;
-}
-
-VALUE
-rb_dlsym_cproto(VALUE self)
-{
- struct sym_data *sym;
- const char *ptype, *typestr;
- size_t len;
- VALUE val;
-
- Data_Get_Struct(self, struct sym_data, sym);
-
- ptype = sym->type;
-
- if( ptype ){
- typestr = char2type(*ptype++);
- len = strlen(typestr);
-
- val = rb_tainted_str_new(typestr, len);
- if (typestr[len - 1] != '*')
- rb_str_cat(val, " ", 1);
-
- if( sym->name ){
- rb_str_cat2(val, sym->name);
- }
- else{
- rb_str_cat2(val, "(null)");
- }
- rb_str_cat(val, "(", 1);
-
- while (*ptype) {
- const char *ty = char2type(*ptype++);
- rb_str_cat2(val, ty);
- if (*ptype)
- rb_str_cat(val, ", ", 2);
- }
-
- rb_str_cat(val, ");", 2);
- }
- else{
- val = rb_tainted_str_new2("void (");
- if( sym->name ){
- rb_str_cat2(val, sym->name);
- }
- else{
- rb_str_cat2(val, "(null)");
- }
- rb_str_cat2(val, ")()");
- }
-
- return val;
-}
-
-VALUE
-rb_dlsym_inspect(VALUE self)
-{
- VALUE proto;
- VALUE val;
- char *str;
- int str_size;
- struct sym_data *sym;
-
- Data_Get_Struct(self, struct sym_data, sym);
- proto = rb_dlsym_cproto(self);
-
- str_size = RSTRING(proto)->len + 100;
- str = dlmalloc(str_size);
- snprintf(str, str_size - 1,
- "#<DL::Symbol:0x%lx func=0x%lx '%s'>",
- sym, sym->func, RSTRING(proto)->ptr);
- val = rb_tainted_str_new2(str);
- dlfree(str);
-
- return val;
-}
-
-static int
-stack_size(struct sym_data *sym)
-{
- int i;
- int size;
-
- size = 0;
- for( i=1; i < sym->len; i++ ){
- switch(sym->type[i]){
- case 'C':
- case 'H':
- case 'I':
- case 'L':
- size += sizeof(long);
- break;
- case 'F':
- size += sizeof(float);
- break;
- case 'D':
- size += sizeof(double);
- break;
- case 'c':
- case 'h':
- case 'i':
- case 'l':
- case 'f':
- case 'd':
- case 'p':
- case 'P':
- case 's':
- case 'S':
- case 'a':
- case 'A':
- size += sizeof(void*);
- break;
- default:
- return -(sym->type[i]);
- }
- }
- return size;
-}
-
-static ID rb_dl_id_DLErrno;
-
-static VALUE
-rb_dl_get_last_error(VALUE self)
-{
- return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLErrno);
-}
-
-static VALUE
-rb_dl_set_last_error(VALUE self, VALUE val)
-{
- errno = NUM2INT(val);
- rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, val);
- return Qnil;
-}
-
-#ifdef HAVE_WINDOWS_H
-#include <windows.h>
-static ID rb_dl_id_DLW32Error;
-
-static VALUE
-rb_dl_win32_get_last_error(VALUE self)
-{
- return rb_thread_local_aref(rb_thread_current(), rb_dl_id_DLW32Error);
-}
-
-static VALUE
-rb_dl_win32_set_last_error(VALUE self, VALUE val)
-{
- SetLastError(NUM2INT(val));
- rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, val);
- return Qnil;
-}
-#endif
-
-#ifdef DLSTACK_GUARD
-# ifdef __MSVC_RUNTIME_CHECKS
-# pragma runtime_checks("s", off)
-# endif
-# if _MSC_VER >= 1300
-__declspec(noinline)
-# endif
-static int
-rb_dlsym_guardcall(char type, ANY_TYPE *ret, long *stack, void *func)
-{
- char *volatile guard = ALLOCA_N(char, 1); /* guard stack pointer */
- switch(type){
- case '0':
- {
- void (*f)(DLSTACK_PROTO) = func;
- f(DLSTACK_ARGS);
- }
- break;
- case 'P':
- case 'p':
- {
- void * (*f)(DLSTACK_PROTO) = func;
- ret->p = f(DLSTACK_ARGS);
- }
- break;
- case 'C':
- case 'c':
- {
- char (*f)(DLSTACK_PROTO) = func;
- ret->c = f(DLSTACK_ARGS);
- }
- break;
- case 'H':
- case 'h':
- {
- short (*f)(DLSTACK_PROTO) = func;
- ret->h = f(DLSTACK_ARGS);
- }
- break;
- case 'I':
- case 'i':
- {
- int (*f)(DLSTACK_PROTO) = func;
- ret->i = f(DLSTACK_ARGS);
- }
- break;
- case 'L':
- case 'l':
- {
- long (*f)(DLSTACK_PROTO) = func;
- ret->l = f(DLSTACK_ARGS);
- }
- break;
- case 'F':
- case 'f':
- {
- float (*f)(DLSTACK_PROTO) = func;
- ret->f = f(DLSTACK_ARGS);
- }
- break;
- case 'D':
- case 'd':
- {
- double (*f)(DLSTACK_PROTO) = func;
- ret->d = f(DLSTACK_ARGS);
- }
- break;
- case 'S':
- case 's':
- {
- char * (*f)(DLSTACK_PROTO) = func;
- ret->s = f(DLSTACK_ARGS);
- }
- break;
- default:
- return 0;
- }
- return 1;
-}
-# ifdef __MSVC_RUNTIME_CHECKS
-# pragma runtime_checks("s", restore)
-# endif
-#endif /* defined(DLSTACK_GUARD) */
-
-VALUE
-rb_dlsym_call(int argc, VALUE argv[], VALUE self)
-{
- struct sym_data *sym;
- ANY_TYPE *args;
- ANY_TYPE *dargs;
- ANY_TYPE ret;
- int *dtypes;
- VALUE val;
- VALUE dvals;
- int i;
- long ftype;
- void *func;
-
- rb_secure_update(self);
- Data_Get_Struct(self, struct sym_data, sym);
- DEBUG_CODE({
- printf("rb_dlsym_call(): type = '%s', func = 0x%x\n", sym->type, sym->func);
- });
- if( (sym->len - 1) != argc ){
- rb_raise(rb_eArgError, "%d arguments are needed", sym->len - 1);
- }
-
- ftype = 0;
- dvals = Qnil;
-
- args = ALLOC_N(ANY_TYPE, sym->len - 1);
- dargs = ALLOC_N(ANY_TYPE, sym->len - 1);
- dtypes = ALLOC_N(int, sym->len - 1);
-#define FREE_ARGS {xfree(args); xfree(dargs); xfree(dtypes);}
-
- for( i = sym->len - 2; i >= 0; i-- ){
- dtypes[i] = 0;
-
- switch( sym->type[i+1] ){
- case 'p':
- dtypes[i] = 'p';
- case 'P':
- {
- struct ptr_data *data;
- VALUE pval;
-
- if( argv[i] == Qnil ){
- ANY2P(args[i]) = DLVOIDP(0);
- }
- else{
- if( rb_obj_is_kind_of(argv[i], rb_cDLPtrData) ){
- pval = argv[i];
- }
- else{
- pval = rb_funcall(argv[i], rb_intern("to_ptr"), 0);
- if( !rb_obj_is_kind_of(pval, rb_cDLPtrData) ){
- rb_raise(rb_eDLTypeError, "unexpected type of argument #%d", i);
- }
- }
- Data_Get_Struct(pval, struct ptr_data, data);
- ANY2P(args[i]) = DLVOIDP(data->ptr);
- }
- }
- PUSH_P(ftype);
- break;
- case 'a':
- dtypes[i] = 'a';
- case 'A':
- if( argv[i] == Qnil ){
- ANY2P(args[i]) = DLVOIDP(0);
- }
- else{
- ANY2P(args[i]) = DLVOIDP(rb_ary2cary(0, argv[i], NULL));
- }
- PUSH_P(ftype);
- break;
- case 'C':
- ANY2C(args[i]) = DLCHAR(NUM2CHR(argv[i]));
- PUSH_C(ftype);
- break;
- case 'c':
- ANY2C(dargs[i]) = DLCHAR(NUM2CHR(argv[i]));
- ANY2P(args[i]) = DLVOIDP(&(ANY2C(dargs[i])));
- dtypes[i] = 'c';
- PUSH_P(ftype);
- break;
- case 'H':
- ANY2H(args[i]) = DLSHORT(NUM2INT(argv[i]));
- PUSH_C(ftype);
- break;
- case 'h':
- ANY2H(dargs[i]) = DLSHORT(NUM2INT(argv[i]));
- ANY2P(args[i]) = DLVOIDP(&(ANY2H(dargs[i])));
- dtypes[i] = 'h';
- PUSH_P(ftype);
- break;
- case 'I':
- ANY2I(args[i]) = DLINT(NUM2INT(argv[i]));
- PUSH_I(ftype);
- break;
- case 'i':
- ANY2I(dargs[i]) = DLINT(NUM2INT(argv[i]));
- ANY2P(args[i]) = DLVOIDP(&(ANY2I(dargs[i])));
- dtypes[i] = 'i';
- PUSH_P(ftype);
- break;
- case 'L':
- ANY2L(args[i]) = DLNUM2LONG(argv[i]);
- PUSH_L(ftype);
- break;
- case 'l':
- ANY2L(dargs[i]) = DLNUM2LONG(argv[i]);
- ANY2P(args[i]) = DLVOIDP(&(ANY2L(dargs[i])));
- dtypes[i] = 'l';
- PUSH_P(ftype);
- break;
- case 'F':
- Check_Type(argv[i], T_FLOAT);
- ANY2F(args[i]) = DLFLOAT(RFLOAT(argv[i])->value);
- PUSH_F(ftype);
- break;
- case 'f':
- Check_Type(argv[i], T_FLOAT);
- ANY2F(dargs[i]) = DLFLOAT(RFLOAT(argv[i])->value);
- ANY2P(args[i]) = DLVOIDP(&(ANY2F(dargs[i])));
- dtypes[i] = 'f';
- PUSH_P(ftype);
- break;
- case 'D':
- Check_Type(argv[i], T_FLOAT);
- ANY2D(args[i]) = RFLOAT(argv[i])->value;
- PUSH_D(ftype);
- break;
- case 'd':
- Check_Type(argv[i], T_FLOAT);
- ANY2D(dargs[i]) = RFLOAT(argv[i])->value;
- ANY2P(args[i]) = DLVOIDP(&(ANY2D(dargs[i])));
- dtypes[i] = 'd';
- PUSH_P(ftype);
- break;
- case 'S':
- if( argv[i] == Qnil ){
- ANY2S(args[i]) = DLSTR(0);
- }
- else{
- VALUE str = argv[i];
- SafeStringValue(str);
- ANY2S(args[i]) = DLSTR(RSTRING(str)->ptr);
- }
- PUSH_P(ftype);
- break;
- case 's':
- {
- VALUE str = argv[i];
- SafeStringValue(str);
- ANY2S(args[i]) = DLSTR(dlmalloc(RSTRING(str)->len + 1));
- memcpy((char*)(ANY2S(args[i])), RSTRING(str)->ptr, RSTRING(str)->len + 1);
- dtypes[i] = 's';
- }
- PUSH_P(ftype);
- break;
- default:
- FREE_ARGS;
- rb_raise(rb_eDLTypeError,
- "unknown type '%c' of the return value.",
- sym->type[i+1]);
- }
- }
-
- switch( sym->type[0] ){
- case '0':
- PUSH_0(ftype);
- break;
- case 'P':
- case 'p':
- case 'S':
- case 's':
- case 'A':
- case 'a':
- PUSH_P(ftype);
- break;
- case 'C':
- case 'c':
- PUSH_C(ftype);
- break;
- case 'H':
- case 'h':
- PUSH_H(ftype);
- break;
- case 'I':
- case 'i':
- PUSH_I(ftype);
- break;
- case 'L':
- case 'l':
- PUSH_L(ftype);
- break;
- case 'F':
- case 'f':
- PUSH_F(ftype);
- break;
- case 'D':
- case 'd':
- PUSH_D(ftype);
- break;
- default:
- FREE_ARGS;
- rb_raise(rb_eDLTypeError,
- "unknown type `%c' of the return value.",
- sym->type[0]);
- }
-
- func = sym->func;
-
-#if defined(DLSTACK)
- {
-#if defined(DLSTACK_SIZE)
- int stk_size;
- long stack[DLSTACK_SIZE];
- long *sp;
-
- sp = stack;
- stk_size = stack_size(sym);
- if( stk_size < 0 ){
- FREE_ARGS;
- rb_raise(rb_eDLTypeError, "unknown type '%c'.", -stk_size);
- }
- else if( stk_size > (int)(DLSTACK_SIZE) ){
- FREE_ARGS;
- rb_raise(rb_eArgError, "too many arguments.");
- }
-#endif
-
- DLSTACK_START(sym);
-
-#if defined(DLSTACK_REVERSE)
- for( i = sym->len - 2; i >= 0; i-- )
-#else
- for( i = 0; i <= sym->len -2; i++ )
-#endif
- {
- switch( sym->type[i+1] ){
- case 'p':
- case 'P':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'a':
- case 'A':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'C':
- DLSTACK_PUSH_C(ANY2C(args[i]));
- break;
- case 'c':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'H':
- DLSTACK_PUSH_H(ANY2H(args[i]));
- break;
- case 'h':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'I':
- DLSTACK_PUSH_I(ANY2I(args[i]));
- break;
- case 'i':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'L':
- DLSTACK_PUSH_L(ANY2L(args[i]));
- break;
- case 'l':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'F':
- DLSTACK_PUSH_F(ANY2F(args[i]));
- break;
- case 'f':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'D':
- DLSTACK_PUSH_D(ANY2D(args[i]));
- break;
- case 'd':
- DLSTACK_PUSH_P(ANY2P(args[i]));
- break;
- case 'S':
- case 's':
- DLSTACK_PUSH_P(ANY2S(args[i]));
- break;
- }
- }
- DLSTACK_END(sym->type);
-
-#ifdef DLSTACK_GUARD
- if(!rb_dlsym_guardcall(sym->type[0], &ret, stack, func)) {
- FREE_ARGS;
- rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
- }
-#else /* defined(DLSTACK_GUARD) */
- {
- switch( sym->type[0] ){
- case '0':
- {
- void (*f)(DLSTACK_PROTO) = func;
- f(DLSTACK_ARGS);
- }
- break;
- case 'P':
- case 'p':
- {
- void * (*f)(DLSTACK_PROTO) = func;
- ret.p = f(DLSTACK_ARGS);
- }
- break;
- case 'C':
- case 'c':
- {
- char (*f)(DLSTACK_PROTO) = func;
- ret.c = f(DLSTACK_ARGS);
- }
- break;
- case 'H':
- case 'h':
- {
- short (*f)(DLSTACK_PROTO) = func;
- ret.h = f(DLSTACK_ARGS);
- }
- break;
- case 'I':
- case 'i':
- {
- int (*f)(DLSTACK_PROTO) = func;
- ret.i = f(DLSTACK_ARGS);
- }
- break;
- case 'L':
- case 'l':
- {
- long (*f)(DLSTACK_PROTO) = func;
- ret.l = f(DLSTACK_ARGS);
- }
- break;
- case 'F':
- case 'f':
- {
- float (*f)(DLSTACK_PROTO) = func;
- ret.f = f(DLSTACK_ARGS);
- }
- break;
- case 'D':
- case 'd':
- {
- double (*f)(DLSTACK_PROTO) = func;
- ret.d = f(DLSTACK_ARGS);
- }
- break;
- case 'S':
- case 's':
- {
- char * (*f)(DLSTACK_PROTO) = func;
- ret.s = f(DLSTACK_ARGS);
- }
- break;
- default:
- FREE_ARGS;
- rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
- }
- }
-#endif /* defubed(DLSTACK_GUARD) */
-
- {
- /*
- * We should get the value of errno/GetLastError() before calling another functions.
- */
- int last_errno = errno;
-#ifdef _WIN32
- DWORD win32_last_err = GetLastError();
-#endif
-
- rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLErrno, INT2NUM(last_errno));
-#ifdef _WIN32
- rb_thread_local_aset(rb_thread_current(), rb_dl_id_DLW32Error, INT2NUM(win32_last_err));
-#endif
- }
-
- }
-#else /* defined(DLSTACK) */
- switch(ftype){
-#include "call.func"
- default:
- FREE_ARGS;
- rb_raise(rb_eDLTypeError, "unsupported function type `%s'", sym->type);
- }
-#endif /* defined(DLSTACK) */
-
- switch( sym->type[0] ){
- case '0':
- val = Qnil;
- break;
- case 'P':
- val = rb_dlptr_new((void*)(ANY2P(ret)), 0, 0);
- break;
- case 'p':
- val = rb_dlptr_new((void*)(ANY2P(ret)), 0, dlfree);
- break;
- case 'C':
- case 'c':
- val = CHR2FIX((char)(ANY2C(ret)));
- break;
- case 'H':
- case 'h':
- val = INT2NUM((short)(ANY2H(ret)));
- break;
- case 'I':
- case 'i':
- val = INT2NUM((int)(ANY2I(ret)));
- break;
- case 'L':
- case 'l':
- val = DLLONG2NUM((long)(ANY2L(ret)));
- break;
- case 'F':
- case 'f':
- val = rb_float_new((double)(ANY2F(ret)));
- break;
- case 'D':
- case 'd':
- val = rb_float_new((double)(ANY2D(ret)));
- break;
- case 'S':
- if( ANY2S(ret) ){
- val = rb_tainted_str_new2((char*)(ANY2S(ret)));
- }
- else{
- val = Qnil;
- }
- break;
- case 's':
- if( ANY2S(ret) ){
- val = rb_tainted_str_new2((char*)(ANY2S(ret)));
- DEBUG_CODE({
- printf("dlfree(%s)\n",(char*)(ANY2S(ret)));
- });
- dlfree((void*)(ANY2S(ret)));
- }
- else{
- val = Qnil;
- }
- break;
- default:
- FREE_ARGS;
- rb_raise(rb_eDLTypeError, "unknown type `%c'", sym->type[0]);
- }
-
- dvals = rb_ary_new();
- for( i = 0; i <= sym->len - 2; i++ ){
- if( dtypes[i] ){
- switch( dtypes[i] ){
- case 'c':
- rb_ary_push(dvals, CHR2FIX(*((char*)(ANY2P(args[i])))));
- break;
- case 'h':
- rb_ary_push(dvals, INT2NUM(*((short*)(ANY2P(args[i])))));
- break;
- case 'i':
- rb_ary_push(dvals, INT2NUM(*((int*)(ANY2P(args[i])))));
- break;
- case 'l':
- rb_ary_push(dvals, DLLONG2NUM(*((long*)(ANY2P(args[i])))));
- break;
- case 'f':
- rb_ary_push(dvals, rb_float_new(*((float*)(ANY2P(args[i])))));
- break;
- case 'd':
- rb_ary_push(dvals, rb_float_new(*((double*)(ANY2P(args[i])))));
- break;
- case 'p':
- rb_ary_push(dvals, rb_dlptr_new((void*)(ANY2P(args[i])), 0, 0));
- break;
- case 'a':
- rb_ary_push(dvals, rb_dlptr_new((void*)ANY2P(args[i]), 0, 0));
- break;
- case 's':
- rb_ary_push(dvals, rb_tainted_str_new2((char*)ANY2S(args[i])));
- DEBUG_CODE({
- printf("dlfree(%s)\n",(char*)ANY2S(args[i]));
- });
- dlfree((void*)ANY2S(args[i]));
- break;
- default:
- {
- char c = dtypes[i];
- FREE_ARGS;
- rb_raise(rb_eRuntimeError, "unknown argument type '%c'", i, c);
- }
- }
- }
- else{
- switch( sym->type[i+1] ){
- case 'A':
- dlfree((void*)ANY2P(args[i]));
- break;
- }
- rb_ary_push(dvals, argv[i]);
- }
- }
-
- FREE_ARGS;
-#undef FREE_ARGS
- return rb_assoc_new(val,dvals);
-}
-
-VALUE
-rb_dlsym_to_i(VALUE self)
-{
- struct sym_data *sym;
-
- Data_Get_Struct(self, struct sym_data, sym);
- return DLLONG2NUM(sym);
-}
-
-VALUE
-rb_dlsym_to_ptr(VALUE self)
-{
- struct sym_data *sym;
-
- Data_Get_Struct(self, struct sym_data, sym);
- return rb_dlptr_new(sym->func, sizeof(freefunc_t), 0);
-}
-
-void
-Init_dlsym()
-{
- rb_cDLSymbol = rb_define_class_under(rb_mDL, "Symbol", rb_cObject);
- rb_define_alloc_func(rb_cDLSymbol, rb_dlsym_s_allocate);
- rb_define_singleton_method(rb_cDLSymbol, "char2type", rb_s_dlsym_char2type, 1);
- rb_define_method(rb_cDLSymbol, "initialize", rb_dlsym_initialize, -1);
- rb_define_method(rb_cDLSymbol, "call", rb_dlsym_call, -1);
- rb_define_method(rb_cDLSymbol, "[]", rb_dlsym_call, -1);
- rb_define_method(rb_cDLSymbol, "name", rb_dlsym_name, 0);
- rb_define_method(rb_cDLSymbol, "proto", rb_dlsym_proto, 0);
- rb_define_method(rb_cDLSymbol, "cproto", rb_dlsym_cproto, 0);
- rb_define_method(rb_cDLSymbol, "inspect", rb_dlsym_inspect, 0);
- rb_define_method(rb_cDLSymbol, "to_s", rb_dlsym_cproto, 0);
- rb_define_method(rb_cDLSymbol, "to_ptr", rb_dlsym_to_ptr, 0);
- rb_define_method(rb_cDLSymbol, "to_i", rb_dlsym_to_i, 0);
-
- rb_dl_id_DLErrno = rb_intern("DLErrno");
- rb_define_singleton_method(rb_mDL, "last_error", rb_dl_get_last_error, 0);
- rb_define_singleton_method(rb_mDL, "last_error=", rb_dl_set_last_error, 1);
-#ifdef _WIN32
- rb_dl_id_DLW32Error = rb_intern("DLW32Error");
- rb_define_singleton_method(rb_mDL, "win32_last_error", rb_dl_win32_get_last_error, 0);
- rb_define_singleton_method(rb_mDL, "win32_last_error=", rb_dl_win32_set_last_error, 1);
-#endif
-}
diff --git a/ext/dl/test/libtest.def b/ext/dl/test/libtest.def
deleted file mode 100644
index 8ecefc917b..0000000000
--- a/ext/dl/test/libtest.def
+++ /dev/null
@@ -1,28 +0,0 @@
-EXPORTS
-test_alloc_test_struct
-test_append
-test_arylen
-test_c2i
-test_call_func1
-test_callback1
-test_close
-test_d2f
-test_f2d
-test_fill_test_struct
-test_fill_test_union
-test_gets
-test_i2c
-test_init
-test_isucc
-test_lcc
-test_lsucc
-test_open
-test_strcat
-test_strlen
-test_succ
-test_data_init
-test_data_add
-test_data_aref
-test_set_long_value
-test_get_long_value
-internal_long_value
diff --git a/ext/dl/test/test.c b/ext/dl/test/test.c
deleted file mode 100644
index 7321379390..0000000000
--- a/ext/dl/test/test.c
+++ /dev/null
@@ -1,247 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-static char internal_string[] = "internal_string";
-long internal_long_value = 100;
-
-struct test_struct {
- char c;
- long l;
-};
-
-union test_union {
- char c;
- int i;
- long l;
- void *p;
-};
-
-struct test_data {
- char name[1024];
- struct test_data *next;
-};
-
-long
-test_get_long_value()
-{
- return internal_long_value;
-};
-
-void
-test_set_long_value(long l)
-{
- internal_long_value = l;
-};
-
-void
-test_fill_test_struct(struct test_struct *ptr, char c, long l)
-{
- ptr->c = c;
- ptr->l = l;
-};
-
-void
-test_fill_test_union(union test_union *ptr, long l)
-{
- ptr->l = l;
-};
-
-struct test_struct *
-test_alloc_test_struct(char c, long l)
-{
- struct test_struct *data;
-
- data = (struct test_struct *)malloc(sizeof(struct test_struct));
- data->c = c;
- data->l = l;
-
- return data;
-};
-
-int
-test_c2i(char c)
-{
- return (int)c;
-};
-
-char
-test_i2c(int i)
-{
- return (char)i;
-};
-
-long
-test_lcc(char c1, char c2)
-{
- return (long)(c1 + c2);
-};
-
-double
-test_f2d(float f)
-{
- double d;
- d = f;
- return d;
-};
-
-float
-test_d2f(double d)
-{
- float f;
- f = d;
- return f;
-};
-
-int
-test_strlen(const char *str)
-{
- return strlen(str);
-};
-
-int
-test_isucc(int i)
-{
- return (i+1);
-};
-
-long
-test_lsucc(long l)
-{
- return (l+1);
-};
-
-void
-test_succ(long *l)
-{
- (*l)++;
-};
-
-char *
-test_strcat(char *str1, const char *str2)
-{
- return strcat(str1, str2);
-};
-
-int
-test_arylen(char *ary[])
-{
- int i;
- for( i=0; ary[i]; i++ ){};
- return i;
-};
-
-void
-test_append(char *ary[], int len, char *astr)
-{
- int i;
- int size1,size2;
- char *str;
-
- size2 = strlen(astr);
-
- for( i=0; i <= len - 1; i++ ){
- size1 = strlen(ary[i]);
- str = (char*)malloc(size1 + size2 + 1);
- strcpy(str, ary[i]);
- strcat(str, astr);
- ary[i] = str;
- };
-};
-
-int
-test_init(int *argc, char **argv[])
-{
- int i;
- char s[256];
-
- for( i=0; i < (*argc); i++ ){
- sprintf(s, "arg%d", i);
- if( strcmp((*argv)[i], s) != 0 ){
- return 1;
- }
- }
- return 0;
-}
-
-FILE *
-test_open(const char *filename, const char *mode)
-{
- FILE *file;
- file = fopen(filename,mode);
- return file;
-};
-
-void
-test_close(FILE *file)
-{
- fclose(file);
-};
-
-char *
-test_gets(char *s, int size, FILE *f)
-{
- return fgets(s,size,f);
-};
-
-typedef int callback1_t(int, char *);
-#define CALLBACK_MSG "callback message"
-
-int
-test_callback1(int err, const char *msg)
-{
- if( strcmp(msg, CALLBACK_MSG) == 0 ){
- return 1;
- }
- else{
- return 0;
- }
-}
-
-int
-test_call_func1(callback1_t *func)
-{
- if( func ){
- return (*func)(0, CALLBACK_MSG);
- }
- else{
- return 0;
- }
-}
-
-struct test_data *
-test_data_init()
-{
- struct test_data *data;
-
- data = (struct test_data *)malloc(sizeof(struct test_data));
- data->next = NULL;
- memset(data->name, 0, 1024);
-
- return data;
-};
-
-void
-test_data_add(struct test_data *list, const char *name)
-{
- struct test_data *data;
-
- data = (struct test_data *)malloc(sizeof(struct test_data));
- memset(data->name, 0, 1024);
- strncpy(data->name, name, 1024);
- data->next = list->next;
- list->next = data;
-};
-
-struct test_data *
-test_data_aref(struct test_data *list, int i)
-{
- struct test_data *data;
- int j;
-
- for( data = list->next, j=0; data; data = data->next, j++ ){
- if( i == j ){
- return data;
- };
- };
- return NULL;
-};
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
deleted file mode 100644
index bf8dfc18e3..0000000000
--- a/ext/dl/test/test.rb
+++ /dev/null
@@ -1,306 +0,0 @@
-# -*- ruby -*-
-
-require 'dl'
-require 'dl/import'
-
-$FAIL = 0
-$TOTAL = 0
-
-def assert(label, ty, *conds)
- $TOTAL += 1
- cond = !conds.include?(false)
- if( cond )
- printf("succeed in `#{label}'\n")
- else
- $FAIL += 1
- case ty
- when :may
- printf("fail in `#{label}' ... expected\n")
- when :must
- printf("fail in `#{label}' ... unexpected\n")
- when :raise
- raise(RuntimeError, "fail in `#{label}'")
- end
- end
-end
-
-def debug(*xs)
- if( $DEBUG )
- xs.each{|x|
- p x
- }
- end
-end
-
-print("DLSTACK = #{DL::DLSTACK}\n")
-print("MAX_ARG = #{DL::MAX_ARG}\n")
-print("\n")
-print("DL::FREE = #{DL::FREE.inspect}\n")
-print("\n")
-
-$LIB = nil
-if( !$LIB && File.exist?("libtest.so") )
- $LIB = "./libtest.so"
-end
-if( !$LIB && File.exist?("test/libtest.so") )
- $LIB = "./test/libtest.so"
-end
-
-module LIBTest
- extend DL::Importable
-
- dlload($LIB)
- extern "int test_c2i(char)"
- extern "char test_i2c(int)"
- extern "long test_lcc(char, char)"
- extern "double test_f2d(float)"
- extern "float test_d2f(double)"
- extern "int test_strlen(char*)"
- extern "int test_isucc(int)"
- extern "long test_lsucc(long)"
- extern "void test_succ(long *)"
- extern "int test_arylen(int [])"
- extern "void test_append(char*[], int, char *)"
-end
-
-DL.dlopen($LIB){|h|
- c2i = h["test_c2i","IC"]
- debug c2i
- r,rs = c2i[?a]
- debug r,rs
- assert("c2i", :may, r == ?a)
- assert("extern c2i", :must, r == LIBTest.test_c2i(?a))
-
- i2c = h["test_i2c","CI"]
- debug i2c
- r,rs = i2c[?a]
- debug r,rs
- assert("i2c", :may, r == ?a)
- assert("exern i2c", :must, r == LIBTest.test_i2c(?a))
-
- lcc = h["test_lcc","LCC"]
- debug lcc
- r,rs = lcc[1,2]
- assert("lcc", :may, r == 3)
- assert("extern lcc", :must, r == LIBTest.test_lcc(1,2))
-
- f2d = h["test_f2d","DF"]
- debug f2d
- r,rs = f2d[20.001]
- debug r,rs
- assert("f2d", :may, r.to_i == 20)
- assert("extern f2d", :must, r = LIBTest.test_f2d(20.001))
-
- d2f = h["test_d2f","FD"]
- debug d2f
- r,rs = d2f[20.001]
- debug r,rs
- assert("d2f", :may, r.to_i == 20)
- assert("extern d2f", :must, r == LIBTest.test_d2f(20.001))
-
- strlen = h["test_strlen","IS"]
- debug strlen
- r,rs = strlen["0123456789"]
- debug r,rs
- assert("strlen", :must, r == 10)
- assert("extern strlen", :must, r == LIBTest.test_strlen("0123456789"))
-
- isucc = h["test_isucc","II"]
- debug isucc
- r,rs = isucc[2]
- debug r,rs
- assert("isucc", :must, r == 3)
- assert("extern isucc", :must, r == LIBTest.test_isucc(2))
-
- lsucc = h["test_lsucc","LL"]
- debug lsucc
- r,rs = lsucc[10000000]
- debug r,rs
- assert("lsucc", :must, r == 10000001)
- assert("extern lsucc", :must, r == LIBTest.test_lsucc(10000000))
-
- succ = h["test_succ","0l"]
- debug succ
- r,rs = succ[0]
- debug r,rs
- assert("succ", :must, rs[0] == 1)
- l = DL.malloc(DL.sizeof("L"))
- l.struct!("L",:lval)
- LIBTest.test_succ(l)
- assert("extern succ", :must, rs[0] == l[:lval])
-
- arylen = h["test_arylen","IA"]
- debug arylen
- r,rs = arylen[["a","b","c","d",nil]]
- debug r,rs
- assert("arylen", :must, r == 4)
-
- arylen = h["test_arylen","IP"]
- debug arylen
- r,rs = arylen[["a","b","c","d",nil]]
- debug r,rs
- assert("arylen", :must, r == 4)
- assert("extern arylen", :must, r == LIBTest.test_arylen(["a","b","c","d",nil]))
-
- append = h["test_append","0aIS"]
- debug append
- r,rs = append[["a","b","c"],3,"x"]
- debug r,rs
- assert("append", :must, rs[0].to_a('S',3) == ["ax","bx","cx"])
-
- LIBTest.test_append(["a","b","c"],3,"x")
- assert("extern append", :must, rs[0].to_a('S',3) == LIBTest._args_[0].to_a('S',3))
-
- strcat = h["test_strcat","SsS"]
- debug strcat
- r,rs = strcat["abc\0","x"]
- debug r,rs
- assert("strcat", :must, rs[0].to_s == "abcx")
-
- init = h["test_init","IiP"]
- debug init
- argc = 3
- argv = ["arg0","arg1","arg2"].to_ptr
- r,rs = init[argc, argv.ref]
- assert("init", :must, r == 0)
-}
-
-
-h = DL.dlopen($LIB)
-
-sym_open = h["test_open", "PSS"]
-sym_gets = h["test_gets", "SsIP"]
-sym_close = h["test_close", "0P"]
-debug sym_open,sym_gets,sym_close
-
-line = "Hello world!\n"
-File.open("tmp.txt", "w"){|f|
- f.print(line)
-}
-
-fp,rs = sym_open["tmp.txt", "r"]
-if( fp )
- fp.free = sym_close
- r,rs = sym_gets[" " * 256, 256, fp]
- debug r,rs
- assert("open,gets", :must, rs[0] == line)
- ObjectSpace.define_finalizer(fp) {File.unlink("tmp.txt")}
- fp = nil
-else
- assert("open,gets", :must, line == nil)
- File.unlink("tmp.txt")
-end
-
-
-callback1 = h["test_callback1"]
-debug callback1
-r,rs = h["test_call_func1", "IP"][callback1]
-debug r,rs
-assert("callback1", :must, r == 1)
-
-
-callback2 = DL.callback("LLP"){|num,ptr|
- msg = ptr.to_s
- if( msg == "callback message" )
- 2
- else
- 0
- end
-}
-debug callback2
-r,rs = h["test_call_func1", "IP"][callback2]
-debug r,rs
-assert("callback2", :must, r == 2)
-DL.remove_callback(callback2)
-
-ptr = DL.malloc(DL.sizeof('CL'))
-ptr.struct!("CL", :c, :l)
-ptr["c"] = 0
-ptr["l"] = 0
-r,rs = h["test_fill_test_struct","0PIL"][ptr,100,1000]
-debug r,rs
-assert("fill_test_struct", :must, ptr["c"] == 100, ptr["l"] == 1000)
-assert("fill_test_struct", :must, ptr[:c] == 100, ptr[:l] == 1000) unless (Fixnum === :-)
-
-
-r,rs = h["test_alloc_test_struct", "PIL"][100,200]
-r.free = DL::FREE
-r.struct!("CL", :c, :l)
-assert("alloc_test_struct", :must, r["c"] == 100, r["l"] == 200)
-assert("alloc_test_struct", :must, r[:c] == 100, r[:l] == 200) unless (Fixnum === :-)
-
-ptr = h["test_strlen"]
-sym1 = DL::Symbol.new(ptr,"foo","0")
-sym2 = h["test_strlen","LS"]
-assert("Symbol.new", :must, ptr == sym1.to_ptr, sym1.to_ptr == sym2.to_ptr)
-
-set_val = h["test_set_long_value","0"]
-get_val = h["test_get_long_value","L"]
-lval = get_val[][0]
-ptr = h["internal_long_value"]
-ptr.struct!("L", :l)
-assert("get value", :must, ptr["l"] == lval)
-assert("get value", :must, ptr[:l] == lval) unless (Fixnum === :-)
-ptr["l"] = 200
-lval = get_val[][0]
-assert("set value", :must, ptr["l"] == lval)
-assert("set value", :must, ptr[:l] == lval) unless (Fixnum === :-)
-
-
-data_init = h["test_data_init", "P"]
-data_add = h["test_data_add", "0PS"]
-data_aref = h["test_data_aref", "PPI"]
-r,rs = data_init[]
-ptr = r
-data_add[ptr, "name1"]
-data_add[ptr, "name2"]
-data_add[ptr, "name3"]
-
-r,rs = data_aref[ptr, 1]
-ptr = r
-ptr.struct!("C1024P", :name, :next)
-assert("data_aref", :must,
- ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2")
-assert("data_aref", :must,
- ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name2") unless (Fixnum === :-)
-
-ptr = ptr["next"]
-ptr.struct!("C1024P", :name, :next)
-assert("data_aref", :must,
- ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1")
-assert("data_aref", :must,
- ptr["name"].collect{|c| c.chr}.join.split("\0")[0] == "name1") unless (Fixnum === :-)
-
-GC.start
-
-ptr = DL::malloc(32)
-ptr.struct!("CHIL", "c", "h", "i", "l")
-ptr["c"] = 1
-ptr["h"] = 2
-ptr["i"] = 3
-ptr["l"] = 4
-assert("struct!", :must,
- ptr["c"] == 1 &&
- ptr["h"] == 2 &&
- ptr["i"] == 3 &&
- ptr["l"] == 4)
-
-ptr = DL::malloc(DL::sizeof("IP"))
-ptr.struct!("IP", "n", "ptr")
-ptr["n"] = 10
-ptr["ptr"] = nil
-assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
-
-ptr = DL::malloc(16)
-ptr.struct!("CICI", "c1", "i1", "c2", "i2")
-ptr["c1"] = 0xf1
-ptr["c2"] = 0xf2
-c1 = [ptr["c1"]].pack("c").unpack("C")[0]
-c2 = [ptr["c2"]].pack("c").unpack("C")[0]
-assert("struct!", :must,
- c1 == 0xf1 &&
- c2 == 0xf2)
-
-
-GC.start
-printf("fail/total = #{$FAIL}/#{$TOTAL}\n")
diff --git a/ext/dl/type.rb b/ext/dl/type.rb
deleted file mode 100644
index 804420c395..0000000000
--- a/ext/dl/type.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-# example:
-# DLTYPE[INT][:rb2c]["arg0"] => "NUM2INT(arg0)"
-# DLTYPE[DOUBLE][:c2rb]["r"] => "rb_float_new(r)"
-
-DLTYPE = {
- VOID = 0x00 => {
- :name => 'VOID',
- :rb2c => nil,
- :c2rb => nil,
- :ctype => "void",
- :stmem => "v",
- :sym => true,
- :cb => true,
- },
- CHAR = 0x01 => {
- :name => 'CHAR',
- :rb2c => proc{|x| "NUM2CHR(#{x})"},
- :c2rb => proc{|x| "CHR2FIX(#{x})"},
- :ctype => "char",
- :stmem => "c",
- :sym => false,
- :cb => false,
- },
- SHORT = 0x02 => {
- :name => 'SHORT',
- :rb2c => proc{|x| "FIX2INT(#{x})"},
- :c2rb => proc{|x| "INT2FIX(#{x})"},
- :ctype => "short",
- :stmem => "h",
- :sym => false,
- :cb => false,
- },
- INT = 0x03 => {
- :name => 'INT',
- :rb2c => proc{|x| "NUM2INT(#{x})"},
- :c2rb => proc{|x| "INT2NUM(#{x})"},
- :ctype => "int",
- :stmem => "i",
- :sym => true,
- :cb => false,
- },
- LONG = 0x04 => {
- :name => 'LONG',
- :rb2c => proc{|x| "NUM2INT(#{x})"},
- :c2rb => proc{|x| "INT2NUM(#{x})"},
- :ctype => "long",
- :stmem => "l",
- :sym => true,
- :cb => true,
- },
- FLOAT = 0x05 => {
- :name => 'FLOAT',
- :rb2c => proc{|x| "(float)(RFLOAT(#{x})->value)"},
- :c2rb => proc{|x| "rb_float_new((double)#{x})"},
- :ctype => "float",
- :stmem => "f",
- :sym => false,
- :cb => false,
- },
- DOUBLE = 0x06 => {
- :name => 'DOUBLE',
- :rb2c => proc{|x| "RFLOAT(#{x})->value"},
- :c2rb => proc{|x| "rb_float_new(#{x})"},
- :ctype => "double",
- :stmem => "d",
- :sym => true,
- :cb => true,
- },
- VOIDP = 0x07 => {
- :name => 'VOIDP',
- :rb2c => proc{|x| "rb_dlptr2cptr(#{x})"},
- :c2rb => proc{|x| "rb_dlptr_new(#{x},sizeof(void*),0)"},
- :ctype => "void *",
- :stmem => "p",
- :sym => true,
- :cb => true,
- },
-}
-
-def tpush(t, x)
- (t << 3)|x
-end
-
-def tget(t, i)
- (t & (0x07 << (i * 3))) >> (i * 3)
-end
-
-def types2num(types)
- res = 0x00
- r = types.reverse
- r.each{|t|
- res = tpush(res,t)
- }
- res
-end
-
-def num2types(num)
- ts = []
- i = 0
- t = tget(num,i)
- while( (t != VOID && i > 0) || (i == 0) )
- ts.push(DLTYPE[t][:ctype])
- i += 1
- t = tget(num,i)
- end
- ts
-end
-
-def types2ctypes(types)
- res = []
- types.each{|t|
- res.push(DLTYPE[t][:ctype])
- }
- res
-end
diff --git a/ext/enumerator/enumerator.c b/ext/enumerator/enumerator.c
deleted file mode 100644
index 1c6e1d1ace..0000000000
--- a/ext/enumerator/enumerator.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/************************************************
-
- enumerator.c - provides Enumerator class
-
- $Author$
-
- Copyright (C) 2001-2003 Akinori MUSHA
-
- $Idaemons: /home/cvs/rb/enumerator/enumerator.c,v 1.1.1.1 2001/07/15 10:12:48 knu Exp $
- $RoughId: enumerator.c,v 1.6 2003/07/27 11:03:24 nobu Exp $
- $Id$
-
-************************************************/
-
-#include "ruby.h"
-#include "node.h"
-
-/*
- * Document-class: Enumerable::Enumerator
- *
- * A class which provides a method `each' to be used as an Enumerable
- * object.
- */
-static VALUE rb_cEnumerator;
-static ID sym_each, sym_each_with_index, sym_each_slice, sym_each_cons;
-static ID id_new, id_enum_obj, id_enum_method, id_enum_args;
-
-/*
- * call-seq:
- * obj.to_enum(method = :each, *args)
- * obj.enum_for(method = :each, *args)
- *
- * Returns Enumerable::Enumerator.new(self, method, *args).
- *
- * e.g.:
- * str = "xyz"
- *
- * enum = str.enum_for(:each_byte)
- * a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
- *
- * # protects an array from being modified
- * a = [1, 2, 3]
- * some_method(a.to_enum)
- *
- */
-static VALUE
-obj_to_enum(obj, enum_args)
- VALUE obj, enum_args;
-{
- rb_ary_unshift(enum_args, obj);
-
- return rb_apply(rb_cEnumerator, id_new, enum_args);
-}
-
-/*
- * call-seq:
- * enum_with_index
- *
- * Returns Enumerable::Enumerator.new(self, :each_with_index).
- *
- */
-static VALUE
-enumerator_enum_with_index(obj)
- VALUE obj;
-{
- return rb_funcall(rb_cEnumerator, id_new, 2, obj, sym_each_with_index);
-}
-
-static VALUE
-each_slice_i(val, memo)
- VALUE val;
- NODE *memo;
-{
- VALUE ary = memo->u1.value;
- long size = memo->u3.cnt;
-
- rb_ary_push(ary, val);
-
- if (RARRAY(ary)->len == size) {
- rb_yield(ary);
- memo->u1.value = rb_ary_new2(size);
- }
-
- return Qnil;
-}
-
-/*
- * call-seq:
- * e.each_slice(n) {...}
- *
- * Iterates the given block for each slice of <n> elements.
- *
- * e.g.:
- * (1..10).each_slice(3) {|a| p a}
- * # outputs below
- * [1, 2, 3]
- * [4, 5, 6]
- * [7, 8, 9]
- * [10]
- *
- */
-static VALUE
-enum_each_slice(obj, n)
- VALUE obj, n;
-{
- long size = NUM2LONG(n);
- NODE *memo;
- VALUE ary;
-
- if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
-
- memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
-
- rb_iterate(rb_each, obj, each_slice_i, (VALUE)memo);
-
- ary = memo->u1.value;
- if (RARRAY(ary)->len > 0) rb_yield(ary);
-
- return Qnil;
-}
-
-/*
- * call-seq:
- * e.enum_slice(n)
- *
- * Returns Enumerable::Enumerator.new(self, :each_slice, n).
- *
- */
-static VALUE
-enumerator_enum_slice(obj, n)
- VALUE obj, n;
-{
- return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_slice, n);
-}
-
-static VALUE
-each_cons_i(val, memo)
- VALUE val;
- NODE *memo;
-{
- VALUE ary = memo->u1.value;
- long size = memo->u3.cnt;
-
- if (RARRAY(ary)->len == size) {
- rb_ary_shift(ary);
- }
- rb_ary_push(ary, val);
- if (RARRAY(ary)->len == size) {
- rb_yield(rb_ary_dup(ary));
- }
- return Qnil;
-}
-
-/*
- * call-seq:
- * each_cons(n) {...}
- *
- * Iterates the given block for each array of consecutive <n>
- * elements.
- *
- * e.g.:
- * (1..10).each_cons(3) {|a| p a}
- * # outputs below
- * [1, 2, 3]
- * [2, 3, 4]
- * [3, 4, 5]
- * [4, 5, 6]
- * [5, 6, 7]
- * [6, 7, 8]
- * [7, 8, 9]
- * [8, 9, 10]
- *
- */
-static VALUE
-enum_each_cons(obj, n)
- VALUE obj, n;
-{
- long size = NUM2LONG(n);
- NODE *memo;
-
- if (size <= 0) rb_raise(rb_eArgError, "invalid size");
- memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size);
-
- rb_iterate(rb_each, obj, each_cons_i, (VALUE)memo);
-
- return Qnil;
-}
-
-/*
- * call-seq:
- * e.enum_cons(n)
- *
- * Returns Enumerable::Enumerator.new(self, :each_cons, n).
- *
- */
-static VALUE
-enumerator_enum_cons(obj, n)
- VALUE obj, n;
-{
- return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_cons, n);
-}
-
-/*
- * call-seq:
- * Enumerable::Enumerator.new(obj, method = :each, *args)
- *
- * Creates a new Enumerable::Enumerator object, which is to be
- * used as an Enumerable object using the given object's given
- * method with the given arguments.
- *
- * e.g.:
- * str = "xyz"
- *
- * enum = Enumerable::Enumerator.new(str, :each_byte)
- * a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
- *
- */
-static VALUE
-enumerator_initialize(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
-{
- VALUE enum_obj, enum_method, enum_args;
-
- rb_scan_args(argc, argv, "11*", &enum_obj, &enum_method, &enum_args);
-
- if (enum_method == Qnil)
- enum_method = sym_each;
-
- rb_ivar_set(obj, id_enum_obj, enum_obj);
- rb_ivar_set(obj, id_enum_method, enum_method);
- rb_ivar_set(obj, id_enum_args, enum_args);
-
- return Qnil;
-}
-
-static VALUE
-enumerator_iter(memo)
- NODE *memo;
-{
- return rb_apply(memo->u1.value, memo->u2.id, memo->u3.value);
-}
-
-/*
- * call-seq:
- * enum.each {...}
- *
- * Iterates the given block using the object and the method specified
- * in the first place.
- *
- */
-static VALUE
-enumerator_each(obj)
- VALUE obj;
-{
- VALUE val;
-
- obj = (VALUE)rb_node_newnode(NODE_MEMO,
- rb_ivar_get(obj, id_enum_obj),
- rb_to_id(rb_ivar_get(obj, id_enum_method)),
- rb_ivar_get(obj, id_enum_args));
- val = rb_iterate((VALUE (*)_((VALUE)))enumerator_iter, obj, rb_yield, 0);
- return val;
-}
-
-void
-Init_enumerator()
-{
- VALUE rb_mEnumerable;
-
- rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -2);
- rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -2);
-
- rb_mEnumerable = rb_path2class("Enumerable");
-
- rb_define_method(rb_mEnumerable, "enum_with_index", enumerator_enum_with_index, 0);
- rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
- rb_define_method(rb_mEnumerable, "enum_slice", enumerator_enum_slice, 1);
- rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
- rb_define_method(rb_mEnumerable, "enum_cons", enumerator_enum_cons, 1);
-
- rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
- rb_include_module(rb_cEnumerator, rb_mEnumerable);
-
- rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
- rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
-
- sym_each = ID2SYM(rb_intern("each"));
- sym_each_with_index = ID2SYM(rb_intern("each_with_index"));
- sym_each_slice = ID2SYM(rb_intern("each_slice"));
- sym_each_cons = ID2SYM(rb_intern("each_cons"));
-
- id_new = rb_intern("new");
- id_enum_obj = rb_intern("enum_obj");
- id_enum_method = rb_intern("enum_method");
- id_enum_args = rb_intern("enum_args");
-}
diff --git a/ext/enumerator/enumerator.txt b/ext/enumerator/enumerator.txt
deleted file mode 100644
index 64c7d50226..0000000000
--- a/ext/enumerator/enumerator.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" enumerator.txt - -*- Indented-Text -*-
-$Idaemons: /home/cvs/rb/enumerator/enumerator.txt,v 1.2 2001/07/15 10:19:24 knu Exp $
-$RoughId: enumerator.txt,v 1.5 2003/02/20 12:24:51 knu Exp $
-$Id$
-
-** Enumerable::Enumerator(Class)
-
-A class which provides a method `each' to be used as an Enumerable
-object.
-
-Superclass: Object
-
-Mix-ins: Enumerable
-
-require 'enumerator'
-
-Class Methods:
-
- new(obj, method = :each, *args)
-
- Creates a new Enumerable::Enumerator object, which is to be
- used as an Enumerable object using the given object's given
- method with the given arguments.
-
- e.g.:
- str = "xyz"
-
- enum = Enumerable::Enumerator.new(str, :each_byte)
- a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
-
-Methods:
-
- each {...}
-
- Iterates the given block using the object and the method
- specified in the first place.
-
-
-Requiring this module also adds some methods to the Object class:
-
- to_enum(method = :each, *args)
- enum_for(method = :each, *args)
-
- Returns Enumerable::Enumerator.new(self, method, *args).
-
- e.g.:
- str = "xyz"
-
- enum = str.enum_for(:each_byte)
- a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
-
- # protects an array from being modified
- a = [1, 2, 3]
- some_method(a.to_enum)
-
-And the Enumerable module.
-
- each_slice(n) {...}
-
- Iterates the given block for each slice of <n> elements.
-
- e.g.:
- (1..10).each_slice(3) {|a| p a}
- # outputs below
- [1, 2, 3]
- [4, 5, 6]
- [7, 8, 9]
- [10]
-
- enum_slice(n)
-
- Returns Enumerable::Enumerator.new(self, :each_slice, n).
-
- each_cons(n) {...}
-
- Iterates the given block for each array of consecutive <n>
- elements.
-
- e.g.:
- (1..10).each_cons(3) {|a| p a}
- # outputs below
- [1, 2, 3]
- [2, 3, 4]
- [3, 4, 5]
- [4, 5, 6]
- [5, 6, 7]
- [6, 7, 8]
- [7, 8, 9]
- [8, 9, 10]
-
- enum_cons(n)
-
- Returns Enumerable::Enumerator.new(self, :each_cons, n).
-
- enum_with_index
-
- Returns Enumerable::Enumerator.new(self, :each_with_index).
-
--------------------------------------------------------
-Local variables:
-fill-column: 70
-end:
diff --git a/ext/enumerator/extconf.rb b/ext/enumerator/extconf.rb
deleted file mode 100644
index 94e2ee38b2..0000000000
--- a/ext/enumerator/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('enumerator')
diff --git a/ext/etc/.cvsignore b/ext/etc/.cvsignore
index 4088712231..f3c7a7c5da 100644
--- a/ext/etc/.cvsignore
+++ b/ext/etc/.cvsignore
@@ -1,3 +1 @@
Makefile
-mkmf.log
-*.def
diff --git a/ext/etc/MANIFEST b/ext/etc/MANIFEST
new file mode 100644
index 0000000000..79fb1ff34c
--- /dev/null
+++ b/ext/etc/MANIFEST
@@ -0,0 +1,6 @@
+MANIFEST
+etc.c
+etc.txt
+etc.txt.jp
+depend
+extconf.rb
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 486963378b..ee0cd529e4 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -23,30 +23,18 @@
#include <grp.h>
#endif
-#ifndef HAVE_TYPE_UID_T
-#define uid_t int
-#endif
-
static VALUE sPasswd, sGroup;
-#ifndef _WIN32
-char *getenv();
-#endif
-char *getlogin();
-
-/* Returns the short user name of the currently logged in user.
- *
- * e.g.
- * Etc.getlogin -> 'guest'
- */
static VALUE
etc_getlogin(obj)
VALUE obj;
{
+ char *getenv();
char *login;
- rb_secure(4);
#ifdef HAVE_GETLOGIN
+ char *getlogin();
+
login = getlogin();
if (!login) login = getenv("USER");
#else
@@ -58,16 +46,6 @@ etc_getlogin(obj)
return Qnil;
}
-#if defined(HAVE_GETPWENT) || defined(HAVE_GETGRENT)
-static VALUE
-safe_setup_str(str)
- const char *str;
-{
- if (str == 0) str = "";
- return rb_tainted_str_new2(str);
-}
-#endif
-
#ifdef HAVE_GETPWENT
static VALUE
setup_passwd(pwd)
@@ -75,63 +53,51 @@ setup_passwd(pwd)
{
if (pwd == 0) rb_sys_fail("/etc/passwd");
return rb_struct_new(sPasswd,
- safe_setup_str(pwd->pw_name),
-#ifdef HAVE_ST_PW_PASSWD
- safe_setup_str(pwd->pw_passwd),
+ rb_tainted_str_new2(pwd->pw_name),
+ rb_tainted_str_new2(pwd->pw_passwd),
+ INT2FIX(pwd->pw_uid),
+ INT2FIX(pwd->pw_gid),
+#ifdef PW_GECOS
+ rb_tainted_str_new2(pwd->pw_gecos),
#endif
- PW_UID2VAL(pwd->pw_uid),
- PW_GID2VAL(pwd->pw_gid),
-#ifdef HAVE_ST_PW_GECOS
- safe_setup_str(pwd->pw_gecos),
+ rb_tainted_str_new2(pwd->pw_dir),
+ rb_tainted_str_new2(pwd->pw_shell),
+#ifdef PW_CHANGE
+ INT2FIX(pwd->pw_change),
#endif
- safe_setup_str(pwd->pw_dir),
- safe_setup_str(pwd->pw_shell),
-#ifdef HAVE_ST_PW_CHANGE
- INT2NUM(pwd->pw_change),
+#ifdef PW_QUOTA
+ INT2FIX(pwd->pw_quota),
#endif
-#ifdef HAVE_ST_PW_QUOTA
- INT2NUM(pwd->pw_quota),
+#ifdef PW_AGE
+ INT2FIX(pwd->pw_age),
#endif
-#ifdef HAVE_ST_PW_AGE
- PW_AGE2VAL(pwd->pw_age),
+#ifdef PW_CLASS
+ rb_tainted_str_new2(pwd->pw_class),
#endif
-#ifdef HAVE_ST_PW_CLASS
- safe_setup_str(pwd->pw_class),
+#ifdef PW_COMMENT
+ rb_tainted_str_new2(pwd->pw_comment),
#endif
-#ifdef HAVE_ST_PW_COMMENT
- safe_setup_str(pwd->pw_comment),
-#endif
-#ifdef HAVE_ST_PW_EXPIRE
- INT2NUM(pwd->pw_expire),
+#ifdef PW_EXPIRE
+ INT2FIX(pwd->pw_expire),
#endif
0 /*dummy*/
);
}
#endif
-/* Returns the /etc/passwd information for the user with specified integer
- * user id (uid).
- *
- * The information is returned as a Struct::Passwd; see getpwent above for
- * details.
- *
- * 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(argc, argv, obj)
int argc;
VALUE *argv;
VALUE obj;
{
-#if defined(HAVE_GETPWENT)
+#ifdef HAVE_GETPWENT
VALUE id;
- uid_t uid;
+ int uid;
struct passwd *pwd;
- rb_secure(4);
if (rb_scan_args(argc, argv, "01", &id) == 1) {
- uid = PW_VAL2UID(id);
+ uid = NUM2INT(id);
}
else {
uid = getuid();
@@ -144,14 +110,6 @@ etc_getpwuid(argc, argv, obj)
#endif
}
-/* 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.
- *
- * 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(obj, nam)
VALUE obj, nam;
@@ -159,7 +117,7 @@ etc_getpwnam(obj, nam)
#ifdef HAVE_GETPWENT
struct passwd *pwd;
- SafeStringValue(nam);
+ Check_Type(nam, T_STRING);
pwd = getpwnam(RSTRING(nam)->ptr);
if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %s", RSTRING(nam)->ptr);
return setup_passwd(pwd);
@@ -168,44 +126,6 @@ etc_getpwnam(obj, nam)
#endif
}
-#ifdef HAVE_GETPWENT
-static int passwd_blocking = 0;
-static VALUE
-passwd_ensure()
-{
- passwd_blocking = Qfalse;
- return Qnil;
-}
-
-static VALUE
-passwd_iterate()
-{
- struct passwd *pw;
-
- setpwent();
- while (pw = getpwent()) {
- rb_yield(setup_passwd(pw));
- }
- endpwent();
- return Qnil;
-}
-#endif
-
-/* Provides a convenient Ruby iterator which executes a block for each entry
- * in the /etc/passwd file.
- *
- * The code block is passed an Etc::Passwd struct; see getpwent above for
- * details.
- *
- * Example:
- *
- * require 'etc'
- *
- * Etc.passwd {|u|
- * puts u.name + " = " + u.gecos
- * }
- *
- */
static VALUE
etc_passwd(obj)
VALUE obj;
@@ -213,13 +133,13 @@ etc_passwd(obj)
#ifdef HAVE_GETPWENT
struct passwd *pw;
- rb_secure(4);
if (rb_block_given_p()) {
- if (passwd_blocking) {
- rb_raise(rb_eRuntimeError, "parallel passwd iteration");
+ setpwent();
+ while (pw = getpwent()) {
+ rb_yield(setup_passwd(pw));
}
- passwd_blocking = Qtrue;
- rb_ensure(passwd_iterate, 0, passwd_ensure, 0);
+ endpwent();
+ return obj;
}
if (pw = getpwent()) {
return setup_passwd(pw);
@@ -228,72 +148,6 @@ etc_passwd(obj)
return Qnil;
}
-/* Resets the process of reading the /etc/passwd file, so that the next call
- * to getpwent will return the first entry again.
- */
-static VALUE
-etc_setpwent(obj)
- VALUE obj;
-{
-#ifdef HAVE_GETPWENT
- setpwent();
-#endif
- return Qnil;
-}
-
-/* Ends the process of scanning through the /etc/passwd file begun with
- * getpwent, and closes the file.
- */
-static VALUE
-etc_endpwent(obj)
- VALUE obj;
-{
-#ifdef HAVE_GETPWENT
- endpwent();
-#endif
- return Qnil;
-}
-
-/* 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:
- *
- * - Passwd#name contains the short login name of the user as a String.
- *
- * - 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.
- *
- * - 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(obj)
- VALUE obj;
-{
-#ifdef HAVE_GETPWENT
- struct passwd *pw;
-
- if (pw = getpwent()) {
- return setup_passwd(pw);
- }
-#endif
- return Qnil;
-}
-
#ifdef HAVE_GETGRENT
static VALUE
setup_group(grp)
@@ -305,39 +159,26 @@ setup_group(grp)
mem = rb_ary_new();
tbl = grp->gr_mem;
while (*tbl) {
- rb_ary_push(mem, safe_setup_str(*tbl));
+ rb_ary_push(mem, rb_tainted_str_new2(*tbl));
tbl++;
}
return rb_struct_new(sGroup,
- safe_setup_str(grp->gr_name),
-#ifdef HAVE_ST_GR_PASSWD
- safe_setup_str(grp->gr_passwd),
-#endif
- PW_GID2VAL(grp->gr_gid),
+ rb_tainted_str_new2(grp->gr_name),
+ rb_tainted_str_new2(grp->gr_passwd),
+ INT2FIX(grp->gr_gid),
mem);
}
#endif
-/* Returns information about the group with specified integer group id (gid),
- * as found in /etc/group.
- *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
- *
- * e.g. Etc.getgrgid(100) -> #<struct Struct::Group name="users", passwd="x",
- * gid=100, mem=["meta", "root"]>
- *
- */
static VALUE
etc_getgrgid(obj, id)
VALUE obj, id;
{
#ifdef HAVE_GETGRENT
- gid_t gid;
+ int gid;
struct group *grp;
- rb_secure(4);
- gid = PW_VAL2GID(id);
+ gid = NUM2INT(id);
grp = getgrgid(gid);
if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
return setup_group(grp);
@@ -346,16 +187,6 @@ etc_getgrgid(obj, id)
#endif
}
-/* Returns information about the group with specified String name, as found
- * in /etc/group.
- *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
- *
- * e.g. Etc.getgrnam('users') -> #<struct Struct::Group name="users",
- * passwd="x", gid=100, mem=["meta", "root"]>
- *
- */
static VALUE
etc_getgrnam(obj, nam)
VALUE obj, nam;
@@ -363,8 +194,7 @@ etc_getgrnam(obj, nam)
#ifdef HAVE_GETGRENT
struct group *grp;
- rb_secure(4);
- SafeStringValue(nam);
+ Check_Type(nam, T_STRING);
grp = getgrnam(RSTRING(nam)->ptr);
if (grp == 0) rb_raise(rb_eArgError, "can't find group for %s", RSTRING(nam)->ptr);
return setup_group(grp);
@@ -373,44 +203,6 @@ etc_getgrnam(obj, nam)
#endif
}
-#ifdef HAVE_GETGRENT
-static int group_blocking = 0;
-static VALUE
-group_ensure()
-{
- group_blocking = Qfalse;
- return Qnil;
-}
-
-static VALUE
-group_iterate()
-{
- struct group *pw;
-
- setgrent();
- while (pw = getgrent()) {
- rb_yield(setup_group(pw));
- }
- endgrent();
- return Qnil;
-}
-#endif
-
-/* Provides a convenient Ruby iterator which executes a block for each entry
- * in the /etc/group file.
- *
- * The code block is passed an Etc::Group struct; see getgrent above for
- * details.
- *
- * Example:
- *
- * require 'etc'
- *
- * Etc.group {|g|
- * puts g.name + ": " + g.mem.join(', ')
- * }
- *
- */
static VALUE
etc_group(obj)
VALUE obj;
@@ -418,13 +210,13 @@ etc_group(obj)
#ifdef HAVE_GETGRENT
struct group *grp;
- rb_secure(4);
if (rb_block_given_p()) {
- if (group_blocking) {
- rb_raise(rb_eRuntimeError, "parallel group iteration");
+ setgrent();
+ while (grp = getgrent()) {
+ rb_yield(setup_group(grp));
}
- group_blocking = Qtrue;
- rb_ensure(group_iterate, 0, group_ensure, 0);
+ endgrent();
+ return obj;
}
if (grp = getgrent()) {
return setup_group(grp);
@@ -433,73 +225,8 @@ etc_group(obj)
return Qnil;
}
-/* Resets the process of reading the /etc/group file, so that the next call
- * to getgrent will return the first entry again.
- */
-static VALUE
-etc_setgrent(obj)
- VALUE obj;
-{
-#ifdef HAVE_GETGRENT
- setgrent();
-#endif
- return Qnil;
-}
-
-/* Ends the process of scanning through the /etc/group file begun by
- * getgrent, and closes the file.
- */
-static VALUE
-etc_endgrent(obj)
- VALUE obj;
-{
-#ifdef HAVE_GETGRENT
- endgrent();
-#endif
- return Qnil;
-}
-
-/* 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:
- *
- * - Group#name contains the name of the group as a String.
- *
- * - 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.
- *
- * - 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(obj)
- VALUE obj;
-{
-#ifdef HAVE_GETGRENT
- struct group *gr;
-
- if (gr = getgrent()) {
- return setup_group(gr);
- }
-#endif
- return Qnil;
-}
-
static VALUE mEtc;
-/* The etc module provides access to information from the /etc/passwd and
- * /etc/group files on Linux and Unix systems.
- *
- * Documented by mathew <meta@pobox.com>.
- */
void
Init_etc()
{
@@ -509,51 +236,41 @@ Init_etc()
rb_define_module_function(mEtc, "getpwuid", etc_getpwuid, -1);
rb_define_module_function(mEtc, "getpwnam", etc_getpwnam, 1);
- rb_define_module_function(mEtc, "setpwent", etc_setpwent, 0);
- rb_define_module_function(mEtc, "endpwent", etc_endpwent, 0);
- rb_define_module_function(mEtc, "getpwent", etc_getpwent, 0);
rb_define_module_function(mEtc, "passwd", etc_passwd, 0);
rb_define_module_function(mEtc, "getgrgid", etc_getgrgid, 1);
rb_define_module_function(mEtc, "getgrnam", etc_getgrnam, 1);
rb_define_module_function(mEtc, "group", etc_group, 0);
- rb_define_module_function(mEtc, "setgrent", etc_setgrent, 0);
- rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
- rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
- rb_global_variable(&sPasswd);
sPasswd = rb_struct_define("Passwd",
"name", "passwd", "uid", "gid",
-#ifdef HAVE_ST_PW_GECOS
+#ifdef PW_GECOS
"gecos",
#endif
"dir", "shell",
-#ifdef HAVE_ST_PW_CHANGE
+#ifdef PW_CHANGE
"change",
#endif
-#ifdef HAVE_ST_PW_QUOTA
+#ifdef PW_QUOTA
"quota",
#endif
-#ifdef HAVE_ST_PW_AGE
+#ifdef PW_AGE
"age",
#endif
-#ifdef HAVE_ST_PW_CLASS
- "uclass",
+#ifdef PW_CLASS
+ "class",
#endif
-#ifdef HAVE_ST_PW_COMMENT
+#ifdef PW_COMMENT
"comment",
#endif
-#ifdef HAVE_ST_PW_EXPIRE
+#ifdef PW_EXPIRE
"expire",
#endif
- NULL);
+ 0);
+ rb_global_variable(&sPasswd);
#ifdef HAVE_GETGRENT
+ sGroup = rb_struct_define("Group", "name", "passwd", "gid", "mem", 0);
rb_global_variable(&sGroup);
- sGroup = rb_struct_define("Group", "name",
-#ifdef HAVE_ST_GR_PASSWD
- "passwd",
-#endif
- "gid", "mem", NULL);
#endif
}
diff --git a/ext/etc/etc.txt b/ext/etc/etc.txt
index 534790172c..9801dc0e02 100644
--- a/ext/etc/etc.txt
+++ b/ext/etc/etc.txt
@@ -1,4 +1,4 @@
-.\" etc.txt - -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
+.\" etc.doc - -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
** Etc(Module)
diff --git a/ext/etc/etc.txt.ja b/ext/etc/etc.txt.jp
index 2dddcfb036..8191f4886b 100644
--- a/ext/etc/etc.txt.ja
+++ b/ext/etc/etc.txt.jp
@@ -1,4 +1,4 @@
-.\" etc.txt.ja - -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
+.\" etc.doc - -*- Indented-Text -*- created at: Fri Jul 14 00:47:15 JST 1995
** Etc()
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index dbd0672545..6fe8810464 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -1,43 +1,31 @@
require 'mkmf'
+def etc_grep_header(field)
+ f = open("conftest.c", "w")
+ f.print <<EOF
+#include <pwd.h>
+EOF
+ f.close
+ begin
+ if xsystem("#{CPP} | egrep #{field}")
+ $defs.push(format("-D%s", field.upcase))
+ end
+ ensure
+ system "rm -f conftest.c"
+ end
+end
+
have_library("sun", "getpwnam") # NIS (== YP) interface for IRIX 4
a = have_func("getlogin")
b = have_func("getpwent")
c = have_func("getgrent")
if a or b or c
- have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
- have_struct_member('struct passwd', 'pw_change', 'pwd.h')
- have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
- if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
- case what_type?('struct passwd', 'pw_age', 'pwd.h')
- when "string"
- f = "safe_setup_str"
- when "long long"
- f = "LL2NUM"
- else
- f = "INT2NUM"
- end
- $defs.push("-DPW_AGE2VAL="+f)
- end
- have_struct_member('struct passwd', 'pw_class', 'pwd.h')
- have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
- have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
- have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
- have_struct_member('struct group', 'gr_passwd', 'grp.h')
- [%w"uid_t pwd.h", %w"gid_t grp.h"].each do |t, *h|
- h.unshift("sys/types.h")
- f = "INT2NUM"
- if have_type(t, h)
- if try_static_assert("sizeof(#{t}) > sizeof(long)", h)
- f = "LL2NUM"
- end
- if try_static_assert("(#{t})-1 > 0", h)
- f = "U#{f}"
- end
- end
- t = t.chomp('_t').upcase
- $defs.push("-DPW_#{t}2VAL=#{f}")
- $defs.push("-DPW_VAL2#{t}=#{f.sub(/([A-Z]+)2(NUM)/, '\22\1')}")
- end
+ etc_grep_header("pw_gecos")
+ etc_grep_header("pw_change")
+ etc_grep_header("pw_quota")
+ etc_grep_header("pw_age")
+ etc_grep_header("pw_class")
+ etc_grep_header("pw_comment") unless /cygwin/ === RUBY_PLATFORM
+ etc_grep_header("pw_expire")
create_makefile("etc")
end
diff --git a/ext/extmk.rb b/ext/extmk.rb
deleted file mode 100644
index cf7944679c..0000000000
--- a/ext/extmk.rb
+++ /dev/null
@@ -1,555 +0,0 @@
-#! /usr/local/bin/ruby
-# -*- ruby -*-
-
-$extension = nil
-$extstatic = nil
-$force_static = nil
-$install = nil
-$destdir = nil
-$dryrun = false
-$clean = nil
-$nodynamic = nil
-$extinit = nil
-$extobjs = nil
-$extflags = ""
-$extlibs = nil
-$extpath = nil
-$ignore = nil
-$message = nil
-
-$progname = $0
-alias $PROGRAM_NAME $0
-alias $0 $progname
-
-$extlist = []
-$compiled = {}
-
-$:.replace([Dir.pwd])
-require 'rbconfig'
-
-srcdir = File.dirname(File.dirname(__FILE__))
-
-$:.unshift(srcdir, File.expand_path("lib", srcdir))
-
-$topdir = "."
-$top_srcdir = srcdir
-
-require 'mkmf'
-require 'optparse/shellwords'
-
-def sysquote(x)
- @quote ||= /human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
- @quote ? x.quote : x
-end
-
-def relative_from(path, base)
- dir = File.join(path, "")
- if File.expand_path(dir) == File.expand_path(dir, base)
- path
- else
- File.join(base, path)
- end
-end
-
-def extract_makefile(makefile, keep = true)
- m = File.read(makefile)
- if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
- return keep
- end
- installrb = {}
- 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]
- target = "#{target_prefix}/#{target}"
- end
- unless oldrb == newrb
- if $extout
- newrb.each {|f| installrb.delete(f)}
- unless installrb.empty?
- config = CONFIG.dup
- install_dirs(target_prefix).each {|var, val| config[var] = val}
- FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, :verbose => true)
- end
- end
- return false
- end
- $target = target
- $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
- $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false
- /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil
- $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
- $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "")
- if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
- s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "")
- s.sub!(/ *#{Regexp.quote($LIBS)}$/, "")
- $libs = s
- end
- $objs = (m[/^OBJS[ \t]*=[ \t](.*)/, 1] || "").split
- $srcs = (m[/^SRCS[ \t]*=[ \t](.*)/, 1] || "").split
- $LOCAL_LIBS = m[/^LOCAL_LIBS[ \t]*=[ \t]*(.*)/, 1] || ""
- $LIBPATH = Shellwords.shellwords(m[/^libpath[ \t]*=[ \t]*(.*)/, 1] || "") - %w[$(libdir) $(topdir)]
- true
-end
-
-def extmake(target)
- print "#{$message} #{target}\n"
- $stdout.flush
- if $force_static or $static_ext[target]
- $static = target
- else
- $static = false
- end
-
- unless $ignore
- return true if $nodynamic and not $static
- end
-
- FileUtils.mkpath target unless File.directory?(target)
- begin
- dir = Dir.pwd
- FileUtils.mkpath target unless File.directory?(target)
- Dir.chdir target
- top_srcdir = $top_srcdir
- topdir = $topdir
- hdrdir = $hdrdir
- prefix = "../" * (target.count("/")+1)
- $top_srcdir = relative_from(top_srcdir, prefix)
- $hdrdir = relative_from(hdrdir, prefix)
- $topdir = prefix + $topdir
- $target = target
- $mdir = target
- $srcdir = File.join($top_srcdir, "ext", $mdir)
- $preload = nil
- $objs = ""
- $srcs = ""
- $compiled[target] = false
- makefile = "./Makefile"
- ok = File.exist?(makefile)
- unless $ignore
- rbconfig0 = Config::CONFIG
- mkconfig0 = CONFIG
- rbconfig = {
- "hdrdir" => $hdrdir,
- "srcdir" => $srcdir,
- "topdir" => $topdir,
- }
- mkconfig = {
- "top_srcdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1],
- "hdrdir" => "$(top_srcdir)",
- "srcdir" => "$(top_srcdir)/ext/#{$mdir}",
- "topdir" => $topdir,
- }
- rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
- mkconfig0.each_pair {|key, val| mkconfig[key] ||= val.dup}
- Config.module_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, rbconfig)
- remove_const(:MAKEFILE_CONFIG)
- const_set(:MAKEFILE_CONFIG, mkconfig)
- }
- Object.class_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, mkconfig)
- }
- begin
- $extconf_h = nil
- ok &&= extract_makefile(makefile)
- if (($extconf_h && !File.exist?($extconf_h)) ||
- !(t = modified?(makefile, MTIMES)) ||
- ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb", "#{$srcdir}/depend"].any? {|f| modified?(f, [t])})
- then
- ok = false
- init_mkmf
- Logging::logfile 'mkmf.log'
- rm_f makefile
- if File.exist?($0 = "#{$srcdir}/makefile.rb")
- load $0
- elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
- load $0
- else
- create_makefile(target)
- end
- $defs << "-DRUBY_EXPORT" if $static
- ok = File.exist?(makefile)
- end
- rescue SystemExit
- # ignore
- ensure
- rm_f "conftest*"
- config = $0
- $0 = $PROGRAM_NAME
- end
- end
- ok = yield(ok) if block_given?
- unless ok
- open(makefile, "w") do |f|
- f.print dummy_makefile(CONFIG["srcdir"])
- end
- return true
- end
- args = sysquote($mflags)
- unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
- args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
- end
- if $static
- args += ["static"] unless $clean
- $extlist.push [$static, $target, File.basename($target), $preload]
- end
- unless system($make, *args)
- $ignore or $continue or return false
- end
- $compiled[target] = true
- if $clean
- FileUtils.rm_f("mkmf.log")
- if $clean != true
- FileUtils.rm_f([makefile, $extconf_h || "extconf.h"])
- end
- File.unlink(makefile) rescue nil
- end
- if $static
- $extflags ||= ""
- $extlibs ||= []
- $extpath ||= []
- unless $mswin
- $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
- end
- $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
- $extpath |= $LIBPATH
- end
- ensure
- unless $ignore
- Config.module_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, rbconfig0)
- remove_const(:MAKEFILE_CONFIG)
- const_set(:MAKEFILE_CONFIG, mkconfig0)
- }
- Object.class_eval {
- remove_const(:CONFIG)
- const_set(:CONFIG, mkconfig0)
- }
- end
- $top_srcdir = top_srcdir
- $topdir = topdir
- $hdrdir = hdrdir
- Dir.chdir dir
- end
- begin
- Dir.rmdir target
- target = File.dirname(target)
- rescue SystemCallError
- break
- end while true
- true
-end
-
-def compiled?(target)
- $compiled[target]
-end
-
-def parse_args()
- $mflags = []
-
- opts = nil
- $optparser ||= OptionParser.new do |opts|
- opts.on('-n') {$dryrun = true}
- opts.on('--[no-]extension [EXTS]', Array) do |v|
- $extension = (v == false ? [] : v)
- end
- opts.on('--[no-]extstatic [STATIC]', Array) do |v|
- if ($extstatic = v) == false
- $extstatic = []
- elsif v
- $force_static = true if $extstatic.delete("static")
- $extstatic = nil if $extstatic.empty?
- end
- end
- opts.on('--dest-dir=DIR') do |v|
- $destdir = v
- end
- opts.on('--extout=DIR') do |v|
- $extout = (v unless v.empty?)
- end
- opts.on('--make=MAKE') do |v|
- $make = v || 'make'
- end
- opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
- v.grep(/\A([-\w]+)=(.*)/) {$configure_args["--#{$1}"] = $2}
- if arg = v.first
- arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
- end
- $mflags.concat(v)
- end
- opts.on('--message [MESSAGE]', String) do |v|
- $message = v
- end
- end
- begin
- $optparser.parse!(ARGV)
- rescue OptionParser::InvalidOption => e
- retry if /^--/ =~ e.args[0]
- $optparser.warn(e)
- abort opts.to_s
- end
-
- $destdir ||= ''
-
- $make, *rest = Shellwords.shellwords($make)
- $mflags.unshift(*rest) unless rest.empty?
-
- def $mflags.set?(flag)
- grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
- false
- end
- def $mflags.defined?(var)
- grep(/\A#{var}=(.*)/) {return $1}
- false
- end
-
- if $mflags.set?(?n)
- $dryrun = true
- else
- $mflags.unshift '-n' if $dryrun
- end
-
- $continue = $mflags.set?(?k)
- if $extout
- $extout = '$(topdir)/'+$extout
- Config::CONFIG["extout"] = CONFIG["extout"] = $extout
- $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
- $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
- end
-end
-
-parse_args()
-
-if target = ARGV.shift and /^[a-z-]+$/ =~ target
- $mflags.push(target)
- target = target.sub(/^(dist|real)(?=(?:clean)?$)/, '')
- case target
- when /clean/
- $ignore ||= true
- $clean = $1 ? $1[0] : true
- when /^install\b/
- $install = true
- $ignore ||= true
- $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
- "INSTALL_DATA=install -c -p -m 0644",
- "MAKEDIRS=mkdir -p") if $dryrun
- end
-end
-unless $message
- if target
- $message = target.sub(/^(\w+)e?\b/, '\1ing').tr('-', ' ')
- else
- $message = "compiling"
- end
-end
-
-EXEEXT = CONFIG['EXEEXT']
-if CROSS_COMPILING
- $ruby = CONFIG['MINIRUBY']
-elsif sep = config_string('BUILD_FILE_SEPARATOR')
- $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
-else
- $ruby = '$(topdir)/miniruby' + EXEEXT
-end
-$ruby << " -I'$(topdir)' -I'$(top_srcdir)/lib'"
-$ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
-$ruby << " -I'$(hdrdir)/ext' -rpurelib.rb"
-$config_h = '$(topdir)/config.h'
-ENV["RUBYLIB"] = "-"
-ENV["RUBYOPT"] = "-rpurelib.rb"
-
-MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
-
-# get static-link modules
-$static_ext = {}
-if $extstatic
- $extstatic.each do |target|
- target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
- $static_ext[target] = $static_ext.size
- end
-end
-for dir in ["ext", File::join($top_srcdir, "ext")]
- setup = File::join(dir, CONFIG['setup'])
- if File.file? setup
- f = open(setup)
- while line = f.gets()
- line.chomp!
- line.sub!(/#.*$/, '')
- next if /^\s*$/ =~ line
- target, opt = line.split(nil, 3)
- if target == 'option'
- case opt
- when 'nodynamic'
- $nodynamic = true
- end
- next
- end
- target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
- $static_ext[target] = $static_ext.size
- end
- MTIMES << f.mtime
- $setup = setup
- f.close
- break
- end
-end unless $extstatic
-
-ext_prefix = "#{$top_srcdir}/ext"
-exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
-if $extension
- exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")}
-else
- withes, withouts = %w[--with --without].collect {|w|
- if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any?
- proc {false}
- elsif (w = w.grep(String)).empty?
- proc {true}
- else
- proc {|c1| w.collect {|opt| opt.split(/,/)}.flatten.any?(&c1)}
- end
- }
- cond = proc {|ext|
- cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
- withes.call(cond1) or !withouts.call(cond1)
- }
- exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
- d = File.dirname(d)
- d.slice!(0, ext_prefix.length + 1)
- d
- }.find_all {|ext|
- with_config(ext, &cond)
- }.sort
-end
-
-if $extout
- extout = Config.expand("#{$extout}", Config::CONFIG.merge("topdir"=>$topdir))
- unless $ignore
- FileUtils.mkpath(extout)
- end
-end
-
-dir = Dir.pwd
-FileUtils::makedirs('ext')
-Dir::chdir('ext')
-
-hdrdir = $hdrdir
-$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
-exts.each do |d|
- extmake(d) or abort
-end
-$top_srcdir = srcdir
-$topdir = "."
-$hdrdir = hdrdir
-
-extinit = Struct.new(:c, :o) {
- def initialize(src)
- super("#{src}.c", "#{src}.#{$OBJEXT}")
- end
-}.new("extinit")
-if $ignore
- FileUtils.rm_f(extinit.to_a) if $clean
- Dir.chdir ".."
- if $clean
- Dir.rmdir('ext') rescue nil
- FileUtils.rm_rf(extout) if $extout
- end
- exit
-end
-
-$extinit ||= ""
-$extobjs ||= ""
-$extpath ||= []
-$extflags ||= ""
-$extlibs ||= []
-unless $extlist.empty?
- $extinit << "\n" unless $extinit.empty?
- list = $extlist.dup
- built = []
- while e = list.shift
- 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)
- list.insert(l + 1, e)
- end
- next
- end
- f = format("%s/%s.%s", s, i, $LIBEXT)
- if File.exist?(f)
- $extinit << " init(Init_#{i}, \"#{t}.so\");\n"
- $extobjs << "ext/#{f} "
- built << t
- end
- end
-
- src = %{\
-#include "ruby.h"
-
-#define init(func, name) {void func _((void)); ruby_init_ext(name, func);}
-
-void ruby_init_ext _((const char *name, void (*init)(void)));
-
-void Init_ext _((void))\n{\n#$extinit}
-}
- if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
- open(extinit.c, "w") {|f| f.print src}
- end
-
- $extobjs = "ext/#{extinit.o} #{$extobjs}"
- if RUBY_PLATFORM =~ /m68k-human|beos/
- $extflags.delete("-L/usr/local/lib")
- end
- $extpath.delete("$(topdir)")
- $extflags = libpathflag($extpath) << " " << $extflags.strip
- 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?
- }.compact
- puts conf
- $stdout.flush
- $mflags.concat(conf)
-else
- FileUtils.rm_f(extinit.to_a)
-end
-rubies = []
-%w[RUBY RUBYW STATIC_RUBY].each {|r|
- n = r
- if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
- rubies << Config.expand(r+=EXEEXT)
- $mflags << "#{n}=#{r}"
- end
-}
-
-Dir.chdir ".."
-unless $destdir.to_s.empty?
- $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
-end
-puts "making #{rubies.join(', ')}"
-$stdout.flush
-$mflags.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("PRE_LIBRUBY_UPDATE = del #{mkf}")
- end
- $mflags.unshift("-f#{mkf}")
- vars.each {|flag| flag.sub!(/\A/, "-D")}
- end
-end
-system($make, *sysquote($mflags)) or exit($?.exitstatus)
-
-#Local variables:
-# mode: ruby
-#end:
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
new file mode 100644
index 0000000000..9e454cc429
--- /dev/null
+++ b/ext/extmk.rb.in
@@ -0,0 +1,779 @@
+#! /usr/local/bin/ruby
+# -*- ruby -*-
+
+$".push 'mkmf.rb'
+ORIG_LIBPATH = ENV['LIB']
+
+if ARGV[0] == 'static'
+ $force_static = true
+ ARGV.shift
+elsif ARGV[0] == 'install'
+ $install = true
+ $destdir = ARGV[1] || ''
+ ARGV.shift
+elsif ARGV[0] == 'clean'
+ $clean = "clean"
+ ARGV.shift
+elsif ARGV[0] == 'distclean'
+ $clean = "distclean"
+ ARGV.shift
+elsif ARGV[0] == 'realclean'
+ $clean = "realclean"
+ ARGV.shift
+end
+
+SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"]
+$extlist = []
+
+$includedir = "@includedir@".gsub(/\$\{prefix\}|\$\(prefix\)/,'@prefix@')
+
+$top_srcdir = "@top_srcdir@"
+if $top_srcdir !~ "^/"
+ # get absolute path
+ $top_srcdir = File.expand_path($top_srcdir)
+end
+# get absolute path
+$topdir = File.expand_path("..")
+
+$:.replace [$top_srcdir, $top_srcdir+"/lib", "."]
+
+require 'find'
+
+def rm_f(*files)
+ targets = []
+ for file in files
+ targets.concat Dir[file]
+ end
+ if not targets.empty?
+ File::chmod 0777, *targets
+ File::unlink *targets
+ end
+end
+
+def older(file1, file2)
+ if !File.exist?(file1) then
+ return true
+ end
+ if !File.exist?(file2) then
+ return false
+ end
+ if File.mtime(file1) < File.mtime(file2)
+ return true
+ end
+ return false
+end
+
+if RUBY_PLATFORM == "m68k-human"
+ CFLAGS = "@CFLAGS@".gsub(/-c..-stack=[0-9]+ */, '')
+else
+ CFLAGS = "@CFLAGS@"
+end
+LINK = "@CC@ -o conftest -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@"
+CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir %s %s %s conftest.c"
+
+if FileTest.readable? 'nul'
+ $null = open('nul', 'w')
+elsif FileTest.readable? '/dev/null'
+ $null = open('/dev/null', 'w')
+else
+ $null = open('test.log', 'w')
+end
+
+$orgerr = $stderr.dup
+$orgout = $stdout.dup
+def xsystem command
+ if $DEBUG
+ puts command
+ return system(command)
+ end
+ $stderr.reopen($null)
+ $stdout.reopen($null)
+ r = system(command)
+ $stderr.reopen($orgerr)
+ $stdout.reopen($orgout)
+ return r
+end
+
+def try_link0(src, opt="")
+ cfile = open("conftest.c", "w")
+ cfile.print src
+ cfile.close
+ ldflags = $LDFLAGS
+ if /mswin32/ =~ RUBY_PLATFORM and !$LIBPATH.empty?
+ ENV['LIB'] = ($LIBPATH + [ORIG_LIBPATH]).compact.join(';')
+ else
+ $LDFLAGS = ldflags.dup
+ $LIBPATH.each {|d| $LDFLAGS << " -L" + d}
+ end
+ begin
+ xsystem(format(LINK, $CFLAGS, $CPPFLAGS, $LDFLAGS, opt, $LOCAL_LIBS))
+ ensure
+ $LDFLAGS = ldflags
+ ENV['LIB'] = ORIG_LIBPATH if /mswin32/ =~ RUBY_PLATFORM
+ end
+end
+
+def try_link(src, opt="")
+ begin
+ try_link0(src, opt)
+ ensure
+ rm_f "conftest*"
+ end
+end
+
+def try_cpp(src, opt="")
+ cfile = open("conftest.c", "w")
+ cfile.print src
+ cfile.close
+ begin
+ xsystem(format(CPP, $CFLAGS, $CPPFLAGS, opt))
+ ensure
+ rm_f "conftest*"
+ end
+end
+
+def egrep_cpp(pat, src, opt="")
+ cfile = open("conftest.c", "w")
+ cfile.print src
+ cfile.close
+ begin
+ xsystem(format(CPP+"|egrep #{pat}", $CFLAGS, $CPPFLAGS, opt))
+ ensure
+ rm_f "conftest*"
+ end
+end
+
+def try_run(src, opt="")
+ begin
+ if try_link0(src, opt)
+ if xsystem("./conftest")
+ true
+ else
+ false
+ end
+ else
+ nil
+ end
+ ensure
+ rm_f "conftest*"
+ end
+end
+
+def install_rb(mfile, srcdir = nil)
+ libdir = "lib"
+ libdir = srcdir + "/" + libdir if srcdir
+ path = []
+ dir = []
+ if File.directory? libdir
+ Find.find(libdir) do |f|
+ next unless /\.rb$/ =~ f
+ f = f[libdir.length+1..-1]
+ path.push f
+ dir |= [File.dirname(f)]
+ end
+ end
+ for f in dir
+ next if f == "."
+ mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)/%s\n", f
+ end
+ for f in path
+ mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f
+ end
+end
+
+def append_library(libs, lib)
+ if /mswin32/ =~ RUBY_PLATFORM
+ lib + ".lib " + libs
+ else
+ "-l" + lib + " " + libs
+ end
+end
+
+def have_library(lib, func="main")
+ if func && func != ""
+ libs = append_library($libs, lib)
+ if /mswin32|mingw/ =~ RUBY_PLATFORM
+ r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+ unless r
+ r = try_link(<<"SRC", libs)
+#include <windows.h>
+#include <winsock.h>
+int main() { return 0; }
+int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
+SRC
+ end
+ else
+ r = try_link(<<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+ end
+ unless r
+ return false
+ end
+ else
+ libs = append_library($libs, lib)
+ end
+
+ $libs = libs
+ return true
+end
+
+def find_library(lib, func, *paths)
+ libpath = $LIBPATH
+ libs = append_library($libs, lib)
+ until try_link(<<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+ if paths.size == 0
+ $LIBPATH = libpath
+ return false
+ end
+ $LIBPATH = libpath | [paths.shift]
+ end
+ $libs = libs
+ return true
+end
+
+def have_func(func, header=nil)
+ libs = $libs
+ src =
+ if /mswin32|mingw/ =~ RUBY_PLATFORM
+ r = <<"SRC"
+#include <windows.h>
+#include <winsock.h>
+SRC
+ else
+ ""
+ end
+ unless header.nil?
+ src << <<"SRC"
+#include <#{header}>
+SRC
+ end
+ r = try_link(src + <<"SRC", libs)
+int main() { return 0; }
+int t() { #{func}(); return 0; }
+SRC
+ unless r
+ r = try_link(src + <<"SRC", libs)
+int main() { return 0; }
+int t() { void ((*p)()); p = (void ((*)()))#{func}; return 0; }
+SRC
+ end
+ unless r
+ return false
+ end
+ $defs.push(format("-DHAVE_%s", func.upcase))
+ return true
+end
+
+def have_header(header)
+ unless try_cpp(<<"SRC")
+#include <#{header}>
+SRC
+ return false
+ end
+ header.tr!("a-z./\055", "A-Z___")
+ $defs.push(format("-DHAVE_%s", header))
+ return true
+end
+
+def arg_config(config, default=nil)
+ unless defined? $configure_args
+ $configure_args = {}
+ args = "@configure_args@"
+ if /mswin32|mingw/ =~ RUBY_PLATFORM and ENV["CONFIGURE_ARGS"]
+ args << " " << ENV["CONFIGURE_ARGS"]
+ end
+ for arg in args.split
+ next unless /^--/ =~ arg
+ if /=/ =~ arg
+ $configure_args[$`] = $'
+ else
+ $configure_args[arg] = true
+ end
+ end
+ end
+ $configure_args.fetch(config, default)
+end
+
+def with_config(config, default=nil)
+ unless /^--with-/ =~ config
+ config = '--with-' + config
+ end
+ arg_config(config, default)
+end
+
+def enable_config(config, default=nil)
+ if arg_config("--enable-"+config, default)
+ true
+ elsif arg_config("--disable-"+config, false)
+ false
+ else
+ default
+ end
+end
+
+def create_header()
+ if $defs.length > 0
+ hfile = open("extconf.h", "w")
+ for line in $defs
+ line =~ /^-D(.*)/
+ hfile.printf "#define %s 1\n", $1
+ end
+ hfile.close
+ end
+end
+
+def dir_config(target, idefault=nil, ldefault=nil)
+ if idefault && ldefault == nil
+ default = idefault
+ idefault = default + "/include"
+ ldefault = default + "/lib"
+ end
+
+ dir = with_config(target + "-dir", default)
+
+ idir, ldir = if dir then [
+ dir + "/include",
+ dir + "/lib"
+ ] else [
+ with_config(target + "-include", idefault),
+ with_config(target + "-lib", ldefault)
+ ] end
+
+ if idir
+ idircflag = "-I" + idir
+ $CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag)
+ end
+
+ if ldir
+ $LIBPATH << ldir unless $LIBPATH.include?(ldir)
+ end
+
+ [idir, ldir]
+end
+
+def create_makefile(target)
+ $target = target
+ if target.rindex(%r!/!)
+ target = $'
+ target_prefix = "/"+$`
+ else
+ target_prefix = ""
+ end
+ rm_f "conftest*"
+ if "@DLEXT@" == $OBJEXT
+ libs = $libs.split
+ for lib in libs
+ lib.sub!(/-l(.*)/, %%"lib\\1.#{$LIBEXT}"%)
+ end
+ $defs.push(format("-DEXTLIB='%s'", libs.join(",")))
+ end
+
+ $DLDFLAGS = '@DLDFLAGS@'
+
+ if $configure_args['--enable-shared'] or "@LIBRUBY@" != "@LIBRUBY_A@"
+ $libs = "@LIBRUBYARG@ " + $libs
+ $LIBPATH.unshift $topdir
+ end
+
+ defflag = ''
+ if RUBY_PLATFORM =~ /cygwin|mingw/ and not $static
+ if not File.exist? target + '.def'
+ open(target + '.def', 'wb') do |f|
+ f.print "EXPORTS\n", "Init_", target, "\n"
+ end
+ end
+ defflag = "--def=" + target + ".def"
+ end
+
+ if RUBY_PLATFORM =~ /mswin32/
+ libpath = $LIBPATH.join(';')
+ else
+ $LIBPATH.each {|d| $DLDFLAGS << " -L" << d}
+ end
+
+ $srcdir = $top_srcdir + "/ext/" + $mdir
+ mfile = open("Makefile", "w")
+ mfile.binmode if /mingw/ =~ RUBY_PLATFORM
+ mfile.printf "\
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = #{$srcdir}
+VPATH = #{$srcdir}
+
+topdir = #{$topdir}
+hdrdir = #{$top_srcdir}
+
+CC = @CC@
+
+CFLAGS = %s #{CFLAGS} #$CFLAGS
+CPPFLAGS = -I$(topdir) -I$(hdrdir) -I@includedir@ %s #$CPPFLAGS
+DLDFLAGS = #$DLDFLAGS #$LDFLAGS
+LDSHARED = @LDSHARED@ #{defflag}
+", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ")
+ mfile.puts "LIBPATH = #{libpath}" if libpath
+
+ mfile.puts ".SUFFIXES: .@OBJEXT@" unless "@OBJEXT@" == "o"
+
+ mfile.printf "\
+
+RUBY_INSTALL_NAME = @RUBY_INSTALL_NAME@
+RUBY_SO_NAME = @RUBY_SO_NAME@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+#pkglibdir = $(libdir)/$(RUBY_INSTALL_NAME)/@MAJOR@.@MINOR@
+pkglibdir = $(libdir)/ruby/@MAJOR@.@MINOR@
+archdir = $(pkglibdir)/@arch@
+@SET_MAKE@
+
+#### End of system configuration section. ####
+
+"
+ mfile.printf "LOCAL_LIBS = %s %s\n", $LOCAL_LIBS, $local_flags
+ mfile.printf "LIBS = %s\n", $libs
+ mfile.printf "OBJS = "
+ if !$objs then
+ $objs = []
+ for f in Dir["#{$top_srcdir}/ext/#{$mdir}/*.{#{SRC_EXT.join(%q{,})}}"]
+ f = File.basename(f)
+ f.sub!(/(#{SRC_EXT.join(%q{|})})$/, $OBJEXT)
+ $objs.push f
+ end
+ else
+ for i in $objs
+ i.sub!(/\.o\z/, ".#{$OBJEXT}")
+ end
+ end
+ mfile.printf $objs.join(" ")
+ mfile.printf "\n"
+
+ ruby_interpreter = "$(topdir)/miniruby@EXEEXT@"
+ if /nmake/i =~ $make
+ ruby_interpreter = '$(topdir:/=\)\miniruby@EXEEXT@'
+ end
+ if defined? CROSS_COMPILING
+ ruby_interpreter = "@MINIRUBY@"
+ end
+
+ mfile.printf <<EOS
+TARGET = #{target}
+DLLIB = $(TARGET).#{$static ? $LIBEXT : "@DLEXT@"}
+
+RUBY = #{ruby_interpreter} -I$(topdir) -I$(hdrdir)/lib
+RM = $(RUBY) -r ftools -e "File::rm_f(*Dir[ARGV.join(' ')])"
+
+EXEEXT = @EXEEXT@
+
+all: $(DLLIB)
+
+clean:; @$(RM) *.#{$OBJEXT} *.so *.sl *.#{$LIBEXT} $(DLLIB)
+ @$(RM) *.ilk *.exp *.pdb *.bak
+
+distclean: clean
+ @$(RM) Makefile extconf.h conftest.*
+ @$(RM) core ruby$(EXEEXT) *~
+
+realclean: distclean
+EOS
+
+ mfile.printf <<EOS
+
+install:
+ @$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(libdir) $(DESTDIR)$(pkglibdir) $(DESTDIR)$(archdir)
+EOS
+ unless $static
+ mfile.printf "\
+ @$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(DLLIB) $(DESTDIR)$(archdir)/$(DLLIB)
+"
+ end
+ install_rb(mfile, $srcdir)
+ mfile.printf "\n"
+
+ if /mswin32/ !~ RUBY_PLATFORM
+ mfile.puts "
+.c.@OBJEXT@:
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
+.cc.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+.cpp.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+.cxx.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+.C.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+"
+ elsif /nmake/i =~ $make
+ mfile.print "
+{$(srcdir)}.c{}.@OBJEXT@:
+ $(CC) -I. -I$(<D) $(CFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+.c.@OBJEXT@:
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+
+{$(srcdir)}.cc{}.@OBJEXT@:
+ $(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+.cc.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+{$(srcdir)}.cpp{}.@OBJEXT@:
+ $(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+.cpp.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+{$(srcdir)}.cxx{}.@OBJEXT@:
+ $(CXX) -I. -I$(<D) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+.cxx.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(<:/=\\)
+"
+ else
+ mfile.print "
+.c.@OBJEXT@:
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<)
+
+.cc.@OBJEXT@ .cpp.@OBJEXT@ .cxx.@OBJEXT@ .C.@OBJEXT@:
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(subst /,\\\\,$<)
+"
+ end
+
+ if $static
+ if "@AR@" =~ /^lib\b/i
+ mfile.printf "\
+$(DLLIB): $(OBJS)
+ @AR@ /OUT:$(DLLIB) $(OBJS)
+"
+ else
+ mfile.printf "\
+$(DLLIB): $(OBJS)
+ @AR@ cru $(DLLIB) $(OBJS)
+ @-@RANLIB@ $(DLLIB) 2> /dev/null || true
+"
+ end
+ elsif "@DLEXT@" != $OBJEXT
+ mfile.print "$(DLLIB): $(OBJS)\n"
+ if /mswin32/ =~ RUBY_PLATFORM
+ if /nmake/i =~ $make
+ mfile.print "\tset LIB=$(LIBPATH:/=\\);$(LIB)\n"
+ else
+ mfile.print "\tenv LIB='$(subst /,\\\\,$(LIBPATH));$(LIB)' \\\n"
+ end
+ end
+ mfile.print "\t$(LDSHARED) $(DLDFLAGS) -o $(DLLIB) $(OBJS) $(LIBS) $(LOCAL_LIBS)\n"
+ elsif RUBY_PLATFORM == "m68k-human"
+ mfile.printf "\
+$(DLLIB): $(OBJS)
+ ar cru $(DLLIB) $(OBJS)
+"
+ else
+ mfile.printf "\
+$(DLLIB): $(OBJS)
+ ld $(DLDFLAGS) -r -o $(DLLIB) $(OBJS)
+"
+ end
+
+ if File.exist?("#{$srcdir}/depend")
+ dfile = open("#{$srcdir}/depend", "r")
+ mfile.printf "###\n"
+ while line = dfile.gets()
+ line.gsub!(/\.o\b/, ".#{$OBJEXT}")
+ line.gsub!(/(\s)([^\s\/]+\.[ch])/, '\1$(srcdir)/\2') if /nmake/i =~ $make
+ mfile.printf "%s", line.gsub('\$\(hdrdir\)/config.h', '$(topdir)/config.h')
+ end
+ dfile.close
+ end
+ mfile.close
+end
+
+def extmake(target)
+ if $force_static or $static_ext[target]
+ $static = target
+ else
+ $static = false
+ end
+
+ unless $install or $clean
+ return if $nodynamic and not $static
+ end
+
+ $OBJEXT = "@OBJEXT@"
+ $LIBEXT = "a"
+ $objs = nil
+ $libs = "@DLDLIBS@"
+ $local_flags = ""
+ if /mswin32/ =~ RUBY_PLATFORM
+ $LIBEXT = "lib"
+ $local_flags = "-link /INCREMENTAL:no /EXPORT:Init_$(TARGET)"
+ end
+ $LOCAL_LIBS = "" # to be assigned in extconf.rb
+ $CFLAGS = ""
+ $CPPFLAGS = ""
+ $LDFLAGS = ""
+ $LIBPATH = []
+
+ dir_config("opt")
+
+ begin
+ Dir.mkdir target unless File.directory?(target)
+ Dir.chdir target
+ $target = target
+ $mdir = target
+ unless $install or $clean
+ if $static_ext.size > 0 ||
+ !File.exist?("./Makefile") ||
+ older("./Makefile", "#{$top_srcdir}/ext/@setup@") ||
+ older("./Makefile", "../extmk.rb") ||
+ older("./Makefile", "#{$top_srcdir}/ext/#{target}/makefile.rb") ||
+ older("./Makefile", "#{$top_srcdir}/ext/#{target}/extconf.rb")
+ then
+ $defs = []
+ if File.exist?("#{$top_srcdir}/ext/#{target}/makefile.rb")
+ load "#{$top_srcdir}/ext/#{target}/makefile.rb"
+ elsif File.exist?("#{$top_srcdir}/ext/#{target}/extconf.rb")
+ load "#{$top_srcdir}/ext/#{target}/extconf.rb"
+ else
+ create_makefile(target)
+ end
+ end
+ end
+ if File.exist?("./Makefile")
+ if $static
+ $extlist.push [$static,$target]
+ end
+ if $install
+ system "#{$make} install DESTDIR=#{$destdir}"
+ elsif $clean
+ system "#{$make} #{$clean}"
+ else
+ unless system "#{$make} all"
+ if ENV["MAKEFLAGS"] != "k" and ENV["MFLAGS"] != "-k"
+ exit
+ end
+ end
+ end
+ end
+ if $static
+ $extlibs ||= ""
+ $extlibs += " " + $LDFLAGS unless $LDFLAGS == ""
+ $extlibs += " " + $libs unless $libs == ""
+ $extlibs += " " + $LOCAL_LIBS unless $LOCAL_LIBS == ""
+ end
+ ensure
+ rm_f "conftest*"
+ Dir.chdir ".."
+ end
+end
+
+$make = ENV["MAKE"]
+$make ||= with_config("make-prog", "make")
+
+# get static-link modules
+$static_ext = {}
+for setup in ["@setup@", "#{$top_srcdir}/ext/@setup@"]
+ if File.file? setup
+ f = open(setup)
+ while line = f.gets()
+ line.chomp!
+ line.sub!(/#.*$/, '')
+ next if /^\s*$/ =~ line
+ if /^option +nodynamic/ =~ line
+ $nodynamic = true
+ next
+ end
+ target = line.split[0]
+ target = target.downcase if /mswin32/ =~ RUBY_PLATFORM
+ $static_ext[target] = true
+ end
+ f.close
+ break
+ end
+end
+
+for d in Dir["#{$top_srcdir}/ext/*"]
+ File.directory?(d) || next
+ File.file?(d + "/MANIFEST") || next
+
+ d = File.basename(d)
+ if $install
+ print "installing ", d, "\n"
+ elsif $clean
+ print "cleaning ", d, "\n"
+ else
+ print "compiling ", d, "\n"
+ if RUBY_PLATFORM =~ /-aix/ and older("../ruby.imp", "../miniruby")
+ load "#{$top_srcdir}/ext/aix_mksym.rb"
+ end
+ end
+ extmake(d)
+end
+
+if $install or $clean
+ Dir.chdir ".."
+ exit
+end
+$extinit = "" unless $extinit
+
+ruby = "@RUBY_INSTALL_NAME@@EXEEXT@"
+miniruby = "miniruby@EXEEXT@"
+
+$extobjs = "" unless $extobjs
+if $extlist.size > 0
+ for s,t in $extlist
+ f = format("%s/%s.%s", s, t, $LIBEXT)
+ if File.exist?(f)
+ $extinit += format("\
+\tInit_%s();\n\
+\trb_provide(\"%s.so\");\n\
+", t, t)
+ $extobjs += "ext/"
+ $extobjs += f
+ $extobjs += " "
+ else
+ false
+ end
+ end
+
+ if older("extinit.c", "#{$top_srcdir}/ext/@setup@")
+ f = open("extinit.c", "w")
+ f.printf "void Init_ext() {\n"
+ f.printf $extinit
+ f.printf "}\n"
+ f.close
+ end
+ if older("extinit.#{$OBJEXT}", "extinit.c")
+ cmd = "@CC@ " + CFLAGS + " -c extinit.c"
+ print cmd, "\n"
+ system cmd or exit 1
+ end
+
+ Dir.chdir ".."
+
+ if older(ruby, "#{$top_srcdir}/ext/@setup@") or older(ruby, miniruby)
+ rm_f ruby
+ end
+
+ $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
+ if RUBY_PLATFORM =~ /m68k-human|beos/
+ $extlibs.gsub!("-L/usr/local/lib", "") if $extlibs
+ end
+ system format(%[#{$make} #{ruby} EXTOBJS='%s' EXTLIBS='%s'], $extobjs, $extlibs)
+else
+ Dir.chdir ".."
+ if older(ruby, miniruby)
+ rm_f ruby
+ system("#{$make} #{ruby}")
+ end
+end
+
+#Local variables:
+# mode: ruby
+#end:
diff --git a/ext/fcntl/.cvsignore b/ext/fcntl/.cvsignore
index 4088712231..f3c7a7c5da 100644
--- a/ext/fcntl/.cvsignore
+++ b/ext/fcntl/.cvsignore
@@ -1,3 +1 @@
Makefile
-mkmf.log
-*.def
diff --git a/ext/fcntl/MANIFEST b/ext/fcntl/MANIFEST
new file mode 100644
index 0000000000..aef7ad4ca0
--- /dev/null
+++ b/ext/fcntl/MANIFEST
@@ -0,0 +1,3 @@
+MANIFEST
+depend
+fcntl.c
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
deleted file mode 100644
index 8b717d4a5b..0000000000
--- a/ext/fcntl/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'mkmf'
-create_makefile('fcntl')
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 57cca103f4..80e0112e4c 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -5,7 +5,7 @@
$Author$
created at: Mon Apr 7 18:53:05 JST 1997
- Copyright (C) 1997-2001 Yukihiro Matsumoto
+ Copyright (C) 1997-1998 Yukihiro Matsumoto
************************************************/
@@ -34,81 +34,6 @@ pack up your own arguments to pass as args for locking functions, etc.
#include "ruby.h"
#include <fcntl.h>
-/* 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.
- *
- * 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 OS
- * platform. Some values listed below may not be supported on your system.
- *
- * The constants supported by Ruby for use with IO::fcntl are:
- *
- * - F_DUPFD - duplicate a close-on-exec file handle to a non-close-on-exec
- * file handle.
- *
- * - F_GETFD - read the close-on-exec flag of a file handle.
- *
- * - 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.
- *
- * - F_RDLCK, F_WRLCK, F_UNLCK - types of lock for the above.
- *
- * The constants supported by Ruby for use with IO::sysopen are:
- *
- * - O_APPEND - open file in append mode.
- *
- * - 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
Init_fcntl()
{
@@ -179,9 +104,4 @@ Init_fcntl()
#ifdef O_WRONLY
rb_define_const(mFcntl, "O_WRONLY", INT2NUM(O_WRONLY));
#endif
-#ifdef O_ACCMODE
- rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_ACCMODE));
-#else
- rb_define_const(mFcntl, "O_ACCMODE", INT2FIX(O_RDONLY | O_WRONLY | O_RDWR));
-#endif
}
diff --git a/ext/gdbm/.cvsignore b/ext/gdbm/.cvsignore
index 4088712231..f3c7a7c5da 100644
--- a/ext/gdbm/.cvsignore
+++ b/ext/gdbm/.cvsignore
@@ -1,3 +1 @@
Makefile
-mkmf.log
-*.def
diff --git a/ext/gdbm/MANIFEST b/ext/gdbm/MANIFEST
new file mode 100644
index 0000000000..f4a8796d18
--- /dev/null
+++ b/ext/gdbm/MANIFEST
@@ -0,0 +1,5 @@
+MANIFEST
+README
+depend
+extconf.rb
+gdbm.c
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 82109fda90..d43450229f 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -6,8 +6,6 @@
$Date$
modified at: Mon Jan 24 15:59:52 JST 1994
- Documentation by Peter Adolphs < futzilogik at users dot sourceforge dot net >
-
************************************************/
#include "ruby.h"
@@ -16,74 +14,10 @@
#include <fcntl.h>
#include <errno.h>
-/*
- * Document-class: GDBM
- *
- * == Summary
- *
- * Ruby extension for GNU dbm (gdbm) -- a simple database engine for storing
- * key-value pairs on disk.
- *
- * == Description
- *
- * GNU dbm is a library for simple databases. A database is a file that stores
- * key-value pairs. Gdbm allows the user to store, retrieve, and delete data by
- * key. It furthermore allows a non-sorted traversal of all key-value pairs.
- * A gdbm database thus provides the same functionality as a hash. As
- * with objects of the Hash class, elements can be accessed with <tt>[]</tt>.
- * Furthermore, GDBM mixes in the Enumerable module, thus providing convenient
- * methods such as #find, #collect, #map, etc.
- *
- * A process is allowed to open several different databases at the same time.
- * A process can open a database as a "reader" or a "writer". Whereas a reader
- * has only read-access to the database, a writer has read- and write-access.
- * A database can be accessed either by any number of readers or by exactly one
- * writer at the same time.
- *
- * == Examples
- *
- * 1. Opening/creating a database, and filling it with some entries:
- *
- * require 'gdbm'
- *
- * gdbm = GDBM.new("fruitstore.db")
- * gdbm["ananas"] = "3"
- * gdbm["banana"] = "8"
- * gdbm["cranberry"] = "4909"
- * gdbm.close
- *
- * 2. Reading out a database:
- *
- * require 'gdbm'
- *
- * gdbm = GDBM.new("fruitstore.db")
- * gdbm.each_pair do |key, value|
- * print "#{key}: #{value}\n"
- * end
- * gdbm.close
- *
- * produces
- *
- * banana: 8
- * ananas: 3
- * cranberry: 4909
- *
- * == Links
- *
- * * http://www.gnu.org/software/gdbm/
- */
-static VALUE rb_cGDBM, rb_eGDBMError, rb_eGDBMFatalError;
-
-#define RUBY_GDBM_RW_BIT 0x20000000
+static VALUE cGDBM, rb_eGDBMError;
#define MY_BLOCK_SIZE (2048)
-#define MY_FATAL_FUNC rb_gdbm_fatal
-static void
-rb_gdbm_fatal(msg)
- char *msg;
-{
- rb_raise(rb_eGDBMFatalError, "%s", msg);
-}
+#define MY_FATAL_FUNC (0)
struct dbmdata {
int di_size;
@@ -96,15 +30,10 @@ closed_dbm()
rb_raise(rb_eRuntimeError, "closed GDBM file");
}
-#define GetDBM(obj, dbmp) do {\
+#define GetDBM(obj, dbmp) {\
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);\
- (dbm) = dbmp->di_dbm;\
}
static void
@@ -112,83 +41,24 @@ free_dbm(dbmp)
struct dbmdata *dbmp;
{
if (dbmp) {
- if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
- free(dbmp);
+ if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
+ free(dbmp);
}
}
-/*
- * call-seq:
- * gdbm.close -> nil
- *
- * Closes the associated database file.
- */
-static VALUE
-fgdbm_close(obj)
- VALUE obj;
-{
- struct dbmdata *dbmp;
-
- GetDBM(obj, dbmp);
- gdbm_close(dbmp->di_dbm);
- dbmp->di_dbm = 0;
-
- return Qnil;
-}
+static VALUE fgdbm_close _((VALUE));
-/*
- * call-seq:
- * gdbm.closed? -> true or false
- *
- * Returns true if the associated database file has been closed.
- */
static VALUE
-fgdbm_closed(obj)
- VALUE obj;
-{
- struct dbmdata *dbmp;
-
- Data_Get_Struct(obj, struct dbmdata, dbmp);
- if (dbmp == 0)
- return Qtrue;
- if (dbmp->di_dbm == 0)
- return Qtrue;
-
- return Qfalse;
-}
-
-static VALUE fgdbm_s_alloc _((VALUE));
-
-static VALUE
-fgdbm_s_alloc(klass)
+fgdbm_s_new(argc, argv, klass)
+ int argc;
+ VALUE *argv;
VALUE klass;
{
- return Data_Wrap_Struct(klass, 0, free_dbm, 0);
+ VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
+ rb_obj_call_init(obj, argc, argv);
+ return obj;
}
-/*
- * call-seq:
- * GDBM.new(filename, mode = 0666, flags = nil)
- *
- * Creates a new GDBM instance by opening a gdbm file named _filename_.
- * If the file does not exist, a new file with file mode _mode_ will be
- * created. _flags_ may be one of the following:
- * * *READER* - open as a reader
- * * *WRITER* - open as a writer
- * * *WRCREAT* - open as a writer; if the database does not exist, create a new one
- * * *NEWDB* - open as a writer; overwrite any existing databases
- *
- * The values *WRITER*, *WRCREAT* and *NEWDB* may be combined with the following
- * values by bitwise or:
- * * *SYNC* - cause all database operations to be synchronized to the disk
- * * *NOLOCK* - do not lock the database file
- *
- * If no _flags_ are specified, the GDBM object will try to open the database
- * file as a writer and will create it if it does not already exist
- * (cf. flag <tt>WRCREAT</tt>). If this fails (for instance, if another process
- * has already opened the database as a reader), it will try to open the
- * database file as a reader (cf. flag <tt>READER</tt>).
- */
static VALUE
fgdbm_initialize(argc, argv, obj)
int argc;
@@ -201,37 +71,31 @@ fgdbm_initialize(argc, argv, obj)
int mode, flags = 0;
if (rb_scan_args(argc, argv, "12", &file, &vmode, &vflags) == 1) {
- mode = 0666; /* default value */
+ mode = 0666; /* default value */
}
else if (NIL_P(vmode)) {
- mode = -1; /* return nil if DB does not exist */
+ mode = -1; /* return nil if DB not exist */
}
else {
- mode = NUM2INT(vmode);
+ mode = NUM2INT(vmode);
}
if (!NIL_P(vflags))
flags = NUM2INT(vflags);
- SafeStringValue(file);
+ file = rb_str_to_str(file);
+ Check_SafeStr(file);
- if (flags & RUBY_GDBM_RW_BIT) {
- flags &= ~RUBY_GDBM_RW_BIT;
+ dbm = 0;
+ if (mode >= 0)
dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
- flags, mode, MY_FATAL_FUNC);
- }
- else {
- dbm = 0;
- if (mode >= 0)
- dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
- GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
- if (!dbm)
- dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
- GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
- if (!dbm)
- dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
- GDBM_READER|flags, 0, MY_FATAL_FUNC);
- }
+ GDBM_WRCREAT|flags, mode, MY_FATAL_FUNC);
+ if (!dbm)
+ dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
+ GDBM_WRITER|flags, 0, MY_FATAL_FUNC);
+ if (!dbm)
+ dbm = gdbm_open(RSTRING(file)->ptr, MY_BLOCK_SIZE,
+ GDBM_READER|flags, 0, MY_FATAL_FUNC);
if (!dbm) {
if (mode == -1) return Qnil;
@@ -245,7 +109,6 @@ fgdbm_initialize(argc, argv, obj)
}
dbmp = ALLOC(struct dbmdata);
- free_dbm(DATA_PTR(obj));
DATA_PTR(obj) = dbmp;
dbmp->di_dbm = dbm;
dbmp->di_size = -1;
@@ -253,25 +116,6 @@ fgdbm_initialize(argc, argv, obj)
return obj;
}
-/*
- * call-seq:
- * GDBM.open(filename, mode = 0666, flags = nil)
- * GDBM.open(filename, mode = 0666, flags = nil) { |gdbm| ... }
- *
- * If called without a block, this is synonymous to GDBM::new.
- * If a block is given, the new GDBM instance will be passed to the block
- * as a parameter, and the corresponding database file will be closed
- * after the execution of the block code has been finished.
- *
- * Example for an open call with a block:
- *
- * require 'gdbm'
- * GDBM.open("fruitstore.db") do |gdbm|
- * gdbm.each_pair do |key, value|
- * print "#{key}: #{value}\n"
- * end
- * end
- */
static VALUE
fgdbm_s_open(argc, argv, klass)
int argc;
@@ -292,22 +136,36 @@ fgdbm_s_open(argc, argv, klass)
}
static VALUE
+fgdbm_close(obj)
+ VALUE obj;
+{
+ struct dbmdata *dbmp;
+
+ GetDBM(obj, dbmp);
+ gdbm_close(dbmp->di_dbm);
+ dbmp->di_dbm = 0;
+
+ return Qnil;
+}
+
+static VALUE
rb_gdbm_fetch(dbm, key)
GDBM_FILE dbm;
datum key;
{
datum val;
- VALUE str;
+ NEWOBJ(str, struct RString);
+ OBJSETUP(str, rb_cString, T_STRING);
val = gdbm_fetch(dbm, key);
if (val.dptr == 0)
return Qnil;
- str = rb_obj_alloc(rb_cString);
- RSTRING(str)->len = val.dsize;
- RSTRING(str)->aux.capa = val.dsize;
- RSTRING(str)->ptr = REALLOC_N(val.dptr,char,val.dsize+1);
- RSTRING(str)->ptr[val.dsize] = '\0';
+ str->ptr = 0;
+ str->len = val.dsize;
+ str->orig = 0;
+ str->ptr = REALLOC_N(val.dptr,char,val.dsize+1);
+ str->ptr[str->len] = '\0';
OBJ_TAINT(str);
return (VALUE)str;
@@ -320,7 +178,7 @@ rb_gdbm_fetch2(dbm, keystr)
{
datum key;
- StringValue(keystr);
+ keystr = rb_str_to_str(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
@@ -334,7 +192,8 @@ rb_gdbm_fetch3(obj, keystr)
struct dbmdata *dbmp;
GDBM_FILE dbm;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
return rb_gdbm_fetch2(dbm, keystr);
}
@@ -343,20 +202,21 @@ rb_gdbm_firstkey(dbm)
GDBM_FILE dbm;
{
datum key;
- VALUE str;
+ NEWOBJ(str, struct RString);
+ OBJSETUP(str, rb_cString, T_STRING);
key = gdbm_firstkey(dbm);
if (key.dptr == 0)
return Qnil;
- str = rb_obj_alloc(rb_cString);
- RSTRING(str)->len = key.dsize;
- RSTRING(str)->aux.capa = key.dsize;
- RSTRING(str)->ptr = REALLOC_N(key.dptr,char,key.dsize+1);
- RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+ str->ptr = 0;
+ str->len = key.dsize;
+ str->orig = 0;
+ str->ptr = REALLOC_N(key.dptr,char,key.dsize+1);
+ str->ptr[str->len] = '\0';
OBJ_TAINT(str);
- return str;
+ return (VALUE)str;
}
static VALUE
@@ -365,7 +225,8 @@ rb_gdbm_nextkey(dbm, keystr)
VALUE keystr;
{
datum key, key2;
- VALUE str;
+ NEWOBJ(str, struct RString);
+ OBJSETUP(str, rb_cString, T_STRING);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
@@ -373,37 +234,40 @@ rb_gdbm_nextkey(dbm, keystr)
if (key2.dptr == 0)
return Qnil;
- str = rb_obj_alloc(rb_cString);
- RSTRING(str)->len = key2.dsize;
- RSTRING(str)->aux.capa = key2.dsize;
- RSTRING(str)->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1);
- RSTRING(str)->ptr[RSTRING(str)->len] = '\0';
+ str->ptr = 0;
+ str->len = key2.dsize;
+ str->orig = 0;
+ str->ptr = REALLOC_N(key2.dptr,char,key2.dsize+1);
+ str->ptr[str->len] = '\0';
OBJ_TAINT(str);
- return str;
+ return (VALUE)str;
}
static VALUE
fgdbm_fetch(obj, keystr, ifnone)
VALUE obj, keystr, ifnone;
{
+ datum key;
+ struct dbmdata *dbmp;
+ GDBM_FILE dbm;
VALUE valstr;
- valstr = rb_gdbm_fetch3(obj, keystr);
+ keystr = rb_str_to_str(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
+
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+ valstr = rb_gdbm_fetch(dbm, key);
if (NIL_P(valstr)) {
if (ifnone == Qnil && rb_block_given_p())
- return rb_yield(keystr);
+ return rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
return ifnone;
}
return valstr;
}
-/*
- * call-seq:
- * gdbm[key] -> value
- *
- * Retrieves the _value_ corresponding to _key_.
- */
static VALUE
fgdbm_aref(obj, keystr)
VALUE obj, keystr;
@@ -411,13 +275,6 @@ fgdbm_aref(obj, keystr)
return rb_gdbm_fetch3(obj, keystr);
}
-/*
- * call-seq:
- * gdbm.fetch(key [, default]) -> value
- *
- * Retrieves the _value_ corresponding to _key_. If there is no value
- * associated with _key_, _default_ will be returned instead.
- */
static VALUE
fgdbm_fetch_m(argc, argv, obj)
int argc;
@@ -429,18 +286,11 @@ fgdbm_fetch_m(argc, argv, obj)
rb_scan_args(argc, argv, "11", &keystr, &ifnone);
valstr = fgdbm_fetch(obj, keystr, ifnone);
if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
- rb_raise(rb_eIndexError, "key not found");
+ rb_raise(rb_eIndexError, "key not found");
return valstr;
}
-/*
- * call-seq:
- * gdbm.index(value) -> key
- *
- * Returns the _key_ for a given _value_. If several keys may map to the
- * same value, the key that is found first will be returned.
- */
static VALUE
fgdbm_index(obj, valstr)
VALUE obj, valstr;
@@ -449,8 +299,9 @@ fgdbm_index(obj, valstr)
GDBM_FILE dbm;
VALUE keystr, valstr2;
- StringValue(valstr);
- GetDBM2(obj, dbmp, dbm);
+ valstr = rb_str_to_str(valstr);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -482,136 +333,67 @@ fgdbm_indexes(argc, argv, obj)
return new;
}
-/*
- * call-seq:
- * gdbm.select { |value| block } -> array
- *
- * Returns a new array of all values of the database for which _block_
- * evaluates to true.
- */
static VALUE
-fgdbm_select(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
+rb_gdbm_delete(obj, keystr)
+ VALUE obj, keystr;
{
- VALUE new = rb_ary_new2(argc);
- int i;
+ datum key;
+ struct dbmdata *dbmp;
+ GDBM_FILE dbm;
- if (rb_block_given_p()) {
- GDBM_FILE dbm;
- struct dbmdata *dbmp;
- VALUE keystr;
+ rb_secure(4);
+ keystr = rb_str_to_str(keystr);
+ key.dptr = RSTRING(keystr)->ptr;
+ key.dsize = RSTRING(keystr)->len;
- if (argc > 0) {
- rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
- }
- GetDBM2(obj, dbmp, dbm);
- for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
- keystr = rb_gdbm_nextkey(dbm, keystr)) {
- VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
- VALUE v = rb_yield(assoc);
-
- if (RTEST(v)) {
- rb_ary_push(new, assoc);
- }
- GetDBM2(obj, dbmp, dbm);
- }
- }
- else {
- rb_warn("GDBM#select(index..) is deprecated; use GDBM#values_at");
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
- for (i=0; i<argc; i++) {
- rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
- }
+ if (!gdbm_exists(dbm, key)) {
+ return Qnil;
}
- return new;
-}
-
-/*
- * call-seq:
- * gdbm.values_at(key, ...) -> array
- *
- * Returns an array of the values associated with each specified _key_.
- */
-static VALUE
-fgdbm_values_at(argc, argv, obj)
- int argc;
- VALUE *argv;
- VALUE obj;
-{
- VALUE new = rb_ary_new2(argc);
- int i;
-
- for (i=0; i<argc; i++) {
- rb_ary_push(new, rb_gdbm_fetch3(obj, argv[i]));
+ if (gdbm_delete(dbm, key)) {
+ dbmp->di_size = -1;
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
-
- return new;
-}
-
-static void
-rb_gdbm_modify(obj)
- VALUE obj;
-{
- rb_secure(4);
- if (OBJ_FROZEN(obj)) rb_error_frozen("GDBM");
+ else if (dbmp->di_size >= 0) {
+ dbmp->di_size--;
+ }
+ return obj;
}
static VALUE
-rb_gdbm_delete(obj, keystr)
+fgdbm_delete(obj, keystr)
VALUE obj, keystr;
{
datum key;
struct dbmdata *dbmp;
GDBM_FILE dbm;
- rb_gdbm_modify(obj);
- StringValue(keystr);
+ rb_secure(4);
+ keystr = rb_str_to_str(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
if (!gdbm_exists(dbm, key)) {
- return Qnil;
+ if (rb_block_given_p()) rb_yield(keystr);
+ return Qnil;
}
if (gdbm_delete(dbm, key)) {
- dbmp->di_size = -1;
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+ dbmp->di_size = -1;
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
else if (dbmp->di_size >= 0) {
- dbmp->di_size--;
+ dbmp->di_size--;
}
return obj;
}
-/*
- * call-seq:
- * gdbm.delete(key) -> value or nil
- *
- * Removes the key-value-pair with the specified _key_ from this database and
- * returns the corresponding _value_. Returns nil if the database is empty.
- */
-static VALUE
-fgdbm_delete(obj, keystr)
- VALUE obj, keystr;
-{
- VALUE valstr;
-
- valstr = fgdbm_fetch(obj, keystr, Qnil);
- rb_gdbm_delete(obj, keystr);
- return valstr;
-}
-
-/*
- * call-seq:
- * gdbm.shift -> (key, value) or nil
- *
- * Removes a key-value-pair from this database and returns it as a
- * two-item array [ _key_, _value_ ]. Returns nil if the database is empty.
- */
static VALUE
fgdbm_shift(obj)
VALUE obj;
@@ -620,8 +402,10 @@ fgdbm_shift(obj)
GDBM_FILE dbm;
VALUE keystr, valstr;
- rb_gdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
keystr = rb_gdbm_firstkey(dbm);
if (NIL_P(keystr)) return Qnil;
valstr = rb_gdbm_fetch2(dbm, keystr);
@@ -630,13 +414,6 @@ fgdbm_shift(obj)
return rb_assoc_new(keystr, valstr);
}
-/*
- * call-seq:
- * gdbm.delete_if { |key, value| block } -> gdbm
- * gdbm.reject! { |key, value| block } -> gdbm
- *
- * Deletes every key-value pair from _gdbm_ for which _block_ evaluates to true.
- */
static VALUE
fgdbm_delete_if(obj)
VALUE obj;
@@ -647,21 +424,23 @@ fgdbm_delete_if(obj)
VALUE ret, ary = rb_ary_new();
int i, status = 0, n;
- rb_gdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
n = dbmp->di_size;
dbmp->di_size = -1;
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- valstr = rb_gdbm_fetch2(dbm, keystr);
- 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);
+ valstr = rb_gdbm_fetch2(dbm, keystr);
+ ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
+ if (status != 0) goto delete;
+ if (RTEST(ret)) rb_ary_push(ary, keystr);
+ else dbmp->di_size++;
}
+ delete:
for (i = 0; i < RARRAY(ary)->len; i++)
rb_gdbm_delete(obj, RARRAY(ary)->ptr[i]);
if (status) rb_jump_tag(status);
@@ -670,12 +449,6 @@ fgdbm_delete_if(obj)
return obj;
}
-/*
- * call-seq:
- * gdbm.clear -> gdbm
- *
- * Removes all the key-value pairs within _gdbm_.
- */
static VALUE
fgdbm_clear(obj)
VALUE obj;
@@ -684,19 +457,11 @@ fgdbm_clear(obj)
struct dbmdata *dbmp;
GDBM_FILE dbm;
- rb_gdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
dbmp->di_size = -1;
-#if 0
- while (key = gdbm_firstkey(dbm), key.dptr) {
- if (gdbm_delete(dbm, key)) {
- free(key.dptr);
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
- }
- free(key.dptr);
- }
-#else
while (key = gdbm_firstkey(dbm), key.dptr) {
for (; key.dptr; key = nextkey) {
nextkey = gdbm_nextkey(dbm, key);
@@ -708,19 +473,11 @@ fgdbm_clear(obj)
free(key.dptr);
}
}
-#endif
dbmp->di_size = 0;
return obj;
}
-/*
- * call-seq:
- * gdbm.invert -> hash
- *
- * Returns a hash created by using _gdbm_'s values as keys, and the keys
- * as values.
- */
static VALUE
fgdbm_invert(obj)
VALUE obj;
@@ -730,7 +487,8 @@ fgdbm_invert(obj)
VALUE keystr, valstr;
VALUE hash = rb_hash_new();
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
valstr = rb_gdbm_fetch2(dbm, keystr);
@@ -740,8 +498,6 @@ fgdbm_invert(obj)
return hash;
}
-static VALUE each_pair _((VALUE));
-
static VALUE
each_pair(obj)
VALUE obj;
@@ -763,14 +519,6 @@ update_i(pair, dbm)
return Qnil;
}
-/*
- * call-seq:
- * gdbm.update(other) -> gdbm
- *
- * Adds the key-value pairs of _other_ to _gdbm_, overwriting entries with
- * duplicate keys with those from _other_. _other_ must have an each_pair
- * method.
- */
static VALUE
fgdbm_update(obj, other)
VALUE obj, other;
@@ -779,13 +527,6 @@ fgdbm_update(obj, other)
return obj;
}
-/*
- * call-seq:
- * gdbm.replace(other) -> gdbm
- *
- * Replaces the content of _gdbm_ with the key-value pairs of _other_.
- * _other_ must have an each_pair method.
- */
static VALUE
fgdbm_replace(obj, other)
VALUE obj, other;
@@ -795,13 +536,6 @@ fgdbm_replace(obj, other)
return obj;
}
-/*
- * call-seq:
- * gdbm[key]= value -> value
- * gdbm.store(key, value) -> value
- *
- * Associates the value _value_ with the specified _key_.
- */
static VALUE
fgdbm_store(obj, keystr, valstr)
VALUE obj, keystr, valstr;
@@ -810,33 +544,26 @@ fgdbm_store(obj, keystr, valstr)
struct dbmdata *dbmp;
GDBM_FILE dbm;
- rb_gdbm_modify(obj);
- StringValue(keystr);
- StringValue(valstr);
-
+ rb_secure(4);
+ keystr = rb_str_to_str(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
+ valstr = rb_str_to_str(valstr);
val.dptr = RSTRING(valstr)->ptr;
val.dsize = RSTRING(valstr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
dbmp->di_size = -1;
+ dbm = dbmp->di_dbm;
if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
- if (errno == EPERM) rb_sys_fail(0);
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+ if (errno == EPERM) rb_sys_fail(0);
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
return valstr;
}
-/*
- * call-seq:
- * gdbm.length -> fixnum
- * gdbm.size -> fixnum
- *
- * Returns the number of key-value pairs in this database.
- */
static VALUE
fgdbm_length(obj)
VALUE obj;
@@ -846,8 +573,9 @@ fgdbm_length(obj)
GDBM_FILE dbm;
int i = 0;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+ dbm = dbmp->di_dbm;
for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
nextkey = gdbm_nextkey(dbm, key);
@@ -859,17 +587,11 @@ fgdbm_length(obj)
return INT2FIX(i);
}
-/*
- * call-seq:
- * gdbm.empty? -> true or false
- *
- * Returns true if the database is empty.
- */
static VALUE
fgdbm_empty_p(obj)
VALUE obj;
{
- datum key;
+ datum key, nextkey;
struct dbmdata *dbmp;
GDBM_FILE dbm;
@@ -889,13 +611,6 @@ fgdbm_empty_p(obj)
return Qfalse;
}
-/*
- * call-seq:
- * gdbm.each_value { |value| block } -> gdbm
- *
- * Executes _block_ for each key in the database, passing the corresponding
- * _value_ as a parameter.
- */
static VALUE
fgdbm_each_value(obj)
VALUE obj;
@@ -904,23 +619,17 @@ fgdbm_each_value(obj)
GDBM_FILE dbm;
VALUE keystr;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
rb_yield(rb_gdbm_fetch2(dbm, keystr));
- GetDBM2(obj, dbmp, dbm);
}
return obj;
}
-/*
- * call-seq:
- * gdbm.each_key { |key| block } -> gdbm
- *
- * Executes _block_ for each key in the database, passing the
- * _key_ as a parameter.
- */
static VALUE
fgdbm_each_key(obj)
VALUE obj;
@@ -929,23 +638,17 @@ fgdbm_each_key(obj)
GDBM_FILE dbm;
VALUE keystr;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- rb_yield(keystr);
- GetDBM2(obj, dbmp, dbm);
+ rb_yield(rb_str_dup(keystr));
}
return obj;
}
-/*
- * call-seq:
- * gdbm.each_pair { |key, value| block } -> gdbm
- *
- * Executes _block_ for each key in the database, passing the _key_ and the
- * correspoding _value_ as a parameter.
- */
static VALUE
fgdbm_each_pair(obj)
VALUE obj;
@@ -954,23 +657,19 @@ fgdbm_each_pair(obj)
struct dbmdata *dbmp;
VALUE keystr;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- rb_yield(rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)));
- GetDBM2(obj, dbmp, dbm);
+ rb_yield(rb_assoc_new(rb_str_dup(keystr),
+ rb_gdbm_fetch2(dbm, keystr)));
}
return obj;
}
-/*
- * call-seq:
- * gdbm.keys -> array
- *
- * Returns an array of all keys of this database.
- */
static VALUE
fgdbm_keys(obj)
VALUE obj;
@@ -979,7 +678,9 @@ fgdbm_keys(obj)
GDBM_FILE dbm;
VALUE keystr, ary;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
ary = rb_ary_new();
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -990,12 +691,6 @@ fgdbm_keys(obj)
return ary;
}
-/*
- * call-seq:
- * gdbm.values -> array
- *
- * Returns an array of all values of this database.
- */
static VALUE
fgdbm_values(obj)
VALUE obj;
@@ -1005,26 +700,20 @@ fgdbm_values(obj)
GDBM_FILE dbm;
VALUE valstr, ary;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
ary = rb_ary_new();
for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
nextkey = gdbm_nextkey(dbm, key);
- valstr = rb_gdbm_fetch(dbm, key);
+ valstr = rb_gdbm_fetch(dbm, key);
free(key.dptr);
- rb_ary_push(ary, valstr);
+ rb_ary_push(ary, valstr);
}
return ary;
}
-/*
- * call-seq:
- * gdbm.has_key?(k) -> true or false
- * gdbm.key?(k) -> true or false
- *
- * Returns true if the given key _k_ exists within the database.
- * Returns false otherwise.
- */
static VALUE
fgdbm_has_key(obj, keystr)
VALUE obj, keystr;
@@ -1033,24 +722,17 @@ fgdbm_has_key(obj, keystr)
struct dbmdata *dbmp;
GDBM_FILE dbm;
- StringValue(keystr);
+ keystr = rb_str_to_str(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
if (gdbm_exists(dbm, key))
return Qtrue;
return Qfalse;
}
-/*
- * call-seq:
- * gdbm.has_value?(v) -> true or false
- * gdbm.value?(v) -> true or false
- *
- * Returns true if the given value _v_ exists within the database.
- * Returns false otherwise.
- */
static VALUE
fgdbm_has_value(obj, valstr)
VALUE obj, valstr;
@@ -1059,8 +741,9 @@ fgdbm_has_value(obj, valstr)
GDBM_FILE dbm;
VALUE keystr, valstr2;
- StringValue(valstr);
- GetDBM2(obj, dbmp, dbm);
+ valstr = rb_str_to_str(valstr);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -1076,12 +759,6 @@ fgdbm_has_value(obj, valstr)
return Qfalse;
}
-/*
- * call-seq:
- * gdbm.to_a -> array
- *
- * Returns an array of all key-value pairs contained in the database.
- */
static VALUE
fgdbm_to_a(obj)
VALUE obj;
@@ -1090,25 +767,20 @@ fgdbm_to_a(obj)
GDBM_FILE dbm;
VALUE keystr, ary;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
ary = rb_ary_new();
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
- rb_ary_push(ary, rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)));
+ rb_ary_push(ary, rb_assoc_new(rb_str_dup(keystr),
+ rb_gdbm_fetch2(dbm, keystr)));
}
return ary;
}
-/*
- * call-seq:
- * gdbm.reorganize -> gdbm
- *
- * Reorganizes the database file. This operation removes reserved space of
- * elements that have already been deleted. It is only useful after a lot of
- * deletions in the database.
- */
static VALUE
fgdbm_reorganize(obj)
VALUE obj;
@@ -1116,22 +788,13 @@ fgdbm_reorganize(obj)
struct dbmdata *dbmp;
GDBM_FILE dbm;
- rb_gdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
gdbm_reorganize(dbm);
return obj;
}
-/*
- * call-seq:
- * gdbm.sync -> gdbm
- *
- * Unless the _gdbm_ object has been opened with the *SYNC* flag, it is not
- * guarenteed that database modification operations are immediately applied to
- * the database file. This method ensures that all recent modifications
- * to the database are written to the file. Blocks until all writing operations
- * to the disk have been finished.
- */
static VALUE
fgdbm_sync(obj)
VALUE obj;
@@ -1139,18 +802,13 @@ fgdbm_sync(obj)
struct dbmdata *dbmp;
GDBM_FILE dbm;
- rb_gdbm_modify(obj);
- GetDBM2(obj, dbmp, dbm);
+ rb_secure(4);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
gdbm_sync(dbm);
return obj;
}
-/*
- * call-seq:
- * gdbm.cachesize = size -> size
- *
- * Sets the size of the internal bucket cache to _size_.
- */
static VALUE
fgdbm_set_cachesize(obj, val)
VALUE obj, val;
@@ -1159,24 +817,16 @@ fgdbm_set_cachesize(obj, val)
GDBM_FILE dbm;
int optval;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
optval = FIX2INT(val);
if (gdbm_setopt(dbm, GDBM_CACHESIZE, &optval, sizeof(optval)) == -1) {
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
return val;
}
-/*
- * call-seq:
- * gdbm.fastmode = boolean -> boolean
- *
- * Turns the database's fast mode on or off. If fast mode is turned on, gdbm
- * does not wait for writes to be flushed to the disk before continuing.
- *
- * This option is obsolete for gdbm >= 1.8 since fast mode is turned on by
- * default. See also: #syncmode=
- */
static VALUE
fgdbm_set_fastmode(obj, val)
VALUE obj, val;
@@ -1185,30 +835,19 @@ fgdbm_set_fastmode(obj, val)
GDBM_FILE dbm;
int optval;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
optval = 0;
if (RTEST(val))
optval = 1;
if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
return val;
}
-/*
- * call-seq:
- * gdbm.syncmode = boolean -> boolean
- *
- * Turns the database's synchronization mode on or off. If the synchronization
- * mode is turned on, the database's in-memory state will be synchronized to
- * disk after every database modification operation. If the synchronization
- * mode is turned off, GDBM does not wait for writes to be flushed to the disk
- * before continuing.
- *
- * This option is only available for gdbm >= 1.8 where syncmode is turned off
- * by default. See also: #fastmode=
- */
static VALUE
fgdbm_set_syncmode(obj, val)
VALUE obj, val;
@@ -1221,24 +860,20 @@ fgdbm_set_syncmode(obj, val)
GDBM_FILE dbm;
int optval;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
optval = 0;
if (RTEST(val))
optval = 1;
if (gdbm_setopt(dbm, GDBM_FASTMODE, &optval, sizeof(optval)) == -1) {
- rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
+ rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
}
return val;
#endif
}
-/*
- * call-seq:
- * gdbm.to_hash -> hash
- *
- * Returns a hash of all key-value pairs contained in the database.
- */
static VALUE
fgdbm_to_hash(obj)
VALUE obj;
@@ -1247,7 +882,9 @@ fgdbm_to_hash(obj)
GDBM_FILE dbm;
VALUE keystr, hash;
- GetDBM2(obj, dbmp, dbm);
+ GetDBM(obj, dbmp);
+ dbm = dbmp->di_dbm;
+
hash = rb_hash_new();
for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -1258,13 +895,6 @@ fgdbm_to_hash(obj)
return hash;
}
-/*
- * call-seq:
- * gdbm.reject { |key, value| block } -> hash
- *
- * Returns a hash copy of _gdbm_ where all key-value pairs from _gdbm_ for
- * which _block_ evaluates to true are removed. See also: #delete_if
- */
static VALUE
fgdbm_reject(obj)
VALUE obj;
@@ -1275,84 +905,74 @@ fgdbm_reject(obj)
void
Init_gdbm()
{
- rb_cGDBM = rb_define_class("GDBM", rb_cObject);
+ cGDBM = rb_define_class("GDBM", rb_cObject);
rb_eGDBMError = rb_define_class("GDBMError", rb_eStandardError);
- rb_eGDBMFatalError = rb_define_class("GDBMFatalError", rb_eException);
- rb_include_module(rb_cGDBM, rb_mEnumerable);
-
- rb_define_alloc_func(rb_cGDBM, fgdbm_s_alloc);
- rb_define_singleton_method(rb_cGDBM, "open", fgdbm_s_open, -1);
-
- rb_define_method(rb_cGDBM, "initialize", fgdbm_initialize, -1);
- rb_define_method(rb_cGDBM, "close", fgdbm_close, 0);
- rb_define_method(rb_cGDBM, "closed?", fgdbm_closed, 0);
- rb_define_method(rb_cGDBM, "[]", fgdbm_aref, 1);
- rb_define_method(rb_cGDBM, "fetch", fgdbm_fetch_m, -1);
- rb_define_method(rb_cGDBM, "[]=", fgdbm_store, 2);
- rb_define_method(rb_cGDBM, "store", fgdbm_store, 2);
- rb_define_method(rb_cGDBM, "index", fgdbm_index, 1);
- rb_define_method(rb_cGDBM, "indexes", fgdbm_indexes, -1);
- rb_define_method(rb_cGDBM, "indices", fgdbm_indexes, -1);
- rb_define_method(rb_cGDBM, "select", fgdbm_select, -1);
- rb_define_method(rb_cGDBM, "values_at", fgdbm_values_at, -1);
- rb_define_method(rb_cGDBM, "length", fgdbm_length, 0);
- rb_define_method(rb_cGDBM, "size", fgdbm_length, 0);
- rb_define_method(rb_cGDBM, "empty?", fgdbm_empty_p, 0);
- rb_define_method(rb_cGDBM, "each", fgdbm_each_pair, 0);
- rb_define_method(rb_cGDBM, "each_value", fgdbm_each_value, 0);
- rb_define_method(rb_cGDBM, "each_key", fgdbm_each_key, 0);
- rb_define_method(rb_cGDBM, "each_pair", fgdbm_each_pair, 0);
- rb_define_method(rb_cGDBM, "keys", fgdbm_keys, 0);
- rb_define_method(rb_cGDBM, "values", fgdbm_values, 0);
- rb_define_method(rb_cGDBM, "shift", fgdbm_shift, 0);
- rb_define_method(rb_cGDBM, "delete", fgdbm_delete, 1);
- rb_define_method(rb_cGDBM, "delete_if", fgdbm_delete_if, 0);
- rb_define_method(rb_cGDBM, "reject!", fgdbm_delete_if, 0);
- rb_define_method(rb_cGDBM, "reject", fgdbm_reject, 0);
- rb_define_method(rb_cGDBM, "clear", fgdbm_clear, 0);
- rb_define_method(rb_cGDBM, "invert", fgdbm_invert, 0);
- rb_define_method(rb_cGDBM, "update", fgdbm_update, 1);
- rb_define_method(rb_cGDBM, "replace", fgdbm_replace, 1);
- rb_define_method(rb_cGDBM, "reorganize", fgdbm_reorganize, 0);
- rb_define_method(rb_cGDBM, "sync", fgdbm_sync, 0);
- /* rb_define_method(rb_cGDBM, "setopt", fgdbm_setopt, 2); */
- rb_define_method(rb_cGDBM, "cachesize=", fgdbm_set_cachesize, 1);
- rb_define_method(rb_cGDBM, "fastmode=", fgdbm_set_fastmode, 1);
- rb_define_method(rb_cGDBM, "syncmode=", fgdbm_set_syncmode, 1);
-
- rb_define_method(rb_cGDBM, "include?", fgdbm_has_key, 1);
- rb_define_method(rb_cGDBM, "has_key?", fgdbm_has_key, 1);
- rb_define_method(rb_cGDBM, "member?", fgdbm_has_key, 1);
- rb_define_method(rb_cGDBM, "has_value?", fgdbm_has_value, 1);
- rb_define_method(rb_cGDBM, "key?", fgdbm_has_key, 1);
- rb_define_method(rb_cGDBM, "value?", fgdbm_has_value, 1);
-
- rb_define_method(rb_cGDBM, "to_a", fgdbm_to_a, 0);
- rb_define_method(rb_cGDBM, "to_hash", fgdbm_to_hash, 0);
-
- /* flag for #new and #open: open database as a reader */
- rb_define_const(rb_cGDBM, "READER", INT2FIX(GDBM_READER|RUBY_GDBM_RW_BIT));
- /* flag for #new and #open: open database as a writer */
- rb_define_const(rb_cGDBM, "WRITER", INT2FIX(GDBM_WRITER|RUBY_GDBM_RW_BIT));
- /* flag for #new and #open: open database as a writer; if the database does not exist, create a new one */
- rb_define_const(rb_cGDBM, "WRCREAT", INT2FIX(GDBM_WRCREAT|RUBY_GDBM_RW_BIT));
- /* flag for #new and #open: open database as a writer; overwrite any existing databases */
- rb_define_const(rb_cGDBM, "NEWDB", INT2FIX(GDBM_NEWDB|RUBY_GDBM_RW_BIT));
-
- /* flag for #new and #open. this flag is obsolete for gdbm >= 1.8 */
- rb_define_const(rb_cGDBM, "FAST", INT2FIX(GDBM_FAST));
+ rb_include_module(cGDBM, rb_mEnumerable);
+
+ rb_define_singleton_method(cGDBM, "new", fgdbm_s_new, -1);
+ rb_define_singleton_method(cGDBM, "open", fgdbm_s_open, -1);
+
+ rb_define_method(cGDBM, "initialize", fgdbm_initialize, -1);
+ rb_define_method(cGDBM, "close", fgdbm_close, 0);
+ rb_define_method(cGDBM, "[]", fgdbm_aref, 1);
+ rb_define_method(cGDBM, "fetch", fgdbm_fetch_m, -1);
+ rb_define_method(cGDBM, "[]=", fgdbm_store, 2);
+ rb_define_method(cGDBM, "store", fgdbm_store, 2);
+ rb_define_method(cGDBM, "index", fgdbm_index, 1);
+ rb_define_method(cGDBM, "indexes", fgdbm_indexes, -1);
+ rb_define_method(cGDBM, "indices", fgdbm_indexes, -1);
+ rb_define_method(cGDBM, "length", fgdbm_length, 0);
+ rb_define_alias(cGDBM, "size", "length");
+ rb_define_method(cGDBM, "empty?", fgdbm_empty_p, 0);
+ rb_define_method(cGDBM, "each", fgdbm_each_pair, 0);
+ rb_define_method(cGDBM, "each_value", fgdbm_each_value, 0);
+ rb_define_method(cGDBM, "each_key", fgdbm_each_key, 0);
+ rb_define_method(cGDBM, "each_pair", fgdbm_each_pair, 0);
+ rb_define_method(cGDBM, "keys", fgdbm_keys, 0);
+ rb_define_method(cGDBM, "values", fgdbm_values, 0);
+ rb_define_method(cGDBM, "shift", fgdbm_shift, 0);
+ rb_define_method(cGDBM, "delete", fgdbm_delete, 1);
+ rb_define_method(cGDBM, "delete_if", fgdbm_delete_if, 0);
+ rb_define_method(cGDBM, "reject!", fgdbm_delete_if, 0);
+ rb_define_method(cGDBM, "reject", fgdbm_reject, 0);
+ rb_define_method(cGDBM, "clear", fgdbm_clear, 0);
+ rb_define_method(cGDBM,"invert", fgdbm_invert, 0);
+ rb_define_method(cGDBM,"update", fgdbm_update, 1);
+ rb_define_method(cGDBM,"replace", fgdbm_replace, 1);
+ rb_define_method(cGDBM,"reorganize", fgdbm_reorganize, 0);
+ rb_define_method(cGDBM,"sync", fgdbm_sync, 0);
+ /* rb_define_method(cGDBM,"setopt", fgdbm_setopt, 2); */
+ rb_define_method(cGDBM,"cachesize=", fgdbm_set_cachesize, 1);
+ rb_define_method(cGDBM,"fastmode=", fgdbm_set_fastmode, 1);
+ rb_define_method(cGDBM,"syncmode=", fgdbm_set_syncmode, 1);
+
+ rb_define_method(cGDBM, "include?", fgdbm_has_key, 1);
+ rb_define_method(cGDBM, "has_key?", fgdbm_has_key, 1);
+ rb_define_method(cGDBM, "member?", fgdbm_has_key, 1);
+ rb_define_method(cGDBM, "has_value?", fgdbm_has_value, 1);
+ rb_define_method(cGDBM, "key?", fgdbm_has_key, 1);
+ rb_define_method(cGDBM, "value?", fgdbm_has_value, 1);
+
+ rb_define_method(cGDBM, "to_a", fgdbm_to_a, 0);
+ rb_define_method(cGDBM, "to_hash", fgdbm_to_hash, 0);
+
+ /* flags for gdbm_opn() */
+ /*
+ rb_define_const(cGDBM, "READER", INT2FIX(GDBM_READER));
+ rb_define_const(cGDBM, "WRITER", INT2FIX(GDBM_WRITER));
+ rb_define_const(cGDBM, "WRCREAT", INT2FIX(GDBM_WRCREAT));
+ rb_define_const(cGDBM, "NEWDB", INT2FIX(GDBM_NEWDB));
+ */
+ rb_define_const(cGDBM, "FAST", INT2FIX(GDBM_FAST));
/* this flag is obsolete in gdbm 1.8.
On gdbm 1.8, fast mode is default behavior. */
/* gdbm version 1.8 specific */
#if defined(GDBM_SYNC)
- /* flag for #new and #open. only for gdbm >= 1.8 */
- rb_define_const(rb_cGDBM, "SYNC", INT2FIX(GDBM_SYNC));
+ rb_define_const(cGDBM, "SYNC", INT2FIX(GDBM_SYNC));
#endif
#if defined(GDBM_NOLOCK)
- /* flag for #new and #open */
- rb_define_const(rb_cGDBM, "NOLOCK", INT2FIX(GDBM_NOLOCK));
+ rb_define_const(cGDBM, "NOLOCK", INT2FIX(GDBM_NOLOCK));
#endif
- /* version of the gdbm library*/
- rb_define_const(rb_cGDBM, "VERSION", rb_str_new2(gdbm_version));
+ rb_define_const(cGDBM, "VERSION", rb_str_new2(gdbm_version));
}
diff --git a/ext/iconv/.cvsignore b/ext/iconv/.cvsignore
deleted file mode 100644
index 394787fced..0000000000
--- a/ext/iconv/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-mkmf.log
-*.def
-iconv.rb
-config.charset
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
deleted file mode 100644
index aed4644290..0000000000
--- a/ext/iconv/charset_alias.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /usr/bin/ruby
-# :stopdoc:
-require 'rbconfig'
-require 'optparse'
-
-# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
-# Fri, 30 May 2003 00:09:00 GMT'
-
-OS = Config::CONFIG["target_os"]
-SHELL = Config::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 |opt|
- 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
deleted file mode 100644
index 688ddd97b7..0000000000
--- a/ext/iconv/depend
+++ /dev/null
@@ -1,2 +0,0 @@
-iconv.o: iconv.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h \
- $(hdrdir)/intern.h
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
deleted file mode 100644
index a9d0cfb5e6..0000000000
--- a/ext/iconv/extconf.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-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")
- 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
- 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
deleted file mode 100644
index 65fed33bd2..0000000000
--- a/ext/iconv/iconv.c
+++ /dev/null
@@ -1,910 +0,0 @@
-/* -*- mode:c; c-file-style:"ruby" -*- */
-/**********************************************************************
-
- iconv.c -
-
- $Author$
- $Date$
- created at: Wed Dec 1 20:28:09 JST 1999
-
- All the files in this distribution are covered under the Ruby's
- license (see the file COPYING).
-
- Documentation by Yukihiro Matsumoto and Gavin Sinclair.
-
-**********************************************************************/
-
-#include "ruby.h"
-#include <errno.h>
-#include <iconv.h>
-#include <assert.h>
-#include "st.h"
-#include "intern.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. 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
- *
- * 2. Invoke Iconv.open with a block.
- *
- * Iconv.open(to, from) do |cd|
- * input.each { |s| output << cd.iconv(s) }
- * output << cd.iconv(nil)
- * end
- *
- * 3. Shorthand for (2).
- *
- * Iconv.iconv(to, from, *input.to_a)
- *
- * 4. Simple conversion between two charsets.
- *
- * converted_text = Iconv.new('iso-8859-15', 'utf-8').iconv(text)
- */
-
-/* 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;
- VALUE (*append)_((VALUE, VALUE));
-};
-
-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_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));
-static void iconv_dfree _((void *cd));
-static VALUE iconv_free _((VALUE cd));
-static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
-static VALUE rb_str_derive _((VALUE str, const char* ptr, int len));
-static VALUE iconv_convert _((iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env));
-static VALUE iconv_s_allocate _((VALUE klass));
-static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from));
-static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from));
-static VALUE iconv_s_convert _((struct iconv_env_t* env));
-static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self));
-static VALUE iconv_init_state _((VALUE cd));
-static VALUE iconv_finish _((VALUE self));
-static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
-
-static VALUE 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 char *
-map_charset
-#ifdef HAVE_PROTOTYPES
- (VALUE *code)
-#else /* HAVE_PROTOTYPES */
- (code)
- VALUE *code;
-#endif /* HAVE_PROTOTYPES */
-{
- VALUE val = *code;
-
- if (RHASH(charset_map)->tbl && RHASH(charset_map)->tbl->num_entries) {
- VALUE key = rb_funcall2(val, rb_intern("downcase"), 0, 0);
- StringValuePtr(key);
- if (st_lookup(RHASH(charset_map)->tbl, key, &val)) {
- *code = val;
- }
- }
- return StringValuePtr(*code);
-}
-
-static iconv_t
-iconv_create
-#ifdef HAVE_PROTOTYPES
- (VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
- (to, from)
- VALUE to;
- VALUE from;
-#endif /* HAVE_PROTOTYPES */
-{
- const char* tocode = map_charset(&to);
- const char* fromcode = map_charset(&from);
-
- iconv_t cd = iconv_open(tocode, fromcode);
-
- if (cd == (iconv_t)-1) {
- switch (errno) {
- case EMFILE:
- case ENFILE:
- case ENOMEM:
- rb_gc();
- cd = iconv_open(tocode, fromcode);
- }
- if (cd == (iconv_t)-1) {
- int inval = errno == EINVAL;
- char *s = inval ? "invalid encoding " : "iconv";
- volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
- RSTRING(from)->len + 8);
-
- sprintf(RSTRING(msg)->ptr, "%s(\"%s\", \"%s\")",
- s, RSTRING(to)->ptr, RSTRING(from)->ptr);
- s = RSTRING(msg)->ptr;
- RSTRING(msg)->len = strlen(s);
- if (!inval) rb_sys_fail(s);
- iconv_fail(rb_eIconvInvalidEncoding,
- Qnil, rb_ary_new3(2, to, from), NULL, s);
- }
- }
-
- return cd;
-}
-
-static void
-iconv_dfree
-#ifdef HAVE_PROTOTYPES
- (void *cd)
-#else /* HAVE_PROTOTYPES */
- (cd)
- void *cd;
-#endif /* HAVE_PROTOTYPES */
-{
- iconv_close(VALUE2ICONV(cd));
-}
-
-#define ICONV_FREE iconv_dfree
-
-static VALUE
-iconv_free
-#ifdef HAVE_PROTOTYPES
- (VALUE cd)
-#else /* HAVE_PROTOTYPES */
- (cd)
- VALUE cd;
-#endif /* HAVE_PROTOTYPES */
-{
- if (cd && iconv_close(VALUE2ICONV(cd)) == -1)
- rb_sys_fail("iconv_close");
- return Qnil;
-}
-
-static VALUE
-check_iconv
-#ifdef HAVE_PROTOTYPES
- (VALUE obj)
-#else /* HAVE_PROTOTYPES */
- (obj)
- VALUE obj;
-#endif /* HAVE_PROTOTYPES */
-{
- Check_Type(obj, T_DATA);
- if (RDATA(obj)->dfree != ICONV_FREE) {
- rb_raise(rb_eArgError, "Iconv expected (%s)", rb_class2name(CLASS_OF(obj)));
- }
- return (VALUE)DATA_PTR(obj);
-}
-
-static VALUE
-iconv_try
-#ifdef HAVE_PROTOTYPES
- (iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)
-#else /* HAVE_PROTOTYPES */
- (cd, inptr, inlen, outptr, outlen)
- iconv_t cd;
- const char **inptr;
- size_t *inlen;
- char **outptr;
- size_t *outlen;
-#endif /* HAVE_PROTOTYPES */
-{
-#ifdef ICONV_INPTR_CONST
-#define ICONV_INPTR_CAST
-#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
-#ifdef HAVE_PROTOTYPES
- (VALUE error, VALUE mesg, VALUE success, VALUE failed)
-#else /* HAVE_PROTOTYPES */
- (error, mesg, success, failed)
- VALUE error, mesg, success, failed;
-#endif /* HAVE_PROTOTYPES */
-{
- rb_call_super(1, &mesg);
- rb_ivar_set(error, rb_success, success);
- rb_ivar_set(error, rb_failed, failed);
- return error;
-}
-
-static VALUE
-iconv_fail
-#ifdef HAVE_PROTOTYPES
- (VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg)
-#else /* HAVE_PROTOTYPES */
- (error, success, failed, env, mesg)
- VALUE error, success, failed;
- struct iconv_env_t *env;
- const char *mesg;
-#endif /* HAVE_PROTOTYPES */
-{
- VALUE args[3];
-
- if (mesg && *mesg) {
- args[0] = rb_str_new2(mesg);
- }
- else if (TYPE(failed) != T_STRING || RSTRING(failed)->len < 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);
- }
- }
- error = rb_class_new_instance(3, args, error);
- if (!rb_block_given_p()) rb_exc_raise(error);
- ruby_errinfo = error;
- return rb_yield(failed);
-}
-
-static VALUE
-rb_str_derive
-#ifdef HAVE_PROTOTYPES
- (VALUE str, const char* ptr, int len)
-#else /* HAVE_PROTOTYPES */
- (str, ptr, len)
- VALUE str;
- const char *ptr;
- int len;
-#endif /* HAVE_PROTOTYPES */
-{
- VALUE ret;
-
- if (NIL_P(str))
- return rb_str_new(ptr, len);
- if (RSTRING(str)->ptr == ptr && RSTRING(str)->len == len)
- return str;
- if (RSTRING(str)->ptr + RSTRING(str)->len == ptr + len)
- ret = rb_str_substr(str, ptr - RSTRING(str)->ptr, len);
- else
- ret = rb_str_new(ptr, len);
- OBJ_INFECT(ret, str);
- return ret;
-}
-
-static VALUE
-iconv_convert
-#ifdef HAVE_PROTOTYPES
- (iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env)
-#else /* HAVE_PROTOTYPES */
- (cd, str, start, length, env)
- iconv_t cd;
- VALUE str;
- int start;
- int length;
- struct iconv_env_t *env;
-#endif /* HAVE_PROTOTYPES */
-{
- 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(error, Qnil, Qnil, env, 0);
- if (TYPE(rescue) == T_ARRAY) {
- str = RARRAY(rescue)->len > 0 ? RARRAY(rescue)->ptr[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 {
- int slen;
-
- StringValue(str);
- slen = RSTRING(str)->len;
- inptr = RSTRING(str)->ptr;
-
- if (start < 0 ? (start += slen) < 0 : start >= slen)
- length = 0;
- else if (length < 0 && (length += slen + 1) < 0)
- length = 0;
- else if ((length -= start) < 0)
- length = 0;
- else
- inptr += 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 (0 <= outlen && outlen <= sizeof(buffer)) {
- outlen = sizeof(buffer) - outlen;
- if (NIL_P(error) || /* something converted */
- outlen > inptr - tmpstart || /* input can't contain output */
- (outlen < inptr - tmpstart && inlen > 0) || /* something skipped */
- memcmp(buffer, tmpstart, outlen)) /* something differs */
- {
- if (NIL_P(str)) {
- ret = rb_str_new(buffer, outlen);
- }
- else {
- if (ret) {
- ret = rb_str_buf_cat(ret, instart, tmpstart - instart);
- }
- else {
- ret = rb_str_new(instart, tmpstart - instart);
- 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);
- else if (inptr > instart)
- rb_str_cat(ret, instart, inptr - instart);
- str = rb_str_derive(str, inptr, inlen);
- rescue = iconv_fail(error, ret, str, env, errmsg);
- if (TYPE(rescue) == T_ARRAY) {
- if ((len = RARRAY(rescue)->len) > 0)
- rb_str_concat(ret, RARRAY(rescue)->ptr[0]);
- if (len > 1 && !NIL_P(str = RARRAY(rescue)->ptr[1])) {
- StringValue(str);
- inlen = length = RSTRING(str)->len;
- instart = inptr = RSTRING(str)->ptr;
- 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);
- else if (inptr > instart)
- rb_str_cat(ret, instart, inptr - instart);
- return ret;
-}
-
-static VALUE
-iconv_s_allocate
-#ifdef HAVE_PROTOTYPES
- (VALUE klass)
-#else /* HAVE_PROTOTYPES */
- (klass)
- VALUE klass;
-#endif /* HAVE_PROTOTYPES */
-{
- return Data_Wrap_Struct(klass, 0, ICONV_FREE, 0);
-}
-
-/*
- * Document-method: new
- * call-seq: Iconv.new(to, from)
- *
- * 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
- *
- * === 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
-#ifdef HAVE_PROTOTYPES
- (VALUE self, VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
- (self, to, from)
- VALUE self;
- VALUE to;
- VALUE from;
-#endif /* HAVE_PROTOTYPES */
-{
- iconv_free(check_iconv(self));
- DATA_PTR(self) = NULL;
- DATA_PTR(self) = (void *)ICONV2VALUE(iconv_create(to, from));
- 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
-#ifdef HAVE_PROTOTYPES
- (VALUE self, VALUE to, VALUE from)
-#else /* HAVE_PROTOTYPES */
- (self, to, from)
- VALUE self;
- VALUE to;
- VALUE from;
-#endif /* HAVE_PROTOTYPES */
-{
- VALUE cd = ICONV2VALUE(iconv_create(to, from));
-
- self = Data_Wrap_Struct(self, NULL, ICONV_FREE, (void *)cd);
- if (rb_block_given_p()) {
- return rb_ensure(rb_yield, self, (VALUE(*)())iconv_finish, self);
- }
- else {
- return self;
- }
-}
-
-static VALUE
-iconv_s_convert
-#ifdef HAVE_PROTOTYPES
- (struct iconv_env_t* env)
-#else /* HAVE_PROTOTYPES */
- (env)
- struct iconv_env_t *env;
-#endif /* HAVE_PROTOTYPES */
-{
- VALUE last = 0;
-
- for (; env->argc > 0; --env->argc, ++env->argv) {
- VALUE s = iconv_convert(env->cd, last = *(env->argv), 0, -1, env);
- env->append(env->ret, s);
- }
-
- if (!NIL_P(last)) {
- VALUE s = iconv_convert(env->cd, Qnil, 0, 0, env);
- if (RSTRING(s)->len)
- env->append(env->ret, s);
- }
-
- return env->ret;
-}
-
-/*
- * Document-method: 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
-#ifdef HAVE_PROTOTYPES
- (int argc, VALUE *argv, VALUE self)
-#else /* HAVE_PROTOTYPES */
- (argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
- struct iconv_env_t arg;
-
- 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]);
- 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
-#ifdef HAVE_PROTOTYPES
- (VALUE self, VALUE to, VALUE from, VALUE str)
-#else /* HAVE_PROTOTYPES */
- (self, to, from, str)
- VALUE self, to, from, str;
-#endif /* HAVE_PROTOTYPES */
-{
- struct iconv_env_t arg;
-
- arg.argc = 1;
- arg.argv = &str;
- arg.append = rb_str_append;
- arg.ret = rb_str_new(0, 0);
- arg.cd = iconv_create(to, from);
- return rb_ensure(iconv_s_convert, (VALUE)&arg, iconv_free, ICONV2VALUE(arg.cd));
-}
-
-/*
- * 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
-#ifdef HAVE_PROTOTYPES
- (VALUE cd)
-#else /* HAVE_PROTOTYPES */
- (cd)
- VALUE cd;
-#endif /* HAVE_PROTOTYPES */
-{
- return iconv_convert(VALUE2ICONV(cd), Qnil, 0, 0, NULL);
-}
-
-static VALUE
-iconv_finish
-#ifdef HAVE_PROTOTYPES
- (VALUE self)
-#else /* HAVE_PROTOTYPES */
- (self)
- VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
- VALUE cd = check_iconv(self);
-
- if (!cd) return Qnil;
- DATA_PTR(self) = NULL;
-
- return rb_ensure(iconv_init_state, cd, iconv_free, cd);
-}
-
-/*
- * Document-method: 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
-#ifdef HAVE_PROTOTYPES
- (int argc, VALUE *argv, VALUE self)
-#else /* HAVE_PROTOTYPES */
- (argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
- VALUE str, n1, n2;
- VALUE cd = check_iconv(self);
-
- n1 = n2 = Qnil;
- rb_scan_args(argc, argv, "12", &str, &n1, &n2);
-
- return iconv_convert(VALUE2ICONV(cd), str,
- NIL_P(n1) ? 0 : NUM2INT(n1),
- NIL_P(n2) ? -1 : NUM2INT(n2),
- NULL);
-}
-
-/*
- * 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
-#ifdef HAVE_PROTOTYPES
-(VALUE self)
-#else /* HAVE_PROTOTYPES */
- (self)
- VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
- 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
-#ifdef HAVE_PROTOTYPES
-(VALUE self)
-#else /* HAVE_PROTOTYPES */
- (self)
- VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
- 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
-#ifdef HAVE_PROTOTYPES
- (VALUE self)
-#else /* HAVE_PROTOTYPES */
- (self)
- VALUE self;
-#endif /* HAVE_PROTOTYPES */
-{
- 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, 2);
- rb_define_singleton_method(rb_cIconv, "iconv", iconv_s_iconv, -1);
- rb_define_singleton_method(rb_cIconv, "conv", iconv_s_conv, 3);
- rb_define_method(rb_cIconv, "initialize", iconv_initialize, 2);
- rb_define_method(rb_cIconv, "close", iconv_finish, 0);
- rb_define_method(rb_cIconv, "iconv", iconv_iconv, -1);
-
- rb_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");
-
- 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/io/wait/extconf.rb b/ext/io/wait/extconf.rb
deleted file mode 100644
index e8181d25f5..0000000000
--- a/ext/io/wait/extconf.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'mkmf'
-target = "io/wait"
-
-unless macro_defined?("DOSISH", "#include <ruby.h>")
- fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
- have_macro("FIONREAD", h)
- end
- if fionread
- $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
- create_makefile(target)
- end
-else
- if have_func("rb_w32_ioctlsocket", "ruby.h")
- have_func("rb_w32_is_socket", "ruby.h")
- create_makefile(target)
- end
-end
diff --git a/ext/io/wait/lib/nonblock.rb b/ext/io/wait/lib/nonblock.rb
deleted file mode 100644
index 2103fdf25b..0000000000
--- a/ext/io/wait/lib/nonblock.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "fcntl"
-class IO
- def nonblock?
- (fcntl(Fcntl::F_GETFL) & File::NONBLOCK) != 0
- end
-
- def nonblock=(nb)
- f = fcntl(Fcntl::F_GETFL)
- if nb
- f |= File::NONBLOCK
- else
- f &= ~File::NONBLOCK
- end
- fcntl(Fcntl::F_SETFL, f)
- end
-
- def nonblock(nb = true)
- nb, self.nonblock = nonblock?, nb
- yield
- ensure
- self.nonblock = nb
- end
-end if defined?(Fcntl::F_GETFL)
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
deleted file mode 100644
index 61d6527b36..0000000000
--- a/ext/io/wait/wait.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/**********************************************************************
-
- io/wait.c -
-
- $Author$
- $Date$
- created at: Tue Aug 28 09:08:06 JST 2001
-
- All the files in this distribution are covered under the Ruby's
- license (see the file COPYING).
-
-**********************************************************************/
-
-#include "ruby.h"
-#include "rubyio.h"
-
-#include <sys/types.h>
-#if defined(FIONREAD_HEADER)
-#include FIONREAD_HEADER
-#endif
-
-#ifdef HAVE_RB_W32_IOCTLSOCKET
-#define ioctl ioctlsocket
-#define ioctl_arg u_long
-#define ioctl_arg2num(i) ULONG2NUM(i)
-#else
-#define ioctl_arg int
-#define ioctl_arg2num(i) INT2NUM(i)
-#endif
-
-#ifdef HAVE_RB_W32_IS_SOCKET
-#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
-#else
-#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
-#endif
-
-static VALUE io_ready_p _((VALUE io));
-static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
-void Init_wait _((void));
-
-EXTERN struct timeval rb_time_interval _((VALUE time));
-
-/*
-=begin
-= IO wait methods.
-=end
- */
-
-/*
-=begin
---- IO#ready?
- returns non-nil if input available without blocking, or nil.
-=end
-*/
-static VALUE
-io_ready_p(io)
- VALUE io;
-{
- OpenFile *fptr;
- FILE *fp;
- ioctl_arg n;
-
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
- if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
- fp = fptr->f;
- if (feof(fp)) return Qfalse;
- if (rb_read_pending(fp)) return Qtrue;
- if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
- if (n > 0) return ioctl_arg2num(n);
- return Qnil;
-}
-
-/*
-=begin
---- IO#wait([timeout])
- waits until input available or timed out and returns self, or nil
- when EOF reached.
-=end
-*/
-static VALUE
-io_wait(argc, argv, io)
- int argc;
- VALUE *argv;
- VALUE io;
-{
- OpenFile *fptr;
- fd_set rd;
- FILE *fp;
- int fd;
- ioctl_arg n;
- VALUE timeout;
- struct timeval *tp, timerec;
-
- GetOpenFile(io, fptr);
- rb_io_check_readable(fptr);
- rb_scan_args(argc, argv, "01", &timeout);
- if (NIL_P(timeout)) {
- tp = 0;
- }
- else {
- timerec = rb_time_interval(timeout);
- tp = &timerec;
- }
-
- fp = fptr->f;
- if (feof(fp)) return Qfalse;
- if (rb_read_pending(fp)) return Qtrue;
- fd = fileno(fp);
- FD_ZERO(&rd);
- FD_SET(fd, &rd);
- if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
- rb_sys_fail(0);
- rb_io_check_closed(fptr);
- if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
- if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
- if (n > 0) return io;
- return Qnil;
-}
-
-void
-Init_wait()
-{
- rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
- rb_define_method(rb_cIO, "wait", io_wait, -1);
-}
diff --git a/ext/enumerator/.cvsignore b/ext/md5/.cvsignore
index fc802ff1c2..f3c7a7c5da 100644
--- a/ext/enumerator/.cvsignore
+++ b/ext/md5/.cvsignore
@@ -1,2 +1 @@
Makefile
-mkmf.log
diff --git a/ext/md5/MANIFEST b/ext/md5/MANIFEST
new file mode 100644
index 0000000000..189a482afb
--- /dev/null
+++ b/ext/md5/MANIFEST
@@ -0,0 +1,8 @@
+MANIFEST
+depend
+extconf.rb
+md5.txt
+md5.txt.jp
+md5.h
+md5c.c
+md5init.c
diff --git a/ext/md5/depend b/ext/md5/depend
new file mode 100644
index 0000000000..14427861f8
--- /dev/null
+++ b/ext/md5/depend
@@ -0,0 +1,2 @@
+md5c.o: md5c.c md5.h $(topdir)/config.h
+md5init.o: md5init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h md5.h
diff --git a/ext/md5/extconf.rb b/ext/md5/extconf.rb
new file mode 100644
index 0000000000..a57a976a39
--- /dev/null
+++ b/ext/md5/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+$CFLAGS += " -DHAVE_CONFIG_H"
+create_makefile('md5')
diff --git a/ext/md5/md5.h b/ext/md5/md5.h
new file mode 100644
index 0000000000..81a6d7ff36
--- /dev/null
+++ b/ext/md5/md5.h
@@ -0,0 +1,86 @@
+/* MD5.H - header file for MD5C.C
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+/* ========== include global.h ========== */
+/* GLOBAL.H - RSAREF types and constants
+ */
+
+/* PROTOTYPES should be set to one if and only if the compiler supports
+ function argument prototyping.
+The following makes PROTOTYPES default to 0 if it has not already
+ been defined with C compiler flags.
+ */
+#ifdef HAVE_PROTOTYPES
+#define PROTOTYPES 1
+#endif
+#ifndef PROTOTYPES
+#define PROTOTYPES 0
+#endif
+
+/* POINTER defines a generic pointer type */
+typedef unsigned char *POINTER;
+
+/* UINT2 defines a two byte word */
+typedef unsigned short int UINT2;
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#else
+/* Wild guess */
+#define LONG_MAX 2147483647L
+#endif
+
+/* UINT4 defines a four byte word */
+#if defined(INT_MAX) && INT_MAX == 2147483647
+typedef unsigned int UINT4;
+#else
+#if defined(LONG_MAX) && LONG_MAX == 2147483647L
+typedef unsigned long int UINT4;
+#endif
+/* Too bad if neither is */
+#endif
+
+/* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
+If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
+ returns an empty list.
+ */
+#if PROTOTYPES
+#define PROTO_LIST(list) list
+#else
+#define PROTO_LIST(list) ()
+#endif
+/* ========== End global.h; continue md5.h ========== */
+
+/* MD5 context. */
+typedef struct {
+ UINT4 state[4]; /* state (ABCD) */
+ UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
+ unsigned char buffer[64]; /* input buffer */
+} MD5_CTX;
+
+void MD5Init PROTO_LIST ((MD5_CTX *));
+void MD5Update PROTO_LIST
+ ((MD5_CTX *, unsigned char *, unsigned int));
+void MD5Final PROTO_LIST ((unsigned char [16], MD5_CTX *));
diff --git a/ext/md5/md5.txt b/ext/md5/md5.txt
new file mode 100644
index 0000000000..1d58306cf5
--- /dev/null
+++ b/ext/md5/md5.txt
@@ -0,0 +1,50 @@
+.\" md5.doc - -*- Indented-Text -*- created at: Fri Aug 2 12:01:27 JST 1996
+
+** MD5(Class)
+
+A class to implement MD5 Message-Digest Algorithm by RSA Data
+Security, Inc., described in RFC1321.
+
+Superclass: Object
+
+Class Methods:
+
+ new([str])
+ md5([str])
+
+ Creates a new MD5 object. If a string argument is given, it
+ is added to the object. (see update.)
+
+Methods:
+
+ clone
+
+ Copies the MD5 object.
+
+ digest
+
+ Returns the MD5 hash of the added strings as a string of 16
+ bytes.
+
+ hexdigest
+
+ Returns the MD5 hash of the added strings as a string of 32
+ hexadecimal digits. This method is equal to:
+
+ def hexdigest
+ ret = ''
+ digest.each_byte {|i| ret << sprintf('%02x', i) }
+ ret
+ end
+
+ update(str)
+
+ Update the MD5 object with the string str. Repeated calls are
+ equivalent to a single call with the concatenation of all the
+ arguments, i.e. m.update(a); m.update(b) is equivalent to
+ m.update(a+b).
+
+-------------------------------------------------------
+Local variables:
+fill-column: 70
+end:
diff --git a/ext/md5/md5.txt.jp b/ext/md5/md5.txt.jp
new file mode 100644
index 0000000000..b71dd9bfc9
--- /dev/null
+++ b/ext/md5/md5.txt.jp
@@ -0,0 +1,50 @@
+.\" md5.doc - -*- Indented-Text -*- created at: Fri Aug 2 12:01:27 JST 1996
+
+** MD5()
+
+RFC1321RSA Data Security, Inc. MD5 Message-Digest
+Algorithm
+
+Superclass: Object
+
+Class Methods:
+
+ new([str])
+ md5([str])
+
+ MD5
+ (see update)
+
+Methods:
+
+ clone
+
+ MD5
+
+ digest
+
+ 16
+
+
+ hexdigest
+
+ ASCII
+ 16'fe5c2235f48d2bcc911afabea23cd5aa'32
+ Ruby
+
+ def hexdigest
+ ret = ''
+ digest.each_byte {|i| ret << sprintf('%02x', i) }
+ ret
+ end
+
+ update(str)
+
+ MD5update
+ update m.update(a);
+ m.update(b) m.update(a+b)
+
+-------------------------------------------------------
+Local variables:
+fill-column: 70
+end:
diff --git a/ext/md5/md5c.c b/ext/md5/md5c.c
new file mode 100644
index 0000000000..d7c7e4fb27
--- /dev/null
+++ b/ext/md5/md5c.c
@@ -0,0 +1,337 @@
+/* MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "md5.h"
+
+/* Constants for MD5Transform routine.
+ */
+
+#define S11 7
+#define S12 12
+#define S13 17
+#define S14 22
+#define S21 5
+#define S22 9
+#define S23 14
+#define S24 20
+#define S31 4
+#define S32 11
+#define S33 16
+#define S34 23
+#define S41 6
+#define S42 10
+#define S43 15
+#define S44 21
+
+static void MD5Transform PROTO_LIST ((UINT4 [4], unsigned char [64]));
+static void Encode PROTO_LIST
+ ((unsigned char *, UINT4 *, unsigned int));
+static void Decode PROTO_LIST
+ ((UINT4 *, unsigned char *, unsigned int));
+static void MD5_memcpy PROTO_LIST ((POINTER, POINTER, unsigned int));
+static void MD5_memset PROTO_LIST ((POINTER, int, unsigned int));
+
+static unsigned char PADDING[64] = {
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* F, G, H and I are basic MD5 functions.
+ */
+#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define I(x, y, z) ((y) ^ ((x) | (~z)))
+
+/* ROTATE_LEFT rotates x left n bits.
+ */
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+
+/* FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+Rotation is separate from addition to prevent recomputation.
+ */
+#define FF(a, b, c, d, x, s, ac) { \
+ (a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
+#define GG(a, b, c, d, x, s, ac) { \
+ (a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
+#define HH(a, b, c, d, x, s, ac) { \
+ (a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
+#define II(a, b, c, d, x, s, ac) { \
+ (a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
+ (a) = ROTATE_LEFT ((a), (s)); \
+ (a) += (b); \
+ }
+
+/* MD5 initialization. Begins an MD5 operation, writing a new context.
+ */
+void MD5Init (context)
+MD5_CTX *context; /* context */
+{
+ context->count[0] = context->count[1] = 0;
+ /* Load magic initialization constants.
+*/
+ context->state[0] = 0x67452301;
+ context->state[1] = 0xefcdab89;
+ context->state[2] = 0x98badcfe;
+ context->state[3] = 0x10325476;
+}
+
+/* MD5 block update operation. Continues an MD5 message-digest
+ operation, processing another message block, and updating the
+ context.
+ */
+void MD5Update (context, input, inputLen)
+MD5_CTX *context; /* context */
+unsigned char *input; /* input block */
+unsigned int inputLen; /* length of input block */
+{
+ unsigned int i, index, partLen;
+
+ /* Compute number of bytes mod 64 */
+ index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+
+ /* Update number of bits */
+ if ((context->count[0] += ((UINT4)inputLen << 3))
+ < ((UINT4)inputLen << 3))
+ context->count[1]++;
+ context->count[1] += ((UINT4)inputLen >> 29);
+
+ partLen = 64 - index;
+
+ /* Transform as many times as possible.
+*/
+ if (inputLen >= partLen) {
+ MD5_memcpy
+ ((POINTER)&context->buffer[index], (POINTER)input, partLen);
+ MD5Transform (context->state, context->buffer);
+
+ for (i = partLen; i + 63 < inputLen; i += 64)
+ MD5Transform (context->state, &input[i]);
+
+ index = 0;
+ }
+ else
+ i = 0;
+
+ /* Buffer remaining input */
+ MD5_memcpy
+ ((POINTER)&context->buffer[index], (POINTER)&input[i],
+ inputLen-i);
+}
+
+/* MD5 finalization. Ends an MD5 message-digest operation, writing the
+ the message digest and zeroizing the context.
+ */
+void MD5Final (digest, context)
+unsigned char digest[16]; /* message digest */
+MD5_CTX *context; /* context */
+{
+ unsigned char bits[8];
+ unsigned int index, padLen;
+
+ /* Save number of bits */
+ Encode (bits, context->count, 8);
+
+ /* Pad out to 56 mod 64.
+*/
+ index = (unsigned int)((context->count[0] >> 3) & 0x3f);
+ padLen = (index < 56) ? (56 - index) : (120 - index);
+ MD5Update (context, PADDING, padLen);
+
+ /* Append length (before padding) */
+ MD5Update (context, bits, 8);
+
+ /* Store state in digest */
+ Encode (digest, context->state, 16);
+
+ /* Zeroize sensitive information.
+*/
+ MD5_memset ((POINTER)context, 0, sizeof (*context));
+}
+
+/* MD5 basic transformation. Transforms state based on block.
+ */
+static void MD5Transform (state, block)
+UINT4 state[4];
+unsigned char block[64];
+{
+ UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+
+ Decode (x, block, 64);
+
+ /* Round 1 */
+ FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+ FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+ FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+ FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+ FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+ FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+ FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+ FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+ FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+ FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+ FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+ FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+ FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+ FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+ FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+ FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+
+ /* Round 2 */
+ GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+ GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+ GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+ GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+ GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+ GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */
+ GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+ GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+ GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+ GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+ GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+ GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+ GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+ GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+ GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+ GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+
+ /* Round 3 */
+ HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+ HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+ HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+ HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+ HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+ HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+ HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+ HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+ HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+ HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+ HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+ HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
+ HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+ HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+ HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+ HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+
+ /* Round 4 */
+ II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+ II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+ II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+ II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+ II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+ II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+ II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+ II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+ II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+ II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+ II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+ II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+ II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+ II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+ II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+ II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
+
+ state[0] += a;
+ state[1] += b;
+ state[2] += c;
+ state[3] += d;
+
+ /* Zeroize sensitive information.
+*/
+ MD5_memset ((POINTER)x, 0, sizeof (x));
+}
+
+/* Encodes input (UINT4) into output (unsigned char). Assumes len is
+ a multiple of 4.
+ */
+static void Encode (output, input, len)
+unsigned char *output;
+UINT4 *input;
+unsigned int len;
+{
+ unsigned int i, j;
+
+ for (i = 0, j = 0; j < len; i++, j += 4) {
+ output[j] = (unsigned char)(input[i] & 0xff);
+ output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
+ output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
+ output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
+ }
+}
+
+/* Decodes input (unsigned char) into output (UINT4). Assumes len is
+ a multiple of 4.
+ */
+static void Decode (output, input, len)
+UINT4 *output;
+unsigned char *input;
+unsigned int len;
+{
+ unsigned int i, j;
+
+ for (i = 0, j = 0; j < len; i++, j += 4)
+ output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
+ (((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
+}
+
+/* Note: Replace "for loop" with standard memcpy if possible.
+ */
+
+static void MD5_memcpy (output, input, len)
+POINTER output;
+POINTER input;
+unsigned int len;
+{
+ unsigned int i;
+
+ for (i = 0; i < len; i++)
+ output[i] = input[i];
+}
+
+/* Note: Replace "for loop" with standard memset if possible.
+ */
+static void MD5_memset (output, value, len)
+POINTER output;
+int value;
+unsigned int len;
+{
+ unsigned int i;
+
+ for (i = 0; i < len; i++)
+ ((char *)output)[i] = (char)value;
+}
diff --git a/ext/md5/md5init.c b/ext/md5/md5init.c
new file mode 100644
index 0000000000..a57d5f8f30
--- /dev/null
+++ b/ext/md5/md5init.c
@@ -0,0 +1,114 @@
+/************************************************
+
+ md5init.c -
+
+ $Author$
+ created at: Fri Aug 2 09:24:12 JST 1996
+
+ Copyright (C) 1995-1998 Yukihiro Matsumoto
+
+************************************************/
+/* This module provides an interface to the RSA Data Security,
+ Inc. MD5 Message-Digest Algorithm, described in RFC 1321.
+ It requires the files md5c.c and md5.h (which are slightly changed
+ from the versions in the RFC to avoid the "global.h" file.) */
+
+#include "ruby.h"
+#include "md5.h"
+
+static VALUE cMD5;
+
+static VALUE
+md5_update(obj, str)
+ VALUE obj;
+ struct RString *str;
+{
+ MD5_CTX *md5;
+
+ Check_Type(str, T_STRING);
+ Data_Get_Struct(obj, MD5_CTX, md5);
+ MD5Update(md5, str->ptr, str->len);
+
+ return obj;
+}
+
+static VALUE
+md5_digest(obj)
+ VALUE obj;
+{
+ MD5_CTX *md5, ctx;
+ unsigned char digest[16];
+
+ Data_Get_Struct(obj, MD5_CTX, md5);
+ ctx = *md5;
+ MD5Final(digest, &ctx);
+
+ return rb_str_new(digest, 16);
+}
+
+static VALUE
+md5_hexdigest(obj)
+ VALUE obj;
+{
+ MD5_CTX *md5, ctx;
+ unsigned char digest[16];
+ char buf[33];
+ int i;
+
+ Data_Get_Struct(obj, MD5_CTX, md5);
+ ctx = *md5;
+ MD5Final(digest, &ctx);
+
+ for (i=0; i<16; i++) {
+ sprintf(buf+i*2, "%02x", digest[i]);
+ }
+ return rb_str_new(buf, 32);
+}
+
+static VALUE
+md5_clone(obj)
+ VALUE obj;
+{
+ MD5_CTX *md5, *md5_new;
+
+ Data_Get_Struct(obj, MD5_CTX, md5);
+ obj = Data_Make_Struct(CLASS_OF(obj), MD5_CTX, 0, free, md5_new);
+ *md5_new = *md5;
+
+ return obj;
+}
+
+static VALUE
+md5_new(argc, argv, class)
+ int argc;
+ VALUE* argv;
+ VALUE class;
+{
+ VALUE arg, obj;
+ MD5_CTX *md5;
+
+ rb_scan_args(argc, argv, "01", &arg);
+ if (!NIL_P(arg)) Check_Type(arg, T_STRING);
+
+ obj = Data_Make_Struct(class, MD5_CTX, 0, free, md5);
+ MD5Init(md5);
+ if (!NIL_P(arg)) {
+ md5_update(obj, arg);
+ }
+
+ return obj;
+}
+
+void
+Init_md5()
+{
+ cMD5 = rb_define_class("MD5", rb_cObject);
+
+ rb_define_singleton_method(cMD5, "new", md5_new, -1);
+ rb_define_singleton_method(cMD5, "md5", md5_new, -1);
+
+ rb_define_method(cMD5, "update", md5_update, 1);
+ rb_define_method(cMD5, "digest", md5_digest, 0);
+ rb_define_method(cMD5, "hexdigest", md5_hexdigest, 0);
+ rb_define_method(cMD5, "clone", md5_clone, 0);
+}
diff --git a/ext/nkf/.cvsignore b/ext/nkf/.cvsignore
index 4088712231..f3c7a7c5da 100644
--- a/ext/nkf/.cvsignore
+++ b/ext/nkf/.cvsignore
@@ -1,3 +1 @@
Makefile
-mkmf.log
-*.def
diff --git a/ext/nkf/MANIFEST b/ext/nkf/MANIFEST
new file mode 100644
index 0000000000..5114a3762a
--- /dev/null
+++ b/ext/nkf/MANIFEST
@@ -0,0 +1,7 @@
+MANIFEST
+depend
+extconf.rb
+lib/kconv.rb
+nkf.c
+nkf1.7/nkf.c
+test.rb
diff --git a/ext/nkf/depend b/ext/nkf/depend
index 0ed8fea8d2..13e32e6074 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -1 +1 @@
-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
+nkf.o : nkf.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h $(srcdir)/nkf1.7/nkf.c
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 4ffe8d984e..af6d82275f 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -1,367 +1,73 @@
-#
-# kconv.rb - Kanji Converter.
-#
-# $Id$
-#
-# ----
-#
-# kconv.rb implements the Kconv class for Kanji Converter. Additionally,
-# some methods in String classes are added to allow easy conversion.
-#
-
require 'nkf'
-#
-# Kanji Converter for Ruby.
-#
module Kconv
- #
- # Public Constants
- #
-
- #Constant of Encoding
-
- # Auto-Detect
AUTO = NKF::AUTO
- # ISO-2022-JP
JIS = NKF::JIS
- # EUC-JP
EUC = NKF::EUC
- # Shift_JIS
SJIS = NKF::SJIS
- # BINARY
BINARY = NKF::BINARY
- # NOCONV
NOCONV = NKF::NOCONV
- # ASCII
- ASCII = NKF::ASCII
- # UTF-8
- UTF8 = NKF::UTF8
- # UTF-16
- UTF16 = NKF::UTF16
- # UTF-32
- UTF32 = NKF::UTF32
- # UNKNOWN
UNKNOWN = NKF::UNKNOWN
-
- #
- # Private Constants
- #
-
- # Revision of kconv.rb
- REVISION = %q$Revision$
-
- #Regexp of Encoding
-
- # Regexp of Shift_JIS string (private constant)
- RegexpShiftjis = /\A(?:
- [\x00-\x7f\xa1-\xdf] |
- [\x81-\x9f\xe0-\xfc][\x40-\x7e\x80-\xfc]
- )*\z/nx
-
- # Regexp of EUC-JP string (private constant)
- RegexpEucjp = /\A(?:
- [\x00-\x7f] |
- \x8e [\xa1-\xdf] |
- \x8f [\xa1-\xfe] [\xa1-\xfe] |
- [\xa1-\xfe] [\xa1-\xfe]
- )*\z/nx
-
- # Regexp of UTF-8 string (private constant)
- RegexpUtf8 = /\A(?:
- [\x00-\x7f] |
- [\xc2-\xdf] [\x80-\xbf] |
- \xe0 [\xa0-\xbf] [\x80-\xbf] |
- [\xe1-\xef] [\x80-\xbf] [\x80-\xbf] |
- \xf0 [\x90-\xbf] [\x80-\xbf] [\x80-\xbf] |
- [\xf1-\xf3] [\x80-\xbf] [\x80-\xbf] [\x80-\xbf] |
- \xf4 [\x80-\x8f] [\x80-\xbf] [\x80-\xbf]
- )*\z/nx
-
- #
- # Public Methods
- #
-
- # call-seq:
- # Kconv.kconv(str, out_code, in_code = Kconv::AUTO)
- #
- # Convert <code>str</code> to out_code.
- # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want to decode them, use NKF.nkf.
def kconv(str, out_code, in_code = AUTO)
opt = '-'
case in_code
- when ::NKF::JIS
+ when NKF::JIS
opt << 'J'
- when ::NKF::EUC
+ when NKF::EUC
opt << 'E'
- when ::NKF::SJIS
+ when NKF::SJIS
opt << 'S'
- when ::NKF::UTF8
- opt << 'W'
- when ::NKF::UTF16
- opt << 'W16'
end
case out_code
- when ::NKF::JIS
+ when NKF::JIS
opt << 'j'
- when ::NKF::EUC
+ when NKF::EUC
opt << 'e'
- when ::NKF::SJIS
+ when NKF::SJIS
opt << 's'
- when ::NKF::UTF8
- opt << 'w'
- when ::NKF::UTF16
- opt << 'w16'
- when ::NKF::NOCONV
+ when NKF::NOCONV
return str
end
opt = '' if opt == '-'
- ::NKF::nkf(opt, str)
+ NKF::nkf(opt, str)
end
module_function :kconv
- #
- # Encode to
- #
-
- # call-seq:
- # Kconv.tojis(str) -> string
- #
- # Convert <code>str</code> to ISO-2022-JP
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-jxm0', str).
def tojis(str)
- ::NKF::nkf('-jm', str)
+ NKF::nkf('-j', str)
end
module_function :tojis
- # call-seq:
- # Kconv.toeuc(str) -> string
- #
- # Convert <code>str</code> to EUC-JP
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-exm0', str).
def toeuc(str)
- ::NKF::nkf('-em', str)
+ NKF::nkf('-e', str)
end
module_function :toeuc
- # call-seq:
- # Kconv.tosjis(str) -> string
- #
- # Convert <code>str</code> to Shift_JIS
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-sxm0', str).
def tosjis(str)
- ::NKF::nkf('-sm', str)
+ NKF::nkf('-s', str)
end
module_function :tosjis
- # call-seq:
- # Kconv.toutf8(str) -> string
- #
- # Convert <code>str</code> to UTF-8
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-wxm0', str).
- def toutf8(str)
- ::NKF::nkf('-wm', str)
- end
- module_function :toutf8
-
- # call-seq:
- # Kconv.toutf16(str) -> string
- #
- # Convert <code>str</code> to UTF-16
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-w16xm0', str).
- def toutf16(str)
- ::NKF::nkf('-w16m', str)
- end
- module_function :toutf16
-
- #
- # guess
- #
-
- # call-seq:
- # Kconv.guess(str) -> integer
- #
- # Guess input encoding by NKF.guess2
def guess(str)
- ::NKF::guess(str)
+ NKF::guess(str)
end
module_function :guess
-
- # call-seq:
- # Kconv.guess_old(str) -> integer
- #
- # Guess input encoding by NKF.guess1
- def guess_old(str)
- ::NKF::guess1(str)
- end
- module_function :guess_old
-
- #
- # isEncoding
- #
-
- # call-seq:
- # Kconv.iseuc(str) -> obj or nil
- #
- # Returns whether input encoding is EUC-JP or not.
- #
- # *Note* don't expect this return value is MatchData.
- def iseuc(str)
- RegexpEucjp.match( str )
- end
- module_function :iseuc
-
- # call-seq:
- # Kconv.issjis(str) -> obj or nil
- #
- # Returns whether input encoding is Shift_JIS or not.
- #
- # *Note* don't expect this return value is MatchData.
- def issjis(str)
- RegexpShiftjis.match( str )
- end
- module_function :issjis
-
- # call-seq:
- # Kconv.isutf8(str) -> obj or nil
- #
- # Returns whether input encoding is UTF-8 or not.
- #
- # *Note* don't expect this return value is MatchData.
- def isutf8(str)
- RegexpUtf8.match( str )
- end
- module_function :isutf8
-
end
class String
- # call-seq:
- # String#kconv(out_code, in_code = Kconv::AUTO)
- #
- # Convert <code>self</code> to out_code.
- # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want to decode them, use NKF.nkf.
def kconv(out_code, in_code=Kconv::AUTO)
Kconv::kconv(self, out_code, in_code)
end
-
- #
- # to Encoding
- #
-
- # call-seq:
- # String#tojis -> string
- #
- # Convert <code>self</code> to ISO-2022-JP
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-jxm0', str).
- def tojis; Kconv.tojis(self) end
-
- # call-seq:
- # String#toeuc -> string
- #
- # Convert <code>self</code> to EUC-JP
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-exm0', str).
- def toeuc; Kconv.toeuc(self) end
-
- # call-seq:
- # String#tosjis -> string
- #
- # Convert <code>self</code> to Shift_JIS
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-sxm0', str).
- def tosjis; Kconv.tosjis(self) end
-
- # call-seq:
- # String#toutf8 -> string
- #
- # Convert <code>self</code> to UTF-8
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-wxm0', str).
- def toutf8; Kconv.toutf8(self) end
-
- # call-seq:
- # String#toutf16 -> string
- #
- # Convert <code>self</code> to UTF-16
- #
- # *Note*
- # This method decode MIME encoded string and
- # convert halfwidth katakana to fullwidth katakana.
- # If you don't want it, use NKF.nkf('-w16xm0', str).
- def toutf16; Kconv.toutf16(self) end
-
- #
- # is Encoding
- #
-
- # call-seq:
- # String#iseuc -> obj or nil
- #
- # Returns whether <code>self</code>'s encoding is EUC-JP or not.
- #
- # *Note* don't expect this return value is MatchData.
- def iseuc; Kconv.iseuc(self) end
-
- # call-seq:
- # String#issjis -> obj or nil
- #
- # Returns whether <code>self</code>'s encoding is Shift_JIS or not.
- #
- # *Note* don't expect this return value is MatchData.
- def issjis; Kconv.issjis(self) end
-
- # call-seq:
- # String#isutf8 -> obj or nil
- #
- # Returns whether <code>self</code>'s encoding is UTF-8 or not.
- #
- # *Note* don't expect this return value is MatchData.
- def isutf8; Kconv.isutf8(self) end
+ def tojis
+ NKF::nkf('-j', self)
+ end
+ def toeuc
+ NKF::nkf('-e', self)
+ end
+ def tosjis
+ NKF::nkf('-s', self)
+ end
end
diff --git a/ext/nkf/nkf-utf8/config.h b/ext/nkf/nkf-utf8/config.h
deleted file mode 100644
index 9da82c6aee..0000000000
--- a/ext/nkf/nkf-utf8/config.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef _CONFIG_H_
-#define _CONFIG_H_
-
-/* UTF8 入出力 */
-#define UTF8_INPUT_ENABLE
-#define UTF8_OUTPUT_ENABLE
-
-/* Shift_JIS 範囲外の文字を、CP932 で同値な文字に読み換える */
-#define SHIFTJIS_CP932
-
-/* オプションで入力を指定した時に、文字コ・踉札匹鮓把蠅垢蝟昭粡竚癈鷭т繻Ь粤肅鈬緑孕瀉歪冬読惻蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь阮纈蜚オプション */
-/* by Satoru Takabayashi <ccsatoru@vega.aichi-u.ac.jp> */
-#define OVERWRITE
-
-/* --cap-input, --url-input オプション */
-#define INPUT_OPTION
-
-/* --numchar-input オプション */
-#define NUMCHAR_OPTION
-
-/* --debug, --no-output オプション */
-#define CHECK_OPTION
-
-/* JIS X0212 */
-#define X0212_ENABLE
-
-/* --exec-in, --exec-out オプション
- * pipe, fork, execvp あたりが無いと動きません。
- * MS-DOS, MinGW などでは undef にしてください
- * child process 終了時の処理がいいかげんなので、
- * デフォルトで無効にしています。
- */
-/* #define EXEC_IO */
-
-/* SunOS の cc を使う瘢雹ときは undef にしてください */
-#define ANSI_C_PROTOTYPE
-
-/* int が 32bit 未満の環境で NUMCHAR_OPTION を使う瘢雹には、
- * コメントを外してください。
- */
-/* #define INT_IS_SHORT */
-
-
-#if defined(INT_IS_SHORT)
-typedef long nkf_char;
-typedef unsigned char nkf_nfchar;
-#else
-typedef int nkf_char;
-typedef int nkf_nfchar;
-#endif
-
-/* Unicode Normalization */
-#define UNICODE_NORMALIZATION
-
-#ifndef WIN32DLL
-/******************************/
-/* デフォルトの出力コ・踉札描蝟昭粡竚癈鷭т繻Ь嚆跂笏兎奏猛瀉歪鹿粡寂蝟赱齠洲粤讌将d繙蜴津徳嫐壥地津瀛瓶鹿粡寂蝟赱齠洲粤讌将粤肅鈬兎奏猛瀉歪冬喨瓶蝟昭粡竚癈鷭т繻Ьd繙蜴津徳嫐壥地津濺嫦蝟昭粡竚癈鷭т繻Ьd繙蜴津徳嫐壥地津炙堝鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将e踈綣蝟昭粡竚癈鷭т繻Ь粤肅鈬兎奏猛瀉歪冬喨瓶鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i粤肅鈬筥燐傭帆吽椀塢藁逅殺瘢雹粤肅鈬筥孕童濾緑孕濺料駄滴鹿粡寂蝟赱齠洲粤讌将d繙蜴孕童濾緑孕濺料駄甜蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤嬶秒歪冬力厖遡冨壮貧亮蝟昭粡竚癈鷭т繻Ь蜀鈔繙堝互瀕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将d繙蜴孕童濾緑孕濺料駄甜蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь粤肅鈬碗輿棉攸塢藁灣疎姪潴杜敗拘下蝟昭粡竚癈鷭т繻Ь粤肅鈬碗輿棉攸塢藁灣疎姪瀘特潴杜敗骸蝟昭粡竚癈鷭т繻Ь粤肅鈬碗輿棉攸塢藁灣疎姪瀘督潴杜敗梗蝟昭粡竚癈鷭т繻Ь鈿鴉瘡蝴癆蜿釼鞜蜥蝟昭粡竚癈鷭т繻Ь闔齡諞燻聶葹鈕窘力厖遡冨壮貧累堊駄冬瞭蓄姪稜堡飮鹿粡寂蝟赱齠洲粤讌将竢銖鉉聨鈕竏癇聹枸碗輿棉攸塢藁灣疎姪瀘督潴杜敗否纂蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь緕粡地瞭蒜瀏鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚諞諞遣鉉罧皴纔鉉罸鉉罩羝諞錫鬲鞘繻續繖蛹迴粤旭挟桓碣蜴粤潟箟皹彊籬旭旭旭旭旭錫鬲将蓿繙洲芍繞諞諞遣鉉罧秧莉澡澳熕鱚纓界瘢雹蜆酋聽彊過絣過羇官概温干怨羆祓険金鬼患鰍慌礑上諞諞遣鉉罧禺昭碣纐貅蝟昭粡竚癈鷭ц襷樟梓声蝟昭粡竚癈鷭т繻Ь續鳬瘤裼蛹鬯伉帙鴦蜿遘鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将關蜃蔗辿晃桑蜚齦堋鴣暖彬宋践鹿粡寂蝟赱齠洲粤讌将ぢ連絡先: (株)富士通研瘢雹究所 ソフト3研瘢雹 市川 至
-** (E-Mail Address: ichikawa@flab.fujitsu.co.jp)
-** Copyright (C) 1996,1998
-** Copyright (C) 2002
-** 連絡先: 琉球大学霾鷙慍ぢ河野 真迚辣芦宛竟鶯鹿粡寂蝟赱齠洲粤讌将ぢ(E-Mail Address: kono@ie.u-ryukyu.ac.jp)
-** 連絡先: COW for DOS & Win16 & Win32 & OS/2
-** (E-Mail Address: GHG00637@niftyserve.or.p)
-**
-** このソ・踉札垢里い覆詈踉嗣,改変,修正も許諾します。ただし、
-** その際には、誰が貢献したを┐垢海良鮖弔垢海函鹿粡寂蝟赱齠洲粤讌将再配布や雑誌の付録などの問い合わせも必要ありません。
-** 営利利用も綉鉾燭靴覆と楼呂乃弔靴泙后鹿粡寂蝟赱齠洲粤讌将バイナリの配布の際にはversion messageを保存することを魴錣箸靴泙后鹿粡寂蝟赱齠洲粤讌将このプログラムについては特に何の保擇發靴覆ぁ靴蕕此鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将当纈鈬鞳鴉蜚瘤蓍鈑蜩鳫苒瘢蝟昭粡竚癈鷭т繻Ь釿跿粡鈑關鈑迴粡胱蜴膃逅鳫鈑蝟昭粡竚癈鷭т繻Ь跫鈑粹逾鱚鈔葹阡蜚蝟昭粡竚癈鷭т繻Ь蒹硼關蜃蔗阡蜒葹韶縺蜴跛關蜈鶤鹿粡寂蝟赱齠洲粤讌将醍釶鴒蜩蛯蜿鱚髟蜥纉鱸芍釶鴦蜿辣齠瘍纉蝟昭粡竚癈鷭т繻Ь阨闔癘鼡繙闥竢顆蜴膃繖蜩蛯蜿闥跚鼈蜴膊鹿粡寂蝟赱齠洲粤讌将堡奏堡碗瓶談蘇羊面倉卅淋錨徂堡吐倉塹班嗜瀞彖凖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь孕騰サポ・踉札箸砲弔い鹿粡寂蝟赱齠洲粤讌将拾苳四茲諞ぢと入れかえてそのまま使えるよう瘢雹になっています
-** nkf -e などとして起動すると、鞍淑未堝ぢと判定されれば、
-** そのまま euc-jp に変換されます
-**
-** まだバグがある可能性が高いです。
-** (特に鞍淑漫▲魁ド混在、エラ・踉蚕萢蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ьぢ何か問題を見つけたら、
-** E-Mail: furukawa@tcp-ip.or.jp
-** まで御連絡をお願いします。
-***********************************************************************/
-/* $Id$ */
-#define NKF_VERSION "2.0.8"
-#define NKF_RELEASE_DATE "2007-01-28"
-#include "config.h"
-#include "utf8tbl.h"
-
-#define COPY_RIGHT \
- "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa),2000 S. Kono, COW\n" \
- "Copyright (C) 2002-2006 Kono, Furukawa, Naruse, mastodon"
-
-
-/*
-**
-**
-**
-** USAGE: nkf [flags] [file]
-**
-** Flags:
-** b Output is buffered (DEFAULT)
-** u Output is unbuffered
-**
-** t no operation
-**
-** j Output code is JIS 7 bit (DEFAULT SELECT)
-** s Output code is MS Kanji (DEFAULT SELECT)
-** e Output code is AT&T JIS (DEFAULT SELECT)
-** w Output code is AT&T JIS (DEFAULT SELECT)
-** l Output code is JIS 7bit and ISO8859-1 Latin-1
-**
-** m MIME conversion for ISO-2022-JP
-** I Convert non ISO-2022-JP charactor to GETA by Pekoe <pekoe@lair.net>
-** i_ Output sequence to designate JIS-kanji (DEFAULT_J)
-** o_ Output sequence to designate single-byte roman characters (DEFAULT_R)
-** M MIME output conversion
-**
-** r {de/en}crypt ROT13/47
-**
-** v display Version
-**
-** T Text mode output (for MS-DOS)
-**
-** x Do not convert X0201 kana into X0208
-** Z Convert X0208 alphabet to ASCII
-**
-** f60 fold option
-**
-** m MIME decode
-** B try to fix broken JIS, missing Escape
-** B[1-9] broken level
-**
-** O Output to 'nkf.out' file or last file name
-** d Delete \r in line feed
-** c Add \r in line feed
-** -- other long option
-** -- ignore following option (don't use with -O )
-**
-**/
-
-#if (defined(__TURBOC__) || defined(_MSC_VER) || defined(LSI_C) || defined(__MINGW32__) || defined(__EMX__) || defined(__MSDOS__) || defined(__WINDOWS__) || defined(__DOS__) || defined(__OS2__)) && !defined(MSDOS)
-#define MSDOS
-#if (defined(__Win32__) || defined(_WIN32)) && !defined(__WIN32__)
-#define __WIN32__
-#endif
-#endif
-
-#ifdef PERL_XS
-#undef OVERWRITE
-#endif
-
-#ifndef PERL_XS
-#include <stdio.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(MSDOS) || defined(__OS2__)
-#include <fcntl.h>
-#include <io.h>
-#if defined(_MSC_VER) || defined(__WATCOMC__)
-#define mktemp _mktemp
-#endif
-#endif
-
-#ifdef MSDOS
-#ifdef LSI_C
-#define setbinmode(fp) fsetbin(fp)
-#elif defined(__DJGPP__)
-#include <libc/dosio.h>
-#define setbinmode(fp) djgpp_setbinmode(fp)
-#else /* Microsoft C, Turbo C */
-#define setbinmode(fp) setmode(fileno(fp), O_BINARY)
-#endif
-#else /* UNIX */
-#define setbinmode(fp)
-#endif
-
-#if defined(__DJGPP__)
-void djgpp_setbinmode(FILE *fp)
-{
- /* we do not use libc's setmode(), which changes COOKED/RAW mode in device. */
- int fd, m;
- fd = fileno(fp);
- m = (__file_handle_modes[fd] & (~O_TEXT)) | O_BINARY;
- __file_handle_set(fd, m);
-}
-#endif
-
-#ifdef _IOFBF /* SysV and MSDOS, Windows */
-#define setvbuffer(fp, buf, size) setvbuf(fp, buf, _IOFBF, size)
-#else /* BSD */
-#define setvbuffer(fp, buf, size) setbuffer(fp, buf, size)
-#endif
-
-/*Borland C++ 4.5 EasyWin*/
-#if defined(__TURBOC__) && defined(_Windows) && !defined(__WIN32__) /*Easy Win */
-#define EASYWIN
-#ifndef __WIN16__
-#define __WIN16__
-#endif
-#include <windows.h>
-#endif
-
-#ifdef OVERWRITE
-/* added by satoru@isoternet.org */
-#if defined(__EMX__)
-#include <sys/types.h>
-#endif
-#include <sys/stat.h>
-#if !defined(MSDOS) || defined(__DJGPP__) /* UNIX, djgpp */
-#include <unistd.h>
-#if defined(__WATCOMC__)
-#include <sys/utime.h>
-#else
-#include <utime.h>
-#endif
-#else /* defined(MSDOS) */
-#ifdef __WIN32__
-#ifdef __BORLANDC__ /* BCC32 */
-#include <utime.h>
-#else /* !defined(__BORLANDC__) */
-#include <sys/utime.h>
-#endif /* (__BORLANDC__) */
-#else /* !defined(__WIN32__) */
-#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__WATCOMC__) || defined(__OS2__) || defined(__EMX__) || defined(__IBMC__) || defined(__IBMCPP__) /* VC++, MinGW, Watcom, emx+gcc, IBM VAC++ */
-#include <sys/utime.h>
-#elif defined(__TURBOC__) /* BCC */
-#include <utime.h>
-#elif defined(LSI_C) /* LSI C */
-#endif /* (__WIN32__) */
-#endif
-#endif
-#endif
-
-#define FALSE 0
-#define TRUE 1
-
-/* state of output_mode and input_mode
-
- c2 0 means ASCII
- X0201
- ISO8859_1
- X0208
- EOF all termination
- c1 32bit data
-
- */
-
-#define ASCII 0
-#define X0208 1
-#define X0201 2
-#define ISO8859_1 8
-#define NO_X0201 3
-#define X0212 0x2844
-#define X0213_1 0x284F
-#define X0213_2 0x2850
-
-/* Input Assumption */
-
-#define JIS_INPUT 4
-#define EUC_INPUT 16
-#define SJIS_INPUT 5
-#define LATIN1_INPUT 6
-#define FIXED_MIME 7
-#define STRICT_MIME 8
-
-/* MIME ENCODE */
-
-#define ISO2022JP 9
-#define JAPANESE_EUC 10
-#define SHIFT_JIS 11
-
-#define UTF8 12
-#define UTF8_INPUT 13
-#define UTF16_INPUT 1015
-#define UTF32_INPUT 1017
-
-/* byte order */
-
-#define ENDIAN_BIG 1234
-#define ENDIAN_LITTLE 4321
-#define ENDIAN_2143 2143
-#define ENDIAN_3412 3412
-
-#define WISH_TRUE 15
-
-/* ASCII CODE */
-
-#define BS 0x08
-#define TAB 0x09
-#define NL 0x0a
-#define CR 0x0d
-#define ESC 0x1b
-#define SPACE 0x20
-#define AT 0x40
-#define SSP 0xa0
-#define DEL 0x7f
-#define SI 0x0f
-#define SO 0x0e
-#define SSO 0x8e
-#define SS3 0x8f
-
-#define is_alnum(c) \
- (('a'<=c && c<='z')||('A'<= c && c<='Z')||('0'<=c && c<='9'))
-
-/* I don't trust portablity of toupper */
-#define nkf_toupper(c) (('a'<=c && c<='z')?(c-('a'-'A')):c)
-#define nkf_isoctal(c) ('0'<=c && c<='7')
-#define nkf_isdigit(c) ('0'<=c && c<='9')
-#define nkf_isxdigit(c) (nkf_isdigit(c) || ('a'<=c && c<='f') || ('A'<=c && c <= 'F'))
-#define nkf_isblank(c) (c == SPACE || c == TAB)
-#define nkf_isspace(c) (nkf_isblank(c) || c == CR || c == NL)
-#define nkf_isalpha(c) (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
-#define nkf_isalnum(c) (nkf_isdigit(c) || nkf_isalpha(c))
-#define nkf_isprint(c) (' '<=c && c<='~')
-#define nkf_isgraph(c) ('!'<=c && c<='~')
-#define hex2bin(c) (('0'<=c&&c<='9') ? (c-'0') : \
- ('A'<=c&&c<='F') ? (c-'A'+10) : \
- ('a'<=c&&c<='f') ? (c-'a'+10) : 0 )
-#define is_eucg3(c2) (((unsigned short)c2 >> 8) == SS3)
-
-#define CP932_TABLE_BEGIN 0xFA
-#define CP932_TABLE_END 0xFC
-#define CP932INV_TABLE_BEGIN 0xED
-#define CP932INV_TABLE_END 0xEE
-#define is_ibmext_in_sjis(c2) (CP932_TABLE_BEGIN <= c2 && c2 <= CP932_TABLE_END)
-
-#define HOLD_SIZE 1024
-#if defined(INT_IS_SHORT)
-#define IOBUF_SIZE 2048
-#else
-#define IOBUF_SIZE 16384
-#endif
-
-#define DEFAULT_J 'B'
-#define DEFAULT_R 'B'
-
-#define SJ0162 0x00e1 /* 01 - 62 ku offset */
-#define SJ6394 0x0161 /* 63 - 94 ku offset */
-
-#define RANGE_NUM_MAX 18
-#define GETA1 0x22
-#define GETA2 0x2e
-
-
-#if defined(UTF8_OUTPUT_ENABLE) || defined(UTF8_INPUT_ENABLE)
-#define sizeof_euc_to_utf8_1byte 94
-#define sizeof_euc_to_utf8_2bytes 94
-#define sizeof_utf8_to_euc_C2 64
-#define sizeof_utf8_to_euc_E5B8 64
-#define sizeof_utf8_to_euc_2bytes 112
-#define sizeof_utf8_to_euc_3bytes 16
-#endif
-
-/* MIME preprocessor */
-
-#ifdef EASYWIN /*Easy Win */
-extern POINT _BufferSize;
-#endif
-
-struct input_code{
- char *name;
- nkf_char stat;
- nkf_char score;
- nkf_char index;
- nkf_char buf[3];
- void (*status_func)(struct input_code *, nkf_char);
- nkf_char (*iconv_func)(nkf_char c2, nkf_char c1, nkf_char c0);
- int _file_stat;
-};
-
-static char *input_codename = "";
-
-#ifndef PERL_XS
-static const char *CopyRight = COPY_RIGHT;
-#endif
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static nkf_char noconvert(FILE *f);
-#endif
-static void module_connection(void);
-static nkf_char kanji_convert(FILE *f);
-static nkf_char h_conv(FILE *f,nkf_char c2,nkf_char c1);
-static nkf_char push_hold_buf(nkf_char c2);
-static void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0));
-static nkf_char s_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-static nkf_char s2e_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
-static nkf_char e_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
-/* UCS Mapping
- * 0: Shift_JIS, eucJP-ascii
- * 1: eucJP-ms
- * 2: CP932, CP51932
- */
-#define UCS_MAP_ASCII 0
-#define UCS_MAP_MS 1
-#define UCS_MAP_CP932 2
-static int ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-#ifdef UTF8_INPUT_ENABLE
-/* no NEC special, NEC-selected IBM extended and IBM extended characters */
-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 nkf_char unicode_subchar = '?'; /* the regular substitution character */
-static void nkf_each_char_to_hex(void (*f)(nkf_char c2,nkf_char c1), nkf_char c);
-static void encode_fallback_html(nkf_char c);
-static void encode_fallback_xml(nkf_char c);
-static void encode_fallback_java(nkf_char c);
-static void encode_fallback_perl(nkf_char c);
-static void encode_fallback_subchar(nkf_char c);
-static void (*encode_fallback)(nkf_char c) = NULL;
-static nkf_char w2e_conv(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
-static nkf_char w_iconv(nkf_char c2,nkf_char c1,nkf_char c0);
-static nkf_char w_iconv16(nkf_char c2,nkf_char c1,nkf_char c0);
-static nkf_char w_iconv32(nkf_char c2,nkf_char c1,nkf_char c0);
-static nkf_char unicode_to_jis_common(nkf_char c2,nkf_char c1,nkf_char c0,nkf_char *p2,nkf_char *p1);
-static nkf_char w_iconv_common(nkf_char c1,nkf_char c0,const unsigned short *const *pp,nkf_char psize,nkf_char *p2,nkf_char *p1);
-static void w16w_conv(nkf_char val, nkf_char *p2, nkf_char *p1, nkf_char *p0);
-static nkf_char ww16_conv(nkf_char c2, nkf_char c1, nkf_char c0);
-static nkf_char w16e_conv(nkf_char val,nkf_char *p2,nkf_char *p1);
-static void w_status(struct input_code *, nkf_char);
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
-static int output_bom_f = FALSE;
-static int output_endian = ENDIAN_BIG;
-static nkf_char e2w_conv(nkf_char c2,nkf_char c1);
-static void w_oconv(nkf_char c2,nkf_char c1);
-static void w_oconv16(nkf_char c2,nkf_char c1);
-static void w_oconv32(nkf_char c2,nkf_char c1);
-#endif
-static void e_oconv(nkf_char c2,nkf_char c1);
-static nkf_char e2s_conv(nkf_char c2, nkf_char c1, nkf_char *p2, nkf_char *p1);
-static void s_oconv(nkf_char c2,nkf_char c1);
-static void j_oconv(nkf_char c2,nkf_char c1);
-static void fold_conv(nkf_char c2,nkf_char c1);
-static void cr_conv(nkf_char c2,nkf_char c1);
-static void z_conv(nkf_char c2,nkf_char c1);
-static void rot_conv(nkf_char c2,nkf_char c1);
-static void hira_conv(nkf_char c2,nkf_char c1);
-static void base64_conv(nkf_char c2,nkf_char c1);
-static void iso2022jp_check_conv(nkf_char c2,nkf_char c1);
-static void no_connection(nkf_char c2,nkf_char c1);
-static nkf_char no_connection2(nkf_char c2,nkf_char c1,nkf_char c0);
-
-static void code_score(struct input_code *ptr);
-static void code_status(nkf_char c);
-
-static void std_putc(nkf_char c);
-static nkf_char std_getc(FILE *f);
-static nkf_char std_ungetc(nkf_char c,FILE *f);
-
-static nkf_char broken_getc(FILE *f);
-static nkf_char broken_ungetc(nkf_char c,FILE *f);
-
-static nkf_char mime_begin(FILE *f);
-static nkf_char mime_getc(FILE *f);
-static nkf_char mime_ungetc(nkf_char c,FILE *f);
-
-static void switch_mime_getc(void);
-static void unswitch_mime_getc(void);
-static nkf_char mime_begin_strict(FILE *f);
-static nkf_char mime_getc_buf(FILE *f);
-static nkf_char mime_ungetc_buf(nkf_char c,FILE *f);
-static nkf_char mime_integrity(FILE *f,const unsigned char *p);
-
-static nkf_char base64decode(nkf_char c);
-static void mime_prechar(nkf_char c2, nkf_char c1);
-static void mime_putc(nkf_char c);
-static void open_mime(nkf_char c);
-static void close_mime(void);
-static void eof_mime(void);
-static void mimeout_addchar(nkf_char c);
-#ifndef PERL_XS
-static void usage(void);
-static void version(void);
-#endif
-static void options(unsigned char *c);
-#if defined(PERL_XS) || defined(WIN32DLL)
-static void reinit(void);
-#endif
-
-/* buffers */
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-static unsigned char stdibuf[IOBUF_SIZE];
-static unsigned char stdobuf[IOBUF_SIZE];
-#endif
-static unsigned char hold_buf[HOLD_SIZE*2];
-static int hold_count = 0;
-
-/* MIME preprocessor fifo */
-
-#define MIME_BUF_SIZE (1024) /* 2^n ring buffer */
-#define MIME_BUF_MASK (MIME_BUF_SIZE-1)
-#define Fifo(n) mime_buf[(n)&MIME_BUF_MASK]
-static unsigned char mime_buf[MIME_BUF_SIZE];
-static unsigned int mime_top = 0;
-static unsigned int mime_last = 0; /* decoded */
-static unsigned int mime_input = 0; /* undecoded */
-static nkf_char (*mime_iconv_back)(nkf_char c2,nkf_char c1,nkf_char c0) = NULL;
-
-/* flags */
-static int unbuf_f = FALSE;
-static int estab_f = FALSE;
-static int nop_f = FALSE;
-static int binmode_f = TRUE; /* binary mode */
-static int rot_f = FALSE; /* rot14/43 mode */
-static int hira_f = FALSE; /* hira/kata henkan */
-static int input_f = FALSE; /* non fixed input code */
-static int alpha_f = FALSE; /* convert JIx0208 alphbet to ASCII */
-static int mime_f = STRICT_MIME; /* convert MIME B base64 or Q */
-static int mime_decode_f = FALSE; /* mime decode is explicitly on */
-static int mimebuf_f = FALSE; /* MIME buffered input */
-static int broken_f = FALSE; /* convert ESC-less broken JIS */
-static int iso8859_f = FALSE; /* ISO8859 through */
-static int mimeout_f = FALSE; /* base64 mode */
-#if defined(MSDOS) || defined(__OS2__)
-static int x0201_f = TRUE; /* Assume JISX0201 kana */
-#else
-static int x0201_f = NO_X0201; /* Assume NO JISX0201 */
-#endif
-static int iso2022jp_f = FALSE; /* convert ISO-2022-JP */
-
-#ifdef UNICODE_NORMALIZATION
-static int nfc_f = FALSE;
-static nkf_char (*i_nfc_getc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_nfc_ungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char nfc_getc(FILE *f);
-static nkf_char nfc_ungetc(nkf_char c,FILE *f);
-#endif
-
-#ifdef INPUT_OPTION
-static int cap_f = FALSE;
-static nkf_char (*i_cgetc)(FILE *) = std_getc; /* input of cgetc */
-static nkf_char (*i_cungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char cap_getc(FILE *f);
-static nkf_char cap_ungetc(nkf_char c,FILE *f);
-
-static int url_f = FALSE;
-static nkf_char (*i_ugetc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_uungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char url_getc(FILE *f);
-static nkf_char url_ungetc(nkf_char c,FILE *f);
-#endif
-
-#if defined(INT_IS_SHORT)
-#define NKF_INT32_C(n) (n##L)
-#else
-#define NKF_INT32_C(n) (n)
-#endif
-#define PREFIX_EUCG3 NKF_INT32_C(0x8F00)
-#define CLASS_MASK NKF_INT32_C(0xFF000000)
-#define CLASS_UNICODE NKF_INT32_C(0x01000000)
-#define VALUE_MASK NKF_INT32_C(0x00FFFFFF)
-#define UNICODE_MAX NKF_INT32_C(0x0010FFFF)
-#define is_unicode_capsule(c) ((c & CLASS_MASK) == CLASS_UNICODE)
-#define is_unicode_bmp(c) ((c & VALUE_MASK) <= NKF_INT32_C(0xFFFF))
-
-#ifdef NUMCHAR_OPTION
-static int numchar_f = FALSE;
-static nkf_char (*i_ngetc)(FILE *) = std_getc; /* input of ugetc */
-static nkf_char (*i_nungetc)(nkf_char c ,FILE *f) = std_ungetc;
-static nkf_char numchar_getc(FILE *f);
-static nkf_char numchar_ungetc(nkf_char c,FILE *f);
-#endif
-
-#ifdef CHECK_OPTION
-static int noout_f = FALSE;
-static void no_putc(nkf_char c);
-static nkf_char debug_f = FALSE;
-static void debug(const char *str);
-static nkf_char (*iconv_for_check)(nkf_char c2,nkf_char c1,nkf_char c0) = 0;
-#endif
-
-static int guess_f = FALSE;
-#if !defined PERL_XS
-static void print_guessed_code(char *filename);
-#endif
-static void set_input_codename(char *codename);
-static int is_inputcode_mixed = FALSE;
-static int is_inputcode_set = FALSE;
-
-#ifdef EXEC_IO
-static int exec_f = 0;
-#endif
-
-#ifdef SHIFTJIS_CP932
-/* invert IBM extended characters to others */
-static int cp51932_f = FALSE;
-
-/* invert NEC-selected IBM extended characters to IBM extended characters */
-static int cp932inv_f = TRUE;
-
-/* static nkf_char cp932_conv(nkf_char c2, nkf_char c1); */
-#endif /* SHIFTJIS_CP932 */
-
-#ifdef X0212_ENABLE
-static int x0212_f = FALSE;
-static nkf_char x0212_shift(nkf_char c);
-static nkf_char x0212_unshift(nkf_char c);
-#endif
-static int x0213_f = FALSE;
-
-static unsigned char prefix_table[256];
-
-static void set_code_score(struct input_code *ptr, nkf_char score);
-static void clr_code_score(struct input_code *ptr, nkf_char score);
-static void status_disable(struct input_code *ptr);
-static void status_push_ch(struct input_code *ptr, nkf_char c);
-static void status_clear(struct input_code *ptr);
-static void status_reset(struct input_code *ptr);
-static void status_reinit(struct input_code *ptr);
-static void status_check(struct input_code *ptr, nkf_char c);
-static void e_status(struct input_code *, nkf_char);
-static void s_status(struct input_code *, nkf_char);
-
-struct input_code input_code_list[] = {
- {"EUC-JP", 0, 0, 0, {0, 0, 0}, e_status, e_iconv, 0},
- {"Shift_JIS", 0, 0, 0, {0, 0, 0}, s_status, s_iconv, 0},
-#ifdef UTF8_INPUT_ENABLE
- {"UTF-8", 0, 0, 0, {0, 0, 0}, w_status, w_iconv, 0},
- {"UTF-16", 0, 0, 0, {0, 0, 0}, NULL, w_iconv16, 0},
- {"UTF-32", 0, 0, 0, {0, 0, 0}, NULL, w_iconv32, 0},
-#endif
- {0}
-};
-
-static int mimeout_mode = 0;
-static int base64_count = 0;
-
-/* X0208 -> ASCII converter */
-
-/* fold parameter */
-static int f_line = 0; /* chars in line */
-static int f_prev = 0;
-static int fold_preserve_f = FALSE; /* preserve new lines */
-static int fold_f = FALSE;
-static int fold_len = 0;
-
-/* options */
-static unsigned char kanji_intro = DEFAULT_J;
-static unsigned char ascii_intro = DEFAULT_R;
-
-/* Folding */
-
-#define FOLD_MARGIN 10
-#define DEFAULT_FOLD 60
-
-static int fold_margin = FOLD_MARGIN;
-
-/* converters */
-
-#ifdef DEFAULT_CODE_JIS
-# define DEFAULT_CONV j_oconv
-#endif
-#ifdef DEFAULT_CODE_SJIS
-# define DEFAULT_CONV s_oconv
-#endif
-#ifdef DEFAULT_CODE_EUC
-# define DEFAULT_CONV e_oconv
-#endif
-#ifdef DEFAULT_CODE_UTF8
-# define DEFAULT_CONV w_oconv
-#endif
-
-/* process default */
-static void (*output_conv)(nkf_char c2,nkf_char c1) = DEFAULT_CONV;
-
-static void (*oconv)(nkf_char c2,nkf_char c1) = no_connection;
-/* s_iconv or oconv */
-static nkf_char (*iconv)(nkf_char c2,nkf_char c1,nkf_char c0) = no_connection2;
-
-static void (*o_zconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_fconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_crconv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_rot_conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_hira_conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_base64conv)(nkf_char c2,nkf_char c1) = no_connection;
-static void (*o_iso2022jp_check_conv)(nkf_char c2,nkf_char c1) = no_connection;
-
-/* static redirections */
-
-static void (*o_putc)(nkf_char c) = std_putc;
-
-static nkf_char (*i_getc)(FILE *f) = std_getc; /* general input */
-static nkf_char (*i_ungetc)(nkf_char c,FILE *f) =std_ungetc;
-
-static nkf_char (*i_bgetc)(FILE *) = std_getc; /* input of mgetc */
-static nkf_char (*i_bungetc)(nkf_char c ,FILE *f) = std_ungetc;
-
-static void (*o_mputc)(nkf_char c) = std_putc ; /* output of mputc */
-
-static nkf_char (*i_mgetc)(FILE *) = std_getc; /* input of mgetc */
-static nkf_char (*i_mungetc)(nkf_char c ,FILE *f) = std_ungetc;
-
-/* for strict mime */
-static nkf_char (*i_mgetc_buf)(FILE *) = std_getc; /* input of mgetc_buf */
-static nkf_char (*i_mungetc_buf)(nkf_char c,FILE *f) = std_ungetc;
-
-/* Global states */
-static int output_mode = ASCII, /* output kanji mode */
- input_mode = ASCII, /* input kanji mode */
- shift_mode = FALSE; /* TRUE shift out, or X0201 */
-static int mime_decode_mode = FALSE; /* MIME mode B base64, Q hex */
-
-/* X0201 / X0208 conversion tables */
-
-/* X0201 kana conversion table */
-/* 90-9F A0-DF */
-static const
-unsigned char cv[]= {
- 0x21,0x21,0x21,0x23,0x21,0x56,0x21,0x57,
- 0x21,0x22,0x21,0x26,0x25,0x72,0x25,0x21,
- 0x25,0x23,0x25,0x25,0x25,0x27,0x25,0x29,
- 0x25,0x63,0x25,0x65,0x25,0x67,0x25,0x43,
- 0x21,0x3c,0x25,0x22,0x25,0x24,0x25,0x26,
- 0x25,0x28,0x25,0x2a,0x25,0x2b,0x25,0x2d,
- 0x25,0x2f,0x25,0x31,0x25,0x33,0x25,0x35,
- 0x25,0x37,0x25,0x39,0x25,0x3b,0x25,0x3d,
- 0x25,0x3f,0x25,0x41,0x25,0x44,0x25,0x46,
- 0x25,0x48,0x25,0x4a,0x25,0x4b,0x25,0x4c,
- 0x25,0x4d,0x25,0x4e,0x25,0x4f,0x25,0x52,
- 0x25,0x55,0x25,0x58,0x25,0x5b,0x25,0x5e,
- 0x25,0x5f,0x25,0x60,0x25,0x61,0x25,0x62,
- 0x25,0x64,0x25,0x66,0x25,0x68,0x25,0x69,
- 0x25,0x6a,0x25,0x6b,0x25,0x6c,0x25,0x6d,
- 0x25,0x6f,0x25,0x73,0x21,0x2b,0x21,0x2c,
- 0x00,0x00};
-
-
-/* X0201 kana conversion table for daguten */
-/* 90-9F A0-DF */
-static const
-unsigned char dv[]= {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x74,
- 0x00,0x00,0x00,0x00,0x25,0x2c,0x25,0x2e,
- 0x25,0x30,0x25,0x32,0x25,0x34,0x25,0x36,
- 0x25,0x38,0x25,0x3a,0x25,0x3c,0x25,0x3e,
- 0x25,0x40,0x25,0x42,0x25,0x45,0x25,0x47,
- 0x25,0x49,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x25,0x50,0x25,0x53,
- 0x25,0x56,0x25,0x59,0x25,0x5c,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};
-
-/* X0201 kana conversion table for han-daguten */
-/* 90-9F A0-DF */
-static const
-unsigned char ev[]= {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 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,
- 0x00,0x00,0x00,0x00,0x25,0x51,0x25,0x54,
- 0x25,0x57,0x25,0x5a,0x25,0x5d,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 */
-static const
-unsigned char fv[] = {
-
- 0x00,0x00,0x00,0x00,0x2c,0x2e,0x00,0x3a,
- 0x3b,0x3f,0x21,0x00,0x00,0x27,0x60,0x00,
- 0x5e,0x00,0x5f,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x2d,0x00,0x2f,
- 0x5c,0x00,0x00,0x7c,0x00,0x00,0x60,0x27,
- 0x22,0x22,0x28,0x29,0x00,0x00,0x5b,0x5d,
- 0x7b,0x7d,0x3c,0x3e,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x2b,0x2d,0x00,0x00,
- 0x00,0x3d,0x00,0x3c,0x3e,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x24,0x00,0x00,0x25,0x23,0x26,0x2a,0x40,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-} ;
-
-
-#define CRLF 1
-
-static int file_out_f = FALSE;
-#ifdef OVERWRITE
-static int overwrite_f = FALSE;
-static int preserve_time_f = FALSE;
-static int backup_f = FALSE;
-static char *backup_suffix = "";
-static char *get_backup_filename(const char *suffix, const char *filename);
-#endif
-
-static int crmode_f = 0; /* CR, NL, CRLF */
-#ifdef EASYWIN /*Easy Win */
-static int end_check;
-#endif /*Easy Win */
-
-#define STD_GC_BUFSIZE (256)
-nkf_char std_gc_buf[STD_GC_BUFSIZE];
-nkf_char std_gc_ndx;
-
-#ifdef WIN32DLL
-#include "nkf32dll.c"
-#elif defined(PERL_XS)
-#else /* WIN32DLL */
-int main(int argc, char **argv)
-{
- FILE *fin;
- unsigned char *cp;
-
- char *outfname = NULL;
- char *origfname;
-
-#ifdef EASYWIN /*Easy Win */
- _BufferSize.y = 400;/*Set Scroll Buffer Size*/
-#endif
-
- for (argc--,argv++; (argc > 0) && **argv == '-'; argc--, argv++) {
- cp = (unsigned char *)*argv;
- options(cp);
-#ifdef EXEC_IO
- if (exec_f){
- int fds[2], pid;
- if (pipe(fds) < 0 || (pid = fork()) < 0){
- abort();
- }
- if (pid == 0){
- if (exec_f > 0){
- close(fds[0]);
- dup2(fds[1], 1);
- }else{
- close(fds[1]);
- dup2(fds[0], 0);
- }
- execvp(argv[1], &argv[1]);
- }
- if (exec_f > 0){
- close(fds[1]);
- dup2(fds[0], 0);
- }else{
- close(fds[0]);
- dup2(fds[1], 1);
- }
- argc = 0;
- break;
- }
-#endif
- }
- if(x0201_f == WISH_TRUE)
- x0201_f = ((!iso2022jp_f)? TRUE : NO_X0201);
-
- if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","wb",stdout) == NULL)
- return (-1);
-#else
- setbinmode(stdout);
-#endif
-
- if (unbuf_f)
- setbuf(stdout, (char *) NULL);
- else
- setvbuffer(stdout, (char *) stdobuf, IOBUF_SIZE);
-
- if (argc == 0) {
- if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","rb",stdin) == NULL) return (-1);
-#else
- setbinmode(stdin);
-#endif
- setvbuffer(stdin, (char *) stdibuf, IOBUF_SIZE);
- if (nop_f)
- noconvert(stdin);
- else {
- kanji_convert(stdin);
- if (guess_f) print_guessed_code(NULL);
- }
- } else {
- int nfiles = argc;
- int is_argument_error = FALSE;
- while (argc--) {
- is_inputcode_mixed = FALSE;
- is_inputcode_set = FALSE;
- input_codename = "";
-#ifdef CHECK_OPTION
- iconv_for_check = 0;
-#endif
- if ((fin = fopen((origfname = *argv++), "r")) == NULL) {
- perror(*--argv);
- *argv++;
- is_argument_error = TRUE;
- continue;
- } else {
-#ifdef OVERWRITE
- int fd = 0;
- int fd_backup = 0;
-#endif
-
-/* reopen file for stdout */
- if (file_out_f == TRUE) {
-#ifdef OVERWRITE
- if (overwrite_f){
- outfname = malloc(strlen(origfname)
- + strlen(".nkftmpXXXXXX")
- + 1);
- if (!outfname){
- perror(origfname);
- return -1;
- }
- strcpy(outfname, origfname);
-#ifdef MSDOS
- {
- int i;
- for (i = strlen(outfname); i; --i){
- if (outfname[i - 1] == '/'
- || outfname[i - 1] == '\\'){
- break;
- }
- }
- outfname[i] = '\0';
- }
- strcat(outfname, "ntXXXXXX");
- mktemp(outfname);
- fd = open(outfname, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL,
- S_IREAD | S_IWRITE);
-#else
- strcat(outfname, ".nkftmpXXXXXX");
- fd = mkstemp(outfname);
-#endif
- if (fd < 0
- || (fd_backup = dup(fileno(stdout))) < 0
- || dup2(fd, fileno(stdout)) < 0
- ){
- perror(origfname);
- return -1;
- }
- }else
-#endif
- if(argc == 1 ) {
- outfname = *argv++;
- argc--;
- } else {
- outfname = "nkf.out";
- }
-
- if(freopen(outfname, "w", stdout) == NULL) {
- perror (outfname);
- return (-1);
- }
- if (binmode_f == TRUE) {
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","wb",stdout) == NULL)
- return (-1);
-#else
- setbinmode(stdout);
-#endif
- }
- }
- if (binmode_f == TRUE)
-#if defined(__OS2__) && (defined(__IBMC__) || defined(__IBMCPP__))
- if (freopen("","rb",fin) == NULL)
- return (-1);
-#else
- setbinmode(fin);
-#endif
- setvbuffer(fin, (char *) stdibuf, IOBUF_SIZE);
- if (nop_f)
- noconvert(fin);
- else {
- char *filename = NULL;
- kanji_convert(fin);
- if (nfiles > 1) filename = origfname;
- if (guess_f) print_guessed_code(filename);
- }
- fclose(fin);
-#ifdef OVERWRITE
- if (overwrite_f) {
- struct stat sb;
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
- time_t tb[2];
-#else
- struct utimbuf tb;
-#endif
-
- fflush(stdout);
- close(fd);
- if (dup2(fd_backup, fileno(stdout)) < 0){
- perror("dup2");
- }
- if (stat(origfname, &sb)) {
- fprintf(stderr, "Can't stat %s\n", origfname);
- }
- /* パ・踉札潺奪轡腑鵑鯢蝟昭粡竚癈鷭т繻Ь蓁閼冐瘢絳皰齡熏閼紿蝟昭粡竚癈鷭т繻Ь頏蜴纈鬪秩逾黼鞳鴉蜩皷闔黠遐阨釶辣鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ьタイムスタンプを復元 */
- if(preserve_time_f){
-#if defined(MSDOS) && !defined(__MINGW32__) && !defined(__WIN32__) && !defined(__WATCOMC__) && !defined(__EMX__) && !defined(__OS2__) && !defined(__DJGPP__)
- tb[0] = tb[1] = sb.st_mtime;
- if (utime(outfname, tb)) {
- fprintf(stderr, "Can't set timestamp %s\n", outfname);
- }
-#else
- tb.actime = sb.st_atime;
- tb.modtime = sb.st_mtime;
- if (utime(outfname, &tb)) {
- fprintf(stderr, "Can't set timestamp %s\n", outfname);
- }
-#endif
- }
- if(backup_f){
- char *backup_filename = get_backup_filename(backup_suffix, origfname);
-#ifdef MSDOS
- unlink(backup_filename);
-#endif
- if (rename(origfname, backup_filename)) {
- perror(backup_filename);
- fprintf(stderr, "Can't rename %s to %s\n",
- origfname, backup_filename);
- }
- }else{
-#ifdef MSDOS
- if (unlink(origfname)){
- perror(origfname);
- }
-#endif
- }
- if (rename(outfname, origfname)) {
- perror(origfname);
- fprintf(stderr, "Can't rename %s to %s\n",
- outfname, origfname);
- }
- free(outfname);
- }
-#endif
- }
- }
- if (is_argument_error)
- return(-1);
- }
-#ifdef EASYWIN /*Easy Win */
- if (file_out_f == FALSE)
- scanf("%d",&end_check);
- else
- fclose(stdout);
-#else /* for Other OS */
- if (file_out_f == TRUE)
- fclose(stdout);
-#endif /*Easy Win */
- return (0);
-}
-#endif /* WIN32DLL */
-
-#ifdef OVERWRITE
-char *get_backup_filename(const char *suffix, const char *filename)
-{
- char *backup_filename;
- int asterisk_count = 0;
- int i, j;
- int filename_length = strlen(filename);
-
- for(i = 0; suffix[i]; i++){
- if(suffix[i] == '*') asterisk_count++;
- }
-
- if(asterisk_count){
- backup_filename = malloc(strlen(suffix) + (asterisk_count * (filename_length - 1)) + 1);
- if (!backup_filename){
- perror("Can't malloc backup filename.");
- return NULL;
- }
-
- for(i = 0, j = 0; suffix[i];){
- if(suffix[i] == '*'){
- backup_filename[j] = '\0';
- strncat(backup_filename, filename, filename_length);
- i++;
- j += filename_length;
- }else{
- backup_filename[j++] = suffix[i++];
- }
- }
- backup_filename[j] = '\0';
- }else{
- j = strlen(suffix) + filename_length;
- backup_filename = malloc( + 1);
- strcpy(backup_filename, filename);
- strcat(backup_filename, suffix);
- backup_filename[j] = '\0';
- }
- return backup_filename;
-}
-#endif
-
-static const
-struct {
- const char *name;
- const char *alias;
-} long_option[] = {
- {"ic=", ""},
- {"oc=", ""},
- {"base64","jMB"},
- {"euc","e"},
- {"euc-input","E"},
- {"fj","jm"},
- {"help","v"},
- {"jis","j"},
- {"jis-input","J"},
- {"mac","sLm"},
- {"mime","jM"},
- {"mime-input","m"},
- {"msdos","sLw"},
- {"sjis","s"},
- {"sjis-input","S"},
- {"unix","eLu"},
- {"version","V"},
- {"windows","sLw"},
- {"hiragana","h1"},
- {"katakana","h2"},
- {"katakana-hiragana","h3"},
- {"guess", "g"},
- {"cp932", ""},
- {"no-cp932", ""},
-#ifdef X0212_ENABLE
- {"x0212", ""},
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- {"utf8", "w"},
- {"utf16", "w16"},
- {"ms-ucs-map", ""},
- {"fb-skip", ""},
- {"fb-html", ""},
- {"fb-xml", ""},
- {"fb-perl", ""},
- {"fb-java", ""},
- {"fb-subchar", ""},
- {"fb-subchar=", ""},
-#endif
-#ifdef UTF8_INPUT_ENABLE
- {"utf8-input", "W"},
- {"utf16-input", "W16"},
- {"no-cp932ext", ""},
- {"no-best-fit-chars",""},
-#endif
-#ifdef UNICODE_NORMALIZATION
- {"utf8mac-input", ""},
-#endif
-#ifdef OVERWRITE
- {"overwrite", ""},
- {"overwrite=", ""},
- {"in-place", ""},
- {"in-place=", ""},
-#endif
-#ifdef INPUT_OPTION
- {"cap-input", ""},
- {"url-input", ""},
-#endif
-#ifdef NUMCHAR_OPTION
- {"numchar-input", ""},
-#endif
-#ifdef CHECK_OPTION
- {"no-output", ""},
- {"debug", ""},
-#endif
-#ifdef SHIFTJIS_CP932
- {"cp932inv", ""},
-#endif
-#ifdef EXEC_IO
- {"exec-in", ""},
- {"exec-out", ""},
-#endif
- {"prefix=", ""},
-};
-
-static int option_mode = 0;
-
-void options(unsigned char *cp)
-{
- nkf_char i, j;
- unsigned char *p;
- unsigned char *cp_back = NULL;
- char codeset[32];
-
- if (option_mode==1)
- return;
- while(*cp && *cp++!='-');
- while (*cp || cp_back) {
- if(!*cp){
- cp = cp_back;
- cp_back = NULL;
- continue;
- }
- p = 0;
- switch (*cp++) {
- case '-': /* literal options */
- if (!*cp || *cp == SPACE) { /* ignore the rest of arguments */
- option_mode = 1;
- return;
- }
- for (i=0;i<sizeof(long_option)/sizeof(long_option[0]);i++) {
- p = (unsigned char *)long_option[i].name;
- for (j=0;*p && *p != '=' && *p == cp[j];p++, j++);
- if (*p == cp[j] || cp[j] == ' '){
- p = &cp[j] + 1;
- break;
- }
- p = 0;
- }
- if (p == 0) return;
- while(*cp && *cp != SPACE && cp++);
- if (long_option[i].alias[0]){
- cp_back = cp;
- cp = (unsigned char *)long_option[i].alias;
- }else{
- if (strcmp(long_option[i].name, "ic=") == 0){
- for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
- codeset[i] = nkf_toupper(p[i]);
- }
- codeset[i] = 0;
- if(strcmp(codeset, "ISO-2022-JP") == 0){
- input_f = JIS_INPUT;
- }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0 ||
- strcmp(codeset, "CP50220") == 0 ||
- strcmp(codeset, "CP50221") == 0 ||
- strcmp(codeset, "CP50222") == 0){
- input_f = JIS_INPUT;
-#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
- input_f = JIS_INPUT;
-#ifdef X0212_ENABLE
- x0212_f = TRUE;
-#endif
- }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
- input_f = JIS_INPUT;
-#ifdef X0212_ENABLE
- x0212_f = TRUE;
-#endif
- x0213_f = TRUE;
- }else if(strcmp(codeset, "SHIFT_JIS") == 0){
- input_f = SJIS_INPUT;
- }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
- strcmp(codeset, "CSWINDOWS31J") == 0 ||
- strcmp(codeset, "CP932") == 0 ||
- strcmp(codeset, "MS932") == 0){
- input_f = SJIS_INPUT;
-#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "EUCJP") == 0 ||
- strcmp(codeset, "EUC-JP") == 0){
- input_f = EUC_INPUT;
- }else if(strcmp(codeset, "CP51932") == 0){
- input_f = EUC_INPUT;
-#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
- strcmp(codeset, "EUCJP-MS") == 0 ||
- strcmp(codeset, "EUCJPMS") == 0){
- input_f = EUC_INPUT;
-#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_MS;
-#endif
- }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
- strcmp(codeset, "EUCJP-ASCII") == 0){
- input_f = EUC_INPUT;
-#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
- }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
- strcmp(codeset, "SHIFT_JIS-2004") == 0){
- input_f = SJIS_INPUT;
- x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
-#endif
- }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
- strcmp(codeset, "EUC-JIS-2004") == 0){
- input_f = EUC_INPUT;
- x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
-#endif
-#ifdef UTF8_INPUT_ENABLE
- }else if(strcmp(codeset, "UTF-8") == 0 ||
- strcmp(codeset, "UTF-8N") == 0 ||
- strcmp(codeset, "UTF-8-BOM") == 0){
- input_f = UTF8_INPUT;
-#ifdef UNICODE_NORMALIZATION
- }else if(strcmp(codeset, "UTF8-MAC") == 0 ||
- strcmp(codeset, "UTF-8-MAC") == 0){
- input_f = UTF8_INPUT;
- nfc_f = TRUE;
-#endif
- }else if(strcmp(codeset, "UTF-16") == 0 ||
- strcmp(codeset, "UTF-16BE") == 0 ||
- strcmp(codeset, "UTF-16BE-BOM") == 0){
- input_f = UTF16_INPUT;
- input_endian = ENDIAN_BIG;
- }else if(strcmp(codeset, "UTF-16LE") == 0 ||
- strcmp(codeset, "UTF-16LE-BOM") == 0){
- input_f = UTF16_INPUT;
- input_endian = ENDIAN_LITTLE;
- }else if(strcmp(codeset, "UTF-32") == 0 ||
- strcmp(codeset, "UTF-32BE") == 0 ||
- strcmp(codeset, "UTF-32BE-BOM") == 0){
- input_f = UTF32_INPUT;
- input_endian = ENDIAN_BIG;
- }else if(strcmp(codeset, "UTF-32LE") == 0 ||
- strcmp(codeset, "UTF-32LE-BOM") == 0){
- input_f = UTF32_INPUT;
- input_endian = ENDIAN_LITTLE;
-#endif
- }
- continue;
- }
- if (strcmp(long_option[i].name, "oc=") == 0){
- x0201_f = FALSE;
- for (i=0; i < 16 && SPACE < p[i] && p[i] < DEL; i++){
- codeset[i] = nkf_toupper(p[i]);
- }
- codeset[i] = 0;
- if(strcmp(codeset, "ISO-2022-JP") == 0){
- output_conv = j_oconv;
- }else if(strcmp(codeset, "X-ISO2022JP-CP932") == 0){
- output_conv = j_oconv;
- no_cp932ext_f = TRUE;
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "CP50220") == 0){
- output_conv = j_oconv;
- x0201_f = TRUE;
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "CP50221") == 0){
- output_conv = j_oconv;
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "ISO-2022-JP-1") == 0){
- output_conv = j_oconv;
-#ifdef X0212_ENABLE
- x0212_f = TRUE;
-#endif
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
- }else if(strcmp(codeset, "ISO-2022-JP-3") == 0){
- output_conv = j_oconv;
-#ifdef X0212_ENABLE
- x0212_f = TRUE;
-#endif
- x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
- }else if(strcmp(codeset, "SHIFT_JIS") == 0){
- output_conv = s_oconv;
- }else if(strcmp(codeset, "WINDOWS-31J") == 0 ||
- strcmp(codeset, "CSWINDOWS31J") == 0 ||
- strcmp(codeset, "CP932") == 0 ||
- strcmp(codeset, "MS932") == 0){
- output_conv = s_oconv;
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "EUCJP") == 0 ||
- strcmp(codeset, "EUC-JP") == 0){
- output_conv = e_oconv;
- }else if(strcmp(codeset, "CP51932") == 0){
- output_conv = e_oconv;
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- }else if(strcmp(codeset, "EUC-JP-MS") == 0 ||
- strcmp(codeset, "EUCJP-MS") == 0 ||
- strcmp(codeset, "EUCJPMS") == 0){
- output_conv = e_oconv;
-#ifdef X0212_ENABLE
- x0212_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_MS;
-#endif
- }else if(strcmp(codeset, "EUC-JP-ASCII") == 0 ||
- strcmp(codeset, "EUCJP-ASCII") == 0){
- output_conv = e_oconv;
-#ifdef X0212_ENABLE
- x0212_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
- }else if(strcmp(codeset, "SHIFT_JISX0213") == 0 ||
- strcmp(codeset, "SHIFT_JIS-2004") == 0){
- output_conv = s_oconv;
- x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
- }else if(strcmp(codeset, "EUC-JISX0213") == 0 ||
- strcmp(codeset, "EUC-JIS-2004") == 0){
- output_conv = e_oconv;
-#ifdef X0212_ENABLE
- x0212_f = TRUE;
-#endif
- x0213_f = TRUE;
-#ifdef SHIFTJIS_CP932
- cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- }else if(strcmp(codeset, "UTF-8") == 0){
- output_conv = w_oconv;
- }else if(strcmp(codeset, "UTF-8N") == 0){
- output_conv = w_oconv;
- }else if(strcmp(codeset, "UTF-8-BOM") == 0){
- output_conv = w_oconv;
- output_bom_f = TRUE;
- }else if(strcmp(codeset, "UTF-16BE") == 0){
- output_conv = w_oconv16;
- }else if(strcmp(codeset, "UTF-16") == 0 ||
- strcmp(codeset, "UTF-16BE-BOM") == 0){
- output_conv = w_oconv16;
- output_bom_f = TRUE;
- }else if(strcmp(codeset, "UTF-16LE") == 0){
- output_conv = w_oconv16;
- output_endian = ENDIAN_LITTLE;
- }else if(strcmp(codeset, "UTF-16LE-BOM") == 0){
- output_conv = w_oconv16;
- output_endian = ENDIAN_LITTLE;
- output_bom_f = TRUE;
- }else if(strcmp(codeset, "UTF-32") == 0 ||
- strcmp(codeset, "UTF-32BE") == 0){
- output_conv = w_oconv32;
- }else if(strcmp(codeset, "UTF-32BE-BOM") == 0){
- output_conv = w_oconv32;
- output_bom_f = TRUE;
- }else if(strcmp(codeset, "UTF-32LE") == 0){
- output_conv = w_oconv32;
- output_endian = ENDIAN_LITTLE;
- }else if(strcmp(codeset, "UTF-32LE-BOM") == 0){
- output_conv = w_oconv32;
- output_endian = ENDIAN_LITTLE;
- output_bom_f = TRUE;
-#endif
- }
- continue;
- }
-#ifdef OVERWRITE
- if (strcmp(long_option[i].name, "overwrite") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "overwrite=") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = TRUE;
- backup_f = TRUE;
- backup_suffix = malloc(strlen((char *) p) + 1);
- strcpy(backup_suffix, (char *) p);
- continue;
- }
- if (strcmp(long_option[i].name, "in-place") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = FALSE;
- continue;
- }
- if (strcmp(long_option[i].name, "in-place=") == 0){
- file_out_f = TRUE;
- overwrite_f = TRUE;
- preserve_time_f = FALSE;
- backup_f = TRUE;
- backup_suffix = malloc(strlen((char *) p) + 1);
- strcpy(backup_suffix, (char *) p);
- continue;
- }
-#endif
-#ifdef INPUT_OPTION
- if (strcmp(long_option[i].name, "cap-input") == 0){
- cap_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "url-input") == 0){
- url_f = TRUE;
- continue;
- }
-#endif
-#ifdef NUMCHAR_OPTION
- if (strcmp(long_option[i].name, "numchar-input") == 0){
- numchar_f = TRUE;
- continue;
- }
-#endif
-#ifdef CHECK_OPTION
- if (strcmp(long_option[i].name, "no-output") == 0){
- noout_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "debug") == 0){
- debug_f = TRUE;
- continue;
- }
-#endif
- if (strcmp(long_option[i].name, "cp932") == 0){
-#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
- cp932inv_f = TRUE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_CP932;
-#endif
- continue;
- }
- if (strcmp(long_option[i].name, "no-cp932") == 0){
-#ifdef SHIFTJIS_CP932
- cp51932_f = FALSE;
- cp932inv_f = FALSE;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
- continue;
- }
-#ifdef SHIFTJIS_CP932
- if (strcmp(long_option[i].name, "cp932inv") == 0){
- cp932inv_f = TRUE;
- continue;
- }
-#endif
-
-#ifdef X0212_ENABLE
- if (strcmp(long_option[i].name, "x0212") == 0){
- x0212_f = TRUE;
- continue;
- }
-#endif
-
-#ifdef EXEC_IO
- if (strcmp(long_option[i].name, "exec-in") == 0){
- exec_f = 1;
- return;
- }
- if (strcmp(long_option[i].name, "exec-out") == 0){
- exec_f = -1;
- return;
- }
-#endif
-#if defined(UTF8_OUTPUT_ENABLE) && defined(UTF8_INPUT_ENABLE)
- if (strcmp(long_option[i].name, "no-cp932ext") == 0){
- no_cp932ext_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "no-best-fit-chars") == 0){
- no_best_fit_chars_f = TRUE;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-skip") == 0){
- encode_fallback = NULL;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-html") == 0){
- encode_fallback = encode_fallback_html;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-xml" ) == 0){
- encode_fallback = encode_fallback_xml;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-java") == 0){
- encode_fallback = encode_fallback_java;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-perl") == 0){
- encode_fallback = encode_fallback_perl;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-subchar") == 0){
- encode_fallback = encode_fallback_subchar;
- continue;
- }
- if (strcmp(long_option[i].name, "fb-subchar=") == 0){
- encode_fallback = encode_fallback_subchar;
- unicode_subchar = 0;
- if (p[0] != '0'){
- /* decimal number */
- for (i = 0; i < 7 && nkf_isdigit(p[i]); i++){
- unicode_subchar *= 10;
- unicode_subchar += hex2bin(p[i]);
- }
- }else if(p[1] == 'x' || p[1] == 'X'){
- /* hexadecimal number */
- for (i = 2; i < 8 && nkf_isxdigit(p[i]); i++){
- unicode_subchar <<= 4;
- unicode_subchar |= hex2bin(p[i]);
- }
- }else{
- /* octal number */
- for (i = 1; i < 8 && nkf_isoctal(p[i]); i++){
- unicode_subchar *= 8;
- unicode_subchar += hex2bin(p[i]);
- }
- }
- w16e_conv(unicode_subchar, &i, &j);
- unicode_subchar = i<<8 | j;
- continue;
- }
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- if (strcmp(long_option[i].name, "ms-ucs-map") == 0){
- ms_ucs_map_f = UCS_MAP_MS;
- continue;
- }
-#endif
-#ifdef UNICODE_NORMALIZATION
- if (strcmp(long_option[i].name, "utf8mac-input") == 0){
- input_f = UTF8_INPUT;
- nfc_f = TRUE;
- continue;
- }
-#endif
- if (strcmp(long_option[i].name, "prefix=") == 0){
- if (nkf_isgraph(p[0])){
- for (i = 1; nkf_isgraph(p[i]); i++){
- prefix_table[p[i]] = p[0];
- }
- }
- continue;
- }
- }
- continue;
- case 'b': /* buffered mode */
- unbuf_f = FALSE;
- continue;
- case 'u': /* non bufferd mode */
- unbuf_f = TRUE;
- continue;
- case 't': /* transparent mode */
- if (*cp=='1') {
- /* alias of -t */
- nop_f = TRUE;
- *cp++;
- } else if (*cp=='2') {
- /*
- * -t with put/get
- *
- * nkf -t2MB hoge.bin | nkf -t2mB | diff -s - hoge.bin
- *
- */
- nop_f = 2;
- *cp++;
- } else
- nop_f = TRUE;
- continue;
- case 'j': /* JIS output */
- case 'n':
- output_conv = j_oconv;
- continue;
- case 'e': /* AT&T EUC output */
- output_conv = e_oconv;
- cp932inv_f = FALSE;
- continue;
- case 's': /* SJIS output */
- output_conv = s_oconv;
- continue;
- case 'l': /* ISO8859 Latin-1 support, no conversion */
- iso8859_f = TRUE; /* Only compatible with ISO-2022-JP */
- input_f = LATIN1_INPUT;
- continue;
- case 'i': /* Kanji IN ESC-$-@/B */
- if (*cp=='@'||*cp=='B')
- kanji_intro = *cp++;
- continue;
- case 'o': /* ASCII IN ESC-(-J/B */
- if (*cp=='J'||*cp=='B'||*cp=='H')
- ascii_intro = *cp++;
- continue;
- case 'h':
- /*
- bit:1 katakana->hiragana
- bit:2 hiragana->katakana
- */
- if ('9'>= *cp && *cp>='0')
- hira_f |= (*cp++ -'0');
- else
- hira_f |= 1;
- continue;
- case 'r':
- rot_f = TRUE;
- continue;
-#if defined(MSDOS) || defined(__OS2__)
- case 'T':
- binmode_f = FALSE;
- continue;
-#endif
-#ifndef PERL_XS
- case 'V':
- version();
- exit(1);
- break;
- case 'v':
- usage();
- exit(1);
- break;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- case 'w': /* UTF-8 output */
- if (cp[0] == '8') {
- output_conv = w_oconv; cp++;
- if (cp[0] == '0'){
- cp++;
- } else {
- output_bom_f = TRUE;
- }
- } else {
- if ('1'== cp[0] && '6'==cp[1]) {
- output_conv = w_oconv16; cp+=2;
- } else if ('3'== cp[0] && '2'==cp[1]) {
- output_conv = w_oconv32; cp+=2;
- } else {
- output_conv = w_oconv;
- continue;
- }
- if (cp[0]=='L') {
- cp++;
- output_endian = ENDIAN_LITTLE;
- } else if (cp[0] == 'B') {
- cp++;
- } else {
- continue;
- }
- if (cp[0] == '0'){
- cp++;
- } else {
- output_bom_f = TRUE;
- }
- }
- continue;
-#endif
-#ifdef UTF8_INPUT_ENABLE
- case 'W': /* UTF input */
- if (cp[0] == '8') {
- cp++;
- input_f = UTF8_INPUT;
- }else{
- if ('1'== cp[0] && '6'==cp[1]) {
- cp += 2;
- input_f = UTF16_INPUT;
- input_endian = ENDIAN_BIG;
- } else if ('3'== cp[0] && '2'==cp[1]) {
- cp += 2;
- input_f = UTF32_INPUT;
- input_endian = ENDIAN_BIG;
- } else {
- input_f = UTF8_INPUT;
- continue;
- }
- if (cp[0]=='L') {
- cp++;
- input_endian = ENDIAN_LITTLE;
- } else if (cp[0] == 'B') {
- cp++;
- }
- }
- continue;
-#endif
- /* Input code assumption */
- case 'J': /* JIS input */
- input_f = JIS_INPUT;
- continue;
- case 'E': /* AT&T EUC input */
- input_f = EUC_INPUT;
- continue;
- case 'S': /* MS Kanji input */
- input_f = SJIS_INPUT;
- if (x0201_f==NO_X0201) x0201_f=TRUE;
- continue;
- case 'Z': /* Convert X0208 alphabet to asii */
- /* bit:0 Convert X0208
- bit:1 Convert Kankaku to one space
- bit:2 Convert Kankaku to two spaces
- bit:3 Convert HTML Entity
- */
- if ('9'>= *cp && *cp>='0')
- alpha_f |= 1<<(*cp++ -'0');
- else
- alpha_f |= TRUE;
- continue;
- case 'x': /* Convert X0201 kana to X0208 or X0201 Conversion */
- x0201_f = FALSE; /* No X0201->X0208 conversion */
- /* accept X0201
- ESC-(-I in JIS, EUC, MS Kanji
- SI/SO in JIS, EUC, MS Kanji
- SSO in EUC, JIS, not in MS Kanji
- MS Kanji (0xa0-0xdf)
- output X0201
- ESC-(-I in JIS (0x20-0x5f)
- SSO in EUC (0xa0-0xdf)
- 0xa0-0xd in MS Kanji (0xa0-0xdf)
- */
- continue;
- case 'X': /* Assume X0201 kana */
- /* Default value is NO_X0201 for EUC/MS-Kanji mix */
- x0201_f = TRUE;
- continue;
- case 'F': /* prserve new lines */
- fold_preserve_f = TRUE;
- case 'f': /* folding -f60 or -f */
- fold_f = TRUE;
- fold_len = 0;
- while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
- fold_len *= 10;
- fold_len += *cp++ - '0';
- }
- if (!(0<fold_len && fold_len<BUFSIZ))
- fold_len = DEFAULT_FOLD;
- if (*cp=='-') {
- fold_margin = 0;
- cp++;
- while('0'<= *cp && *cp <='9') { /* we don't use atoi here */
- fold_margin *= 10;
- fold_margin += *cp++ - '0';
- }
- }
- continue;
- case 'm': /* MIME support */
- /* mime_decode_f = TRUE; */ /* this has too large side effects... */
- if (*cp=='B'||*cp=='Q') {
- mime_decode_mode = *cp++;
- mimebuf_f = FIXED_MIME;
- } else if (*cp=='N') {
- mime_f = TRUE; cp++;
- } else if (*cp=='S') {
- mime_f = STRICT_MIME; cp++;
- } else if (*cp=='0') {
- mime_decode_f = FALSE;
- mime_f = FALSE; cp++;
- }
- continue;
- case 'M': /* MIME output */
- if (*cp=='B') {
- mimeout_mode = 'B';
- mimeout_f = FIXED_MIME; cp++;
- } else if (*cp=='Q') {
- mimeout_mode = 'Q';
- mimeout_f = FIXED_MIME; cp++;
- } else {
- mimeout_f = TRUE;
- }
- continue;
- case 'B': /* Broken JIS support */
- /* bit:0 no ESC JIS
- bit:1 allow any x on ESC-(-x or ESC-$-x
- bit:2 reset to ascii on NL
- */
- if ('9'>= *cp && *cp>='0')
- broken_f |= 1<<(*cp++ -'0');
- else
- broken_f |= TRUE;
- continue;
-#ifndef PERL_XS
- case 'O':/* for Output file */
- file_out_f = TRUE;
- continue;
-#endif
- case 'c':/* add cr code */
- crmode_f = CRLF;
- continue;
- case 'd':/* delete cr code */
- crmode_f = NL;
- continue;
- case 'I': /* ISO-2022-JP output */
- iso2022jp_f = TRUE;
- continue;
- case 'L': /* line mode */
- if (*cp=='u') { /* unix */
- crmode_f = NL; cp++;
- } else if (*cp=='m') { /* mac */
- crmode_f = CR; cp++;
- } else if (*cp=='w') { /* windows */
- crmode_f = CRLF; cp++;
- } else if (*cp=='0') { /* no conversion */
- crmode_f = 0; cp++;
- }
- continue;
- case 'g':
-#ifndef PERL_XS
- guess_f = TRUE;
-#endif
- continue;
- case ' ':
- /* module muliple options in a string are allowed for Perl moudle */
- while(*cp && *cp++!='-');
- continue;
- default:
- /* bogus option but ignored */
- continue;
- }
- }
-}
-
-struct input_code * find_inputcode_byfunc(nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
-{
- if (iconv_func){
- struct input_code *p = input_code_list;
- while (p->name){
- if (iconv_func == p->iconv_func){
- return p;
- }
- p++;
- }
- }
- return 0;
-}
-
-void set_iconv(nkf_char f, nkf_char (*iconv_func)(nkf_char c2,nkf_char c1,nkf_char c0))
-{
-#ifdef INPUT_CODE_FIX
- if (f || !input_f)
-#endif
- if (estab_f != f){
- estab_f = f;
- }
-
- if (iconv_func
-#ifdef INPUT_CODE_FIX
- && (f == -TRUE || !input_f) /* -TRUE means "FORCE" */
-#endif
- ){
- iconv = iconv_func;
- }
-#ifdef CHECK_OPTION
- if (estab_f && iconv_for_check != iconv){
- struct input_code *p = find_inputcode_byfunc(iconv);
- if (p){
- set_input_codename(p->name);
- debug(input_codename);
- }
- iconv_for_check = iconv;
- }
-#endif
-}
-
-#define SCORE_L2 (1) /* 第2水準漢字 */
-#define SCORE_KANA (SCORE_L2 << 1) /* いわゆる筈苳山僖蝟昭粡竚癈鷭т繻Ь粤肅鈬地凖瀋登杜地凖瀚僧ぢ機鎔預己源蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将d繙蜴喘碗冬弛抗喘碗冬津佚猟踉殺踉羽弛抗による読み換え */
-#define SCORE_NO_EXIST (SCORE_CP932 << 1) /* 存在しない文字 */
-#else
-#define SCORE_NO_EXIST (SCORE_DEPEND << 1) /* 存在しない文字 */
-#endif
-#define SCORE_iMIME (SCORE_NO_EXIST << 1) /* MIME による指定 */
-#define SCORE_ERROR (SCORE_iMIME << 1) /* エラ・踉蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь粤肅鈬地凖濾良地凖煢揺妖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闔齡諞焜葹黹闥縷碎縷前桍鹿粡寂蝟赱齠洲粤讌将穐穐蝟昭粡竚癈鷭т繻Ь穐穐鹿粡寂蝟赱齠洲粤讌将穐地凖瀋登杜潮地凖瀋登杜潮地凖瀋登杜潮鹿粡寂蝟赱齠洲粤讌将喘碗冬津佚猟喘碗冬津佚猟喘碗冬津佚猟喘碗冬力濺愽嘖蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闔齡諞焜葹黹闥縷碎縷動桍鹿粡寂蝟赱齠洲粤讌将喘碗冬眠喘碗冬眠喘碗冬眠喘碗冬眠蝟昭粡竚癈鷭т繻Ь地凖潴岡地凖瀋登杜潮地凖瀘努瓶坎地凖瀘努瓶坎鹿粡寂蝟赱齠洲粤讌将喘碗冬津佚猟喘碗冬津佚猟喘碗冬津佚猟喘碗冬津佚猟蝟昭粡竚癈鷭т繻Ь地凖瀋登杜潮地凖瀘努瓶坎地凖瀘努瓶坎地凖濺厰碗蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶黼竢粤燗竢鱚蜴頤竢粤頸鬪諞焜葹黹闥紿鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将頸鬮黹闥竢鱚纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶竚鰡竢粤燗竢鱚蜴頤竢粤頸鬪諞焜葹黹闥紿鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将頸鬮黹闥逅蚕黹闥綮鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆閼縷黹闥紲齡鴣笏鉋焜閼蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇頸鬮碯聘維纂蝟昭粡竚癈鷭т繻Ь蜀粤孕童瀟孕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇頸鬮碯聘榎纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将黼竢粤燗竢鱚喘碗冬賭厦勞纂蝟昭粡竚癈鷭т繻Ь繻黼十嗜鹿粡寂蝟赱齠洲粤讌将黼竢粤燗竢鱚喘碗冬冒料鹿粡寂蝟赱齠洲粤讌将i聹繙堝互墅孕濺料駄甜蝟昭粡竚癈鷭т繻Ь繻黼─絏竢鉚岡羽鹿粡寂蝟赱齠洲粤讌将黼竢粤燗竢鱚喘碗冬力濺愽嘖鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将踈蜀逅因薫十逢蝟昭粡竚癈鷭т繻Ь續焜閼縷黹闥紲頸鬪竢鱚熹痰跂濮異祺瘢雹聟鹿粡寂蝟赱齠洲粤讌将踈蜀逅因薫十逢蝟昭粡竚癈鷭т繻Ь續焜閼縷黹闥紲頸鬪竢鱚熹痰跂瀑異祺瘢雹聟鹿粡寂蝟赱齠洲粤讌将踈蜀逅因薫因軌鹿粡寂蝟赱齠洲粤讌将黼竢粤燗竢鱚喘碗冬眠鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆黯粡黶碎紲齡鴣笏鉋焜閼蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将頸鬮齡癆瓜鹿粡寂蝟赱齠洲粤讌将頸鬮碯聘維瓜鹿粡寂蝟赱齠洲粤讌将竢粤燗竢鱚鹿粡寂蝟赱齠洲粤讌将蜀蜒闔十苳脂竢鉚煕礬續煢竢鉚遡單逢纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆黯頤鼈焜荐齡鴣笏鉋焜閼鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将頸鬮碯聘頸鬮蜴粤纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆黯竚縺鬥齡鴣笏鉋焜閼蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将頸鬮齡癆纂蝟昭粡竚癈鷭т繻Ь苳脂鈔纔纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆黯鱚黼齡鴣笏鉋焜閼蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将齡癆焜跂癇鹿粡寂蝟赱齠洲粤讌将頸鬮黹闥喘碗冬瀕不纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆黯鱚蜴蜚蜴頤竢粤頸鬧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь黯鱚黼頸鬧纂蝟昭粡竚癈鷭т繻Ь苳止肅跂燗飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶齡癆焜蒹站蜴頤竢粤頸鬪諞焜葹礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь踉蚕徒瘢雹逅纉矍罘蝟昭粡竚癈鷭т繻Ь黯鱚黼頸鬧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶黯齡癆蜴頤竢粤頸鬪諞焜葹礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь荐頸鬮齡癆鹿粡寂蝟赱齠洲粤讌将竅黼浦鹿粡寂蝟赱齠洲粤讌将齡癆焜蒹站礬纂蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь癈虻鹿粡寂蝟赱齠洲粤讌将蜀津密蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将踈蜀蜩熾鉗竢粤焜瘰齦跂蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь繻黼┛逅殺瘢雹踉蚕罘蝟昭粡竚癈鷭т繻Ь黯頤鼈焜荐頸鬪嗜鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь閼縷黹闥紲頸鬧纂蝟昭粡竚癈鷭т繻Ь黯竚縺鬥頸鬧纂蝟昭粡竚癈鷭т繻Ь繻黼┬因険踉蚕瘢雹逅逢┛逅殺瘢雹踉蚕罘鹿粡寂蝟赱齠洲粤讌将頸鬮齡癆纂蝟昭粡竚癈鷭т繻Ь黯頤鼈焜荐頸鬪鹿粡寂蝟赱齠洲粤讌将i聹繙班瀞壁嘸弛抗下蝟昭粡竚癈鷭т繻Ь繻黼雉厩害煕鹿粡寂蝟赱齠洲粤讌将逅殺瘢雹黯蛯辣煢釼鼕蜩蝟昭粡竚癈鷭т繻Ь苳雌音鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь緕粡班瀞壁嘸弛抗鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь繻黼芦渦煕瘢雹逅因羂踉蚕瘢雹逅因聶鹿粡寂蝟赱齠洲粤讌将頸鬮齡癆纂蝟昭粡竚癈鷭т繻Ь黯頤鼈焜荐頸鬪鹿粡寂蝟赱齠洲粤讌将e鈔蜀悵憶貨杜疎姪蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь黯粡黶碎紲頸鬧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将竅黼瑳蝟昭粡竚癈鷭т繻Ь┬因完踉蚕瘢雹逅因桁因鍵踉蚕瘢雹逅因聶蝟昭粡竚癈鷭т繻Ь黯頤鼈焜荐頸鬪鹿粡寂蝟赱齠洲粤讌将鷁縷竢鉚苳獅朧檪苳獅霸檪瘢雹頸鬮碯聘維逅諮苳獅霸櫞纂蝟昭粡竚癈鷭т繻Ь閼縷黹闥紲頸鬧纂蝟昭粡竚癈鷭т繻Ь黯竚縺鬥頸鬧纂蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь黯粡黶碎紲頸鬧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将竅黼瑳蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将蜀┛逅殺瘢雹踉蚕紿┛逅殺瘢雹踉蚕礬鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь峨焜闔頸鬮碯聘維頸鬮碯聘榎逅諮苳獅朧檪瘢雹頸鬮碯聘榎十鹿粡寂蝟赱齠洲粤讌将黼竢粤燗竢鱚喘碗冬弛抗鴬纂蝟昭粡竚癈鷭т繻Ь黯竚縺鬥頸鬧纂蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡班瀞壁嘸弛抗鹿粡寂蝟赱齠洲粤讌将i冐粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将齡癆焙蜩痰跂鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆燗鶉齡鴣笏鉋焜閼鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将齬蜚竏頸鬮齡癆鹿粡寂蝟赱齠洲粤讌将竅黼浦鹿粡寂蝟赱齠洲粤讌将齡癆焜蒹站礬纂蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь癈虻鹿粡寂蝟赱齠洲粤讌将蜀津密蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将踈蜀蜩熾鉗竢粤焜瘰齦跂蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь繻黼嗜因甕踉蚕瘢雹逅因聽蝟昭粡竚癈鷭т繻Ь苳雌瓜鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将踈蜀因御礬蝟昭粡竚癈鷭т繻Ь苳雌音鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь緕粡芦渦濺料駄鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将齡癆焙蜩痰跂鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь癈浦鹿粡寂蝟赱齠洲粤讌将蜀因甕踉蚕瘢雹逅因聽鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь閼縷黹闥紲頸鬧纂蝟昭粡竚癈鷭т繻Ь黯竚縺鬥頸鬧纂蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь黯粡黶碎紲頸鬧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь癈穏鹿粡寂蝟赱齠洲粤讌将蜀因甕踉蚕瘢雹逅因聽鹿粡寂蝟赱齠洲粤讌将頸鬮齡癆纂蝟昭粡竚癈鷭т繻Ь黯頤鼈焜荐頸鬪鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将齡癆焙蜩痰跂鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡芦渦濺料駄鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙堝互瀕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将蜆燗鶉齡鴣笏鉋焜閼鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将齬蜚竏頸鬮齡癆鹿粡寂蝟赱齠洲粤讌将竅黼浦鹿粡寂蝟赱齠洲粤讌将齡癆焜蒹站礬纂蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь癈虻鹿粡寂蝟赱齠洲粤讌将蜀津密蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将踈蜀蜩熾鉗竢粤焜瘰齦跂蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь繻黼┛逅殺瘢雹踉蚕罘蝟昭粡竚癈鷭т繻Ь苳雌瓜鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь繻黼┛逅殺瘢雹踉蚕罘蝟昭粡竚癈鷭т繻Ь苳雌音鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь繻黼┛逅殺瘢雹踉蚕刊蝟昭粡竚癈鷭т繻Ь苳雌鎧鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь黯粡黶碎紲頸鬧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将竅黼瑳蝟昭粡竚癈鷭т繻Ь癈穏鹿粡寂蝟赱齠洲粤讌将蜀因鍵踉蚕瘢雹逅因砌鹿粡寂蝟赱齠洲粤讌将齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь苳脂鈔纔苳頸鬮齡癆鹿粡寂蝟赱齠洲粤讌将蜴硼苳獅朧十逅殺瘢雹苳獅霸十蘯蝟昭粡竚癈鷭т繻Ь逅殺瘢雹苳獅朮十罘纂蝟昭粡竚癈鷭т繻Ь峨焜闔頸鬮碯聘維頸鬮碯聘榎頸鬮碯聘課蝟昭粡竚癈鷭т繻Ь逅諮苳獅朧檪瘢雹頸鬮碯聘榎鹿粡寂蝟赱齠洲粤讌将蜀≠闕鹿粡寂蝟赱齠洲粤讌将竢粤燗竢鱚鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь黯竚縺鬥頸鬧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将齡癆焙蜩痰跂鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鱚瘠纂蝟昭粡竚癈鷭т繻Ь癈該鹿粡寂蝟赱齠洲粤讌将 蜀因鍵踉蚕瘢雹逅因砌鹿粡寂蝟赱齠洲粤讌将 蜀頸鬮蜴粤苳雌蝟昭粡竚癈鷭т繻Ь 齡癆熕萬竏礬纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 齡癆焜跂癇鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь黯粡黶碎紲頸鬧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆閼縷齡癆諞焜葹礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь銓笏蜿釼肚瘍纂蝟昭粡竚癈鷭т繻Ь蜴頤竢粤鱚齦踉纂蝟昭粡竚癈鷭т繻Ь蜴頤竢粤蜴頤竢粤煬蜩鹿粡寂蝟赱齠洲粤讌将蛹苳試瘢紿蝟昭粡竚癈鷭т繻Ь─隲齡癆煕礬鹿粡寂蝟赱齠洲粤讌将 雹鹿粡寂蝟赱齠洲粤讌将 竢銓蜴纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь─隲齡癆煕礬鹿粡寂蝟赱齠洲粤讌将 竢銓蜴纂蝟昭粡竚癈鷭т繻Ь隲齡癆煕礬礬纂蝟昭粡竚癈鷭т繻Ь苳雌鹿粡寂蝟赱齠洲粤讌将痺闔煕赱飴鹿粡寂蝟赱齠洲粤讌将踈蜀苳雌十鹿粡寂蝟赱齠洲粤讌将蜀鱚齦踉鹿粡寂蝟赱齠洲粤讌将痺闔煕赱飴鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将鱚齦踉纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀痺闔煕赱腥蝟昭粡竚癈鷭т繻Ь纉逅殺瘢雹纉矍罘蝟昭粡竚癈鷭т繻Ь續煢竢鉚簒適纉蜒闔胚釿鹿粡寂蝟赱齠洲粤讌将踈蜀津密蝟昭粡竚癈鷭т繻Ь蜴頤竢粤頸蜴頤竢粤煬蜩鹿粡寂蝟赱齠洲粤讌将蛹苳試瘢紿蝟昭粡竚癈鷭т繻Ь黯鱚黼頸鬧纂蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀鈔繙瀕害通娘蝟昭粡竚癈鷭т繻Ь諞焜葹齡籖艱斌蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀齡籖艫燻鬻鹿粡寂蝟赱齠洲粤讌将鱚鴈熈窰碯聘齡籖艫燻鬻飮鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь續艱鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡徂粒可面鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇熾鈑續礙鉉聨竏癇読姪罘鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь熈窰鈔十堋瀁蓄怠酉冨滴蝟昭粡竚癈鷭т繻Ь續渡道鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь熈窰碯聘齡籖艫燻鬻禹鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i冐粤徂粒可面鹿粡寂蝟赱齠洲粤讌将蜆熕礙鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀―渡透鹿粡寂蝟赱齠洲粤讌将頤葹鬥礬纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀瀕害通蜜蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤肅鈬筥佚厂烱唏瘢雹逅>繙蜴繖瀕害通密鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇閭闔鶯斌蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇禹鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀鈿鞏十蝟昭粡竚癈鷭т繻Ь迴糒跂焜闔鈬笏蜿遖鹿粡寂蝟赱齠洲粤讌将蛹┬┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь熕礬鹿粡寂蝟赱齠洲粤讌将┴閙頤渡透纂蝟昭粡竚癈鷭т繻Ь續瓜鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶迴糒跂焜闔鈬笏蜿遖蜆蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将閭闔阨焜闔蝟昭粡竚癈鷭т繻Ь熕齡籖頤纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鱚韭痺竢銓蜴癆蜿迴糒跂胙闕頤皷粤蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь阨繖蜒鱚笏蜿鹿粡寂蝟赱齠洲粤讌将i聹繙氾男瀟來貧亮蝟昭粡竚癈鷭т繻Ь闖煕苺纉黯罘蝟昭粡竚癈鷭т繻Ь熕鈿熕禹鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蜊繽煕蝟昭粡竚癈鷭т繻Ь閙逅閙頤纂蝟昭粡竚癈鷭т繻Ь閙頤蜊縷頤纂蝟昭粡竚癈鷭т繻Ь蜀迚辣阨十簒滴鹿粡寂蝟赱齠洲粤讌将 閙矚黼挟竢鉚竢鉚閭闔矚黼挟焜闔鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь癈絛岸竢飴蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀竰迴粤煕蝟昭粡竚癈鷭т繻Ь閙竰竢鉚竢鉚閭闔竰焜闔鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь阡煕蝟昭粡竚癈鷭т繻Ь閙鳫竢鉚竢鉚閭闔鳫竢鉚纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀蜩鏖芦芽鞏罘鹿粡寂蝟赱齠洲粤讌将 閙蜩鏖芦芽鞏竏繝諧竢鉚竢鉚閭闔蜩鏖芦芽鞏竏繝諧竢鉚纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀蓍鱇煕蝟昭粡竚癈鷭т繻Ь閙蓍鱇焜闔閭闔竢鉚蜥痿竢鉚纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀肬趙煕蝟昭粡竚癈鷭т繻Ь閙聶闔閭闔竢鉚闌籖竢鉚纂蝟昭粡竚癈鷭т繻Ь聨跚鈬纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀瘡韆痿芦葦煕蝟昭粡竚癈鷭т繻Ь閙闔閭闔竢鉚焜闔鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь熈續齡籖艱纂蝟昭粡竚癈鷭т繻Ь熾鈑續齡籖艱纂蝟昭粡竚癈鷭т繻Ь蜴頤鱚粡竰繝闔蝟昭粡竚癈鷭т繻Ь蜀粤瀕侖壥椀塢藁鹿粡寂蝟赱齠洲粤讌将蜀竅鞏罘蝟昭粡竚癈鷭т繻Ь焜艱熈續禹熈續竅鞏艱纂蝟昭粡竚癈鷭т繻Ь焜艱熾鈑續禹熾鈑續秉瘰熾鈑續禹鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鳰煕鹿粡寂蝟赱齠洲粤讌将蛬續蛬艱蛬艱鳰熈續禹鹿粡寂蝟赱齠洲粤讌将蛬鈑續蛬艱蛬艱赧艱纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将i聹繙嬪暖倉瀟來貧亮蝟昭粡竚癈鷭т繻Ь竏癇煕鹿粡寂蝟赱齠洲粤讌将蛬鈑續蛬艱蛬艱竏癇熈續禹鹿粡寂蝟赱齠洲粤讌将蛬銛鈑續蛬艱蛬艱銛辜葹鰡艱纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将i聹繙良地津瀘碗輿棉攸塢藁鹿粡寂蝟赱齠洲粤讌将蜀鈕窰逅殺瘢雹鉋煕孕童濾緑孕鹿粡寂蝟赱齠洲粤讌将蛬鈕窰艱熈續禹熈續鈕窰艱纂蝟昭粡竚癈鷭т繻Ь燻聶熾鈑續蛬艱蛬艱鈕窰艱纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将蜀迚辣煕瘢雹逅迚辣碯聨羹銃婦田瀝浜滴鹿粡寂蝟赱齠洲粤讌将 蛬辯續蛬艱蛬艱蜊縷艱纂蝟昭粡竚癈鷭т繻Ь蛬逡鈑續蛬艱蛬艱蜊縷艱纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀碣闍緕煕瘢雹蝟昭粡竚癈鷭т繻Ь蛬砒續蛬艱蛬艱鳫諷釼艱纂蝟昭粡竚癈鷭т繻Ь蛬碯鈑續蛬艱蛬艱鳫諷釼艱纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀蜴頤十瓶濾緑孕蜴頤十嫦濾緑孕蜴頤十壮瀕円瀕侖圦鹿粡寂蝟赱齠洲粤讌将黼蜒闔簒適煢竢鉚鹿粡寂蝟赱齠洲粤讌将繻黼鉋煕喨瓶濾緑孕蝟昭粡竚癈鷭т繻Ь續煢竢鉚┃墟嫖黯蜒闔纂蝟昭粡竚癈鷭т繻Ь蜀粤孕童濾緑孕濺料駄甜蝟昭粡竚癈鷭т繻Ь踈蜀蜴頤十堝互瀕侖圦鹿粡寂蝟赱齠洲粤讌将黼蜒闔簒適煢竢鉚鹿粡寂蝟赱齠洲粤讌将繻黼鉋煕孕同襟瀕侖圦鹿粡寂蝟赱齠洲粤讌将黼蜒闔簒適煢竢鉚蔚鹿粡寂蝟赱齠洲粤讌将繻黼鉋煕孕導貨瀕侖圦鹿粡寂蝟赱齠洲粤讌将黼蜒闔簒適煢竢鉚害鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将黼蜒闔徳毛適煢竢鉚鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将齡鴣笏鉋焜閼鉋焜閼縷跚齡纂蝟昭粡竚癈鷭т繻Ь蓍跂隲釶辣鹿粡寂蝟赱齠洲粤讌将齡癆熬繪鉗隧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蒹站鈔芬闥堆夕蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜆蒹站烽闕斌蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜴祺纂蝟昭粡竚癈鷭т繻Ь荐祺熈續礬蝟昭粡竚癈鷭т繻Ь癈因旭瑳蝟昭粡竚癈鷭т繻Ь蜀┬祺熈續礬因旭鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因禿鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因篤鹿粡寂蝟赱齠洲粤讌将 蜀─蜴頤罘蝟昭粡竚癈鷭т繻Ь 黼蜒闔墟嫖蜒闔鴬纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蜀蜒闔十煢竢鉚害蝟昭粡竚癈鷭т繻Ь 蜴頤緕粡瘤猟描累舵濃鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь ┴蛬艱因篤鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因禿鹿粡寂蝟赱齠洲粤讌将 踈蜀十透蝟昭粡竚癈鷭т繻Ь 蜀┬祺熈續礬因禿鹿粡寂蝟赱齠洲粤讌将 蜀─蜴頤罘蝟昭粡竚癈鷭т繻Ь 黼蜒闔墟嫖蜒闔鴬纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蜀蜒闔十煢竢鉚害蝟昭粡竚癈鷭т繻Ь 蜴頤緕粡瘤猟描累憶干纂蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь ┴蛬艱因篤鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因篤鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因旭鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因旭鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将竅黼萄鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因詑鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因惰鹿粡寂蝟赱齠洲粤讌将 蜀─蜴頤罘蝟昭粡竚癈鷭т繻Ь 黼蜒闔墟嫖蜒闔纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蜀蜒闔十煢竢鉚蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь ┴蛬艱因惰鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因詑鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因兎鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将竅黼添鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因篤鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因旭鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因旭鹿粡寂蝟赱齠洲粤讌将 蜀─蜴頤罘蝟昭粡竚癈鷭т繻Ь 黼蜒闔墟嫖蜒闔鴬纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蜀蜒闔十煢竢鉚害蝟昭粡竚癈鷭т繻Ь 蜴頤緕粡瘤猟描累慨渦纂蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь ┴蛬艱因旭鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因旭鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 蜀─蜴頤罘蝟昭粡竚癈鷭т繻Ь 黼蜒闔墟嫖蜒闔匡纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀蜒闔十煢竢鉚蔚蝟昭粡竚癈鷭т繻Ь 蜴頤緕粡瘤猟描累舵濃鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь┴蛬艱因篤鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因禿鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将竅黼萄鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因禿鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因旭鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬因旭鹿粡寂蝟赱齠洲粤讌将 蜀─蜴頤罘蝟昭粡竚癈鷭т繻Ь 黼蜒闔墟嫖蜒闔鴬纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蜀蜒闔十煢竢鉚害蝟昭粡竚癈鷭т繻Ь 蜴頤緕粡瘤猟描累棉墺姪纂蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь ┴蛬艱因旭鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因旭鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 蜀─蜴頤罘蝟昭粡竚癈鷭т繻Ь 黼蜒闔墟嫖蜒闔匡纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀蜒闔十煢竢鉚蔚蝟昭粡竚癈鷭т繻Ь 蜴頤緕粡瘤猟描累棉墺姪纂蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь┴蛬艱因禿鹿粡寂蝟赱齠洲粤讌将 踈┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱因篤鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将粤聲鹿粡寂蝟赱齠洲粤讌将 ┴蛬艱祺鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将闔鴦蜿轣蜴闖隰閼粤笏蜿闔踟鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諞焜葹諱鉅蛬竢鉚纈読姪罘鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь諞焜葹階化穐卯綾飴鹿粡寂蝟赱齠洲粤讌将蜴蜩澹砠徳毛纏鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀鉋煕喨瓶濾緑孕蜴頤十嫦濾緑孕鹿粡寂蝟赱齠洲粤讌将i聹繙堝互瀕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将蜴頤十堝互瀕侖鉋煕孕同襟瀕侖埃蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜩澹砠墟嫖纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜴頤迴粤喘鰭纂蝟昭粡竚癈鷭т繻Ь頤迴粤喘鰭纂蝟昭粡竚癈鷭т繻Ь蓍胄熏閼徳毛纏鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将d繙蜴療慥闔銛鈿頤續纔鹿粡寂蝟赱齠洲粤讌将d繙蜴單猟阨瘤祺艱鈬蝟昭粡竚癈鷭т繻Ь粤肅鈬喪碣縺鈔跫關苡跫皷鈑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将迴糒跂焜闔鈬笏蜿遖鹿粡寂蝟赱齠洲粤讌将竏繝諧硼蹠罘纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蓍跂┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь蜀粤瀕侖壥地津瀑婦鹿粡寂蝟赱齠洲粤讌将 蜀♂鉋煕蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь竢粤燗鶉祓鹿粡寂蝟赱齠洲粤讌将蜀祺蝟昭粡竚癈鷭т繻Ь黼竢鈔鹿粡寂蝟赱齠洲粤讌将蜀祺苳┬蜴頤十瓶濾緑孕瘢雹逅逑熾笂熏瘰煕因慌徒鹿粡寂蝟赱齠洲粤讌将竅黼侯砠蜩鹿粡寂蝟赱齠洲粤讌将蜀≦齡痰煕逅殺瘢雹″蜊縷粤竢粤熏閼紿鹿粡寂蝟赱齠洲粤讌将竅黼鈿纉碎蜩蒹鹿粡寂蝟赱齠洲粤讌将蜩跛轤蜃阨鹿粡寂蝟赱齠洲粤讌将蜀萬竢鉚祺祓重脇鹿粡寂蝟赱齠洲粤讌将盟嘖纂蝟昭粡竚癈鷭т繻Ь踈鹿粡寂蝟赱齠洲粤讌将祺纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将 竅黼瘡鱚痲纉碎蜩蒹鹿粡寂蝟赱齠洲粤讌将 蜀祓踉壮蝟昭粡竚癈鷭т繻Ь 芬闥硼苺竢粤鈔阡亠芦怪団蝟昭粡竚癈鷭т繻Ь 祺纂蝟昭粡竚癈鷭т繻Ь 療慥纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 單猟纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь踈綣蝟昭粡竚癈鷭т繻Ь黼竢鈔絳蜚閼鹿粡寂蝟赱齠洲粤讌将迚艾矼瘤裼蓍鹿粡寂蝟赱齠洲粤讌将蜀十徒祓踉蚕仭壇鹿粡寂蝟赱齠洲粤讌将芬闥硼苺肅鴦竢粤蝟昭粡竚癈鷭т繻Ь飴鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈綣蝟昭粡竚癈鷭т繻Ь杜鳥鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将蜥齡鹿粡寂蝟赱齠洲粤讌将i聹繙堝互瀕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将 蜀蜒闔十煢竢鉚蔚蝟昭粡竚癈鷭т繻Ь 蜀蜴頤緕粡瘤杜追僧濛蒜蝟昭粡竚癈鷭т繻Ь 祺瓜鹿粡寂蝟赱齠洲粤讌将 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 蜀因銚踉蚕逅殺瘢雹因賃蝟昭粡竚癈鷭т繻Ь 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 祕踉殺踉蚕纂蝟昭粡竚癈鷭т繻Ь 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 祕祿纂蝟昭粡竚癈鷭т繻Ь 繻黼渡道鹿粡寂蝟赱齠洲粤讌将 繻黼渡道鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 繻黼渡道鹿粡寂蝟赱齠洲粤讌将 繻黼鹿粡寂蝟赱齠洲粤讌将 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 蜀因銚踉蚕逅殺瘢雹因賃蝟昭粡竚癈鷭т繻Ь 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 祕踉殺踉蚕纂蝟昭粡竚癈鷭т繻Ь 祕祿纂蝟昭粡竚癈鷭т繻Ь 繻黼渡道鹿粡寂蝟赱齠洲粤讌将 繻黼渡道鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 繻黼渡道鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 單猟纂蝟昭粡竚癈鷭т繻Ь踈蜀竢鉚蜒闔鴬蝟昭粡竚癈鷭т繻Ь 蜴祿瓜鹿粡寂蝟赱齠洲粤讌将 蜀┬祺熈續礬渡逅殺瘢雹鹿粡寂蝟赱齠洲粤讌将 祓熈續礬渡逅殺瘢雹鹿粡寂蝟赱齠洲粤讌将 祕熈續礬渡透蝟昭粡竚癈鷭т繻Ь 齬蜚竏鉋煥鈔蛛遘蝟昭粡竚癈鷭т繻Ь 竅黼猟描累舵悩鹿粡寂蝟赱齠洲粤讌将 祓祺逅三透蔚祓逅三透愛瘢雹因篤鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼猟描累棉墺姪瑳蝟昭粡竚癈鷭т繻Ь 祓祿逅三透祺逅三透右瘢雹因篤踉殺踉傘胸鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼猟描累憶干瑳蝟昭粡竚癈鷭т繻Ь 祓祿逅三透蔚祓逅三透祕逅三透源鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼猟描累慨渦瑳蝟昭粡竚癈鷭т繻Ь 祓祿逅三透王瘢雹因篤愛瘢雹因篤踉殺踉傘胸鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 祺纂蝟昭粡竚癈鷭т繻Ь 踈纛鹿粡寂蝟赱齠洲粤讌将 祺脇纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 單猟纂蝟昭粡竚癈鷭т繻Ь踈綣蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将蜀蜩熾鉗竢粤焜瘰齦跂羽鹿粡寂蝟赱齠洲粤讌将單猟纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将 蜀祓苳┬蜴頤十瓶濾緑孕瘢雹逅逑熾笂熏瘰煕因慌徒鹿粡寂蝟赱齠洲粤讌将蜚閼鹿粡寂蝟赱齠洲粤讌将蜀≦齡痰煕瘢雹逅♂齒幻宜煕蝟昭粡竚癈鷭т繻Ь鈿纉碎蜩蒹鹿粡寂蝟赱齠洲粤讌将祺瓜鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈齡痰煕十墟嫖蝟昭粡竚癈鷭т繻Ь齒幻宜煕蝟昭粡竚癈鷭т繻Ь瓶聾元降瓜鹿粡寂蝟赱齠洲粤讌将祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь杜鳥鹿粡寂蝟赱齠洲粤讌将繻黼嗤純逅殺瘢雹右踉三逅殺瘢雹竢鉚黯蜒闔鹿粡寂蝟赱齠洲粤讌将壁悵屋秩黼鹿粡寂蝟赱齠洲粤讌将蜀齒屋臆褓煕瘢雹逅屋円羹塾悵屋羽鹿粡寂蝟赱齠洲粤讌将┴閭闔都善播堊鴬纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将 祺芦葦纂蝟昭粡竚癈鷭т繻Ь 祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь 單猟纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь踈蜀祓十嗷逅殺瘢雹竢鉚黯蜒闔鹿粡寂蝟赱齠洲粤讌将嫦芦葦癈鹿粡寂蝟赱齠洲粤讌将祓熈續礬謇嗷鹿粡寂蝟赱齠洲粤讌将竢粤燗鶉祓鹿粡寂蝟赱齠洲粤讌将蜀嗷丶踉蚕祓瘢雹逅祓因絨蝟昭粡竚癈鷭т繻Ь 蜀齒屋臆褓煕瘢雹逅芦葦煕十力烱芦葦蝟昭粡竚癈鷭т繻Ь ┴閭闔都善播堊鴬纂蝟昭粡竚癈鷭т繻Ь 療慥纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 祺芦葦纂蝟昭粡竚癈鷭т繻Ь 祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь 單猟纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь踈硼苺竢粤鼡蜷嗜鈔鈬鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将瘡鱚痲纉碎蜩蒹鹿粡寂蝟赱齠洲粤讌将祓纂蝟昭粡竚癈鷭т繻Ь療慥纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь踈蜀仭壇逅殺瘢雹祓津密蝟昭粡竚癈鷭т繻Ь蜴癈閹闕瘤葹鱇笏纈鹿粡寂蝟赱齠洲粤讌将蜀鼈蜀迴粤鹿粡寂蝟赱齠洲粤讌将頤鼈蜀磔蝟昭粡竚癈鷭т繻Ь齒幻宜煕蝟昭粡竚癈鷭т繻Ь瓶聾元降瓜鹿粡寂蝟赱齠洲粤讌将單猟纂蝟昭粡竚癈鷭т繻Ь踈蜀嗤礎摘踉蚕祓瘢雹逅祓┛愛瘢雹因傑鹿粡寂蝟赱齠洲粤讌将頤鼈蜀磔蝟昭粡竚癈鷭т繻Ь 蜀齒屋臆褓煕瘢雹逅屋円羹塾悵屋羽鹿粡寂蝟赱齠洲粤讌将 ┴閭闔都善播堊鴬纂蝟昭粡竚癈鷭т繻Ь 療慥纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 祺芦葦纂蝟昭粡竚癈鷭т繻Ь 單猟纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь跫闍蜍硼苺竢粤蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь踈蜀蜴頤迴粤悵屋鉋熏閼十芦渦蝟昭粡竚癈鷭т繻Ь 鉋熏閼十芦嘘澑蜴頤迴粤悵憶樫鴬鹿粡寂蝟赱齠洲粤讌将竅黼磨鉅鼈蜀鹿粡寂蝟赱齠洲粤讌将祺瓜鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈蜀祓Ы逅殺瘢雹蜊縷逅殺瘢雹迚辣焙繝閼縷迴粤鹿粡寂蝟赱齠洲粤讌将蒹站浜竢粤蝟昭粡竚癈鷭т繻Ь┬祓熈續礬渡透鹿粡寂蝟赱齠洲粤讌将┴閭闔┛ЫЗ纂蝟昭粡竚癈鷭т繻Ь喪垰鹿粡寂蝟赱齠洲粤讌将繻黼十色蝟昭粡竚癈鷭т繻Ь戎迚辣闔鴦蜿齡癇黼髟緕竇蝟昭粡竚癈鷭т繻Ь 蜀蜊縷十墟秒壥揺妖蝟昭粡竚癈鷭т繻Ь 蒹站鱚瘡續瘟鹿粡寂蝟赱齠洲粤讌将 蜀迚辣烽繚蜴燗蜒罘渡透蝟昭粡竚癈鷭т繻Ь 盟嘖纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 療慥纂蝟昭粡竚癈鷭т繻Ь 繻黼蜊縷矼芍遖罘渡透蝟昭粡竚癈鷭т繻Ь喪垰鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь竢鉚穐洲鹿粡寂蝟赱齠洲粤讌将┴蛬艱祓鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将闥轣喪檀竢粤鹿粡寂蝟赱齠洲粤讌将單猟纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将繻黼十逅殺瘢雹♂黯呉蜚迚辣焙繝閼縷迴粤鹿粡寂蝟赱齠洲粤讌将鼈蜀迴粤遡單鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈蜀祓嗜瘢雹逅─蜩澹砠蜊縷粤竢粤熏閼紿蝟昭粡竚癈鷭т繻Ь蓍胄熏閼墟嫖鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈蜀祓途逅殺瘢雹♂黯呉蜚迚辣焙繝閼縷迴粤鹿粡寂蝟赱齠洲粤讌将蜀┴蛬艱罘十脇蝟昭粡竚癈鷭т繻Ь竢鉚穐喘闔緕硼苺竢粤蝟昭粡竚癈鷭т繻Ь喪垰鹿粡寂蝟赱齠洲粤讌将繻黼十ぇ蝟昭粡竚癈鷭т繻Ь┬祓熈續礬渡透鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将┴閭闔┛途辿粹逾黼鈔閾閼鹿粡寂蝟赱齠洲粤讌将┴閭闔┛ГЗ鹿粡寂蝟赱齠洲粤讌将盟嘖纂蝟昭粡竚癈鷭т繻Ь踈蜀祓Ю祓З鹿粡寂蝟赱齠洲粤讌将蓍蜩瘤裼銓鳫糒笏蜿鹿粡寂蝟赱齠洲粤讌将蜴頤迴粤芦宛纂蝟昭粡竚癈鷭т繻Ь蓍胄熏閼徳毛纏鹿粡寂蝟赱齠洲粤讌将黼蜴頤竢粤釶辣│瓶廊屋臆丐鹿粡寂蝟赱齠洲粤讌将i聹繙氾男瀟來貧亮蝟昭粡竚癈鷭т繻Ь繧鉋焜閼緕瘢紿纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将繻黼十├蝟昭粡竚癈鷭т繻Ь┬祓熈續礬渡透鹿粡寂蝟赱齠洲粤讌将闔緕硼苺竢粤蝟昭粡竚癈鷭т繻Ь竢鉚穐喘鹿粡寂蝟赱齠洲粤讌将┴閭闔┛ГЗ纂蝟昭粡竚癈鷭т繻Ь竢鉚穐├鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将盟嘖纂蝟昭粡竚癈鷭т繻Ь踈蜀祓Ю祓З鹿粡寂蝟赱齠洲粤讌将蓍蜩瘤裼銓鳫糒笏蜿鹿粡寂蝟赱齠洲粤讌将蜴頤迴粤芦宛纂蝟昭粡竚癈鷭т繻Ь蓍胄熏閼徳毛纏鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将繻黼十徴鹿粡寂蝟赱齠洲粤讌将蜴頤迴粤芦渦纂蝟昭粡竚癈鷭т繻Ь蓍胄熏閼徳毛纏鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь緕粡芦渦濺料駄鹿粡寂蝟赱齠洲粤讌将繻黼十悵憶樫右瘢雹因憩蝟昭粡竚癈鷭т繻Ь鉋熏閼悵憶樫瓜鹿粡寂蝟赱齠洲粤讌将鼈蜀迴粤遡單纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将繻黼十悵憶樫王瘢雹因憩蝟昭粡竚癈鷭т繻Ь鉋熏閼悵憶樫音鹿粡寂蝟赱齠洲粤讌将鼈蜀迴粤遡單纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将阨趙齒辣鞳竕瘡閼鹿粡寂蝟赱齠洲粤讌将┴閭闔┛途辿纂蝟昭粡竚癈鷭т繻Ь竢鉚穐ぇ鹿粡寂蝟赱齠洲粤讌将┴閭闔┛ЖЗ纂蝟昭粡竚癈鷭т繻Ь竢鉚穐羽纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь踈蜀碣闍緕煕逅三蝟昭粡竚癈鷭т繻Ь痺竇頸銷喘碣闍緕閼鹿粡寂蝟赱齠洲粤讌将蜴頤迴粤芦宛纂蝟昭粡竚癈鷭т繻Ь蓍胄熏閼徳毛纏鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь竢鉚穐喘鹿粡寂蝟赱齠洲粤讌将┴閭闔┛ГЗ纂蝟昭粡竚癈鷭т繻Ь竢鉚穐羽纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь踈蜀祓ЖЗ鹿粡寂蝟赱齠洲粤讌将蜀┴蛬艱罘十脇蝟昭粡竚癈鷭т繻Ь粹逾黼鈔閾閼鹿粡寂蝟赱齠洲粤讌将┴閭闔┛途辿纂蝟昭粡竚癈鷭т繻Ь竢鉚穐├蝟昭粡竚癈鷭т繻Ь喪垰鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将蜀祓З鹿粡寂蝟赱齠洲粤讌将蓍蜩芦葦瘤蜴閼闔蝟昭粡竚癈鷭т繻Ь鉋熏閼悵屋瓜蓍胄熏閼悵屋瓜鹿粡寂蝟赱齠洲粤讌将療慥纂蝟昭粡竚癈鷭т繻Ь踈蜀祓十払祓З鹿粡寂蝟赱齠洲粤讌将蓍蜩芦宛瘤裼銓鳫糒笏蜿鹿粡寂蝟赱齠洲粤讌将蜴頤迴粤喘鰭鼈蜀迴粤遡單纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将繻黼鳫諷釼网瘢雹因鴬鹿粡寂蝟赱齠洲粤讌将蜴頤迴粤喘鰭鼈蜀迴粤遡單纂蝟昭粡竚癈鷭т繻Ь努垰鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将┴閭闔┛途辿纂蝟昭粡竚癈鷭т繻Ь竢鉚穐├鹿粡寂蝟赱齠洲粤讌将瘟銓瘟鱸阨蜴頤迴粤纈鹿粡寂蝟赱齠洲粤讌将單猟纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь繻黼祓十逾蝟昭粡竚癈鷭т繻Ь啣蝟昭粡竚癈鷭т繻Ь祿熈續礬謇嗷鹿粡寂蝟赱齠洲粤讌将仭壇純逅殺瘢雹逢┛愛踉蚕祿瘢雹逅祿踉因絨蝟昭粡竚癈鷭т繻Ь祓鎧鹿粡寂蝟赱齠洲粤讌将悵屋瓜鹿粡寂蝟赱齠洲粤讌将杜鳥鹿粡寂蝟赱齠洲粤讌将繻黼蝟昭粡竚癈鷭т繻Ь┴蛬艱祿罘纂蝟昭粡竚癈鷭т繻Ь闔繻途蝟昭粡竚癈鷭т繻Ь┴閭闔┛途辿纂蝟昭粡竚癈鷭т繻Ь單猟纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь跫鈬踟喘鹿粡寂蝟赱齠洲粤讌将┴閭闔┛途辿纂蝟昭粡竚癈鷭т繻Ь杜鳥鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь繻黼十喘瘢雹逅蜒闔十煢竢鉚蝟昭粡竚癈鷭т繻Ь 喘嚠蜀壁鹿粡寂蝟赱齠洲粤讌将 蜀┴蛬艱罘十脇蝟昭粡竚癈鷭т繻Ь ┴閭闔┛途辿粹逾黼鈔閾閼鹿粡寂蝟赱齠洲粤讌将 盟嘖纂蝟昭粡竚癈鷭т繻Ь 繻黼十ぇ蝟昭粡竚癈鷭т繻Ь 範療迴裼蝟昭粡竚癈鷭т繻Ь 蜀┴蛬艱罘十脇蝟昭粡竚癈鷭т繻Ь 鹿粡寂蝟赱齠洲粤讌将 竢鉚穐喘闔緕硼苺竢粤蝟昭粡竚癈鷭т繻Ь 竢鉚穐ぇ蝟昭粡竚癈鷭т繻Ь 盟嘖纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 蜀├擢踉蚕逅殺瘢雹З蝟昭粡竚癈鷭т繻Ь ├炉踉蚕逅殺瘢雹аЗ蝟昭粡竚癈鷭т繻Ь 鹿粡寂蝟赱齠洲粤讌将 嬪鹿粡寂蝟赱齠洲粤讌将 捏添鹿粡寂蝟赱齠洲粤讌将 シ鹿粡寂蝟赱齠洲粤讌将 シ鹿粡寂蝟赱齠洲粤讌将 嬪鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 齡癆蜒闔齡銓韆闔縷纃闃蛬肅鴦碎縻芸岡階規往纂蝟昭粡竚癈鷭т繻Ь 祕褓蓖鈬煥迴裼煕蜥齡熹痰跂档芸踉殺踉県仭壇旭談喪嘸嬶秒歪纏鹿粡寂蝟赱齠洲粤讌将 蛹┬祓熈續礬渡透鹿粡寂蝟赱齠洲粤讌将 蜀嗤礎祓瘢雹逅祓踉蚕蝟昭粡竚癈鷭т繻Ь ┴閭闔┛祓逢纂蝟昭粡竚癈鷭т繻Ь 繻黼鱚瘠十鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蜀祓渡透喪垰鹿粡寂蝟赱齠洲粤讌将 療慥纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 闔繻途蝟昭粡竚癈鷭т繻Ь ┴閭闔┛途辿纂蝟昭粡竚癈鷭т繻Ь 單猟纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь踈蜀十十勞瘢雹逅碣闍緕煕逅惨蝟昭粡竚癈鷭т繻Ь鉋熏閼喪檀瓢續煢竢鉚遡單逢纂蝟昭粡竚癈鷭т繻Ь杜鳥鹿粡寂蝟赱齠洲粤讌将 繻黼十逅殺瘢雹蜊縷粤竢粤煕瘢雹逅″蜊縷粤竢粤熏閼蝟昭粡竚癈鷭т繻Ь 蜀噂┴蛬艱罘重脇瘢雹逅祓嗤礎滴鹿粡寂蝟赱齠洲粤讌将 蛬艱仭壇鹿粡寂蝟赱齠洲粤讌将 竢銓蜴纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 蛬艱卯罘纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 祓婿鹿粡寂蝟赱齠洲粤讌将 單猟纂蝟昭粡竚癈鷭т繻Ь繻黼十逅殺瘢雹蜊縷粤竢粤煕瘢雹逅″蜊縷粤竢粤熏閼蝟昭粡竚癈鷭т繻Ь 蜀噂┴蛬艱罘重脇蝟昭粡竚癈鷭т繻Ь 蜀祓十嗤礎滴鹿粡寂蝟赱齠洲粤讌将 蛬艱仭壇鹿粡寂蝟赱齠洲粤讌将 竢銓蜴纂蝟昭粡竚癈鷭т繻Ь 繻黼十逅殺瘢雹祓秀熈續礬―渡逅殺瘢雹十仭壇蝟昭粡竚癈鷭т繻Ь 蛬艱仭壇鹿粡寂蝟赱齠洲粤讌将 竢銓蜴纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 蛬艱卯罘纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蛬艱蓑罘纂蝟昭粡竚癈鷭т繻Ь 繻黼鹿粡寂蝟赱齠洲粤讌将 蛬艱卯罘纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 祓匯鹿粡寂蝟赱齠洲粤讌将 單猟纂蝟昭粡竚癈鷭т繻Ь繻黼十徒瘢雹逅蜴頤迴粤悵屋蝟昭粡竚癈鷭т繻Ь 亠芦怪蝟昭粡竚癈鷭т繻Ь 祺瓜鹿粡寂蝟赱齠洲粤讌将 療慥纂蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь杜鳥鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь黼鈔鹿粡寂蝟赱齠洲粤讌将 齬蜚竏鉋熏閼紿蝟昭粡竚癈鷭т繻Ь竅黼喘鰭瑳蝟昭粡竚癈鷭т繻Ь齬蜚竏┴蜒闔岡卯逢竅矼嫦壁孕騰孕騰蔚蝟昭粡竚癈鷭т繻Ь竅黼穏鹿粡寂蝟赱齠洲粤讌将 纉堝蝟昭粡竚癈鷭т繻Ь 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 竢粤燗鶉祕鹿粡寂蝟赱齠洲粤讌将 祕踉殺踉蚕纂蝟昭粡竚癈鷭т繻Ь 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 竢粤燗鶉祿鹿粡寂蝟赱齠洲粤讌将 ┴蜒闔岡卯淫祿鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼浦鹿粡寂蝟赱齠洲粤讌将 纉嫦孕騰鹿粡寂蝟赱齠洲粤讌将 蜀┴蛬艱罘―脇蝟昭粡竚癈鷭т繻Ь 竢粤燗鶉祕鹿粡寂蝟赱齠洲粤讌将 ┴蜒闔岡卯逢纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼芦宛瑳蝟昭粡竚癈鷭т繻Ь竅黼芦嘘澑瑳蝟昭粡竚癈鷭т繻Ь蜀逑熾笂熏瘰煕瘢雹逅纂蝟昭粡竚癈鷭т繻Ь 因憩踉蚕逅殺瘢雹因慌瘢雹逅纂蝟昭粡竚癈鷭т繻Ь 因憶踉蚕逅殺瘢雹因慧蝟昭粡竚癈鷭т繻Ь 亶害鎮蝟昭粡竚癈鷭т繻Ь 蜀十透續飴鹿粡寂蝟赱齠洲粤讌将 祓祺透祓因徹旭盟嗷炙良地津纂蝟昭粡竚癈鷭т繻Ь 祺纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь┴閭闔岡羽蓍蜩瓶鈿喨瓶嫦癈鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь竅黼芦渦瑳蝟昭粡竚癈鷭т繻Ь┴閭闔凖読憚鍍断祺祓鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将e鈔蜀悵憶貨杜疎姪蝟昭粡竚癈鷭т繻Ь竅黼芦嘘濂瑳蝟昭粡竚癈鷭т繻Ь┴閭闔凖読憚鍍断祺祓鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 粤聲鹿粡寂蝟赱齠洲粤讌将 ┴閭闔鉋熏閼絳羽阡蒹齔繝蛛竅黼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь飴鹿粡寂蝟赱齠洲粤讌将祕纂蝟昭粡竚癈鷭т繻Ь闔銛綮鹿粡寂蝟赱齠洲粤讌将阡鈬燉闥鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь辮蛹閾蝟昭粡竚癈鷭т繻Ь竢鉚渡頭逢纂蝟昭粡竚癈鷭т繻Ь─蜩煢鉋竢粤燗續蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将 蜀蜩澹砠鹿粡寂蝟赱齠洲粤讌将 齡鴣笏鉋焜閼鉋焜閼縷跚齡纂蝟昭粡竚癈鷭т繻Ь齡鴣笏鉋焜閼纉雹鹿粡寂蝟赱齠洲粤讌将 蛹苳試瘢紿蝟昭粡竚癈鷭т繻Ь 蜀隲黹闥纉黹闥紿纉雹鹿粡寂蝟赱齠洲粤讌将 雹鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь黼蜴頤竢粤釶辣纉釶辣鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇鹿粡寂蝟赱齠洲粤讌将萬竢鉚斌鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇續祿祕纂蝟昭粡竚癈鷭т繻Ь銓闌籖蜴粤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜚力矼諱鉅鼈蜀繿釿蝟昭粡竚癈鷭т繻Ь逡齡蜚蜴瓶鹿粡寂蝟赱齠洲粤讌将瘤蜚矼胄纈呉蜚閼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闌籖竢飴鹿粡寂蝟赱齠洲粤讌将頤鼈煦闌籖碯罔祺鹿粡寂蝟赱齠洲粤讌将頤鼈煦闌籖碯罔祓鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蛹┬祓熈續礬渡透鹿粡寂蝟赱齠洲粤讌将蜀祓途辿蝟昭粡竚癈鷭т繻Ь┴蛬艱祓鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь閼縷齡癆羽纂蝟昭粡竚癈鷭т繻Ь萬蓖趙烽羽渡齡痰煕鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀≦齡痰煕鹿粡寂蝟赱齠洲粤讌将齡鴣笏鉋焜閼鉋焜閼縷跚齡纂蝟昭粡竚癈鷭т繻Ь蜴頤竢粤鱚齦踉纂蝟昭粡竚癈鷭т繻Ь十脇鹿粡寂蝟赱齠洲粤讌将竢粤燗鶉祓鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蓍跂隲釶辣鹿粡寂蝟赱齠洲粤讌将蜀隲黹闥纉黹闥紿蝟昭粡竚癈鷭т繻Ь纉雹鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将黼蜒闔徳毛適纉蜒闔胚釿鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь阯蝟昭粡竚癈鷭т繻Ь渡蜩續繝筱鮗蝟昭粡竚癈鷭т繻Ь衷粤纉碎蜩蒹筱鮗蝟昭粡竚癈鷭т繻Ь濯聿纈噸面碯赱齡闥蜩蒹筴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь羽鈔竅黼鵺竢銓蜴綣蝟昭粡竚癈鷭т繻Ь瘤裼閼纉閭闔瘤跂癘纉矍竏瘤艱筮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鱚祓纂蝟昭粡竚癈鷭т繻Ь闌籖蜴粤飴鹿粡寂蝟赱齠洲粤讌将蛹闌籖蜴粤闌籖竢蝟昭粡竚癈鷭т繻Ь蓖趙烽梭闌籖蜴粤纂蝟昭粡竚癈鷭т繻Ь津娘蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将黯蜒閼縷竅頌紲祺蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь竢鉚穐岡鹿粡寂蝟赱齠洲粤讌将竢銓蜴纂蝟昭粡竚癈鷭т繻Ь繻黼竢鉚黯蜒闔逅殺瘢雹祺瘢雹逅祺踉蚕罘蝟昭粡竚癈鷭т繻Ь竢鉚悵屋卯岡鹿粡寂蝟赱齠洲粤讌将竢銓蜴纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀蓖趙煢鈔纔踉蓖趙焜阨銓鹿粡寂蝟赱齠洲粤讌将祓闌籖碯聘蓖趙煢鈔纔飮鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将祓熈續礬鹿粡寂蝟赱齠洲粤讌将蜀祓渡透蝟昭粡竚癈鷭т繻Ь渡道鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь閼縷齡癆羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将祕纂蝟昭粡竚癈鷭т繻Ь┬竢鉚祺祓逢竅矼嫦壁哢孕騰鹿粡寂蝟赱齠洲粤讌将 竅黼穏鹿粡寂蝟赱齠洲粤讌将 纉堝蝟昭粡竚癈鷭т繻Ь闌籖蜴粤闌籖竢蝟昭粡竚癈鷭т繻Ь蓖趙烽梭闌籖蜴粤纂蝟昭粡竚癈鷭т繻Ь踈蜀┴蛬艱罘十脇蝟昭粡竚癈鷭т繻Ь 鱚渡道鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 繻黼鹿粡寂蝟赱齠洲粤讌将竢粤燗鶉祕鹿粡寂蝟赱齠洲粤讌将 祕踉殺踉蚕纂蝟昭粡竚癈鷭т繻Ь 蜀蓖趙煢鈔纔踉蓖趙焜阨銓鹿粡寂蝟赱齠洲粤讌将 祿闌籖碯聘蓖趙煢鈔纔飮鹿粡寂蝟赱齠洲粤讌将 繻黼┬祿熈續礬渡透鹿粡寂蝟赱齠洲粤讌将 祕續脇纂蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 繻黼鹿粡寂蝟赱齠洲粤讌将 竢粤燗鶉祿鹿粡寂蝟赱齠洲粤讌将 ┴蜒闔岡卯淫祿鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼浦鹿粡寂蝟赱齠洲粤讌将 纉嫦孕騰鹿粡寂蝟赱齠洲粤讌将蜀蓖趙煢鈔纔踉蓖趙焜阨銓鹿粡寂蝟赱齠洲粤讌将祕闌籖碯聘蓖趙煢鈔纔飮鹿粡寂蝟赱齠洲粤讌将繻黼┬祕熈續礬渡透鹿粡寂蝟赱齠洲粤讌将 鱚渡道鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 繻黼鹿粡寂蝟赱齠洲粤讌将竢粤燗鶉祕鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь竢鉚祺祓祕鹿粡寂蝟赱齠洲粤讌将碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь蜀祕渡透鱚瘠纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鱚鴈續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇萬蓖趙烽諞焜葹祺蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀蓖趙焜阨銓苳蚕鰐吊喇敕蝟昭粡竚癈鷭т繻Ь續脇鹿粡寂蝟赱齠洲粤讌将蓖趙烽梭闌籖竢皷芬繖葹鬧祺纂蝟昭粡竚癈鷭т繻Ь續┬蓖趙焜阨銓苳蚕鰐吊喇敕渡蓖趙焜阨銓鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諞焜葹鷁縷竢鉚諞焜葹祺鉉聨竏癇卯諞焜葹岡諞焜葹羽鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蜀繙蜴繖班瀞壁嘸弛抗鴬粤肅鈬筥悵憶貨杜疎姪蝟昭粡竚癈鷭т繻Ь諞焜葹貉鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将齡癆蜒闔齡諞焜葹鼈蜀裼齪芦嘘燗堰樫碎縻弓朮鋤口階拐階唄欝胤纂蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将蜀<霍害蜴逅殺瘢雹黯蛯辣煢釼鼕蜩鴬鹿粡寂蝟赱齠洲粤讌将i絢蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯蓍胄裼黯竦抗菓掛霸弦飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鼈蜀蜩焜霍害档弛抗貨堊駄冬妥派塁档因完飮鹿粡寂蝟赱齠洲粤讌将蜀讒蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь逅因聿纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь霍害蜴羲蝟昭粡竚癈鷭т繻Ь瘢雹逅弛抗寡琳灣疎姪濛吐瀕踉蚕逅殺瘢雹弛抗寡琳灣疎姪濺猟鹿粡寂蝟赱齠洲粤讌将i絢蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯霍害蜴課霸弦飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇霍害蜴祺亶害瀕巛堊駄冬妥派塁档因完飮鹿粡寂蝟赱齠洲粤讌将蜀礬蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь逅因聿纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡班瀞壁嘸弛抗鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь─憶樫逅殺瘢雹黯蛯辣煢釼鼕蜩鴬鹿粡寂蝟赱齠洲粤讌将i絢蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯蓍胄裼黯憶菓掛霸弦飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鼈蜀蜩燔芦渦档因聲毟祓維纂蝟昭粡竚癈鷭т繻Ь瘡鹿粡寂蝟赱齠洲粤讌将蜀篤透蝟昭粡竚癈鷭т繻Ь侑兎婦濺嫦燃瘡苳殺苳県瘢雹罘纂蝟昭粡竚癈鷭т繻Ь逅因聿纂蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь逅因聿纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀隹祺纂蝟昭粡竚癈鷭т繻Ь羽隸瓜鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь罔祺苳蚕逢蝟昭粡竚癈鷭т繻Ь蜀芦嘘煕瘢雹逅祺苳蚕逢蝟昭粡竚癈鷭т繻Ь蜀因導十逅殺瘢雹透觸卯暑週觸謙王踉蚕襴踉蚕欝蝟昭粡竚癈鷭т繻Ь 祺凖読憚鍍断因屋蓍胄煌蜩憶樫鷄甞熹痰跂档因動毟因硬踉祓飮鹿粡寂蝟赱齠洲粤讌将 踈纛係暑醜鹿粡寂蝟赱齠洲粤讌将 祺凖読憚鍍断因鰻息纂蝟昭粡竚癈鷭т繻Ь 蜀因硬踉祓祺纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 祺祺因稿喨葦恐紛街刊纂蝟昭粡竚癈鷭т繻Ь蜀因硬踉祓祺纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀祓踉因稿蝟昭粡竚癈鷭т繻Ь祓┬祓苳津密仭壇透纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 祓因慧纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀祺鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将蜀隹祺纂蝟昭粡竚癈鷭т繻Ь羽隸瓜鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇煢竢鉚諞焜葹祺鉉聨竏癇卯諞焜葹祕蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀祺悵屋羽鹿粡寂蝟赱齠洲粤讌将 祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь踈蜀十脇祺逢祺踉嗤礎滴鹿粡寂蝟赱齠洲粤讌将椀蝟昭粡竚癈鷭т繻Ь踈蜀§芦嘘煕瘢雹逅因動踉蚕逅殺瘢雹因胴瘢雹逅因完踉蚕逅殺瘢雹因特蝟昭粡竚癈鷭т繻Ь亶害鎮蝟昭粡竚癈鷭т繻Ь蜀十透續飴鹿粡寂蝟赱齠洲粤讌将 祓祺逢幻祓┛羽因徹旭盟嗷炙良地津纂蝟昭粡竚癈鷭т繻Ь祺纂蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь諞焜葹鱚鷁縷竢鉚岡卯瘢雹祺逅祉羽纂蝟昭粡竚癈鷭т繻Ь續鱚鴈續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閭闔岡羽纂蝟昭粡竚癈鷭т繻Ь續飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諞焜葹縷蜒闔鉉聨竏癇岡諞焜葹祓鉉聨竏癇逢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь十芦葦蝟昭粡竚癈鷭т繻Ь祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将踈蜀祺因御鹿粡寂蝟赱齠洲粤讌将蜀祕逢蝟昭粡竚癈鷭т繻Ь續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将 蜀<雉厩害煕瘢雹逅§芦嘘煕瘢雹逅因撞踉蚕逅殺瘢雹因禿瘢雹逅因善踉蚕逅殺瘢雹因禿蝟昭粡竚癈鷭т繻Ь釿閼蜴蜩偏鵺蜴鶯寰蜒閼會蝟癆專纈鱚鹿粡寂蝟赱齠洲粤讌将 祓祓稀祕因迭礎盟嗷炙良地津纂蝟昭粡竚癈鷭т繻Ь祺纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 祺祺踉殺踉県祓瘢雹罘纂蝟昭粡竚癈鷭т繻Ь祓逅因傑纂蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将 蜀竦輝抗貨罘蝟昭粡竚癈鷭т繻Ь 鉉聨竏癇岡瓜鹿粡寂蝟赱齠洲粤讌将 蜀絏黯竢鉚岡卯瘢雹鷁逅雌羽逢蝟昭粡竚癈鷭т繻Ь 鷁縷竢鉚岡卯瘢雹祺逅祉羽纂蝟昭粡竚癈鷭т繻Ь 蜀祺踉因碓逢蝟昭粡竚癈鷭т繻Ь 祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь 祺瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь緕粡班瀞壁嘸弛抗鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡芦渦濺料駄鹿粡寂蝟赱齠洲粤讌将繻黼十嗜鹿粡寂蝟赱齠洲粤讌将祺芦葦纂蝟昭粡竚癈鷭т繻Ь逅蚕羯鹿粡寂蝟赱齠洲粤讌将繻黼┬祺渡透十仭壇蝟昭粡竚癈鷭т繻Ь力鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将 蜀<雉厩害煕瘢雹逅逑熾笂熏瘰煕瘢雹逅因撞踉蚕逅殺瘢雹因禿瘢雹逅因善踉蚕逅殺瘢雹因禿蝟昭粡竚癈鷭т繻Ь釿閼蜴蜩偏鵺蜴鶯寰蜒閼會蝟癆專纈鱚鹿粡寂蝟赱齠洲粤讌将 祓祺稀祓因徹旭盟嗷炙良地津纂蝟昭粡竚癈鷭т繻Ь祺纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь祺瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将 蜀竦輝抗貨逅殺瘢雹祺瘢雹逅祺踉蚕礬蝟昭粡竚癈鷭т繻Ь 鉉聨竏癇岡瓜鹿粡寂蝟赱齠洲粤讌将 蜀絏黯竢鉚岡卯瘢雹鷁逅雌羽逢蝟昭粡竚癈鷭т繻Ь 鷁縷竢鉚岡卯瘢雹祺逅祉羽纂蝟昭粡竚癈鷭т繻Ь 蜀祺踉因碓逢蝟昭粡竚癈鷭т繻Ь 祓瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь 祺瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь 蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь緕粡班瀞壁嘸弛抗鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閭闔岡羽纂蝟昭粡竚癈鷭т繻Ь續飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤孕童濾緑孕濺料駄甜蝟昭粡竚癈鷭т繻Ь諞焜葹縷竢鉚諞焜葹祺鉉聨竏癇卯諞焜葹祕鉉聨竏癇隹鉉聨竏癇隸蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇續纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь─祓鹿粡寂蝟赱齠洲粤讌将飴鹿粡寂蝟赱齠洲粤讌将祺纂蝟昭粡竚癈鷭т繻Ь繻黼┛祺瘢雹逅祺踉蚕罘鹿粡寂蝟赱齠洲粤讌将 鱚鉗竢粤熹閙裼黯竢迯闔岡卯穐岡羽纂蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将蜀鱚鹿粡寂蝟赱齠洲粤讌将蜀隹飴鹿粡寂蝟赱齠洲粤讌将蜀隸談喪嘸嬶秒歪蔚焜闔祺祓祕鹿粡寂蝟赱齠洲粤讌将鱚飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鱚鴈續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇煢竢鉚諞焜葹祺鉉聨竏癇卯諞焜葹祕蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇續纂蝟昭粡竚癈鷭т繻Ь竢銖蜴蜒闔羝澑齡烽縻充蝟昭粡竚癈鷭т繻Ь因丹鹿粡寂蝟赱齠洲粤讌将 屋屋憶憶憶憶憶憶憶憶憶憶憶憶憶憶蝟昭粡竚癈鷭т繻Ь憶憶憶憶憶憶憶憶憶憶憶憶憶憶憶憶蝟昭粡竚癈鷭т繻Ь外咳咳咳咳咳咳咳咳咳咳咳咳害崖崖蝟昭粡竚癈鷭т繻Ь完官官官寛干干干軌軌軌軌彊彊薫薫鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀祺踉鴬鹿粡寂蝟赱齠洲粤讌将踈蜀祺逢磔鹿粡寂蝟赱齠洲粤讌将 祕纂蝟昭粡竚癈鷭т繻Ь踈蜀逅因祕十逢因鍵瘟磔蝟昭粡竚癈鷭т繻Ь鱚鴈纂蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 齬蜚竏蜒闔羝澑齡烽縻祺維蝟昭粡竚癈鷭т繻Ь竅黼浦鹿粡寂蝟赱齠洲粤讌将 蜀祓踉因鍵因惰踉祓鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼虻鹿粡寂蝟赱齠洲粤讌将 蜀祕逢續纂蝟昭粡竚癈鷭т繻Ь蜀祓踉因前因惰踉祓逅因祕―逢鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼浦鹿粡寂蝟赱齠洲粤讌将 竅黼該鹿粡寂蝟赱齠洲粤讌将 蜀祕逢續纂蝟昭粡竚癈鷭т繻Ь蜀逅因祕―祕瘢雹逢因鍵蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼穏鹿粡寂蝟赱齠洲粤讌将 蜀祕逢續纂蝟昭粡竚癈鷭т繻Ь蜀祓踉因鍵因稿踉祓逅因祕―逢鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼虻鹿粡寂蝟赱齠洲粤讌将 蜀祕逢續纂蝟昭粡竚癈鷭т繻Ь蜀祓踉因弘因惰踉祓逅因祕祕―宛逢鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼浦鹿粡寂蝟赱齠洲粤讌将 蜀祕逢續纂蝟昭粡竚癈鷭т繻Ь蜀祓踉因鍵因惰踉祓逅因祕祕―宛逢鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼穏鹿粡寂蝟赱齠洲粤讌将 蜀祕逢續纂蝟昭粡竚癈鷭т繻Ь蜀祓踉因鍵因呼踉祓逅因祕祕―宛逢鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 粤聲鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀祺十脇鹿粡寂蝟赱齠洲粤讌将繻黼┬祺瘢雹県因羂纉蝟昭粡竚癈鷭т繻Ь祓盟嗷炙良地津襟竢鉚岡卯逢纂蝟昭粡竚癈鷭т繻Ь祺纂蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь鱚縷竢鉚岡卯穐瘢雹祺逅祉羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀鱚十鹿粡寂蝟赱齠洲粤讌将┴閭闔岡羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鱚鴈續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i粤肅鈬筥孕童濾緑孕濺料駄滴粤肅鈬筥孕童瀟孕侖壥杜疎姪蝟昭粡竚癈鷭т繻Ь濶寓焜闔鉉聨竏癇瘡鉉聨竏癇隹鉉聨竏癇隸鉉聨竏癇隶蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将逅蚕遡嫖瀝喪忙鹿粡寂蝟赱齠洲粤讌将蜀逢蝟昭粡竚癈鷭т繻Ь隹瘡纂蝟昭粡竚癈鷭т繻Ь隸纂蝟昭粡竚癈鷭т繻Ь隶纂蝟昭粡竚癈鷭т繻Ь繻黼瘡踉因鍵逢蝟昭粡竚癈鷭т繻Ь因祕鹿粡寂蝟赱齠洲粤讌将 因鍵逅因恰鹿粡寂蝟赱齠洲粤讌将飴鹿粡寂蝟赱齠洲粤讌将繻黼瘡踉蚕貌濾淋害瀉┛篤透蝟昭粡竚癈鷭т繻Ь隹瘡苳殺苳渦鹿粡寂蝟赱齠洲粤讌将因鍵瘡苳殺苳匡瘢雹罘纂蝟昭粡竚癈鷭т繻Ь隶瘡逅因恰鹿粡寂蝟赱齠洲粤讌将繻黼瘡踉蚕貌濾淋害瀉┛案篤透蝟昭粡竚癈鷭т繻Ь隹匡纂蝟昭粡竚癈鷭т繻Ь隸┬鴬瘢雹罘纂蝟昭粡竚癈鷭т繻Ь隶宛┬逅因恰旭逅因恰鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将飴鹿粡寂蝟赱齠洲粤讌将飴鹿粡寂蝟赱齠洲粤讌将飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙堝互瀕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇襟竢鉚諞焜葹祺鉉聨竏癇卯諞焜葹祕蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇瘡纂蝟昭粡竚癈鷭т繻Ь因羝蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь踈蜀祺苳蚕逢蝟昭粡竚癈鷭т繻Ь穏齡祓餓筱虻鰾蝟昭粡竚癈鷭т繻Ь逅因井源鹿粡寂蝟赱齠洲粤讌将祓瘢雹罘踉殺踉渦纂蝟昭粡竚癈鷭т繻Ь瘡逅因恰旭纂蝟昭粡竚癈鷭т繻Ь瘡逅因恰鹿粡寂蝟赱齠洲粤讌将踈蜀祺苳蚕逢蝟昭粡竚癈鷭т繻Ь瘡祺瘢雹罘踉殺踉渦纂蝟昭粡竚癈鷭т繻Ь瘡逅因恰纂蝟昭粡竚癈鷭т繻Ь瘡逅因恰鹿粡寂蝟赱齠洲粤讌将踈蜀祺苳蚕逢蝟昭粡竚癈鷭т繻Ь瘡祺瘢雹罘踉殺踉胸鹿粡寂蝟赱齠洲粤讌将祓瘢雹罘纂蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь瘡音鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь續貉鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諞焜葹九焜闔鉉聨竏癇瘡鉉聨竏癇隹鉉聨竏癇隸蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇岡卯飴鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇續纂蝟昭粡竚癈鷭т繻Ь瘡瘢雹崛盲冬輿嗚纂蝟昭粡竚癈鷭т繻Ь瘡踉因鍵鹿粡寂蝟赱齠洲粤讌将飴鹿粡寂蝟赱齠洲粤讌将貉鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将 寓焜闔讙瘢雹祺逅祉卯瘢雹祕鹿粡寂蝟赱齠洲粤讌将 鱚鉗竢粤熹閙裼黯竢迯闔岡卯穐岡羽纂蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将 蜀鱚鹿粡寂蝟赱齠洲粤讌将 飴鹿粡寂蝟赱齠洲粤讌将 談喪嘸嬶秒歪貉鹿粡寂蝟赱齠洲粤讌将 鱚飴鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鱚鴈續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙堝互瀕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇煢竢鉚蔚諞焜葹祺鉉聨竏癇卯諞焜葹祕蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇續纂蝟昭粡竚癈鷭т繻Ь┬祺十逅殺瘢雹逢祺十渡透鹿粡寂蝟赱齠洲粤讌将 ┴閭闔岡羽纂蝟昭粡竚癈鷭т繻Ь鱚鴈纂蝟昭粡竚癈鷭т繻Ь繻黼┛祺瘢雹逅祺踉蚕息鹿粡寂蝟赱齠洲粤讌将 蜀祕踉遼鈍瀕坡貨竪因鎮旭貌濾淋害瀉┛篤透踉祕蝟昭粡竚癈鷭т繻Ь鱚鴈音鹿粡寂蝟赱齠洲粤讌将 祓談喪嘸嬶秒歪┬祺踉殺踉姥逢遼鈍瀕坡貨竪因概督丹逢鹿粡寂蝟赱齠洲粤讌将 祺纂蝟昭粡竚癈鷭т繻Ь繻黼┬祺芥卸鉋瘟鱚齦鴪閾癆鹿粡寂蝟赱齠洲粤讌将 鹿粡寂蝟赱齠洲粤讌将 續音鹿粡寂蝟赱齠洲粤讌将 鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь繻黼續蔚縷竢鉚┬逅因聿踉殺踉燦祓逅祉岡瘢雹祓鹿粡寂蝟赱齠洲粤讌将蜀鱚續鱚鹿粡寂蝟赱齠洲粤讌将┴閭闔岡羽纂蝟昭粡竚癈鷭т繻Ь續飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諞焜葹蜒闔襖鉉聨竏癇岡諞焜葹祓鉉聨竏癇逢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь銓續纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь┬祺逅殺瘢雹逢祺十渡透鹿粡寂蝟赱齠洲粤讌将繻黼黯蜒閼縷硴隕祓鹿粡寂蝟赱齠洲粤讌将 鱚九焜闔祓逅祉岡瘢雹祓鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将 祺纂蝟昭粡竚癈鷭т繻Ь祓談喪嘸嬶秒歪祓纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀鱚續鱚鹿粡寂蝟赱齠洲粤讌将┴閭闔岡羽纂蝟昭粡竚癈鷭т繻Ь續飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諞焜葹蜒閼縷煌蜩焜闕迴遖鉉聨竏癇岡諞焜葹祓鉉聨竏癇穐諞焜葹岡諞焜葹羽鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蜀鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡互煥濂磔黝飮鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡互煥濂磔黯逑桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖羝熹閙纒窰霞纉濆害桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖闔齡互煥潦磔黝飮鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡竢銖羝熹閙纒窰鰍纉熏黝飮鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡竢銖羝熹閙纒窰鰍纉濆害桍纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡韶纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡竢銖韶纂蝟昭粡竚癈鷭т繻Ь竢銖蜴鈿烽纉肅竏癇黯碎縷嘆桍鹿粡寂蝟赱齠洲粤讌将卯卯卯卯卯卯卯卯鹿粡寂蝟赱齠洲粤讌将 卯卯卯卯卯卯卯卯蝟昭粡竚癈鷭т繻Ь卯穐卯穐穐卯岡卯蝟昭粡竚癈鷭т繻Ь穐卯穐穐岡卯卯卯鹿粡寂蝟赱齠洲粤讌将齡癆蜒闔齡銓閙矼齡煕蜚焜葹鴦熹痰跂瀉貨逑桍鹿粡寂蝟赱齠洲粤讌将卯卯卯卯卯卯卯卯鹿粡寂蝟赱齠洲粤讌将 卯卯卯卯卯卯卯卯蝟昭粡竚癈鷭т繻Ь卯卯穐卯穐穐卯穐蝟昭粡竚癈鷭т繻Ь穐卯穐穐穐穐卯卯鹿粡寂蝟赱齠洲粤讌将齡癆蜒闔齡銓閙矼齡煕蜚焜葹鴦熹痰跂濆害瀉菓充蝟昭粡竚癈鷭т繻Ь卯卯卯卯卯卯卯卯蝟昭粡竚癈鷭т繻Ь卯卯卯卯卯卯卯卯蝟昭粡竚癈鷭т繻Ь卯卯穐卯穐卯卯卯蝟昭粡竚癈鷭т繻Ь穐卯穐穐卯卯穐穐鹿粡寂蝟赱齠洲粤讌将齡癆蜒闔齡銓閙矼齡煕蜚焜葹鴦熹痰跂濆害瀉額充蝟昭粡竚癈鷭т繻Ь卯卯卯卯卯卯卯卯蝟昭粡竚癈鷭т繻Ь卯卯卯卯卯卯卯卯蝟昭粡竚癈鷭т繻Ь卯卯卯卯卯卯卯卯蝟昭粡竚癈鷭т繻Ь卯卯卯卯卯卯卯卯鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇續纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь罔祺踉因鍵鹿粡寂蝟赱齠洲粤讌将 飴鹿粡寂蝟赱齠洲粤讌将 祺纂蝟昭粡竚癈鷭т繻Ь繻黼罔祺踉因絨鹿粡寂蝟赱齠洲粤讌将 蜀閙矼齡煕蜚焜葹鴦煕鹿粡寂蝟赱齠洲粤讌将 蜀黯黯轣鞏十池瀝双瀉亶害鹿粡寂蝟赱齠洲粤讌将 齬蜚竏鴬蝟昭粡竚癈鷭т繻Ь 竅黼穏鹿粡寂蝟赱齠洲粤讌将 蜀閙矼齡煕蜚焜葹鴦熹痰跂濆害瀉菓祓逅三呑鱚鴈纂蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼該鹿粡寂蝟赱齠洲粤讌将 蜀閙矼齡煕蜚焜葹鴦熹痰跂濆害瀉額祓逅三呑鱚鴈纂蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь踈蜀─竦抗臥鉚煕鹿粡寂蝟赱齠洲粤讌将 齬蜚竏鴬蝟昭粡竚癈鷭т繻Ь 竅黼穏鹿粡寂蝟赱齠洲粤讌将 蜀閙矼齡煕蜚焜葹鴦熹痰跂瀉菓祓逅三呑鱚鴈纂蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼該鹿粡寂蝟赱齠洲粤讌将 蜀閙矼齡煕蜚焜葹鴦熹痰跂濆害瀉額祓逅三呑鱚鴈纂蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь踈蜀黯黯轣鞏十池瀝双瀝唏蝟昭粡竚癈鷭т繻Ь 蜀十逅殺瘢雹閙矼齡煕蜚焜葹鴦熹痰跂瀉貨逑档右瘢雹因各櫞續瓜鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь韶鹿粡寂蝟赱齠洲粤讌将 逑熾笂熏瘰煕嫦嘸輿俤弛抗羝熹閙纒窰霞纉濆害鹿粡寂蝟赱齠洲粤讌将 逑熾笂熏瘰煕嫦嘸輿俤羊互煥濂磔黯逑鹿粡寂蝟赱齠洲粤讌将 羝熹閙纒窰霞纉纂蝟昭粡竚癈鷭т繻Ь鱚煢竢鉚焜闕迴遖祺祓韶皷閹熾互煥濂磔鵺岡羽纂蝟昭粡竚癈鷭т繻Ь繻黼罔祕踉因動鹿粡寂蝟赱齠洲粤讌将 蜀閙矼齡煕蜚焜葹鴦煕鹿粡寂蝟赱齠洲粤讌将 蜀黯黯轣鞏十池瀝双瀉亶害鹿粡寂蝟赱齠洲粤讌将 蜀十逅殺瘢雹十逅殺瘢雹十刊續瓜鹿粡寂蝟赱齠洲粤讌将 踈蜀黯黯轣鞏十池瀝双瀝唏蝟昭粡竚癈鷭т繻Ь 齬蜚竏鴬蝟昭粡竚癈鷭т繻Ь 竅黼穏鹿粡寂蝟赱齠洲粤讌将 齬蜚竏羽蝟昭粡竚癈鷭т繻Ь 竅黼虻鹿粡寂蝟赱齠洲粤讌将 蜀十十十滴續瓜鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼減鹿粡寂蝟赱齠洲粤讌将 蜀十鴬續瓜鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼該鹿粡寂蝟赱齠洲粤讌将 蜀十十辿續瓜鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 齬蜚竏鴬蝟昭粡竚癈鷭т繻Ь 竅黼穏鹿粡寂蝟赱齠洲粤讌将 齬蜚竏羽蝟昭粡竚癈鷭т繻Ь 竅黼虻鹿粡寂蝟赱齠洲粤讌将 蜀十稀續瓜鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼減鹿粡寂蝟赱齠洲粤讌将 蜀十稀續瓜鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼萄鹿粡寂蝟赱齠洲粤讌将 齬蜚竏羽蝟昭粡竚癈鷭т繻Ь 竅黼炭鹿粡寂蝟赱齠洲粤讌将 蜀十挑續瓜鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼頂鹿粡寂蝟赱齠洲粤讌将 蜀十逅殺瘢雹竦抗臥鉚煕鱚鴈纂蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 竅黼萄鹿粡寂蝟赱齠洲粤讌将 蜀┛祕瘢雹逅祕踉蚕稀續瓜鹿粡寂蝟赱齠洲粤讌将 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 碣縺觧鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь韶充蝟昭粡竚癈鷭т繻Ь逑熾笂熏瘰煕嫦嘸輿俤弛抗羝熹閙纒窰鰍纉濆害鹿粡寂蝟赱齠洲粤讌将 逑熾笂熏瘰煕嫦嘸輿俤羊互煥潦磔黯逑鹿粡寂蝟赱齠洲粤讌将 羝熹閙纒窰鰍纉纂蝟昭粡竚癈鷭т繻Ь鱚蜒闔竢迯闔卯穐韶档因徹檪蝴繽聨羝熹閙纒窰嘆隹隸鹿粡寂蝟赱齠洲粤讌将踈鱚鴈瓜鹿粡寂蝟赱齠洲粤讌将i聹繙班瀞壁嘸弛抗下蝟昭粡竚癈鷭т繻Ь─鱚逅殺瘢雹竦抗臥鉚煕瘢雹逅蜩煥膤┴隹鹿粡寂蝟赱齠洲粤讌将 鉉聨竏癇岡瓜鹿粡寂蝟赱齠洲粤讌将 蜀絏黯竢鉚┴隹卯瘢雹鷁逅雌羽逢鹿粡寂蝟赱齠洲粤讌将 鷁縷竢鉚岡卯岡羽纂蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 鱚瓜鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将鱚鴈續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇煢竢鉚焜闕迴遖鉉聨竏癇卯諞焜葹祕竢銖皷芬繖蓖鶯竢銖隱諞焜葹頌蝴絳諞焜葹岡諞焜葹羽鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь諞焜葹祺纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纂蝟昭粡竚癈鷭т繻Ь銖蜃鈬鼈闥貉鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀韶逢續瓜鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将祓因鍵纂蝟昭粡竚癈鷭т繻Ь頌蝴祓鱚鴈纂蝟昭粡竚癈鷭т繻Ь鞁祓飮鹿粡寂蝟赱齠洲粤讌将蜀十續瓜鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将祕因鍵纂蝟昭粡竚癈鷭т繻Ь皷閹熾互煥瀉祕鱚鴈纂蝟昭粡竚癈鷭т繻Ь瘡档維纂蝟昭粡竚癈鷭т繻Ь瘡逢續瓜鹿粡寂蝟赱齠洲粤讌将蜀鈿焜霍害纔逅殺瘢雹鹿粡寂蝟赱齠洲粤讌将 瘡県因可澱鞳竕瘡葹鱇笏纈鹿粡寂蝟赱齠洲粤讌将 貌濾淋害瀉┛外逢病纔鈔繖葹鱇笏纈鹿粡寂蝟赱齠洲粤讌将 續瓜鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将祺瘡苳殺苳源鹿粡寂蝟赱齠洲粤讌将瘡苳因憩篤鹿粡寂蝟赱齠洲粤讌将祺瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь凖読憚鍍断鎧鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь十路悵屋瓜鹿粡寂蝟赱齠洲粤讌将祓瘡瘢雹羯鹿粡寂蝟赱齠洲粤讌将蜀隹祺纂蝟昭粡竚癈鷭т繻Ь羽隸瓜鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆諞煥痺萬竏癇熹閙蒹蜆鉉聨竏癇岡鉉聨竏癇羽鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将竢銖竏癇蒹渦慨偽係港唾津蕩纂蝟昭粡竚癈鷭т繻Ь銓蓍胄飴鹿粡寂蝟赱齠洲粤讌将逅蚕遡嫖瀝喪忙鹿粡寂蝟赱齠洲粤讌将蛹紲鼈蜀逢蝟昭粡竚癈鷭т繻Ь蜀苳蚕鼈蜀蝟昭粡竚癈鷭т繻Ь蛹紲鼈蜀逢蝟昭粡竚癈鷭т繻Ь ┴罘┛蒹鼈蜀逅三櫞纂蝟昭粡竚癈鷭т繻Ь 鼈蜀纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 鼈蜀纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆釿閼縷聲跛矚站煦讎鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閭闔┛Е瘢雹З纂蝟昭粡竚癈鷭т繻Ь竢鉚穐鹿粡寂蝟赱齠洲粤讌将逅蚕遡嫖瀝喪忙鹿粡寂蝟赱齠洲粤讌将蜀苳蚕貌濾淋害瀉┗旭旭旭鹿粡寂蝟赱齠洲粤讌将 ┴閭闔┛因外祚遼鈍瀕坡貨竪碓旭旭逢碓鹿粡寂蝟赱齠洲粤讌将蜀苳蚕貌濾淋害瀉┗旭旭逢蝟昭粡竚癈鷭т繻Ь┴閭闔┛因外祚遼鈍瀕坡貨竪碓旭旭碓鹿粡寂蝟赱齠洲粤讌将蜀苳蚕旭旭蝟昭粡竚癈鷭т繻Ь┴閭闔┛因外祚碓旭ケ逢纂蝟昭粡竚癈鷭т繻Ь罔碓旭蝟昭粡竚癈鷭т繻Ь┴閭闔┛因外祚碓旭ケ逢纂蝟昭粡竚癈鷭т繻Ь罔碓逢鹿粡寂蝟赱齠洲粤讌将 ┴閭闔┛因外祚碓ケ逢纂蝟昭粡竚癈鷭т繻Ь罔碓蝟昭粡竚癈鷭т繻Ь┴閭闔┛因外祚碓ケ逢纂蝟昭粡竚癈鷭т繻Ь罔逢鹿粡寂蝟赱齠洲粤讌将 ┴閭闔┛因外ケ逢纂蝟昭粡竚癈鷭т繻Ь竢鉚穐薩鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆釿閼縷聲跛矚站燔迪諞焜葹礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь竢鉚穐逅薩鹿粡寂蝟赱齠洲粤讌将┴閭闔┛ВЗ纂蝟昭粡竚癈鷭т繻Ь竢鉚穐鹿粡寂蝟赱齠洲粤讌将鉉聨縺竏焜葹鰡煦纔竢鉚礬纂蝟昭粡竚癈鷭т繻Ь竢鉚穐薩鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆釿閼縷聲跛矚站煌癘瓱鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将竢銖竏癇蒹渦慨偽係港唾津蕩纂蝟昭粡竚癈鷭т繻Ь竢鉚穐樛З纂蝟昭粡竚癈鷭т繻Ь瘢雹崛盲冬輿嗚纂蝟昭粡竚癈鷭т繻Ь罔♂黯蜒閼縷硴隕礬鹿粡寂蝟赱齠洲粤讌将 ┴閭闔┛дЗ纂蝟昭粡竚癈鷭т繻Ь┴閭闔┛ОЗ纂蝟昭粡竚癈鷭т繻Ь┴閭闔┛ОЗ纂蝟昭粡竚癈鷭т繻Ь┴閭闔┛蒹屋瘢雹因呑鹿粡寂蝟赱齠洲粤讌将 ┴閭闔┛蒹蔚瘢雹因呑鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将 ┴閭闔┛З纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閭闔┛蒹渦瘢雹因呑鹿粡寂蝟赱齠洲粤讌将┴閭闔┛蒹瘢雹因呑鹿粡寂蝟赱齠洲粤讌将┴閭闔┛蒹瘢雹因呑鹿粡寂蝟赱齠洲粤讌将┴閭闔┛蒹瘢雹因呑鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆釿閼縷聲跛矚站熕纈讎鉉聨竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閭闔┛к棗鹿粡寂蝟赱齠洲粤讌将┴閭闔┛З纂蝟昭粡竚癈鷭т繻Ь竢鉚穐鹿粡寂蝟赱齠洲粤讌将鉉聨縺竏焜葹鰡煦纔竢鉚礬纂蝟昭粡竚癈鷭т繻Ь竢鉚穐鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆釿閼縷聲跛矚站燗竏癇諞焜葹礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鉗竢粤燗竏癇纂蝟昭粡竚癈鷭т繻Ь竢鉚県逅三頭逅三透纂蝟昭粡竚癈鷭т繻Ь續郢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤孕童瀟孕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇快焜闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将i絢蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯熹閙羝澑磔桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖纒窰熾互霞纉桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖纒窰熾互霞纉熏黝飮鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡芦渦熹閙羝濂磔黝飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯雹鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀祺悵屋羽鹿粡寂蝟赱齠洲粤讌将纒窰熾互奄綮鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь踈蜀蜩煥膤鴬鹿粡寂蝟赱齠洲粤讌将 蜀黯黯轣鞏十池瀝双濮喘鰭逅殺瘢雹十貌濾淋害瀉┛堂鴬瘢雹逅祓因干鹿粡寂蝟赱齠洲粤讌将 鱚鴈胸鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь王瘢雹因傑因憶纂蝟昭粡竚癈鷭т繻Ь┛純逅殺瘢雹王踉雌蝴繽聨纒窰熾互霞纉蝟昭粡竚癈鷭т繻Ь憶貨熾互霞纉档課纂蝟昭粡竚癈鷭т繻Ь踈綣蝟昭粡竚癈鷭т繻Ь續飴鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将祺瘢雹因傑纂蝟昭粡竚癈鷭т繻Ь王瘢雹因傑因憶纂蝟昭粡竚癈鷭т繻Ь┛純逅殺瘢雹王踉雌蝴繽聨纒窰熾互霞纉蝟昭粡竚癈鷭т繻Ь黯黯轣鞏―池瀝双濮喘鰭熹閙羝濂磔黯逑档課熹閙羝濂磔黝祺飮鹿粡寂蝟赱齠洲粤讌将 繻黼鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀$鱚鴈纂蝟昭粡竚癈鷭т繻Ь逅因傑因憶纂蝟昭粡竚癈鷭т繻Ь┛純逅殺瘢雹右踉雌蝴繽聨纒窰熾互奄紿鹿粡寂蝟赱齠洲粤讌将 鱚鴈档榎纂蝟昭粡竚癈鷭т繻Ь續飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶閭闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇飴鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇瘡纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь頤硼轜罘鹿粡寂蝟赱齠洲粤讌将 阨烽闕煕遡單纂蝟昭粡竚癈鷭т繻Ь┴閙頤к概熊鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к卸皆鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к卸熊鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十脇蝟昭粡竚癈鷭т繻Ь熕礬脇鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙嬪暖倉瀟來貧亮蝟昭粡竚癈鷭т繻Ь十瘢雹逅蜩熾鉗竢粤焜瘰齦跂羽鹿粡寂蝟赱齠洲粤讌将祓瘢雹遡嫖瀝喪忙鹿粡寂蝟赱齠洲粤讌将蜀逢蝟昭粡竚癈鷭т繻Ь熕礬瘡鹿粡寂蝟赱齠洲粤讌将踈蜀旭鹿粡寂蝟赱齠洲粤讌将┴閙頤因丹纂蝟昭粡竚癈鷭т繻Ь熕礬┛瘡瘢雹罘鹿粡寂蝟赱齠洲粤讌将繻黼瘡踉蚕貌濾淋害瀉┛篤透蝟昭粡竚癈鷭т繻Ь熕礬┛瘡苳殺苳渦纂蝟昭粡竚癈鷭т繻Ь熕礬┛┬逅因恰纂蝟昭粡竚癈鷭т繻Ь熕礬┛瘡逅因恰纂蝟昭粡竚癈鷭т繻Ь踈蜀遼鈍瀕坡貨竪因碓篤篤鹿粡寂蝟赱齠洲粤讌将┴閙頤因動瘡姥纂蝟昭粡竚癈鷭т繻Ь熕礬┛┬讀苳殺苳傘鴬瘢雹罘鹿粡寂蝟赱齠洲粤讌将┴閙頤因鍵瘡逅因恰纂蝟昭粡竚癈鷭т繻Ь熕礬┛瘢雹罘鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь續郢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十鹿粡寂蝟赱齠洲粤讌将 阨熏閼喪檀瓢鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鹿粡寂蝟赱齠洲粤讌将繻黼十嗜幻宜澑蝟昭粡竚癈鷭т繻Ь阨熏閼瓶聾元降瓜鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鍵鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将阨熏閼孕童纂蝟昭粡竚癈鷭т繻Ь絏竢鉚岡羽纂蝟昭粡竚癈鷭т繻Ь瘡鹿粡寂蝟赱齠洲粤讌将寓焜闔讙瘢雹祺逅祉卯瘢雹祕鹿粡寂蝟赱齠洲粤讌将┴閙頤祺鹿粡寂蝟赱齠洲粤讌将蜀祓鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鹿粡寂蝟赱齠洲粤讌将蜀祕┴閙頤祕鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆熄竢鉚蔚諞焜葹祺鉉聨竏癇羽鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь頤硼轜罘鹿粡寂蝟赱齠洲粤讌将 阨烽闕煕遡單纂蝟昭粡竚癈鷭т繻Ь頤緕粡瘤杜追僧潴不毀滴蝟昭粡竚癈鷭т繻Ь熕礬┬皷芬繖葹鬧к碍熊鹿粡寂蝟赱齠洲粤讌将┴閙頤к碍凶鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将┴閙頤к碍凶鹿粡寂蝟赱齠洲粤讌将┴閙頤銖蜃鈬竏癇楹祁З纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十脇蝟昭粡竚癈鷭т繻Ь熕礬脇鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀祺瓶聾元降羽鹿粡寂蝟赱齠洲粤讌将祺纂蝟昭粡竚癈鷭т繻Ь飴鹿粡寂蝟赱齠洲粤讌将i聹繙嬪暖倉瀟來貧亮蝟昭粡竚癈鷭т繻Ь踈蜀祺逅殺瘢雹黯蜒閼縷竅頌紲祓鹿粡寂蝟赱齠洲粤讌将蜀蜩熾鉗竢粤烽逅羽蝟昭粡竚癈鷭т繻Ь逅因聿纂蝟昭粡竚癈鷭т繻Ь逅蚕羯鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将祓瘢雹崛盲冬輿嗚纂蝟昭粡竚癈鷭т繻Ь嬶秒歪冬輿悸鹿粡寂蝟赱齠洲粤讌将祺祓苳殺苳碓遼鈍瀕坡貨竪因跳丹蓍艾鳫艨蝟昭粡竚癈鷭т繻Ь逅因各透貌濾淋害瀉┛丹逢阯鳫艨蝟昭粡竚癈鷭т繻Ь頤緕粡瘤杜追僧潴不毀滴蝟昭粡竚癈鷭т繻Ь熕礬逅因聿鹿粡寂蝟赱齠洲粤讌将┴閙頤逅因聿鹿粡寂蝟赱齠洲粤讌将┴閙頤祓瘢雹罘纂蝟昭粡竚癈鷭т繻Ь熕礬┬祓苳殺苳県瘢雹罘纂蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь熕礬┬祺苳殺苳県瘢雹罘纂蝟昭粡竚癈鷭т繻Ь熕礬逅因聿鹿粡寂蝟赱齠洲粤讌将┴閙頤逅因聿鹿粡寂蝟赱齠洲粤讌将┴閙頤祓瘢雹罘纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь續郢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь踈蜀祺蝟昭粡竚癈鷭т繻Ь諞焜葹絏竢鉚岡羽纂蝟昭粡竚癈鷭т繻Ь瘡苳殺苳県瘢雹羯鹿粡寂蝟赱齠洲粤讌将祓瘡瘢雹羯鹿粡寂蝟赱齠洲粤讌将 蜀*瘡鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀阨煥鈔蛛十猟描累棉墺姪鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鹿粡寂蝟赱齠洲粤讌将┴閙頤祺鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将┴閙頤祺鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆熄竢鉚害諞焜葹祺鉉聨竏癇羽鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь頤硼轜罘鹿粡寂蝟赱齠洲粤讌将 阨烽闕煕遡單纂蝟昭粡竚癈鷭т繻Ь頤緕粡瘤杜追僧潴不毀滴蝟昭粡竚癈鷭т繻Ь熕礬┬皷芬繖葹鬧к碍熊鹿粡寂蝟赱齠洲粤讌将┴閙頤к碍凶鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к旭挨鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к旭挨鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к旭挨鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к旭挨鹿粡寂蝟赱齠洲粤讌将┴閙頤к碍凶鹿粡寂蝟赱齠洲粤讌将┴閙頤銖蜃鈬竏癇楹祁З纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十脇蝟昭粡竚癈鷭т繻Ь熕礬脇鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀祺瓶聾元降羽鹿粡寂蝟赱齠洲粤讌将祓因鍵纂蝟昭粡竚癈鷭т繻Ь蜀粤燐傭帆吽椀塢藁鹿粡寂蝟赱齠洲粤讌将繻黼十瘢雹逅蜩熾鉗竢粤焜瘰齦跂羽蝟昭粡竚癈鷭т繻Ь祓瘢雹崛盲冬輿嗚纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь踈蜀祺蝟昭粡竚癈鷭т繻Ь絏竢鉚岡羽纂蝟昭粡竚癈鷭т繻Ь蜀<羽續郢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь頤緕粡瘤杜追僧潴不毀滴蝟昭粡竚癈鷭т繻Ь熕礬祓瘢雹貌濾淋害瀉┛旭旭案透鹿粡寂蝟赱齠洲粤讌将┴閙頤逅遼鈍瀕坡貨竪因旭旭篤旭苳殺苳鹿粡寂蝟赱齠洲粤讌将┴閙頤逅遼鈍瀕坡貨竪因旭篤旭旭苳殺苳蔚鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к旭挨鹿粡寂蝟赱齠洲粤讌将踈纛鹿粡寂蝟赱齠洲粤讌将 ┴閙頤к旭挨鹿粡寂蝟赱齠洲粤讌将┴閙頤逅遼鈍瀕坡貨竪因旭篤旭旭苳殺苳蔚鹿粡寂蝟赱齠洲粤讌将┴閙頤逅遼鈍瀕坡貨竪因旭旭篤旭苳殺苳鹿粡寂蝟赱齠洲粤讌将┴閙頤逅遼鈍瀕坡貨竪因旭旭旭篤纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶縷閭闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将i聹繙嬪暖倉瀟來貧亮蝟昭粡竚癈鷭т繻Ь十瘢雹逅蜩熾鉗竢粤焜瘰齦跂羽鹿粡寂蝟赱齠洲粤讌将九焜闔祓逅祉岡瘢雹祓鹿粡寂蝟赱齠洲粤讌将蜀祺逅殺瘢雹黯蜒閼縷竅頌紲祓蝟昭粡竚癈鷭т繻Ь祺逅崛盲冬輿嗚纂蝟昭粡竚癈鷭т繻Ь蜀憶貨逅殺瘢雹旭祺瘢雹逅祺踉蚕卦粂鹿粡寂蝟赱齠洲粤讌将 偏嫩鹿粡寂蝟赱齠洲粤讌将 祓瘢雹因篤道鹿粡寂蝟赱齠洲粤讌将 祺拘纂蝟昭粡竚癈鷭т繻Ь 祺祺踉碓因呼殿纂蝟昭粡竚癈鷭т繻Ь 祓祓柑鹿粡寂蝟赱齠洲粤讌将 蜀蜩煥膤鴬鹿粡寂蝟赱齠洲粤讌将 ┴閙頤因御鹿粡寂蝟赱齠洲粤讌将 ┴閙頤逅因傑因宛逢纂蝟昭粡竚癈鷭т繻Ь ┴閙頤祓鍵鹿粡寂蝟赱齠洲粤讌将 踈纛鹿粡寂蝟赱齠洲粤讌将 ┴閙頤逅因傑因宛逢纂蝟昭粡竚癈鷭т繻Ь ┴閙頤祓鍵鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 蜀緕竢粤煕瘡赳痺覃釿閼縷聲跛矚站祓鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь十脇蝟昭粡竚癈鷭т繻Ь熕礬脇鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь踈蜀祺逢蝟昭粡竚癈鷭т繻Ь阨熏閼喪檀瓢鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鹿粡寂蝟赱齠洲粤讌将繻黼十芦葦蝟昭粡竚癈鷭т繻Ь阨熏閼柄仭療單濺嫦纂蝟昭粡竚癈鷭т繻Ь熕礬嗜熕礬奥因鍵鹿粡寂蝟赱齠洲粤讌将繻黼十嗜幻宜澑蝟昭粡竚癈鷭т繻Ь阨熏閼瓶聾元降瓜鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鍵鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь踈蜀蜩煥膤鴬鹿粡寂蝟赱齠洲粤讌将 阨熏閼柄仭療單濺嫦纂蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将蜀<霍害蜴罘蝟昭粡竚癈鷭т繻Ь諞焜葹鷁鷄纂蝟昭粡竚癈鷭т繻Ь回焜闔祺祓逅雌岡瘢雹鷄十鹿粡寂蝟赱齠洲粤讌将鷁縷竢鉚岡卯瘢雹祺逅祉羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь十蝟昭粡竚癈鷭т繻Ь阨熏閼喪檀瓢鹿粡寂蝟赱齠洲粤讌将 ┴閙頤祓鹿粡寂蝟赱齠洲粤讌将 踈蜀蜩煥膤鴬鹿粡寂蝟赱齠洲粤讌将蜀憶貨罘蝟昭粡竚癈鷭т繻Ь熕礬┛罘纂蝟昭粡竚癈鷭т繻Ь熕礬┬祺瘢雹罘鍵鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鍵鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь熕礬┬祺瘢雹罘鍵鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鍵鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь─鉉聨蜩苒瘰荐祓鉉聨蜩苒瘰荐祺鹿粡寂蝟赱齠洲粤讌将黼蜒闔徳毛適鹿粡寂蝟赱齠洲粤讌将鱚鴈闖癆纉笊蜩葹鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь阨熏閼柄仭療單濺嫦纂蝟昭粡竚癈鷭т繻Ь熕礬因宛逢纂蝟昭粡竚癈鷭т繻Ь熕礬因宛逢纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇芦渦燗蓍胄諞焜葹礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь諞焜葹鱚禹鹿粡寂蝟赱齠洲粤讌将逅蚕羯鹿粡寂蝟赱齠洲粤讌将蜀蜩煥膤續蝟昭粡竚癈鷭т繻Ь┛逅殺瘢雹踉蚕罘蝟昭粡竚癈鷭т繻Ь續因碓因卦鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь繻黼蝟昭粡竚癈鷭т繻Ь┛逅殺瘢雹踉蚕罘蝟昭粡竚癈鷭т繻Ь續因臼因卦鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鱚鴈續纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇芦渦熾銖蓍胄諞焜葹礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь諞焜葹鱚禹鹿粡寂蝟赱齠洲粤讌将蜀因傑踉蚕瘢雹逅因幻鹿粡寂蝟赱齠洲粤讌将鱚┛因傑鹿粡寂蝟赱齠洲粤讌将踈蜀因弦踉蚕瘢雹逅因慌鹿粡寂蝟赱齠洲粤讌将鱚侑兎婦濺嫦燃因卦工鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь續鱚鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡芦渦濺料駄鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇回焜闔鉉聨竏癇岡諞焜葹祓鉉聨竏癇隹鉉聨竏癇隸蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇鬻纂蝟昭粡竚癈鷭т繻Ь黯纒竍絵祺蝟昭粡竚癈鷭т繻Ь鈔祺瘢雹羯鹿粡寂蝟赱齠洲粤讌将 蜀憶樫罘蝟昭粡竚癈鷭т繻Ь蜀┬因憶踉蚕鬻瘢雹逅鈔因夏蝟昭粡竚癈鷭т繻Ь 蜀隹┬鈔羽苳殺苳羽鈔鎧鹿粡寂蝟赱齠洲粤讌将 蜀隸祓鬻瘢雹┬祓踉因彊因掩逢紿纂蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь踈蜀┛鈔逅殺瘢雹鬻踉蚕滴蝟昭粡竚癈鷭т繻Ь 蜀隹┬鈔羽苳殺苳羽綮鹿粡寂蝟赱齠洲粤讌将 蜀隸祓鬻瘢雹┬祓踉因彊因掩逢紿纂蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将 繻黼罔鉉聨蜩苒瘰荐鈔鹿粡寂蝟赱齠洲粤讌将 鉉聨竏癇瘡纂蝟昭粡竚癈鷭т繻Ь竢銖皷芬繖蓖鶯頸鮖鹿粡寂蝟赱齠洲粤讌将i絢蝟昭粡竚癈鷭т繻Ь纔鴈闔齡銖蜃鈬鼈闥闔齡芦渦燗蓍胄裼黝飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将 頸憶貨鼈蜀蜩梹鬻榎纂蝟昭粡竚癈鷭т繻Ь蜀頸鬧蝟昭粡竚癈鷭т繻Ь 頸鰮逅因傑因憶飮鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь蜀讒蝟昭粡竚癈鷭т繻Ь 祺瘡苳殺苳源鹿粡寂蝟赱齠洲粤讌将 祓瘡瘢雹羯鹿粡寂蝟赱齠洲粤讌将 蜀隹祺纂蝟昭粡竚癈鷭т繻Ь 蜀隸祓纂蝟昭粡竚癈鷭т繻Ь 鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь祺芦渦燗蓍胄鴬纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь緕粡芦渦濺料駄鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь罔因憩踉祺鱚鴈纂蝟昭粡竚癈鷭т繻Ь鴬隹羽苳殺苳羽因球因訓羽纂蝟昭粡竚癈鷭т繻Ь羽隸┬祺瘢雹┬祓踉因彊因掩逢紿纂蝟昭粡竚癈鷭т繻Ь續飴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶黯閭闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将i聹繙嬪暖倉瀟來貧亮蝟昭粡竚癈鷭т繻Ь十瘢雹逅蜩熾鉗竢粤焜瘰齦跂羽鹿粡寂蝟赱齠洲粤讌将九焜闔祓逅祉岡瘢雹祓鹿粡寂蝟赱齠洲粤讌将蜀祺逅殺瘢雹黯蜒閼縷竅頌紲祓蝟昭粡竚癈鷭т繻Ь祺逅崛盲冬輿嗚纂蝟昭粡竚癈鷭т繻Ь蜀§芦嘘煕瘢雹逅因徹旭踉蚕逅殺瘢雹因天儀蝟昭粡竚癈鷭т繻Ь 亶害鎮蝟昭粡竚癈鷭т繻Ь 祓瘢雹因篤道鹿粡寂蝟赱齠洲粤讌将 祺姥因動纂蝟昭粡竚癈鷭т繻Ь 祓姥源鹿粡寂蝟赱齠洲粤讌将 祓因完祓苳因喝鹿粡寂蝟赱齠洲粤讌将 ┴閙頤祺鹿粡寂蝟赱齠洲粤讌将 ┴閙頤祓鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 蜀釿閼縷聲跛矚站釿閼縷聲跛矚站祓鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将蜀祺渡透鹿粡寂蝟赱齠洲粤讌将┴閙頤渡透纂蝟昭粡竚癈鷭т繻Ь續郢鹿粡寂蝟赱齠洲粤讌将繻黼十蝟昭粡竚癈鷭т繻Ь阨熏閼喪檀瓢鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鹿粡寂蝟赱齠洲粤讌将繻黼十芦葦蝟昭粡竚癈鷭т繻Ь阨熏閼喩鋲壥壁啝鹿粡寂蝟赱齠洲粤讌将┴閙頤祓逢纂蝟昭粡竚癈鷭т繻Ь踈蜀祺瓶聾元降羽鹿粡寂蝟赱齠洲粤讌将 阨熏閼瓶聾元降瓜鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鍵鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь踈蜀蜩煥膤鴬鹿粡寂蝟赱齠洲粤讌将 阨熏閼喩鋲壥壁啝鹿粡寂蝟赱齠洲粤讌将蜀絏黯竢鉚岡卯瘢雹祺逅祉羽逢蝟昭粡竚癈鷭т繻Ь熕礬鴬纂蝟昭粡竚癈鷭т繻Ь熕礬羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将蜀℃諞煢齔鱸銓羽℃諞煢齔鱸銓鴬蝟昭粡竚癈鷭т繻Ь續煢竢鉚遡單逢纂蝟昭粡竚癈鷭т繻Ь續郢赱鱚黹蓍竏癇蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将 阨熏閼喩鋲壥壁啝鹿粡寂蝟赱齠洲粤讌将絏黯竢鉚岡卯瘢雹祺逅祉羽纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将蜀竦抗臥鉚煕鹿粡寂蝟赱齠洲粤讌将逅殺瘢雹亶害瀕巛堊駄冬妥派祺瘢雹逅祺踉蚕亶害瀕巛堊駄冬杜挑蝟昭粡竚癈鷭т繻Ь蜀鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥竦抗臥鉚朮毟姥鋼纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь諞焜葹竦抗臥鉚档弛抗寡琳灣疎姪濛吐瀕毟祓維纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将祺苳殺苳源鹿粡寂蝟赱齠洲粤讌将祓瘢雹羯鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将e鈔蜀喩鋲塋瓶瀉亶害蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь熕礬鴬纂蝟昭粡竚癈鷭т繻Ь蜀頏繙蝌熹痰跂曩皷芬繖葹鬧祓櫞蝟昭粡竚癈鷭т繻Ь熕礬鱚肅碎縻銖蜃鈬竏癇榎鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь熕礬羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶袿閭闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将i聹繙嬪暖倉瀟來貧亮蝟昭粡竚癈鷭т繻Ь十瘢雹逅蜩熾鉗竢粤焜瘰齦跂羽鹿粡寂蝟赱齠洲粤讌将九焜闔祓逅祉岡瘢雹祓鹿粡寂蝟赱齠洲粤讌将蜀祺逅殺瘢雹黯蜒閼縷竅頌紲祓蝟昭粡竚癈鷭т繻Ь祺逅崛盲冬輿嗚纂蝟昭粡竚癈鷭т繻Ь蜀逑熾笂熏瘰煕瘢雹逅因徹旭踉蚕逅殺瘢雹因天儀蝟昭粡竚癈鷭т繻Ь 亠芦怪鎮蝟昭粡竚癈鷭т繻Ь 祓瘢雹因篤道鹿粡寂蝟赱齠洲粤讌将 祺祓柑鹿粡寂蝟赱齠洲粤讌将 祓祓柑鹿粡寂蝟赱齠洲粤讌将 繻黼鹿粡寂蝟赱齠洲粤讌将 蜀緕竢粤煕瘡赳痺覃釿閼縷聲跛矚站祓鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь十脇蝟昭粡竚癈鷭т繻Ь頤迴粤汁喘鰭瘢雹逅阨熏閼紂宿嗜幻宜澑蝟昭粡竚癈鷭т繻Ь熕礬喘鹿粡寂蝟赱齠洲粤讌将┴閙頤ЖЗ纂蝟昭粡竚癈鷭т繻Ь熕礬黹蜑煢銓鳫鹿粡寂蝟赱齠洲粤讌将 阨熏閼喪檀瓢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь熕礬脇鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь踈蜀蜩煥膤鴬鹿粡寂蝟赱齠洲粤讌将 蜀芦嘘煕鹿粡寂蝟赱齠洲粤讌将 蜀頤迴粤―悵憶樫鴬蝟昭粡竚癈鷭т繻Ь 阨熏閼悵憶樫音鹿粡寂蝟赱齠洲粤讌将 ┴閙頤途辿纂蝟昭粡竚癈鷭т繻Ь ┴閙頤ГЗ纂蝟昭粡竚癈鷭т繻Ь ┴閙頤ЖЗ纂蝟昭粡竚癈鷭т繻Ь ┴閙頤悵憶樫王瘢雹因憩鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 蜀頤迴粤―悵憶鴬蝟昭粡竚癈鷭т繻Ь 阨熏閼悵憶音鹿粡寂蝟赱齠洲粤讌将 ┴閙頤途辿纂蝟昭粡竚癈鷭т繻Ь ┴閙頤ГЗ纂蝟昭粡竚癈鷭т繻Ь ┴閙頤ЖЗ纂蝟昭粡竚癈鷭т繻Ь ┴閙頤悵憶王瘢雹因憩鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閙頤祺瘢雹罘纂蝟昭粡竚癈鷭т繻Ь熕礬羽纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь踈蜀祺十悵屋羽鹿粡寂蝟赱齠洲粤讌将蜀阨熏閼紂舜芦葦蝟昭粡竚癈鷭т繻Ь頤迴粤芦葦纂蝟昭粡竚癈鷭т繻Ь熕礬喘鹿粡寂蝟赱齠洲粤讌将┴閙頤ЖЗ纂蝟昭粡竚癈鷭т繻Ь熕礬├彦鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь熕礬羽纂蝟昭粡竚癈鷭т繻Ь踈蜀祺十瓶聾元降羽鹿粡寂蝟赱齠洲粤讌将齒幻宜銓鳫糒笏蜿遯侯砠闔蝟昭粡竚癈鷭т繻Ь秩闔鶯撃蜚闥蜴途鱈ЛЛ鹿粡寂蝟赱齠洲粤讌将蜩關癇鹿粡寂蝟赱齠洲粤讌将 阨熏閼瓶聾元降瓜鹿粡寂蝟赱齠洲粤讌将┴閙頤祓逢纂蝟昭粡竚癈鷭т繻Ь踈蜀祺逢鹿粡寂蝟赱齠洲粤讌将蜀阨熏閼―喪檀逅殺瘢雹頤迴粤―瓶聾元降羽鹿粡寂蝟赱齠洲粤讌将┴閙頤途辿纂蝟昭粡竚癈鷭т繻Ь熕礬├├鹿粡寂蝟赱齠洲粤讌将┴閙頤癈竕蛬蜴鍠纂蝟昭粡竚癈鷭т繻Ь頤迴粤喘鰭纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閙頤祓鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将 蜀黯黯轣鞏羲蝟昭粡竚癈鷭т繻Ь王踉三王踉祉右踉三絋踉祉閏蝟昭粡竚癈鷭т繻Ь王踉三絋踉祉右踉三絋踉祉羽續郢鹿粡寂蝟赱齠洲粤讌将 蜀芦嘘煕鹿粡寂蝟赱齠洲粤讌将 蜀阨熏閼紂舜芦嘘澑蝟昭粡竚癈鷭т繻Ь 阨熏閼悵憶樫瓜鹿粡寂蝟赱齠洲粤讌将 ┴閙頤途辿纂蝟昭粡竚癈鷭т繻Ь ┴閙頤ГЗ纂蝟昭粡竚癈鷭т繻Ь ┴閙頤ЖЗ纂蝟昭粡竚癈鷭т繻Ь ┴閙頤悵憶樫右瘢雹因憩鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь踈蜀阨熏閼―芦宛蝟昭粡竚癈鷭т繻Ь頤迴粤芦宛纂蝟昭粡竚癈鷭т繻Ь熕礬喘鹿粡寂蝟赱齠洲粤讌将┴閙頤ГЗ纂蝟昭粡竚癈鷭т繻Ь熕礬瘤裼煢銓鳫鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь熕礬鴬纂蝟昭粡竚癈鷭т繻Ь熕礬羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶矚黼挟焜闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将迚辣熕鱚竏癇岡羽纂蝟昭粡竚癈鷭т繻Ь烽癈絛眼闔岡祓鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鉉聨竏癇鳫諷釼碯聘掛纂蝟昭粡竚癈鷭т繻Ь蜴碣闍緕焜阨銓纈纂蝟昭粡竚癈鷭т繻Ь蜴碣闍緕煬癈飴鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇鳫諷釼艱斌蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇瓜鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀碣闍緕焜阨銓纈逢鹿粡寂蝟赱齠洲粤讌将 鱚鴈鳫諷釼碯聘碣闍緕焜阨銓纈飮鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь┴蛬砒續礬鹿粡寂蝟赱齠洲粤讌将蜀秉洲ぇ瘢雹逅碣闍緕煬癈―喘蝟昭粡竚癈鷭т繻Ь瘢雹逅鉋熏閼綵汁喘鰭蜴頤迴粤十悵屋羽蝟昭粡竚癈鷭т繻Ь祓┴蛬砒續礬鹿粡寂蝟赱齠洲粤讌将 碣闍緕煬癈飴鹿粡寂蝟赱齠洲粤讌将 蜀祓十Ю祓十З鹿粡寂蝟赱齠洲粤讌将 碣闍緕烽朧歃祓碣闍緕烽霸歃禹蝟昭粡竚癈鷭т繻Ь碣闍緕焜阨銓纈讐纂蝟昭粡竚癈鷭т繻Ь鱚鴈喘纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 ┴蛬碯鈑續礬卯罘纂蝟昭粡竚癈鷭т繻Ь鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь踈蜀秉洲├瘢雹逅碣闍緕煬癈―喘蝟昭粡竚癈鷭т繻Ь瘢雹逅鉋熏閼綵舜芦宛蜴頤迴粤十悵屋羽蝟昭粡竚癈鷭т繻Ь祓┴蛬砒續礬鹿粡寂蝟赱齠洲粤讌将 碣闍緕煬癈飴鹿粡寂蝟赱齠洲粤讌将 蜀祓十祓十З鹿粡寂蝟赱齠洲粤讌将 碣闍緕烽朧歃祓碣闍緕烽霸歃禹鹿粡寂蝟赱齠洲粤讌将 碣闍緕焜阨銓纈讐纂蝟昭粡竚癈鷭т繻Ь鱚鴈喘纂蝟昭粡竚癈鷭т繻Ь繻黼鹿粡寂蝟赱齠洲粤讌将 ┴蛬碯鈑續礬卯罘纂蝟昭粡竚癈鷭т繻Ь鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь碣闍緕煬癈禹鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諞焜葹碣闍緕熾鈑續礙鉉聨竏癇読姪罘鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鳫諷釼竢鬢踉参蝟昭粡竚癈鷭т繻Ь碣闍緕烽桙鳫諷釼竢鬩純纂蝟昭粡竚癈鷭т繻Ь續禹鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鉉聨竏癇鱚竰纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶竰焜闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀頏纐焜鬧鹿粡寂蝟赱齠洲粤讌将 頏纐焜飴鹿粡寂蝟赱齠洲粤讌将 蜀化衆逅殺瘢雹祓十量蝟昭粡竚癈鷭т繻Ь竰焜闔穐к逾鹿粡寂蝟赱齠洲粤讌将 蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀祺蝟昭粡竚癈鷭т繻Ь焜鱆闔岡祓鹿粡寂蝟赱齠洲粤讌将繻黼噂洲橇З鹿粡寂蝟赱齠洲粤讌将 頏纐焜祓纂蝟昭粡竚癈鷭т繻Ь踈蜀祓十к逾蝟昭粡竚癈鷭т繻Ь鴉閼縷羹獣厂透鹿粡寂蝟赱齠洲粤讌将┴閙竰竢鉚穐к鬣鹿粡寂蝟赱齠洲粤讌将 繻黼鴉閼縷羹獣勞鹿粡寂蝟赱齠洲粤讌将┴閙竰竢鉚穐к鬣鹿粡寂蝟赱齠洲粤讌将 鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将 ┴閙竰竢鉚穐量鹿粡寂蝟赱齠洲粤讌将繻黼院洲椣害鴉閼縷罅塾密蝟昭粡竚癈鷭т繻Ь焜鱆闔岡祓鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь續跿閹闌籖竢鉚┤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将粐纓跚鈬瘤阨葹鮗蝟昭粡竚癈鷭т繻Ь橇痲鈬蜴鈔頤鈿蜴膽蝟昭粡竚癈鷭т繻Ь齔痺綣蝟昭粡竚癈鷭т繻Ь鼡蜷鹿粡寂蝟赱齠洲粤讌将闥踈紿闥轣阨蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闌齡癆蜴鱚鱚阨竏癇痺鬧鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将因鍵瘰瘤纉芦宛芦葦蝟昭粡竚癈鷭т繻Ь踉三喪檀票蝟昭粡竚癈鷭т繻Ь纓蜴鹿粡寂蝟赱齠洲粤讌将齔痺綣蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蓍肬趙趺闥粹纉阡鱚黼鴟蒹痲蜴齔痺蜴蜴絎鹿粡寂蝟赱齠洲粤讌将壽蜩轣蜴蜀聽鱚釿胙闕逕蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь粤肅鈬葹鰡皷岡祓何穏羽鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆闌籖竢鉚諞焜葹祺鉉聨竏癇羽鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇鱚纂蝟昭粡竚癈鷭т繻Ь諞焜葹肬趙燗纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь噂к鬣瘢雹逅≧闌籖頏纉纈煕蝟昭粡竚癈鷭т繻Ь肬趙燗衆蜃鈿鱚鹿粡寂蝟赱齠洲粤讌将踈蜀祓十樌Е瘢雹逅紙熕鱚洲橇逅殺瘢雹闌籖頏纉纈煕蝟昭粡竚癈鷭т繻Ь熕鱚к逾纂蝟昭粡竚癈鷭т繻Ь 肬趙燗衆蜃鈿鱚鹿粡寂蝟赱齠洲粤讌将繻黼噂帯蝟昭粡竚癈鷭т繻Ь煬蜴絋苳三聨跚鈬纂蝟昭粡竚癈鷭т繻Ь闌籖齡癆纂蝟昭粡竚癈鷭т繻Ь踈蜀祺十渡逅殺瘢雹煬蜴―竚闢關緕癈跚鈬蝟昭粡竚癈鷭т繻Ь闌籖齡癆к逾纂蝟昭粡竚癈鷭т繻Ь踈蜀噂洲樌逅殺瘢雹肬趙熕鱚黼鴟縷罘鹿粡寂蝟赱齠洲粤讌将┬祓十к鬣噂洲樌Е瘢雹逅紙熕鱚洲橇З蝟昭粡竚癈鷭т繻Ь逅殺瘢雹闌籖頏纉纈煕鹿粡寂蝟赱齠洲粤讌将纓蜴鹿粡寂蝟赱齠洲粤讌将蜀肬趙熕鱚黼鴟縷罘蝟昭粡竚癈鷭т繻Ь熕鱚祓纂蝟昭粡竚癈鷭т繻Ь煬蜴飴鹿粡寂蝟赱齠洲粤讌将肬趙燗к鬣纂蝟昭粡竚癈鷭т繻Ь繻黼┬聨頏纐祓瘢雹逅≧闌籖頏纉纈煕蝟昭粡竚癈鷭т繻Ь聨頏纐к逾瘢雹逅肬趙熕鱚黼鴟縷罘鹿粡寂蝟赱齠洲粤讌将跚竅纓跚鈬蝟昭粡竚癈鷭т繻Ь煬蜴紿鹿粡寂蝟赱齠洲粤讌将聨跚鈬纂蝟昭粡竚癈鷭т繻Ь闌籖齡癆樌Щ頤鈬蜴鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将聨跚鈬纂蝟昭粡竚癈鷭т繻Ь闌籖齡癆纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将繻黼蝟昭粡竚癈鷭т繻Ь熕鱚瘢雹因鍵瘰瘤纉綽蝟昭粡竚癈鷭т繻Ь熕鱚祓纂蝟昭粡竚癈鷭т繻Ь闌籖齡癆芬闥芍皷鈑跂纓跚鈬蝟昭粡竚癈鷭т繻Ь踈蜀聨頏纐十З鹿粡寂蝟赱齠洲粤讌将肬趙燗飴鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将聨頏纐瓜鹿粡寂蝟赱齠洲粤讌将蜀聨跚鈬醇闌籖跂遘蝟昭粡竚癈鷭т繻Ь闌籖齡癆纂蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь煬蜴飴鹿粡寂蝟赱齠洲粤讌将肬趙燗к鬣肬趙鈔頤鈿蜴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь踈蜀祓十к罕蝟昭粡竚癈鷭т繻Ь熕鱚к逾纂蝟昭粡竚癈鷭т繻Ь煬蜴飴鹿粡寂蝟赱齠洲粤讌将肬趙燗к逾阨纓跚鈬鈔跂癇蝟昭粡竚癈鷭т繻Ь踈蜀祺十瘢雹逅祓十З鹿粡寂蝟赱齠洲粤讌将祺十瘢雹逅祓十к蝟昭粡竚癈鷭т繻Ь化洲:逅殺瘢雹噂洲:鹿粡寂蝟赱齠洲粤讌将芦宛瘤諱謨癈竕齔痺鹿粡寂蝟赱齠洲粤讌将蜀聨頏纐З鹿粡寂蝟赱齠洲粤讌将肬趙燗纃阮糒韭蜒癆齔痺纉蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь熕鱚Щ鹿粡寂蝟赱齠洲粤讌将蜀聨跚鈬醇闌籖跂遘蝟昭粡竚癈鷭т繻Ь闌籖齡癆Щ阨喘鰭鞜竇鉤鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将聨頏纐聨跚鈬纂蝟昭粡竚癈鷭т繻Ь闌籖齡癆к鬣肬趙鈔頤鈿蜴鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将頏纐聨頏纐齡蛹鈬繖蓍闔絎跋闢粹鈬蝟昭粡竚癈鷭т繻Ь熕鱚祓纂蝟昭粡竚癈鷭т繻Ь化舜芦葦鹿粡寂蝟赱齠洲粤讌将聨頏纐因鍵蜩捕鞜鈬黼蝟昭粡竚癈鷭т繻Ь煬蜴葹鰡皷岡祓鹿粡寂蝟赱齠洲粤讌将蜀聨跚鈬醇闌籖跂遘鈿鴉瘡癈鹿粡寂蝟赱齠洲粤讌将肬趙燗纂蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь煬蜴絋苳紙闌籖跂遨肬趙熏癇芍遘轣銷蜴齒謨鞳銖蜿鹿粡寂蝟赱齠洲粤讌将聨跚鈬葹鰡皷岡祓鹿粡寂蝟赱齠洲粤讌将肬趙燗к逾竅逾蜚粹闌鈿鹿粡寂蝟赱齠洲粤讌将繻黼化舜芦葦蝟昭粡竚癈鷭т繻Ь皷逅跂蜴齒謨纉鱚鴈縺銖肬趙蜴蝟昭粡竚癈鷭т繻Ь噂秀因粤逅三罘肬趙燗ぢ゛*/
- else if (c1==(0xdf&0x7f)) fold_state = 1; /* ゜*/
- else if (c1==(0xa4&0x7f)) fold_state = 1; /* 。*/
- else if (c1==(0xa3&0x7f)) fold_state = 1; /* ,*/
- else if (c1==(0xa1&0x7f)) fold_state = 1; /* 」*/
- else if (c1==(0xb0&0x7f)) fold_state = 1; /* - */
- else if (SPACE<=c1 && c1<=(0xdf&0x7f)) { /* X0201 */
- f_line = 1;
- fold_state = '\n';/* add one new f_line before this character */
- } else {
- f_line = 1;
- fold_state = '\n';/* add one new f_line before this character */
- }
- } else if (c2==0) {
- /* kinsoku point in ASCII */
- if ( c1==')'|| /* { [ ( */
- c1==']'||
- c1=='}'||
- c1=='.'||
- c1==','||
- c1=='!'||
- c1=='?'||
- c1=='/'||
- c1==':'||
- c1==';' ) {
- fold_state = 1;
- /* just after special */
- } else if (!is_alnum(prev0)) {
- f_line = char_size(c2,c1);
- fold_state = '\n';
- } else if ((prev0==' ') || /* ignored new f_line */
- (prev0=='\n')|| /* ignored new f_line */
- (prev0&0x80)) { /* X0208 - ASCII */
- f_line = char_size(c2,c1);
- fold_state = '\n';/* add one new f_line before this character */
- } else {
- fold_state = 1; /* default no fold in ASCII */
- }
- } else {
- if (c2=='!') {
- if (c1=='"') fold_state = 1; /* 、 */
- else if (c1=='#') fold_state = 1; /* 。 */
- else if (c1=='W') fold_state = 1; /* 」 */
- else if (c1=='K') fold_state = 1; /* ) */
- else if (c1=='$') fold_state = 1; /* , */
- else if (c1=='%') fold_state = 1; /* . */
- else if (c1=='\'') fold_state = 1; /* + */
- else if (c1=='(') fold_state = 1; /* ; */
- else if (c1==')') fold_state = 1; /* ? */
- else if (c1=='*') fold_state = 1; /* ! */
- else if (c1=='+') fold_state = 1; /* ゛ */
- else if (c1==',') fold_state = 1; /* ゜ */
- /* default no fold in kinsoku */
- else {
- fold_state = '\n';
- f_line = char_size(c2,c1);
- /* add one new f_line before this character */
- }
- } else {
- f_line = char_size(c2,c1);
- fold_state = '\n';
- /* add one new f_line before this character */
- }
- }
- }
- }
- /* terminator process */
- switch(fold_state) {
- case '\n':
- (*o_fconv)(0,'\n');
- (*o_fconv)(c2,c1);
- break;
- case 0:
- return;
- case '\r':
- (*o_fconv)(0,'\n');
- break;
- case '\t':
- case ' ':
- (*o_fconv)(0,' ');
- break;
- default:
- (*o_fconv)(c2,c1);
- }
-}
-
-nkf_char z_prev2=0,z_prev1=0;
-
-void z_conv(nkf_char c2, nkf_char c1)
-{
-
- /* if (c2) c1 &= 0x7f; assertion */
-
- if (x0201_f && z_prev2==X0201) { /* X0201 */
- if (c1==(0xde&0x7f)) { /* 濁点 */
- z_prev2=0;
- (*o_zconv)(dv[(z_prev1-SPACE)*2],dv[(z_prev1-SPACE)*2+1]);
- return;
- } else if (c1==(0xdf&0x7f)&&ev[(z_prev1-SPACE)*2]) { /* 筈苳斬蝟昭粡竚癈鷭т繻Ь熕鱚衆纂蝟昭粡竚癈鷭т繻Ь燠竢鉚纐曩頏纐鵜嗤礎滴檪纐曩頏纐鵜嗤礎滴櫞纂蝟昭粡竚癈鷭т繻Ь續郢鹿粡寂蝟赱齠洲粤讌将繻黼鹿粡寂蝟赱齠洲粤讌将頏纐化飴鹿粡寂蝟赱齠洲粤讌将┴閙闔熕鱚仭壇課熕鱚仭壇黄榎鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀祺十渡透鹿粡寂蝟赱齠洲粤讌将┴閙闔岡祓鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀屋円逅殺瘢雹化舜芦葦蝟昭粡竚癈鷭т繻Ь鵜嗤礎滴沮鵜嗤礎滴櫞鹿粡寂蝟赱齠洲粤讌将瘟肬濁点 or 筈苳斬蝟昭粡竚癈鷭т繻Ь熕鱚瓜熕鱚音鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь踈蝟昭粡竚癈鷭т繻Ь燠竢鉚笆曩祓仭壇課鵜嗤礎滴櫞纂蝟昭粡竚癈鷭т繻Ь續郢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将瓶悵屋糟韆痰續蝟昭粡竚癈鷭т繻Ь跟葹煕瘢雹逅祺因桶鹿粡寂蝟赱齠洲粤讌将祺纂蝟昭粡竚癈鷭т繻Ь踈蜀瘡韆痿逅殺瘢雹十鹿粡寂蝟赱齠洲粤讌将瓶悵屋哩苡鹿粡寂蝟赱齠洲粤讌将┛噂純羽鹿粡寂蝟赱齠洲粤讌将跟葹煕逅三蝟昭粡竚癈鷭т繻Ь祓纂蝟昭粡竚癈鷭т繻Ь祺纂蝟昭粡竚癈鷭т繻Ь繻黼跟葹煕逅三蝟昭粡竚癈鷭т繻Ь燠竢鉚穐З纂蝟昭粡竚癈鷭т繻Ь燠竢鉚穐З纂蝟昭粡竚癈鷭т繻Ь續郢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь繻黼┛愛踉祉逅殺瘢雹右踉三逅殺瘢雹祓維蝟昭粡竚癈鷭т繻Ь祓祓維纂蝟昭粡竚癈鷭т繻Ь祺飴鹿粡寂蝟赱齠洲粤讌将跟葹煕逅三蝟昭粡竚癈鷭т繻Ь竏癇緕纂蝟昭粡竚癈鷭т繻Ь齬蜚竏祓鹿粡寂蝟赱齠洲粤讌将癈Е苳薩緕逅紫∋鱚瘠纂蝟昭粡竚癈鷭т繻Ь竅黼Ш銓蜚▽瘢雹踉拶碣縺觧鹿粡寂蝟赱齠洲粤讌将癈к▼緕逅資∋鱚瘠纂蝟昭粡竚癈鷭т繻Ь竅黼逅薩緕逅氏逅拶碣縺觧鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将銓蜚蝟昭粡竚癈鷭т繻Ь蛹┴緕┴閙闔┛銓蜚纂蝟昭粡竚癈鷭т繻Ь鱚鴈纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь燠竢鉚祺羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将d繙蜴鳫絵礬楴蝟昭粡竚癈鷭т繻Ь踉Я禳鹿粡寂蝟赱齠洲粤讌将踉蚕友嘘鹿粡寂蝟赱齠洲粤讌将踉蚕擂嘘鹿粡寂蝟赱齠洲粤讌将踉пЗ礬楴蝟昭粡竚癈鷭т繻ЬыЗ芥楴蝟昭粡竚癈鷭т繻ЬЗ芥楴蝟昭粡竚癈鷭т繻Ь礬鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь粤肅鈬鳫隈礬鹿粡寂蝟赱齠洲粤讌将:楴蝟昭粡竚癈鷭т繻Ь踉蚕炉慣楴蝟昭粡竚癈鷭т繻Ь踉蚕粂鹿粡寂蝟赱齠洲粤讌将楴蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆阡焜闔鉉聨竏癇岡諞焜葹祓蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀祺十化舜芦葦祺十瓶聾元降羽鹿粡寂蝟赱齠洲粤讌将 祓阡嘘羽纂蝟昭粡竚癈鷭т繻Ь踈蜀祺蝟昭粡竚癈鷭т繻Ь祓阡慣羽纂蝟昭粡竚癈鷭т繻Ь祺阡慣鴬纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閙鳫竢鉚祺羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜆蜥痿竢鉚諞焜葹祺鉉聨竏癇羽鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蜥痿逅羽鹿粡寂蝟赱齠洲粤讌将蜀祺因乙蝟昭粡竚癈鷭т繻Ь┛逅殺瘢雹刊鹿粡寂蝟赱齠洲粤讌将祺柑鹿粡寂蝟赱齠洲粤讌将┴閙蓍鱇焜闔岡祓鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь踈蜀祓因郡瘢雹逅頤竢鉚閭闔頤竢鉚閭闔匡蝟昭粡竚癈鷭т繻Ь飴鹿粡寂蝟赱齠洲粤讌将祓盟嗷炙良地津姐柑鹿粡寂蝟赱齠洲粤讌将┴閙蓍鱇焜闔岡祓鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将繻黼十逅殺瘢雹祓因崖祓因慨鹿粡寂蝟赱齠洲粤讌将祓音鹿粡寂蝟赱齠洲粤讌将┴閙蓍鱇焜闔岡祓鹿粡寂蝟赱齠洲粤讌将鱚鴈纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蜥痿逅鴬鹿粡寂蝟赱齠洲粤讌将蜀祺逅殺瘢雹十談喪嘸嬶秒歪因外拘鹿粡寂蝟赱齠洲粤讌将祺技鹿粡寂蝟赱齠洲粤讌将祓柑鹿粡寂蝟赱齠洲粤讌将繻黼十逅殺瘢雹逅殺瘢雹刊鹿粡寂蝟赱齠洲粤讌将祺技鹿粡寂蝟赱齠洲粤讌将繻黼十逅殺瘢雹祓因概祓因涯鹿粡寂蝟赱齠洲粤讌将祓音鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閙蓍鱇焜闔岡祓鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь濶蜩鏖芦芽鞏竏繝諧竢鉚諞焜葹祺鉉聨竏癇羽鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь竢銖鉉聨竏癇瘤艱柢僧播瀘嬪瀝層毟課鹿粡寂蝟赱齠洲粤讌将臆罨桶幸鹿粡寂蝟赱齠洲粤讌将牡岡牡幸鹿粡寂蝟赱齠洲粤讌将乙卯乙皙鹿粡寂蝟赱齠洲粤讌将俺皙卸卯鹿粡寂蝟赱齠洲粤讌将卸甃卸筱鹿粡寂蝟赱齠洲粤讌将害卯害罨鹿粡寂蝟赱齠洲粤讌将崖甃慨穐鹿粡寂蝟赱齠洲粤讌将概皙涯穐鹿粡寂蝟赱齠洲粤讌将碍皙碍絳鹿粡寂蝟赱齠洲粤讌将慣巻慣絳鹿粡寂蝟赱齠洲粤讌将儀桑儀絳鹿粡寂蝟赱齠洲粤讌将恭幸挟穐鹿粡寂蝟赱齠洲粤讌将教幸況絳鹿粡寂蝟赱齠洲粤讌将郡岡卦穐鹿粡寂蝟赱齠洲粤讌将祁岡祁絳鹿粡寂蝟赱齠洲粤讌将鹸卯厳絳鹿粡寂蝟赱齠洲粤讌将羌巻羞絳鹿粡寂蝟赱齠洲粤讌将寛規慣缸蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь諞焜葹藥鹿粡寂蝟赱齠洲粤讌将鉉聨竏癇鶯緕筱纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь罔祺苳蚕逅殺瘢雹因屋瘢雹逅祓苳蚕逅殺瘢雹因聿蝟昭粡竚癈鷭т繻Ь祺都善纂蝟昭粡竚癈鷭т繻Ь祓都漸纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀┬祺苳蚕逅殺瘢雹因我祺苳蚕逅殺瘢雹因桁鹿粡寂蝟赱齠洲粤讌将 祺都善纂蝟昭粡竚癈鷭т繻Ь祓都漸纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将肬僧播瀘嬪瀝層蕭鹿粡寂蝟赱齠洲粤讌将 齡癇鱇鈑縻蛞朧飮鹿粡寂蝟赱齠洲粤讌将 緕鱇鈑縻蛞霸飮鹿粡寂蝟赱齠洲粤讌将 祓纂蝟昭粡竚癈鷭т繻Ь蜀齡癇逅殺瘢雹踉蚕鈔蝟昭粡竚癈鷭т繻Ь祺都善纂蝟昭粡竚癈鷭т繻Ь祓都漸纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将┴閙蜩鏖芦芽鞏竏繝諧竢鉚祺羽纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蓍竢鉚纈戎瓶廊屋臆仗多範播惑顛鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖葹蜊縷鞜纈釖蝟昭粡竚癈鷭т繻Ь竢銖皷芬繖葹∠扱疑鍍鱈偏紳植蝟昭粡竚癈鷭т繻Ь竢銖皷芬繖葹∠扱疑喩鋲壥壁喊多↑鹿粡寂蝟赱齠洲粤讌将闔齡銖蜃鈬竏癇椣卦辛嗜元広運竸↑鹿粡寂蝟赱齠洲粤讌将闔齡銖蜃鈬竏癇椣卦辛嗜元広運多↑鹿粡寂蝟赱齠洲粤讌将闔齡銖蜃鈬竏癇椣卦辛嗜芦沖偏紳植蝟昭粡竚癈鷭т繻Ь竢銖皷芬繖葹∠扱疑瓶廊屋臆仗竸↑鹿粡寂蝟赱齠洲粤讌将i粤肅鈬筥孕童濾緑孕濺料駄滴鹿粡寂蝟赱齠洲粤讌将闔齡銖蜃鈬竏癇椣卦腎堝紳植蝟昭粡竚癈鷭т繻Ь竢銖皷芬繖葹∠扱疑孕騰舷竸↑鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲粤讌将闔齡銖蜃鈬竏癇椣卦腎哭喪檀豹竸↑鹿粡寂蝟赱齠洲粤讌将燐面鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将ぢ該当するコ・踉札匹陵ダ菘戮鬢苳糸げるための目印 */
-nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
- e_iconv, s_iconv, 0, 0, 0, 0,
-#if defined(UTF8_INPUT_ENABLE)
- w_iconv, w_iconv,
-#endif
- 0,
-};
-
-const nkf_char mime_encode[] = {
- JAPANESE_EUC, SHIFT_JIS,ISO8859_1, ISO8859_1, X0208, X0201,
-#if defined(UTF8_INPUT_ENABLE)
- UTF8, UTF8,
-#endif
- ASCII,
- 0
-};
-
-const nkf_char mime_encode_method[] = {
- 'B', 'B','Q', 'B', 'B', 'Q',
-#if defined(UTF8_INPUT_ENABLE)
- 'B', 'Q',
-#endif
- 'Q',
- 0
-};
-
-
-#define MAXRECOVER 20
-
-void switch_mime_getc(void)
-{
- if (i_getc!=mime_getc) {
- i_mgetc = i_getc; i_getc = mime_getc;
- i_mungetc = i_ungetc; i_ungetc = mime_ungetc;
- if(mime_f==STRICT_MIME) {
- i_mgetc_buf = i_mgetc; i_mgetc = mime_getc_buf;
- i_mungetc_buf = i_mungetc; i_mungetc = mime_ungetc_buf;
- }
- }
-}
-
-void unswitch_mime_getc(void)
-{
- if(mime_f==STRICT_MIME) {
- i_mgetc = i_mgetc_buf;
- i_mungetc = i_mungetc_buf;
- }
- i_getc = i_mgetc;
- i_ungetc = i_mungetc;
- if(mime_iconv_back)set_iconv(FALSE, mime_iconv_back);
- mime_iconv_back = NULL;
-}
-
-nkf_char mime_begin_strict(FILE *f)
-{
- nkf_char c1 = 0;
- int i,j,k;
- const unsigned char *p,*q;
- nkf_char r[MAXRECOVER]; /* recovery buffer, max mime pattern length */
-
- mime_decode_mode = FALSE;
- /* =? has been checked */
- j = 0;
- p = mime_pattern[j];
- r[0]='='; r[1]='?';
-
- for(i=2;p[i]>' ';i++) { /* start at =? */
- if ( ((r[i] = c1 = (*i_getc)(f))==EOF) || nkf_toupper(c1) != p[i] ) {
- /* pattern fails, try next one */
- q = p;
- while (mime_pattern[++j]) {
- p = mime_pattern[j];
- for(k=2;k<i;k++) /* assume length(p) > i */
- if (p[k]!=q[k]) break;
- if (k==i && nkf_toupper(c1)==p[k]) break;
- }
- p = mime_pattern[j];
- if (p) continue; /* found next one, continue */
- /* all fails, output from recovery buffer */
- (*i_ungetc)(c1,f);
- for(j=0;j<i;j++) {
- (*oconv)(0,r[j]);
- }
- return c1;
- }
- }
- mime_decode_mode = p[i-2];
-
- mime_iconv_back = iconv;
- set_iconv(FALSE, mime_priority_func[j]);
- clr_code_score(find_inputcode_byfunc(mime_priority_func[j]), SCORE_iMIME);
-
- if (mime_decode_mode=='B') {
- mimebuf_f = unbuf_f;
- if (!unbuf_f) {
- /* do MIME integrity check */
- return mime_integrity(f,mime_pattern[j]);
- }
- }
- switch_mime_getc();
- mimebuf_f = TRUE;
- return c1;
-}
-
-nkf_char mime_getc_buf(FILE *f)
-{
- /* we don't keep eof of Fifo, becase it contains ?= as
- a terminator. It was checked in mime_integrity. */
- return ((mimebuf_f)?
- (*i_mgetc_buf)(f):Fifo(mime_input++));
-}
-
-nkf_char mime_ungetc_buf(nkf_char c, FILE *f)
-{
- if (mimebuf_f)
- (*i_mungetc_buf)(c,f);
- else
- Fifo(--mime_input) = (unsigned char)c;
- return c;
-}
-
-nkf_char mime_begin(FILE *f)
-{
- nkf_char c1;
- int i,k;
-
- /* In NONSTRICT mode, only =? is checked. In case of failure, we */
- /* re-read and convert again from mime_buffer. */
-
- /* =? has been checked */
- k = mime_last;
- Fifo(mime_last++)='='; Fifo(mime_last++)='?';
- for(i=2;i<MAXRECOVER;i++) { /* start at =? */
- /* We accept any character type even if it is breaked by new lines */
- c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
- if (c1=='\n'||c1==' '||c1=='\r'||
- c1=='-'||c1=='_'||is_alnum(c1) ) continue;
- if (c1=='=') {
- /* Failed. But this could be another MIME preemble */
- (*i_ungetc)(c1,f);
- mime_last--;
- break;
- }
- if (c1!='?') break;
- else {
- /* c1=='?' */
- c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
- if (!(++i<MAXRECOVER) || c1==EOF) break;
- if (c1=='b'||c1=='B') {
- mime_decode_mode = 'B';
- } else if (c1=='q'||c1=='Q') {
- mime_decode_mode = 'Q';
- } else {
- break;
- }
- c1 = (*i_getc)(f); Fifo(mime_last++) = (unsigned char)c1;
- if (!(++i<MAXRECOVER) || c1==EOF) break;
- if (c1!='?') {
- mime_decode_mode = FALSE;
- }
- break;
- }
- }
- switch_mime_getc();
- if (!mime_decode_mode) {
- /* false MIME premble, restart from mime_buffer */
- mime_decode_mode = 1; /* no decode, but read from the mime_buffer */
- /* Since we are in MIME mode until buffer becomes empty, */
- /* we never go into mime_begin again for a while. */
- return c1;
- }
- /* discard mime preemble, and goto MIME mode */
- mime_last = k;
- /* do no MIME integrity check */
- return c1; /* used only for checking EOF */
-}
-
-#ifdef CHECK_OPTION
-void no_putc(nkf_char c)
-{
- ;
-}
-
-void debug(const char *str)
-{
- if (debug_f){
- fprintf(stderr, "%s\n", str);
- }
-}
-#endif
-
-void set_input_codename(char *codename)
-{
- if (guess_f &&
- is_inputcode_set &&
- strcmp(codename, "") != 0 &&
- strcmp(codename, input_codename) != 0)
- {
- is_inputcode_mixed = TRUE;
- }
- input_codename = codename;
- is_inputcode_set = TRUE;
-}
-
-#if !defined(PERL_XS) && !defined(WIN32DLL)
-void print_guessed_code(char *filename)
-{
- char *codename = "BINARY";
- if (!is_inputcode_mixed) {
- if (strcmp(input_codename, "") == 0) {
- codename = "ASCII";
- } else {
- codename = input_codename;
- }
- }
- if (filename != NULL) printf("%s:", filename);
- printf("%s\n", codename);
-}
-#endif /*WIN32DLL*/
-
-#ifdef INPUT_OPTION
-
-nkf_char hex_getc(nkf_char ch, FILE *f, nkf_char (*g)(FILE *f), nkf_char (*u)(nkf_char c, FILE *f))
-{
- nkf_char c1, c2, c3;
- c1 = (*g)(f);
- if (c1 != ch){
- return c1;
- }
- c2 = (*g)(f);
- if (!nkf_isxdigit(c2)){
- (*u)(c2, f);
- return c1;
- }
- c3 = (*g)(f);
- if (!nkf_isxdigit(c3)){
- (*u)(c2, f);
- (*u)(c3, f);
- return c1;
- }
- return (hex2bin(c2) << 4) | hex2bin(c3);
-}
-
-nkf_char cap_getc(FILE *f)
-{
- return hex_getc(':', f, i_cgetc, i_cungetc);
-}
-
-nkf_char cap_ungetc(nkf_char c, FILE *f)
-{
- return (*i_cungetc)(c, f);
-}
-
-nkf_char url_getc(FILE *f)
-{
- return hex_getc('%', f, i_ugetc, i_uungetc);
-}
-
-nkf_char url_ungetc(nkf_char c, FILE *f)
-{
- return (*i_uungetc)(c, f);
-}
-#endif
-
-#ifdef NUMCHAR_OPTION
-nkf_char numchar_getc(FILE *f)
-{
- nkf_char (*g)(FILE *) = i_ngetc;
- nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
- int i = 0, j;
- nkf_char buf[8];
- long c = -1;
-
- buf[i] = (*g)(f);
- if (buf[i] == '&'){
- buf[++i] = (*g)(f);
- if (buf[i] == '#'){
- c = 0;
- buf[++i] = (*g)(f);
- if (buf[i] == 'x' || buf[i] == 'X'){
- for (j = 0; j < 7; j++){
- buf[++i] = (*g)(f);
- if (!nkf_isxdigit(buf[i])){
- if (buf[i] != ';'){
- c = -1;
- }
- break;
- }
- c <<= 4;
- c |= hex2bin(buf[i]);
- }
- }else{
- for (j = 0; j < 8; j++){
- if (j){
- buf[++i] = (*g)(f);
- }
- if (!nkf_isdigit(buf[i])){
- if (buf[i] != ';'){
- c = -1;
- }
- break;
- }
- c *= 10;
- c += hex2bin(buf[i]);
- }
- }
- }
- }
- if (c != -1){
- return CLASS_UNICODE | c;
- }
- while (i > 0){
- (*u)(buf[i], f);
- --i;
- }
- return buf[0];
-}
-
-nkf_char numchar_ungetc(nkf_char c, FILE *f)
-{
- return (*i_nungetc)(c, f);
-}
-#endif
-
-#ifdef UNICODE_NORMALIZATION
-
-/* Normalization Form C */
-nkf_char nfc_getc(FILE *f)
-{
- nkf_char (*g)(FILE *f) = i_nfc_getc;
- nkf_char (*u)(nkf_char c ,FILE *f) = i_nfc_ungetc;
- int i=0, j, k=1, lower, upper;
- nkf_char buf[9];
- const nkf_nfchar *array;
-#if 0
- extern const struct normalization_pair normalization_table[];
-#endif
-
- buf[i] = (*g)(f);
- while (k > 0 && ((buf[i] & 0xc0) != 0x80)){
- lower=0, upper=NORMALIZATION_TABLE_LENGTH-1;
- while (upper >= lower) {
- j = (lower+upper) / 2;
- array = normalization_table[j].nfd;
- for (k=0; k < NORMALIZATION_TABLE_NFD_LENGTH && array[k]; k++){
- if (array[k] != buf[k]){
- array[k] < buf[k] ? (lower = j + 1) : (upper = j - 1);
- k = 0;
- break;
- } else if (k >= i)
- buf[++i] = (*g)(f);
- }
- if (k > 0){
- array = normalization_table[j].nfc;
- for (i=0; i < NORMALIZATION_TABLE_NFC_LENGTH && array[i]; i++)
- buf[i] = (nkf_char)(array[i]);
- i--;
- break;
- }
- }
- while (i > 0)
- (*u)(buf[i--], f);
- }
- return buf[0];
-}
-
-nkf_char nfc_ungetc(nkf_char c, FILE *f)
-{
- return (*i_nfc_ungetc)(c, f);
-}
-#endif /* UNICODE_NORMALIZATION */
-
-
-nkf_char
-mime_getc(FILE *f)
-{
- nkf_char c1, c2, c3, c4, cc;
- nkf_char t1, t2, t3, t4, mode, exit_mode;
- nkf_char lwsp_count;
- char *lwsp_buf;
- char *lwsp_buf_new;
- nkf_char lwsp_size = 128;
-
- if (mime_top != mime_last) { /* Something is in FIFO */
- return Fifo(mime_top++);
- }
- if (mime_decode_mode==1 ||mime_decode_mode==FALSE) {
- mime_decode_mode=FALSE;
- unswitch_mime_getc();
- return (*i_getc)(f);
- }
-
- if (mimebuf_f == FIXED_MIME)
- exit_mode = mime_decode_mode;
- else
- exit_mode = FALSE;
- if (mime_decode_mode == 'Q') {
- if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
-restart_mime_q:
- if (c1=='_' && mimebuf_f != FIXED_MIME) return ' ';
- if (c1<=' ' || DEL<=c1) {
- mime_decode_mode = exit_mode; /* prepare for quit */
- return c1;
- }
- if (c1!='=' && (c1!='?' || mimebuf_f == FIXED_MIME)) {
- return c1;
- }
-
- mime_decode_mode = exit_mode; /* prepare for quit */
- if ((c2 = (*i_mgetc)(f)) == EOF) return (EOF);
- if (c1=='?'&&c2=='=' && mimebuf_f != FIXED_MIME) {
- /* end Q encoding */
- input_mode = exit_mode;
- lwsp_count = 0;
- lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
- if (lwsp_buf==NULL) {
- perror("can't malloc");
- return -1;
- }
- while ((c1=(*i_getc)(f))!=EOF) {
- switch (c1) {
- case NL:
- case CR:
- if (c1==NL) {
- if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
- i_ungetc(SPACE,f);
- continue;
- } else {
- i_ungetc(c1,f);
- }
- c1 = NL;
- } else {
- if ((c1=(*i_getc)(f))!=EOF && c1 == NL) {
- if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
- i_ungetc(SPACE,f);
- continue;
- } else {
- i_ungetc(c1,f);
- }
- i_ungetc(NL,f);
- } else {
- i_ungetc(c1,f);
- }
- c1 = CR;
- }
- break;
- case SPACE:
- case TAB:
- lwsp_buf[lwsp_count] = (unsigned char)c1;
- if (lwsp_count++>lwsp_size){
- lwsp_size <<= 1;
- lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
- if (lwsp_buf_new==NULL) {
- free(lwsp_buf);
- perror("can't realloc");
- return -1;
- }
- lwsp_buf = lwsp_buf_new;
- }
- continue;
- }
- break;
- }
- if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
- i_ungetc(c1,f);
- for(lwsp_count--;lwsp_count>0;lwsp_count--)
- i_ungetc(lwsp_buf[lwsp_count],f);
- c1 = lwsp_buf[0];
- }
- free(lwsp_buf);
- return c1;
- }
- if (c1=='='&&c2<' ') { /* this is soft wrap */
- while((c1 = (*i_mgetc)(f)) <=' ') {
- if ((c1 = (*i_mgetc)(f)) == EOF) return (EOF);
- }
- mime_decode_mode = 'Q'; /* still in MIME */
- goto restart_mime_q;
- }
- if (c1=='?') {
- mime_decode_mode = 'Q'; /* still in MIME */
- (*i_mungetc)(c2,f);
- return c1;
- }
- if ((c3 = (*i_mgetc)(f)) == EOF) return (EOF);
- if (c2<=' ') return c2;
- mime_decode_mode = 'Q'; /* still in MIME */
- return ((hex2bin(c2)<<4) + hex2bin(c3));
- }
-
- if (mime_decode_mode != 'B') {
- mime_decode_mode = FALSE;
- return (*i_mgetc)(f);
- }
-
-
- /* Base64 encoding */
- /*
- MIME allows line break in the middle of
- Base64, but we are very pessimistic in decoding
- in unbuf mode because MIME encoded code may broken by
- less or editor's control sequence (such as ESC-[-K in unbuffered
- mode. ignore incomplete MIME.
- */
- mode = mime_decode_mode;
- mime_decode_mode = exit_mode; /* prepare for quit */
-
- while ((c1 = (*i_mgetc)(f))<=' ') {
- if (c1==EOF)
- return (EOF);
- }
-mime_c2_retry:
- if ((c2 = (*i_mgetc)(f))<=' ') {
- if (c2==EOF)
- return (EOF);
- if (mime_f != STRICT_MIME) goto mime_c2_retry;
- if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
- return c2;
- }
- if ((c1 == '?') && (c2 == '=')) {
- input_mode = ASCII;
- lwsp_count = 0;
- lwsp_buf = malloc((lwsp_size+5)*sizeof(char));
- if (lwsp_buf==NULL) {
- perror("can't malloc");
- return -1;
- }
- while ((c1=(*i_getc)(f))!=EOF) {
- switch (c1) {
- case NL:
- case CR:
- if (c1==NL) {
- if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
- i_ungetc(SPACE,f);
- continue;
- } else {
- i_ungetc(c1,f);
- }
- c1 = NL;
- } else {
- if ((c1=(*i_getc)(f))!=EOF) {
- if (c1==SPACE) {
- i_ungetc(SPACE,f);
- continue;
- } else if ((c1=(*i_getc)(f))!=EOF && (c1==SPACE||c1==TAB)) {
- i_ungetc(SPACE,f);
- continue;
- } else {
- i_ungetc(c1,f);
- }
- i_ungetc(NL,f);
- } else {
- i_ungetc(c1,f);
- }
- c1 = CR;
- }
- break;
- case SPACE:
- case TAB:
- lwsp_buf[lwsp_count] = (unsigned char)c1;
- if (lwsp_count++>lwsp_size){
- lwsp_size <<= 1;
- lwsp_buf_new = realloc(lwsp_buf, (lwsp_size+5)*sizeof(char));
- if (lwsp_buf_new==NULL) {
- free(lwsp_buf);
- perror("can't realloc");
- return -1;
- }
- lwsp_buf = lwsp_buf_new;
- }
- continue;
- }
- break;
- }
- if (lwsp_count > 0 && (c1 != '=' || (lwsp_buf[lwsp_count-1] != SPACE && lwsp_buf[lwsp_count-1] != TAB))) {
- i_ungetc(c1,f);
- for(lwsp_count--;lwsp_count>0;lwsp_count--)
- i_ungetc(lwsp_buf[lwsp_count],f);
- c1 = lwsp_buf[0];
- }
- free(lwsp_buf);
- return c1;
- }
-mime_c3_retry:
- if ((c3 = (*i_mgetc)(f))<=' ') {
- if (c3==EOF)
- return (EOF);
- if (mime_f != STRICT_MIME) goto mime_c3_retry;
- if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
- return c3;
- }
-mime_c4_retry:
- if ((c4 = (*i_mgetc)(f))<=' ') {
- if (c4==EOF)
- return (EOF);
- if (mime_f != STRICT_MIME) goto mime_c4_retry;
- if (mimebuf_f!=FIXED_MIME) input_mode = ASCII;
- return c4;
- }
-
- mime_decode_mode = mode; /* still in MIME sigh... */
-
- /* BASE 64 decoding */
-
- t1 = 0x3f & base64decode(c1);
- t2 = 0x3f & base64decode(c2);
- t3 = 0x3f & base64decode(c3);
- t4 = 0x3f & base64decode(c4);
- cc = ((t1 << 2) & 0x0fc) | ((t2 >> 4) & 0x03);
- if (c2 != '=') {
- Fifo(mime_last++) = (unsigned char)cc;
- cc = ((t2 << 4) & 0x0f0) | ((t3 >> 2) & 0x0f);
- if (c3 != '=') {
- Fifo(mime_last++) = (unsigned char)cc;
- cc = ((t3 << 6) & 0x0c0) | (t4 & 0x3f);
- if (c4 != '=')
- Fifo(mime_last++) = (unsigned char)cc;
- }
- } else {
- return c1;
- }
- return Fifo(mime_top++);
-}
-
-nkf_char mime_ungetc(nkf_char c, FILE *f)
-{
- Fifo(--mime_top) = (unsigned char)c;
- return c;
-}
-
-nkf_char mime_integrity(FILE *f, const unsigned char *p)
-{
- nkf_char c,d;
- unsigned int q;
- /* In buffered mode, read until =? or NL or buffer full
- */
- mime_input = mime_top;
- mime_last = mime_top;
-
- while(*p) Fifo(mime_input++) = *p++;
- d = 0;
- q = mime_input;
- while((c=(*i_getc)(f))!=EOF) {
- if (((mime_input-mime_top)&MIME_BUF_MASK)==0) {
- break; /* buffer full */
- }
- if (c=='=' && d=='?') {
- /* checked. skip header, start decode */
- Fifo(mime_input++) = (unsigned char)c;
- /* mime_last_input = mime_input; */
- mime_input = q;
- switch_mime_getc();
- return 1;
- }
- if (!( (c=='+'||c=='/'|| c=='=' || c=='?' || is_alnum(c))))
- break;
- /* Should we check length mod 4? */
- Fifo(mime_input++) = (unsigned char)c;
- d=c;
- }
- /* In case of Incomplete MIME, no MIME decode */
- Fifo(mime_input++) = (unsigned char)c;
- mime_last = mime_input; /* point undecoded buffer */
- mime_decode_mode = 1; /* no decode on Fifo last in mime_getc */
- switch_mime_getc(); /* anyway we need buffered getc */
- return 1;
-}
-
-nkf_char base64decode(nkf_char c)
-{
- int i;
- if (c > '@') {
- if (c < '[') {
- i = c - 'A'; /* A..Z 0-25 */
- } else {
- i = c - 'G' /* - 'a' + 26 */ ; /* a..z 26-51 */
- }
- } else if (c > '/') {
- i = c - '0' + '4' /* - '0' + 52 */ ; /* 0..9 52-61 */
- } else if (c == '+') {
- i = '>' /* 62 */ ; /* + 62 */
- } else {
- i = '?' /* 63 */ ; /* / 63 */
- }
- return (i);
-}
-
-static const char basis_64[] =
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static nkf_char b64c;
-#define MIMEOUT_BUF_LENGTH (60)
-char mimeout_buf[MIMEOUT_BUF_LENGTH+1];
-int mimeout_buf_count = 0;
-int mimeout_preserve_space = 0;
-#define itoh4(c) (c>=10?c+'A'-10:c+'0')
-
-void open_mime(nkf_char mode)
-{
- const unsigned char *p;
- int i;
- int j;
- p = mime_pattern[0];
- for(i=0;mime_encode[i];i++) {
- if (mode == mime_encode[i]) {
- p = mime_pattern[i];
- break;
- }
- }
- mimeout_mode = mime_encode_method[i];
-
- i = 0;
- if (base64_count>45) {
- if (mimeout_buf_count>0 && nkf_isblank(mimeout_buf[i])){
- (*o_mputc)(mimeout_buf[i]);
- i++;
- }
- (*o_mputc)(NL);
- (*o_mputc)(SPACE);
- base64_count = 1;
- if (!mimeout_preserve_space && mimeout_buf_count>0
- && (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
- || mimeout_buf[i]==CR || mimeout_buf[i]==NL )) {
- i++;
- }
- }
- if (!mimeout_preserve_space) {
- for (;i<mimeout_buf_count;i++) {
- if (mimeout_buf[i]==SPACE || mimeout_buf[i]==TAB
- || mimeout_buf[i]==CR || mimeout_buf[i]==NL ) {
- (*o_mputc)(mimeout_buf[i]);
- base64_count ++;
- } else {
- break;
- }
- }
- }
- mimeout_preserve_space = FALSE;
-
- while(*p) {
- (*o_mputc)(*p++);
- base64_count ++;
- }
- j = mimeout_buf_count;
- mimeout_buf_count = 0;
- for (;i<j;i++) {
- mime_putc(mimeout_buf[i]);
- }
-}
-
-void close_mime(void)
-{
- (*o_mputc)('?');
- (*o_mputc)('=');
- base64_count += 2;
- mimeout_mode = 0;
-}
-
-void eof_mime(void)
-{
- switch(mimeout_mode) {
- case 'Q':
- case 'B':
- break;
- case 2:
- (*o_mputc)(basis_64[((b64c & 0x3)<< 4)]);
- (*o_mputc)('=');
- (*o_mputc)('=');
- base64_count += 3;
- break;
- case 1:
- (*o_mputc)(basis_64[((b64c & 0xF) << 2)]);
- (*o_mputc)('=');
- base64_count += 2;
- break;
- }
- if (mimeout_mode) {
- if (mimeout_f!=FIXED_MIME) {
- close_mime();
- } else if (mimeout_mode != 'Q')
- mimeout_mode = 'B';
- }
-}
-
-void mimeout_addchar(nkf_char c)
-{
- switch(mimeout_mode) {
- case 'Q':
- if (c==CR||c==NL) {
- (*o_mputc)(c);
- base64_count = 0;
- } else if(!nkf_isalnum(c)) {
- (*o_mputc)('=');
- (*o_mputc)(itoh4(((c>>4)&0xf)));
- (*o_mputc)(itoh4((c&0xf)));
- base64_count += 3;
- } else {
- (*o_mputc)(c);
- base64_count++;
- }
- break;
- case 'B':
- b64c=c;
- (*o_mputc)(basis_64[c>>2]);
- mimeout_mode=2;
- base64_count ++;
- break;
- case 2:
- (*o_mputc)(basis_64[((b64c & 0x3)<< 4) | ((c & 0xF0) >> 4)]);
- b64c=c;
- mimeout_mode=1;
- base64_count ++;
- break;
- case 1:
- (*o_mputc)(basis_64[((b64c & 0xF) << 2) | ((c & 0xC0) >>6)]);
- (*o_mputc)(basis_64[c & 0x3F]);
- mimeout_mode='B';
- base64_count += 2;
- break;
- default:
- (*o_mputc)(c);
- base64_count++;
- break;
- }
-}
-
-nkf_char mime_lastchar2, mime_lastchar1;
-
-void mime_prechar(nkf_char c2, nkf_char c1)
-{
- if (mimeout_mode){
- if (c2){
- if (base64_count + mimeout_buf_count/3*4> 66){
- (*o_base64conv)(EOF,0);
- (*o_base64conv)(0,NL);
- (*o_base64conv)(0,SPACE);
- }
- }/*else if (mime_lastchar2){
- if (c1 <=DEL && !nkf_isspace(c1)){
- (*o_base64conv)(0,SPACE);
- }
- }*/
- }/*else{
- if (c2 && mime_lastchar2 == 0
- && mime_lastchar1 && !nkf_isspace(mime_lastchar1)){
- (*o_base64conv)(0,SPACE);
- }
- }*/
- mime_lastchar2 = c2;
- mime_lastchar1 = c1;
-}
-
-void mime_putc(nkf_char c)
-{
- int i, j;
- nkf_char lastchar;
-
- if (mimeout_f == FIXED_MIME){
- if (mimeout_mode == 'Q'){
- if (base64_count > 71){
- if (c!=CR && c!=NL) {
- (*o_mputc)('=');
- (*o_mputc)(NL);
- }
- base64_count = 0;
- }
- }else{
- if (base64_count > 71){
- eof_mime();
- (*o_mputc)(NL);
- base64_count = 0;
- }
- if (c == EOF) { /* c==EOF */
- eof_mime();
- }
- }
- if (c != EOF) { /* c==EOF */
- mimeout_addchar(c);
- }
- return;
- }
-
- /* mimeout_f != FIXED_MIME */
-
- if (c == EOF) { /* c==EOF */
- j = mimeout_buf_count;
- mimeout_buf_count = 0;
- i = 0;
- if (mimeout_mode) {
- for (;i<j;i++) {
- if (nkf_isspace(mimeout_buf[i]) && base64_count < 71){
- break;
- }
- mimeout_addchar(mimeout_buf[i]);
- }
- eof_mime();
- for (;i<j;i++) {
- mimeout_addchar(mimeout_buf[i]);
- }
- } else {
- for (;i<j;i++) {
- mimeout_addchar(mimeout_buf[i]);
- }
- }
- return;
- }
-
- if (mimeout_mode=='Q') {
- if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
- if (c <= SPACE) {
- close_mime();
- (*o_mputc)(SPACE);
- base64_count++;
- }
- (*o_mputc)(c);
- base64_count++;
- }
- return;
- }
-
- if (mimeout_buf_count > 0){
- lastchar = mimeout_buf[mimeout_buf_count - 1];
- }else{
- lastchar = -1;
- }
-
- if (!mimeout_mode) {
- if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1)) {
- if (nkf_isspace(c)) {
- if (c==CR || c==NL) {
- base64_count=0;
- }
- for (i=0;i<mimeout_buf_count;i++) {
- (*o_mputc)(mimeout_buf[i]);
- if (mimeout_buf[i] == CR || mimeout_buf[i] == NL){
- base64_count = 0;
- }else{
- base64_count++;
- }
- }
- mimeout_buf[0] = (char)c;
- mimeout_buf_count = 1;
- }else{
- if (base64_count > 1
- && base64_count + mimeout_buf_count > 76){
- (*o_mputc)(NL);
- base64_count = 0;
- if (!nkf_isspace(mimeout_buf[0])){
- (*o_mputc)(SPACE);
- base64_count++;
- }
- }
- mimeout_buf[mimeout_buf_count++] = (char)c;
- if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
- open_mime(output_mode);
- }
- }
- return;
- }else{
- if (lastchar==CR || lastchar == NL){
- for (i=0;i<mimeout_buf_count;i++) {
- (*o_mputc)(mimeout_buf[i]);
- }
- base64_count = 0;
- mimeout_buf_count = 0;
- }
- if (lastchar==SPACE) {
- for (i=0;i<mimeout_buf_count-1;i++) {
- (*o_mputc)(mimeout_buf[i]);
- base64_count++;
- }
- mimeout_buf[0] = SPACE;
- mimeout_buf_count = 1;
- }
- open_mime(output_mode);
- }
- }else{
- /* mimeout_mode == 'B', 1, 2 */
- if ( c<=DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
- if (lastchar == CR || lastchar == NL){
- if (nkf_isblank(c)) {
- for (i=0;i<mimeout_buf_count;i++) {
- mimeout_addchar(mimeout_buf[i]);
- }
- mimeout_buf_count = 0;
- } else if (SPACE<c && c<DEL) {
- eof_mime();
- for (i=0;i<mimeout_buf_count;i++) {
- (*o_mputc)(mimeout_buf[i]);
- }
- base64_count = 0;
- mimeout_buf_count = 0;
- }
- }
- if (c==SPACE || c==TAB || c==CR || c==NL) {
- for (i=0;i<mimeout_buf_count;i++) {
- if (SPACE<mimeout_buf[i] && mimeout_buf[i]<DEL) {
- eof_mime();
- for (i=0;i<mimeout_buf_count;i++) {
- (*o_mputc)(mimeout_buf[i]);
- base64_count++;
- }
- mimeout_buf_count = 0;
- }
- }
- mimeout_buf[mimeout_buf_count++] = (char)c;
- if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
- eof_mime();
- for (i=0;i<mimeout_buf_count;i++) {
- (*o_mputc)(mimeout_buf[i]);
- base64_count++;
- }
- mimeout_buf_count = 0;
- }
- return;
- }
- if (mimeout_buf_count>0 && SPACE<c && c!='=') {
- mimeout_buf[mimeout_buf_count++] = (char)c;
- if (mimeout_buf_count>MIMEOUT_BUF_LENGTH) {
- j = mimeout_buf_count;
- mimeout_buf_count = 0;
- for (i=0;i<j;i++) {
- mimeout_addchar(mimeout_buf[i]);
- }
- }
- return;
- }
- }
- }
- if (mimeout_buf_count>0) {
- j = mimeout_buf_count;
- mimeout_buf_count = 0;
- for (i=0;i<j;i++) {
- if (mimeout_buf[i]==CR || mimeout_buf[i]==NL)
- break;
- mimeout_addchar(mimeout_buf[i]);
- }
- if (i<j) {
- eof_mime();
- base64_count=0;
- for (;i<j;i++) {
- (*o_mputc)(mimeout_buf[i]);
- }
- open_mime(output_mode);
- }
- }
- mimeout_addchar(c);
-}
-
-
-#if defined(PERL_XS) || defined(WIN32DLL)
-void reinit(void)
-{
- {
- struct input_code *p = input_code_list;
- while (p->name){
- status_reinit(p++);
- }
- }
- unbuf_f = FALSE;
- estab_f = FALSE;
- nop_f = FALSE;
- binmode_f = TRUE;
- rot_f = FALSE;
- hira_f = FALSE;
- input_f = FALSE;
- alpha_f = FALSE;
- mime_f = STRICT_MIME;
- mime_decode_f = FALSE;
- mimebuf_f = FALSE;
- broken_f = FALSE;
- iso8859_f = FALSE;
- mimeout_f = FALSE;
-#if defined(MSDOS) || defined(__OS2__)
- x0201_f = TRUE;
-#else
- x0201_f = NO_X0201;
-#endif
- iso2022jp_f = FALSE;
-#if defined(UTF8_INPUT_ENABLE) || defined(UTF8_OUTPUT_ENABLE)
- ms_ucs_map_f = UCS_MAP_ASCII;
-#endif
-#ifdef UTF8_INPUT_ENABLE
- no_cp932ext_f = FALSE;
- no_best_fit_chars_f = FALSE;
- encode_fallback = NULL;
- unicode_subchar = '?';
- input_endian = ENDIAN_BIG;
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- output_bom_f = FALSE;
- output_endian = ENDIAN_BIG;
-#endif
-#ifdef UNICODE_NORMALIZATION
- nfc_f = FALSE;
-#endif
-#ifdef INPUT_OPTION
- cap_f = FALSE;
- url_f = FALSE;
- numchar_f = FALSE;
-#endif
-#ifdef CHECK_OPTION
- noout_f = FALSE;
- debug_f = FALSE;
-#endif
- guess_f = FALSE;
- is_inputcode_mixed = FALSE;
- is_inputcode_set = FALSE;
-#ifdef EXEC_IO
- exec_f = 0;
-#endif
-#ifdef SHIFTJIS_CP932
- cp51932_f = TRUE;
- cp932inv_f = TRUE;
-#endif
-#ifdef X0212_ENABLE
- x0212_f = FALSE;
- x0213_f = FALSE;
-#endif
- {
- int i;
- for (i = 0; i < 256; i++){
- prefix_table[i] = 0;
- }
- }
- hold_count = 0;
- mimeout_buf_count = 0;
- mimeout_mode = 0;
- base64_count = 0;
- f_line = 0;
- f_prev = 0;
- fold_preserve_f = FALSE;
- fold_f = FALSE;
- fold_len = 0;
- kanji_intro = DEFAULT_J;
- ascii_intro = DEFAULT_R;
- fold_margin = FOLD_MARGIN;
- output_conv = DEFAULT_CONV;
- oconv = DEFAULT_CONV;
- o_zconv = no_connection;
- o_fconv = no_connection;
- o_crconv = no_connection;
- o_rot_conv = no_connection;
- o_hira_conv = no_connection;
- o_base64conv = no_connection;
- o_iso2022jp_check_conv = no_connection;
- o_putc = std_putc;
- i_getc = std_getc;
- i_ungetc = std_ungetc;
- i_bgetc = std_getc;
- i_bungetc = std_ungetc;
- o_mputc = std_putc;
- i_mgetc = std_getc;
- i_mungetc = std_ungetc;
- i_mgetc_buf = std_getc;
- i_mungetc_buf = std_ungetc;
- output_mode = ASCII;
- input_mode = ASCII;
- shift_mode = FALSE;
- mime_decode_mode = FALSE;
- file_out_f = FALSE;
- crmode_f = 0;
- option_mode = 0;
- broken_counter = 0;
- broken_last = 0;
- z_prev2=0,z_prev1=0;
-#ifdef CHECK_OPTION
- iconv_for_check = 0;
-#endif
- input_codename = "";
-#ifdef WIN32DLL
- reinitdll();
-#endif /*WIN32DLL*/
-}
-#endif
-
-void no_connection(nkf_char c2, nkf_char c1)
-{
- no_connection2(c2,c1,0);
-}
-
-nkf_char no_connection2(nkf_char c2, nkf_char c1, nkf_char c0)
-{
- fprintf(stderr,"nkf internal module connection failure.\n");
- exit(1);
- return 0; /* LINT */
-}
-
-#ifndef PERL_XS
-#ifdef WIN32DLL
-#define fprintf dllprintf
-#endif
-void usage(void)
-{
- fprintf(stderr,"USAGE: nkf(nkf32,wnkf,nkf2) -[flags] [in file] .. [out file for -O flag]\n");
- fprintf(stderr,"Flags:\n");
- fprintf(stderr,"b,u Output is buffered (DEFAULT),Output is unbuffered\n");
-#ifdef DEFAULT_CODE_SJIS
- fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift_JIS (DEFAULT), EUC-JP, UTF-8N\n");
-#endif
-#ifdef DEFAULT_CODE_JIS
- fprintf(stderr,"j,s,e,w Output code is JIS 7 bit (DEFAULT), Shift JIS, EUC-JP, UTF-8N\n");
-#endif
-#ifdef DEFAULT_CODE_EUC
- fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift JIS, EUC-JP (DEFAULT), UTF-8N\n");
-#endif
-#ifdef DEFAULT_CODE_UTF8
- fprintf(stderr,"j,s,e,w Output code is JIS 7 bit, Shift JIS, EUC-JP, UTF-8N (DEFAULT)\n");
-#endif
-#ifdef UTF8_OUTPUT_ENABLE
- fprintf(stderr," After 'w' you can add more options. -w[ 8 [0], 16 [[BL] [0]] ]\n");
-#endif
- fprintf(stderr,"J,S,E,W Input assumption is JIS 7 bit , Shift JIS, EUC-JP, UTF-8\n");
-#ifdef UTF8_INPUT_ENABLE
- fprintf(stderr," After 'W' you can add more options. -W[ 8, 16 [BL] ] \n");
-#endif
- fprintf(stderr,"t no conversion\n");
- fprintf(stderr,"i[@B] Specify the Esc Seq for JIS X 0208-1978/83 (DEFAULT B)\n");
- fprintf(stderr,"o[BJH] Specify the Esc Seq for ASCII/Roman (DEFAULT B)\n");
- fprintf(stderr,"r {de/en}crypt ROT13/47\n");
- fprintf(stderr,"h 1 katakana->hiragana, 2 hiragana->katakana, 3 both\n");
- fprintf(stderr,"v Show this usage. V: show version\n");
- fprintf(stderr,"m[BQN0] MIME decode [B:base64,Q:quoted,N:non-strict,0:no decode]\n");
- fprintf(stderr,"M[BQ] MIME encode [B:base64 Q:quoted]\n");
- fprintf(stderr,"l ISO8859-1 (Latin-1) support\n");
- fprintf(stderr,"f/F Folding: -f60 or -f or -f60-10 (fold margin 10) F preserve nl\n");
- fprintf(stderr,"Z[0-3] Convert X0208 alphabet to ASCII\n");
- fprintf(stderr," 1: Kankaku to 1 space 2: to 2 spaces 3: Convert to HTML Entity\n");
- fprintf(stderr,"X,x Assume X0201 kana in MS-Kanji, -x preserves X0201\n");
- fprintf(stderr,"B[0-2] Broken input 0: missing ESC,1: any X on ESC-[($]-X,2: ASCII on NL\n");
-#ifdef MSDOS
- fprintf(stderr,"T Text mode output\n");
-#endif
- fprintf(stderr,"O Output to File (DEFAULT 'nkf.out')\n");
- fprintf(stderr,"I Convert non ISO-2022-JP charactor to GETA\n");
- fprintf(stderr,"d,c Convert line breaks -d: LF -c: CRLF\n");
- fprintf(stderr,"-L[uwm] line mode u:LF w:CRLF m:CR (DEFAULT noconversion)\n");
- fprintf(stderr,"\n");
- fprintf(stderr,"Long name options\n");
- fprintf(stderr," --ic=<input codeset> --oc=<output codeset>\n");
- fprintf(stderr," Specify the input or output codeset\n");
- fprintf(stderr," --fj --unix --mac --windows\n");
- fprintf(stderr," --jis --euc --sjis --utf8 --utf16 --mime --base64\n");
- fprintf(stderr," Convert for the system or code\n");
- fprintf(stderr," --hiragana --katakana --katakana-hiragana\n");
- fprintf(stderr," To Hiragana/Katakana Conversion\n");
- fprintf(stderr," --prefix= Insert escape before troublesome characters of Shift_JIS\n");
-#ifdef INPUT_OPTION
- fprintf(stderr," --cap-input, --url-input Convert hex after ':' or '%%'\n");
-#endif
-#ifdef NUMCHAR_OPTION
- fprintf(stderr," --numchar-input Convert Unicode Character Reference\n");
-#endif
-#ifdef UTF8_INPUT_ENABLE
- fprintf(stderr," --fb-{skip, html, xml, perl, java, subchar}\n");
- fprintf(stderr," Specify how nkf handles unassigned characters\n");
-#endif
-#ifdef OVERWRITE
- fprintf(stderr," --in-place[=SUFFIX] --overwrite[=SUFFIX]\n");
- fprintf(stderr," Overwrite original listed files by filtered result\n");
- fprintf(stderr," --overwrite preserves timestamp of original files\n");
-#endif
- fprintf(stderr," -g --guess Guess the input code\n");
- fprintf(stderr," --help --version Show this help/the version\n");
- fprintf(stderr," For more information, see also man nkf\n");
- fprintf(stderr,"\n");
- version();
-}
-
-void version(void)
-{
- fprintf(stderr,"Network Kanji Filter Version %s (%s) "
-#if defined(MSDOS) && !defined(__WIN32__) && !defined(__WIN16__) && !defined(__OS2__)
- "for DOS"
-#endif
-#if defined(MSDOS) && defined(__WIN16__)
- "for Win16"
-#endif
-#if defined(MSDOS) && defined(__WIN32__)
- "for Win32"
-#endif
-#ifdef __OS2__
- "for OS/2"
-#endif
- ,NKF_VERSION,NKF_RELEASE_DATE);
- fprintf(stderr,"\n%s\n",CopyRight);
-}
-#endif /*PERL_XS*/
-
-/**
- ** パッチ制作鹿粡寂蝟赱齠洲粤讌将濶篝辣鳫鞳跂蛛粤鶤闥瘠痰搶竏薊鹿粡寂蝟赱齠洲粤讌将苗令陌鉗粤千笂癇甅祟褓鹿粡寂蝟赱齠洲粤讌将蔗畧齟祟鱸竢莅竢蝟昭粡竚癈鷭т繻Ь蜴阨續栴谺鉞覡闥闕陌侮阨紿鹿粡寂蝟赱齠洲粤讌将蜥蘋頤踈纈蜴鬯褓壹謇蜥蝎瘢瓸鹿粡寂蝟赱齠洲粤讌将蜊蛻蜍噤踉雌癆鐇黶蛹闍祟褓鹿粡寂蝟赱齠洲粤讌将煖閻宣閻閧甌謠葹轣謇蓍謠閻蝟昭粡竚癈鷭т繻Ь謠鈿千絎鴒祟褓嚠蜴裼闔鍠鹿粡寂蝟赱齠洲粤讌将版旭恭契鉗胄黼鴟絎闥蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鈔蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎纔鉉罸鉉罩羝侯碎諞諞遣羝谺禺碣粤跂肅跂閼碓斡幹錫鬲冗鈔纔干痲亀割峡旭旭旭旭絢碣甎釈鱚羹Н鴣磔蜚鱚絲纔鉉罸鉉罩羝侯碎粋叙円襟岸頏纐蜈逅脂篏倶絛芦痳害瘋幹嘘飢拘咳繙宴姥蔚盖幹騎盥蚊Ь纔鉉罸鉉罩羝侯碎鹿畩錫鬲娼粤銛跛鹿粡寂蝟赱齠洲蔘鉉Ь誓卯元旭穐誓鹿粡寂蝟赱齠洲粤讌将i釿跿粤竢鈕蜃⊆蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤孕童瀟孕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮越蝟昭粡竚癈鷭т繻Ь因外旭因外葦因外芦因篤庵因篤暗因外涜因篤荏蝟昭粡竚癈鷭т繻Ь因篤餌因篤影因篤葦因外溝因外甲因旭卒因篤完因旭糎蝟昭粡竚癈鷭т繻Ь因篤嚇因屋嚇因篤各因外督因外禿因外皇因外硬因外鯵蝟昭粡竚癈鷭т繻Ь因甘陳因外圧因外斡因外扱因外特因屋唄因屋碓因篤案蝟昭粡竚癈鷭т繻Ь因篤鈎因外叡因屋蔚因篤誼因屋俺因屋乙因屋姥因屋厩蝟昭粡竚癈鷭т繻Ь因屋叡因屋営因篤宛因篤姐因外唄因外欝因篤蛎因篤劃蝟昭粡竚癈鷭т繻Ь因篤蟻因篤議因外宛因外姐因外袷因外安因外庵因外按蝟昭粡竚癈鷭т繻Ь因外暗因外案因外碓因外臼因篤安因臆渦因旭賊因旭跳蝟昭粡竚癈鷭т繻Ь因旭瞳因篤営因臆彊因篤叡因篤嬰因臆橋因臆況因臆嬰蝟昭粡竚癈鷭т繻Ь因臆慨因俺寛因俺完因旭属因屋害因屋崖因憶鯵因旭禅蝟昭粡竚癈鷭т繻Ь因篤梓因旭漸因旭然因篤圧因篤鯵因篤斡因篤袷因篤屋蝟昭粡竚癈鷭т繻Ь因旭膳因俺斡因俺圧因乙誕因乙弾因乙壇因乙歎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь莱竰闢閹嫦浴韶蜴衷逅癆蛯跂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互善熏黝蝟昭粡竚癈鷭т繻Ь因外旭因外葦因外芦因篤庵因篤暗因外涜因篤荏蝟昭粡竚癈鷭т繻Ь因篤餌因篤影因篤葦因外溝因外甲因旭卒因篤完因旭糎蝟昭粡竚癈鷭т繻Ь因篤嚇因篤迭因篤各因外督因外禿因外皇因外硬因外鯵蝟昭粡竚癈鷭т繻Ь因甘陳因外圧因外斡因外扱因外特因屋欝因屋碓因篤案蝟昭粡竚癈鷭т繻Ь因篤鈎因篤掬因臆乙因篤誼因屋俺因屋乙因屋姥因屋厩蝟昭粡竚癈鷭т繻Ь因屋叡因屋営因篤宛因篤姐因外唄因外欝因篤蛎因篤劃蝟昭粡竚癈鷭т繻Ь因篤蟻因篤議因外宛因外姐因外袷因外安因外庵因外按蝟昭粡竚癈鷭т繻Ь因外暗因外案因外碓因外臼因篤安因篤按因旭賊因旭跳蝟昭粡竚癈鷭т繻Ь因旭瞳因篤営因臆彊因篤叡因篤嬰因臆橋因臆況因臆嬰蝟昭粡竚癈鷭т繻Ь因臆慨因俺寛因俺完因旭属因屋害因屋崖因憶鯵因篤典蝟昭粡竚癈鷭т繻Ь因篤梓因篤徹因篤撤因篤圧因篤鯵因篤斡因篤袷因篤屋蝟昭粡竚癈鷭т繻Ь因旭膳因俺斡因俺圧因乙誕因乙弾因乙壇因乙歎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互漸桍鹿粡寂蝟赱齠洲粤讌将誼喬義卯義穐蟻階蟻岡蟻潮蟻狸鹿粡寂蝟赱齠洲粤讌将鯵測葦岡厩岡厩穐厩卯厩階葦階穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐屋謙屋測恩喬恩桑恩岡恩階鹿粡寂蝟赱齠洲粤讌将臆銭臆幸穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐臆桑臆謙袷狸営岡営巻屋穐鹿粡寂蝟赱齠洲粤讌将屋階穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐臆穐価規咳岡屋岡鹿粡寂蝟赱齠洲粤讌将屋桑俺卯乙岡俺銭俺測憶銭桶潮憶潮鹿粡寂蝟赱齠洲粤讌将桶規臆測臆狸穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐渦測鯵穐橋頭橋潮橋銭芦穐鹿粡寂蝟赱齠洲粤讌将芦卯安喬穐穐穐穐掬頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜒鳫齒胄池瘰韈鈑闕鞜碎鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮貨逑桍鹿粡寂蝟赱齠洲粤讌将誼喬義卯義穐蟻階蟻岡蟻潮蟻狸鹿粡寂蝟赱齠洲粤讌将鯵測葦岡厩岡厩穐厩卯厩階葦階穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐屋謙屋測恩喬恩桑恩岡恩階鹿粡寂蝟赱齠洲粤讌将臆銭臆幸穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐臆桑臆謙禿岡営岡営巻屋穐鹿粡寂蝟赱齠洲粤讌将屋階穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐臆穐価規咳岡屋岡鹿粡寂蝟赱齠洲粤讌将屋桑俺卯乙岡俺銭俺測憶銭桶潮憶潮鹿粡寂蝟赱齠洲粤讌将桶規臆測臆狸穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐渦測鯵穐橋頭橋潮橋銭芦穐鹿粡寂蝟赱齠洲粤讌将芦卯安喬穐穐穐穐掬頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮額蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因篤碓因篤臼因篤渦因篤嘘因篤唄因篤欝因篤蔚因篤鰻蝟昭粡竚癈鷭т繻Ь因篤姥因篤厩蝟昭粡竚癈鷭т繻Ь因篤憶因篤臆因篤桶因篤牡因篤乙因篤俺因篤卸蝟昭粡竚癈鷭т繻Ь因篤恩因篤温因篤価因篤佳因篤加因篤可因篤嘉因篤夏蝟昭粡竚癈鷭т繻Ь因篤外因篤咳因篤害因篤崖因篤慨因篤概因篤涯因篤碍蝟昭粡竚癈鷭т繻Ь因篤蓋因篤街因篤柿蝟昭粡竚癈鷭т繻Ь因篤官因篤寛因篤干因篤幹因篤患因篤感因篤慣蝟昭粡竚癈鷭т繻Ь因篤憾因篤換因篤漢因篤澗因篤潅因篤環因篤甘因篤監蝟昭粡竚癈鷭т繻Ь因篤軌因篤輝因篤飢因篤騎因篤鬼因篤亀因篤偽因篤儀蝟昭粡竚癈鷭т繻Ь因篤妓因篤宜因篤義蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互全桍鹿粡寂蝟赱齠洲粤讌将梓卯梓岡梓階梓巻梓規梓喬梓桑鹿粡寂蝟赱齠洲粤讌将梓謙梓幸梓銭梓測梓狸梓潮梓適梓頭鹿粡寂蝟赱齠洲粤讌将圧穐圧卯圧岡圧階圧巻圧規圧喬圧桑鹿粡寂蝟赱齠洲粤讌将圧謙圧幸圧銭圧測圧狸圧潮圧適圧頭鹿粡寂蝟赱齠洲粤讌将斡穐斡卯斡岡斡階斡巻斡規斡喬斡桑鹿粡寂蝟赱齠洲粤讌将斡謙斡幸斡銭斡測斡狸斡潮斡適斡頭鹿粡寂蝟赱齠洲粤讌将扱穐扱卯扱岡扱階扱巻扱規扱喬扱桑鹿粡寂蝟赱齠洲粤讌将扱謙扱幸扱銭扱測扱狸扱潮扱適扱頭鹿粡寂蝟赱齠洲粤讌将宛穐宛卯宛岡宛階宛巻宛規宛喬宛桑鹿粡寂蝟赱齠洲粤讌将宛謙宛幸宛銭宛測宛狸宛潮宛適宛頭鹿粡寂蝟赱齠洲粤讌将姐穐姐卯姐岡姐階穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮吸蝟昭粡竚癈鷭т繻Ь因外善因外漸因外然因外全因外禅因外繕因外膳蝟昭粡竚癈鷭т繻Ь因外糎因外噌因外疏因外疎因外礎因外祖因外租因外粗蝟昭粡竚癈鷭т繻Ь因外属因外賊因外族因外続因外卒因外袖因外其因外揃蝟昭粡竚癈鷭т繻Ь因外存因外孫因外汰因外詑因外唾因外堕因外妥因外惰蝟昭粡竚癈鷭т繻Ь因外丹因外単因外嘆因外坦因外担因外探因外旦因外歎蝟昭粡竚癈鷭т繻Ь因外淡因外湛因外蛋因外誕因外鍛因外団因外壇因外弾蝟昭粡竚癈鷭т繻Ь因外聴因外脹因外腸因外蝶因外調因外諜因外超因外跳蝟昭粡竚癈鷭т繻Ь因外銚因外長因外珍因外賃因外鎮因外陳因外津因外墜蝟昭粡竚癈鷭т繻Ь因外徹因外撤因外轍因外迭因外鉄因外典因外填因外天蝟昭粡竚癈鷭т繻Ь因外展因外店因外伝因外殿因外澱因外田因外電因外兎蝟昭粡竚癈鷭т繻Ь因外動因外同因外堂因外導因外憧因外撞因外洞蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互繕桍鹿粡寂蝟赱齠洲粤讌将街卯街岡街階街巻街規街喬街桑鹿粡寂蝟赱齠洲粤讌将街謙街幸街銭街測街狸街潮街適街頭鹿粡寂蝟赱齠洲粤讌将柿穐柿卯柿階柿巻柿規柿喬柿桑柿謙鹿粡寂蝟赱齠洲粤讌将柿幸穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐蛎卯蛎岡蛎階蛎巻蛎規蛎喬蛎桑鹿粡寂蝟赱齠洲粤讌将蛎謙蛎幸蛎銭蛎測蛎狸蛎潮蛎適蛎頭鹿粡寂蝟赱齠洲粤讌将鈎穐鈎卯鈎階鈎巻鈎規鈎喬鈎桑鈎謙鹿粡寂蝟赱齠洲粤讌将鈎幸穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮頚蝟昭粡竚癈鷭т繻Ь因梓碓因梓臼因梓渦因梓嘘因梓唄因梓欝因梓葦蝟昭粡竚癈鷭т繻Ь因梓蔚因梓鰻因梓姥因梓厩因梓荏因梓餌因梓叡因梓営蝟昭粡竚癈鷭т繻Ь因梓嬰因梓影因梓屋因梓憶因梓臆因梓桶因梓牡因梓乙蝟昭粡竚癈鷭т繻Ь因梓俺因梓卸因梓恩因梓温因梓価因梓佳因梓加因梓可蝟昭粡竚癈鷭т繻Ь因梓嘉因梓夏蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因梓外因梓咳因梓害因梓崖因梓慨因梓概因梓輝蝟昭粡竚癈鷭т繻Ь因梓涯因梓碍因梓蓋因梓街因梓柿因梓蛎因梓鈎因梓劃蝟昭粡竚癈鷭т繻Ь因梓嚇因梓各因梓完因梓官因梓寛因梓干因梓幹因梓患蝟昭粡竚癈鷭т繻Ь因梓感因梓慣因梓憾因梓換因梓漢因梓澗因梓潅因梓環蝟昭粡竚癈鷭т繻Ь因梓甘因梓監蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互糎桍鹿粡寂蝟赱齠洲粤讌将軌穐軌岡軌狸輝穐輝謙輝巻輝狸鹿粡寂蝟赱齠洲粤讌将飢狸飢巻騎巻騎狸軌卯軌階軌頭輝階鹿粡寂蝟赱齠洲粤讌将輝測輝桑飢階騎階飢測騎測鬼測飢穐鹿粡寂蝟赱齠洲粤讌将飢頭飢謙騎桑騎頭輝潮騎穐飢規騎謙鹿粡寂蝟赱齠洲粤讌将鬼岡穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮鉱蝟昭粡竚癈鷭т繻Ь因牡彊因牡怯因牡恐因牡恭因牡挟因牡教因牡橋蝟昭粡竚癈鷭т繻Ь因牡況因牡狂因牡狭因牡響因牡饗因牡驚因牡仰因牡凝蝟昭粡竚癈鷭т繻Ь因牡尭因牡薫因牡訓因牡群因牡軍蝟昭粡竚癈鷭т繻Ь因牡郡蝟昭粡竚癈鷭т繻Ь因牡卦因牡袈因牡祁因牡係因牡傾因牡形因牡径因牡恵蝟昭粡竚癈鷭т繻Ь因牡慶因牡慧因牡憩因牡鍵因牡険因牡顕因牡験因牡鹸蝟昭粡竚癈鷭т繻Ь因牡元因牡原因牡厳蝟昭粡竚癈鷭т繻Ь因卸袈因卸祁因卸係蝟昭粡竚癈鷭т繻Ь因卸傾因卸形因卸径因卸恵因卸慶因卸慧蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因牡幻因牡弦因牡諺因牡限因牡乎因牡個蝟昭粡竚癈鷭т繻Ь因牡古因牡呼因牡弘蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互疏桍鹿粡寂蝟赱齠洲粤讌将蔚穐蔚卯蔚岡蔚階蔚巻蔚規蔚喬鹿粡寂蝟赱齠洲粤讌将蔚桑蔚謙蔚幸蔚銭蔚測穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐鰻穐鰻卯鰻岡鹿粡寂蝟赱齠洲粤讌将鰻階鰻巻鰻規鰻喬鰻桑鰻謙鰻幸鰻銭鹿粡寂蝟赱齠洲粤讌将鰻測穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐換狸換潮換適鹿粡寂蝟赱齠洲粤讌将換頭漢穐漢卯漢岡漢階漢巻漢規漢喬鹿粡寂蝟赱齠洲粤讌将漢桑漢謙漢幸漢銭漢測漢狸漢潮漢適鹿粡寂蝟赱齠洲粤讌将漢頭澗穐澗卯澗岡澗階澗巻澗規穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮胎蝟昭粡竚癈鷭т繻Ь因崖甲因崖稿因崖皇因崖前因崖全因崖善蝟昭粡竚癈鷭т繻Ь因崖禅因崖硬因崖漸因崖古因崖呼因崖担因崖攻蝟昭粡竚癈鷭т繻Ь因崖昂因憶嘘因崖晃因崖続因崖族因崖賊因崖属因憶姐蝟昭粡竚癈鷭т繻Ь因崖調因崖誕因崖弘因崖元因崖原因崖厳蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憶蔚因崖団因憶憶蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互礎桍鹿粡寂蝟赱齠洲粤讌将橋巻橋桑橋卯橋岡橋穐橋階橋規鹿粡寂蝟赱齠洲粤讌将橋喬穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐芦穐彊適旭巻鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐怯適怯狸怯潮怯頭叡喬叡巻叡規鹿粡寂蝟赱齠洲粤讌将穐嬰謙嬰喬嬰桑嬰幸穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮壷蝟昭粡竚癈鷭т繻Ь因牡彊因牡怯因牡恐因牡恭因牡挟因牡教因牡橋蝟昭粡竚癈鷭т繻Ь因牡況因牡狂因牡狭因牡響因牡饗因牡驚因牡仰因牡凝蝟昭粡竚癈鷭т繻Ь因牡尭因牡薫因牡訓因牡群因牡軍因憶彊因憶怯因憶恐蝟昭粡竚癈鷭т繻Ь因憶恭因憶挟因憶教因憶橋因憶況因憶狂因憶狭蝟昭粡竚癈鷭т繻Ь因崖換因崖唄因崖臆因崖環因崖姥因崖卸因崖鯵因崖涯蝟昭粡竚癈鷭т繻Ь因崖輝因崖儀因崖按因崖俺因崖桶因崖佳因崖漢因崖蛎蝟昭粡竚癈鷭т繻Ь因崖甲因崖皇因崖硬因崖古因崖呼因崖担因崖善蝟昭粡竚癈鷭т繻Ь因崖径蝟昭粡竚癈鷭т繻Ь因外営因外影因憶蔚因崖団因憶憶因害全因害禅因害繕蝟昭粡竚癈鷭т繻Ь因害膳因害糎因害咳因害害因害街因崖慧因崖慶因崖恵蝟昭粡竚癈鷭т繻Ь因臆飢因臆怯因臆佳因臆嘉因臆臼因臆荏因臆禅因臆屋蝟昭粡竚癈鷭т繻Ь因臆影因臆惰因臆概因臆温因臆価因害更蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互租桍鹿粡寂蝟赱齠洲粤讌将慨幸害岡慨潮咳巻咳喬外規崖階鹿粡寂蝟赱齠洲粤讌将慨適外階崖喬咳謙咳規害桑概卯慨銭鹿粡寂蝟赱齠洲粤讌将崖幸概桑外潮慨岡害階害喬崖測害測鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐外穐鹿粡寂蝟赱齠洲粤讌将咳適害銭崖卯慨桑穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐碍適鹿粡寂蝟赱齠洲粤讌将碍潮碍狸碍測穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐碍頭穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濮遁蝟昭粡竚癈鷭т繻Ь因臆嘉因臆影因臆惰蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因外営因外影蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因外拘因外瞳因外童因外胴因外徳蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互属桍鹿粡寂蝟赱齠洲粤讌将店狸輝喬前階恭頭潅穐臼測害謙鹿粡寂蝟赱齠洲粤讌将稿喬芦岡慣規咳狸禅穐袷銭嚇卯轍規鹿粡寂蝟赱齠洲粤讌将掬潮感喬価喬惰規弦階群桑義卯卸卯鹿粡寂蝟赱齠洲粤讌将孫測皇穐況測呼巻超岡賃適存適憶喬鹿粡寂蝟赱齠洲粤讌将湛頭限桑存幸殿規外幸狭桑鹸謙誼桑鹿粡寂蝟赱齠洲粤讌将係潮郡頭電規動銭憧潮胴潮梓幸尭岡鹿粡寂蝟赱齠洲粤讌将抗桑皇巻前卯丹幸按頭碓頭鰻穐怯階鹿粡寂蝟赱齠洲粤讌将弘規安銭鬼頭儀穐稿測珍潮津頭庵階鹿粡寂蝟赱齠洲粤讌将完適原階属岡圧規扱銭崖測店規伝規鹿粡寂蝟赱齠洲粤讌将慶頭安岡庵卯古頭徹穐呼卯伝岡鯵謙鹿粡寂蝟赱齠洲粤讌将然岡害謙恩測嘆頭唄卯碍穐澗潮甘卯鹿粡寂蝟赱齠洲粤讌将凝穐稿測同規呼岡津測暗巻飢潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛越蝟昭粡竚癈鷭т繻Ь因攻恐因攻薫因攻前因昂涜因鬼安因騎導因蟻厳蝟昭粡竚癈鷭т繻Ь因薫弾因憩堕因呼嘆因攻展因騎尭因皇誼因形汰因甘臼蝟昭粡竚癈鷭т繻Ь因係抗因険特因凝俺因偽姥因亀梓因饗営因元荏因甲蛎蝟昭粡竚癈鷭т繻Ь因宜典因騎噌因仰橋因郡鎮因控呼因偽寛因甘恒因弘澗蝟昭粡竚癈鷭т繻Ь因攻堂因験監因更庵因騎撤因亀其因蟻外因菊訓因橋屋蝟昭粡竚癈鷭т繻Ь因橋導因狂梓因驚蓋因驚導因仰温因郡蟻因袈淡因形甘蝟昭粡竚癈鷭т繻Ь因晃慨因顕同因幻蟻因諺彊因慌田因仰族因卦疎因袈蛋蝟昭粡竚癈鷭т繻Ь因更探因彊繕因限葦因個諺因控族因狭古因騎祖因輝原蝟昭粡竚癈鷭т繻Ь因儀渦因妓外因宜幹因蟻卒因掬洞因彊恩因恭噌因恭憧蝟昭粡竚癈鷭т繻Ь因驚惰因尭唄因薫古因訓唄因訓宜因訓諜因軍各因慧葦蝟昭粡竚癈鷭т繻Ь因顕袈因顕脹因元昂因弘彊因慌蟻因皇餌因妓狭因教唾蝟昭粡竚癈鷭т繻Ь因驚義因卦乙因輝胴因宜嘉因宜教因菊鍵因菊鎮蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互族桍鹿粡寂蝟赱齠洲粤讌将佳狸菊銭漸銭族桑詑巻蓋測特卯鹿粡寂蝟赱齠洲粤讌将控喬腸狸聴適澱巻蛋卯湛喬碍測碓巻鹿粡寂蝟赱齠洲粤讌将担測餌喬叡喬厳喬俺卯典幸篤銭碍謙鹿粡寂蝟赱齠洲粤讌将斡幸轍幸全頭憩階徹測咳喬電適撞規鹿粡寂蝟赱齠洲粤讌将導潮徳卯瞳階価穐嚇頭彊幸弘頭礎卯鹿粡寂蝟赱齠洲粤讌将詑喬妥卯皇卯狂桑傾狸径喬卒狸誕階鹿粡寂蝟赱齠洲粤讌将斡測鈎岡晃潮溝適然狸存桑佳卯可測鹿粡寂蝟赱齠洲粤讌将外巻碍桑嚇頭劃階袈喬疎岡恐幸蛋謙鹿粡寂蝟赱齠洲粤讌将禿喬梓適訓適狂銭特巻壇謙憶卯乙幸鹿粡寂蝟赱齠洲粤讌将騎測嬰規佳潮尭適鍛穐驚規恒階皇規鹿粡寂蝟赱齠洲粤讌将澱測同銭硬階仰適鹸銭乎銭兎測禿測鹿粡寂蝟赱齠洲粤讌将芦銭姐巻斡岡営穐憶岡可穐騎幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛額蝟昭粡竚癈鷭т繻Ь因溝官因橋橋因狂属因仰祁因薫薫因卦潅因袈原蝟昭粡竚癈鷭т繻Ь因慶卦因顕禅因厳胴因控限因攻古因乎皇因輝同因飢妥蝟昭粡竚癈鷭т繻Ь因宜蔚因鬼続因蟻続因議蔚因怯狂因狭顕因仰粗因係個蝟昭粡竚癈鷭т繻Ь因鹸誕因幻儀因諺群因抗膳因港存因仰驚因更糎因原長蝟昭粡竚癈鷭т繻Ь因儀然因況篤因原壇因慌暗因飢験因偽厳因鬼梓因掬蝶蝟昭粡竚癈鷭т繻Ь因恐撤因挟孫因狂鈎因狂蓋因饗詑因軍群因係汰因形饗蝟昭粡竚癈鷭т繻Ь因弦港因弦腸因個饗因呼鯵因弘田因控然因攻拘因昂狭蝟昭粡竚癈鷭т繻Ь因蟻橋因誼続因狭慶因晃環因晃甘因恭溝因径屋因響佳蝟昭粡竚癈鷭т繻Ь因響憩因狂其因甲按因尭菊因飢群因亀皇因彊薫因恐澱蝟昭粡竚癈鷭т繻Ь因仰蛎因凝扱因凝脹因鹸蟻因弦碓因呼幹因甘唄因甲街蝟昭粡竚癈鷭т繻Ь因騎洞因狭餌因響柿因昂鹸因狂価因輝誼因形坦因鹸族蝟昭粡竚癈鷭т繻Ь因恒鎮因抗乎因偽蟻因皇恩因狂臆因験圧因鹸咳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互卒桍鹿粡寂蝟赱齠洲粤讌将蛋規屋謙加規甘喬天適童階荏穐鹿粡寂蝟赱齠洲粤讌将堕岡屋銭可謙嘉桑墜測宜銭顕銭硬喬鹿粡寂蝟赱齠洲粤讌将存狸孫謙堕測天岡天幸袷階臼頭蔚階鹿粡寂蝟赱齠洲粤讌将餌適劃測偽岡慶卯元階呼銭続適袖階鹿粡寂蝟赱齠洲粤讌将探桑堂岡胴桑憧規澗穐輝謙凝階薫測鹿粡寂蝟赱齠洲粤讌将粗頭汰卯嘆卯津幸導喬篤穐姐潮俺喬鹿粡寂蝟赱齠洲粤讌将街適溝階礎狸蛋測宛巻患卯宜階宜卯鹿粡寂蝟赱齠洲粤讌将義岡橋規慶階慌謙憶謙迭謙寛測誕謙鹿粡寂蝟赱齠洲粤讌将鎮狸柿幸挟狸軍狸蛋幸禿測聴測驚卯鹿粡寂蝟赱齠洲粤讌将険卯元巻元謙動卯動適碍卯宜狸橋謙鹿粡寂蝟赱齠洲粤讌将憩銭拘桑属幸唾巻湛穐徹狸天適特狸鹿粡寂蝟赱齠洲粤讌将嚇適軍銭議桑掬岡訓頭乎測乎巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛吸蝟昭粡竚癈鷭т繻Ь因響菊因掬外因饗探因驚鰻因驚慶因卦憩因傾憾蝟昭粡竚癈鷭т繻Ь因蟻恭因形旭因慶旭因菊堕因弦呼因諺姥因乎卒因個祁蝟昭粡竚癈鷭т繻Ь因古鍛因呼営因晃轍因港暗因溝鈎因甘鍵因軌慶因輝旭蝟昭粡竚癈鷭т繻Ь因宜抗因蟻甲因恐夏因恐鍵因挟澱因饗柿因群前因卦恒蝟昭粡竚癈鷭т繻Ь因傾慣因憩噌因厳涜因諺唾因限薫因恭礎因験蛋因昂前蝟昭粡竚癈鷭т繻Ь因鬼姐因鬼鯵因亀疎因狂鬼因響妓因諺薫因係卸因況卦蝟昭粡竚癈鷭т繻Ь因硬団因騎郡因蟻漸因険荏因原軌因弘斡因甘姥因甘患蝟昭粡竚癈鷭т繻Ь因甘歎因監臼因騎蛋因鬼蓋因蟻租因菊嘘因彊乙因教輝蝟昭粡竚癈鷭т繻Ь因況劃因驚寛因驚群因驚迭因薫係因郡鯵因形袈因形租蝟昭粡竚癈鷭т繻Ь因径宛因慶荏因恵禿因慶橋因教天因群蟻因騎詑因誼患蝟昭粡竚癈鷭т繻Ь因議展因恐腸因恐徹因恭厩因凝屋因原義因諺咳因個陳蝟昭粡竚癈鷭т繻Ь因慌童因尭葦因傾繕因溝義因甘糎因甘疎因甘礎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互其桍鹿粡寂蝟赱齠洲粤讌将胴測徳穐按卯唄桑粗喬鰻卯影喬鹿粡寂蝟赱齠洲粤讌将概巻害卯碍頭嚇測義狸幻階壇卯導桑鹿粡寂蝟赱齠洲粤讌将憧銭芦頭圧穐斡潮咳頭亀幸全測鍛卯鹿粡寂蝟赱齠洲粤讌将加岡嘉潮慧頭案謙碓規屋謙鬼適案桑鹿粡寂蝟赱齠洲粤讌将嚇卯憩頭控桑禅銭兎穐営潮嘆潮狂卯鹿粡寂蝟赱齠洲粤讌将攻潮担穐尭岡昂規蓋幸元穐淡卯庵規鹿粡寂蝟赱齠洲粤讌将嘉巻郡桑墜適害喬義巻族階続潮干巻鹿粡寂蝟赱齠洲粤讌将晃卯溝潮卒測鎮銭佳幸鈎狸厳頭控頭鹿粡寂蝟赱齠洲粤讌将続幸督卯営卯官頭恩穐典潮鯵喬嚇規鹿粡寂蝟赱齠洲粤讌将崖銭可桑街喬慧幸嘉喬伝頭甲喬甲謙鹿粡寂蝟赱齠洲粤讌将皇岡鰻桑臼銭教適蟻穐膳銭扱喬堕階鹿粡寂蝟赱齠洲粤讌将梓桑狂規迭岡祖測嬰桑探卯担謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛頚蝟昭粡竚癈鷭т繻Ь因恭晃因形稿因驚抗因昂郡因呼怯因形疏因訓諺蝟昭粡竚癈鷭т繻Ь因攻幻因恵顕因狂鰻因慧薫因狂輝因抗驚因飢堂因鬼餌蝟昭粡竚癈鷭т繻Ь因元疎因諺嘘因憩全因古団因弘撤因騎橋因幻幻因傾官蝟昭粡竚癈鷭т繻Ь因監嘆因軌妥因飢臼因輝幹因亀騎因儀可因軍伝因儀限蝟昭粡竚癈鷭т繻Ь因宜輝因菊恐因菊鹸因彊卦因怯袈因怯況因怯噌因恭族蝟昭粡竚癈鷭т繻Ь因挟柿因教驚因橋尭因狂寛因凝嘘因卦橋因形劃因恵涜蝟昭粡竚癈鷭т繻Ь因慶潅因慶更因慧澗因憩饗因験暗因験漢因原団因諺宛蝟昭粡竚癈鷭т繻Ь因諺恭因限橋因古督因晃荏因皇呼因顕存因呼壇因溝展蝟昭粡竚癈鷭т繻Ь因飢厳因恐影因挟験因尭丹因攻更因狂官因軌恒因饗屋蝟昭粡竚癈鷭т繻Ь因驚形因尭鬼因形郡因慶軌因幻完因諺桶因況宛因甘洞蝟昭粡竚癈鷭т繻Ь因軌街因軌俺因軌教因輝恵因飢蓋因飢恭因亀膳因儀案蝟昭粡竚癈鷭т繻Ь因妓圧因義鍛因掬徳因怯族因怯童因恐導因恭群蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互存桍鹿粡寂蝟赱齠洲粤讌将恒狸漸幸卸潮価狸害適険巻原頭鹿粡寂蝟赱齠洲粤讌将跳幸薫狸袷幸晃測賊幸壇岡田岡斡階鹿粡寂蝟赱齠洲粤讌将碍規況銭元規善階天謙唄階街頭蛎階鹿粡寂蝟赱齠洲粤讌将天測堂喬撤測店穐蓋巻各適調階桶桑鹿粡寂蝟赱齠洲粤讌将前穐粗銭教穐鉄適旭測嚇巻慣狸尭銭鹿粡寂蝟赱齠洲粤讌将皇卯其巻墜卯伝測堂桑桶謙鬼規形頭鹿粡寂蝟赱齠洲粤讌将典喬可穐鍛銭限巻袷卯暗卯各穐挟適鹿粡寂蝟赱齠洲粤讌将糎桑津謙桶桑驚桑原桑同階店巻店岡鹿粡寂蝟赱齠洲粤讌将動潮慨謙幹幸干適漸頭童狸徳卯姐頭鹿粡寂蝟赱齠洲粤讌将諺桑糎適患銭幻卯噌適疏巻揃桑厩穐鹿粡寂蝟赱齠洲粤讌将典適唾幸伝巻瞳狸徳頭葦幸葦喬唄幸鹿粡寂蝟赱齠洲粤讌将蔚狸温頭佳幸夏適街銭嚇階官卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛鉱蝟昭粡竚癈鷭т繻Ь因鬼暗因亀弦因儀輝因儀漸因宜慶因蟻鬼因蟻議蝟昭粡竚癈鷭т繻Ь因蟻呼因議典因議天因議瞳因掬係因掬験因掬港因掬揃蝟昭粡竚癈鷭т繻Ь因菊姥因彊飢因怯潅因恐昂因恐銚因恭膳因教蛎因橋芦蝟昭粡竚癈鷭т繻Ь因橋干因橋憧因況仰因狂憶因狂昂因狭誕因驚菊因仰価蝟昭粡竚癈鷭т繻Ь因仰狭因凝夏因凝皇因卦害因袈厳因係驚因形各因恵徹蝟昭粡竚癈鷭т繻Ь因慶圧因慶姥因慶掬因慶賊因鍵欝因鍵鯵因鍵粗因鍵賊蝟昭粡竚癈鷭т繻Ь因険鬼因険呼因顕価因験飢因幻潅因幻怯因限餌因乎漸蝟昭粡竚癈鷭т繻Ь因乎特因弘蛋因恒卦因慌訓因係各因慌特因控全因攻環蝟昭粡竚癈鷭т繻Ь因晃圧因更更因港銚因皇蛎因飢蟻因飢疎因騎瞳因鬼宛蝟昭粡竚癈鷭т繻Ь因妓諜因恐瞳因尭徹因乎響因呼菊因硬孫因輝澗因飢蛎蝟昭粡竚癈鷭т繻Ь因鬼漢因偽督因形完因恒祁因皇彊因硬腸因軍幹因尭姐蝟昭粡竚癈鷭т繻Ь因険薫因卦臼因菊督因彊珍因港糎因群賃因呼唾蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互汰桍鹿粡寂蝟赱齠洲粤讌将其巻鍵階澱銭尭穐袈巻限適禅銭鹿粡寂蝟赱齠洲粤讌将斡謙叡桑彊頭彊喬験幸限卯墜桑議規鹿粡寂蝟赱齠洲粤讌将蝶銭俺適卒岡店測撞穐鈎幸軌喬超頭鹿粡寂蝟赱齠洲粤讌将津喬津適憩測湛幸慣階鍵岡禅穐街喬鹿粡寂蝟赱齠洲粤讌将個頭卦穐伝桑害測安規袷狸姥潮薫穐鹿粡寂蝟赱齠洲粤讌将潅幸元適溝測詑穐洞幸牡潮柿卯験潮鹿粡寂蝟赱齠洲粤讌将揃階徹謙扱潮叡桑恩穐険規顕喬攻潮鹿粡寂蝟赱齠洲粤讌将妓適蝶穐劃狸乎卯動幸狭測俺巻群謙鹿粡寂蝟赱齠洲粤讌将卦穐洞銭蛋卯餌巻郡岡恐銭験銭晃銭鹿粡寂蝟赱齠洲粤讌将安巻澗岡聴適憩狸弦規墜銭撞狸牡銭鹿粡寂蝟赱齠洲粤讌将憾測干適恐謙訓巻憩規糎巻袖喬腸岡鹿粡寂蝟赱齠洲粤讌将害頭元狸汰潮続幸咳幸姥銭桶桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛胎蝟昭粡竚癈鷭т繻Ь因蟻墜因恐洞因挟租因挟填因況可因饗汰因元噌蝟昭粡竚癈鷭т繻Ь因攻脹因袈弘因溝超因恭潅因抗斡因溝疎因袈惰因橋飢蝟昭粡竚癈鷭т繻Ь因甘姐因軌晃因騎嘆因誼訓因彊展因挟慌因教恭因狂菊蝟昭粡竚癈鷭т繻Ь因訓填因軍蛋因卦桶因径昂因慧顕因原控因限験因乎賃蝟昭粡竚癈鷭т繻Ь因恒係因更碓因教礎因橋疎因饗限因甘諜因甘調因監柿蝟昭粡竚癈鷭т繻Ь因監憩因飢柿因騎童因騎堂因亀迭因偽賃因妓殿因宜誕蝟昭粡竚癈鷭т繻Ь因宜湛因宜篤因蟻軌因誼環因掬芦因掬佳因菊跳因彊営蝟昭粡竚癈鷭т繻Ь因恭扱因教夏因蟻誼因教粗因教堕因教展因況皇因饗恐蝟昭粡竚癈鷭т繻Ь因饗径因驚案因軍患因傾換因傾単因恵童因慶厩因慶佳蝟昭粡竚癈鷭т繻Ь因鍵漸因険芦因険導因弦攻因諺掬因諺狭因諺橋因諺乎蝟昭粡竚癈鷭т繻Ь因諺電因乎歎因乎鎮因攻鍛因晃特因饗尭因甘限因監鈎蝟昭粡竚癈鷭т繻Ь因監個因輝軌因蟻儀因蟻徳因怯憾因恭葦因橋寛蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互唾桍鹿粡寂蝟赱齠洲粤讌将族卯澱測誕測桶適澗潮議巻乎卯鹿粡寂蝟赱齠洲粤讌将抗銭旭狸鯵階嬰銭換巻胴適探穐天頭鹿粡寂蝟赱齠洲粤讌将動頭袖謙腸測粗銭兎謙存潮凝測徹階鹿粡寂蝟赱齠洲粤讌将各卯憩桑抗卯礎幸汰巻宛幸天頭動喬鹿粡寂蝟赱齠洲粤讌将蟻適壇銭孫頭軌穐妥穐扱岡憩巻温潮鹿粡寂蝟赱齠洲粤讌将旦卯鬼銭撤適屋適厩幸丹巻涯謙超喬鹿粡寂蝟赱齠洲粤讌将宜狸蔚適抗適脹桑旭規賊潮澱銭斡適鹿粡寂蝟赱齠洲粤讌将驚桑袷銭葦頭夏銭坦銭卦階扱狸桶規鹿粡寂蝟赱齠洲粤讌将唄狸叡謙害測嘉規唾岡導卯案幸迭測鹿粡寂蝟赱齠洲粤讌将劃喬存謙牡測軍卯存銭嘉幸嚇穐漸適鹿粡寂蝟赱齠洲粤讌将蔚測珍階欝岡更喬臼岡劃桑感銭惰頭鹿粡寂蝟赱齠洲粤讌将蓋謙然幸珍狸薫穐仰銭鈎適感謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛壷蝟昭粡竚癈鷭т繻Ь因蟻昂因誼咳因議津因監電因怯葦因恐禿因仰害蝟昭粡竚癈鷭т繻Ь因傾丹因傾誕因慶寛因慧環因憩腸因険田因顕影因鹸弘蝟昭粡竚癈鷭т繻Ь因幻感因弦群因限弘因古郡因呼夏因弘咳因恒澗因恒驚蝟昭粡竚癈鷭т繻Ь因攻旦因恒甲因甘丹因監監因輝患因騎官因菊抗因恐暗蝟昭粡竚癈鷭т繻Ь因況調因驚官因凝安因軍恭因慧俺因恒団因慌験因騎調蝟昭粡竚癈鷭т繻Ь因宜厩因蟻惰因仰脹因傾議因慧嘉因恵溝因妓慧因訓稿蝟昭粡竚癈鷭т繻Ь因輝徳因幻騎因呼動因監蛋因誼涜因橋乙因祁礎因形迭蝟昭粡竚癈鷭т繻Ь因顕叡因更篤因輝旦因菊疏因教澱因狭尭因饗弦因仰導蝟昭粡竚癈鷭т繻Ь因凝攻因尭挟因袈禿因慶唄因議撤因弘卦因恒厳因晃斡蝟昭粡竚癈鷭т繻Ь因輝填因飢営因恐完因橋恒因橋長因凝荏因掬其因慶腸蝟昭粡竚癈鷭т繻Ь因憩群因橋童因元粗因元瞳因諺童因飢噌因騎長因宜軍蝟昭粡竚癈鷭т繻Ь因掬呼因菊弘因彊亀因慌鉄因攻挟因軌揃因輝影蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互妥桍鹿粡寂蝟赱齠洲粤讌将可潮害穐慨桑嚇狸甘謙鬼喬騎卯鹿粡寂蝟赱齠洲粤讌将怯桑攻謙溝適然狸詑規丹喬丹頭単卯鹿粡寂蝟赱齠洲粤讌将単銭展巻展銭電穐瞳穐卸頭恩巻可測鹿粡寂蝟赱齠洲粤讌将蓋狸碍桑彊桑彊狸恐潮況喬祁適諺岡鹿粡寂蝟赱齠洲粤讌将善頭然規誕狸銚謙徹幸典謙嘘狸渦喬鹿粡寂蝟赱齠洲粤讌将蔚桑誼桑薫卯元潮弘卯攻規稿穐租穐鹿粡寂蝟赱齠洲粤讌将賊卯蛋桑蝶幸姐喬劃喬憾測鬼幸元潮鹿粡寂蝟赱齠洲粤讌将呼階善頭然狸禅巻膳階旦卯団適荏巻鹿粡寂蝟赱齠洲粤讌将俺喬碍適官謙狭狸傾謙徹銭徹謙撤適鹿粡寂蝟赱齠洲粤讌将典桑厩桑卸穐恵適験巻乎狸族岡迭謙鹿粡寂蝟赱齠洲粤讌将庵規監適袈卯卦喬調巻佳喬儀階繕階鹿粡寂蝟赱齠洲粤讌将澗謙揃岡餌謙害穐恭卯憩巻呼適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濛遁蝟昭粡竚癈鷭т繻Ь因恐田因狭按因饗攻因訓田因慧鬼因鍵祁因顕群蝟昭粡竚癈鷭т繻Ь因弦填因晃墜因厳亀因呼賊因誼蛎因監蓋因監撤因監袖蝟昭粡竚癈鷭т繻Ь因亀扱因義屋因蟻陳因蟻店因菊坦因怯甘因恭夏因教属蝟昭粡竚癈鷭т繻Ь因橋澗因狂電因狭溝因仰係因仰同因卦崖因卦孫因祁影蝟昭粡竚癈鷭т繻Ь因傾掬因傾填因慶崖因険迭因顕粗因元疏因弦疏因諺柿蝟昭粡竚癈鷭т繻Ь因古疎因呼溝因弘害因恒陳因昂扱因甘汰因甘単因飢鯵蝟昭粡竚癈鷭т繻Ь因妓卦因妓澱因誼安因卦荏因誼劃因険甘因諺袷因呼探蝟昭粡竚癈鷭т繻Ь因攻恭因昂仰因径乙因諺弾因晃宛因恒恐因偽導因騎糎蝟昭粡竚癈鷭т繻Ь因弘鰻因鬼街因儀顕因掬乙因恭糎因驚慨因薫諺因祁怯蝟昭粡竚癈鷭т繻Ь因恵限因憩徹因幻薫因弘寛因恒鬼因抗碓因抗姥因攻呼蝟昭粡竚癈鷭т繻Ь因郡掬因港担因議扱因議狭因教薫因況漸因個糎因攻賃蝟昭粡竚癈鷭т繻Ь因恭凝因況換因狭厩因験探因晃鰻因攻丹因幻禿蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互丹桍鹿粡寂蝟赱齠洲粤讌将童巻慣銭惰謙撤喬芦狸亀潮恐頭鹿粡寂蝟赱齠洲粤讌将叡巻桶喬嘉岡皇階童卯芦桑憶穐騎頭鹿粡寂蝟赱齠洲粤讌将儀巻怯頭況巻呼岡険喬其階徹規卸岡鹿粡寂蝟赱齠洲粤讌将輝頭仰測誕適圧喬呼穐呼潮昂頭疏穐鹿粡寂蝟赱齠洲粤讌将噌階礎測葦潮厩岡卦岡卦幸妓幸前適鹿粡寂蝟赱齠洲粤讌将碓喬饗測轍潮按狸憶銭義規怯巻傾穐鹿粡寂蝟赱齠洲粤讌将憩階全潮担潮迭適碓銭蛋狸超巻津卯鹿粡寂蝟赱齠洲粤讌将典頭諺幸屋桑可幸柿規幹岡温謙漸潮鹿粡寂蝟赱齠洲粤讌将糎階唾穐疏狸凝銭跳喬屋狸郡幸田幸鹿粡寂蝟赱齠洲粤讌将唄謙慨階涯穐汰階丹岡単喬陳潮臆喬鹿粡寂蝟赱齠洲粤讌将牡桑澗穐険階験巻鍛幸調規脹桑慶階鹿粡寂蝟赱齠洲粤讌将撞狸唄適鰻潮誼測膳頭汰潮陳銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉越蝟昭粡竚癈鷭т繻Ь因慧漢因憩糎因険形因顕餌因顕街因元繕因諺凝蝟昭粡竚癈鷭т繻Ь因乎壇因個撞因弘係因弘祁因慌祖因慌恒因控験因溝租蝟昭粡竚癈鷭т繻Ь因飢環因亀鹸因尭蓋因訓涯因輝狂因傾元因慧亀因険続蝟昭粡竚癈鷭т繻Ь因恵壇因偽潅因妓輝因誼糎因恭疏因橋禿因橋督因狭義蝟昭粡竚癈鷭т繻Ь因群長因卦呼因卦古因傾暗因傾偽因傾墜因恵昂因慶屋蝟昭粡竚癈鷭т繻Ь因慶幹因原扱因諺慨因攻蛎因弘怯因稿屋因軌天因飢卦蝟昭粡竚癈鷭т繻Ь因騎鍛因騎轍因軌姐因亀疏因妓電因宜監因群劃因蟻限蝟昭粡竚癈鷭т繻Ь因誼挟因騎営因彊迭因彊導因恭誼因恭験因恭各因恭詑蝟昭粡竚癈鷭т繻Ь因挟団因教店因橋胴因議迭因狭団因狭督因尭欝因訓典蝟昭粡竚癈鷭т繻Ь因甘弦因卦店因袈童因形抗因恵墜因慶弾因慶甲因鍵怯蝟昭粡竚癈鷭т繻Ь因験換因験妓因鹸驚因鹸唾因元涜因幻探因個薫因弘葦蝟昭粡竚癈鷭т繻Ь因弘仰因抗昂因昂叡因港渦因軌弾因妓昂因怯古蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互嘆桍鹿粡寂蝟赱齠洲粤讌将営階騎規聴謙芦穐特階扱巻牡桑鹿粡寂蝟赱齠洲粤讌将碍階斡頭慨幸卦頭轍狸賃階葦頭督桑鹿粡寂蝟赱齠洲粤讌将探適鍛銭誼頭長銭概岡弦喬鰻喬鈎階鹿粡寂蝟赱齠洲粤讌将袖謙其測丹銭完潮卦卯圧狸田喬恒銭鹿粡寂蝟赱齠洲粤讌将慌銭歎穐禅卯騎適険規港規案穐乙階鹿粡寂蝟赱齠洲粤讌将恵卯桶規控規挟穐甲巻漸謙撞階鍵喬鹿粡寂蝟赱齠洲粤讌将惰適葦穐誕卯轍頭童規芦穐唄測桶巻鹿粡寂蝟赱齠洲粤讌将尭頭弾穐田適庵適鰻頭可巻幻測誕謙鹿粡寂蝟赱齠洲粤讌将旭穐芦適狂銭田測堕測電階各穐慌桑鹿粡寂蝟赱齠洲粤讌将族狸姥潮鹸狸墜幸田潮芦桑概階鬼巻鹿粡寂蝟赱齠洲粤讌将存規乙謙温適可階蛋岡禿頭寛岡善桑鹿粡寂蝟赱齠洲粤讌将干謙特卯粗適崖謙嬰桑尭謙嚇銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉額蝟昭粡竚癈鷭т繻Ь因騎店因監感因弘鬼因呼属因宜響因険咳因議督蝟昭粡竚癈鷭т繻Ь因形伝因呼惰因狂珍因乎碍因群童因甲憾因響劃因諺属蝟昭粡竚癈鷭т繻Ь因甘街因騎妓因偽斡因儀橋因恐探因恭漸因教填因饗甘蝟昭粡竚癈鷭т繻Ь因仰撤因凝蟻因薫祖因祁田因形兎因径疏因慶詑因鍵劃蝟昭粡竚癈鷭т繻Ь因鍵旦因原誕因諺控因抗蟻因偽迭因妓歎因菊嚇因教祖蝟昭粡竚癈鷭т繻Ь因橋攻因響鍵因饗袖因卦碍因諺歎因軌牡因祁典因儀外蝟昭粡竚癈鷭т繻Ь因菊餌因彊教因橋形因驚彊因卦憧因形荏因憩凝因険憧蝟昭粡竚癈鷭т繻Ь因厳姥因弘患因更続因径湛因卦誼因形胴因径輝因鹸担蝟昭粡竚癈鷭т繻Ь因弘碓因傾店因形慌因験涯因義撤因祁完因甘可因甘堂蝟昭粡竚癈鷭т繻Ь因蟻更因菊徹因恐堕因橋鈎因況同因驚展因原饗因幻祁蝟昭粡竚癈鷭т繻Ь因諺蛎因恒甘因慌導因更聴因響鰻因薫俺因軍価因顕天蝟昭粡竚癈鷭т繻Ь因鹸儀因乎粗因甘葦因輝感因輝誕因亀限因蟻撞蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互担桍鹿粡寂蝟赱齠洲粤讌将撤喬迭階展卯同巻導規洞測涜巻鹿粡寂蝟赱齠洲粤讌将影岡咳卯響岡訓潮洞適乙岡騎銭軍銭鹿粡寂蝟赱齠洲粤讌将扱巻嘘幸鰻謙祁喬疎頭祖狸銚規墜階鹿粡寂蝟赱齠洲粤讌将温銭儀桑鍵岡壇規加規概桑尭巻訓規鹿粡寂蝟赱齠洲粤讌将淡謙鈎潮鍛階柿適況階腸規弦狸弘適鹿粡寂蝟赱齠洲粤讌将甲狸篤潮街銭議測葦銭元銭鍵岡蛎巻鹿粡寂蝟赱齠洲粤讌将稿測憧階堂狸慶謙涜測飢喬賃巻概巻鹿粡寂蝟赱齠洲粤讌将抗頭瞳穐袈銭呼桑族狸腸狸臆銭完銭鹿粡寂蝟赱齠洲粤讌将嬰階賃巻伝潮憧適圧狸扱規牡階湛適鹿粡寂蝟赱齠洲粤讌将幹謙顕巻孫銭撤潮店規伝潮兎桑同頭鹿粡寂蝟赱齠洲粤讌将宛狸佳規崖銭劃穐諺頭担穐幻桑晃適鹿粡寂蝟赱齠洲粤讌将前測津穐牡桑前岡租喬鉄巻葦階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉吸蝟昭粡竚癈鷭т繻Ь因弘存因恒可因恒銚因稿暗因驚典因挟妓因挟轍蝟昭粡竚癈鷭т繻Ь因教卦因凝憧因袈鹸因径餌因弘狭因抗脹因凝汰因鬼堂蝟昭粡竚癈鷭т繻Ь因菊孫因挟全因呼環因呼田因慌幹因輝係因妓饗因宜温蝟昭粡竚癈鷭т繻Ь因誼亀因掬昂因仰涜因慧呼因卦叡因乎唾因古轍因晃蟻蝟昭粡竚癈鷭т繻Ь因薫孫因監営因饗惰因尭賊因卦外因攻涜因輝甘因鬼碓蝟昭粡竚癈鷭т繻Ь因妓概因妓儀因宜礎因誼彊因菊慌因教昂因況誼因凝憶蝟昭粡竚癈鷭т繻Ь因袈径因験墜因乎田因弘唄因弘督因抗環因係乙因係柿蝟昭粡竚癈鷭т繻Ь因飢疏因掬繕因儀影因宜郡因彊渦因軌渦因輝義因輝礎蝟昭粡竚癈鷭т繻Ь因輝団因飢旭因亀碓因妓鬼因妓妓因宜儀因蟻控因誼洞蝟昭粡竚癈鷭т繻Ь因議限因彊唾因恐控因挟可因況訓因狂干因狂唾因狂墜蝟昭粡竚癈鷭т繻Ь因袈跳因仰銚因凝尭因仰溝因薫尭因訓淡因菊騎因卦銚蝟昭粡竚癈鷭т繻Ь因傾祁因径換因径鬼因径飢因恵超因慶訓因飢外蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互旦桍鹿粡寂蝟赱齠洲粤讌将感階偽幸掬巻前適属巻担喬徹頭鹿粡寂蝟赱齠洲粤讌将旭階旭頭官幸況喬顕潮然穐議謙庵潮鹿粡寂蝟赱齠洲粤讌将可規完狸鍵岡丹適荏桑換適脹適径階鹿粡寂蝟赱齠洲粤讌将租規案巻完巻圧階恩規壇穐聴桑崖頭鹿粡寂蝟赱齠洲粤讌将胴桑涜階長狸卸幸袈階溝頭妥巻堕岡鹿粡寂蝟赱齠洲粤讌将嘉狸疏潮鍵階繕卯影謙糎卯抗巻担銭鹿粡寂蝟赱齠洲粤讌将弾喬嘉測唾規唄幸葦適況謙旦頭庵桑鹿粡寂蝟赱齠洲粤讌将偽喬淡狸探銭梓卯険階患卯驚桑屋潮鹿粡寂蝟赱齠洲粤讌将拘謙袷階姥規鉄潮嬰銭宜幸属適圧謙鹿粡寂蝟赱齠洲粤讌将碍銭慨測攻岡溝巻徹巻儀桑概桑攻穐鹿粡寂蝟赱齠洲粤讌将田頭凝階探潮展狸坦狸同穐禿幸外岡鹿粡寂蝟赱齠洲粤讌将団卯宛幸況幸兎頭掬規天階蔚規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉頚蝟昭粡竚癈鷭т繻Ь因宜顕因誼各因昂電因甘涜因宜諺因菊団因諺個蝟昭粡竚癈鷭т繻Ь因尭撤因傾属因傾恐因蟻天因鹸訓因軍佳因訓賊因掬郡蝟昭粡竚癈鷭т繻Ь因菊撞因恭径因挟港因訓坦因恵晃因甘干因掬特因甘澗蝟昭粡竚癈鷭т繻Ь因儀鎮因偽漸因彊噌因尭坦因慶按因鍵督因険崖因険惰蝟昭粡竚癈鷭т繻Ь因呼族因弦昂因原全因議憧因恐諺因挟祖因弦厳因況祁蝟昭粡竚癈鷭т繻Ь因驚轍因仰嚇因郡涯因係慨因義感因憩卦因顕祖因更礎蝟昭粡竚癈鷭т繻Ь因監導因掬坦因恐陳因恭慌因教儀因況尭因袈坦因群潅蝟昭粡竚癈鷭т繻Ь因鍵鍛因鍵汰因呼温因恒環因軌按因儀胴因義慌因狂元蝟昭粡竚癈鷭т繻Ь因狭軍因訓挟因群督因乎揃因妓堂因乎徹因攻響因弘厩蝟昭粡竚癈鷭т繻Ь因厳憩因傾鉄因祁天因鹸温因監夏因飢教因騎義因恐団蝟昭粡竚癈鷭т繻Ь因況弾因驚蛋因袈慶因径拘因恵控因顕涯因元鹸因呼殿蝟昭粡竚癈鷭т繻Ь因橋陳因尭屋因群斡因慧餌因験疎因更単因硬繕蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互淡桍鹿粡寂蝟赱齠洲粤讌将影潮詑卯厳岡詑謙宛桑卒謙租謙鹿粡寂蝟赱齠洲粤讌将填卯宛狸亀卯偽穐蔚測俺岡展狸況銭鹿粡寂蝟赱齠洲粤讌将厩桑租銭同穐瞳穐温狸卒頭義規壇幸鹿粡寂蝟赱齠洲粤讌将況銭元幸凝巻饗狸導巻臆巻慨銭鈎潮鹿粡寂蝟赱齠洲粤讌将劃測徹喬寛狸宜卯祁頭坦適担適牡謙鹿粡寂蝟赱齠洲粤讌将価頭嚇潮亀巻鉄卯臆狸掬幸蛋幸唾巻鹿粡寂蝟赱齠洲粤讌将叡喬蔚幸険岡古頭崖潮橋幸偽銭凝巻鹿粡寂蝟赱齠洲粤讌将個穐鬼階凝適害銭概卯寛喬晃階展桑鹿粡寂蝟赱齠洲粤讌将瞳狸安岡牡幸卸幸価測宜穐堕巻鍛狸鹿粡寂蝟赱齠洲粤讌将蟻岡響適弦卯皇謙鎮測瞳桑袷規諺測鹿粡寂蝟赱齠洲粤讌将疎幸誕測扱頭卦適個測前測坦謙姐幸鹿粡寂蝟赱齠洲粤讌将坦適徳適係桑堕謙干規薫幸童適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉鉱蝟昭粡竚癈鷭т繻Ь因稿蛎因況蛋因形鰻因騎街因卦限因港田因菊橋蝟昭粡竚癈鷭т繻Ь因険皇因験同因鍵晃因菊鈎因菊探因卦恐因径感因弘鈎蝟昭粡竚癈鷭т繻Ь因狂況因宜殿因義溝因慶碓因袈慧因限加因監撞因菊響蝟昭粡竚癈鷭т繻Ь因響厩因驚碍因尭芦因郡轍因傾狂因幻狂因諺亀因乎傾蝟昭粡竚癈鷭т繻Ь因掬墜因恭弾因卦探因傾腸因顕跳因抗恩因慌堂因鹸甲蝟昭粡竚癈鷭т繻Ь因原田因甲可因鬼単因菊驚因教乎因仰誼因薫欝因乎膳蝟昭粡竚癈鷭т繻Ь因乎蝶因晃蛎因教監因郡洞因甘按因甘銚因儀徹因宜佳蝟昭粡竚癈鷭т繻Ь因義橋因蟻鍛因輝糎因掬鯵因掬甲因彊蔚因恐袈因教祁蝟昭粡竚癈鷭т繻Ь因教膳因橋凝因仰凝因群涯因径俺因険軌因険港因顕更蝟昭粡竚癈鷭т繻Ь因限誼因乎前因乎填因個郡因攻叡因攻幹因監租因挟疎蝟昭粡竚癈鷭т繻Ь因饗橋因顕嬰因鹸怯因元響因弘展因誼葦因狭騎因晃糎蝟昭粡竚癈鷭т繻Ь因鹸形因元儀因監案因飢尭因菊噌因掬患因況按蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互蛋桍鹿粡寂蝟赱齠洲粤讌将晃頭鰻幸弘桑晃喬墜規同桑乙規鹿粡寂蝟赱齠洲粤讌将誕謙澱頭俺幸孫岡屋喬干測況巻限階鹿粡寂蝟赱齠洲粤讌将荏巻俺適臼銭攻適淡幸団適脹測尭穐鹿粡寂蝟赱齠洲粤讌将妓桑圧適撤幸瞳規鰻規鹸穐填階天階鹿粡寂蝟赱齠洲粤讌将動銭恵巻轍喬騎潮妓幸教測歎階鍵卯鹿粡寂蝟赱齠洲粤讌将案測乎卯教喬諺桑臆規形規輝卯存喬鹿粡寂蝟赱齠洲粤讌将梓頭弘幸牡桑唾桑津謙涜銭督巻梓潮鹿粡寂蝟赱齠洲粤讌将涜頭加幸漸幸動卯形潮督潮憶桑嘉銭鹿粡寂蝟赱齠洲粤讌将薫階概規其幸飢測個狸同巻全岡可頭鹿粡寂蝟赱齠洲粤讌将弦階欝規屋銭響適唾潮坦頭嚇幸芦階鹿粡寂蝟赱齠洲粤讌将篤謙外規幹喬験卯拘幸孫潮弾穐壇頭鹿粡寂蝟赱齠洲粤讌将腸幸店喬佳卯涯桑騎適蟻幸薫測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉胎蝟昭粡竚癈鷭т繻Ь因驚諜因驚撤因薫胴因係害因慧佳因鍵津因顕続蝟昭粡竚癈鷭т繻Ь因鹸庵因鹸澱因厳芦因弦渦因諺価因乎漢因弘繕因慌腸蝟昭粡竚癈鷭т繻Ь因晃督因甲導因皇驚因甘監因甘善因軌個因飢偽因儀漢蝟昭粡竚癈鷭т繻Ь因宜糎因掬劃因菊銚因菊長因恐各因橋卒因況餌因況聴蝟昭粡竚癈鷭т繻Ь因狂腸因輝慌因慶憶因鍵疏因険糎因限旭因乎乎因乎惰蝟昭粡竚癈鷭т繻Ь因慌慧因攻害因鬼屋因晃加因騎鰻因軌諜因騎誼因妓糎蝟昭粡竚癈鷭т繻Ь因挟族因況慨因群況因祁橋因形感因恒填因飢坦因驚善蝟昭粡竚癈鷭т繻Ь因饗原因妓旭因掬潅因宜鬼因況加因憩涜因輝撤因袈旦蝟昭粡竚癈鷭т繻Ь因挟狭因係展因溝鬼因硬詑因儀誕因宜孫因橋卸因況港蝟昭粡竚癈鷭т繻Ь因饗壇因鬼店因狭長因掬亀因険甲因況控因溝疏因況禿蝟昭粡竚癈鷭т繻Ь因甲飢因狂議因甘繕因監迭因騎淡因恐孫因況佳因驚疎蝟昭粡竚癈鷭т繻Ь因呼担因監祖因慧仰因硬惰因甘扱因怯恐因凝鍵蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互鍛桍鹿粡寂蝟赱齠洲粤讌将堂測輝階慣階群銭卒規墜階孫規鹿粡寂蝟赱齠洲粤讌将蛋狸唾喬訓狸鉄銭環卯善巻碓謙更幸鹿粡寂蝟赱齠洲粤讌将淡潮単卯群穐可幸慌岡渦卯乙頭慶測鹿粡寂蝟赱齠洲粤讌将群桑超卯弘測膳頭善謙荏規完潮慣潮鹿粡寂蝟赱齠洲粤讌将彊適仰頭篤桑温謙弾巻硬銭乙潮澱規鹿粡寂蝟赱齠洲粤讌将唄潮乎幸賃頭津狸袈岡殿銭慣謙漸卯鹿粡寂蝟赱齠洲粤讌将外岡晃巻袖頭堕測咳測尭岡賃岡葦桑鹿粡寂蝟赱齠洲粤讌将換幸嘘岡群謙田幸凝適袈岡夏頭弘規鹿粡寂蝟赱齠洲粤讌将嘆巻桶測歎適誕穐鬼頭安喬聴測妓穐鹿粡寂蝟赱齠洲粤讌将外卯典頭餌喬恒狸桶銭鯵喬叡適堂規鹿粡寂蝟赱齠洲粤讌将慧岡蓋巻瞳幸聴巻義狸然階展潮卦喬鹿粡寂蝟赱齠洲粤讌将憩階義適患階碓幸碓謙誕幸教岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉壷蝟昭粡竚癈鷭т繻Ь因諺田因呼蓋因亀夏因監輝因輝価因飢歎因騎誕蝟昭粡竚癈鷭т繻Ь因蟻禅因掬慶因彊前因怯顕因恭超因況姐因況珍因凝況蝟昭粡竚癈鷭т繻Ь因仰乎因軍涯因軍碍因卦咳因傾軌因幻諜因諺晃因弘漢蝟昭粡竚癈鷭т繻Ь因弘恒因弘撞因攻担因厳個因宜欝因甘幻因監宜因甘暗蝟昭粡竚癈鷭т繻Ь因諺弦因呼各因晃碓因軌祖因掬恵因宜攻因蟻孫因掬存蝟昭粡竚癈鷭т繻Ь因恭珍因恭徳因挟単因橋鎮因狭漢因狭銚因仰安因凝其蝟昭粡竚癈鷭т繻Ь因訓拘因卦恩因形粗因憩諺因鍵旭因鹸換因鹸湛因弦険蝟昭粡竚癈鷭т繻Ь因限憶因古袷因弘教因攻慶因更袷因怯慧因恐恒因饗害蝟昭粡竚癈鷭т繻Ь因驚験因仰郡因憩鍛因憩特因仰丹因憩元因厳汰因幻童蝟昭粡竚癈鷭т繻Ь因況教因験賊因晃鈎因攻瞳因仰餌因慶怯因鹸劃因恒響蝟昭粡竚癈鷭т繻Ь因甘訓因騎卦因議軌因饗梓因尭殿因元団因原可因弦膳蝟昭粡竚癈鷭т繻Ь因飢温因鬼案因誼教因況甘因狂糎因郡斡因郡験蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互壇桍鹿粡寂蝟赱齠洲粤讌将掬岡乎頭古卯叡狸凝岡況謙童測鹿粡寂蝟赱齠洲粤讌将蓋桑礎測幹適柿穐偽規恩幸調卯店狸鹿粡寂蝟赱齠洲粤讌将完幸亀幸原測湛岡狂喬祖狸童潮涜喬鹿粡寂蝟赱齠洲粤讌将蔚適誼規教狸展喬伝適按銭轍卯叡狸鹿粡寂蝟赱齠洲粤讌将妥適宜幸幻卯賃狸咳頭挟岡形潮善狸鹿粡寂蝟赱齠洲粤讌将壇桑俺頭祖岡扱狸叡頭況規険謙温測鹿粡寂蝟赱齠洲粤讌将陳卯芦測街謙傾桑鎮測営穐干階嬰謙鹿粡寂蝟赱齠洲粤讌将堂銭響階探桑店頭感穐鹸卯長幸腸頭鹿粡寂蝟赱齠洲粤讌将元適電巻導喬童測餌桑佳卯賃銭葦狸鹿粡寂蝟赱齠洲粤讌将蛎岡抗狸可階桶巻饗桑尭喬薫銭店桑鹿粡寂蝟赱齠洲粤讌将洞岡響喬揃巻憶桑価階庵謙乎岡澱幸鹿粡寂蝟赱齠洲粤讌将梓測厩穐堂階唄幸坦適墜巻斡頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀉遁蝟昭粡竚癈鷭т繻Ь因鹸電因弘桶因抗加因鬼寛因溝尭因響蝶因薫弦蝟昭粡竚癈鷭т繻Ь因乎嘆因個兎因昂害因飢卒因義官因掬蛋因菊梓因況鰻蝟昭粡竚癈鷭т繻Ь因狭恵因狭拘因仰響因尭案因群恐因群特因径田因鍵葦蝟昭粡竚癈鷭т繻Ь因鍵慧因厳澗因弘壇因輝仰因硬抗因傾鹸因鍵限因抗害蝟昭粡竚癈鷭т繻Ь因諺超因軌可因鬼乎因諺訓因饗響因乎担因険扱因彊脹蝟昭粡竚癈鷭т繻Ь因況前因皇堂因甘更因甘晃因甲碓因諺饗因元単因元狂蝟昭粡竚癈鷭т繻Ь因狭旭因凝慧因係昂因険亀蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互聴桍鹿粡寂蝟赱齠洲粤讌将動狸撤穐撤規轍銭迭卯迭喬迭狸鹿粡寂蝟赱齠洲粤讌将迭頭鉄岡典喬典謙展岡展規旦測展銭鹿粡寂蝟赱齠洲粤讌将憶岡動潮展適店適店頭伝穐伝岡殿穐鹿粡寂蝟赱齠洲粤讌将殿階殿喬澱適澱潮澱巻澱喬澱岡田桑鹿粡寂蝟赱齠洲粤讌将田適電潮田頭兎桑動幸撞銭導穐撞測鹿粡寂蝟赱齠洲粤讌将撞潮撞桑憧桑瞳喬童謙童頭胴謙瞳測鹿粡寂蝟赱齠洲粤讌将洞幸瞳穐胴卯洞頭童喬胴喬臼謙督巻鹿粡寂蝟赱齠洲粤讌将督頭特適督謙督測督卯督銭督穐禿巻鹿粡寂蝟赱齠洲粤讌将禿規葦銭芦謙葦巻芦銭芦規旭規同狸鹿粡寂蝟赱齠洲粤讌将篤喬芦卯芦幸芦狸篤適禿頭葦卯旭喬鹿粡寂蝟赱齠洲粤讌将梓階梓桑薫階圧規圧穐梓謙圧銭圧喬鹿粡寂蝟赱齠洲粤讌将斡狸扱謙宛穐姐銭宛規安巻安岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋越蝟昭粡竚癈鷭т繻Ь因軌湛因軌蛋因軌続因軌嘆因軌超因軌津因軌典蝟昭粡竚癈鷭т繻Ь因軌田因軌迭因軌電因軌胴因軌撞因輝姐因輝葦因輝芦蝟昭粡竚癈鷭т繻Ь因輝蔚因輝欝因輝唄因輝荏因輝憶因輝柿因輝碍因輝鈎蝟昭粡竚癈鷭т繻Ь因輝蛎因輝各因輝完因輝飢因輝潅因輝鬼因輝恐因形童蝟昭粡竚癈鷭т繻Ь因輝狭因輝響因輝凝因輝鍵因輝顕因偽銚因輝乎因輝弦蝟昭粡竚癈鷭т繻Ь因輝呼因輝恒因輝抗因輝控因輝攻因輝全因輝繕因輝漸蝟昭粡竚癈鷭т繻Ь因輝噌因輝疏因輝疎因輝続因輝賊因輝族因輝属因輝袖蝟昭粡竚癈鷭т繻Ь因輝堕因輝探因輝湛因輝賃因輝徹因原亀因輝店因輝田蝟昭粡竚癈鷭т繻Ь因輝動因輝撞因輝禿因飢梓因飢安因飢唄因飢暗因飢卸蝟昭粡竚癈鷭т繻Ь因飢価因飢嘉因飢崖因飢街因飢監因飢幹因飢澗因飢潅蝟昭粡竚癈鷭т繻Ь因飢掬因飢鬼因飢響因飢郡因飢狭因飢軍因飢憩因飢慶蝟昭粡竚癈鷭т繻Ь因飢個因飢拘因飢慌因飢訓因飢幻因飢恒因呼糎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互腸桍鹿粡寂蝟赱齠洲粤讌将徳桑価狸価潮佳狸佳規加卯加潮鹿粡寂蝟赱齠洲粤讌将可桑可適嘉階嘉喬古潮嘉穐夏階夏規鹿粡寂蝟赱齠洲粤讌将夏謙夏幸外喬外謙騎謙外潮咳穐外頭鹿粡寂蝟赱齠洲粤讌将咳規咳銭害階害頭崖卯崖階崖謙慨穐鹿粡寂蝟赱齠洲粤讌将慨喬慨規撤桑慨幸慨潮営喬概適涯幸鹿粡寂蝟赱齠洲粤讌将涯適恒謙碍測碍桑蓋岡街喬柿穐柿喬鹿粡寂蝟赱齠洲粤讌将柿規柿適蛎穐蛎喬鈎階単岡仰幸劃頭鹿粡寂蝟赱齠洲粤讌将尭狸嬰適嚇適嚇謙嚇潮各銭完卯干潮鹿粡寂蝟赱齠洲粤讌将幹穐寛狸寛潮干狸寛適干喬寛幸官潮鹿粡寂蝟赱齠洲粤讌将幹適憾頭慣規憾適患頭慣卯慣桑慣穐鹿粡寂蝟赱齠洲粤讌将換岡慣測憾穐慣喬憾巻換穐憾喬潅桑鹿粡寂蝟赱齠洲粤讌将漢岡澗謙漢規漢狸潅巻潅謙漢謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋額蝟昭粡竚癈鷭т繻Ь因鬼疎因鬼嘆因鬼全因鬼妥因鬼唾因鬼銚因鬼典蝟昭粡竚癈鷭т繻Ь因鬼填因亀案因亀唄因鬼督因鬼電因鬼田因鬼徳因鬼轍蝟昭粡竚癈鷭т繻Ь因亀街因亀完因亀恭因亀潅因亀嘉因亀誼因亀患因亀偽蝟昭粡竚癈鷭т繻Ь因亀儀因亀蓋因亀崖因亀議因亀更因亀鍵因鬼粗因亀諺蝟昭粡竚癈鷭т繻Ь因亀稿因亀径因亀慧因亀晃因亀硬因亀租因亀恵因亀験蝟昭粡竚癈鷭т繻Ь因亀噌因亀厳因亀糎因亀珍因亀探因亀墜因亀担因亀鎮蝟昭粡竚癈鷭т繻Ь因亀鉄因亀調因偽唄因亀瞳因偽蔚因亀禿因亀督因偽餌蝟昭粡竚癈鷭т繻Ь因亀胴因偽甘因偽軌因訓墜因偽慨因偽涯因偽害因偽蓋蝟昭粡竚癈鷭т繻Ь因偽饗因偽挟因偽夏因偽驚因偽響因偽原因偽鍵因偽諺蝟昭粡竚癈鷭т繻Ь因偽前因偽拘因偽呼因偽禅因偽租因偽其因偽卒因偽嘆蝟昭粡竚癈鷭т繻Ь因偽唾因偽単因偽坦因偽丹因偽淡因偽壇因偽脹因偽蝶蝟昭粡竚癈鷭т繻Ь因偽跳因偽電因偽胴因儀旭因偽篤因儀梓因儀姐蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互調桍鹿粡寂蝟赱齠洲粤讌将薫謙薫測薫潮訓階訓謙訓喬誼桑鹿粡寂蝟赱齠洲粤讌将訓狸群喬軍桑軍謙郡適軍測郡穐郡頭鹿粡寂蝟赱齠洲粤讌将袈幸恵穐係謙袈卯祁頭係幸傾階形穐鹿粡寂蝟赱齠洲粤讌将径階形巻形銭径穐恵階恵喬慶巻慶岡鹿粡寂蝟赱齠洲粤讌将慶階鍵銭慶喬慧階鍵測険幸険潮厳岡鹿粡寂蝟赱齠洲粤讌将顕卯原岡鹸測厳穐唾穐元岡験潮厳幸鹿粡寂蝟赱齠洲粤讌将幻規限幸弦頭諺測限銭個適限測限謙鹿粡寂蝟赱齠洲粤讌将諺適乎規個階個卯個桑個幸個謙古規鹿粡寂蝟赱齠洲粤讌将個狸古巻個頭古頭呼銭呼幸呼測呼狸鹿粡寂蝟赱齠洲粤讌将呼潮弘岡弘銭恒穐恒測諺喬慌規慌狸鹿粡寂蝟赱齠洲粤讌将慌潮抗岡抗謙抗適祖岡控規控穐拘適鹿粡寂蝟赱齠洲粤讌将控銭控謙攻岡攻穐攻桑攻狸攻幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋吸蝟昭粡竚癈鷭т繻Ь因宜係因宜険因宜皇因監掬因監疎因宜然因宜族蝟昭粡竚癈鷭т繻Ь因宜旦因宜展因宜鎮因宜個因宜長因宜珍因義乙因義影蝟昭粡竚癈鷭т繻Ь因義臼因義叡因義姐因義荏因義完因義驚因義換因義概蝟昭粡竚癈鷭т繻Ь因義涯因義恐因義響因義港因義唾因義妥因義誕因義嘆蝟昭粡竚癈鷭т繻Ь因義堕因義迭因義跳因義填因義店因義超因義徳因義涜蝟昭粡竚癈鷭т繻Ь因蟻庵因蟻安因蟻蔚因蟻害因義聴因蟻価因蟻涯因蟻嚇蝟昭粡竚癈鷭т繻Ь因蟻干因蟻患因蟻完因蟻輝因蟻亀因蟻義因蟻蟻因蟻教蝟昭粡竚癈鷭т繻Ь因蟻狭因蟻薫因蟻軍因蟻卦因蟻係因教幻因蟻形因蟻鍵蝟昭粡竚癈鷭т繻Ь因蟻験因蟻繕因蟻存因蟻坦因蟻歎因蟻湛因蟻調因蟻聴蝟昭粡竚癈鷭т繻Ь因蟻鉄因蟻填因蟻轍因蟻津因蟻典因蟻殿因蟻動因蟻洞蝟昭粡竚癈鷭т繻Ь因蟻導因誼圧因誼扱因誼宛因誼按因誼嘘因誼屋因誼臆蝟昭粡竚癈鷭т繻Ь因誼恩因誼蓋因誼街因誼官因誼感因誼甘因誼騎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互超桍鹿粡寂蝟赱齠洲粤讌将探穐担頭揃卯旦狸旦適填岡歎喬鹿粡寂蝟赱齠洲粤讌将歎幸淡狸湛卯湛巻更測蛋測誕測誕喬鹿粡寂蝟赱齠洲粤讌将誕狸誕桑鍛規誕適鍛桑団幸壇幸弾潮鹿粡寂蝟赱齠洲粤讌将弾銭壇潮銚狸壇銭聴測脹規脹桑諜狸鹿粡寂蝟赱齠洲粤讌将脹頭脹測脹卯脹巻腸岡脹銭脹幸脹謙鹿粡寂蝟赱齠洲粤讌将調狸諜岡調適調測超狸跳階跳喬銚桑鹿粡寂蝟赱齠洲粤讌将銚巻銚岡珍岡長潮珍狸珍適賃潮長穐鹿粡寂蝟赱齠洲粤讌将賃桑賃狸鎮幸鎮潮陳階陳岡陳喬陳測鹿粡寂蝟赱齠洲粤讌将津測墜岡墜規徹測撤銭撤幸撤卯撤測鹿粡寂蝟赱齠洲粤讌将迭喬迭桑鉄巻鉄階鉄穐鉄適典桑典巻鹿粡寂蝟赱齠洲粤讌将典頭填岡填巻鉄桑天規天喬天銭殿狸鹿粡寂蝟赱齠洲粤讌将天頭伝穐澱卯澱岡澱謙田穐澱頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋頚蝟昭粡竚癈鷭т繻Ь因掬超因掬迭因掬陳因掬珍因掬賃因掬轍因掬撤蝟昭粡竚癈鷭т繻Ь因掬展因掬店因掬澱因掬同因掬導因掬動因掬憧因掬童蝟昭粡竚癈鷭т繻Ь因掬禿因菊鯵因菊姐因菊議因菊誼因菊安因菊臼因菊蔚蝟昭粡竚癈鷭т繻Ь因菊温因菊可因菊蓋因菊官因菊憾因菊潅因菊甘因菊夏蝟昭粡竚癈鷭т繻Ь因菊輝因菊偽因菊儀因菊宜因菊怯因菊仰因菊軍因菊祁蝟昭粡竚癈鷭т繻Ь因菊験因菊顕因菊憩因菊諺因菊幻因菊恒因菊厳因菊硬蝟昭粡竚癈鷭т繻Ь因菊更因菊晃因菊前因菊糎因菊祖因菊唾因菊超因菊涜蝟昭粡竚癈鷭т繻Ь因菊鉄因菊童因菊同因菊陳因彊続因菊篤因彊憶因彊彊蝟昭粡竚癈鷭т繻Ь因彊厩因彊碓因彊温因彊暗因彊咳因彊餌因彊欝因彊佳蝟昭粡竚癈鷭т繻Ь因彊俺因彊案因彊柿因彊義因彊官因彊響因彊祁因彊菊蝟昭粡竚癈鷭т繻Ь因彊漢因彊感因彊環因彊恭因彊干因彊挟因彊寛因彊驚蝟昭粡竚癈鷭т繻Ь因彊饗因彊宜因彊険因彊個因彊天因彊験因彊港蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互銚桍鹿粡寂蝟赱齠洲粤讌将宛巻姐測姐喬姐桑姐岡袷桑宛測鹿粡寂蝟赱齠洲粤讌将暗卯安謙暗穐按階安巻篤穐安潮庵喬鹿粡寂蝟赱齠洲粤讌将安規按謙唄潮臼規碓喬案喬案桑碓穐鹿粡寂蝟赱齠洲粤讌将案巻案銭碓階渦卯案測案卯碓潮碓適鹿粡寂蝟赱齠洲粤讌将唄桑嘘適渦謙渦桑唄銭嘘頭嘘狸渦狸鹿粡寂蝟赱齠洲粤讌将嘘巻嘘潮唄岡唄巻鰻階鰻桑欝謙欝幸鹿粡寂蝟赱齠洲粤讌将欝銭蔚測鰻巻蔚頭蔚規鰻卯欝頭欝潮鹿粡寂蝟赱齠洲粤讌将欝階鰻規厩幸厩喬姥桑荏狸厩巻厩銭鹿粡寂蝟赱齠洲粤讌将姥銭厩卯荏測荏適叡狸叡銭叡幸影桑鹿粡寂蝟赱齠洲粤讌将叡謙叡階叡喬餌銭叡測瞳幸叡潮嬰喬鹿粡寂蝟赱齠洲粤讌将嬰階影喬影銭影巻影頭影潮影狸影適鹿粡寂蝟赱齠洲粤讌将屋穐屋謙屋幸屋潮屋狸憶巻憶測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋鉱蝟昭粡竚癈鷭т繻Ь因恐嬰因恐憶因恐価因恐嘉因恐外因恐害因恐崖蝟昭粡竚癈鷭т繻Ь因恐官因恐甘因恐掬因恐恭因恐蟻因恐彊因恐狂因恐恵蝟昭粡竚癈鷭т繻Ь因恐顕因恐弦因恐慧因恐慌因恐抗因恐攻因恐調因恐験蝟昭粡竚癈鷭т繻Ь因恐拘因恐跳因恐脹因恐詑因恐弾因恐篤因恐旦因挟調蝟昭粡竚癈鷭т繻Ь因恐淡因恐鎮因恐鍛因恐蛋因恐嘆因恐歎因恐溝因恐湛蝟昭粡竚癈鷭т繻Ь因恭庵因恐電因恐同因恭卸因恭芦因恭宛因恐兎因恐撞蝟昭粡竚癈鷭т繻Ь因恭軌因恭嚇因恭環因挟叡因恭監因恭攻因恭古因恭鍵蝟昭粡竚癈鷭т繻Ь因恭疎因恭袈因恭然因恭呼因恭弦因恭稿因恭袖因恭饗蝟昭粡竚癈鷭т繻Ь因恭狭因恭妥因恭店因恭丹因恭旦因恭迭因恭湛因恭腸蝟昭粡竚癈鷭т繻Ь因恭洞因恭担因挟蔚因挟慨因挟斡因挟嘘因挟俺因挟涯蝟昭粡竚癈鷭т繻Ь因教営因挟鰻因挟恩因挟案因挟況因挟尭因挟袈因挟甘蝟昭粡竚癈鷭т繻Ь因教価因挟控因挟抗因挟禅因挟噌因挟幻因挟唾蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互珍桍鹿粡寂蝟赱齠洲粤讌将環銭環岡潅規潅桑澗測環謙潅岡鹿粡寂蝟赱齠洲粤讌将監卯甘桑屋幸甘穐甘卯価狸甘階甘頭鹿粡寂蝟赱齠洲粤讌将飢狸監喬監巻監岡監銭軌穐監潮輝謙鹿粡寂蝟赱齠洲粤讌将輝狸軌規飢巻飢階飢測騎巻騎規騎桑鹿粡寂蝟赱齠洲粤讌将騎喬騎謙鬼測鬼謙亀喬亀規鬼潮亀謙鹿粡寂蝟赱齠洲粤讌将亀適亀潮儀岡儀謙妓岡妓階存銭宜測鹿粡寂蝟赱齠洲粤讌将宜頭義測蟻桑誼階誼喬誼卯誼巻誼狸鹿粡寂蝟赱齠洲粤讌将議岡議測議幸掬穐掬卯菊卯祁岡彊銭鹿粡寂蝟赱齠洲粤讌将彊階菊測祁階恭規恭喬恭巻怯狸挟頭鹿粡寂蝟赱齠洲粤讌将挟巻挟幸挟卯教適教潮橋巻橋桑橋謙鹿粡寂蝟赱齠洲粤讌将教頭橋岡況穐狂階狂謙狂適狂幸狂巻鹿粡寂蝟赱齠洲粤讌将狭謙狭潮驚卯饗幸驚幸饗適饗狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋胎蝟昭粡竚癈鷭т繻Ь因橋担因橋存因橋超因橋珍因橋徹因橋各因橋填蝟昭粡竚癈鷭т繻Ь因橋店因橋動因橋撞因橋瞳因況案因況蔚因況嬰因況俺蝟昭粡竚癈鷭т繻Ь因況卸因昂蓋因況嘉因況各因況涯因況官因況蓋因況碍蝟昭粡竚癈鷭т繻Ь因況感因況掬因況彊因況宜因況恭因況挟因況弦因況薫蝟昭粡竚癈鷭т繻Ь因況噌因況恵因況響因況乎因況限因況繕因況善因況元蝟昭粡竚癈鷭т繻Ь因況揃因況兎因況卒因況澱因況続因況店因況存因況鉄蝟昭粡竚癈鷭т繻Ь因況津因況陳因況轍因況電因況孫因況壇因況旦因況天蝟昭粡竚癈鷭т繻Ь因響甲因狂嬰因狂感因狂温因狂完因狂環因狂害因狂甘蝟昭粡竚癈鷭т繻Ь因狂続因狂佳因狂宜因狂恭因狂祁因狂憩因狂稿因狂呼蝟昭粡竚癈鷭т繻Ь因狂祖因狂拘因狂皇因狂溝因狂験因響租因狂孫因狂郡蝟昭粡竚癈鷭т繻Ь因狂袖因狂前因狂汰因狭案因狂個因狂慧因狭葦因狂蛋蝟昭粡竚癈鷭т繻Ь因狭宛因狂銚因狭臆因狭俺因狂撤因狭庵因狂団蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互鎮桍鹿粡寂蝟赱齠洲粤讌将個巻古桑個規抗喬恒岡弘巻個桑鹿粡寂蝟赱齠洲粤讌将古階慌規呼幸古穐古頭慌謙慌銭恒銭鹿粡寂蝟赱齠洲粤讌将慌階慌卯乎喬昂幸昂桑控狸昂謙攻測鹿粡寂蝟赱齠洲粤讌将控巻昂適攻適抗幸昂巻抗潮控幸抗穐鹿粡寂蝟赱齠洲粤讌将攻卯控適控潮晃卯攻銭溝岡港適皇穐鹿粡寂蝟赱齠洲粤讌将溝頭甲卯皇階溝適甲適妥謙甲銭皇潮鹿粡寂蝟赱齠洲粤讌将溝測甲階港桑漸適更卯港穐更狸更規鹿粡寂蝟赱齠洲粤讌将溝巻皇適硬謙前岡善測稿頭属銭稿幸鹿粡寂蝟赱齠洲粤讌将稿岡硬桑前規溝卯善適硬潮善巻硬測鹿粡寂蝟赱齠洲粤讌将前銭善岡礎卯漸階善階全巻前狸膳岡鹿粡寂蝟赱齠洲粤讌将然喬膳謙全桑繕岡禅幸繕喬全謙然謙鹿粡寂蝟赱齠洲粤讌将漸岡噌穐糎潮疏穐糎巻疏岡疏階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋壷蝟昭粡竚癈鷭т繻Ь因響昂因原鰻因響詑因響坦因響嘆因響存因響続蝟昭粡竚癈鷭т繻Ь因響礎因響津因響脹因響墜因響疏因響珍因響伝因響涜蝟昭粡竚癈鷭т繻Ь因饗圧因原蔚因響徳因饗渦因饗蔚因溝咳因饗影因饗蓋蝟昭粡竚癈鷭т繻Ь因饗碍因袈鎮因饗街因晃電因饗慣因饗干因饗換因饗軌蝟昭粡竚癈鷭т繻Ь因饗宜因饗鬼因饗蟻因饗菊因饗怯因饗係因饗傾因饗憩蝟昭粡竚癈鷭т繻Ь因饗鍵因饗鹸因饗験因饗個因饗晃因饗控因饗硬因饗全蝟昭粡竚癈鷭т繻Ь因饗疏因饗疎因饗粗因饗族因饗賊因饗続因饗揃因饗唾蝟昭粡竚癈鷭т繻Ь因饗旦因饗誕因饗蝶因饗墜因饗澱因饗殿因饗導因饗兎蝟昭粡竚癈鷭т繻Ь因硬妥因驚宛因驚嘘因驚唄因驚餌因驚牡因驚桶因驚掬蝟昭粡竚癈鷭т繻Ь因驚亀因驚恐因驚響因驚顕因驚個因驚港因驚険因驚溝蝟昭粡竚癈鷭т繻Ь因驚慧因驚狂因驚軍因驚慌因驚弘因驚担因驚同因驚蝶蝟昭粡竚癈鷭т繻Ь因驚堕因驚跳因驚探因驚陳因驚租因驚賊因驚妥蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互津桍鹿粡寂蝟赱齠洲粤讌将誕銭団測壇頭団幸壇銭脹頭鹸潮鹿粡寂蝟赱齠洲粤讌将蝶喬腸測蝶潮蝶謙脹幸蝶規蝶階脹岡鹿粡寂蝟赱齠洲粤讌将聴狸超階長階超巻諜銭跳幸諜幸銚適鹿粡寂蝟赱齠洲粤讌将長規禿巻銚規墜幸撤規徹銭賃規鎮桑鹿粡寂蝟赱齠洲粤讌将津喬賃謙鎮喬津狸陳適鎮狸津謙陳岡鹿粡寂蝟赱齠洲粤讌将鎮規墜銭陳幸津巻陳規津銭津適轍潮鹿粡寂蝟赱齠洲粤讌将填適轍適撤幸天岡典頭迭適轍階填測鹿粡寂蝟赱齠洲粤讌将轍測天喬鉄潮撤頭鉄階迭銭鉄適轍巻鹿粡寂蝟赱齠洲粤讌将兎頭撤潮迭謙展岡伝銭店謙澱幸殿桑鹿粡寂蝟赱齠洲粤讌将田階殿潮伝頭澱巻殿岡田巻田規展頭鹿粡寂蝟赱齠洲粤讌将伝規澱岡店頭憧卯同卯梓狸電狸兎謙鹿粡寂蝟赱齠洲粤讌将兎適導頭兎岡導卯電頭導岡澱狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀋遁蝟昭粡竚癈鷭т繻Ь因尭嚇因尭嘘因凝瞳因尭原因尭形因尭係因尭険蝟昭粡竚癈鷭т繻Ь因尭鍵因尭尭因尭蟻因尭導因尭仰因尭顕因尭恵因尭妓蝟昭粡竚癈鷭т繻Ь因尭古因尭恒因尭嘆因尭橋因尭続因尭然因尭善因尭全蝟昭粡竚癈鷭т繻Ь因尭孫因尭旦因尭疏因尭墜因尭諜因尭澱因尭調因尭銚蝟昭粡竚癈鷭т繻Ь因尭同因尭電因尭賃因薫姐因薫安因尭徳因薫臼因薫葦蝟昭粡竚癈鷭т繻Ь因薫案因尭禿因薫餌因薫荏因尭郡因薫営因薫姥因薫影蝟昭粡竚癈鷭т繻Ь因薫外因薫嚇因薫害因薫輝因薫恭因薫更因薫慌因薫粗蝟昭粡竚癈鷭т繻Ь因薫同因薫礎因薫存因薫続因薫租因薫墜因薫誕因薫陳蝟昭粡竚癈鷭т繻Ь因薫長因訓姐因薫督因訓叡因訓厩因訓教因訓亀因訓幻蝟昭粡竚癈鷭т繻Ь因訓橋因訓恐因訓潅因訓偽因訓驚因訓呼因訓涜因訓鹸蝟昭粡竚癈鷭т繻Ь因訓控因訓糎因訓礎因訓跳因訓孫因訓妥因訓腸因訓湛蝟昭粡竚癈鷭т繻Ь因訓調因訓壇因訓徹因訓澱因訓天因訓撞因訓特蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互徹桍鹿粡寂蝟赱齠洲粤讌将影幸影頭屋潮憶穐憶測臆謙臆潮鹿粡寂蝟赱齠洲粤讌将臆狸桶穐桶岡桶測桶狸桶頭牡穐牡喬鹿粡寂蝟赱齠洲粤讌将牡測乙謙卸巻卸適恩岡恩卯恩桑温岡鹿粡寂蝟赱齠洲粤讌将温喬価岡価桑佳幸佳岡加階加喬加巻鹿粡寂蝟赱齠洲粤讌将加適可岡嘉岡嘉穐嘉卯夏幸夏桑旭頭鹿粡寂蝟赱齠洲粤讌将咳桑外銭咳狸咳喬咳潮崖巻害頭害幸鹿粡寂蝟赱齠洲粤讌将害規崖適慨適慨頭田謙概桑涯銭涯謙鹿粡寂蝟赱齠洲粤讌将碍穐碍謙碍規碍測碍銭鈎謙蛎階鈎適鹿粡寂蝟赱齠洲粤讌将蛎測鈎穐嚇規嚇適劃適漢岡完規感頭鹿粡寂蝟赱齠洲粤讌将寛規各謙干岡干銭患規干頭患頭患幸鹿粡寂蝟赱齠洲粤讌将幹卯患狸感幸慣穐感階感銭慣喬慣適鹿粡寂蝟赱齠洲粤讌将憾測換適漢桑潅銭潅頭環巻各卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺越蝟昭粡竚癈鷭т繻Ь因郡徹因郡迭因郡天因郡店因郡電因郡堂因郡動蝟昭粡竚癈鷭т繻Ь因郡同因郡童因郡瞳因卦梓因卦鯵因卦圧因卦庵因卦暗蝟昭粡竚癈鷭т繻Ь因卦按因卦欝因卦嘘因卦嬰因卦俺因卦加因卦鈎因卦幹蝟昭粡竚癈鷭т繻Ь因卦環因卦漢因卦換因卦蟻因卦感因卦義因卦狭因卦挟蝟昭粡竚癈鷭т繻Ь因卦況因卦饗因卦仰因卦係因卦袈因卦原因卦厳因卦郡蝟昭粡竚癈鷭т繻Ь因卦諺因卦弦因卦顕因卦拘因卦港因卦皇因卦禅因卦然蝟昭粡竚癈鷭т繻Ь因卦嘆因卦続因卦坦因卦袖因卦堕因卦存因卦唾因卦賊蝟昭粡竚癈鷭т繻Ь因卦団因卦蛋因卦腸因卦長因卦迭因卦津因卦禿因卦篤蝟昭粡竚癈鷭т繻Ь因卦特因袈葦因卦動因卦徳因卦堂因卦導因袈安因袈按蝟昭粡竚癈鷭т繻Ь因袈姐因袈影因袈卸因袈屋因袈憶因袈臆因袈牡因袈慨蝟昭粡竚癈鷭т繻Ь因袈外因袈蛎因袈慣因袈憾因袈感因袈誼因袈妓因袈怯蝟昭粡竚癈鷭т繻Ь因袈恐因袈狂因袈狭因袈響因袈況因袈驚因袈薫蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互轍桍鹿粡寂蝟赱齠洲粤讌将況岡況喬況謙況狸狂穐狂階狂謙鹿粡寂蝟赱齠洲粤讌将狂測狂適狭喬狭階狭幸狭銭饗穐饗巻鹿粡寂蝟赱齠洲粤讌将饗謙饗幸饗銭驚岡驚潮仰喬仰岡仰適鹿粡寂蝟赱齠洲粤讌将凝卯凝規凝桑凝銭恐頭尭測薫謙薫桑鹿粡寂蝟赱齠洲粤讌将薫巻群幸群巻訓適群規群喬訓測軍桑鹿粡寂蝟赱齠洲粤讌将軍謙郡桑卦銭袈謙袈測卦測袈規祁頭鹿粡寂蝟赱齠洲粤讌将祁適祁幸係適係測傾卯形穐傾適径穐鹿粡寂蝟赱齠洲粤讌将径喬径幸径頭径狸径潮径測恵桑恵潮鹿粡寂蝟赱齠洲粤讌将慶桑慶銭慶狸慧階慧適憩狸鍵狸険岡鹿粡寂蝟赱齠洲粤讌将慌喬顕穐慌銭鹸規幻適厳巻幻喬厳狸鹿粡寂蝟赱齠洲粤讌将弦銭幻狸諺階限規諺銭諺頭個卯乎喬鹿粡寂蝟赱齠洲粤讌将乎測個巻限適限狸乎規乎銭古狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺額蝟昭粡竚癈鷭т繻Ь因係天因係珍因係督因係憧因傾扱因傾渦因傾臼蝟昭粡竚癈鷭т繻Ь因傾厩因傾加因傾佳因傾完因傾彊因傾儀因傾菊因傾義蝟昭粡竚癈鷭т繻Ь因傾亀因傾騎因傾形因傾憩因傾諺因傾皇因傾膳因稿澗蝟昭粡竚癈鷭т繻Ь因傾疏因傾租因傾続因傾孫因傾汰因傾湛因傾諜因傾天蝟昭粡竚癈鷭т繻Ь因傾澱因傾撤因傾迭因形宛因形按因形姥因形厩因形屋蝟昭粡竚癈鷭т繻Ь因形影因傾鍵因形咳因形蛎因形嚇因形碍因形干因形儀蝟昭粡竚癈鷭т繻Ь因形換因形怯因形恐因形狭因稿皇因形薫因形傾因形慶蝟昭粡竚癈鷭т繻Ь因形幻因形昂因形控因形晃因形攻因形噌因形淡因形属蝟昭粡竚癈鷭т繻Ь因形其因形探因形担因形惰因弘験因形歎因形蛋因形団蝟昭粡竚癈鷭т繻Ь因形弾因形諜因形蝶因形長因形珍因形陳因形撤因形轍蝟昭粡竚癈鷭т繻Ь因形填因形田因形動因径芦因径案因径袷因径斡因径崖蝟昭粡竚癈鷭т繻Ь因径姥因径厩因径嬰因径概因径恩因径涯因径軌蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互鉄桍鹿粡寂蝟赱齠洲粤讌将揃銭属巻卒潮属測卒狸卒規揃規鹿粡寂蝟赱齠洲粤讌将其規揃巻其桑揃穐揃卯其狸其適孫潮鹿粡寂蝟赱齠洲粤讌将孫謙孫頭存潮孫狸孫銭存測孫岡存頭鹿粡寂蝟赱齠洲粤讌将袖潮孫幸唾測唾卯唾狸唾頭詑巻唾喬鹿粡寂蝟赱齠洲粤讌将堕潮妥幸単卯単巻妥喬妥規旦穐丹穐鹿粡寂蝟赱齠洲粤讌将丹桑単階惰階惰桑単桑丹潮惰喬嘆階鹿粡寂蝟赱齠洲粤讌将嘆桑嘆銭単頭坦桑嘆測坦潮担狸担階鹿粡寂蝟赱齠洲粤讌将探巻担頭担穐探穐探謙探頭旦巻探喬鹿粡寂蝟赱齠洲粤讌将旦規旦狸歎規淡階湛穐蛋巻蛋潮蛋岡鹿粡寂蝟赱齠洲粤讌将蛋測蛋卯蛋謙誕階誕岡誕卯蛋適誕幸鹿粡寂蝟赱齠洲粤讌将誕潮鍛穐鍛規鍛岡団謙団岡団狸壇岡鹿粡寂蝟赱齠洲粤讌将続測壇頭弾岡弾巻弾喬弾銭聴喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺吸蝟昭粡竚癈鷭т繻Ь因慶芦因慶叡因慶欝因慶袷因慶患因慶澗因慶嘉蝟昭粡竚癈鷭т繻Ь因慶害因慶各因慶概因慶感因慶軍因慶偽因慶甘因慶群蝟昭粡竚癈鷭т繻Ь因慶狂因慶凝因慶監因慶恭因慶抗因慶弦因慶蟻因慶呼蝟昭粡竚癈鷭т繻Ь因慶慶因慶溝因慶汰因慶租因慶然因慶袖因慶歎因慶堕蝟昭粡竚癈鷭т繻Ь因慶疎因慧劃因慶漸因慶粗因慶鎮因慶存因慶稿因慶属蝟昭粡竚癈鷭т繻Ь因慶銚因慶陳因慶鉄因慶津因慶涜因慶堂因慶撤因慧圧蝟昭粡竚癈鷭т繻Ь因慧袷因慧桶因慧憶因慧渦因慧咳因慧影因慧姐因慧安蝟昭粡竚癈鷭т繻Ь因慧臆因慧感因慧橋因慧蛎因慧概因慧街因慧干因慧碍蝟昭粡竚癈鷭т繻Ь因慧害因慧柿因慧況因慧議因慧偽因慧掬因慧宜因慧義蝟昭粡竚癈鷭т繻Ь因慧傾因慧響因慧狭因慧恵因慧径因慧験因慶諜因慧慶蝟昭粡竚癈鷭т繻Ь因呼租因慧憩因慧幻因慧弦因慧乎因慧慌因慧弘因慧抗蝟昭粡竚癈鷭т繻Ь因慧拘因慧攻因慧古因慧溝因慧甲因憩蓋因憩柿蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互填桍鹿粡寂蝟赱齠洲粤讌将憧規憧狸憧潮憧適撞穐撞卯撞規鹿粡寂蝟赱齠洲粤讌将撞巻撞謙撞頭洞穐洞謙洞幸洞桑瞳謙鹿粡寂蝟赱齠洲粤讌将童岡童喬童階童謙童桑童狸胴巻胴適鹿粡寂蝟赱齠洲粤讌将胴潮胴銭徳階徳頭涜岡涜幸徳適涜喬鹿粡寂蝟赱齠洲粤讌将涜謙揃卯特規特喬特銭督規督巻禿卯鹿粡寂蝟赱齠洲粤讌将禿喬禿幸篤階篤幸個狸旭喬旭巻旭測鹿粡寂蝟赱齠洲粤讌将葦岡葦謙葦幸葦狸芦卯芦謙鯵頭鯵測鹿粡寂蝟赱齠洲粤讌将梓銭梓喬圧岡圧謙圧銭圧頭斡岡斡謙鹿粡寂蝟赱齠洲粤讌将扱階扱岡扱穐扱喬扱幸扱潮扱頭宛巻鹿粡寂蝟赱齠洲粤讌将宛喬宛規姐測姐階姐銭袷潮厩穐袷狸鹿粡寂蝟赱齠洲粤讌将按測暗規按幸按潮庵巻按銭按喬碓幸鹿粡寂蝟赱齠洲粤讌将暗頭案卯臼測渦幸渦階渦頭唄測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺頚蝟昭粡竚癈鷭т繻Ь因攻限因険感因険嚇因険騎因険輝因鍵特因険訓蝟昭粡竚癈鷭т繻Ь因険凝因険教因険橋因険郡因険験因険幻因険諺因険鍵蝟昭粡竚癈鷭т繻Ь因険顕因険前因険控因険全因険然因険菊因険抗因険噌蝟昭粡竚癈鷭т繻Ь因険属因険袖因険妥因険存因険堕因険丹因険嘆因険汰蝟昭粡竚癈鷭т繻Ь因険湛因険団因険脹因険長因険銚因険淡因険珍因険墜蝟昭粡竚癈鷭т繻Ь因険徹因険天因険徳因険涜因険禿因顕葦因顕芦因顕圧蝟昭粡竚癈鷭т繻Ь因顕扱因顕袷因顕按因顕碓因顕蔚因顕温因顕佳因顕蓋蝟昭粡竚癈鷭т繻Ь因顕崖因顕完因顕宜因顕妓因顕議因顕義因顕菊因顕挟蝟昭粡竚癈鷭т繻Ь因顕恐因顕狂因顕響因顕饗因顕嘉因顕訓因顕祁因顕係蝟昭粡竚癈鷭т繻Ь因顕慧因顕個因顕慌因顕疎因顕稿因顕詑因顕礎因顕撤蝟昭粡竚癈鷭т繻Ь因顕迭因顕墜因顕腸因顕憧因顕導因顕徳因験抗因験鯵蝟昭粡竚癈鷭т繻Ь因顕涜因顕胴因顕津因験斡因顕鎮因験姐因顕長蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互展桍鹿粡寂蝟赱齠洲粤讌将崖規崖巻咳喬崖岡崖卯慨穐崖幸鹿粡寂蝟赱齠洲粤讌将概穐慨規害頭害測咳桑咳謙蓋規街銭鹿粡寂蝟赱齠洲粤讌将柿銭街頭柿岡街喬害階蓋適蓋桑蓋銭鹿粡寂蝟赱齠洲粤讌将碍狸蛎規碍階碍規柿穐蓋幸柿謙各巻鹿粡寂蝟赱齠洲粤讌将官階嚇測鈎適各潮完階劃謙完測鈎卯鹿粡寂蝟赱齠洲粤讌将各桑完桑嚇穐各岡完潮寛岡寛穐蛎潮鹿粡寂蝟赱齠洲粤讌将干謙軌喬各測感潮寛銭干狸亀銭憾巻鹿粡寂蝟赱齠洲粤讌将慣桑感測漢潮感適憾岡感幸幹喬寛狸鹿粡寂蝟赱齠洲粤讌将感頭慣幸干規潅銭感岡澗幸澗頭換頭鹿粡寂蝟赱齠洲粤讌将環幸潅潮澗測環銭環穐潅卯潅喬環喬鹿粡寂蝟赱齠洲粤讌将漢卯飢卯監頭監巻輝桑輝謙飢狸輝頭鹿粡寂蝟赱齠洲粤讌将輝規輝巻監狸鬼穐偽階亀謙鬼謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺鉱蝟昭粡竚癈鷭т繻Ь因元官因原芦因元澗因元亀因元鍵因元全因元幻蝟昭粡竚癈鷭т繻Ь因元恒因元諺因元糎因元仰因元拘因元溝因元伝因元厳蝟昭粡竚癈鷭т繻Ь因元甲因元祁因元慧因元弘因元湛因元汰因元弾因元孫蝟昭粡竚癈鷭т繻Ь因元聴因元諜因元陳因元典因元鎮因元胴因原袷因原嘘蝟昭粡竚癈鷭т繻Ь因原安因元禿因元徳因原斡因原臆因原荏因原外因原各蝟昭粡竚癈鷭т繻Ь因原環因甘亀因原鬼因原菊因原況因原訓因原抗因原然蝟昭粡竚癈鷭т繻Ь因原噌因原疏因原限因原乎因原其因原粗因原担因原旦蝟昭粡竚癈鷭т繻Ь因原属因原湛因幻桶因原疎因原調因原津因原店因原澱蝟昭粡竚癈鷭т繻Ь因原墜因原賃因原兎因厳渦因厳斡因厳宛因厳旭因厳鯵蝟昭粡竚癈鷭т繻Ь因原涜因厳臼因厳姐因厳按因原胴因厳袷因厳慨因厳各蝟昭粡竚癈鷭т繻Ь因厳碍因厳蛎因厳乙因厳温因厳荏因厳彊因厳菊因厳係蝟昭粡竚癈鷭т繻Ь因厳潅因厳甘因厳郡因厳儀因厳狂因厳凝因厳宜蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互伝桍鹿粡寂蝟赱齠洲粤讌将卦階袈階袈銭鍵規形岡傾頭係岡鹿粡寂蝟赱齠洲粤讌将形頭恵測径潮恵穐慶穐仰喬形測恵巻鹿粡寂蝟赱齠洲粤讌将径階恵桑恵喬径測慧頭憩岡慧穐鍵頭鹿粡寂蝟赱齠洲粤讌将鍵潮憩適憩喬憩桑鍵適慶岡険卯険喬鹿粡寂蝟赱齠洲粤讌将険規顕岡顕卯験卯験喬験幸顕桑験測鹿粡寂蝟赱齠洲粤讌将鹸巻鹸岡元岡元幸元適原岡原測幻卯鹿粡寂蝟赱齠洲粤讌将厳適弦適厳規厳潮限規厳岡幻岡弦桑鹿粡寂蝟赱齠洲粤讌将弦岡諺適弦幸諺岡幻潮諺巻限穐限頭鹿粡寂蝟赱齠洲粤讌将限卯乎階乎巻個巻個謙個幸個潮呼幸鹿粡寂蝟赱齠洲粤讌将弘岡呼狸呼巻古謙呼岡弘巻弘狸弘銭鹿粡寂蝟赱齠洲粤讌将恒階拘階恒適慌規慌銭慌測拘卯拘巻鹿粡寂蝟赱齠洲粤讌将抗測抗喬抗謙拘狸恒潮攻穐控適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺胎蝟昭粡竚癈鷭т繻Ь因弦橋因弦挟因弦仰因弦響因弦尭因弦郡因弦祁蝟昭粡竚癈鷭т繻Ь因弦慧因弦験因弦幻因弦諺因弦抗因弦晃因弦善因弦噌蝟昭粡竚癈鷭т繻Ь因弦繕因弦礎因弦粗因弦族因弦汰因弦堕因弦惰因弦丹蝟昭粡竚癈鷭т繻Ь因弦珍因弦鎮因弦陳因弦天因弦憧因弦童因諺鯵因諺蔚蝟昭粡竚癈鷭т繻Ь因諺碓因諺庵因諺餌因諺営因諺乙因諺涯因諺官因諺蟻蝟昭粡竚癈鷭т繻Ь因諺飢因諺感因諺憾因諺恵因諺仰因諺驚因諺恐因諺元蝟昭粡竚癈鷭т繻Ь因諺顕因諺鹸因諺糎因諺善因諺恒因諺禅因諺繕因諺港蝟昭粡竚癈鷭т繻Ь因諺然因諺担因諺団因諺嘆因諺珍因諺殿因諺導因諺天蝟昭粡竚癈鷭т繻Ь因諺鉄因諺同因限唄因諺徹因諺轍因諺瞳因諺津因諺賃蝟昭粡竚癈鷭т繻Ь因限庵因限扱因限荏因諺撤因限蔚因限碓因限鰻因限屋蝟昭粡竚癈鷭т繻Ь因限崖因昂疎因限俺因限佳因限嚇因限恩因限官因限潅蝟昭粡竚癈鷭т繻Ь因限監因限甘因限換因限偽因限蟻因限義因限饗蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互澱桍鹿粡寂蝟赱齠洲粤讌将袖頭其狸其頭揃巻揃潮存穐存狸鹿粡寂蝟赱齠洲粤讌将存適孫岡孫階孫喬孫幸孫銭坦銭担卯鹿粡寂蝟赱齠洲粤讌将坦頭担謙担狸担適探穐探規旦岡旦狸鹿粡寂蝟赱齠洲粤讌将歎謙歎銭淡岡淡幸淡規淡銭淡潮淡適鹿粡寂蝟赱齠洲粤讌将湛巻歎狸湛謙憶潮蛋潮蛋銭誕潮誕岡鹿粡寂蝟赱齠洲粤讌将誕階蛋適誕喬鍛謙鍛卯壇巻壇階団銭鹿粡寂蝟赱齠洲粤讌将弾潮弾銭弾測聴巻聴規聴銭聴桑聴頭鹿粡寂蝟赱齠洲粤讌将聴潮脹穐憧適脹階鍛潮脹巻脹喬超桑鹿粡寂蝟赱齠洲粤讌将超潮跳卯跳階銚卯長幸鎮岡賃適賃銭鹿粡寂蝟赱齠洲粤讌将鎮頭陳銭陳喬鎮狸陳測鎮測津銭津測鹿粡寂蝟赱齠洲粤讌将陳頭津階墜狸徹謙徹幸墜頭撤潮撤適鹿粡寂蝟赱齠洲粤讌将撤穐撤頭鉄岡迭規迭穐迭巻鉄銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺壷蝟昭粡竚癈鷭т繻Ь因古慣因古換因古潅因古軌因古憾因古宜因古挟蝟昭粡竚癈鷭т繻Ь因古彊因古価因古恭因古亀因古袈因古群因古恵因古険蝟昭粡竚癈鷭т繻Ь因古厳因古元因古鹸因古限因古諺因古抗因古恒因古拘蝟昭粡竚癈鷭т繻Ь因古更因古疏因古善因古礎因古属因古旦因古賊因古妥蝟昭粡竚癈鷭т繻Ь因古探因古淡因古誕因古賃因古迭因古特因古涜因古殿蝟昭粡竚癈鷭т繻Ь因古禿因呼袷因呼圧因呼欝因呼渦因呼厩因呼嘘因呼叡蝟昭粡竚癈鷭т繻Ь因呼影因呼餌因呼庵因呼俺因呼崖因呼蛎因呼街因呼患蝟昭粡竚癈鷭т繻Ь因呼寛因呼嚇因呼潅因呼換因呼感因呼甘因呼儀因呼誼蝟昭粡竚癈鷭т繻Ь因呼恐因呼恭因呼挟因呼甲因呼稿因呼然因呼祖因呼粗蝟昭粡竚癈鷭т繻Ь因呼揃因呼珍因呼典因呼轍因呼伝因呼兎因弘厳因呼憧蝟昭粡竚癈鷭т繻Ь因弘圧因呼胴因呼徳因弘臼因弘欝因弘憶因弘按因弘嬰蝟昭粡竚癈鷭т繻Ь因弘蔚因弘安因弘卸因弘涯因弘概因弘街因呼童蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互電桍鹿粡寂蝟赱齠洲粤讌将梓頭圧穐圧卯圧岡旭適梓幸鯵適鹿粡寂蝟赱齠洲粤讌将圧喬圧謙圧適斡謙斡頭扱喬響謙扱岡鹿粡寂蝟赱齠洲粤讌将宛岡扱潮宛卯宛穐宛銭宛幸宛頭袷謙鹿粡寂蝟赱齠洲粤讌将袷頭安卯安規暗岡暗巻牡謙按測碓岡鹿粡寂蝟赱齠洲粤讌将臼岡臼幸嘘岡嘘穐唄銭欝喬欝謙蔚階鹿粡寂蝟赱齠洲粤讌将蔚規蔚幸鰻階鰻岡姥測姥幸姥岡荏岡鹿粡寂蝟赱齠洲粤讌将荏測荏頭荏銭餌規餌巻餌銭叡穐叡卯鹿粡寂蝟赱齠洲粤讌将叡幸叡測営穐営喬営頭嬰卯営測影狸鹿粡寂蝟赱齠洲粤讌将影規影喬憶適影頭憶巻臆狸憶規憶卯鹿粡寂蝟赱齠洲粤讌将乙適乙桑牡規牡幸俺巻牡謙温規桶頭鹿粡寂蝟赱齠洲粤讌将牡測乙穐温狸温喬温階温測乙銭加頭鹿粡寂蝟赱齠洲粤讌将佳幸佳桑嘉幸外頭夏銭慨巻害適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝濺遁蝟昭粡竚癈鷭т繻Ь因抗厩因抗臆因抗荏因抗桶因抗柿因抗概因抗蛎蝟昭粡竚癈鷭т繻Ь因抗誼因抗彊因抗恵因抗凝因抗偽因抗属因抗礎因抗祖蝟昭粡竚癈鷭т繻Ь因抗拘因抗孫因抗超因抗跳因抗展因抗典因抗銚因抗坦蝟昭粡竚癈鷭т繻Ь因抗陳因抗聴因抗淡因抗鉄因拘荏因拘唄因拘嘘因拘鯵蝟昭粡竚癈鷭т繻Ь因拘扱因拘碓因拘涯因拘佳因拘概因拘憶因拘柿因拘官蝟昭粡竚癈鷭т繻Ь因拘飢因拘幹因拘蟻因拘彊因拘恐因拘掬因拘響因慌温蝟昭粡竚癈鷭т繻Ь因拘薫因拘卦因拘祁因拘慶因拘義因拘恵因拘慧因拘険蝟昭粡竚癈鷭т繻Ь因拘憩因控顕因控厳因控諺因控拘因控攻因控晃因控更蝟昭粡竚癈鷭т繻Ь因控前因控糎因控膳因控祖因控唾因控詑因控孫因控妥蝟昭粡竚癈鷭т繻Ь因控蛋因尭洞因控坦因控団因控鍛因控諜因控調因控超蝟昭粡竚癈鷭т繻Ь因控鎮因控撤因控典因控轍因攻憶因攻恩因攻嘉因攻夏蝟昭粡竚癈鷭т繻Ь因攻寛因攻潅因攻監因攻澗因攻祁因攻誼因攻掬蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互動桍鹿粡寂蝟赱齠洲粤讌将教潮教頭橋喬況岡橋狸狂潮狭謙鹿粡寂蝟赱齠洲粤讌将狭規狭桑響銭響桑饗卯饗岡饗穐饗巻鹿粡寂蝟赱齠洲粤讌将饗喬饗謙饗幸驚適驚測驚幸驚潮拘潮鹿粡寂蝟赱齠洲粤讌将仰狸薫潮仰規尭幸薫巻薫喬薫謙訓階鹿粡寂蝟赱齠洲粤讌将薫適訓卯薫頭訓喬訓幸群巻群銭軍穐鹿粡寂蝟赱齠洲粤讌将軍幸軍潮軍適郡巻郡喬郡謙郡岡郡幸鹿粡寂蝟赱齠洲粤讌将卦狸袈穐袈巻袈喬袈謙可岡袈測祁卯鹿粡寂蝟赱齠洲粤讌将祁幸係規祁狸係卯祁銭係喬係測係頭鹿粡寂蝟赱齠洲粤讌将傾穐傾狸形謙形喬形階径階径巻恵階鹿粡寂蝟赱齠洲粤讌将恵喬恵謙恵測慶狸慧潮憧頭憩岡祖頭鹿粡寂蝟赱齠洲粤讌将憩喬憩規鍵頭鍵狸験謙顕巻顕卯験桑鹿粡寂蝟赱齠洲粤讌将験潮鹸喬鹸頭鹸測原測原頭厳穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀑越蝟昭粡竚癈鷭т繻Ь因晃訓因晃郡因晃軍因晃疏因晃粗因晃賊因晃其蝟昭粡竚癈鷭т繻Ь因晃担因晃坦因晃旦因晃店因晃殿因更鯵因更姐因更渦蝟昭粡竚癈鷭т繻Ь因更唄因更姥因更憶因更営因更嬰因更牡因更屋因更加蝟昭粡竚癈鷭т繻Ь因更嘉因更劃因更嚇因更寛因更換因更患因更軌因更澗蝟昭粡竚癈鷭т繻Ь因更輝因更飢因更潅因更亀因更昂因更晃因更禅因更祖蝟昭粡竚癈鷭т繻Ь因更租因更唾因更墜因更賃因更陳因更銚因更脹因更田蝟昭粡竚癈鷭т繻Ь因更電因更同因更堂因更涜因更童因港葦因港案因港圧蝟昭粡竚癈鷭т繻Ь因更轍因港厩因港佳因港碍因港患因港寛因港完因港干蝟昭粡竚癈鷭т繻Ь因港嚇因港亀因港環因港蟻因港儀因港菊因港恐因港教蝟昭粡竚癈鷭т繻Ь因港挟因港狭因港饗因港響因港祖因港属因港唾因港丹蝟昭粡竚癈鷭т繻Ь因港弾因港脹因港蝶因港調因港津因港墜因港轍因港迭蝟昭粡竚癈鷭т繻Ь因港填因港兎因港殿因港電因港憧因港同因港瞳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互堂桍鹿粡寂蝟赱齠洲粤讌将粗測属喬賊謙賊銭賊頭族岡族階鹿粡寂蝟赱齠洲粤讌将族規族桑族謙族幸族銭族適族頭続岡鹿粡寂蝟赱齠洲粤讌将卒巻卒階卒頭卒潮卒適袖卯袖謙揃巻鹿粡寂蝟赱齠洲粤讌将孫階存階孫卯孫喬孫桑孫頭汰穐汰謙鹿粡寂蝟赱齠洲粤讌将詑巻唾穐唾銭詑幸唾喬唾頭堕卯堕岡鹿粡寂蝟赱齠洲粤讌将妥階妥岡妥巻堕巻妥卯坦銭惰岡惰卯鹿粡寂蝟赱齠洲粤讌将惰穐単規単巻丹幸単階丹狸丹喬丹謙鹿粡寂蝟赱齠洲粤讌将単岡丹銭丹巻嘆適単測嘆規嘆巻嘆卯鹿粡寂蝟赱齠洲粤讌将坦穐担桑坦岡担喬坦適探銭旦穐旦桑鹿粡寂蝟赱齠洲粤讌将歎喬歎謙壇桑壇狸弾穐聴幸聴謙壇測鹿粡寂蝟赱齠洲粤讌将聴階聴喬腸銭腸喬珍頭腸階脹頭調巻鹿粡寂蝟赱齠洲粤讌将脹規脹岡調卯蝶頭蝶適調喬調謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀑額蝟昭粡竚癈鷭т繻Ь因皇議因皇掬因皇挟因皇輝因皇軌因皇宜因皇群蝟昭粡竚癈鷭т繻Ь因皇弦因皇厳因皇疎因皇尭因皇形因皇港因皇全因皇噌蝟昭粡竚癈鷭т繻Ь因皇族因皇担因皇単因皇詑因皇存因皇汰因皇旦因皇弾蝟昭粡竚癈鷭т繻Ь因皇嘆因皇長因皇蝶因皇童因皇填因皇田因皇兎因皇督蝟昭粡竚癈鷭т繻Ь因硬荏因硬餌因硬嬰因硬卦因硬傾因硬慶因硬険因硬幻蝟昭粡竚癈鷭т繻Ь因硬限因硬乎因硬慌因硬控因硬恒因硬皇因硬禅因硬噌蝟昭粡竚癈鷭т繻Ь因硬存因硬疏因硬祖因昂怯因硬鍛因硬壇因硬弾因硬聴蝟昭粡竚癈鷭т繻Ь因硬調因硬鎮因硬津因硬陳因硬徹因硬典因硬展因硬兎蝟昭粡竚癈鷭т繻Ь因硬憧因硬洞因硬瞳因硬胴因硬涜因硬特因硬督因稿扱蝟昭粡竚癈鷭т繻Ь因稿宛因袈揃因稿欝因稿憶因稿加因稿嚇因稿漢因稿飢蝟昭粡竚癈鷭т繻Ь因稿鬼因稿恭因稿菊因稿彊因稿怯因稿橋因稿況因稿驚蝟昭粡竚癈鷭т繻Ь因稿響因稿祁因稿群因稿袈因稿控因稿甲因稿前蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互憧桍鹿粡寂蝟赱齠洲粤讌将顕頭甲桑圧幸感巻営狸厩幸穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀑吸蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因禿崖蝟昭粡竚癈鷭т繻Ь因禿咳蝟昭粡竚癈鷭т繻Ь因禿外蝟昭粡竚癈鷭т繻Ь因禿概因禿涯因禿街因禿柿蝟昭粡竚癈鷭т繻Ь因禿碍因禿蓋因禿各因禿完因禿劃因禿嚇因禿官因禿寛蝟昭粡竚癈鷭т繻Ь因禿干因禿幹因禿蛎因禿鈎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互胴桍鹿粡寂蝟赱齠洲粤讌将展銭恒狸慨謙恩謙環狸特幸安測鹿粡寂蝟赱齠洲粤讌将恭卯乎謙夏幸尭測憧規轍謙電卯兎狸鹿粡寂蝟赱齠洲粤讌将動穐動階導幸撞喬胴岡童銭胴銭胴巻鹿粡寂蝟赱齠洲粤讌将特潮梓穐芦岡篤頭葦適梓喬扱穐梓岡鹿粡寂蝟赱齠洲粤讌将姐巻案巻按謙唄銭蔚巻厩潮餌適嬰狸鹿粡寂蝟赱齠洲粤讌将憶規温狸価喬加穐可測外穐外桑害巻鹿粡寂蝟赱齠洲粤讌将碍岡街階蛎岡劃潮前適換狸憾銭漢幸鹿粡寂蝟赱齠洲粤讌将監頭妓喬卦幸袈規形狸恵謙恵桑前頭鹿粡寂蝟赱齠洲粤讌将善穐弦適限岡弘測控階控測控潮攻階鹿粡寂蝟赱齠洲粤讌将港巻溝銭袖喬唾穐飢頭堕謙妥狸単適鹿粡寂蝟赱齠洲粤讌将蛋喬誕銭弾規腸桑諜階善卯調岡超潮鹿粡寂蝟赱齠洲粤讌将賃謙賃幸陳穐堂卯導巻洞桑涜桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀑想蝟昭粡竚癈鷭т繻Ь因菊津因彊議因彊元因彊諺因彊津因彊諜因怯屋蝟昭粡竚癈鷭т繻Ь因彊堂因怯臼因怯碍因怯外因怯晃因恐嘘因恐繕因恭撞蝟昭粡竚癈鷭т繻Ь因挟彊因挟皇因挟壇因教甘因橋旭因橋欝因橋蛎因橋姐蝟昭粡竚癈鷭т繻Ь因橋嘉因橋嬰因橋牡因橋教因橋儀因橋宜因徳渦因橋軍蝟昭粡竚癈鷭т繻Ь因橋更因橋前因橋族因橋惰因橋徳因況暗因胴温因況橋蝟昭粡竚癈鷭т繻Ь因況詑因狂飢因況丹因狂葦因狂幹因狂弾因徳嘘因狭狂蝟昭粡竚癈鷭т繻Ь因徳唄因狭晃因狭轍因響外因響饗因響感因響軍因響慧蝟昭粡竚癈鷭т繻Ь因響轍因響鉄因饗超因驚各因驚誼因驚原因驚尭因驚珍蝟昭粡竚癈鷭т繻Ь因仰梓因仰厳因仰尭因仰攻因仰礎因仰弾因仰童因仰堂蝟昭粡竚癈鷭т繻Ь因仰特因凝街因凝誼因凝卸因凝鈎因凝惰因尭幻因尭袖蝟昭粡竚癈鷭т繻Ь因尭撞因薫圧因薫扱因薫恩因薫元因薫疎因訓案因訓梓蝟昭粡竚癈鷭т繻Ь因訓誼因訓感因訓慣因徳欝因訓単因訓禿因群賊蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互涜桍鹿粡寂蝟赱齠洲粤讌将佳適害巻善喬碍桑蛎潮鈎幸劃喬鹿粡寂蝟赱齠洲粤讌将嚇階劃岡完桑各規寛喬寛銭寛幸寛適鹿粡寂蝟赱齠洲粤讌将感岡憾幸換頭軌卯偽頭狂岡狭狸狭適鹿粡寂蝟赱齠洲粤讌将狭測響喬善桑郡喬価頭顕卯鹸適原巻鹿粡寂蝟赱齠洲粤讌将厳銭抗穐善謙善幸善銭更巻善測更測鹿粡寂蝟赱齠洲粤讌将祖卯租桑善狸租測孫適善潮調謙諜狸鹿粡寂蝟赱齠洲粤讌将賃桑珍穐陳喬典岡憧桑徳卯善適外卯鹿粡寂蝟赱齠洲粤讌将涯岡碍頭鈎桑各喬幹謙澗巻亀階亀幸鹿粡寂蝟赱齠洲粤讌将偽測善頭蟻穐漸穐漸卯鍵桑呼規善岡鹿粡寂蝟赱齠洲粤讌将然桑膳幸疏桑疎適祖頭漸岡粗喬袖階鹿粡寂蝟赱齠洲粤讌将揃頭弾穐弾巻脹岡跳喬漸階澱頭漸巻鹿粡寂蝟赱齠洲粤讌将漸規斡桑按適漸喬臼規渦桑営銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝瀑築蝟昭粡竚癈鷭т繻Ь因恒跳因恒津因恒田因恒電因恒鉄因恒典因慌斡蝟昭粡竚癈鷭т繻Ь因慌碓因慌袷因慌柿因慌完因慌鈎因慌甘因慌宜因慌輝蝟昭粡竚癈鷭т繻Ь因慌街因慌況因慌膳因慌祁因慌係因慌天因慌跳因慌長蝟昭粡竚癈鷭т繻Ь因慌聴因徳卸因慌諜因慌徹因慌蝶因抗乙因抗憶因慌涜蝟昭粡竚癈鷭т繻Ь因徳恩因抗嬰因慌篤因抗営因抗芦因抗薫因抗儀因抗全蝟昭粡竚癈鷭т繻Ь因抗旦因抗津因抗童因拘咳因拘患因拘憾因控慌因胴鎮蝟昭粡竚癈鷭т繻Ь因徳温因攻皇因攻粗因昂崖因昂蛎因昂干因昂環因昂監蝟昭粡竚癈鷭т繻Ь因昂輝因昂亀因晃儀因晃教因徳価因徳佳因更卸因徳加蝟昭粡竚癈鷭т繻Ь因更硬因港甘因港長因港鎮因溝卦因溝群因溝呼因溝賊蝟昭粡竚癈鷭т繻Ь因溝詑因甲旭因皇薫因皇饗因徳可因硬厩因硬脹蝟昭粡竚癈鷭т繻Ь因憶薫因憶訓因憶群因憶軍因憶郡因憶卦因憶袈蝟昭粡竚癈鷭т繻Ь因憶祁因憶係因憶傾因篤轍因旭繕因篤扱因篤芦蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь莱竰闢閹嫦浴韶蜴衷逅癆蛯跂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互特熏黝蝟昭粡竚癈鷭т繻Ь因恒跳因恒津因恒田因恒電因恒鉄因恒典因慌斡蝟昭粡竚癈鷭т繻Ь因慌碓因慌袷因慌柿因慌完因慌鈎因慌甘因慌宜因慌輝蝟昭粡竚癈鷭т繻Ь因慌街因慌況因慌膳因慌祁因慌係因慌天因慌跳因慌長蝟昭粡竚癈鷭т繻Ь因慌聴因徳卸因慌諜因慌徹因慌蝶因抗乙因抗憶因慌涜蝟昭粡竚癈鷭т繻Ь因徳恩因抗嬰因慌篤因抗営因抗芦因抗薫因抗儀因抗全蝟昭粡竚癈鷭т繻Ь因抗旦因抗津因抗童因拘咳因拘患因拘憾因控慌因胴鎮蝟昭粡竚癈鷭т繻Ь因徳温因攻皇因攻粗因昂崖因昂蛎因昂干因昂環因昂監蝟昭粡竚癈鷭т繻Ь因昂輝因昂亀因晃儀因晃教因徳価因徳佳因更卸因徳加蝟昭粡竚癈鷭т繻Ь因更硬因港甘因港長因港鎮因溝卦因溝群因溝呼因溝賊蝟昭粡竚癈鷭т繻Ь因溝詑因甲旭因皇薫因皇饗因徳可因硬厩因硬脹蝟昭粡竚癈鷭т繻Ь因憶薫因憶訓因憶群因憶軍因憶郡因憶卦因憶袈蝟昭粡竚癈鷭т繻Ь因憶祁因憶係因憶傾因篤轍因篤鉄因篤扱因篤芦蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹徳菓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因芦銚蝟昭粡竚癈鷭т繻Ь因芦歎因旭存因芦長因芦陳因旭粗因芦賃因芦珍因篤掬蝟昭粡竚癈鷭т繻Ь因鯵鹸因鯵元蝟昭粡竚癈鷭т繻Ь因旭善因篤鉄因旭惰蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因旭汰因旭疏因旭噌因旭租因憶臆蝟昭粡竚癈鷭т繻Ь因旭全因憶蔚蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼繕桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐蓋喬蓋謙蓋幸蓋銭柿銭穐蓋狸鹿粡寂蝟赱齠洲粤讌将穐蓋適柿測穐蓋頭穐穐穐鹿粡寂蝟赱齠洲粤讌将穐柿狸柿潮柿適柿頭鈎銭街穐鈎狸鹿粡寂蝟赱齠洲粤讌将鈎岡鈎潮鈎測蛎穐鈎適穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹徳頚蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因梓芦因梓鯵因梓梓因梓圧因梓斡因梓扱蝟昭粡竚癈鷭т繻Ь因梓宛因梓姐因梓袷因梓安因梓庵因梓暗因梓案蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因梓飢因梓騎因梓鬼因梓亀因梓偽因梓儀蝟昭粡竚癈鷭т繻Ь因梓妓因梓宜因梓義因梓蟻因梓誼因梓掬因梓菊蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼噌桍鹿粡寂蝟赱齠洲粤讌将庵喬臼穐穐渦喬穐嘘岡穐鹿粡寂蝟赱齠洲粤讌将唄卯嘘頭穐唄銭按謙欝岡穐蔚喬鹿粡寂蝟赱齠洲粤讌将按適穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐暗喬臼卯案穐渦桑嘘卯嘘階嘘謙鹿粡寂蝟赱齠洲粤讌将唄岡唄穐唄幸唄測案謙欝階按頭蔚桑鹿粡寂蝟赱齠洲粤讌将案適穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹徳想蝟昭粡竚癈鷭т繻Ь因旭単因旭丹因旭担因旭嘆因葦芦因葦団因葦旭蝟昭粡竚癈鷭т繻Ь因葦梓因旭探因旭坦因葦斡因葦宛因葦庵因旭歎因葦袷蝟昭粡竚癈鷭т繻Ь因葦暗因旭湛因旭淡因旭誕因旭蛋因葦荏因葦蔚因葦渦蝟昭粡竚癈鷭т繻Ь因葦姥因葦叡因葦嬰因葦臆因葦屋因葦牡因旭団蝟昭粡竚癈鷭т繻Ь因旭鍛因旭弾因旭壇因葦弾因葦外因葦価因葦嘉因葦恩蝟昭粡竚癈鷭т繻Ь因葦慨因葦涯因葦街因葦劃因葦蛎因葦干因葦慣因葦患蝟昭粡竚癈鷭т繻Ь因旭脹因旭蝶因旭腸因旭超因旭調因葦脹因葦軌因葦潅蝟昭粡竚癈鷭т繻Ь因旭諜因葦鬼因葦妓因葦偽因葦義因葦誼因葦彊因葦掬蝟昭粡竚癈鷭т繻Ь因葦挟因葦恐因旭珍因旭長因旭鎮因旭賃因葦驚因葦蝶蝟昭粡竚癈鷭т繻Ь因葦薫因葦響因葦群因葦凝因葦狂因葦跳因葦賃因葦長蝟昭粡竚癈鷭т繻Ь因葦諜因葦郡因旭陳因葦係因葦袈因葦傾因葦慶因葦径蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼疎桍鹿粡寂蝟赱齠洲粤讌将暗卯暗穐暗巻暗岡碓階叡適碓卯鹿粡寂蝟赱齠洲粤讌将碓規暗規暗階碓桑碓幸碓潮暗桑碓測鹿粡寂蝟赱齠洲粤讌将碓頭暗幸暗謙暗測暗銭臼測臼桑臼階鹿粡寂蝟赱齠洲粤讌将臼幸影規臼潮臼頭穐渦卯渦規暗潮鹿粡寂蝟赱齠洲粤讌将暗狸暗頭暗適営穐穐渦測渦頭渦幸鹿粡寂蝟赱齠洲粤讌将嘘規嘘桑嘘銭嘘適嘘狸唄巻唄謙唄喬鹿粡寂蝟赱齠洲粤讌将案卯案階案岡案喬案巻営岡欝卯唄潮鹿粡寂蝟赱齠洲粤讌将案規欝規欝幸欝桑欝測欝潮蔚卯欝頭鹿粡寂蝟赱齠洲粤讌将蔚規蔚階案銭案幸案狸案測蔚潮営巻鹿粡寂蝟赱齠洲粤讌将鰻卯蔚測鰻階蔚頭蔚幸営謙営狸営銭鹿粡寂蝟赱齠洲粤讌将営喬鰻規案潮案頭鰻桑鰻銭鰻適鰻狸鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜異蝟昭粡竚癈鷭т繻Ь因甘芦因甘梓因甘圧因甘庵因甘渦因甘影因甘桶蝟昭粡竚癈鷭т繻Ь因甘牡因甘恩因甘佳因甘嘉因甘夏因甘外因甘概因甘完蝟昭粡竚癈鷭т繻Ь因甘官因甘幹因甘慣因甘輝因甘義因甘誼因甘恭因甘狂蝟昭粡竚癈鷭т繻Ь因甘狭因甘郡因甘卦因甘傾因甘憩因甘個因甘攻因甘昂蝟昭粡竚癈鷭т繻Ь因甘皇因甘粗因甘孫因甘坦因甘聴因甘珍因甘賃因甘徹蝟昭粡竚癈鷭т繻Ь因甘撤因甘轍因甘展因甘兎因甘同因甘導因甘撞因甘督蝟昭粡竚癈鷭т繻Ь因甘禿因甘篤因監旭因監芦因監鯵因監宛因監安因監庵蝟昭粡竚癈鷭т繻Ь因監渦因監欝因監蔚因監鰻因監厩因監嘉因監咳因監彊蝟昭粡竚癈鷭т繻Ь因監崖因監概因監碍因監街因監蛎因監嚇因監完因監寛蝟昭粡竚癈鷭т繻Ь因監憾因監換因監澗因監潅因監飢因監鬼因監偽因監妓蝟昭粡竚癈鷭т繻Ь因監菊因監恭因監響因監驚因監凝因監訓因監祁因監係蝟昭粡竚癈鷭т繻Ь因監傾因監形因監慶因監慧因監険因監顕因監鹸蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼賊桍鹿粡寂蝟赱齠洲粤讌将童規童幸童銭童狸童適胴穐胴岡鹿粡寂蝟赱齠洲粤讌将胴階胴巻胴桑胴幸胴銭胴適胴頭涜岡鹿粡寂蝟赱齠洲粤讌将涜桑涜幸涜測涜狸涜潮涜適特穐特卯鹿粡寂蝟赱齠洲粤讌将特規特喬特謙特幸特測特狸特潮特頭鹿粡寂蝟赱齠洲粤讌将督岡督狸禿穐禿岡篤穐篤岡篤狸篤潮鹿粡寂蝟赱齠洲粤讌将篤頭旭穐旭卯旭巻旭桑旭銭旭狸旭適鹿粡寂蝟赱齠洲粤讌将葦穐葦階葦桑葦謙葦測葦狸葦潮葦適鹿粡寂蝟赱齠洲粤讌将芦岡芦桑芦適鯵穐鯵岡鯵階鯵規梓穐鹿粡寂蝟赱齠洲粤讌将梓卯梓岡梓規梓喬梓銭梓狸梓適圧卯鹿粡寂蝟赱齠洲粤讌将圧岡圧階圧桑圧幸圧頭斡穐斡岡斡階鹿粡寂蝟赱齠洲粤讌将斡喬斡桑斡銭斡潮扱穐扱卯鯵測宛卯鹿粡寂蝟赱齠洲粤讌将宛階宛巻宛喬宛銭宛適宛頭姐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜菓蝟昭粡竚癈鷭т繻Ь因軌慌因軌抗因軌拘因軌攻因軌溝因軌甲因軌硬蝟昭粡竚癈鷭т繻Ь因軌稿因軌前因軌善因軌漸因軌疏因軌粗因軌属因軌孫蝟昭粡竚癈鷭т繻Ь因軌汰因軌堕因軌丹因軌坦因軌担因軌歎因軌鍛因軌壇蝟昭粡竚癈鷭т繻Ь因軌聴因軌蝶因軌調因軌銚因軌鎮因軌陳因軌墜因軌轍蝟昭粡竚癈鷭т繻Ь因軌鉄因軌填因軌展因軌店因軌兎因軌同因軌洞因軌徳蝟昭粡竚癈鷭т繻Ь因軌禿因輝鯵因輝斡因輝扱因輝宛因輝安因輝庵因輝按蝟昭粡竚癈鷭т繻Ь因輝暗因軌堂因輝碓因輝鰻因輝厩因輝餌因輝叡因輝営蝟昭粡竚癈鷭т繻Ь因輝嬰因輝桶因輝卸因輝恩因輝加因輝可因輝夏因輝咳蝟昭粡竚癈鷭т繻Ь因輝崖因輝慨因輝概因輝蓋因輝街因輝寛因輝漢因輝監蝟昭粡竚癈鷭т繻Ь因輝騎因輝亀因輝儀因輝妓因輝菊因輝挟因輝橋因輝慧蝟昭粡竚癈鷭т繻Ь因輝験因輝鹸因輝限因輝古因輝晃因輝皇因輝善因輝然蝟昭粡竚癈鷭т繻Ь因輝祖因輝存因輝汰因輝唾因輝妥因輝惰因輝嘆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼続桍鹿粡寂蝟赱齠洲粤讌将叡謙叡頭営卯営岡営階営規営謙鹿粡寂蝟赱齠洲粤讌将営適嬰岡嬰規嬰適影岡影階影巻影桑鹿粡寂蝟赱齠洲粤讌将屋卯屋岡屋規憶岡憶階憶規憶喬憶謙鹿粡寂蝟赱齠洲粤讌将臆岡臆謙桶卯桶岡桶規桶狸牡規牡幸鹿粡寂蝟赱齠洲粤讌将乙規乙桑乙謙乙銭乙狸乙頭俺穐俺卯鹿粡寂蝟赱齠洲粤讌将俺喬俺適卸桑卸謙卸幸恩穐恩岡恩規鹿粡寂蝟赱齠洲粤讌将恩銭恩狸温階温規温喬温桑温謙温銭鹿粡寂蝟赱齠洲粤讌将温狸価巻価規価喬価桑価頭佳穐佳喬鹿粡寂蝟赱齠洲粤讌将佳桑佳謙佳銭佳測佳潮加穐加巻加喬鹿粡寂蝟赱齠洲粤讌将加謙加狸加頭可卯可巻可喬可測可狸鹿粡寂蝟赱齠洲粤讌将嘉卯嘉規嘉謙嘉幸嘉銭嘉狸夏穐夏卯鹿粡寂蝟赱齠洲粤讌将夏巻夏喬夏桑外穐外階外銭外測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜館蝟昭粡竚癈鷭т繻Ь因騎庵因騎臼因騎嘘因騎姥因騎餌因騎叡因騎嬰蝟昭粡竚癈鷭т繻Ь因騎影因騎乙因騎卸因騎恩因騎温因騎佳因騎加因騎可蝟昭粡竚癈鷭т繻Ь因騎外因騎害因騎概因騎鈎因騎劃因騎嚇因騎寛因騎潅蝟昭粡竚癈鷭т繻Ь因騎澗因騎宜因騎蟻因騎怯因騎恭因騎教因騎驚因騎仰蝟昭粡竚癈鷭т繻Ь因騎群因騎傾因騎慧因騎験因騎厳因騎幻因騎古因騎抗蝟昭粡竚癈鷭т繻Ь因騎拘因騎更因騎皇因騎善因騎全因騎疏因騎疎因騎粗蝟昭粡竚癈鷭т繻Ь因騎族因騎卒因騎袖因騎揃因騎存因騎汰因騎堕因騎丹蝟昭粡竚癈鷭т繻Ь因騎探因騎弾因騎腸因騎蝶因騎諜因騎珍因騎陳因騎津蝟昭粡竚癈鷭т繻Ь因騎徹因騎填因騎天因騎撞因鬼芦因鬼嘘因鬼荏因鬼憶蝟昭粡竚癈鷭т繻Ь因鬼卸因鬼恩因鬼価因鬼夏因鬼咳因鬼慨因鬼概因鬼干蝟昭粡竚癈鷭т繻Ь因鬼幹因鬼慣因鬼環因鬼監因鬼掬因鬼恐因鬼挟因鬼橋蝟昭粡竚癈鷭т繻Ь因鬼況因鬼狭因鬼饗因鬼仰因鬼凝因鬼郡因鬼憩蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼袖桍鹿粡寂蝟赱齠洲粤讌将憾卯憾階憾規憾謙憾幸憾潮換卯鹿粡寂蝟赱齠洲粤讌将換規換喬換狸換頭漢卯漢喬漢桑漢幸鹿粡寂蝟赱齠洲粤讌将漢銭漢潮漢適澗卯澗桑澗幸澗銭澗測鹿粡寂蝟赱齠洲粤讌将澗頭潅喬潅銭潅潮潅適甘穐甘銭甘狸鹿粡寂蝟赱齠洲粤讌将甘頭監喬監狸監適監頭軌穐軌卯軌規鹿粡寂蝟赱齠洲粤讌将軌謙軌幸軌狸軌潮軌適輝規飢銭飢測鹿粡寂蝟赱齠洲粤讌将騎岡騎規騎喬騎測騎狸騎潮鬼卯鬼桑鹿粡寂蝟赱齠洲粤讌将鬼幸鬼銭鬼潮亀穐亀卯亀謙亀銭亀測鹿粡寂蝟赱齠洲粤讌将亀適偽穐偽卯偽巻偽喬儀頭妓卯妓岡鹿粡寂蝟赱齠洲粤讌将妓喬妓謙妓適妓頭宜卯宜岡宜階宜巻鹿粡寂蝟赱齠洲粤讌将宜桑義階義巻義潮蟻岡蟻頭誼卯誼階鹿粡寂蝟赱齠洲粤讌将誼喬誼幸誼測誼狸誼適議卯議岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜緊蝟昭粡竚癈鷭т繻Ь因亀蝶因亀跳因亀銚因亀賃因亀津因亀轍因亀店蝟昭粡竚癈鷭т繻Ь因亀洞因亀篤因偽圧因偽宛因偽袷因偽按因偽暗因偽案蝟昭粡竚癈鷭т繻Ь因偽碓因偽臼因偽渦因偽厩因偽加因偽外因偽崖因偽概蝟昭粡竚癈鷭т繻Ь因偽碍因偽街因偽蛎因偽鈎因偽劃因偽各因偽完因偽官蝟昭粡竚癈鷭т繻Ь因偽干因偽幹因偽感因偽換因偽澗因偽環因偽監因偽鬼蝟昭粡竚癈鷭т繻Ь因偽掬因偽彊因偽怯因偽恐因偽恭因偽橋因偽狭因偽仰蝟昭粡竚癈鷭т繻Ь因偽尭因偽訓因偽群因偽卦因偽鹸因偽元因偽幻因偽限蝟昭粡竚癈鷭т繻Ь因偽乎因偽控因偽更因偽港因偽皇因偽硬因偽稿因偽繕蝟昭粡竚癈鷭т繻Ь因偽膳因偽糎因偽噌因偽疎因偽礎因偽祖因偽賊因偽続蝟昭粡竚癈鷭т繻Ь因偽揃因偽妥因偽探因偽湛因偽蛋因偽誕因偽弾因偽聴蝟昭粡竚癈鷭т繻Ь因偽鍛因偽団因偽長因偽鎮因偽陳因偽墜因偽撤因偽鉄蝟昭粡竚癈鷭т繻Ь因偽典因偽填因偽天因偽展因偽同因偽殿因偽田蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼揃桍鹿粡寂蝟赱齠洲粤讌将尭喬尭桑薫卯薫岡薫桑薫銭薫狸鹿粡寂蝟赱齠洲粤讌将訓卯訓規訓銭訓測訓潮群穐群岡群階鹿粡寂蝟赱齠洲粤讌将群巻群規群幸群銭群狸群適群頭軍階鹿粡寂蝟赱齠洲粤讌将軍巻軍潮軍適軍頭郡規郡喬郡狸郡潮鹿粡寂蝟赱齠洲粤讌将卦岡袈岡袈規袈桑袈謙袈測袈潮袈適鹿粡寂蝟赱齠洲粤讌将袈頭祁穐祁卯祁階祁巻祁規祁桑祁幸鹿粡寂蝟赱齠洲粤讌将祁銭祁測祁狸祁適係卯係階係狸傾巻鹿粡寂蝟赱齠洲粤讌将傾桑傾幸傾銭傾狸傾潮傾適傾頭形卯鹿粡寂蝟赱齠洲粤讌将傾規形桑形謙形幸形狸径謙径潮恵桑鹿粡寂蝟赱齠洲粤讌将恵謙恵狸恵頭慶規慶潮慶適慧巻慧喬鹿粡寂蝟赱齠洲粤讌将慧桑慧幸慧潮憩穐憩規憩喬憩謙憩潮鹿粡寂蝟赱齠洲粤讌将憩適憩頭鍵階鍵巻鍵謙鍵幸慧卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜雇蝟昭粡竚癈鷭т繻Ь因妓庵因妓按因妓餌因妓嬰因妓影因妓屋因妓俺蝟昭粡竚癈鷭т繻Ь因妓卸因妓可因妓害因妓街因妓各因妓換因妓潅因妓環蝟昭粡竚癈鷭т繻Ь因妓監因妓軌因妓亀因妓菊因妓怯因妓挟因妓況因妓狂蝟昭粡竚癈鷭т繻Ь因妓係因妓恵因妓憩因妓鍵因妓険因妓厳因妓幻因妓弦蝟昭粡竚癈鷭т繻Ь因妓諺因妓乎因妓個因妓呼因妓弘因妓拘因妓攻因妓皇蝟昭粡竚癈鷭т繻Ь因妓前因妓善因妓漸因妓繕因妓噌因妓賊因妓族因妓担蝟昭粡竚癈鷭т繻Ь因妓唾因妓嘆因妓淡因妓団因妓壇因妓聴因妓腸因妓調蝟昭粡竚癈鷭т繻Ь因妓超因妓珍因妓陳因妓撤因妓轍因妓店因妓導因宜圧蝟昭粡竚癈鷭т繻Ь因宜斡因宜安因宜庵因宜渦因宜嘘因宜唄因原官因宜営蝟昭粡竚癈鷭т繻Ь因宜憶因宜桶因宜牡因宜恩因宜夏因宜外因宜崖因宜概蝟昭粡竚癈鷭т繻Ь因宜涯因宜各因宜干因宜感因宜飢因宜騎因宜宜因宜蟻蝟昭粡竚癈鷭т繻Ь因宜議因宜掬因宜菊因宜怯因宜恭因宜饗因宜仰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼孫桍鹿粡寂蝟赱齠洲粤讌将攻頭昂岡昂規昂喬昂幸昂測昂狸鹿粡寂蝟赱齠洲粤讌将晃測晃狸晃適更岡更規更桑更頭港巻鹿粡寂蝟赱齠洲粤讌将港桑港潮港適港頭溝穐溝階溝桑溝銭鹿粡寂蝟赱齠洲粤讌将溝狸甲卯甲階甲巻甲謙甲銭甲潮皇岡鹿粡寂蝟赱齠洲粤讌将皇潮皇適皇頭硬階硬巻硬桑硬適硬頭鹿粡寂蝟赱齠洲粤讌将稿卯稿岡稿巻稿桑前穐前巻前狸前潮鹿粡寂蝟赱齠洲粤讌将前適善岡善階善適漸階漸巻漸桑漸謙鹿粡寂蝟赱齠洲粤讌将漸銭漸潮然穐全巻全規全桑全謙全狸鹿粡寂蝟赱齠洲粤讌将禅穐禅規禅適繕階繕規繕桑繕潮膳桑鹿粡寂蝟赱齠洲粤讌将膳銭膳測膳適糎測噌穐噌階噌喬噌幸鹿粡寂蝟赱齠洲粤讌将噌狸噌適噌頭疏穐疏岡疏桑疏狸疎卯鹿粡寂蝟赱齠洲粤讌将疎岡疎階疎規疎謙疎銭疎測疎頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜想蝟昭粡竚癈鷭т繻Ь因義担因義旦因義淡因義弾因義珍因義鎮因義徹蝟昭粡竚癈鷭т繻Ь因義典因義伝因義電因義撞因義洞因義督因蟻旭因蟻葦蝟昭粡竚癈鷭т繻Ь因蟻宛因蟻鰻因蟻慨因蟻厩因蟻餌因蟻営因蟻憶因蟻乙蝟昭粡竚癈鷭т繻Ь因蟻可因蟻蓋因蟻官因蟻澗因蟻潅因蟻飢因蟻偽因蟻掬蝟昭粡竚癈鷭т繻Ь因蟻狂因蟻凝因蟻尭因蟻恵因蟻慶因蟻慧因蟻憩因蟻険蝟昭粡竚癈鷭т繻Ь因蟻鹸因蟻原因蟻諺因蟻古因蟻弘因蟻恒因蟻抗因蟻拘蝟昭粡竚癈鷭т繻Ь因蟻攻因蟻糎因蟻噌因蟻礎因蟻祖因蟻粗因蟻賊因蟻族蝟昭粡竚癈鷭т繻Ь因蟻揃因蟻汰因蟻唾因蟻丹因蟻単因蟻団因蟻弾因蟻超蝟昭粡竚癈鷭т繻Ь因蟻跳因蟻銚因蟻長因蟻珍因蟻徹因蟻兎因蟻同因蟻憧蝟昭粡竚癈鷭т繻Ь因蟻督因誼庵因誼鰻因誼嬰因誼影因誼桶因誼俺因誼温蝟昭粡竚癈鷭т繻Ь因誼佳因誼加因誼嘉因誼外因誼害因誼概因誼涯因誼宜蝟昭粡竚癈鷭т繻Ь因誼義因誼誼因誼恐因誼恭因誼況因誼狂因誼狭蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼詑桍鹿粡寂蝟赱齠洲粤讌将旦潮歎穐歎巻歎規歎銭歎測歎狸鹿粡寂蝟赱齠洲粤讌将歎潮淡桑淡謙淡銭淡頭湛岡湛潮湛頭鹿粡寂蝟赱齠洲粤讌将蛋穐蛋岡蛋階蛋喬蛋銭誕岡誕巻誕規鹿粡寂蝟赱齠洲粤讌将誕銭鍛幸鍛測団岡団潮団桑壇適弾卯鹿粡寂蝟赱齠洲粤讌将弾岡弾巻聴卯聴喬聴潮脹岡腸測腸階鹿粡寂蝟赱齠洲粤讌将腸巻腸喬腸桑蝶卯蝶巻蝶幸蝶潮蝶頭鹿粡寂蝟赱齠洲粤讌将調岡調階調喬調謙諜規諜卯諜幸調銭鹿粡寂蝟赱齠洲粤讌将諜頭超穐超卯超岡超巻超銭超潮跳穐鹿粡寂蝟赱齠洲粤讌将跳幸跳銭跳適跳頭銚卯銚階銚謙銚銭鹿粡寂蝟赱齠洲粤讌将長岡長階長巻長規長幸長測長頭珍穐鹿粡寂蝟赱齠洲粤讌将珍桑珍測賃穐賃巻賃謙賃幸鎮階鎮桑鹿粡寂蝟赱齠洲粤讌将鎮測陳穐鎮適陳謙陳幸津穐津巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜築蝟昭粡竚癈鷭т繻Ь因議店因議童因議胴因掬旭因掬扱因掬按因掬渦蝟昭粡竚癈鷭т繻Ь因掬唄因掬欝因掬姥因掬影因掬屋因掬嘉因掬恩因掬害蝟昭粡竚癈鷭т繻Ь因掬概因掬嚇因掬澗因掬軌因掬換因掬輝因掬偽因掬妓蝟昭粡竚癈鷭т繻Ь因掬蟻因掬誼因掬掬因掬狂因掬響因掬饗因掬驚因掬仰蝟昭粡竚癈鷭т繻Ь因掬凝因掬薫因掬鍵因掬限因掬古因掬漸因掬全因掬禅蝟昭粡竚癈鷭т繻Ь因掬糎因掬疏因掬礎因掬賊因掬続因掬堕因掬妥因掬惰蝟昭粡竚癈鷭т繻Ь因掬旦因掬鍛因掬誕因掬壇因掬脹因掬腸因掬調因掬諜蝟昭粡竚癈鷭т繻Ь因掬鎮因掬津因掬典因掬殿因菊芦因菊斡因菊扱因菊宛蝟昭粡竚癈鷭т繻Ь因菊暗因菊厩因菊叡因菊営因菊憶因菊臆因菊桶因菊牡蝟昭粡竚癈鷭т繻Ь因菊恩因菊佳因菊加因菊嘉因菊外因菊慨因菊涯因菊蛎蝟昭粡竚癈鷭т繻Ь因菊劃因菊各因菊完因菊幹因菊患因菊慣因菊環因菊軌蝟昭粡竚癈鷭т繻Ь因菊鬼因菊妓因菊蟻因菊彊因菊恭因菊挟因菊況蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼堕桍鹿粡寂蝟赱齠洲粤讌将洞頭瞳岡瞳巻瞳規瞳謙瞳銭瞳潮鹿粡寂蝟赱齠洲粤讌将瞳適童幸童潮童頭胴喬胴狸胴潮徳岡鹿粡寂蝟赱齠洲粤讌将徳桑徳測徳巻徳狸徳頭涜穐涜卯涜謙鹿粡寂蝟赱齠洲粤讌将特巻特桑特謙特幸特測督穐督卯督岡鹿粡寂蝟赱齠洲粤讌将督階督巻督適禿卯禿岡禿謙禿幸禿銭鹿粡寂蝟赱齠洲粤讌将禿狸禿潮禿適禿頭篤岡篤階篤喬篤銭鹿粡寂蝟赱齠洲粤讌将篤狸旭桑旭銭旭潮葦階葦巻葦桑葦謙鹿粡寂蝟赱齠洲粤讌将葦銭葦頭芦巻芦潮鯵階鯵規梓穐梓桑鹿粡寂蝟赱齠洲粤讌将梓謙梓幸梓狸圧卯圧巻圧喬圧桑圧潮鹿粡寂蝟赱齠洲粤讌将斡卯斡桑扱卯扱適扱頭宛岡宛喬宛謙鹿粡寂蝟赱齠洲粤讌将宛銭宛適姐卯姐階姐規姐謙姐潮姐適鹿粡寂蝟赱齠洲粤讌将袷岡袷巻袷規袷謙安穐安卯安桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹涜奴蝟昭粡竚癈鷭т繻Ь因彊詑因彊妥因彊嘆因彊担因彊淡因彊湛因彊蛋蝟昭粡竚癈鷭т繻Ь因彊誕因彊壇因彊弾因彊調因彊諜因彊長因彊賃因彊陳蝟昭粡竚癈鷭т繻Ь因彊津因彊轍因彊典因彊堂因彊撞因彊童因彊特因彊督蝟昭粡竚癈鷭т繻Ь因怯芦因怯扱因怯袷因怯庵因怯碓因怯臼因怯渦因怯嘘蝟昭粡竚癈鷭т繻Ь因怯唄因怯蔚因怯鰻因怯厩因怯叡因怯嬰因怯臆因怯価蝟昭粡竚癈鷭т繻Ь因怯佳因怯外因怯咳因怯概因怯涯因怯碍因怯街因怯官蝟昭粡竚癈鷭т繻Ь因怯患因怯感因怯換因怯掬因怯彊因怯驚因怯群因怯係蝟昭粡竚癈鷭т繻Ь因怯径因怯恵因怯憩因怯鍵因怯険因怯験因怯鹸因怯限蝟昭粡竚癈鷭т繻Ь因怯個因怯慌因怯抗因怯昂因怯晃因怯甲因怯皇因怯稿蝟昭粡竚癈鷭т繻Ь因怯前因怯禅因怯糎因怯疏因怯祖因怯存因怯孫因怯唾蝟昭粡竚癈鷭т繻Ь因怯丹因怯単因怯嘆因怯壇因怯弾因怯諜因怯鎮因怯陳蝟昭粡竚癈鷭т繻Ь因怯津因怯墜因怯撤因怯轍因怯天因怯店因怯典蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼惰桍鹿粡寂蝟赱齠洲粤讌将嬰狸嬰潮嬰頭屋卯屋階屋巻屋桑鹿粡寂蝟赱齠洲粤讌将憶階憶規憶狸臆穐臆岡臆階臆桑臆幸鹿粡寂蝟赱齠洲粤讌将臆測桶幸桶潮牡岡牡階牡巻牡喬牡狸鹿粡寂蝟赱齠洲粤讌将乙穐乙卯乙岡乙巻乙喬乙銭乙狸俺巻鹿粡寂蝟赱齠洲粤讌将俺潮俺頭卸階卸銭卸潮恩潮恩適恩頭鹿粡寂蝟赱齠洲粤讌将温穐価喬価謙佳階佳喬佳桑佳銭佳適鹿粡寂蝟赱齠洲粤讌将佳頭加巻加適可規可喬可銭嘉銭夏岡鹿粡寂蝟赱齠洲粤讌将夏巻夏狸夏潮外階外巻外銭外測外潮鹿粡寂蝟赱齠洲粤讌将咳穐咳階咳喬咳謙害幸害銭害潮崖規鹿粡寂蝟赱齠洲粤讌将崖喬崖幸崖狸慨卯慨岡慨階慨巻慨喬鹿粡寂蝟赱齠洲粤讌将慨銭慨測慨適概岡概階概巻概謙概測鹿粡寂蝟赱齠洲粤讌将涯規涯喬涯狸涯潮碍卯碍巻碍規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特異蝟昭粡竚癈鷭т繻Ь因恭係因恭恵因恭慶因恭憩因恭顕因恭鹸因恭厳蝟昭粡竚癈鷭т繻Ь因恭諺因恭弘因恭拘因恭控因恭更因恭港因恭硬因恭全蝟昭粡竚癈鷭т繻Ь因恭繕因恭祖因恭租因恭粗因恭堕因恭単因恭探因恭淡蝟昭粡竚癈鷭т繻Ь因恭壇因恭脹因恭蝶因恭調因恭諜因恭鎮因恭徹因恭典蝟昭粡竚癈鷭т繻Ь因恭伝因恭澱因恭堂因恭導因恭撞因恭童因恭胴因挟姐蝟昭粡竚癈鷭т繻Ь因挟袷因挟碓因挟渦因挟唄因挟姥因挟嬰因挟屋因挟臆蝟昭粡竚癈鷭т繻Ь因挟牡因挟乙因挟温因挟価因挟夏因挟外因挟概因挟劃蝟昭粡竚癈鷭т繻Ь因挟各因挟澗因挟監因挟輝因挟飢因挟騎因挟鬼因挟義蝟昭粡竚癈鷭т繻Ь因挟蟻因挟誼因挟議因挟菊因挟彊因挟怯因挟恭因挟仰蝟昭粡竚癈鷭т繻Ь因挟軍因挟郡因挟径因挟慶因挟元因挟厳因挟呼因挟弘蝟昭粡竚癈鷭т繻Ь因挟恒因挟晃因挟更因挟溝因挟皇因挟稿因挟善因挟然蝟昭粡竚癈鷭т繻Ь因挟繕因挟糎因挟礎因挟続因挟堕因挟妥因挟惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼単桍鹿粡寂蝟赱齠洲粤讌将潅巻潅幸潅銭潅測潅狸潅適環穐鹿粡寂蝟赱齠洲粤讌将環卯環規環桑甘巻甘規甘幸甘銭甘潮鹿粡寂蝟赱齠洲粤讌将監穐監規監桑監測監頭軌卯軌巻軌謙鹿粡寂蝟赱齠洲粤讌将軌幸軌銭軌頭輝階輝巻輝喬輝幸輝測鹿粡寂蝟赱齠洲粤讌将輝適輝頭飢岡飢喬飢幸飢適騎卯騎銭鹿粡寂蝟赱齠洲粤讌将騎狸騎潮鬼階鬼桑鬼幸亀穐亀岡亀巻鹿粡寂蝟赱齠洲粤讌将亀頭偽穐偽桑偽測儀銭儀潮妓卯妓規鹿粡寂蝟赱齠洲粤讌将妓銭宜岡宜規宜謙宜潮義穐義階義喬鹿粡寂蝟赱齠洲粤讌将義適蟻岡蟻階蟻巻蟻頭誼岡誼謙誼幸鹿粡寂蝟赱齠洲粤讌将誼適議穐議巻議喬議謙議頭菊穐菊岡鹿粡寂蝟赱齠洲粤讌将菊巻菊規菊幸菊適菊頭彊穐彊巻彊謙鹿粡寂蝟赱齠洲粤讌将彊幸彊潮怯卯怯岡怯規怯喬怯潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特菓蝟昭粡竚癈鷭т繻Ь因橋嬰因橋憶因橋臆因橋桶因橋牡因橋俺因橋温蝟昭粡竚癈鷭т繻Ь因橋価因橋佳因橋加因橋嘉因橋外因橋咳因橋崖因橋街蝟昭粡竚癈鷭т繻Ь因橋碍因橋完因橋患因橋感因橋漢因橋潅因橋輝因橋甘蝟昭粡竚癈鷭т繻Ь因橋儀因橋妓因橋宜因橋蟻因橋誼因橋彊因橋怯因橋涜蝟昭粡竚癈鷭т繻Ь因橋響因橋饗因橋驚因橋慧因橋軍因橋卦因橋憩因橋祁蝟昭粡竚癈鷭т繻Ь因橋係因橋傾因橋径因橋鍵因橋恵因橋限因橋乎因橋個蝟昭粡竚癈鷭т繻Ь因橋弘因橋慌因橋更因橋港因橋溝因橋甲因橋稿因橋前蝟昭粡竚癈鷭т繻Ь因橋全因橋祖因橋賊因橋族因橋袖因橋詑因橋惰因橋丹蝟昭粡竚癈鷭т繻Ь因橋嘆因橋坦因橋淡因橋鍛因橋壇因橋弾因橋調因橋賃蝟昭粡竚癈鷭т繻Ь因橋墜因橋展因橋殿因橋澱因橋電因橋徳因況圧因況扱蝟昭粡竚癈鷭т繻Ь因況暗因況嘘因況厩因況叡因況屋因況臆因況崖因況嚇蝟昭粡竚癈鷭т繻Ь因況患因況慣因況憾因況潅因況鬼因況亀因況議蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼坦桍鹿粡寂蝟赱齠洲粤讌将袈喬袈狸袈適祁巻祁喬祁測係卯鹿粡寂蝟赱齠洲粤讌将係巻係適係頭傾卯傾階傾喬傾謙傾幸鹿粡寂蝟赱齠洲粤讌将傾測径穐径卯径岡径規径測径狸径潮鹿粡寂蝟赱齠洲粤讌将憩幸恵穐恵岡恵階恵規恵謙恵幸慶岡鹿粡寂蝟赱齠洲粤讌将慶桑慶幸慶狸慧卯慧喬憩穐憩岡憩喬鹿粡寂蝟赱齠洲粤讌将憩桑元岡険巻険幸険潮険頭顕謙顕桑鹿粡寂蝟赱齠洲粤讌将顕狸顕潮顕頭験穐験卯験階験測験頭鹿粡寂蝟赱齠洲粤讌将鹸巻鹸規鹸銭鹸狸元規元桑元謙元測鹿粡寂蝟赱齠洲粤讌将原測原適原頭厳穐厳卯厳岡厳規厳幸鹿粡寂蝟赱齠洲粤讌将厳銭厳測厳狸幻岡幻巻幻喬幻謙弦喬鹿粡寂蝟赱齠洲粤讌将弦謙弦銭弦狸諺卯諺階諺規諺幸諺銭鹿粡寂蝟赱齠洲粤讌将諺適限岡限測乎規乎謙乎狸乎頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特館蝟昭粡竚癈鷭т繻Ь因狂聴因狂脹因狂蝶因狂超因狂長因狂鎮因狂陳蝟昭粡竚癈鷭т繻Ь因狂典因狂展因狂伝因狂殿因狂澱因狂田因狂動因狂同蝟昭粡竚癈鷭т繻Ь因狂撞因狂洞因狂涜因狂特因狂督因狭斡因狭姐因狭袷蝟昭粡竚癈鷭т繻Ь因狭碓因狭臼因狭嘘因狭蔚因狭鰻因狭咳因狭崖因狭概蝟昭粡竚癈鷭т繻Ь因狭蓋因狭蛎因狭寛因狭患因狭換因狭甘因狭儀因狭蟻蝟昭粡竚癈鷭т繻Ь因狭恭因狭挟因狭教因狭橋因狭狂因狭狭因狭驚因狭薫蝟昭粡竚癈鷭т繻Ь因狭訓因狭群因狭形因狭径因狭憩因狭鍵因狭個因狭慌蝟昭粡竚癈鷭т繻Ь因狭攻因狭晃因狭善因狭禅因狭繕因狭糎因狭疎因狭祖蝟昭粡竚癈鷭т繻Ь因狭粗因狭揃因狭存因狭汰因狭唾因狭探因狭淡因狭脹蝟昭粡竚癈鷭т繻Ь因狭超因狭跳因狭轍因狭典因狭電因狭兎因狭同因狭導蝟昭粡竚癈鷭т繻Ь因狭撞因狭禿因響旭因響葦因響鯵因響案因響臼因響欝蝟昭粡竚癈鷭т繻Ь因響荏因響営因響屋因響牡因響恩因響外因響害蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼探桍鹿粡寂蝟赱齠洲粤讌将然巻然桑然測然適然頭全規全喬鹿粡寂蝟赱齠洲粤讌将全幸全銭全適禅穐禅卯禅岡禅規禅喬鹿粡寂蝟赱齠洲粤讌将禅測繕巻繕桑繕銭膳卯膳階膳適糎卯鹿粡寂蝟赱齠洲粤讌将糎階糎喬糎桑糎幸糎測噌卯噌測噌潮鹿粡寂蝟赱齠洲粤讌将噌適噌頭疏規疏測疏頭疎穐疎卯疎巻鹿粡寂蝟赱齠洲粤讌将疎潮疎適疎頭礎喬礎幸礎謙礎狸祖穐鹿粡寂蝟赱齠洲粤讌将祖巻祖規祖喬祖狸祖潮租巻租桑租狸鹿粡寂蝟赱齠洲粤讌将粗穐粗卯粗岡粗狸粗潮属岡属階属喬鹿粡寂蝟赱齠洲粤讌将属桑属幸属頭賊穐賊卯賊桑賊測賊適鹿粡寂蝟赱齠洲粤讌将族巻族謙族測族狸族頭続規続喬続測鹿粡寂蝟赱齠洲粤讌将続頭卒喬卒銭卒潮袖岡袖喬袖謙袖潮鹿粡寂蝟赱齠洲粤讌将其穐其桑其測其適揃穐揃規揃潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特緊蝟昭粡竚癈鷭т繻Ь因饗慧因饗顕因饗元因饗昂因饗溝因饗稿因饗前蝟昭粡竚癈鷭т繻Ь因饗漸因饗然因饗糎因饗噌因饗礎因饗祖因饗租因饗属蝟昭粡竚癈鷭т繻Ь因饗存因饗孫因饗堕因饗妥因饗坦因饗担因饗湛因饗鍛蝟昭粡竚癈鷭т繻Ь因饗超因饗珍因饗撤因饗迭因饗填因饗天因饗電因饗同蝟昭粡竚癈鷭т繻Ь因饗瞳因饗胴因饗篤因驚芦因驚梓因驚圧因驚姐因驚按蝟昭粡竚癈鷭т繻Ь因驚暗因驚碓因驚渦因驚厩因驚影因驚俺因驚卸因驚恩蝟昭粡竚癈鷭т繻Ь因驚加因驚嘉因驚崖因驚概因驚涯因驚柿因驚蛎因驚各蝟昭粡竚癈鷭т繻Ь因驚漢因驚澗因驚環因驚監因驚飢因驚鬼因驚宜因驚蟻蝟昭粡竚癈鷭т繻Ь因驚誼因驚饗因驚仰因驚尭因驚郡因驚袈因驚係因驚傾蝟昭粡竚癈鷭т繻Ь因驚径因驚元因驚原因驚厳因驚弦因驚拘因驚控因驚昂蝟昭粡竚癈鷭т繻Ь因驚晃因驚甲因驚稿因驚属因驚族因驚卒因驚嘆因驚旦蝟昭粡竚癈鷭т繻Ь因驚団因驚弾因驚聴因驚脹因驚腸因驚調因驚超蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼歎桍鹿粡寂蝟赱齠洲粤讌将団銭団狸壇穐壇桑壇幸壇測壇狸鹿粡寂蝟赱齠洲粤讌将壇適弾岡弾巻聴巻聴桑聴銭聴適聴頭鹿粡寂蝟赱齠洲粤讌将脹卯脹階脹銭腸喬腸桑腸謙旦桑腸適鹿粡寂蝟赱齠洲粤讌将腸頭蝶卯蝶幸蝶狸蝶頭諜桑諜適諜頭鹿粡寂蝟赱齠洲粤讌将超卯超規超桑超頭跳穐跳狸銚岡銚桑鹿粡寂蝟赱齠洲粤讌将長卯長岡長巻長喬長桑長謙珍銭珍狸鹿粡寂蝟赱齠洲粤讌将賃巻賃桑賃幸賃潮賃頭鎮巻鎮謙鎮銭鹿粡寂蝟赱齠洲粤讌将鎮適鎮頭陳喬陳測陳潮陳頭津穐津岡鹿粡寂蝟赱齠洲粤讌将津規津幸津頭墜穐墜巻墜喬墜狸徹穐鹿粡寂蝟赱齠洲粤讌将徹巻撤適轍岡轍桑迭岡迭喬迭幸迭測鹿粡寂蝟赱齠洲粤讌将迭狸鉄巻鉄規鉄謙鉄幸鉄測鉄頭典卯鹿粡寂蝟赱齠洲粤讌将典岡典階典巻典桑典狸典潮典適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特雇蝟昭粡竚癈鷭т繻Ь因凝恐因凝恭因凝狂因凝軍因凝径因凝慶因凝個蝟昭粡竚癈鷭т繻Ь因凝抗因凝更因凝前因凝膳因凝祖因凝租因凝賊因凝続蝟昭粡竚癈鷭т繻Ь因凝詑因凝惰因凝丹因凝単因凝坦因凝歎因凝淡因凝蛋蝟昭粡竚癈鷭т繻Ь因凝団因凝壇因凝弾因凝殿因凝田因凝電因凝胴因凝涜蝟昭粡竚癈鷭т繻Ь因凝督因尭梓因尭宛因尭袷因尭庵因尭按因尭蔚因尭姥蝟昭粡竚癈鷭т繻Ь因尭荏因尭餌因尭俺因尭温因尭価因尭夏因尭外因尭崖蝟昭粡竚癈鷭т繻Ь因尭涯因尭蛎因尭鈎因尭可因尭監因尭輝因尭飢因尭騎蝟昭粡竚癈鷭т繻Ь因尭儀因尭宜因尭義因尭議因尭掬因尭怯因尭恐因尭狂蝟昭粡竚癈鷭т繻Ь因尭驚因尭慶因尭慧因尭験因尭厳因尭幻因尭限因尭乎蝟昭粡竚癈鷭т繻Ь因尭個因尭弘因尭慌因尭抗因尭拘因尭攻因尭港因尭稿蝟昭粡竚癈鷭т繻Ь因尭前因尭禅因尭繕因尭膳因尭糎因尭租因尭粗因尭属蝟昭粡竚癈鷭т繻Ь因尭袖因尭其因尭唾因尭探因尭歎因尭淡因尭蛋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼湛桍鹿粡寂蝟赱齠洲粤讌将督銭督適禿謙禿幸篤穐篤規篤幸鹿粡寂蝟赱齠洲粤讌将篤狸篤潮旭穐旭規旭喬旭桑旭潮葦桑鹿粡寂蝟赱齠洲粤讌将芦穐芦階芦頭鯵巻鯵桑鯵幸鯵狸梓階鹿粡寂蝟赱齠洲粤讌将梓巻梓謙梓幸梓銭梓測圧巻圧規圧潮鹿粡寂蝟赱齠洲粤讌将圧適梓適斡巻斡規斡狸斡適扱規扱喬鹿粡寂蝟赱齠洲粤讌将扱適宛卯宛規宛喬姐巻姐規姐喬姐桑鹿粡寂蝟赱齠洲粤讌将姐謙姐測袷巻袷測安穐安卯安巻安桑鹿粡寂蝟赱齠洲粤讌将庵銭按卯按階按巻按規按喬按謙按狸鹿粡寂蝟赱齠洲粤讌将暗巻案銭碓階碓巻碓規碓喬碓桑碓測鹿粡寂蝟赱齠洲粤讌将碓狸碓頭臼適渦穐渦測渦潮渦頭嘘穐鹿粡寂蝟赱齠洲粤讌将嘘卯嘘謙唄卯唄規唄喬唄桑唄銭唄測鹿粡寂蝟赱齠洲粤讌将欝穐欝岡欝桑欝銭欝狸欝適蔚穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特想蝟昭粡竚癈鷭т繻Ь因訓狂因訓傾因訓鍵因訓元因訓厳因訓乎因訓慌蝟昭粡竚癈鷭т繻Ь因訓港因訓溝因訓前因訓漸因訓粗因訓属因訓族因訓続蝟昭粡竚癈鷭т繻Ь因訓汰因訓惰因訓丹因訓単因訓担因訓誕因訓鍛因訓蝶蝟昭粡竚癈鷭т繻Ь因訓超因訓長因訓珍因訓鎮因訓童因訓禿因群旭因群扱蝟昭粡竚癈鷭т繻Ь因群宛因群姐因群嘘因群鰻因群荏因群営因群影因群牡蝟昭粡竚癈鷭т繻Ь因群佳因群夏因群慨因群蓋因群街因群官因群寛因群干蝟昭粡竚癈鷭т繻Ь因群患因群甘因群監因群軌因群騎因群亀因群偽因群義蝟昭粡竚癈鷭т繻Ь因群誼因群掬因群彊因群恭因群狂因群饗因群凝因群尭蝟昭粡竚癈鷭т繻Ь因群訓因群祁因群係因群径因群恵因群憩因群鹸因群弦蝟昭粡竚癈鷭т繻Ь因群個因群古因群抗因群溝因群糎因群祖因群租因群賊蝟昭粡竚癈鷭т繻Ь因群卒因群妥因群単因群歎因群湛因群鍛因群諜因群超蝟昭粡竚癈鷭т繻Ь因群銚因群墜因群典因群導因群憧因群徳因群涜蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼誕桍鹿粡寂蝟赱齠洲粤讌将夏適外岡外巻外規外桑外測外潮鹿粡寂蝟赱齠洲粤讌将咳岡咳階咳謙咳幸咳適害岡害巻害桑鹿粡寂蝟赱齠洲粤讌将害謙害狸崖卯崖岡崖規崖銭崖測崖潮鹿粡寂蝟赱齠洲粤讌将慨階慨潮概穐概岡概喬概謙概潮概適鹿粡寂蝟赱齠洲粤讌将概頭涯穐涯喬涯桑涯幸涯測涯狸涯適鹿粡寂蝟赱齠洲粤讌将涯頭碍卯碍桑碍幸碍狸蓋穐蓋卯蓋階鹿粡寂蝟赱齠洲粤讌将蓋規蓋喬蓋適街穐街階街規街桑街謙鹿粡寂蝟赱齠洲粤讌将街狸街適街頭柿穐柿岡柿規柿喬柿銭鹿粡寂蝟赱齠洲粤讌将柿測柿潮蛎規蛎桑蛎幸蛎狸蛎潮蛎頭鹿粡寂蝟赱齠洲粤讌将鈎規鈎喬鈎幸鈎測鈎狸鈎頭劃岡劃階鹿粡寂蝟赱齠洲粤讌将劃喬劃幸劃潮嚇卯嚇階嚇喬嚇桑嚇幸鹿粡寂蝟赱齠洲粤讌将各巻各規各桑各幸各銭各測各潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特築蝟昭粡竚癈鷭т繻Ь因軍篤因郡旭因郡葦因郡梓因郡扱因郡袷因郡臼蝟昭粡竚癈鷭т繻Ь因郡荏因郡餌因郡牡因郡俺因郡恩因郡温因郡価因郡佳蝟昭粡竚癈鷭т繻Ь因郡加因郡可因郡嘉因郡夏因郡外因郡咳因郡街因郡完蝟昭粡竚癈鷭т繻Ь因郡干因郡幹因郡感因郡慣因郡澗因郡環因郡輝因郡飢蝟昭粡竚癈鷭т繻Ь因郡儀因郡議因郡恐因郡橋因郡況因郡狂因郡饗因郡仰蝟昭粡竚癈鷭т繻Ь因郡凝因郡訓因郡群因郡鍵因郡険因郡元因郡原因郡厳蝟昭粡竚癈鷭т繻Ь因郡弦因郡呼因郡弘因郡恒因郡慌因郡晃因郡更因郡港蝟昭粡竚癈鷭т繻Ь因郡甲因郡稿因郡前因郡善因郡然因郡繕因郡糎因郡噌蝟昭粡竚癈鷭т繻Ь因郡疏因郡疎因郡租因郡粗因郡賊因郡族因郡袖因郡孫蝟昭粡竚癈鷭т繻Ь因郡詑因郡惰因郡淡因郡湛因郡鍛因郡聴因郡蝶因郡銚蝟昭粡竚癈鷭т繻Ь因郡珍因郡賃因郡津因郡墜因郡鉄因郡展因郡伝因郡殿蝟昭粡竚癈鷭т繻Ь因郡兎因郡憧因郡徳因郡涜因郡特因郡篤因卦斡蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼団桍鹿粡寂蝟赱齠洲粤讌将輝岡輝喬輝桑飢穐飢卯飢巻飢桑鹿粡寂蝟赱齠洲粤讌将飢幸飢銭飢頭騎喬騎幸騎潮騎適騎頭鹿粡寂蝟赱齠洲粤讌将鬼穐鬼階鬼桑鬼謙鬼適亀穐亀岡亀桑鹿粡寂蝟赱齠洲粤讌将亀適亀頭偽卯偽頭儀卯儀幸儀銭儀測鹿粡寂蝟赱齠洲粤讌将儀狸儀潮儀適妓卯妓規宜穐宜岡宜階鹿粡寂蝟赱齠洲粤讌将宜規宜幸宜狸義岡義巻蟻巻蟻銭蟻頭鹿粡寂蝟赱齠洲粤讌将誼穐誼卯誼巻誼喬誼狸誼適誼頭議桑鹿粡寂蝟赱齠洲粤讌将議狸議頭掬穐掬卯掬巻掬桑掬狸掬適鹿粡寂蝟赱齠洲粤讌将掬頭菊卯菊幸彊穐彊岡彊階彊巻彊桑鹿粡寂蝟赱齠洲粤讌将彊謙彊銭彊狸彊頭怯岡怯階怯規怯喬鹿粡寂蝟赱齠洲粤讌将怯幸怯測怯狸怯潮怯適恐階恐規恐喬鹿粡寂蝟赱齠洲粤讌将恐幸恐潮恭岡恭階恭規恭謙恭幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹特奴蝟昭粡竚癈鷭т繻Ь因袈柿因袈鈎因袈漢因袈完因袈官因袈干因袈幹蝟昭粡竚癈鷭т繻Ь因袈患因袈換因袈澗因袈亀因袈宜因袈菊因袈挟因袈教蝟昭粡竚癈鷭т繻Ь因袈仰因袈凝因袈尭因袈訓因袈郡因袈険因袈元因袈乎蝟昭粡竚癈鷭т繻Ь因袈個因袈控因袈溝因袈甲因袈皇因袈稿因袈前因袈漸蝟昭粡竚癈鷭т繻Ь因袈然因袈全因袈禅因袈繕因袈膳因袈糎因袈疏因袈祖蝟昭粡竚癈鷭т繻Ь因袈堕因袈単因袈探因袈湛因袈誕因袈鍛因袈壇因袈調蝟昭粡竚癈鷭т繻Ь因袈長因袈徹因袈填因袈展因袈澱因袈動因袈同因袈洞蝟昭粡竚癈鷭т繻Ь因袈胴因袈特因祁旭因祁斡因祁袷因祁暗因祁渦因祁唄蝟昭粡竚癈鷭т繻Ь因祁欝因祁鰻因祁厩因祁荏因祁叡因祁臆因祁恩因祁可蝟昭粡竚癈鷭т繻Ь因祁嘉因祁夏因祁慨因祁概因祁涯因祁街因祁劃因祁嚇蝟昭粡竚癈鷭т繻Ь因祁寛因祁患因祁感因祁漢因祁環因祁甘因祁監因祁飢蝟昭粡竚癈鷭т繻Ь因祁偽因祁儀因祁誼因祁掬因祁菊因祁彊因祁恐蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼弾桍鹿粡寂蝟赱齠洲粤讌将袈巻袈桑袈銭袈狸祁穐祁岡祁階鹿粡寂蝟赱齠洲粤讌将祁巻祁銭祁潮係穐係巻係狸係潮傾巻鹿粡寂蝟赱齠洲粤讌将傾規傾喬傾銭傾頭形岡形桑形銭形適鹿粡寂蝟赱齠洲粤讌将形頭径卯径規径適恵階恵幸慶卯慶岡鹿粡寂蝟赱齠洲粤讌将慶規慶幸慶適慶頭慧穐慧巻慧喬慧銭鹿粡寂蝟赱齠洲粤讌将慧狸憩穐憩卯憩巻憩謙憩測鍵規鍵喬鹿粡寂蝟赱齠洲粤讌将鍵幸鍵潮鍵適険卯険潮顕卯顕岡顕階鹿粡寂蝟赱齠洲粤讌将顕潮顕適験穐験規験桑鹸階鹸巻鹸桑鹿粡寂蝟赱齠洲粤讌将鹸謙鹸狸鹸適元岡元狸元適原穐原卯鹿粡寂蝟赱齠洲粤讌将原階原巻原謙原銭原適厳銭厳適幻銭鹿粡寂蝟赱齠洲粤讌将幻頭弦巻弦謙諺卯弦潮弦適弦頭諺巻鹿粡寂蝟赱齠洲粤讌将諺謙諺狸諺潮限穐限卯限岡限階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督異蝟昭粡竚癈鷭т繻Ь因係詑因係堕因係惰因係歎因係淡因係湛因係鍛蝟昭粡竚癈鷭т繻Ь因係壇因係腸因係蝶因係諜因係超因係鉄因係賃因係墜蝟昭粡竚癈鷭т繻Ь因係徹因係撤因係填因係伝因係堂因係導因傾旭因係洞蝟昭粡竚癈鷭т繻Ь因係瞳因係徳因係涜因係篤因傾斡因傾庵因傾碓因傾荏蝟昭粡竚癈鷭т繻Ь因傾叡因傾嬰因傾影因傾屋因傾乙因傾卸因傾温因傾可蝟昭粡竚癈鷭т繻Ь因傾咳因傾慨因傾概因傾蛎因傾劃因傾各因傾幹因傾患蝟昭粡竚癈鷭т繻Ь因傾感因傾漢因傾澗因傾監因傾輝因傾鬼因傾妓因傾蟻蝟昭粡竚癈鷭т繻Ь因傾誼因傾況因傾狭因傾饗因傾群因傾傾因傾径因傾恵蝟昭粡竚癈鷭т繻Ь因傾慧因傾限因傾乎因傾恒因傾抗因傾拘因傾控因傾攻蝟昭粡竚癈鷭т繻Ь因傾晃因傾溝因傾甲因傾善因傾糎因傾噌因傾疎因傾粗蝟昭粡竚癈鷭т繻Ь因傾賊因傾卒因傾存因傾詑因傾嘆因傾担因傾歎因傾淡蝟昭粡竚癈鷭т繻Ь因傾蛋因傾弾因傾調因傾超因傾珍因傾陳因傾津蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼脹桍鹿粡寂蝟赱齠洲粤讌将硬穐硬岡硬規硬銭硬測硬潮稿卯鹿粡寂蝟赱齠洲粤讌将稿謙稿狸前岡前階前桑前幸前銭前狸鹿粡寂蝟赱齠洲粤讌将善卯善規善測善適漸卯漸桑漸測漸潮鹿粡寂蝟赱齠洲粤讌将漸頭然穐然巻然規然謙然幸然銭全巻鹿粡寂蝟赱齠洲粤讌将全規全桑全謙全狸禅規禅喬禅幸禅狸鹿粡寂蝟赱齠洲粤讌将禅潮禅頭繕穐繕規繕桑繕銭繕潮膳規鹿粡寂蝟赱齠洲粤讌将膳謙膳適糎穐糎岡糎規糎喬糎銭糎測鹿粡寂蝟赱齠洲粤讌将噌穐噌卯噌巻噌適疏穐疏階疏狸疎階鹿粡寂蝟赱齠洲粤讌将疎規疎幸疎測疎狸礎喬礎幸礎狸礎適鹿粡寂蝟赱齠洲粤讌将祖卯祖測租謙租幸租測租狸粗卯粗巻鹿粡寂蝟赱齠洲粤讌将粗測粗潮粗適属桑賊巻賊頭族階族桑鹿粡寂蝟赱齠洲粤讌将族幸族銭族測族潮族適族頭続穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督菓蝟昭粡竚癈鷭т繻Ь因径咳因径慨因径劃因径各因径完因径官因径慣蝟昭粡竚癈鷭т繻Ь因径甘因径亀因径彊因径挟因径橋因径狭因径響因径仰蝟昭粡竚癈鷭т繻Ь因径尭因径群因径軍因径祁因径鹸因径弦因径古因径弘蝟昭粡竚癈鷭т繻Ь因径恒因径攻因径溝因径硬因径前因径禅因径礎因径粗蝟昭粡竚癈鷭т繻Ь因径属因径族因径袖因径其因径汰因径詑因径唾因径堕蝟昭粡竚癈鷭т繻Ь因径嘆因径探因径淡因径蛋因径調因径超因径跳因径長蝟昭粡竚癈鷭т繻Ь因径珍因径賃因径展因径伝因径堂因径憧因径撞因径童蝟昭粡竚癈鷭т繻Ь因径胴因径徳因径特因径禿因恵葦因恵芦因恵鯵因恵梓蝟昭粡竚癈鷭т繻Ь因恵斡因恵姐因恵安因恵庵因恵暗因恵案因恵厩因恵餌蝟昭粡竚癈鷭т繻Ь因恵屋因恵乙因恵俺因恵恩因恵加因恵咳因恵崖因恵慨蝟昭粡竚癈鷭т繻Ь因恵涯因恵街因恵柿因恵感因恵漢因恵亀因恵輝因恵飢蝟昭粡竚癈鷭т繻Ь因恵騎因恵宜因恵義因恵蟻因恵誼因恵議因恵掬蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼蝶桍鹿粡寂蝟赱齠洲粤讌将旦卯旦階旦桑旦幸旦潮旦適歎穐鹿粡寂蝟赱齠洲粤讌将歎岡歎幸歎狸歎潮淡喬淡桑淡頭湛巻鹿粡寂蝟赱齠洲粤讌将湛適蛋穐蛋喬誕穐誕喬誕桑誕銭誕測鹿粡寂蝟赱齠洲粤讌将誕狸誕頭鍛巻鍛桑鍛謙鍛幸鍛潮鍛頭鹿粡寂蝟赱齠洲粤讌将団階団巻団規団桑団幸団銭団潮壇喬鹿粡寂蝟赱齠洲粤讌将壇幸壇測弾規聴階聴桑聴謙聴幸聴頭鹿粡寂蝟赱齠洲粤讌将脹卯脹岡脹階脹喬脹潮脹適腸階腸喬鹿粡寂蝟赱齠洲粤讌将腸銭腸潮蝶卯蝶狸蝶潮蝶適調穐調卯鹿粡寂蝟赱齠洲粤讌将調桑調謙調潮諜卯諜階諜桑諜幸諜銭鹿粡寂蝟赱齠洲粤讌将諜狸諜潮超規超桑超銭跳穐跳謙跳銭鹿粡寂蝟赱齠洲粤讌将跳測跳頭銚卯銚岡銚階銚規銚喬銚謙鹿粡寂蝟赱齠洲粤讌将銚測銚狸銚潮長卯長喬長桑長潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督館蝟昭粡竚癈鷭т繻Ь因慶硬因慶繕因慶膳因慶疏因慶続因慶其因慶揃蝟昭粡竚癈鷭т繻Ь因慶孫因慶嘆因慶坦因慶担因慶探因慶旦因慶鍛因慶団蝟昭粡竚癈鷭т繻Ь因慶壇因慶跳因慶長因慧旭因慶轍因慶典因慶填因慶伝蝟昭粡竚癈鷭т繻Ь因慶殿因慶田因慶同因慶撞因慶洞因慶胴因慶徳因慧宛蝟昭粡竚癈鷭т繻Ь因慧碓因慧臼因慧欝因慧鰻因慧叡因慧営因慧屋因慧卸蝟昭粡竚癈鷭т繻Ь因慧恩因慧加因慧可因慧夏因慧崖因慧涯因慧各因慧幹蝟昭粡竚癈鷭т繻Ь因慧患因慧慣因慧甘因慧軌因慧飢因慧妓因慧菊因慧怯蝟昭粡竚癈鷭т繻Ь因慧恐因慧教因慧饗因慧凝因慧尭因慧軍因慧係因慧慧蝟昭粡竚癈鷭т繻Ь因慧険因慧原因慧厳因慧諺因慧個因慧恒因慧控因慧晃蝟昭粡竚癈鷭т繻Ь因慧港因慧皇因慧硬因憩鈎因憩蛎因憩劃因憩嚇因憩各蝟昭粡竚癈鷭т繻Ь因憩干因憩幹因憩慣因憩監因憩飢因憩騎因憩蟻因憩誼蝟昭粡竚癈鷭т繻Ь因憩議因憩怯因憩恭因憩挟因憩教因憩橋因憩仰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼諜桍鹿粡寂蝟赱齠洲粤讌将瞳卯瞳潮瞳適瞳頭童穐童測童潮鹿粡寂蝟赱齠洲粤讌将童頭胴穐胴卯胴喬胴桑胴狸徳卯徳岡鹿粡寂蝟赱齠洲粤讌将徳喬徳銭徳潮涜巻涜狸涜頭特穐特階鹿粡寂蝟赱齠洲粤讌将特謙特適特頭督測督頭禿階禿規禿謙鹿粡寂蝟赱齠洲粤讌将禿狸禿適禿頭篤岡篤銭篤潮篤適篤頭鹿粡寂蝟赱齠洲粤讌将旭桑旭謙旭銭旭潮旭適旭頭葦卯葦階鹿粡寂蝟赱齠洲粤讌将葦巻葦喬葦潮葦適葦頭芦穐芦巻芦喬鹿粡寂蝟赱齠洲粤讌将芦狸芦適鯵穐鯵巻鯵規鯵桑鯵幸鯵銭鹿粡寂蝟赱齠洲粤讌将鯵狸鯵適梓穐梓巻斡穐斡巻斡喬斡潮鹿粡寂蝟赱齠洲粤讌将扱卯扱規宛卯宛謙宛適姐狸姐適袷喬鹿粡寂蝟赱齠洲粤讌将袷桑袷測安謙安幸庵謙庵潮庵頭按岡鹿粡寂蝟赱齠洲粤讌将按巻按規按桑按謙暗穐暗潮暗適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督緊蝟昭粡竚癈鷭т繻Ь因鍵動因鍵堂因鍵導因鍵洞因鍵胴因鍵徳因鍵禿蝟昭粡竚癈鷭т繻Ь因険鯵因険安因険蔚因険鰻因険姥因険叡因険嬰因険屋蝟昭粡竚癈鷭т繻Ь因険牡因険卸因険加因険外因険概因険柿因険鈎因険患蝟昭粡竚癈鷭т繻Ь因険慣因険漢因険潅因険飢因険儀因険彊因険怯因険況蝟昭粡竚癈鷭т繻Ь因険狂因険狭因険仰因険尭因険祁因険険因険弘因険鹸蝟昭粡竚癈鷭т繻Ь因険元因険原因険限因険古因険攻因険晃因険溝因険硬蝟昭粡竚癈鷭т繻Ь因険漸因険租因険族因険卒因険詑因険誕因険坦因険探蝟昭粡竚癈鷭т繻Ь因険蛋因険壇因険弾因険諜因険跳因険賃因険陳因険津蝟昭粡竚癈鷭т繻Ь因険撤因険鉄因険殿因険澱因険動因険同因険堂因険撞蝟昭粡竚癈鷭т繻Ь因険洞因険童因険胴因険督因険篤因顕旭因顕鯵因顕案蝟昭粡竚癈鷭т繻Ь因顕嘘因顕唄因顕厩因顕荏因顕営因顕憶因顕臆因顕恩蝟昭粡竚癈鷭т繻Ь因顕害因顕慨因顕柿因顕干因顕幹因顕患因顕感蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼跳桍鹿粡寂蝟赱齠洲粤讌将牡測牡適牡頭乙卯乙喬乙狸俺穐鹿粡寂蝟赱齠洲粤讌将俺階俺桑俺潮卸巻卸測卸潮卸頭恩穐鹿粡寂蝟赱齠洲粤讌将恩卯恩階恩巻恩桑恩幸恩銭恩適温卯鹿粡寂蝟赱齠洲粤讌将温巻温喬温謙温銭温測価穐価卯価階鹿粡寂蝟赱齠洲粤讌将価巻価桑価謙価幸価銭価適佳穐佳岡鹿粡寂蝟赱齠洲粤讌将佳巻佳桑佳銭佳狸佳適佳頭加喬可穐鹿粡寂蝟赱齠洲粤讌将可規可銭嘉穐嘉岡嘉巻嘉謙嘉銭嘉潮鹿粡寂蝟赱齠洲粤讌将嘉頭夏喬夏桑夏潮夏適外穐外卯外桑鹿粡寂蝟赱齠洲粤讌将外謙外銭外測概巻咳測咳潮咳適咳頭鹿粡寂蝟赱齠洲粤讌将害卯害岡害狸害潮害適崖穐崖階崖桑鹿粡寂蝟赱齠洲粤讌将崖銭崖狸崖潮慨岡慨階慨巻慨桑慨潮鹿粡寂蝟赱齠洲粤讌将慨適概卯概規概喬概桑碍穐碍謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督雇蝟昭粡竚癈鷭т繻Ь因験慶因験憩因験鍵因験顕因験鹸因験原因験個蝟昭粡竚癈鷭т繻Ь因験慌因験拘因験控因験晃因験更因験溝因験甲因験皇蝟昭粡竚癈鷭т繻Ь因験繕因験膳因験噌因験礎因験妥因験惰因験丹因験歎蝟昭粡竚癈鷭т繻Ь因験湛因験弾因験聴因験脹因験調因験陳因験騎因験展蝟昭粡竚癈鷭т繻Ь因験伝因験洞因験童因験胴因験特因鹸葦因鹸斡因鹸袷蝟昭粡竚癈鷭т繻Ь因鹸案因鹸臼因鹸欝因鹸厩因験祖因鹸夏因鹸街因鹸患蝟昭粡竚癈鷭т繻Ь因鹸慣因鹸憾因鹸漢因鹸環因鹸監因鹸輝因鹸飢因鹸偽蝟昭粡竚癈鷭т繻Ь因鹸妓因鹸宜因鹸義因鹸誼因鹸彊因鹸挟因鹸教因鹸況蝟昭粡竚癈鷭т繻Ь因鹸響因鹸薫因鹸軍因鹸郡因鹸袈因鹸係因鹸恵因鹸慶蝟昭粡竚癈鷭т繻Ь因鹸険因鹸元因鹸慌因鹸抗因鹸控因鹸硬因鹸繕因鹸糎蝟昭粡竚癈鷭т繻Ь因鹸噌因鹸疏因鹸粗因鹸賊因鹸卒因鹸汰因鹸堕因鹸妥蝟昭粡竚癈鷭т繻Ь因鹸丹因鹸嘆因鹸歎因鹸淡因鹸鍛因鹸弾因鹸蝶蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼長桍鹿粡寂蝟赱齠洲粤讌将環狸甘桑甘銭甘頭監穐監卯監岡鹿粡寂蝟赱齠洲粤讌将監桑騎岡監銭監測監潮軌岡軌階軌桑鹿粡寂蝟赱齠洲粤讌将軌狸軌適輝穐輝狸輝適飢岡飢階飢巻鹿粡寂蝟赱齠洲粤讌将飢規飢桑飢銭飢測飢頭騎階騎巻騎喬鹿粡寂蝟赱齠洲粤讌将騎頭鬼喬鬼頭亀穐亀卯亀岡亀階亀喬鹿粡寂蝟赱齠洲粤讌将亀幸亀狸亀潮亀適亀頭偽穐偽卯偽岡鹿粡寂蝟赱齠洲粤讌将偽巻偽測偽頭儀幸儀銭儀測儀潮儀頭鹿粡寂蝟赱齠洲粤讌将妓卯妓規妓喬妓幸妓測妓狸妓頭宜階鹿粡寂蝟赱齠洲粤讌将宜謙宜潮宜頭義穐義岡義規義桑蟻巻鹿粡寂蝟赱齠洲粤讌将蟻喬蟻桑蟻謙蟻狸蟻潮蟻適蟻頭誼岡鹿粡寂蝟赱齠洲粤讌将誼桑誼銭誼測誼適義潮議謙議銭議頭鹿粡寂蝟赱齠洲粤讌将掬穐掬喬掬謙掬潮菊階菊喬菊狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督想蝟昭粡竚癈鷭т繻Ь因元篤因原旭因原梓因原圧因原按因原暗因原碓蝟昭粡竚癈鷭т繻Ь因原臼因原渦因原姥因原厩因原餌因原嬰因原憶因原卸蝟昭粡竚癈鷭т繻Ь因原温因原涯因原蓋因原柿因原鈎因原劃因原完因原寛蝟昭粡竚癈鷭т繻Ь因原感因原飢因原騎因原偽因原儀因原妓因原宜因原議蝟昭粡竚癈鷭т繻Ь因原彊因原怯因原恐因原恭因原挟因原狭因原驚因原尭蝟昭粡竚癈鷭т繻Ь因原卦因原袈因原祁因原形因原個因原恒因原攻因原晃蝟昭粡竚癈鷭т繻Ь因原港因原甲因原善因原繕因原膳因原糎因原祖因原賊蝟昭粡竚癈鷭т繻Ь因原続因原卒因原袖因原揃因原存因原孫因原惰因原丹蝟昭粡竚癈鷭т繻Ь因原単因原坦因原探因原脹因原腸因原諜因原跳因原珍蝟昭粡竚癈鷭т繻Ь因原鎮因原徹因原迭因原典因原天因原幻因原徳因原特蝟昭粡竚癈鷭т繻Ь因原督因厳梓因厳圧因厳扱因厳安因厳暗因厳案因厳碓蝟昭粡竚癈鷭т繻Ь因厳嘘因厳唄因厳厩因厳嬰因厳影因厳憶因厳桶蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼賃桍鹿粡寂蝟赱齠洲粤讌将群謙群適群頭軍卯軍岡軍幸軍銭鹿粡寂蝟赱齠洲粤讌将軍狸軍潮軍適郡穐郡階郡規郡潮卦謙鹿粡寂蝟赱齠洲粤讌将卦潮袈卯袈巻袈規袈頭祁卯祁岡祁測鹿粡寂蝟赱齠洲粤讌将係階係巻係規係喬係桑係謙係幸係測鹿粡寂蝟赱齠洲粤讌将係狸傾穐傾階傾規傾桑傾謙傾幸傾適鹿粡寂蝟赱齠洲粤讌将形穐形階形桑形狸形潮形適径卯径規鹿粡寂蝟赱齠洲粤讌将径適径頭恵卯恵謙恵幸恵銭恵適慶規鹿粡寂蝟赱齠洲粤讌将慶喬慶幸慶銭慶狸慶頭慧岡慧階慧巻鹿粡寂蝟赱齠洲粤讌将慧銭慧測慧潮憩卯憩階憩謙憩銭憩頭鹿粡寂蝟赱齠洲粤讌将鍵卯鍵階鍵喬鍵幸鍵銭鍵測険穐険幸鹿粡寂蝟赱齠洲粤讌将険岡険階険巻険謙険銭険測険狸険適鹿粡寂蝟赱齠洲粤讌将険頭顕謙顕潮顕適験穐験岡験規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督築蝟昭粡竚癈鷭т繻Ь因幻柿因幻鈎因幻官因幻干因幻患因幻憾因幻換蝟昭粡竚癈鷭т繻Ь因幻漢因幻澗因幻甘因幻輝因幻亀因幻偽因幻妓因幻義蝟昭粡竚癈鷭т繻Ь因幻誼因幻菊因幻彊因幻挟因幻狭因幻訓因幻傾因幻径蝟昭粡竚癈鷭т繻Ь因幻鍵因幻晃因幻港因幻溝因幻甲因幻稿因幻前因幻糎蝟昭粡竚癈鷭т繻Ь因幻疏因幻汰因幻堕因幻妥因幻丹因幻蛋因幻誕因幻鍛蝟昭粡竚癈鷭т繻Ь因幻団因幻壇因幻脹因幻腸因幻蝶因幻賃因幻津因幻天蝟昭粡竚癈鷭т繻Ь因幻兎因幻動因幻同因幻撞因幻瞳因弦葦因弦斡因弦按蝟昭粡竚癈鷭т繻Ь因弦暗因弦案因弦欝因弦蔚因弦姥因弦厩因弦荏因弦叡蝟昭粡竚癈鷭т繻Ь因弦屋因弦俺因弦卸因弦恩因弦外因弦咳因弦害因弦概蝟昭粡竚癈鷭т繻Ь因弦街因弦柿因弦嚇因弦完因弦寛因弦患因弦感因弦換蝟昭粡竚癈鷭т繻Ь因弦監因弦飢因弦儀因弦義因弦蟻因弦誼因弦怯因弦恐蝟昭粡竚癈鷭т繻Ь因弦恭因弦饗因弦凝因弦薫因弦軍因弦卦因弦形蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼陳桍鹿粡寂蝟赱齠洲粤讌将昂測昂狸昂潮晃幸晃潮更穐更巻鹿粡寂蝟赱齠洲粤讌将更規更測更狸更頭港穐港規溝穐溝巻鹿粡寂蝟赱齠洲粤讌将溝規溝喬溝桑溝狸皇巻皇規皇喬皇桑鹿粡寂蝟赱齠洲粤讌将皇謙硬規硬幸硬測硬潮稿卯稿階稿喬鹿粡寂蝟赱齠洲粤讌将稿幸稿潮稿頭前巻前規前桑前頭善卯鹿粡寂蝟赱齠洲粤讌将善岡善巻善規善適漸穐漸岡漸巻漸喬鹿粡寂蝟赱齠洲粤讌将漸測漸狸漸頭然規然桑然潮然適全穐鹿粡寂蝟赱齠洲粤讌将全階全規全桑全幸全潮全適禅階禅喬鹿粡寂蝟赱齠洲粤讌将禅桑禅謙禅狸禅潮繕卯繕規繕桑膳規鹿粡寂蝟赱齠洲粤讌将膳喬膳桑膳幸膳銭膳測膳適膳頭糎穐鹿粡寂蝟赱齠洲粤讌将糎階糎喬糎測糎頭噌穐噌岡噌喬噌桑鹿粡寂蝟赱齠洲粤讌将噌幸噌頭疏桑疏幸疏適疏頭疎階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹督奴蝟昭粡竚癈鷭т繻Ь因諺其因諺揃因諺詑因諺妥因諺坦因諺旦因諺淡蝟昭粡竚癈鷭т繻Ь因諺湛因諺蛋因諺脹因諺蝶因諺調因諺諜因諺跳因諺陳蝟昭粡竚癈鷭т繻Ь因諺墜因諺澱因諺動因諺憧因諺撞因諺洞因諺特因諺篤蝟昭粡竚癈鷭т繻Ь因限圧因限斡因限安因限臼因限叡因限嬰因限影因限袷蝟昭粡竚癈鷭т繻Ь因限可因限外因限碍因限鈎因限寛因限干因限幹因限患蝟昭粡竚癈鷭т繻Ь因限感因限憾因限飢因限騎因限鬼因限宜因限環因限掬蝟昭粡竚癈鷭т繻Ь因限恭因限仰因限袈因限係因限傾因限恵因限慧因限険蝟昭粡竚癈鷭т繻Ь因限鹸因限元因限限因限個因限呼因限拘因限控因限甲蝟昭粡竚癈鷭т繻Ь因限硬因限稿因乎蓋因乎街因乎劃因乎嚇因乎患因乎慣蝟昭粡竚癈鷭т繻Ь因乎換因乎澗因乎監因乎輝因乎騎因乎鬼因乎儀因乎妓蝟昭粡竚癈鷭т繻Ь因乎蟻因乎議因乎宜因乎恭因乎挟因乎橋因乎狂因乎狭蝟昭粡竚癈鷭т繻Ь因乎仰因乎軍因乎卦因乎袈因乎径因乎慧因乎原蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼墜桍鹿粡寂蝟赱齠洲粤讌将淡桑淡測湛穐湛岡湛階湛幸湛測鹿粡寂蝟赱齠洲粤讌将湛狸蛋巻誕幸誕銭鍛規鍛喬鍛幸鍛測鹿粡寂蝟赱齠洲粤讌将鍛頭団喬団規団幸団潮壇卯壇謙壇狸鹿粡寂蝟赱齠洲粤讌将壇頭弾穐弾岡弾規弾桑弾謙弾適弾頭鹿粡寂蝟赱齠洲粤讌将聴卯聴階聴幸脹岡脹桑脹測超規超幸鹿粡寂蝟赱齠洲粤讌将超狸超適跳頭銚岡銚巻銚謙銚潮長穐鹿粡寂蝟赱齠洲粤讌将長卯長規長適長頭珍穐珍喬珍測珍狸鹿粡寂蝟赱齠洲粤讌将珍頭賃岡賃規賃桑賃幸賃測鎮穐鎮規鹿粡寂蝟赱齠洲粤讌将鎮喬鎮桑鎮謙鎮銭鎮適陳卯陳巻陳規鹿粡寂蝟赱齠洲粤讌将陳桑陳幸津巻津規津桑津狸墜穐賃狸鹿粡寂蝟赱齠洲粤讌将墜卯墜岡墜巻墜潮徹卯徹巻徹規徹喬鹿粡寂蝟赱齠洲粤讌将徹測撤卯撤巻撤喬轍穐轍卯轍岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹禿異蝟昭粡竚癈鷭т繻Ь因古桶因古俺因古卸因古咳因古崖因古涯因古碍蝟昭粡竚癈鷭т繻Ь因古蓋因古街因古劃因古完因古官因古澗因古環因古甘蝟昭粡竚癈鷭т繻Ь因古監因古鬼因古蟻因古誼因古議因古掬因古怯因古恐蝟昭粡竚癈鷭т繻Ь因古狭因古驚因古仰因古尭因古薫因古訓因古傾因古形蝟昭粡竚癈鷭т繻Ь因古径因古顕因古験因古弦因古弘因古慌因古控因古港蝟昭粡竚癈鷭т繻Ь因古溝因古皇因古硬因古漸因古膳因古噌因古祖因古租蝟昭粡竚癈鷭т繻Ь因古続因古袖因古汰因古詑因古丹因古単因古坦因古担蝟昭粡竚癈鷭т繻Ь因古歎因古弾因古脹因古調因古鎮因古展因古電因古動蝟昭粡竚癈鷭т繻Ь因古同因古瞳因古胴因古徳因古田因呼旭因呼芦因呼扱蝟昭粡竚癈鷭т繻Ь因呼宛因呼案因呼碓因呼蔚因呼鰻因呼姥因呼嬰因呼屋蝟昭粡竚癈鷭т繻Ь因呼憶因呼桶因呼乙因呼卸因呼恩因呼加因呼可因呼嘉蝟昭粡竚癈鷭т繻Ь因呼慨因呼概因呼涯因呼碍因呼柿因呼完因呼官蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼撤桍鹿粡寂蝟赱齠洲粤讌将憧階憧桑憧頭撞卯撞岡撞階撞巻鹿粡寂蝟赱齠洲粤讌将撞規撞謙撞潮撞適洞規胴潮徳穐徳卯鹿粡寂蝟赱齠洲粤讌将徳巻徳規徳喬涜規涜喬涜謙涜適特穐鹿粡寂蝟赱齠洲粤讌将特卯特喬特銭特測特潮督穐督岡督階鹿粡寂蝟赱齠洲粤讌将督規禿穐禿階禿巻禿謙禿適篤卯篤規鹿粡寂蝟赱齠洲粤讌将篤喬篤測篤適旭岡旭巻旭謙旭狸葦謙鹿粡寂蝟赱齠洲粤讌将葦測芦謙芦幸芦頭芦銭芦狸芦潮鯵階鹿粡寂蝟赱齠洲粤讌将鯵巻鯵桑鯵頭梓階梓巻梓狸圧測圧潮鹿粡寂蝟赱齠洲粤讌将斡岡斡喬斡桑斡狸扱穐扱巻扱幸宛規鹿粡寂蝟赱齠洲粤讌将宛謙宛測宛狸宛適姐穐姐規姐桑姐謙鹿粡寂蝟赱齠洲粤讌将姐幸姐測袷穐袷卯袷岡袷規安穐安岡鹿粡寂蝟赱齠洲粤讌将安階安巻安喬安潮庵狸安適庵階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹禿菓蝟昭粡竚癈鷭т繻Ь因弘担因弘探因弘歎因弘淡因弘諜因弘跳因弘銚蝟昭粡竚癈鷭т繻Ь因弘長因弘鎮因弘陳因弘墜因弘典因弘腸因弘洞因弘殿蝟昭粡竚癈鷭т繻Ь因弘兎因弘動因弘憧因弘禿因弘篤因恒旭因恒梓因恒圧蝟昭粡竚癈鷭т繻Ь因恒斡因恒宛因恒按因恒碓因恒唄因恒蔚因恒鰻因恒姥蝟昭粡竚癈鷭т繻Ь因恒荏因恒叡因恒嬰因恒屋因恒乙因恒臆因恒桶因恒卸蝟昭粡竚癈鷭т繻Ь因恒温因恒嘉因恒夏因恒咳因恒慨因恒涯因恒碍因恒街蝟昭粡竚癈鷭т繻Ь因恒柿因恒鈎因恒劃因恒干因恒慣因恒憾因恒監因恒騎蝟昭粡竚癈鷭т繻Ь因恒儀因恒宜因恒義因恒蟻因恒怯因恒挟因恒況因恒仰蝟昭粡竚癈鷭т繻Ь因恒郡因恒傾因恒形因恒径因恒険因恒験因恒元因恒原蝟昭粡竚癈鷭т繻Ь因恒諺因恒古因恒恒因恒抗因恒拘因恒控因恒晃因恒硬蝟昭粡竚癈鷭т繻Ь因恒善因恒繕因恒糎因恒礎因恒祖因恒租因恒属因恒賊蝟昭粡竚癈鷭т繻Ь因恒族因恒続因恒其因恒詑因恒唾因恒堕因恒惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼迭桍鹿粡寂蝟赱齠洲粤讌将叡岡叡階叡規営階営巻営桑営幸鹿粡寂蝟赱齠洲粤讌将営銭営適嬰巻嬰規嬰幸嬰銭嬰狸嬰潮鹿粡寂蝟赱齠洲粤讌将嬰適嬰頭影穐影卯影桑影幸影測影潮鹿粡寂蝟赱齠洲粤讌将屋穐屋卯屋巻屋規屋喬屋桑屋幸屋銭鹿粡寂蝟赱齠洲粤讌将屋狸憶穐憶岡憶階憶喬憶謙憶狸憶潮鹿粡寂蝟赱齠洲粤讌将臆階臆巻臆規臆喬臆謙臆適臆頭桶穐鹿粡寂蝟赱齠洲粤讌将桶階桶規桶喬桶謙桶幸桶銭桶狸桶適鹿粡寂蝟赱齠洲粤讌将牡穐牡岡牡階牡喬牡桑牡銭牡潮牡適鹿粡寂蝟赱齠洲粤讌将牡頭乙卯乙謙乙幸乙狸乙潮俺穐俺卯鹿粡寂蝟赱齠洲粤讌将俺規俺桑俺謙俺幸俺適俺頭卸穐卸規鹿粡寂蝟赱齠洲粤讌将卸喬卸桑卸謙卸幸卸測卸狸卸潮卸頭鹿粡寂蝟赱齠洲粤讌将恩謙恩幸恩銭恩潮恩適温岡温桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹禿館蝟昭粡竚癈鷭т繻Ь因慌更因慌稿因慌前因慌全因慌禅因慌膳因慌糎蝟昭粡竚癈鷭т繻Ь因慌疎因慌粗因慌族因慌其因慌存因慌汰因慌詑因慌唾蝟昭粡竚癈鷭т繻Ь因慌堕因慌惰因慌丹因慌単因慌嘆因慌坦因慌探因慌旦蝟昭粡竚癈鷭т繻Ь因慌歎因慌淡因慌誕因慌鍛因慌団因慌壇因慌聴因慌蝶蝟昭粡竚癈鷭т繻Ь因慌諜因慌跳因慌銚因慌長因慌鎮因慌陳因慌墜因慌徹蝟昭粡竚癈鷭т繻Ь因慌撤因慌迭因慌典因慌天因慌展因慌澱因慌電因慌動蝟昭粡竚癈鷭т繻Ь因慌胴因慌涜因慌篤因抗旭因抗芦因抗宛因抗按因抗臼蝟昭粡竚癈鷭т繻Ь因抗唄因抗欝因抗叡因抗営因抗嬰因抗影因抗憶因抗牡蝟昭粡竚癈鷭т繻Ь因抗乙因抗卸因抗温因抗価因抗崖因抗慨因抗涯因抗碍蝟昭粡竚癈鷭т繻Ь因抗慣因抗憾因抗換因抗軌因抗輝因抗飢因抗亀因抗儀蝟昭粡竚癈鷭т繻Ь因抗妓因抗義因抗掬因抗挟因抗教因抗況因抗狭因抗響蝟昭粡竚癈鷭т繻Ь因抗仰因抗尭因抗薫因抗訓因抗軍因抗郡因抗袈蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼典桍鹿粡寂蝟赱齠洲粤讌将碍銭碍潮碍頭蓋穐蓋卯蓋岡蓋謙鹿粡寂蝟赱齠洲粤讌将蓋銭蓋測蓋潮蓋頭街岡街規街謙街測鹿粡寂蝟赱齠洲粤讌将街適柿卯柿階柿巻柿喬柿謙柿測蛎巻鹿粡寂蝟赱齠洲粤讌将蛎規蛎喬蛎銭柿幸鈎卯鈎巻鈎規鈎喬鹿粡寂蝟赱齠洲粤讌将鈎桑鈎幸鈎銭鈎測鈎狸鈎潮劃階劃幸鹿粡寂蝟赱齠洲粤讌将劃狸劃適劃頭嚇岡嚇喬嚇桑各幸各桑鹿粡寂蝟赱齠洲粤讌将各謙各銭各測各潮完卯完岡完巻完謙鹿粡寂蝟赱齠洲粤讌将完幸完潮完適完頭官規官喬官桑官頭鹿粡寂蝟赱齠洲粤讌将寛適寛頭干卯干岡干階干巻干測干頭鹿粡寂蝟赱齠洲粤讌将干潮幹階幹規幹謙幹銭幹狸患規患幸鹿粡寂蝟赱齠洲粤讌将患狸患頭感卯感階感謙感測感潮感適鹿粡寂蝟赱齠洲粤讌将感頭慣卯慣岡憾巻憾階儀謙儀幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹禿緊蝟昭粡竚癈鷭т繻Ь因控慧因控鹸因控幻因控乎因控個因控古因控皇蝟昭粡竚癈鷭т繻Ь因控硬因控稿因控善因控繕因控噌因控疎因控礎因控卒蝟昭粡竚癈鷭т繻Ь因控其因控汰因控堕因控惰因控旦因控淡因控湛因控誕蝟昭粡竚癈鷭т繻Ь因控聴因控脹因控腸因控蝶因控長因控珍因控陳因控津蝟昭粡竚癈鷭т繻Ь因控墜因控徹因控鉄因控填因攻営因攻嬰因攻臆因攻牡蝟昭粡竚癈鷭т繻Ь因攻乙因攻俺因攻加因攻咳因攻崖因攻碍因攻蓋因攻街蝟昭粡竚癈鷭т繻Ь因攻柿因攻鈎因攻劃因攻官因攻飢因攻鬼因攻偽因攻儀蝟昭粡竚癈鷭т繻Ь因攻妓因攻怯因攻凝因攻郡因攻径因攻恵因攻慧因攻憩蝟昭粡竚癈鷭т繻Ь因攻険因攻顕因攻験因攻鹸因攻弦因攻恒因攻攻因攻港蝟昭粡竚癈鷭т繻Ь因攻皇因攻稿因攻全因攻禅因攻繕因攻噌因攻租因攻粗蝟昭粡竚癈鷭т繻Ь因攻続因攻汰因攻蛋因攻腸因議族因攻銚因攻珍因攻陳蝟昭粡竚癈鷭т繻Ь因攻津因攻墜因攻店因攻兎因攻同因攻徳因昂芦蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼天桍鹿粡寂蝟赱齠洲粤讌将薫階薫規薫幸訓銭訓測訓潮群卯鹿粡寂蝟赱齠洲粤讌将群岡群階群謙軍卯軍階郡卯郡階郡銭鹿粡寂蝟赱齠洲粤讌将郡適郡頭卦規卦桑卦謙卦銭卦測袈階鹿粡寂蝟赱齠洲粤讌将袈桑袈銭袈適祁階祁喬祁桑祁謙祁測鹿粡寂蝟赱齠洲粤讌将祁潮祁頭係穐係幸傾規傾喬傾桑傾幸鹿粡寂蝟赱齠洲粤讌将傾銭傾適傾頭形岡形狸形適径卯径岡鹿粡寂蝟赱齠洲粤讌将径規径喬径謙径幸径銭径狸径適径頭鹿粡寂蝟赱齠洲粤讌将恵卯恵巻恵規恵桑恵幸恵銭恵狸恵潮鹿粡寂蝟赱齠洲粤讌将恵適慶穐慶卯慶巻慶桑慶謙慶幸慶潮鹿粡寂蝟赱齠洲粤讌将慶適慧穐慶測慧卯慧巻慧頭憩卯憩巻鹿粡寂蝟赱齠洲粤讌将憩桑憩謙憩銭鍵桑鍵銭険幸鍵潮鍵適鹿粡寂蝟赱齠洲粤讌将険巻険喬険狸険適顕穐顕階顕喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹禿雇蝟昭粡竚癈鷭т繻Ь因晃佳因晃嘉因晃夏因晃外因晃害因晃崖因晃概蝟昭粡竚癈鷭т繻Ь因晃乙因晃嚇因晃幹因晃慣因晃漢因晃輝因晃飢因晃騎蝟昭粡竚癈鷭т繻Ь因晃偽因晃儀因晃宜因晃義因晃恐因晃恭因晃教因晃橋蝟昭粡竚癈鷭т繻Ь因晃響因晃驚因晃疎因晃祖因晃租因晃属因晃卒因晃揃蝟昭粡竚癈鷭т繻Ь因晃存因晃汰因晃詑因晃惰因晃嘆因晃探因晃淡因晃鍛蝟昭粡竚癈鷭т繻Ь因晃撤因晃迭因晃典因晃填因晃天因晃伝因晃導因晃洞蝟昭粡竚癈鷭т繻Ь因更芦因更扱因更宛因更臼因更欝因更蔚因更鰻因更荏蝟昭粡竚癈鷭т繻Ь因更餌因更叡因更影因更臆因更俺因更卸因更佳因更咳蝟昭粡竚癈鷭т繻Ь因更害因更崖因更慨因更概因更街因更柿因更蛎因更鈎蝟昭粡竚癈鷭т繻Ь因更完因更官因更感因更慣因更憾因更環因更甘因更鬼蝟昭粡竚癈鷭т繻Ь因更妓因更宜因更蟻因更誼因更掬因更菊因更彊因更溝蝟昭粡竚癈鷭т繻Ь因更皇因更稿因更繕因更属因更賊因更族因更袖蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼店桍鹿粡寂蝟赱齠洲粤讌将溝幸溝銭溝潮溝頭甲階甲幸皇階鹿粡寂蝟赱齠洲粤讌将皇巻皇幸皇銭皇狸皇適硬桑硬銭硬測鹿粡寂蝟赱齠洲粤讌将硬狸稿穐稿巻稿規稿幸稿潮稿適前岡鹿粡寂蝟赱齠洲粤讌将前階前巻前測前狸善穐善卯善喬善適鹿粡寂蝟赱齠洲粤讌将漸穐漸岡漸階漸巻漸桑漸潮漸適然階鹿粡寂蝟赱齠洲粤讌将然規然喬然謙全桑全卯全巻全銭全測鹿粡寂蝟赱齠洲粤讌将全狸全適禅卯禅巻禅喬禅潮疏銭疏狸鹿粡寂蝟赱齠洲粤讌将疏適疏頭疎岡疎巻疎規疎喬疎幸疎測鹿粡寂蝟赱齠洲粤讌将疎適疎頭礎卯礎階礎喬礎謙礎適祖穐鹿粡寂蝟赱齠洲粤讌将祖岡祖規祖喬祖桑祖測祖狸租穐租巻鹿粡寂蝟赱齠洲粤讌将租規租桑租幸租狸粗岡粗階粗規粗幸鹿粡寂蝟赱齠洲粤讌将粗銭粗潮粗頭属穐属卯属岡属階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹禿想蝟昭粡竚癈鷭т繻Ь因溝梓因溝圧因溝宛因溝姐因溝安因溝庵因溝按蝟昭粡竚癈鷭т繻Ь因溝暗因溝碓因溝渦因溝蔚因溝厩因溝餌因溝叡因溝屋蝟昭粡竚癈鷭т繻Ь因溝俺因溝佳因溝可因溝崖因溝慨因溝概因溝碍因溝街蝟昭粡竚癈鷭т繻Ь因溝柿因溝劃因溝憾因溝澗因溝潅因溝亀因溝偽因溝儀蝟昭粡竚癈鷭т繻Ь因溝蟻因溝掬因溝怯因溝恭因溝教因溝橋因溝狂因溝響蝟昭粡竚癈鷭т繻Ь因溝饗因溝驚因溝仰因溝凝因溝軍因溝卦因溝祁因溝係蝟昭粡竚癈鷭т繻Ь因溝傾因溝憩因溝鍵因溝鹸因溝元因溝原因溝厳因溝弦蝟昭粡竚癈鷭т繻Ь因溝諺因溝限因溝個因溝呼因溝弘因溝拘因溝港因溝皇蝟昭粡竚癈鷭т繻Ь因溝硬因溝繕因溝膳因溝噌因溝礎因溝属因溝賊因溝族蝟昭粡竚癈鷭т繻Ь因溝揃因溝存因溝詑因溝唾因溝妥因溝惰因溝単因溝歎蝟昭粡竚癈鷭т繻Ь因溝淡因溝壇因溝聴因溝跳因溝銚因溝陳因溝墜因溝典蝟昭粡竚癈鷭т繻Ь因溝天因溝伝因溝殿因溝兎因溝導因溝瞳因溝童蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼殿桍鹿粡寂蝟赱齠洲粤讌将惰幸惰銭惰潮惰頭丹穐丹岡丹測鹿粡寂蝟赱齠洲粤讌将丹頭単卯単喬単謙単幸単銭単狸単適鹿粡寂蝟赱齠洲粤讌将嘆岡嘆階嘆喬嘆桑嘆謙嘆幸嘆銭坦卯鹿粡寂蝟赱齠洲粤讌将坦規坦喬坦桑坦潮担卯担階担巻担規鹿粡寂蝟赱齠洲粤讌将担幸担銭担適担頭探穐探階探巻探喬鹿粡寂蝟赱齠洲粤讌将探謙探測探潮探適探頭旦階旦幸旦銭鹿粡寂蝟赱齠洲粤讌将探狸旦測旦謙旦適歎穐歎岡歎規歎桑鹿粡寂蝟赱齠洲粤讌将歎測壇喬弾岡弾桑弾幸聴測聴岡脹卯鹿粡寂蝟赱齠洲粤讌将脹桑脹謙脹狸脹潮脹適腸頭蝶穐蝶岡鹿粡寂蝟赱齠洲粤讌将蝶階蝶巻蝶銭蝶狸調規蝶潮調岡調階鹿粡寂蝟赱齠洲粤讌将調桑調銭諜階諜巻諜頭超階超岡超規鹿粡寂蝟赱齠洲粤讌将超幸超銭超測跳穐跳喬跳桑跳測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹禿築蝟昭粡竚癈鷭т繻Ь因皇恵因皇慧因皇験因皇鹸因皇原因皇諺因皇個蝟昭粡竚癈鷭т繻Ь因皇古因皇慌因皇抗因皇控因皇攻因皇昂因皇晃因皇善蝟昭粡竚癈鷭т繻Ь因皇疏因皇礎因皇租因皇賊因皇袖因皇孫因皇唾因皇惰蝟昭粡竚癈鷭т繻Ь因皇坦因皇歎因皇湛因皇蛋因皇調因皇諜因皇超因皇跳蝟昭粡竚癈鷭т繻Ь因皇珍因皇津因皇墜因皇徹因皇典因皇天因皇店因皇殿蝟昭粡竚癈鷭т繻Ь因皇電因皇動因皇導因皇憧因皇禿因硬袷因硬芦因硬扱蝟昭粡竚癈鷭т繻Ь因硬暗因硬碓因硬臼因硬渦因硬欝因硬蔚因硬厩因硬叡蝟昭粡竚癈鷭т繻Ь因硬営因硬形因硬径因硬恵因硬鍵因硬顕因硬験因硬鹸蝟昭粡竚癈鷭т繻Ь因硬元因硬厳因硬古因硬呼因硬攻因硬晃因硬溝因硬硬蝟昭粡竚癈鷭т繻Ь因硬全因硬糎因硬礎因硬租因硬粗因硬属因硬続因硬卒蝟昭粡竚癈鷭т繻Ь因硬袖因硬旦因硬淡因硬誕因硬諜因硬墜因硬鉄因硬天蝟昭粡竚癈鷭т繻Ь因硬澱因硬田因硬電因硬動因硬同因硬堂因硬撞蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼田桍鹿粡寂蝟赱齠洲粤讌将兎謙兎頭動岡動階動幸動頭同穐鹿粡寂蝟赱齠洲粤讌将同卯同岡同巻同喬同桑同幸同銭同測鹿粡寂蝟赱齠洲粤讌将同頭堂岡堂喬堂銭堂測堂頭導卯導岡鹿粡寂蝟赱齠洲粤讌将導巻導桑導幸導銭導狸導潮導頭憧卯鹿粡寂蝟赱齠洲粤讌将憧階憧巻憧規憧喬憧桑撞階撞規撞喬鹿粡寂蝟赱齠洲粤讌将撞桑撞謙撞銭撞潮撞適洞謙洞幸洞潮鹿粡寂蝟赱齠洲粤讌将洞適洞頭瞳穐瞳卯瞳階瞳規瞳銭瞳潮鹿粡寂蝟赱齠洲粤讌将童頭胴穐胴卯胴岡胴巻胴喬胴桑胴適鹿粡寂蝟赱齠洲粤讌将徳卯徳岡徳階徳規穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯熹閙羝澹篤額蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憶薫因憶訓因憶群因憶軍因憶郡蝟昭粡竚癈鷭т繻Ь因憶卦因憶袈因憶祁因憶係因憶傾因憶彊因憶怯蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互呼憧桍鹿粡寂蝟赱齠洲粤讌将因憶恐因憶恭因憶挟因憶教因憶橋因憶況因憶狂蝟昭粡竚癈鷭т繻Ь蔚幸羂桑羂岡桶卯臼喬渦卯謂皙繙祠鹿粡寂蝟赱齠洲粤讌将因軌羇因輝繝因騎扱因騎牡因聲医因鬼午因儀宜因聲井蝟昭粡竚癈鷭т繻Ь甕穐弦絳矼祠竊規箋階甕卯聰桑宛規鹿粡寂蝟赱齠洲粤讌将因怯屋因教翫因橋鰍因橋教因聲渦因羚温因狂葦因聲嘘蝟昭粡竚癈鷭т繻Ь甕巻甼皙痳岡粭謙粭岡芦謙甕規甕喬鹿粡寂蝟赱齠洲粤讌将因卦葦因袈顕因袈劫因聲鰻因傾外因聲姥因聲厩因聲堰蝟昭粡竚癈鷭т繻Ь甕皙痳桑甕祠甕筱籬穐粐喬甕絳涯岡鹿粡寂蝟赱齠洲粤讌将因聲掩因元皸因聲屋因聲憶因幻扱因聲臆因呉傑因吾羇蝟昭粡竚癈鷭т繻Ь箏喬甓階甓巻甓規遺絳甓喬臼規甓桑鹿粡寂蝟赱齠洲粤讌将因聲恩因控慌因羚粃因聲温因昂鰍因昂岩因昂輝因聲過蝟昭粡竚癈鷭т繻Ь甓皙甓祠更絳痲幸盞岡甓筱繖卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将e鈔蜀悵憶貨杜疎姪蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥纒窰熾互奄縻蝟昭粡竚癈鷭т繻Ь因篤怯因篤恐因篤恭因篤挟因篤教因篤橋因篤況蝟昭粡竚癈鷭т繻Ь因篤狂因篤狭因篤響因篤饗因篤驚因篤仰因篤凝因篤尭蝟昭粡竚癈鷭т繻Ь因篤薫因篤訓因篤群因篤軍因篤郡因篤卦因篤袈因篤祁蝟昭粡竚癈鷭т繻Ь因篤係因篤傾因篤形因篤径因篤恵因篤慶因篤慧因篤憩蝟昭粡竚癈鷭т繻Ь因篤鍵因篤険因篤顕因篤験因篤鹸因篤元因篤原因篤厳蝟昭粡竚癈鷭т繻Ь因篤幻因篤弦因篤諺因篤限因篤乎因篤個因篤古因篤呼蝟昭粡竚癈鷭т繻Ь因篤弘因篤恒因篤慌因篤抗因篤拘因篤控因篤攻因篤昂蝟昭粡竚癈鷭т繻Ь因篤晃因篤更因篤港因篤溝因篤甲因篤皇因篤硬因篤稿蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因旭噌因憶臆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡熹閙羝濂磔黝蝟昭粡竚癈鷭т繻Ь纒窰熾互善纒窰熾互漸纒窰熾互然蝟昭粡竚癈鷭т繻Ь纒窰熾互全纒窰熾互禅纒窰熾互繕纒窰熾互膳蝟昭粡竚癈鷭т繻Ь纒窰熾互糎纒窰熾互噌纒窰熾互疏纒窰熾互疎蝟昭粡竚癈鷭т繻Ь纒窰熾互礎纒窰熾互祖纒窰熾互租纒窰熾互粗蝟昭粡竚癈鷭т繻Ь纒窰熾互属纒窰熾互賊纒窰熾互族纒窰熾互続蝟昭粡竚癈鷭т繻Ь纒窰熾互卒纒窰熾互袖纒窰熾互其纒窰熾互揃蝟昭粡竚癈鷭т繻Ь纒窰熾互存纒窰熾互孫纒窰熾互汰纒窰熾互詑蝟昭粡竚癈鷭т繻Ь纒窰熾互唾纒窰熾互堕纒窰熾互妥纒窰熾互惰蝟昭粡竚癈鷭т繻Ь纒窰熾互丹纒窰熾互単纒窰熾互嘆纒窰熾互坦蝟昭粡竚癈鷭т繻Ь纒窰熾互担纒窰熾互探纒窰熾互旦纒窰熾互歎蝟昭粡竚癈鷭т繻Ь纒窰熾互淡纒窰熾互湛纒窰熾互蛋纒窰熾互誕蝟昭粡竚癈鷭т繻Ь纒窰熾互鍛纒窰熾互団纒窰熾互壇纒窰熾互弾蝟昭粡竚癈鷭т繻Ь纒窰熾互聴纒窰熾互脹纒窰熾互腸纒窰熾互蝶蝟昭粡竚癈鷭т繻Ь纒窰熾互調纒窰熾互諜纒窰熾互超纒窰熾互跳蝟昭粡竚癈鷭т繻Ь纒窰熾互銚纒窰熾互長纒窰熾互珍纒窰熾互賃蝟昭粡竚癈鷭т繻Ь纒窰熾互鎮纒窰熾互陳纒窰熾互津纒窰熾互墜蝟昭粡竚癈鷭т繻Ь纒窰熾互徹纒窰熾互撤纒窰熾互轍纒窰熾互迭蝟昭粡竚癈鷭т繻Ь纒窰熾互鉄纒窰熾互典纒窰熾互填纒窰熾互天蝟昭粡竚癈鷭т繻Ь纒窰熾互展纒窰熾互店纒窰熾互伝纒窰熾互殿蝟昭粡竚癈鷭т繻Ь纒窰熾互澱纒窰熾互田纒窰熾互電纒窰熾互兎蝟昭粡竚癈鷭т繻Ь纒窰熾互動纒窰熾互同纒窰熾互堂纒窰熾互導蝟昭粡竚癈鷭т繻Ь纒窰熾互憧纒窰熾互撞蝟昭粡竚癈鷭т繻Ь纒窰熾互胴纒窰熾互徳纒窰熾互涜蝟昭粡竚癈鷭т繻Ь纒窰熾互特蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь莱竰闢閹嫦浴韶蜴衷逅癆蛯跂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡熹閙羝濂磔黯逑桍鹿粡寂蝟赱齠洲粤讌将熹閙羝濮円逑纒窰熾互漸熏鵺熹閙羝濮階鹿粡寂蝟赱齠洲粤讌将熹閙羝濮巻熹閙羝濮規熹閙羝濮喬熹閙羝濮桑鹿粡寂蝟赱齠洲粤讌将熹閙羝濮謙熹閙羝濮幸熹閙羝濮銭熹閙羝濮測鹿粡寂蝟赱齠洲粤讌将熹閙羝濮狸熹閙羝濮潮熹閙羝濮適熹閙羝濮頭鹿粡寂蝟赱齠洲粤讌将熹閙羝濛穐熹閙羝濛卯熹閙羝濛岡熹閙羝濛階鹿粡寂蝟赱齠洲粤讌将熹閙羝濛巻熹閙羝濛規熹閙羝濛喬熹閙羝濛桑鹿粡寂蝟赱齠洲粤讌将熹閙羝濛謙熹閙羝濛幸熹閙羝濛銭熹閙羝濛測鹿粡寂蝟赱齠洲粤讌将熹閙羝濛狸熹閙羝濛潮熹閙羝濛適熹閙羝濛頭鹿粡寂蝟赱齠洲粤讌将熹閙羝瀉穐熹閙羝瀉卯熹閙羝瀉岡熹閙羝瀉階鹿粡寂蝟赱齠洲粤讌将熹閙羝瀉巻熹閙羝瀉規熹閙羝瀉喬熹閙羝瀉桑鹿粡寂蝟赱齠洲粤讌将熹閙羝瀉謙熹閙羝瀉幸熹閙羝瀉銭熹閙羝瀉測鹿粡寂蝟赱齠洲粤讌将熹閙羝瀉狸熹閙羝瀉潮熹閙羝瀉適熹閙羝瀉頭鹿粡寂蝟赱齠洲粤讌将熹閙羝瀋穐熹閙羝瀋卯熹閙羝瀋岡熹閙羝瀋階鹿粡寂蝟赱齠洲粤讌将熹閙羝瀋巻熹閙羝瀋規熹閙羝瀋喬熹閙羝瀋桑鹿粡寂蝟赱齠洲粤讌将熹閙羝瀋謙熹閙羝瀋幸熹閙羝瀋銭熹閙羝瀋測鹿粡寂蝟赱齠洲粤讌将熹閙羝瀋狸熹閙羝瀋潮熹閙羝瀋適熹閙羝瀋頭鹿粡寂蝟赱齠洲粤讌将熹閙羝濺穐熹閙羝濺卯熹閙羝濺岡熹閙羝濺階鹿粡寂蝟赱齠洲粤讌将熹閙羝濺巻熹閙羝濺規熹閙羝濺喬熹閙羝濺桑鹿粡寂蝟赱齠洲粤讌将熹閙羝濺謙熹閙羝濺幸熹閙羝濺銭熹閙羝濺測鹿粡寂蝟赱齠洲粤讌将熹閙羝濺狸熹閙羝濺潮熹閙羝濺適熹閙羝濺頭鹿粡寂蝟赱齠洲粤讌将熹閙羝瀑穐熹閙羝瀑卯熹閙羝瀑岡熹閙羝瀑階鹿粡寂蝟赱齠洲粤讌将熹閙羝瀑巻熹閙羝瀑規穐穐鹿粡寂蝟赱齠洲粤讌将穐熹閙羝瀑幸熹閙羝瀑銭熹閙羝瀑測鹿粡寂蝟赱齠洲粤讌将熹閙羝瀑蓄逑蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯竢銖憶貨熾互霞纉桍鹿粡寂蝟赱齠洲粤讌将穐熹閙羝澹徳岡穐鹿粡寂蝟赱齠洲粤讌将穐穐熹閙羝澹徳喬熹閙羝澹徳桑鹿粡寂蝟赱齠洲粤讌将穐熹閙羝澹徳幸熹閙羝澹徳銭熹閙羝澹徳測鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将熹閙羝澹涜穐熹閙羝澹涜卯熹閙羝澹涜岡熹閙羝澹涜階鹿粡寂蝟赱齠洲粤讌将熹閙羝澹涜巻熹閙羝澹涜規熹閙羝澹涜喬熹閙羝澹涜桑鹿粡寂蝟赱齠洲粤讌将熹閙羝澹涜謙熹閙羝澹涜幸熹閙羝澹涜銭熹閙羝澹涜測鹿粡寂蝟赱齠洲粤讌将熹閙羝澹涜狸熹閙羝澹涜潮熹閙羝澹涜適熹閙羝澹涜頭鹿粡寂蝟赱齠洲粤讌将熹閙羝澹特穐熹閙羝澹特卯熹閙羝澹特岡熹閙羝澹特階鹿粡寂蝟赱齠洲粤讌将熹閙羝澹特巻熹閙羝澹特規熹閙羝澹特喬熹閙羝澹特桑鹿粡寂蝟赱齠洲粤讌将熹閙羝澹特謙熹閙羝澹特幸熹閙羝澹特銭熹閙羝澹特測鹿粡寂蝟赱齠洲粤讌将熹閙羝澹特狸熹閙羝澹特潮熹閙羝澹特適熹閙羝澹特頭鹿粡寂蝟赱齠洲粤讌将熹閙羝澹督穐熹閙羝澹督卯熹閙羝澹督岡熹閙羝澹督階鹿粡寂蝟赱齠洲粤讌将熹閙羝澹督巻熹閙羝澹督規熹閙羝澹督喬熹閙羝澹督桑鹿粡寂蝟赱齠洲粤讌将熹閙羝澹督謙熹閙羝澹督幸熹閙羝澹督銭熹閙羝澹督測鹿粡寂蝟赱齠洲粤讌将熹閙羝澹督狸熹閙羝澹督潮熹閙羝澹督適熹閙羝澹督頭鹿粡寂蝟赱齠洲粤讌将熹閙羝澹禿穐熹閙羝澹禿卯熹閙羝澹禿岡熹閙羝澹禿階鹿粡寂蝟赱齠洲粤讌将熹閙羝澹禿巻熹閙羝澹禿規熹閙羝澹禿喬熹閙羝澹禿桑鹿粡寂蝟赱齠洲粤讌将熹閙羝澹禿謙熹閙羝澹禿幸熹閙羝澹禿銭熹閙羝澹禿測鹿粡寂蝟赱齠洲粤讌将熹閙羝澹禿狸熹閙羝澹禿潮穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐熹閙羝澹篤階鹿粡寂蝟赱齠洲粤讌将熹閙羝澹篤巻穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐鹿粡寂蝟赱齠洲粤讌将e鈔蜀悵憶貨杜疎姪蝟昭粡竚癈鷭т繻Ь緕粡堝互墅孕濺料駄鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙堝互瀕侖壥杜疎姪鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥瀉菓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因漸寛因憶訓因憶群因漸薫因憶尭因漸干因憶係蝟昭粡竚癈鷭т繻Ь因憶夏因漸仰因漸驚因臆潅因漸凝因漸慨蝟昭粡竚癈鷭т繻Ь因憶饗因憶掬因憶可因臆傾蝟昭粡竚癈鷭т繻Ь因漸咳因漸饗因漸幹蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰嘆熏黝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因漸寛因憶訓因憶群因漸薫因誼因漸干因憶係蝟昭粡竚癈鷭т繻Ь因憶夏因漸仰因漸驚因臆潅因漸凝因漸慨蝟昭粡竚癈鷭т繻Ь因憶饗因憶掬因憶可因臆傾蝟昭粡竚癈鷭т繻Ь因漸咳因漸饗因漸幹蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰嘆濆害桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐卯鰻卯鰻岡穐狸狸鰻謙鹿粡寂蝟赱齠洲粤讌将渦頭階卯俺階牡狸潮岡嘘卯鹿粡寂蝟赱齠洲粤讌将蔚測欝適岡階渦潮挟狸卸幸渦喬鹿粡寂蝟赱齠洲粤讌将渦巻卯頭俺巻穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥瀉額蝟昭粡竚癈鷭т繻Ь因疏臆因疏憶因疏牡因疏価因疏桶因疏温因噌憶因疏嘉蝟昭粡竚癈鷭т繻Ь因疏害因疏咳因疏慨因疏崖因疏完因疏各因疏寛因疏官蝟昭粡竚癈鷭т繻Ь因疏軌因疏飢因疏輝因疏鬼因疏妓因疏騎因憶菊蝟昭粡竚癈鷭т繻Ь因噌加因疏恭因疏恐因疏教因疏挟因疏群因噌外因噌甘蝟昭粡竚癈鷭т繻Ь因疎臆因疎憶因疎牡因疎価因疎桶因疎温因噌官因疎嘉蝟昭粡竚癈鷭т繻Ь因疎害因疎咳因疎慨因疎崖因疎完因疎各因疎寛因疎官蝟昭粡竚癈鷭т繻Ь因噌干因疎軌因疎飢因疎輝因疎鬼因疎妓因疎騎因憶彊蝟昭粡竚癈鷭т繻Ь因噌潅因疎恭因疎恐因疎教因疎挟因疎群因噌軌因疎軍蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰坦濆害桍鹿粡寂蝟赱齠洲粤讌将卯卯卯卯卯卯卯階鹿粡寂蝟赱齠洲粤讌将規規規規幸幸幸幸鹿粡寂蝟赱齠洲粤讌将巻適頭頭頭頭頭欝頭鹿粡寂蝟赱齠洲粤讌将頭規規規規幸巻階鹿粡寂蝟赱齠洲粤讌将卯卯卯卯卯卯卯階鹿粡寂蝟赱齠洲粤讌将規規規規幸幸幸幸鹿粡寂蝟赱齠洲粤讌将巻適頭頭頭頭頭蔚穐鹿粡寂蝟赱齠洲粤讌将頭規規規規幸巻幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥瀉館蝟昭粡竚癈鷭т繻Ь因疏卸因疎卸因疏乙因疎乙因疏恩因疎恩因疏佳因疎佳蝟昭粡竚癈鷭т繻Ь因疏加因疎加因疏夏因疎夏因疏可因疎可因疏外因疎外蝟昭粡竚癈鷭т繻Ь因噌臆因噌寛因疏碍因疎碍因疏涯因疎涯蝟昭粡竚癈鷭т繻Ь因疏蓋因疎蓋因疏概因疎概因疏柿因疎柿因疏蛎因疎蛎蝟昭粡竚癈鷭т繻Ь因疏劃因疎劃因疏鈎因疏嚇因疎嚇因噌牡因噌幹蝟昭粡竚癈鷭т繻Ь因疏慣因疎慣因疏患因疎患因疏感因疎感蝟昭粡竚癈鷭т繻Ь因疏幹因噌患因噌俺因噌感因疏憾因疎憾因疏換因疎換蝟昭粡竚癈鷭т繻Ь因噌慣因疏漢因疎漢因疏潅因疎潅因疏澗因疎澗因噌温蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰探桍鹿粡寂蝟赱齠洲粤讌将拘幸慌謙拘謙全潮卒潮全頭卒頭全適鹿粡寂蝟赱齠洲粤讌将卒適拘銭慌測拘測禅桑袖桑穐穐鹿粡寂蝟赱齠洲粤讌将禅喬袖喬慌潮拘潮禅幸袖幸禅測袖測鹿粡寂蝟赱齠洲粤讌将禅銭袖銭禅狸袖狸禅潮袖潮禅頭袖頭鹿粡寂蝟赱齠洲粤讌将禅適袖適繕卯其卯繕穐其穐慌頭拘頭鹿粡寂蝟赱齠洲粤讌将繕狸其狸繕幸其幸繕喬其喬繕測其測鹿粡寂蝟赱齠洲粤讌将繕謙其謙繕銭其銭膳卯揃卯膳巻揃巻鹿粡寂蝟赱齠洲粤讌将膳階膳規揃規膳桑揃桑膳喬揃喬穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥瀉頚蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因疏俺因疎俺因疏干蝟昭粡竚癈鷭т繻Ь因疎干因疏亀因疎亀因疏況因疎況因疏薫因疎薫因疏仰蝟昭粡竚癈鷭т繻Ь因疎仰因疏尭因疎尭因疏凝因疎凝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因疎街蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰誕桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐桶穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将臆頭桶岡桶喬桶規穐桶階穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥瀉奴蝟昭粡竚癈鷭т繻Ь因漸蓋因漸街因繕怯蝟昭粡竚癈鷭т繻Ь因繕恐因繕恭因繕挟因繕況因繕狭因繕驚蝟昭粡竚癈鷭т繻Ь因繕袈因俺憶因俺臆因俺桶因俺牡因俺乙因俺俺因俺卸蝟昭粡竚癈鷭т繻Ь因俺恩因俺温因俺価因俺佳因俺加因俺可因俺嘉因俺夏蝟昭粡竚癈鷭т繻Ь因俺外因俺咳因俺害因俺崖因俺慨因俺概因俺涯蝟昭粡竚癈鷭т繻Ь因俺碍因俺蓋因繕教因繕響因繕訓因繕群因繕軍因繕郡蝟昭粡竚癈鷭т繻Ь因繕径因俺官因俺寛因俺干因俺幹因俺患因俺感因俺慣蝟昭粡竚癈鷭т繻Ь因俺憾因俺換因俺漢因俺澗因俺潅因俺環因俺甘因俺監蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰弾桍鹿粡寂蝟赱齠洲粤讌将教穐教卯況謙教岡教階教巻教規教喬鹿粡寂蝟赱齠洲粤讌将教桑教謙況規況銭況桑況幸況狸穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥瀋異蝟昭粡竚癈鷭т繻Ь因卸卸因膳寛因膳干因膳幹因膳患因膳感因膳慣蝟昭粡竚癈鷭т繻Ь因膳憾因膳換因膳漢因膳澗因膳潅因膳環因膳甘蝟昭粡竚癈鷭т繻Ь因卸憶因卸臆因卸桶因卸牡因卸乙因卸俺因卸恩因卸温蝟昭粡竚癈鷭т繻Ь因卸価因卸佳因卸加因卸可因卸嘉因卸夏因卸外因卸咳蝟昭粡竚癈鷭т繻Ь因卸害因卸崖因卸慨因卸概因卸涯因卸碍因卸蓋因卸街蝟昭粡竚癈鷭т繻Ь因卸柿因卸蛎因卸鈎因卸劃因卸嚇因卸各因卸完因卸官蝟昭粡竚癈鷭т繻Ь因卸輝因卸飢因卸騎因卸鬼因卸亀因卸偽因卸妓因卸宜蝟昭粡竚癈鷭т繻Ь因卸義因卸蟻因卸誼因卸議因卸掬因卸菊因卸彊因卸怯蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰脹桍鹿粡寂蝟赱齠洲粤讌将袈岡袈階袈巻袈規袈喬袈桑袈謙袈幸鹿粡寂蝟赱齠洲粤讌将袈銭袈測袈狸袈潮袈適袈頭祁穐祁卯鹿粡寂蝟赱齠洲粤讌将穐卦桑祁岡祁階祁巻祁規祁喬祁桑鹿粡寂蝟赱齠洲粤讌将祁謙祁幸祁銭祁測祁狸穐祁潮祁適鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺恩異蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憶嚇因憶劃因憶劃因憶寛蝟昭粡竚癈鷭т繻Ь因憶感因憶慣因憶憾因憶換蝟昭粡竚癈鷭т繻Ь因臆祁因臆係因憶患因憶幹蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因臆軍因憶驚因憶仰蝟昭粡竚癈鷭т繻Ь因臆恩因憶咳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍鍵熏黝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憶嚇因憶劃因憶劃因憶寛蝟昭粡竚癈鷭т繻Ь因憶感因憶慣因憶憾因憶換蝟昭粡竚癈鷭т繻Ь因臆祁因臆係因憶患因憶幹蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因臆軍因憶驚因憶仰蝟昭粡竚癈鷭т繻Ь因臆恩因慧蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍鍵濆害桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将嘘適穐穐穐穐嘘潮穐穐鹿粡寂蝟赱齠洲粤讌将唄喬唄桑穐穐唄謙唄幸穐穐鹿粡寂蝟赱齠洲粤讌将卸桑卸謙穐穐穐唄規唄巻穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将卸階穐蔚狸蔚潮穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐臆謙穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺恩館蝟昭粡竚癈鷭т繻Ь因憶凝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因可恐蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因可挟因漸尭蝟昭粡竚癈鷭т繻Ь因臆群蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍元桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝶規蝶喬蝶桑蝶謙蝶幸蝶銭蝶測蝶狸鹿粡寂蝟赱齠洲粤讌将蝶潮蝶適穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将碍階碍巻碍規碍喬碍桑碍謙碍幸碍銭鹿粡寂蝟赱齠洲粤讌将碍測碍狸穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺恩緊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因臆佳因臆加因臆価因臆可蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍厳桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐牡潮穐牡適穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺恩雇蝟昭粡竚癈鷭т繻Ь因臆監因臆菊因臆軌因臆彊蝟昭粡竚癈鷭т繻Ь因臆柿因臆蛎蝟昭粡竚癈鷭т繻Ь因可郡因憶議蝟昭粡竚癈鷭т繻Ь因臆教因臆況因憶況因可係蝟昭粡竚癈鷭т繻Ь因臆誼因憶寛因臆漢蝟昭粡竚癈鷭т繻Ь因臆澗因臆官因臆完因臆狭因臆響因可軍蝟昭粡竚癈鷭т繻Ь因憶狂因臆狂蝟昭粡竚癈鷭т繻Ь因臆橋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍幻濆害桍鹿粡寂蝟赱齠洲粤讌将牡頭穐乙頭乙穐穐穐穐俺穐鹿粡寂蝟赱齠洲粤讌将桶銭穐穐桶測穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐跳巻穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐俺規穐穐俺桑蔚桑跳謙鹿粡寂蝟赱齠洲粤讌将乙狸穐穐穐穐唄岡穐牡銭鹿粡寂蝟赱齠洲粤讌将牡測牡卯牡穐俺幸俺銭穐跳階穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐蔚謙俺謙穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐俺喬穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺恩鉱蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因臆恐蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憶恐因臆怯因憶教因憶橋蝟昭粡竚癈鷭т繻Ь因臆恭因臆挟蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍諺桍鹿粡寂蝟赱齠洲粤讌将穐穐桶適桶頭穐穐桶狸桶潮鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐乙潮穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐跳幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺恩築蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因臆掬蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍恒桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将腸卯腸岡腸階腸巻腸規腸喬腸桑腸謙鹿粡寂蝟赱齠洲粤讌将腸幸腸銭腸測腸狸腸潮腸適腸頭蝶穐鹿粡寂蝟赱齠洲粤讌将蝶卯蝶岡蝶階蝶巻穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺温館蝟昭粡竚癈鷭т繻Ь因恩憶因恩加因恩臆因恩可蝟昭粡竚癈鷭т繻Ь因恩桶因恩嘉蝟昭粡竚癈鷭т繻Ь因恩牡因恩夏因恩俺因恩咳蝟昭粡竚癈鷭т繻Ь因恩乙因恩外因恩卸因恩鈎蝟昭粡竚癈鷭т繻Ь因恩碍因恩害因恩温因恩嚇蝟昭粡竚癈鷭т繻Ь因恩街因恩慨因恩恩因恩蓋蝟昭粡竚癈鷭т繻Ь因恩劃因恩崖因恩価因恩柿蝟昭粡竚癈鷭т繻Ь因恩各因恩概因恩佳因恩蛎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍控桍鹿粡寂蝟赱齠洲粤讌将穐穐鹸穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐験喬穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺温緊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因臆桶因臆臆蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因臆乙因臆牡蝟昭粡竚癈鷭т繻Ь因臆卸因臆俺蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍昂桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐臆卯鰻適鹿粡寂蝟赱齠洲粤讌将穐穐穐鰻測穐穐鰻潮鰻狸鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐卸適鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺温雇蝟昭粡竚癈鷭т繻Ь因憶形因憶傾蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰轍更桍鹿粡寂蝟赱齠洲粤讌将蔚銭穐蔚幸穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐卸喬穐穐卸規穐卸巻鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蓋異蝟昭粡竚癈鷭т繻Ь因憶憶因憶臆因憶桶因憶碍因憶街因憶柿因憶蛎蝟昭粡竚癈鷭т繻Ь因憶飢因憶騎因憶鬼因憶亀因憶偽因憶儀因憶妓因憶宜蝟昭粡竚癈鷭т繻Ь因憶義因憶蟻因臆温因臆嘉因憶潅因憶環蝟昭粡竚癈鷭т繻Ь因憶官因可彊因可怯蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰迭鍵濆害桍鹿粡寂蝟赱齠洲粤讌将渦卯渦岡渦階嘘桑穐嘘幸嘘銭嘘測鹿粡寂蝟赱齠洲粤讌将欝岡欝階欝巻欝規欝喬欝桑欝謙欝幸鹿粡寂蝟赱齠洲粤讌将欝銭欝測臆幸臆適唄狸唄潮穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐超穐穐超卯鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蓋越蝟昭粡竚癈鷭т繻Ь因牡憶因牡臆因牡桶因牡牡因牡乙因牡俺因牡卸蝟昭粡竚癈鷭т繻Ь因牡恩因牡温因牡価因牡佳因牡加因牡可因牡嘉因牡夏蝟昭粡竚癈鷭т繻Ь因牡外因牡咳因牡害因牡崖因牡慨因牡概因牡涯因牡碍蝟昭粡竚癈鷭т繻Ь因牡蓋因牡街因牡柿因牡蛎因牡鈎因牡劃因牡嚇因牡各蝟昭粡竚癈鷭т繻Ь因牡完因牡官因牡寛因牡干因牡幹因牡患因牡感因牡慣蝟昭粡竚癈鷭т繻Ь因牡憾因牡換因牡漢因牡澗因牡潅因牡環因牡甘因牡監蝟昭粡竚癈鷭т繻Ь因牡軌因牡輝因牡飢因牡騎因牡鬼因牡亀因牡偽因牡儀蝟昭粡竚癈鷭т繻Ь因牡妓因牡宜因牡義因牡蟻因牡誼因牡議因牡掬因牡菊蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰迭顕桍鹿粡寂蝟赱齠洲粤讌将感穐感卯感岡感階感巻感規感喬感桑鹿粡寂蝟赱齠洲粤讌将感謙感幸感銭感測感狸感潮感適感頭鹿粡寂蝟赱齠洲粤讌将慣穐慣卯慣岡慣階穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐渦測渦狸嘘規嘘喬穐鹿粡寂蝟赱齠洲粤讌将穐飢卯飢岡飢階飢巻飢規飢喬飢桑鹿粡寂蝟赱齠洲粤讌将飢謙飢幸飢銭飢測飢狸飢潮飢適飢頭鹿粡寂蝟赱齠洲粤讌将騎穐騎卯騎岡騎階騎巻騎規騎喬騎桑鹿粡寂蝟赱齠洲粤讌将騎謙騎幸騎銭騎測騎狸騎潮騎適騎頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蓋貨抗菓蝟昭粡竚癈鷭т繻Ь因牡彊因牡怯因牡恐因牡恭因牡挟因牡教因牡橋因牡況蝟昭粡竚癈鷭т繻Ь因牡狂因牡狭因牡響因牡饗因牡驚因牡仰因牡凝因牡尭蝟昭粡竚癈鷭т繻Ь因牡薫因牡訓因牡群因牡軍因乙郡蝟昭粡竚癈鷭т繻Ь因憶佳因憶加因憶概因憶涯蝟昭粡竚癈鷭т繻Ь因乙憶因乙臆因乙桶因乙牡因乙乙因乙俺因乙卸蝟昭粡竚癈鷭т繻Ь因乙恩因乙温因乙価因乙佳因乙加因乙可因乙嘉因乙夏蝟昭粡竚癈鷭т繻Ь因乙外因乙咳因乙害因乙崖因乙慨因乙概因乙涯因乙碍蝟昭粡竚癈鷭т繻Ь因乙蓋因乙街因乙柿因乙蛎因乙鈎因乙劃因乙嚇因乙各蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰迭験桍鹿粡寂蝟赱齠洲粤讌将鬼穐鬼卯鬼岡鬼階鬼巻鬼規鬼喬鬼桑鹿粡寂蝟赱齠洲粤讌将鬼謙鬼幸鬼銭鬼測鬼狸鬼潮鬼適鬼頭鹿粡寂蝟赱齠洲粤讌将亀穐亀卯亀岡亀階亀巻亀規亀喬亀桑鹿粡寂蝟赱齠洲粤讌将亀謙亀幸亀銭亀測亀狸亀潮亀適亀頭鹿粡寂蝟赱齠洲粤讌将偽穐偽卯偽岡偽階偽巻偽規偽喬偽桑鹿粡寂蝟赱齠洲粤讌将偽謙偽幸偽銭偽測偽狸偽潮偽適偽頭鹿粡寂蝟赱齠洲粤讌将儀穐儀卯儀岡儀階儀巻儀規儀喬穐鹿粡寂蝟赱齠洲粤讌将穐穐穐渦喬嘘狸嘘階嘘巻穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蓋雇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因可響因可饗蝟昭粡竚癈鷭т繻Ь因可驚蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰迭諺桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐超規超喬超桑超謙鹿粡寂蝟赱齠洲粤讌将超幸穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蓋築蝟昭粡竚癈鷭т繻Ь因可感蝟昭粡竚癈鷭т繻Ь因可漢蝟昭粡竚癈鷭т繻Ь因可官蝟昭粡竚癈鷭т繻Ь因可幹蝟昭粡竚癈鷭т繻Ь因可寛因可潅因可澗因可患蝟昭粡竚癈鷭т繻Ь因可環蝟昭粡竚癈鷭т繻Ь因可慣蝟昭粡竚癈鷭т繻Ь因可監蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰迭個桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐調穐調適穐穐調階穐穐鹿粡寂蝟赱齠洲粤讌将穐調謙穐穐穐穐穐調幸鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐諜頭超頭超適超潮穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蓋奴蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因可騎因可鬼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因可軌因可輝因可飢蝟昭粡竚癈鷭т繻Ь因可偽蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰迭呼桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐諜規穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐超階穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺澗雇蝟昭粡竚癈鷭т繻Ь因外驚因干形因属憶因鈎碍因属臆因属桶因澗恵蝟昭粡竚癈鷭т繻Ь因嚇橋因蛎外因嚇教因害鈎因属牡因換鬼因環各蝟昭粡竚癈鷭т繻Ь因軌臆因咳夏因属乙因崖凝因軌桶因完牡因飢寛蝟昭粡竚癈鷭т繻Ь因概偽因漢柿因嚇況因属俺蝟昭粡竚癈鷭т繻Ь因甘嚇因属卸因属恩因漢寛蝟昭粡竚癈鷭т繻Ь因属温因軌牡因属価因干橋因属佳因属加蝟昭粡竚癈鷭т繻Ь因属可因軌乙因涯形因属嘉因軌俺蝟昭粡竚癈鷭т繻Ь因慨議因干外因鈎況因軌卸因軌恩蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰鉄孫桍鹿粡寂蝟赱齠洲粤讌将芦頭鯵穐芦幸軍規鯵卯亀桑穐鯵岡鹿粡寂蝟赱齠洲粤讌将穐穐穐軍桑穐橋階鹸階続階鹿粡寂蝟赱齠洲粤讌将穐鯵階穐穐穐拘幸芦銭填謙鹿粡寂蝟赱齠洲粤讌将芦測桶規鯵巻穐鯵規橋規厳穐旦幸鹿粡寂蝟赱齠洲粤讌将穐穐恐喬鯵喬穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鯵桑鯵謙穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐跳穐穐況潮鯵幸鯵銭穐穐鹿粡寂蝟赱齠洲粤讌将穐鯵測穐穐穐穐寛規鯵狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺澗想蝟昭粡竚癈鷭т繻Ь因概概因軌加因軌可因甘蛎蝟昭粡竚癈鷭т繻Ь因環劃因官狂因軌夏因蛎袈因感軍因属劃因軌害蝟昭粡竚癈鷭т繻Ь因咳嚇因蓋菊因蓋掬因外橋因属嚇因属各蝟昭粡竚癈鷭т繻Ь因監澗因監漢因柿崖因外憶因属完因軌崖因軌慨蝟昭粡竚癈鷭т繻Ь因軌概因澗慨因軌涯因蓋群因外況因澗群蝟昭粡竚癈鷭т繻Ь因概恵因概慶因概慧因幹恐因甘鈎因属官蝟昭粡竚癈鷭т繻Ь因軌碍因軌蓋因軌街蝟昭粡竚癈鷭т繻Ь因属寛因各環蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰鉄詑桍鹿粡寂蝟赱齠洲粤讌将蝶銭憧適鯵適梓階鯵狸穐鯵潮亀謙鹿粡寂蝟赱齠洲粤讌将穐穐漸階卸穐穐鯵測鯵銭漸幸鹿粡寂蝟赱齠洲粤讌将梓巻穐穐穐卒喬卒規桶適鯵頭鹿粡寂蝟赱齠洲粤讌将控規斡桑梓規梓喬穐嘘謙梓穐梓岡鹿粡寂蝟赱齠洲粤讌将梓桑梓謙梓幸俺規填卯梓銭穐穐鹿粡寂蝟赱齠洲粤讌将梓銭穐穐穐穐梓卯桶適梓測鹿粡寂蝟赱齠洲粤讌将挟巻梓狸涯桑梓潮穐梓適袈頭梓階鹿粡寂蝟赱齠洲粤讌将穐穐穐群巻寛頭梓頭圧穐圧卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺澗築蝟昭粡竚癈鷭т繻Ь因属飢因慨饗因属騎因属鬼蝟昭粡竚癈鷭т繻Ь因属亀因軌幹因外澗因属偽因属儀因蓋彊因慨驚因換形蝟昭粡竚癈鷭т繻Ь因憾害因概宜因属妓因属宜因属義因属蟻蝟昭粡竚癈鷭т繻Ь因属誼因害訓因軌況因患官蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因属議因慣驚蝟昭粡竚癈鷭т繻Ь因軌感因属掬因属彊因憾鈎因属怯因甘恐因属恐蝟昭粡竚癈鷭т繻Ь因各可因属恭因蛎慣因属挟因蛎祁因害完因属教蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰鉄堕桍鹿粡寂蝟赱齠洲粤讌将斡喬穐斡桑患卯穐穐害岡梓銭鹿粡寂蝟赱齠洲粤讌将斡謙斡幸穐斡銭斡測梓狸感階蝶測鹿粡寂蝟赱齠洲粤讌将然巻腸巻斡狸牡適斡潮桶頭斡適梓幸鹿粡寂蝟赱齠洲粤讌将斡頭蝶適梓規梓桑繕適梓謙飢巻扱穐鹿粡寂蝟赱齠洲粤讌将圧頭穐穐扱卯穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐圧穐扱岡穐扱階穐扱巻圧階鹿粡寂蝟赱齠洲粤讌将圧卯扱規穐牡岡穐然測梓測扱喬鹿粡寂蝟赱齠洲粤讌将扱桑扱謙扱幸梓頭厳階扱銭扱測卒謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺澗奴蝟昭粡竚癈鷭т繻Ь因属恵因属慶因慨俺因属慧因賊憶因軌鬼蝟昭粡竚癈鷭т繻Ь因軌潅因賊臆因賊桶因甘恭因賊牡因蛎係因賊乙因軌環蝟昭粡竚癈鷭т繻Ь因賊俺因軌飢因賊卸因賊恩因賊温因軌亀因賊価蝟昭粡竚癈鷭т繻Ь因軌甘因賊佳因賊加因涯憶因外環因賊可因賊嘉蝟昭粡竚癈鷭т繻Ь因涯臆因害官蝟昭粡竚癈鷭т繻Ь因亀乙因澗傾因換凝因蓋郡蝟昭粡竚癈鷭т繻Ь因賊夏因各夏因甘碍因賊外蝟昭粡竚癈鷭т繻Ь因賊咳因賊害因賊崖因賊慨因賊概因漢妓蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰鉄惰桍鹿粡寂蝟赱齠洲粤讌将嘘喬嘘桑軍謙臆規俺巻嘘謙嘘幸穐鹿粡寂蝟赱齠洲粤讌将嘘銭嘘測諜階嘘狸嘘潮嘘適圧幸嘘頭鹿粡寂蝟赱齠洲粤讌将圧適圧狸唄穐穐圧桑穐穐臆頭鹿粡寂蝟赱齠洲粤讌将圧銭穐圧潮圧測唄卯禅潮穐圧謙鹿粡寂蝟赱齠洲粤讌将唄岡堂適唄階揃階圧頭斡穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐腸巻斡潮鹿粡寂蝟赱齠洲粤讌将唄巻穐唄規卦穐穐抗喬斡謙穐鹿粡寂蝟赱齠洲粤讌将膳穐穐桶喬穐唄喬唄桑斡狸唄謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓異蝟昭粡竚癈鷭т繻Ь因賊換因賊漢因賊澗因軌橋因軌尭因賊潅蝟昭粡竚癈鷭т繻Ь因官飢因賊環因蓋幹因賊甘因慣誼因賊監因彊慣蝟昭粡竚癈鷭т繻Ь因賊軌因軌凝因患議因賊輝因軌恭因蓋袈因賊飢蝟昭粡竚癈鷭т繻Ь因賊騎因蓋卦因軌怯因賊鬼因賊亀因賊偽因賊儀因鈎義蝟昭粡竚癈鷭т繻Ь因軌狭因賊妓因漢尭因干環因軌教因碍訓因賊宜蝟昭粡竚癈鷭т繻Ь因軌恐因軌響因軌挟因甘輝因軌饗因監官因賊義蝟昭粡竚癈鷭т繻Ь因賊蟻因賊誼因賊議因賊掬因涯橋蝟昭粡竚癈鷭т繻Ь因碍薫因賊袈蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典険桍鹿粡寂蝟赱齠洲粤讌将欝頭蔚穐蔚卯扱穐穐蔚岡蔚階扱卯鹿粡寂蝟赱齠洲粤讌将扱規梓適蔚巻穐蔚規穐蔚喬禅穐鹿粡寂蝟赱齠洲粤讌将扱巻蔚桑蔚謙蔚幸穐扱階扱桑蔚銭鹿粡寂蝟赱齠洲粤讌将穐蔚測扱喬穐感巻穐穐蔚狸鹿粡寂蝟赱齠洲粤讌将蔚潮穐蔚適蔚頭穐祁岡鰻穐鰻卯鹿粡寂蝟赱齠洲粤讌将穐穐鰻岡穐扱謙鰻階穐穐鹿粡寂蝟赱齠洲粤讌将鰻巻鰻規担規穐臆喬感規況喬穐鹿粡寂蝟赱齠洲粤讌将扱幸穐穐穐穐騎喬穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓菓蝟昭粡竚癈鷭т繻Ь因軌形因賊祁因賊係因賊傾因軌恵因賊形蝟昭粡竚癈鷭т繻Ь因賊径因澗概因賊恵因賊慶蝟昭粡竚癈鷭т繻Ь因賊慧因碍橋因族憶因族臆因族桶因族牡蝟昭粡竚癈鷭т繻Ь因蛎咳因憾祁因軌径因族乙因族俺因族卸因族恩蝟昭粡竚癈鷭т繻Ь因族温因族価因族佳蝟昭粡竚癈鷭т繻Ь因族加因柿患因環干因族可蝟昭粡竚癈鷭т繻Ь因族嘉因軌慧因輝桶因軌慶因柿幹因劃慶蝟昭粡竚癈鷭т繻Ь因族夏因族外因族咳因碍街蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典験桍鹿粡寂蝟赱齠洲粤讌将桶岡穐渦巻桶階桶巻挟頭穐桶規鹿粡寂蝟赱齠洲粤讌将穐渦卯渦岡穐桶喬恐頭桶桑鰻狸鹿粡寂蝟赱齠洲粤讌将桶謙恐階穐桶幸桶銭卒潮渦規穐鹿粡寂蝟赱齠洲粤讌将桶測穐迭潮穐桶狸桶潮渦喬桶適鹿粡寂蝟赱齠洲粤讌将穐穐桶頭渦幸牡穐渦桑牡卯唄適鹿粡寂蝟赱齠洲粤讌将牡岡牡階穐穐穐渦謙渦銭牡巻鹿粡寂蝟赱齠洲粤讌将穐牡規乙卯穐干穐渦狸牡喬穐鹿粡寂蝟赱齠洲粤讌将穐渦測牡桑全謙穐穐牡謙穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓館蝟昭粡竚癈鷭т繻Ь因概碍因輝嘉因輝夏因族換因害夏因族漢因族澗蝟昭粡竚癈鷭т繻Ь因族潅因輝可因族環因族甘因族監因族軌蝟昭粡竚癈鷭т繻Ь因族飢因鈎郡因輝害因輝咳因輝外因族騎蝟昭粡竚癈鷭т繻Ь因軌偽因族鬼因輝崖因族亀因族偽因族儀因族妓因劃慧蝟昭粡竚癈鷭т繻Ь因輝慨因族宜因族義蝟昭粡竚癈鷭т繻Ь因族蟻因環乙因族誼因族議因族掬蝟昭粡竚癈鷭т繻Ь因族菊因潅宜因族彊因族怯因族恐因輝涯蝟昭粡竚癈鷭т繻Ь因族恭因族挟因輝概因輝蓋因輝碍因輝街蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典元桍鹿粡寂蝟赱齠洲粤讌将嘘銭扱巻俺規験規軍測蝶狸碍測恐巻鹿粡寂蝟赱齠洲粤讌将斡謙厳桑俺喬攻適嘘狸担謙鬼喬俺桑鹿粡寂蝟赱齠洲粤讌将揃幸穐嘘測俺謙嘘潮俺幸穐俺銭鹿粡寂蝟赱齠洲粤讌将俺測穐亀適穐碍規穐穐俺狸鹿粡寂蝟赱齠洲粤讌将穐穐嘘適穐俺潮況適俺適穐鹿粡寂蝟赱齠洲粤讌将嘘巻唄穐唄卯顕狸厳謙導測唄岡穐鹿粡寂蝟赱齠洲粤讌将穐恐喬穐穐穐然狸桶喬況卯鹿粡寂蝟赱齠洲粤讌将騎規穐穐穐祁階穐俺頭穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓緊蝟昭粡竚癈鷭т繻Ь因輝干因輝幹因族薫因族訓因感恐因咳菊蝟昭粡竚癈鷭т繻Ь因輝慣因柿慶因族群因輝感因柿感因族軍因輝憾蝟昭粡竚癈鷭т繻Ь因橋凝因輝換因澗官因輝漢因輝澗因輝潅因嚇狭蝟昭粡竚癈鷭т繻Ь因族郡因鈎潅因族卦蝟昭粡竚癈鷭т繻Ь因慨卸因族袈因輝監因族祁因輝環因潅劃因輝甘蝟昭粡竚癈鷭т繻Ь因換義因輝軌因輝輝因輝飢因患菊因族係蝟昭粡竚癈鷭т繻Ь因輝偽因輝鬼因輝亀因輝騎因柿恭因輝儀因潅響因甘挟蝟昭粡竚癈鷭т繻Ь因族傾因族形因族径因輝妓因族恵因族慶蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典厳桍鹿粡寂蝟赱齠洲粤讌将穐穐卸適穐芦謙欝幸諜銭穐鹿粡寂蝟赱齠洲粤讌将害卯欝銭穐碍狸迭頭偽穐穐害岡鹿粡寂蝟赱齠洲粤讌将穐害階害巻害規穐害喬牡規穐鹿粡寂蝟赱齠洲粤讌将害桑穐穐欝測寛規挟規害謙穐鹿粡寂蝟赱齠洲粤讌将欝狸袖適害幸穐穐害銭超謙卸狸鹿粡寂蝟赱齠洲粤讌将穐欝適橋巻穐干卯欝頭害測穐鹿粡寂蝟赱齠洲粤讌将蔚穐害適害狸害潮害適蔚卯恐桑害頭鹿粡寂蝟赱齠洲粤讌将挟狸鰻銭諜穐穐穐顕卯蔚岡穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓雇蝟昭粡竚癈鷭т繻Ь因患怯因続外因続咳因各監因輝恭因続害因漢加因完義蝟昭粡竚癈鷭т繻Ь因慨臆因慨温因輝挟因輝橋蝟昭粡竚癈鷭т繻Ь因碍柿因続崖因続慨因輝教因続概因続涯因甘軍蝟昭粡竚癈鷭т繻Ь因続碍因劃狭蝟昭粡竚癈鷭т繻Ь因続蓋因憾劃因漢潅因輝況蝟昭粡竚癈鷭т繻Ь因続街因環係因輝狂因輝狭蝟昭粡竚癈鷭т繻Ь因患慧因続柿因続蛎因輝響因続鈎因完温因柿慧蝟昭粡竚癈鷭т繻Ь因碍郡因輝饗因蛎換因街尭因続劃蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典弦桍鹿粡寂蝟赱齠洲粤讌将穐穐穐感喬蔚潮崖適穐臆桑鹿粡寂蝟赱齠洲粤讌将穐崖頭繕頭蔚適蔚頭嘘穐穐蔚狸鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鰻卯慨穐続喬慨卯鹿粡寂蝟赱齠洲粤讌将慨岡穐慨階攻巻慨巻穐鰻穐慨規鹿粡寂蝟赱齠洲粤讌将慨喬慨桑穐祁規禅適袈潮慨謙穐鹿粡寂蝟赱齠洲粤讌将穐鰻巻鰻岡穐穐穐慨幸昂測鹿粡寂蝟赱齠洲粤讌将填銭鰻測涯巻鰻規鰻階唄頭穐慨銭鹿粡寂蝟赱齠洲粤讌将慨測慨狸穐穐穐鰻桑穐鰻喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓想蝟昭粡竚癈鷭т繻Ь因続環因続甘因崖幹因続監因碍彊蝟昭粡竚癈鷭т繻Ь因輝恵因甘可因続軌因続輝因輝係蝟昭粡竚癈鷭т繻Ь因輝慶因輝形因続飢因輝傾因続騎因続鬼因続亀蝟昭粡竚癈鷭т繻Ь因続偽因続儀因甘監因続妓因蓋傾蝟昭粡竚癈鷭т繻Ь因害干因甘郡因続宜因続義因続蟻因続誼蝟昭粡竚癈鷭т繻Ь因劃卦因患妓因街教因飢臆因飢桶因続議蝟昭粡竚癈鷭т繻Ь因続掬因甘教因監佳因飢乙因続菊因続彊蝟昭粡竚癈鷭т繻Ь因続怯因蓋形因続恐因続恭因飢牡因続挟因崖夏蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典限桍鹿粡寂蝟赱齠洲粤讌将涯規臆喬穐袖喬涯喬干狸涯桑腸喬鹿粡寂蝟赱齠洲粤讌将涯謙禅幸穐穐涯幸臆桑穐涯銭鹿粡寂蝟赱齠洲粤讌将穐涯測圧規穐涯狸恭穐涯潮臆謙鹿粡寂蝟赱齠洲粤讌将寛銭坦階穐涯適涯頭轍卯臆幸繕桑鹿粡寂蝟赱齠洲粤讌将臆潮碍穐芦銭臆銭教穐碍卯臆測寛測鹿粡寂蝟赱齠洲粤讌将碍岡碍階碍巻穐碍規穐穐穐鹿粡寂蝟赱齠洲粤讌将碍喬碍桑群適臆適碍謙臆頭碍幸碍銭鹿粡寂蝟赱齠洲粤讌将桶穐桶卯探測穐穐穐厳測探適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓築蝟昭粡竚癈鷭т繻Ь因続径因潅狂因感祁因続恵因漢訓因飢害因憧害蝟昭粡竚癈鷭т繻Ь因飢崖因続慶因続慧因卒憶因飢概因飢碍蝟昭粡竚癈鷭т繻Ь因飢涯因卒臆因卒桶因飢蓋因害劃因澗潅蝟昭粡竚癈鷭т繻Ь因卒牡因柿恵因飢街因卒乙因卒俺因官宜因卒卸因卒恩蝟昭粡竚癈鷭т繻Ь因嚇臆因涯温因飢柿因憧崖因卒温因卒価蝟昭粡竚癈鷭т繻Ь因卒佳因卒加因憾蟻因卒可因卒嘉因卒夏因飢蛎蝟昭粡竚癈鷭т繻Ь因卒外因飢鈎因卒咳因飢劃因卒害蝟昭粡竚癈鷭т繻Ь因飢嚇因換牡因涯狂因外教因卒崖因卒慨因卒概因感各蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典個桍鹿粡寂蝟赱齠洲粤讌将桶頭蝶潮干喬斡幸穐牡卯牡穐轍階鹿粡寂蝟赱齠洲粤讌将原卯牡階験適干謙干桑牡巻穐穐鹿粡寂蝟赱齠洲粤讌将穐元狸桶巻俺適恐謙穐穐橋適鹿粡寂蝟赱齠洲粤讌将崖卯干幸袈適干銭卒適穐牡喬穐鹿粡寂蝟赱齠洲粤讌将斡銭干測穐干狸穐干潮軍規穐鹿粡寂蝟赱齠洲粤讌将穐牡桑穐穐干適干頭牡謙渦狸鹿粡寂蝟赱齠洲粤讌将扱規感潮幹穐臆謙亀卯跳卯穐牡測鹿粡寂蝟赱齠洲粤讌将桶桑幹卯穐牡銭穐穐幹岡恐銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺妓奴蝟昭粡竚癈鷭т繻Ь因飢潅因卒干因潅訓因卒幹蝟昭粡竚癈鷭т繻Ь因卒患因卒感蝟昭粡竚癈鷭т繻Ь因卒慣因卒憾因飢環蝟昭粡竚癈鷭т繻Ь因甘飢因卒換因蓋恵因卒漢因蓋涯蝟昭粡竚癈鷭т繻Ь因飢甘因卒澗因卒潅因飢軌因飢監蝟昭粡竚癈鷭т繻Ь因各菊因咳街因卒環因卒甘因咳掬因飢輝因卒監蝟昭粡竚癈鷭т繻Ь因飢飢因卒軌因蓋碍因卒輝因卒飢因飢騎因卒騎蝟昭粡竚癈鷭т繻Ь因卒鬼因卒亀因概凝因卒偽蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典呼桍鹿粡寂蝟赱齠洲粤讌将患桑穐続岡乙巻穐患謙穐穐鹿粡寂蝟赱齠洲粤讌将揃巻然規亀銭腸桑欝穐験頭歎潮患幸鹿粡寂蝟赱齠洲粤讌将穐穐患銭患測調桑患狸旦謙歎規鹿粡寂蝟赱齠洲粤讌将穐跳喬患潮鹸穐穐患適患頭乙桑鹿粡寂蝟赱齠洲粤讌将感穐唄階欝卯厳潮鹸規橋桑感卯感岡鹿粡寂蝟赱齠洲粤讌将乙測害卯卸適恐測轍巻乙狸乙銭牡巻鹿粡寂蝟赱齠洲粤讌将俺喬坦謙卒測渦喬穐感階碍穐攻喬鹿粡寂蝟赱齠洲粤讌将卒銭穐乙潮穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜異蝟昭粡竚癈鷭т繻Ь因飢掬因卒挟因概換因崖感蝟昭粡竚癈鷭т繻Ь因街況因概憾因幹菊因咳乙因感咳因潅嚇因街憶因環傾蝟昭粡竚癈鷭т繻Ь因患慣因蓋慧因卒教蝟昭粡竚癈鷭т繻Ь因卒橋因碍夏因飢況因涯恭蝟昭粡竚癈鷭т繻Ь因澗漢因卒況因憾議因卒狂蝟昭粡竚癈鷭т繻Ь因卒狭因飢橋因卒響因慨掬因飢怯因飢恐因飢挟因卒饗蝟昭粡竚癈鷭т繻Ь因卒驚因卒仰因卒凝因飢教蝟昭粡竚癈鷭т繻Ь因概蟻因各怯因漢可因飢恭因飢菊因蓋恭蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典恒桍鹿粡寂蝟赱齠洲粤讌将俺穐穐堂巻感頭慣穐穐膳岡慣卯鹿粡寂蝟赱齠洲粤讌将感謙原岡昂穐穐穐慣岡俺謙慣階鹿粡寂蝟赱齠洲粤讌将穐教潮穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐慣巻俺狸鹿粡寂蝟赱齠洲粤讌将穐穐慣規穐慣喬穐慣桑慣謙鹿粡寂蝟赱齠洲粤讌将歎適慣幸歎喬慣銭穐慣測慣狸穐鹿粡寂蝟赱齠洲粤讌将俺頭俺潮穐嘆階慣潮俺銭卸階俺適鹿粡寂蝟赱齠洲粤讌将穐穐穐卸卯鹸喬坦頭穐慣適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜菓蝟昭粡竚癈鷭т繻Ь因飢群因袖憶因袖臆因飢郡因袖桶因飢袈蝟昭粡竚癈鷭т繻Ь因袖牡因袖乙因憧概因柿薫因監寛因袖俺因飢饗因飢狭蝟昭粡竚癈鷭т繻Ь因飢卦因袖卸因飢薫因袖恩因袖温蝟昭粡竚癈鷭т繻Ь因袖価因袖佳蝟昭粡竚癈鷭т繻Ь因袖加因飢係因騎桶因飢形因袖可因袖嘉蝟昭粡竚癈鷭т繻Ь因飢慧因袖夏因袖外因騎憶因飢径因袖咳因袖害因騎嚇蝟昭粡竚癈鷭т繻Ь因袖崖因柿狭因崖咳因袖慨蝟昭粡竚癈鷭т繻Ь因飢傾因袖概因袖涯因袖碍因騎乙因外袈因騎牡因袖蓋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典抗桍鹿粡寂蝟赱齠洲粤讌将芦規拘銭害岡穐卸狸穐騎幸卸桑鹿粡寂蝟赱齠洲粤讌将卸潮全謙騎銭穐穐騎測騎狸穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将害喬穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将騎潮扱桑害頭穐穐害桑害謙穐鹿粡寂蝟赱齠洲粤讌将轍規其幸騎適穐騎頭害潮害狸鬼穐鹿粡寂蝟赱齠洲粤讌将穐穐飢頭穐穐穐鬼卯穐鹿粡寂蝟赱齠洲粤讌将穐穐害適穐鬼岡害測鬼階鬼巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜館蝟昭粡竚癈鷭т繻Ь因袖患因袖感因咳慨因袖慣因柿涯因各外蝟昭粡竚癈鷭т繻Ь因袖憾因袖換因袖漢因袖澗因袖潅因騎温蝟昭粡竚癈鷭т繻Ь因患恐因騎価因袖環因外臆蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因袖甘因袖監因騎慨因環桶蝟昭粡竚癈鷭т繻Ь因嚇卸因袖軌因騎柿因袖輝因袖飢蝟昭粡竚癈鷭т繻Ь因騎街因騎外因袖騎因袖鬼因袖亀因寛干蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典控桍鹿粡寂蝟赱齠洲粤讌将崖卯亀喬穐穐俺頭崖喬轍喬亀桑鹿粡寂蝟赱齠洲粤讌将穐亀謙亀幸穐崖階亀銭穐旦巻鹿粡寂蝟赱齠洲粤讌将亀測亀狸穐軍狸穐穐崖桑崖謙鹿粡寂蝟赱齠洲粤讌将亀潮穐亀適亀頭崖規崖測偽穐穐鹿粡寂蝟赱齠洲粤讌将偽卯偽岡穐崖岡偽階穐偽巻穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐慨卯慨喬穐慨岡偽規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜緊蝟昭粡竚癈鷭т繻Ь因騎劃因袖橋因袖況因騎慣因官咳因袖狂因騎換蝟昭粡竚癈鷭т繻Ь因袖狭因街臆因騎各因干慶因袖響因袖饗蝟昭粡竚癈鷭т繻Ь因袖驚因袖仰因袖凝因袖尭因袖薫蝟昭粡竚癈鷭т繻Ь因騎干因騎鈎因慨可因慨凝因崖教因騎幹因騎完蝟昭粡竚癈鷭т繻Ь因袖訓因袖群因碍袈蝟昭粡竚癈鷭т繻Ь因騎漢因騎憾因官騎因概漢因涯加因袖軍因騎患蝟昭粡竚癈鷭т繻Ь因涯郡因袖郡因咳幹蝟昭粡竚癈鷭т繻Ь因袖卦蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典昂桍鹿粡寂蝟赱齠洲粤讌将穐儀喬穐儀桑慨適慨狸儀謙寛桑鹿粡寂蝟赱齠洲粤讌将穐儀幸穐儀銭儀測穐儀狸穐鹿粡寂蝟赱齠洲粤讌将穐儀潮儀適恐卯概卯穐穐恐岡鹿粡寂蝟赱齠洲粤讌将恐階穐慨測恐巻慨頭穐恐規慨潮鹿粡寂蝟赱齠洲粤讌将穐穐恐喬卒狸概穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐恐桑穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐恐謙概階鹿粡寂蝟赱齠洲粤讌将穐概謙穐穐穐概喬概規恐幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜雇蝟昭粡竚癈鷭т繻Ь因其価因干害蝟昭粡竚癈鷭т繻Ь因其佳因害患因其加因其可因其嘉因其夏蝟昭粡竚癈鷭т繻Ь因其外因其咳因其害因騎飢因騎鬼因嚇恩蝟昭粡竚癈鷭т繻Ь因咳崖因其崖因騎儀蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因害掬因其慨因騎恐蝟昭粡竚癈鷭т繻Ь因其概因嚇恵因騎掬因其涯因騎誼因其碍因騎議因其蓋蝟昭粡竚癈鷭т繻Ь因騎菊因其街因其柿因其蛎因其鈎因其劃蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典更桍鹿粡寂蝟赱齠洲粤讌将恭適恭頭嘘潮挟穐挟卯穐挟岡穐鹿粡寂蝟赱齠洲粤讌将穐挟階穐挟巻嘘幸挟規概幸挟喬鹿粡寂蝟赱齠洲粤讌将概銭穐穐穐挟桑穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐碍銭穐穐挟謙穐鹿粡寂蝟赱齠洲粤讌将挟幸挟銭挟測挟狸涯卯穐挟潮穐鹿粡寂蝟赱齠洲粤讌将感頭挟適涯巻涯穐涯階挟頭穐教穐鹿粡寂蝟赱齠洲粤讌将穐教卯教岡穐漸適教階穐穐鹿粡寂蝟赱齠洲粤讌将教規穐験謙穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜想蝟昭粡竚癈鷭т繻Ь因騎橋因其鬼因其亀因騎教因崖患蝟昭粡竚癈鷭т繻Ь因其偽因騎況因其儀因其妓因騎響蝟昭粡竚癈鷭т繻Ь因騎狭因其宜蝟昭粡竚癈鷭т繻Ь因其義因其蟻因其誼因其議因其掬蝟昭粡竚癈鷭т繻Ь因騎狂因慣街因騎饗因其菊因其彊蝟昭粡竚癈鷭т繻Ь因其怯因其恐因其恭因其挟因其教因騎驚蝟昭粡竚癈鷭т繻Ь因其橋因其況因騎凝因騎仰因其狂蝟昭粡竚癈鷭т繻Ь因騎薫因其狭蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典溝桍鹿粡寂蝟赱齠洲粤讌将碍階碍卯涯頭碍岡穐橋銭穐穐鹿粡寂蝟赱齠洲粤讌将碍巻橋測橋狸橋潮況穐況卯碍規橋適鹿粡寂蝟赱齠洲粤讌将橋頭碍喬穐碍桑穐穐穐碍謙鹿粡寂蝟赱齠洲粤讌将唄規況岡歎狸卒潮況階況巻卸階況規鹿粡寂蝟赱齠洲粤讌将扱謙況喬穐慨巻況桑況謙況幸況銭鹿粡寂蝟赱齠洲粤讌将況測穐穐況潮穐況適碍幸穐鹿粡寂蝟赱齠洲粤讌将漸巻況狸梓頭撞適穐穐群卯群岡鹿粡寂蝟赱齠洲粤讌将穐碍銭鹸桑穐穐昂卯穐碍狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜築蝟昭粡竚癈鷭т繻Ь因騎径因揃桶因揃牡因漢彊因騎慶因揃乙蝟昭粡竚癈鷭т繻Ь因鬼憶因騎慧因揃俺因鬼臆因揃卸因鬼桶因碍祁蝟昭粡竚癈鷭т繻Ь因揃恩因咳彊因鬼牡因揃温因鬼俺蝟昭粡竚癈鷭т繻Ь因鬼乙因揃価因揃佳因鬼恩因揃加因患義蝟昭粡竚癈鷭т繻Ь因揃可因揃嘉因揃夏因揃外因揃咳因鬼温因外概蝟昭粡竚癈鷭т繻Ь因柿菊因揃害因揃崖因揃慨因碍劃因揃概因揃涯蝟昭粡竚癈鷭т繻Ь因干監因揃碍因揃蓋因鬼価蝟昭粡竚癈鷭т繻Ь因鬼佳因鬼可因揃街因揃柿因揃蛎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典皇桍鹿粡寂蝟赱齠洲粤讌将寛適穐繕巻穐穐軍狸軍潮教卯鹿粡寂蝟赱齠洲粤讌将穐穐続桑穐軍適軍頭寛狸寛頭鹿粡寂蝟赱齠洲粤讌将全卯慌階郡穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐干喬穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐干階郡卯穐漸規郡岡崖階郡階鹿粡寂蝟赱齠洲粤讌将郡巻干穐患銭郡規穐郡喬郡桑郡謙鹿粡寂蝟赱齠洲粤讌将郡幸郡銭穐郡測郡狸郡潮穐郡適鹿粡寂蝟赱齠洲粤讌将穐郡頭卦穐卦卯卦岡穐卦階干巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺宜奴蝟昭粡竚癈鷭т繻Ь因揃鬼因各恐因揃亀蝟昭粡竚癈鷭т繻Ь因鬼害因鬼概因碍各因揃偽蝟昭粡竚癈鷭т繻Ь因鬼涯因揃儀因揃彊因揃妓蝟昭粡竚癈鷭т繻Ь因揃宜因揃義因揃蟻因揃誼因揃議因揃掬蝟昭粡竚癈鷭т繻Ь因鬼碍因揃菊因街牡因崖完因鬼街因揃怯蝟昭粡竚癈鷭т繻Ь因揃恐因揃恭因鬼柿因揃挟蝟昭粡竚癈鷭т繻Ь因鬼蛎因鬼蓋蝟昭粡竚癈鷭т繻Ь因揃教因揃橋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典稿桍鹿粡寂蝟赱齠洲粤讌将干卯穐穐干狸穐穐干潮袈桑鹿粡寂蝟赱齠洲粤讌将袈謙穐穐其巻袈幸穐填測袈銭鹿粡寂蝟赱齠洲粤讌将穐穐干頭幹穐干適袈測幹岡穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐軍謙袈狸袈潮斡謙鹿粡寂蝟赱齠洲粤讌将控喬祁適穐幹階袈適穐袈頭祁穐鹿粡寂蝟赱齠洲粤讌将穐祁卯穐穐穐祁岡穐穐鹿粡寂蝟赱齠洲粤讌将祁階穐穐穐天潮祁巻祁規坦幸鹿粡寂蝟赱齠洲粤讌将祁喬卦潮慣穐穐繕測祁桑祁謙祁幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義異蝟昭粡竚癈鷭т繻Ь因澗宜因感害因揃形因揃径因碍係因寛監蝟昭粡竚癈鷭т繻Ь因揃恵因揃慶因鬼官因鬼幹因存憶因存臆蝟昭粡竚癈鷭т繻Ь因寛幹蝟昭粡竚癈鷭т繻Ь因鬼患因存桶因鬼感因存牡因存乙蝟昭粡竚癈鷭т繻Ь因存俺因鬼憾因幹狭因存卸因存恩蝟昭粡竚癈鷭т繻Ь因慨嘉因存温因郡憶蝟昭粡竚癈鷭т繻Ь因咳怯因漢軍因存価因嚇驚因患憾蝟昭粡竚癈鷭т繻Ь因存佳因柿橋因鬼甘因存加蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典善桍鹿粡寂蝟赱齠洲粤讌将然潮典潮穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐顕潮卸巻幹銭顕適顕頭穐験穐鹿粡寂蝟赱齠洲粤讌将験卯嘘銭幹潮穐偽階験岡穐鬼幸鹿粡寂蝟赱齠洲粤讌将偽巻験幸幹潮穐穐穐全幸験階鹿粡寂蝟赱齠洲粤讌将穐験巻幹幸穐験規穐穐験喬鹿粡寂蝟赱齠洲粤讌将験桑鰻喬穐騎喬穐穐穐穐鹿粡寂蝟赱齠洲粤讌将幹測穐幹桑穐穐撞穐穐穐鹿粡寂蝟赱齠洲粤讌将験謙幹頭穐穐験幸穐調適験銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義菓蝟昭粡竚癈鷭т繻Ь因存蛎因存鈎因涯可因鬼軌因存劃蝟昭粡竚癈鷭т繻Ь因存嚇因存各因存完因存官因存寛因存干蝟昭粡竚癈鷭т繻Ь因存幹因漢狂因存患因存感因官慶蝟昭粡竚癈鷭т繻Ь因幹感因存慣因憧街因鬼飢蝟昭粡竚癈鷭т繻Ь因存憾因存換因存漢因存澗蝟昭粡竚癈鷭т繻Ь因澗監因存潅因鬼騎因鬼妓蝟昭粡竚癈鷭т繻Ь因存環因存甘因漢夏蝟昭粡竚癈鷭т繻Ь因鬼儀因鬼輝因鬼鬼因鬼偽因存軌因柿俺蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典然桍鹿粡寂蝟赱齠洲粤讌将穐全幸元卯穐鹸頭患幸穐慨規鹿粡寂蝟赱齠洲粤讌将元岡穐卸規穐填潮元階元巻穐鹿粡寂蝟赱齠洲粤讌将元規患測元喬患銭元桑攻謙元謙患狸鹿粡寂蝟赱齠洲粤讌将患適患潮元幸穐感穐元銭患規感岡鹿粡寂蝟赱齠洲粤讌将穐元測元狸穐感卯患頭穐穐鹿粡寂蝟赱齠洲粤讌将穐元潮穐卒適撞卯穐欝巻感階鹿粡寂蝟赱齠洲粤讌将鯵狸斡潮袈巻元適穐穐穐患測鹿粡寂蝟赱齠洲粤讌将穐感規感巻感喬感桑感謙穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義館蝟昭粡竚癈鷭т繻Ь因鬼狭因存菊因存彊蝟昭粡竚癈鷭т繻Ь因漢輝因鬼響因存怯因存恐因害感蝟昭粡竚癈鷭т繻Ь因鬼饗因存恭因存挟因存教因環鈎因崖外蝟昭粡竚癈鷭т繻Ь因飢換因劃憾因寛各因鬼驚因潅饗因存況蝟昭粡竚癈鷭т繻Ь因存狂因潅慨因存狭因存響因鬼凝因寛況蝟昭粡竚癈鷭т繻Ь因存饗因患碍因寛完因換儀因鬼尭因鬼薫因咳径因存驚蝟昭粡竚癈鷭т繻Ь因存仰因鈎柿因鬼訓因存凝因存尭因存薫因外軌蝟昭粡竚癈鷭т繻Ь因鬼群因鬼軍因存訓蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典禅桍鹿粡寂蝟赱齠洲粤讌将穐穐穐厳岡蔚岡穐厳階慣卯鹿粡寂蝟赱齠洲粤讌将橋穐膳巻穐穐穐穐慣桑欝規鹿粡寂蝟赱齠洲粤讌将慣喬郡穐厳巻厳規袖測慣規穐偽規鹿粡寂蝟赱齠洲粤讌将慣幸厳喬慣謙厳桑穐厳謙厳幸厳銭鹿粡寂蝟赱齠洲粤讌将慣測厳測慣銭厳狸穐鰻狸穐慣狸鹿粡寂蝟赱齠洲粤讌将轍幸慣適害規厳潮慣潮厳適然階慌卯鹿粡寂蝟赱齠洲粤讌将穐穐慌岡跳桑亀測慌階慌巻穐鹿粡寂蝟赱齠洲粤讌将飢卯慌規穐慌喬慌桑慌規穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義緊蝟昭粡竚癈鷭т繻Ь因亀臆因慣憶因憾掬因潅輝蝟昭粡竚癈鷭т繻Ь因慣乙因孫恩因孫温因亀佳因孫価蝟昭粡竚癈鷭т繻Ь因孫佳因概蓋因孫加因環患因孫可蝟昭粡竚癈鷭т繻Ь因潅夏因偽加因亀桶因孫嘉蝟昭粡竚癈鷭т繻Ь因亀俺因孫夏因寛患因孫外蝟昭粡竚癈鷭т繻Ь因澗蓋因患漢因孫咳因孫害因孫崖蝟昭粡竚癈鷭т繻Ь因孫慨因亀卸因孫概因孫涯蝟昭粡竚癈鷭т繻Ь因澗教因孫碍因柿漢因孫蓋因嚇価蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典膳桍鹿粡寂蝟赱齠洲粤讌将穐抗幸穐抗銭抗測穐飢謙穐鹿粡寂蝟赱齠洲粤讌将抗狸袖穐抗潮卒頭穐抗適穐穐鹿粡寂蝟赱齠洲粤讌将鯵幸鹸謙抗頭芦測圧卯穐穐穐鹿粡寂蝟赱齠洲粤讌将穐飢狸飢潮穐飢銭拘穐拘卯拘岡鹿粡寂蝟赱齠洲粤讌将穐穐穐拘階拘巻嘘謙寛頭拘規鹿粡寂蝟赱齠洲粤讌将飢幸穐担規抗卯穐穐拘喬拘桑鹿粡寂蝟赱齠洲粤讌将穐拘謙拘幸穐拘銭穐芦謙拘測鹿粡寂蝟赱齠洲粤讌将穐穐穐扱幸穐穐穐袖卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義雇蝟昭粡竚癈鷭т繻Ь因孫潅因外飢因外桶因孫環蝟昭粡竚癈鷭т繻Ь因亀害因孫甘因孫監因孫軌蝟昭粡竚癈鷭т繻Ь因亀外因孫輝因孫飢蝟昭粡竚癈鷭т繻Ь因潅鈎因亀崖因亀咳因孫騎因亀夏蝟昭粡竚癈鷭т繻Ь因各咳因孫鬼因孫亀因亀嘉因孫偽蝟昭粡竚癈鷭т繻Ь因孫儀因漢義因孫妓因孫宜因蓋挟蝟昭粡竚癈鷭т繻Ь因孫義因亀碍因亀蓋蝟昭粡竚癈鷭т繻Ь因嚇佳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典噌桍鹿粡寂蝟赱齠洲粤讌将騎巻堂狸穐穐控測控狸郡狸控潮鹿粡寂蝟赱齠洲粤讌将控適騎喬穐穐控頭穐穐穐鹿粡寂蝟赱齠洲粤讌将攻穐穐穐穐穐攻卯穐穐鹿粡寂蝟赱齠洲粤讌将穐穐漸桑穐穐穐攻岡穐鹿粡寂蝟赱齠洲粤讌将穐穐騎幸攻階穐攻巻控謙攻規鹿粡寂蝟赱齠洲粤讌将穐穐騎銭穐騎規攻喬穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐攻桑鹿粡寂蝟赱齠洲粤讌将穐穐攻謙攻幸穐穐攻銭坦測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義想蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因孫饗蝟昭粡竚癈鷭т繻Ь因孫驚因慣掬因孫仰因孫凝蝟昭粡竚癈鷭т繻Ь因孫尭因亀蛎因換害因孫薫因孫訓因孫群蝟昭粡竚癈鷭т繻Ь因孫軍因孫郡因孫卦蝟昭粡竚癈鷭т繻Ь因孫袈蝟昭粡竚癈鷭т繻Ь因孫祁因孫係因孫傾因孫形蝟昭粡竚癈鷭т繻Ь因孫径因孫恵因孫慶因亀鈎因亀完因亀劃因孫慧蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典疎桍鹿粡寂蝟赱齠洲粤讌将穐牡桑騎頭穐漸卯穐漸岡穐鹿粡寂蝟赱齠洲粤讌将漸階坦測穐騎適祁幸穐穐漸巻鹿粡寂蝟赱齠洲粤讌将鬼狸穐穐穐穐穐鬼規鬼岡鹿粡寂蝟赱齠洲粤讌将穐穐漸規穐漸喬穐穐穐鹿粡寂蝟赱齠洲粤讌将漸桑涯巻穐鬼卯穐漸謙鬼階穐鹿粡寂蝟赱齠洲粤讌将穐鬼巻漸幸穐穐穐漸銭穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐漸測漸狸穐鹿粡寂蝟赱齠洲粤讌将穐穐鬼喬鬼桑穐漸潮穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義築蝟昭粡竚癈鷭т繻Ь因汰嘉因汰夏蝟昭粡竚癈鷭т繻Ь因汰外因慨群因亀換因亀憾蝟昭粡竚癈鷭т繻Ь因亀漢因汰咳蝟昭粡竚癈鷭т繻Ь因汰崖因汰慨因汰概蝟昭粡竚癈鷭т繻Ь因汰涯因嚇凝因汰碍蝟昭粡竚癈鷭т繻Ь因亀環因幹誼因汰蓋蝟昭粡竚癈鷭т繻Ь因咳患因亀澗因汰害因亀甘蝟昭粡竚癈鷭т繻Ь因汰街因亀監蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典祖桍鹿粡寂蝟赱齠洲粤讌将亀岡然銭穐亀穐穐亀卯穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐然測然狸穐穐穐鹿粡寂蝟赱齠洲粤讌将袖岡亀階然潮穐慌喬亀巻然適揃銭鹿粡寂蝟赱齠洲粤讌将桶謙穐亀規亀喬袖銭慌桑然頭探岡鹿粡寂蝟赱齠洲粤讌将穐穐穐飢謙鹸幸亀桑概謙穐鹿粡寂蝟赱齠洲粤讌将全穐亀謙穐桶幸穐穐全卯全岡鹿粡寂蝟赱齠洲粤讌将亀幸恐階穐亀銭穐亀測穐穐鹿粡寂蝟赱齠洲粤讌将亀狸穐亀適穐全階全巻全規全喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺義奴蝟昭粡竚癈鷭т繻Ь因亀菊因汰慣因亀彊因汰憾因寛薫因汰換因咳卸蝟昭粡竚癈鷭т繻Ь因鈎狭因外寛因汰漢因官儀因慨外因鈎概因汰澗因街恩蝟昭粡竚癈鷭т繻Ь因汰潅因汰環因汰甘因汰監因患橋因汰軌因劃憶蝟昭粡竚癈鷭т繻Ь因慨咳因干狂因幹響因外蓋因概街因漢卦因鈎寛蝟昭粡竚癈鷭т繻Ь因概飢因完饗因鈎鈎因環恩因亀怯蝟昭粡竚癈鷭т繻Ь因汰輝因汰飢因汰騎因汰鬼因概誼因汰亀蝟昭粡竚癈鷭т繻Ь因柿澗因汰偽因汰儀因崖害因咳恭因嚇加因害憾因汰妓蝟昭粡竚癈鷭т繻Ь因亀恐因環感因汰宜因汰義因劃換蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典粗桍鹿粡寂蝟赱齠洲粤讌将禅測禅狸旦巻偽階慣階教岡嘆幸偽巻鹿粡寂蝟赱齠洲粤讌将穐偽規穐穐控幸禅潮穐禅適鹿粡寂蝟赱齠洲粤讌将偽桑穐寛謙況桑偽喬穐禅頭繕穐鹿粡寂蝟赱齠洲粤讌将繕卯繕岡繕階干岡穐導岡偽測族卯鹿粡寂蝟赱齠洲粤讌将繕巻牡幸偽銭穐偽謙偽狸偽幸群測鹿粡寂蝟赱齠洲粤讌将担潮導階穐偽潮干銭穐鉄穐繕規鹿粡寂蝟赱齠洲粤讌将偽適繕喬穐儀穐繕桑碍適偽頭穐鹿粡寂蝟赱齠洲粤讌将芦階穐揃測穐穐繕謙乙穐歎桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻異蝟昭粡竚癈鷭т繻Ь因換卦因完驚因鈎環因亀訓因嚇可因亀群蝟昭粡竚癈鷭т繻Ь因亀軍因外騎因寛柿因各飢因汰狭因亀郡因感崖因嚇嘉蝟昭粡竚癈鷭т繻Ь因嚇夏因亀卦因完仰因汰響蝟昭粡竚癈鷭т繻Ь因嚇外因汰饗因汰驚蝟昭粡竚癈鷭т繻Ь因亀袈因亀祁因汰仰因潅彊因汰凝蝟昭粡竚癈鷭т繻Ь因亀係因汰尭因汰薫因汰訓因涯感因汰群蝟昭粡竚癈鷭т繻Ь因汰軍因劃臆因汰郡因汰卦因汰袈蝟昭粡竚癈鷭т繻Ь因亀傾因亀形因鈎誼因各加因感郡因各鬼因憾係因慣臆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典賊桍鹿粡寂蝟赱齠洲粤讌将挟幸儀測穐穐穐偽頭儀狸穐鹿粡寂蝟赱齠洲粤讌将況適穐挟頭桶穐穐袖階儀潮恐岡鹿粡寂蝟赱齠洲粤讌将恐卯況潮穐儀適穐騎謙穐穐鹿粡寂蝟赱齠洲粤讌将穐膳桑膳謙穐膳幸穐桶穐穐鹿粡寂蝟赱齠洲粤讌将鬼測担謙膳銭膳測欝謙跳銭穐膳狸鹿粡寂蝟赱齠洲粤讌将膳潮膳適穐穐恐巻族卯恐規教喬鹿粡寂蝟赱齠洲粤讌将族岡続階穐穐族階族巻恐桑穐鹿粡寂蝟赱齠洲粤讌将穐恐謙族規族喬族桑族謙穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻菓蝟昭粡竚癈鷭т繻Ь因詑温蝟昭粡竚癈鷭т繻Ь因詑価因詑佳因偽温因詑加蝟昭粡竚癈鷭т繻Ь因慨郡因偽価因詑可因偽佳蝟昭粡竚癈鷭т繻Ь因詑嘉因詑夏蝟昭粡竚癈鷭т繻Ь因詑外因害加因詑咳因詑害因詑崖蝟昭粡竚癈鷭т繻Ь因官蛎因慨挟因詑慨因偽可因潅恩蝟昭粡竚癈鷭т繻Ь因寛飢因詑概因崖宜因詑涯因詑碍因偽夏因偽咳蝟昭粡竚癈鷭т繻Ь因慨菊因詑蓋因偽嘉因偽外因偽崖蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典続桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐恭岡穐恭巻鹿粡寂蝟赱齠洲粤讌将穐続幸穐続銭穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐続測穐穐穐穐続潮鹿粡寂蝟赱齠洲粤讌将穐恭規穐穐穐続狸穐穐鹿粡寂蝟赱齠洲粤讌将恭潮恐適穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将俺規恭喬恭測穐穐恭幸続適膳桑鹿粡寂蝟赱齠洲粤讌将膳喬続頭卒穐穐卒卯干測偽桑穐鹿粡寂蝟赱齠洲粤讌将穐穐恭謙諜巻穐恭桑穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻館蝟昭粡竚癈鷭т繻Ь因詑寛因詑干因各群蝟昭粡竚癈鷭т繻Ь因偽鈎因詑幹因柿響蝟昭粡竚癈鷭т繻Ь因偽寛因詑患因偽干因偽劃因崖崖因偽嚇蝟昭粡竚癈鷭т繻Ь因偽慣因偽感因偽患因偽官因偽完蝟昭粡竚癈鷭т繻Ь因偽幹因詑慣因詑憾因詑換因詑漢蝟昭粡竚癈鷭т繻Ь因漢係因詑感蝟昭粡竚癈鷭т繻Ь因詑澗因詑潅蝟昭粡竚癈鷭т繻Ь因詑環因詑甘因詑監蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典袖桍鹿粡寂蝟赱齠洲粤讌将穐穐袖穐袖卯穐穐袖岡穐鹿粡寂蝟赱齠洲粤讌将袖階穐袖桑挟測挟謙穐挟銭穐鹿粡寂蝟赱齠洲粤讌将跳岡袖規挟幸干狸穐袖巻穐穐鹿粡寂蝟赱齠洲粤讌将穐袖喬穐穐恭頭穐穐袖謙鹿粡寂蝟赱齠洲粤讌将袖幸袖銭袖測穐袖狸穐穐穐鹿粡寂蝟赱齠洲粤讌将穐瞳階袖潮穐挟狸袖適穐然桑鹿粡寂蝟赱齠洲粤讌将袖頭穐穐挟潮穐穐挟適穐鹿粡寂蝟赱齠洲粤讌将穐其穐其卯穐穐穐其岡其階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻緊蝟昭粡竚癈鷭т繻Ь因詑挟因偽輝因詑教因偽軌因偽監蝟昭粡竚癈鷭т繻Ь因詑橋因詑況因患狂因偽柿蝟昭粡竚癈鷭т繻Ь因偽儀因詑狂因詑狭因詑響因詑饗蝟昭粡竚癈鷭т繻Ь因詑驚因詑仰因偽騎因詑凝蝟昭粡竚癈鷭т繻Ь因詑尭因偽飢因詑薫蝟昭粡竚癈鷭т繻Ь因詑訓因偽鬼因偽亀蝟昭粡竚癈鷭т繻Ь因詑群因填郡因詑軍因偽妓蝟昭粡竚癈鷭т繻Ь因詑郡因詑卦因甘橋因偽宜因偽偽蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典揃桍鹿粡寂蝟赱齠洲粤讌将穐穐穐揃喬穐穐穐揃桑鹿粡寂蝟赱齠洲粤讌将穐教銭穐揃謙感穐教測揃銭穐鹿粡寂蝟赱齠洲粤讌将揃幸穐教潮教狸穐穐教適穐鹿粡寂蝟赱齠洲粤讌将揃測揃狸穐教頭穐斡適腸階穐鹿粡寂蝟赱齠洲粤讌将揃潮超巻穐蔚階揃適慌幸然謙慌銭鹿粡寂蝟赱齠洲粤讌将儀穐嘆卯穐橋穐穐穐然幸穐鹿粡寂蝟赱齠洲粤讌将穐鹸銭橋卯嘆喬郡階橋岡穐慌測鹿粡寂蝟赱齠洲粤讌将嘆岡嘆階穐寛狸穐害桑教岡穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻雇蝟昭粡竚癈鷭т繻Ь因唾牡因蛎鬼因換蟻因憾官因唾乙蝟昭粡竚癈鷭т繻Ь因偽恭因慨卦因唾俺蝟昭粡竚癈鷭т繻Ь因偽橋因唾卸因唾恩因唾温因幹憶蝟昭粡竚癈鷭т繻Ь因唾価因偽教因偽挟因偽況因幹饗因唾佳蝟昭粡竚癈鷭т繻Ь因唾加因各恭蝟昭粡竚癈鷭т繻Ь因唾嘉因蛎亀因完漢因唾可因寛騎蝟昭粡竚癈鷭т繻Ь因概臆因唾夏因幹臆因唾外因偽狂因偽狭蝟昭粡竚癈鷭т繻Ь因嚇尭因澗街因唾咳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典孫桍鹿粡寂蝟赱齠洲粤讌将橋狸穐穐橋測橋銭昂潮穐況階鹿粡寂蝟赱齠洲粤讌将穐坦巻穐坦岡袖銭穐橋潮穐鹿粡寂蝟赱齠洲粤讌将坦階坦規穐穐橋頭其測坦喬橋適鹿粡寂蝟赱齠洲粤讌将坦桑穐穐坦謙坦幸穐坦銭況穐鹿粡寂蝟赱齠洲粤讌将穐顕謙況卯然適況岡穐穐穐鹿粡寂蝟赱齠洲粤讌将坦測穐坦狸坦潮坦適坦頭担穐穐鹿粡寂蝟赱齠洲粤讌将担卯穐干階然頭群頭況巻況規穐鹿粡寂蝟赱齠洲粤讌将慌狸干巻況喬験謙調巻腸幸慣喬況謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻想蝟昭粡竚癈鷭т繻Ь因唾寛因幹桶因街可因嚇咳因憾菊蝟昭粡竚癈鷭т繻Ь因嚇害因唾干因唾幹因劃係蝟昭粡竚癈鷭т繻Ь因幹驚因漢傾因患街蝟昭粡竚癈鷭т繻Ь因街嘉因換誼蝟昭粡竚癈鷭т繻Ь因偽傾因唾患因唾感因唾慣因患宜因柿寛蝟昭粡竚癈鷭т繻Ь因唾憾因唾換因蓋澗因唾漢因幹仰蝟昭粡竚癈鷭т繻Ь因唾澗因唾潅因外干因劃凝因街夏蝟昭粡竚癈鷭т繻Ь因環慣因唾環因唾甘因唾監蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典詑桍鹿粡寂蝟赱齠洲粤讌将穐況銭況測卦卯穐穐探穐穐鹿粡寂蝟赱齠洲粤讌将況狸天桑堂潮探岡探卯穐探階況適鹿粡寂蝟赱齠洲粤讌将況潮探巻探規慨桑探喬探桑群卯穐鹿粡寂蝟赱齠洲粤讌将穐穐群巻群規探謙群階探幸拘穐鹿粡寂蝟赱齠洲粤讌将迭階群桑群喬群岡穐探銭穐穐鹿粡寂蝟赱齠洲粤讌将群謙群幸穐探測群銭穐穐穐鹿粡寂蝟赱齠洲粤讌将群潮群測穐群狸群適穐蔚巻感適鹿粡寂蝟赱齠洲粤讌将群頭穐祁銭卸喬軍喬穐軍穐況測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻築蝟昭粡竚癈鷭т繻Ь因漢蟻因唾誼因儀咳因監嘉因唾議因唾掬蝟昭粡竚癈鷭т繻Ь因唾菊因儀害因漢完因儀概因軌憶因軌咳因唾彊因鈎外蝟昭粡竚癈鷭т繻Ь因感卦因儀涯因概議因幹牡因外形因儀碍因漢俺蝟昭粡竚癈鷭т繻Ь因街外因唾怯因干軌因唾恐因唾恭因幹尭蝟昭粡竚癈鷭т繻Ь因唾挟因唾教因唾橋因唾況因潅尭因蓋街因蓋潅蝟昭粡竚癈鷭т繻Ь因唾狂因儀蓋因唾狭因唾響因儀街因唾饗因儀各蝟昭粡竚癈鷭т繻Ь因唾驚因鈎教因唾仰因幹乙因唾凝因涯夏蝟昭粡竚癈鷭т繻Ь因儀柿因唾尭因換佳因唾薫因干感因唾訓蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典堕桍鹿粡寂蝟赱齠洲粤讌将歎岡軍測穐穐歎階歎巻穐歎規鹿粡寂蝟赱齠洲粤讌将軍狸穐恭穐穐軍潮歎喬軍適穐鹿粡寂蝟赱齠洲粤讌将歎桑郡穐穐儀喬歎謙穐郡卯郡岡鹿粡寂蝟赱齠洲粤讌将歎幸郡階穐歎銭軍巻軍階穐穐鹿粡寂蝟赱齠洲粤讌将歎測郡巻郡卯歎狸歎潮穐慌桑歎適鹿粡寂蝟赱齠洲粤讌将穐全狸抗桑寛喬拘測郡規穐腸卯鹿粡寂蝟赱齠洲粤讌将迭巻唄喬腸岡郡喬腸階腸巻穐郡桑鹿粡寂蝟赱齠洲粤讌将腸規歎岡腸喬穐原穐腸桑腸謙郡銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺蟻奴蝟昭粡竚癈鷭т繻Ь因咳慶因完加因儀換因儀憾因碍寛因寛鬼因儀甘蝟昭粡竚癈鷭т繻Ь因儀潅因堕温因儀澗因甘卸因蓋教因堕価因堕佳蝟昭粡竚癈鷭т繻Ь因劃傾因儀環因患潅因劃嚇因堕加因感完蝟昭粡竚癈鷭т繻Ь因儀輝因儀軌因堕可因堕嘉因儀監蝟昭粡竚癈鷭т繻Ь因儀飢因蓋橋因堕夏因堕害因堕外蝟昭粡竚癈鷭т繻Ь因儀騎因換恵因劃蟻因堕咳因堕崖因儀鬼因憾傾因堕慨蝟昭粡竚癈鷭т繻Ь因堕概因堕涯因感官因幹卸因憧嚇蝟昭粡竚癈鷭т繻Ь因堕碍因患外因儀亀因概佳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰典惰桍鹿粡寂蝟赱齠洲粤讌将穐穐穐導巻蝶謙慌狸穐蝶幸鹿粡寂蝟赱齠洲粤讌将蝶銭蝶測穐蝶狸慣桑群喬穐穐鹿粡寂蝟赱齠洲粤讌将蝶潮蝶適蝶頭調穐調卯穐卦喬袖喬鹿粡寂蝟赱齠洲粤讌将続銭続測穐穐鰻適卦測調岡穐鹿粡寂蝟赱齠洲粤讌将涯幸調階調巻穐卦謙穐穐穐鹿粡寂蝟赱齠洲粤讌将調規調喬調桑卸桑調謙調幸調銭調測鹿粡寂蝟赱齠洲粤讌将顕潮卦銭調狸調潮穐軍穐調適穐鹿粡寂蝟赱齠洲粤讌将卦幸穐調頭卦桑諜穐昂銭穐卦潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂異蝟昭粡竚癈鷭т繻Ь因堕輝蝟昭粡竚癈鷭т繻Ь因堕飢因堕騎因儀恭因儀狭蝟昭粡竚癈鷭т繻Ь因儀怯因患誼因堕鬼因堕亀因儀橋因換議因堕偽蝟昭粡竚癈鷭т繻Ь因堕儀因儀彊因堕妓因儀教因甘況因蛎儀因堕宜蝟昭粡竚癈鷭т繻Ь因寛亀因儀掬因堕義因概掬因儀狂因完可蝟昭粡竚癈鷭т繻Ь因咳教因儀恐因害係因儀況因堕蟻因涯咳蝟昭粡竚癈鷭т繻Ь因儀挟因堕誼因堕議蝟昭粡竚癈鷭т繻Ь因儀響蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填険桍鹿粡寂蝟赱齠洲粤讌将諜適袈狸祁喬祁巻穐穐祁卯諜頭鹿粡寂蝟赱齠洲粤讌将超穐超卯祁穐天謙超岡祁岡穐穐鹿粡寂蝟赱齠洲粤讌将恭岡超階抗卯穐超巻跳銭超規超喬鹿粡寂蝟赱齠洲粤讌将穐祁幸袈測穐穐超桑穐袈頭鹿粡寂蝟赱齠洲粤讌将卦頭超謙卸銭祁階祁規概卯穐超幸鹿粡寂蝟赱齠洲粤讌将漸謙桶謙袈潮祁謙祁桑恭階穐臆幸鹿粡寂蝟赱齠洲粤讌将涯喬超銭穐穐穐郡階穐袈適鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐超測超狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂菓蝟昭粡竚癈鷭т繻Ь因儀形因堕仰因儀慶因妓憶因憧各因堕凝蝟昭粡竚癈鷭т繻Ь因堕尭因鈎劃因堕薫因妓卸因幹薫因儀径因堕訓蝟昭粡竚癈鷭т繻Ь因堕群因妓乙因堕軍因害傾因堕郡因妓桶因妓牡蝟昭粡竚癈鷭т繻Ь因堕卦因儀慧因妓臆因堕袈因堕祁因蓋況蝟昭粡竚癈鷭т繻Ь因環価因堕係因慨概因堕傾因堕形因咳宜因妓俺蝟昭粡竚癈鷭т繻Ь因堕径因慣柿因外可蝟昭粡竚癈鷭т繻Ь因堕恵因堕慶因憾怯因儀誼因妓加因妓外因潅教因堕慧蝟昭粡竚癈鷭т繻Ь因妓温因妥憶因患狭因妓嘉因妥臆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填験桍鹿粡寂蝟赱齠洲粤讌将穐穐轍階穐轍巻天穐顕頭教桑鹿粡寂蝟赱齠洲粤讌将轍規轍喬轍桑轍謙穐穐轍幸轍銭鹿粡寂蝟赱齠洲粤讌将穐憧桑穐顕測轍測轍狸穐穐鹿粡寂蝟赱齠洲粤讌将験卯轍潮昂測轍適梓測轍頭迭穐圧巻鹿粡寂蝟赱齠洲粤讌将顕銭顕謙迭卯欝銭穐迭岡穐祁狸鹿粡寂蝟赱齠洲粤讌将続巻穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将牡喬験潮迭階欝測験謙迭巻験規験喬鹿粡寂蝟赱齠洲粤讌将迭規旦喬験幸験狸迭喬迭桑穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂館蝟昭粡竚癈鷭т繻Ь因妓碍因劃乙因妥蓋因妓柿因妓慨因妥街蝟昭粡竚癈鷭т繻Ь因潅恵因潅径因妥柿因妥蛎因妓嚇因妓各因外亀蝟昭粡竚癈鷭т繻Ь因妥鈎因妥劃因妥嚇因妥各因妥完因妓崖因妥官因妥寛蝟昭粡竚癈鷭т繻Ь因妥干因涯群因外俺因妥幹因妥患因慨涯蝟昭粡竚癈鷭т繻Ь因憧完因妓蛎因妥感因妓干蝟昭粡竚癈鷭т繻Ь因妓寛因妥慣因妥憾因妓慣蝟昭粡竚癈鷭т繻Ь因妥換因妥漢因妓憾因妥澗因妥潅因妥環蝟昭粡竚癈鷭т繻Ь因妥甘因妓感因妓換因妓官因妓患蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填元桍鹿粡寂蝟赱齠洲粤讌将穐鉄頭鹸銭穐鹸測典穐典卯鹸穐鹿粡寂蝟赱齠洲粤讌将揃狸典岡鹸巻乙喬抗岡験岡導規穐鹿粡寂蝟赱齠洲粤讌将穐穐穐元謙穐繕幸穐穐鹿粡寂蝟赱齠洲粤讌将鹸適鹸頭元穐穐穐元桑典階元喬鹿粡寂蝟赱齠洲粤讌将典巻穐揃潮干桑穐元巻穐郡規鹿粡寂蝟赱齠洲粤讌将崖巻穐穐元卯典規穐迭謙元階鹿粡寂蝟赱齠洲粤讌将圧喬元規典喬鹸狸元岡元幸郡巻鹸潮鹿粡寂蝟赱齠洲粤讌将典桑穐穐典謙典幸穐諜潮典銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂緊蝟昭粡竚癈鷭т繻Ь因妥蟻因妥誼因環佳因妥議因妥掬因妓誼蝟昭粡竚癈鷭т繻Ь因妓彊因妥菊因妥彊因官慧蝟昭粡竚癈鷭т繻Ь因甘傾因妓怯因妥怯因妥恐因妓掬因妓蟻因妥恭蝟昭粡竚癈鷭т繻Ь因妥挟因妓義因妓菊因妥教因妥橋因妥況蝟昭粡竚癈鷭т繻Ь因妥狂因漢外因妥狭因感慨蝟昭粡竚癈鷭т繻Ь因妥響因碍感因妥饗因妓恐因妓議因妥驚因妓恭蝟昭粡竚癈鷭т繻Ь因碍径因害咳蝟昭粡竚癈鷭т繻Ь因妥仰因妥凝因妓饗因妥尭因慨蓋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填厳桍鹿粡寂蝟赱齠洲粤讌将天穐天卯天岡原幸穐穐原銭漸幸鹿粡寂蝟赱齠洲粤讌将原謙原喬原規原狸原巻原適天階天巻鹿粡寂蝟赱齠洲粤讌将卸測穐穐穐穐天規穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐天喬天桑天謙天幸鹿粡寂蝟赱齠洲粤讌将穐天銭天測厳穐穐天適原頭天狸鹿粡寂蝟赱齠洲粤讌将穐天潮穐穐堂卯堂岡穐堂階鹿粡寂蝟赱齠洲粤讌将穐穐寛謙穐厳階穐厳卯原桑鹿粡寂蝟赱齠洲粤讌将祁狸穐厳岡穐厳喬厳規厳桑厳巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂雇蝟昭粡竚癈鷭т繻Ь因妓係因惰牡因惰乙因惰俺因惰卸蝟昭粡竚癈鷭т繻Ь因妓傾因妓形因漢響因妓恵因妓径因劃各蝟昭粡竚癈鷭т繻Ь因完嘉因害橋因害恵因惰恩因妓慶因惰温因外各蝟昭粡竚癈鷭т繻Ь因完潅因妓慧因惰価因驚干因宜憶因碍怯蝟昭粡竚癈鷭т繻Ь因惰佳因宜臆因惰加因惰可因完尭因惰嘉蝟昭粡竚癈鷭т繻Ь因惰夏因宜桶因惰外因宜牡因概柿蝟昭粡竚癈鷭т繻Ь因宜乙因宜俺因宜卸因寛儀蝟昭粡竚癈鷭т繻Ь因蓋環因惰咳因潅怯因惰害因澗鈎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填弦桍鹿粡寂蝟赱齠洲粤讌将超銭慌謙導階導巻導規穐導喬扱穐鹿粡寂蝟赱齠洲粤讌将迭潮原岡穐旦銭導桑全潮慌幸穐鹿粡寂蝟赱齠洲粤讌将導謙導幸導銭牡桑導測漸桑導狸穐鹿粡寂蝟赱齠洲粤讌将卸卯穐導潮慌狸導適穐慌銭穐鹿粡寂蝟赱齠洲粤讌将慌潮穐穐慌測導頭穐穐穐鹿粡寂蝟赱齠洲粤讌将慌適穐穐穐穐憧穐然卯憧卯鹿粡寂蝟赱齠洲粤讌将穐鯵桑穐憧岡穐穐控適穐鹿粡寂蝟赱齠洲粤讌将穐原階憧階穐慌頭憧巻抗岡迭規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂想蝟昭粡竚癈鷭т繻Ь因概蛎因宜外因宜碍因嚇涯蝟昭粡竚癈鷭т繻Ь因宜咳因慣幹因惰患因惰感因惰慣蝟昭粡竚癈鷭т繻Ь因惰憾因環掬因宜崖因宜慨因宜蓋因患響因宜概因街崖蝟昭粡竚癈鷭т繻Ь因完掬因宜感因憾慨因寛群蝟昭粡竚癈鷭т繻Ь因惰換蝟昭粡竚癈鷭т繻Ь因惰漢因憾挟因義可蝟昭粡竚癈鷭т繻Ь因漢形因惰澗因幹訓因惰潅因惰環蝟昭粡竚癈鷭т繻Ь因澗卦因惰甘因宜蛎因害憶因干響因惰監因惰軌蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填限桍鹿粡寂蝟赱齠洲粤讌将穐穐拘巻穐撞卯崖巻抗適拘規鹿粡寂蝟赱齠洲粤讌将拘穐拘桑拘階穐拘岡袈頭撞岡抗狸鹿粡寂蝟赱齠洲粤讌将卸潮抗銭儀卯卸階抗喬撞階撞巻抗幸鹿粡寂蝟赱齠洲粤讌将抗巻圧測撞規迭桑拘卯卦岡穐穐鹿粡寂蝟赱齠洲粤讌将儀岡慨謙穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐撞喬穐涯桑堂卯拘幸拘適鹿粡寂蝟赱齠洲粤讌将穐拘銭撞桑祁潮撞謙拘頭族岡攻幸鹿粡寂蝟赱齠洲粤讌将穐穐穐穐撞幸撞銭腸喬抗潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂築蝟昭粡竚癈鷭т繻Ь因蛎慶因宜潅因惰蟻因惰誼因蛎妓蝟昭粡竚癈鷭т繻Ь因宜環因外幹因惰議因惰掬因宜憾因惰菊蝟昭粡竚癈鷭т繻Ь因惰彊因幹温因惰怯因惰恐蝟昭粡竚癈鷭т繻Ь因惰恭因概軍因涯慨蝟昭粡竚癈鷭т繻Ь因宜澗蝟昭粡竚癈鷭т繻Ь因外卸因惰挟因惰教因柿干因惰橋因各涯蝟昭粡竚癈鷭т繻Ь因惰況因惰狂蝟昭粡竚癈鷭т繻Ь因惰狭因幹群因惰響因憾鬼因宜輝因官掬蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填個桍鹿粡寂蝟赱齠洲粤讌将穐洞測洞狸洞潮洞適穐洞頭穐鹿粡寂蝟赱齠洲粤讌将穐臆銭瞳穐瞳卯族測控岡瞳岡控巻鹿粡寂蝟赱齠洲粤讌将控穐穐瞳階瞳巻瞳規繕卯穐干潮鹿粡寂蝟赱齠洲粤讌将瞳喬穐穐瞳桑欝狸穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐瞳謙瞳幸膳測鹿粡寂蝟赱齠洲粤讌将担適攻穐穐控頭瞳銭瞳測瞳謙穐鹿粡寂蝟赱齠洲粤讌将穐瞳狸祁適穐瞳潮瞳適控幸迭幸鹿粡寂蝟赱齠洲粤讌将芦卯穐橋謙軍卯芦岡芦階穐芦巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狂奴蝟昭粡竚癈鷭т繻Ь因宜儀因丹乙因官議因丹俺因丹卸蝟昭粡竚癈鷭т繻Ь因鈎係因宜誼因丹恩因嚇蓋因宜偽因宜蟻蝟昭粡竚癈鷭т繻Ь因丹温因慣騎因丹価因丹佳因宜亀蝟昭粡竚癈鷭т繻Ь因碍憶因丹加因丹可因崖議因丹嘉因宜議蝟昭粡竚癈鷭т繻Ь因甘佳因柿甘因干概因宜義因丹夏因完誼因丹外因街概蝟昭粡竚癈鷭т繻Ь因各挟因咳橋因官鈎因宜妓因概患因丹咳因丹害因丹崖蝟昭粡竚癈鷭т繻Ь因碍慣因幹監因宜掬蝟昭粡竚癈鷭т繻Ь因官菊因丹慨因宜怯蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填呼桍鹿粡寂蝟赱齠洲粤讌将攻階鯵規穐桶桑攻幸鯵喬攻巻穐鹿粡寂蝟赱齠洲粤讌将鯵桑攻喬穐穐穐穐鯵謙拘卯鹿粡寂蝟赱齠洲粤讌将慣階鯵幸攻桑鯵銭鯵測鯵狸腸狸穐鹿粡寂蝟赱齠洲粤讌将穐穐調謙干幸鯵潮穐穐穐鹿粡寂蝟赱齠洲粤讌将鯵適芦適穐攻規穐鯵頭穐穐鹿粡寂蝟赱齠洲粤讌将穐攻岡梓穐穐梓卯穐慣謙穐鹿粡寂蝟赱齠洲粤讌将穐穐梓岡梓階蔚桑梓巻攻謙穐鹿粡寂蝟赱齠洲粤讌将梓規梓喬調幸穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭異蝟昭粡竚癈鷭т繻Ь因宜驚蝟昭粡竚癈鷭т繻Ь因丹慣因丹憾因寛蛎因宜軍蝟昭粡竚癈鷭т繻Ь因丹換因丹漢因宜仰因丹澗因宜響因宜訓蝟昭粡竚癈鷭т繻Ь因丹潅因宜騎因丹環蝟昭粡竚癈鷭т繻Ь因丹甘因丹監因丹軌因丹輝因宜凝蝟昭粡竚癈鷭т繻Ь因宜群因丹飢因丹騎因憾寛因患饗因丹鬼蝟昭粡竚癈鷭т繻Ь因丹亀因宜饗因丹偽因宜尭蝟昭粡竚癈鷭т繻Ь因碍憾因丹儀因柿訓因丹妓蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填恒桍鹿粡寂蝟赱齠洲粤讌将穐穐圧潮穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐圧幸穐穐昂桑圧銭鹿粡寂蝟赱齠洲粤讌将穐圧測圧狸圧潮圧適穐穐穐鹿粡寂蝟赱齠洲粤讌将飢喬穐圧頭斡穐斡卯斡岡穐斡階鹿粡寂蝟赱齠洲粤讌将斡巻斡規穐斡喬穐穐穐昂巻鹿粡寂蝟赱齠洲粤讌将穐其穐穐穐穐斡桑穐昂規鹿粡寂蝟赱齠洲粤讌将穐穐穐斡謙斡幸穐昂喬穐鹿粡寂蝟赱齠洲粤讌将担適穐芦岡斡銭穐斡測穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭菓蝟昭粡竚癈鷭т繻Ь因碍恐因丹驚因丹仰蝟昭粡竚癈鷭т繻Ь因宜慶因丹凝蝟昭粡竚癈鷭т繻Ь因丹尭因丹薫因蛎概因宜形因宜傾蝟昭粡竚癈鷭т繻Ь因丹訓因丹群因慣害因丹軍因丹郡因感概因丹卦蝟昭粡竚癈鷭т繻Ь因丹袈因丹祁因患咳因宜径因丹係蝟昭粡竚癈鷭т繻Ь因丹傾因宜恵因換尭因丹形因慣患因蛎桶蝟昭粡竚癈鷭т繻Ь因完訓因澗軌因丹径蝟昭粡竚癈鷭т繻Ь因崖換因義乙因宜慧因丹恵因丹慶因丹慧蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填抗桍鹿粡寂蝟赱齠洲粤讌将穐調銭漸桑穐渦卯漸階穐漸巻鹿粡寂蝟赱齠洲粤讌将穐渦岡渦階渦巻渦規蔚穐渦喬穐鹿粡寂蝟赱齠洲粤讌将渦桑渦謙漸岡穐抗頭渦幸穐渦銭鹿粡寂蝟赱齠洲粤讌将漸喬穐漸卯穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将漸測漸狸飢桑漸適渦測渦狸族巻漸幸鹿粡寂蝟赱齠洲粤讌将穐渦潮渦適穐騎狸渦頭穐漸頭鹿粡寂蝟赱齠洲粤讌将嘘穐漸謙然階穐然岡嘘卯然卯嘘岡鹿粡寂蝟赱齠洲粤讌将穐穐然巻嘘階穐然喬天卯嘘巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭館蝟昭粡竚癈鷭т繻Ь因義概因単概因単涯因義街蝟昭粡竚癈鷭т繻Ь因単碍因単蓋因単街因単柿蝟昭粡竚癈鷭т繻Ь因単蛎因単鈎因単劃蝟昭粡竚癈鷭т繻Ь因義碍因単嚇因単各因義蓋因宜薫因単完因単官蝟昭粡竚癈鷭т繻Ь因単寛因義蛎因義柿因単干蝟昭粡竚癈鷭т繻Ь因単幹因宜係因義鈎因義外因単患因蛎宜蝟昭粡竚癈鷭т繻Ь因単感因義劃因義嚇因義完因義各蝟昭粡竚癈鷭т繻Ь因義官因害慧因単慣因街涯因単憾因単換因漢恵因完夏蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填控桍鹿粡寂蝟赱齠洲粤讌将穐穐穐唄銭穐鹸適穐唄測鹿粡寂蝟赱齠洲粤讌将全階唄狸穐穐穐全喬幹卯控岡鹿粡寂蝟赱齠洲粤讌将唄潮亀頭唄適穐唄頭全規全巻卦巻鹿粡寂蝟赱齠洲粤讌将全桑恭規穐穐穐全幸全謙欝穐鹿粡寂蝟赱齠洲粤讌将欝卯穐干銭続喬穐穐教謙欝岡鹿粡寂蝟赱齠洲粤讌将穐穐穐欝階郡幸穐穐穐鹿粡寂蝟赱齠洲粤讌将瞳巻穐全銭穐鯵穐飢謙穐控頭鹿粡寂蝟赱齠洲粤讌将全測穐欝巻穐穐欝規穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭緊蝟昭粡竚癈鷭т繻Ь因単偽因義潅因義環因単儀因漢蓋蝟昭粡竚癈鷭т繻Ь因亀議因完感因単妓因換潅因柿妓蝟昭粡竚癈鷭т繻Ь因憾教因憾干因単宜因単義因患環蝟昭粡竚癈鷭т繻Ь因単蟻因甘官因義監因鈎軌因単誼因義軌蝟昭粡竚癈鷭т繻Ь因単議因外涯因単掬因涯鬼因完環因単菊因換彊蝟昭粡竚癈鷭т繻Ь因義輝因蛎寛因干慣因単彊因蛎蟻蝟昭粡竚癈鷭т繻Ь因各碍因単怯因単恐因単恭因義飢蝟昭粡竚癈鷭т繻Ь因漢慶因咳祁因蛎誼因単挟蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填昂桍鹿粡寂蝟赱齠洲粤讌将穐禅規蔚規禅階禅喬迭幸禅巻穐鹿粡寂蝟赱齠洲粤讌将蔚喬蔚桑穐扱測禅桑穐蔚謙桶岡鹿粡寂蝟赱齠洲粤讌将蔚幸穐禅謙穐蔚銭穐蔚測慣銭鹿粡寂蝟赱齠洲粤讌将蔚狸禅銭穐禅幸穐穐穐蔚潮鹿粡寂蝟赱齠洲粤讌将禅測禅狸慣測穐穐況狸崖喬偽狸鹿粡寂蝟赱齠洲粤讌将袖潮蔚卯穐穐諜狸鯵穐穐穐鹿粡寂蝟赱齠洲粤讌将蔚適禅潮蔚頭穐鰻穐鰻卯穐穐鹿粡寂蝟赱齠洲粤讌将穐鰻岡臆岡繕卯穐穐鰻階鰻巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭雇蝟昭粡竚癈鷭т繻Ь因単卦因街碍因義彊因単袈因柿佳因嚇柿蝟昭粡竚癈鷭т繻Ь因単祁因単係因義菊因嚇蛎因単傾因潅完因柿価蝟昭粡竚癈鷭т繻Ь因単形因単径因外儀因完甘因単恵因単慶蝟昭粡竚癈鷭т繻Ь因義橋因単慧因嘆憶因完咳蝟昭粡竚癈鷭т繻Ь因咳慣因嘆臆因嘆桶因嘆牡因嘆乙因劃亀因嘆俺因澗橋蝟昭粡竚癈鷭т繻Ь因柿群因嘆卸因嘆恩因嘆温因嘆価因嚇鈎因嘆佳因完卸蝟昭粡竚癈鷭т繻Ь因嘆加因嘆可因嘆嘉因義教因義恭因義挟因嘆外蝟昭粡竚癈鷭т繻Ь因嘆夏因憧寛因干饗因蟻俺蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填更桍鹿粡寂蝟赱齠洲粤讌将桶卯繕銭揃適抗謙繕謙桶岡桶階穐鹿粡寂蝟赱齠洲粤讌将穐繕幸桶巻導謙桶規穐桶桑繕桑鹿粡寂蝟赱齠洲粤讌将穐桶喬族頭穐穐穐穐桶謙鹿粡寂蝟赱齠洲粤讌将桶幸桶銭穐桶測桶狸繕狸繕測膳穐鹿粡寂蝟赱齠洲粤讌将桶潮桶適膳卯穐繕潮幹階害岡繕適鹿粡寂蝟赱齠洲粤讌将繕頭元規牡穐牡卯牡岡穐攻卯郡銭鹿粡寂蝟赱齠洲粤讌将膳岡穐穐牡巻鯵岡牡規迭潮牡桑鹿粡寂蝟赱齠洲粤讌将牡謙牡幸概岡牡銭牡狸穐牡階牡喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭想蝟昭粡竚癈鷭т繻Ь因嘆澗因涯慣因義軍因義祁因害澗蝟昭粡竚癈鷭т繻Ь因義郡因義袈因嘆環因嘆甘因嘆監因義卦蝟昭粡竚癈鷭т繻Ь因嘆軌因劃饗因嘆輝因干憾因外患蝟昭粡竚癈鷭т繻Ь因義係因嘆飢因嘆騎因嘆鬼因嘆亀因義傾因嘆偽蝟昭粡竚癈鷭т繻Ь因嘆儀因幹価因嘆妓因甘訓蝟昭粡竚癈鷭т繻Ь因蛎干因嘆宜因漢饗蝟昭粡竚癈鷭т繻Ь因嘆義因嘆蟻因澗劃因嘆誼蝟昭粡竚癈鷭т繻Ь因蟻臆因義径因嘆議因義慧因義慶因嘆掬蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填溝桍鹿粡寂蝟赱齠洲粤讌将乙頭膳銭俺穐俺卯族卯穐穐教適鹿粡寂蝟赱齠洲粤讌将俺岡膳狸穐穐俺階穐俺巻俺規鹿粡寂蝟赱齠洲粤讌将穐穐穐穐俺喬穐族階穐鹿粡寂蝟赱齠洲粤讌将穐超狸族巻俺桑調測祁謙穐俺謙鹿粡寂蝟赱齠洲粤讌将族規穐穐穐穐穐族桑穐鹿粡寂蝟赱齠洲粤讌将俺幸族謙穐俺銭俺測穐俺狸穐鹿粡寂蝟赱齠洲粤讌将族幸穐挟銭唄謙抗幸族銭穐族測鹿粡寂蝟赱齠洲粤讌将跳卯蔚岡俺潮桶頭乙謙嘘適嘘潮乙謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭築蝟昭粡竚癈鷭т繻Ь因柿慣因軌群因嘆凝因嘆尭蝟昭粡竚癈鷭т繻Ь因碍凝因環可因漢慧因換慧因嘆薫因蟻加蝟昭粡竚癈鷭т繻Ь因嘆訓因柿軍因幹各因蟻可因監夏蝟昭粡竚癈鷭т繻Ь因嘆群因澗嚇因嘆軍因幹佳因蟻嘉因慨恵蝟昭粡竚癈鷭т繻Ь因嘆郡因嘆卦因蟻夏因蟻外蝟昭粡竚癈鷭т繻Ь因潅義因潅牡因澗袈因澗誼因蛎乙因蟻害蝟昭粡竚癈鷭т繻Ь因鈎饗因嘆袈因澗輝因蟻慨因蟻碍蝟昭粡竚癈鷭т繻Ь因蟻涯因慨傾因概彊因嘆祁因蟻崖蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填皇桍鹿粡寂蝟赱齠洲粤讌将穐続規穐穐穐卸謙続謙卸幸鹿粡寂蝟赱齠洲粤讌将卸銭瞳幸穐穐卸測穐跳測梓幸鹿粡寂蝟赱齠洲粤讌将繕穐桶狸穐探潮卸狸卸潮天階穐鹿粡寂蝟赱齠洲粤讌将穐続測穐穐鬼適卸適続幸臆測鹿粡寂蝟赱齠洲粤讌将続銭天岡探潮続狸続潮超謙害卯穐鹿粡寂蝟赱齠洲粤讌将穐穐卒岡穐害岡抗銭害階卦規鹿粡寂蝟赱齠洲粤讌将続頭偽狸禅適繕岡害巻鬼頭害規郡桑鹿粡寂蝟赱齠洲粤讌将穐穐穐害喬卒卯穐迭適鹸巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺狭奴蝟昭粡竚癈鷭т繻Ь因坦卸因坦恩因蟻慣因憾形蝟昭粡竚癈鷭т繻Ь因蟻嚇因蟻幹因蟻干因坦温因坦価蝟昭粡竚癈鷭т繻Ь因完監因坦佳因坦加因澗仰因坦可因甘騎蝟昭粡竚癈鷭т繻Ь因坦嘉因坦夏因澗況因坦外因害潅因蛎掬蝟昭粡竚癈鷭т繻Ь因監憾因蟻感因各卦因蟻患蝟昭粡竚癈鷭т繻Ь因蟻完因蓋監蝟昭粡竚癈鷭т繻Ь因坦咳因坦害因坦崖因蟻潅因蟻漢因坦慨因害環因蟻憾蝟昭粡竚癈鷭т繻Ь因蟻甘因蟻鬼因坦概因坦涯因坦碍蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填稿桍鹿粡寂蝟赱齠洲粤讌将崖幸牡謙崖銭崖測全卯崖狸袖喬穐鹿粡寂蝟赱齠洲粤讌将崖潮崖適慌岡穐穐穐袖規祁穐鹿粡寂蝟赱齠洲粤讌将続頭干測崖頭扱桑調穐穐穐慨穐鹿粡寂蝟赱齠洲粤讌将患階慨卯腸適穐慨岡袖卯袖穐穐鹿粡寂蝟赱齠洲粤讌将穐慨階袖岡穐卒頭穐慨巻袖桑鹿粡寂蝟赱齠洲粤讌将穐卒潮穐穐卒測穐袖階卒幸鹿粡寂蝟赱齠洲粤讌将慨規涯狸慨喬歎謙担喬膳巻慨桑慨謙鹿粡寂蝟赱齠洲粤讌将穐崖謙穐然銭穐穐其頭慨卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響異蝟昭粡竚癈鷭т繻Ь因憧感因幹甘因感漢因咳換蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因完群因坦漢因完慨因碍価蝟昭粡竚癈鷭т繻Ь因坦澗因坦潅因蟻宜因坦環蝟昭粡竚癈鷭т繻Ь因街蛎因崖恵因坦監蝟昭粡竚癈鷭т繻Ь因坦甘因蟻蟻因崖郡因蟻怯因坦軌因坦輝因坦飢蝟昭粡竚癈鷭т繻Ь因坦騎因坦鬼因蟻掬因坦亀因完軍蝟昭粡竚癈鷭т繻Ь因崖澗因柿加因坦偽因崖漢因柿監因坦儀蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填善桍鹿粡寂蝟赱齠洲粤讌将袖狸袈規郡測偽潮概謙概幸袖銭穐鹿粡寂蝟赱齠洲粤讌将梓喬穐概銭穐概測袖潮袖頭穐鹿粡寂蝟赱齠洲粤讌将挟潮群狸慨幸干狸鬼測概狸穐概潮鹿粡寂蝟赱齠洲粤讌将概適其岡穐概頭膳幸揃卯穐続桑鹿粡寂蝟赱齠洲粤讌将穐穐穐其階穐穐穐抗穐鹿粡寂蝟赱齠洲粤讌将穐穐穐涯穐穐穐涯卯涯岡鹿粡寂蝟赱齠洲粤讌将涯階涯巻涯規穐其頭涯喬桶階其巻鹿粡寂蝟赱齠洲粤讌将穐涯桑涯謙涯幸涯銭穐揃規其規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響菓蝟昭粡竚癈鷭т繻Ь因甘寛因坦饗因蟻驚因坦驚因慣菊因坦仰蝟昭粡竚癈鷭т繻Ь因坦凝因蟻郡因蟻況蝟昭粡竚癈鷭т繻Ь因外慨因蟻狭因坦尭因街鈎蝟昭粡竚癈鷭т繻Ь因坦薫因坦訓因蟻饗因坦群因蟻響因蟻橋蝟昭粡竚癈鷭т繻Ь因蟻訓因坦軍因嚇各因坦郡因坦卦因鬼仰因蓋狂蝟昭粡竚癈鷭т繻Ь因環恵因坦袈因坦祁因蟻狂因坦係因幹郡蝟昭粡竚癈鷭т繻Ь因崖桶因柿可因坦傾因蟻彊因蟻薫因崖怯蝟昭粡竚癈鷭т繻Ь因蟻凝因蟻群因坦形因患凝蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填然桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐慣適碍測坦岡穐鹿粡寂蝟赱齠洲粤讌将碍狸担幸揃桑慣潮碍潮揃適穐碍適鹿粡寂蝟赱齠洲粤讌将寛卯寛岡卒穐寛階嘆卯嘆階寛巻嘆桑鹿粡寂蝟赱齠洲粤讌将揃幸寛規害銭穐寛喬寛桑穐偽頭鹿粡寂蝟赱齠洲粤讌将嘆測揃狸穐嘆謙穐寛謙穐嘆岡鹿粡寂蝟赱齠洲粤讌将寛幸穐寛銭寛測寛狸寛潮導幸嘆狸鹿粡寂蝟赱齠洲粤讌将寛適寛頭鯵階穐穐干穐干卯穐鹿粡寂蝟赱齠洲粤讌将穐嘆銭干潮干岡干階干巻穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響館蝟昭粡竚癈鷭т繻Ь因監軌因蟻袈因誼俺因外妓因担概蝟昭粡竚癈鷭т繻Ь因蟻係因担涯因担碍因潅柿因蟻慶因各臆因幹慣因蟻軍蝟昭粡竚癈鷭т繻Ь因担蓋因担街因誼乙因担柿因担蛎因担鈎蝟昭粡竚癈鷭т繻Ь因各形因誼夏因崖訓因蓋憶蝟昭粡竚癈鷭т繻Ь因誼咳因蟻形因誼外因誼温因蟻径蝟昭粡竚癈鷭т繻Ь因誼可因誼嘉蝟昭粡竚癈鷭т繻Ь因誼各因担劃因担嚇因感甘因担各因誼牡蝟昭粡竚癈鷭т繻Ь因担完因誼蛎因担官因誼劃因幹妓蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填禅桍鹿粡寂蝟赱齠洲粤讌将穐穐幹岡穐穐幹階穐穐鹿粡寂蝟赱齠洲粤讌将穐幹巻調狸穐穐穐幹規穐鹿粡寂蝟赱齠洲粤讌将穐穐穐昂喬坦謙牡銭穐幹喬鹿粡寂蝟赱齠洲粤讌将穐坦適嘘頭幹桑坦規担岡担卯穐鹿粡寂蝟赱齠洲粤讌将橋頭担穐橋銭幹謙幹幸幹銭幹測穐鹿粡寂蝟赱齠洲粤讌将幹狸幹潮担巻坦桑幹適挟謙坦銭諜潮鹿粡寂蝟赱齠洲粤讌将幹頭患穐患卯袈穐坦狸挟測穐坦巻鹿粡寂蝟赱齠洲粤讌将坦喬坦階患岡患階導穐概銭坦幸患巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響緊蝟昭粡竚癈鷭т繻Ь因担亀因誼干因崖概蝟昭粡竚癈鷭т繻Ь因柿況因担偽因咳議蝟昭粡竚癈鷭т繻Ь因誼鬼因担儀因監咳因誼儀因担妓蝟昭粡竚癈鷭т繻Ь因担宜因各柿因誼偽蝟昭粡竚癈鷭т繻Ь因誼亀因担義因担蟻因担誼因誼飢蝟昭粡竚癈鷭т繻Ь因担議因担掬因担菊因誼感因担彊蝟昭粡竚癈鷭т繻Ь因誼恭因誼患因誼妓因担怯蝟昭粡竚癈鷭т繻Ь因担恐因担恭因誼軌因担挟因誼澗因誼憾蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填膳桍鹿粡寂蝟赱齠洲粤讌将穐担幸穐探卯穐感規穐寛岡鹿粡寂蝟赱齠洲粤讌将感喬穐担適抗潮幹謙蔚巻担狸穐鹿粡寂蝟赱齠洲粤讌将担桑感桑穐担銭穐穐感謙感幸鹿粡寂蝟赱齠洲粤讌将調潮其銭穐穐穐担頭探幸穐鹿粡寂蝟赱齠洲粤讌将穐穐感銭穐穐感測穐旦卯鹿粡寂蝟赱齠洲粤讌将探銭穐穐旦桑穐旦規感狸感潮鹿粡寂蝟赱齠洲粤讌将穐感適旦穐感頭穐慣穐穐穐鹿粡寂蝟赱齠洲粤讌将穐探頭穐患穐穐蔚規慣卯探潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響雇蝟昭粡竚癈鷭т繻Ь因担群因担軍因誼蟻因担郡因誼恐蝟昭粡竚癈鷭т繻Ь因誼狂因憾卦因誼凝因担卦蝟昭粡竚癈鷭т繻Ь因担袈因誼狭因誼驚因誼橋因担祁因干郡蝟昭粡竚癈鷭т繻Ь因換蓋因担係因誼誼因担傾因誼挟因嚇完蝟昭粡竚癈鷭т繻Ь因担形因潅監因誼係因誼饗因担径蝟昭粡竚癈鷭т繻Ь因担恵因蓋臆因害桶因崖菊因誼騎蝟昭粡竚癈鷭т繻Ь因担慶因担慧因探憶因嚇官因誼薫因探臆蝟昭粡竚癈鷭т繻Ь因誼祁因鈎傾因崖群因探桶因干嘉因探牡因探乙蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填噌桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐旦潮飢喬飢桑歎岡鹿粡寂蝟赱齠洲粤讌将歎喬飢謙飢幸恭喬穐穐飢銭穐鹿粡寂蝟赱齠洲粤讌将飢測飢狸飢潮穐穐飢適飢頭穐鹿粡寂蝟赱齠洲粤讌将鬼狸歎巻穐騎穐穐穐穐飢卯鹿粡寂蝟赱齠洲粤讌将穐挟測歎階穐騎卯穐歎規騎岡鹿粡寂蝟赱齠洲粤讌将穐穐騎階幹幸穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐騎巻旦頭騎規穐穐穐穐鹿粡寂蝟赱齠洲粤讌将歎卯穐穐穐穐穐騎喬涯穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響想蝟昭粡竚癈鷭т繻Ь因干換因探碍因探蓋因誼恵因探街因探柿蝟昭粡竚癈鷭т繻Ь因探蛎因探鈎因誼形因蓋狭蝟昭粡竚癈鷭т繻Ь因誼傾因探劃因議憶蝟昭粡竚癈鷭т繻Ь因探嚇因蟻妓因探各因探完因探官蝟昭粡竚癈鷭т繻Ь因誼径因誼慶因誼慧因探寛蝟昭粡竚癈鷭т繻Ь因議加因探干因議恩因蟻仰因探幹蝟昭粡竚癈鷭т繻Ь因探患因探感因議卸因探慣蝟昭粡竚癈鷭т繻Ь因議俺因議桶因探憾因探換因探漢蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填疎桍鹿粡寂蝟赱齠洲粤讌将穐旦銭腸規腸巻穐穐鬼測穐鹿粡寂蝟赱齠洲粤讌将鬼潮鬼狸穐穐鬼適穐穐穐鹿粡寂蝟赱齠洲粤讌将鬼頭腸銭穐堂喬亀穐亀卯亀岡穐鹿粡寂蝟赱齠洲粤讌将穐穐腸潮況測亀階亀巻腸幸腸測鹿粡寂蝟赱齠洲粤讌将穐穐幹銭穐亀規穐穐亀喬鹿粡寂蝟赱齠洲粤讌将顕桑穐腸適穐亀桑穐穐穐鹿粡寂蝟赱齠洲粤讌将亀謙亀幸亀銭穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐蝶岡腸頭亀測亀狸穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響築蝟昭粡竚癈鷭т繻Ь因探議因探掬因環軍因議外因探菊因探彊蝟昭粡竚癈鷭т繻Ь因探怯因誼掬因探恐蝟昭粡竚癈鷭т繻Ь因探恭因探挟因議崖因議慨因探教蝟昭粡竚癈鷭т繻Ь因探橋因咳概因探況因議涯蝟昭粡竚癈鷭т繻Ь因碍況因鈎憶因涯亀因探狂因害牡蝟昭粡竚癈鷭т繻Ь因探狭因探響因探饗因探驚蝟昭粡竚癈鷭т繻Ь因環菊因探仰因探凝因議蓋蝟昭粡竚癈鷭т繻Ь因議碍因議柿因概劃因探尭因涯偽因慨嚇因探薫蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填祖桍鹿粡寂蝟赱齠洲粤讌将穐穐穐蝶潮穐穐儀卯蝶狸鹿粡寂蝟赱齠洲粤讌将穐蝶適儀岡穐牡適儀階崖桑穐鹿粡寂蝟赱齠洲粤讌将蝶頭穐儀巻干頭調卯穐儀規穐鹿粡寂蝟赱齠洲粤讌将儀喬調穐穐調岡穐儀桑穐調階鹿粡寂蝟赱齠洲粤讌将儀謙調巻袖頭鯵規漸卯穐昂穐儀幸鹿粡寂蝟赱齠洲粤讌将穐繕岡憧巻儀銭穐穐儀測揃規鹿粡寂蝟赱齠洲粤讌将儀狸穐穐禅穐天岡儀潮穐穐鹿粡寂蝟赱齠洲粤讌将調規調喬穐其穐穐儀適恐卯調桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺響奴蝟昭粡竚癈鷭т繻Ь因議憾因旦臆因議漢因議換因旦桶因澗妓蝟昭粡竚癈鷭т繻Ь因劃掬因鈎驚因蛎幹因議澗蝟昭粡竚癈鷭т繻Ь因議環因各桶因旦牡蝟昭粡竚癈鷭т繻Ь因議潅因旦乙因議甘因旦俺蝟昭粡竚癈鷭т繻Ь因旦卸因旦恩因旦温因議監蝟昭粡竚癈鷭т繻Ь因旦価因旦佳因議軌因議輝因旦加因旦可因旦嘉因議飢蝟昭粡竚癈鷭т繻Ь因旦夏因議鬼因議騎因議亀因害乙因干漢因議偽蝟昭粡竚癈鷭т繻Ь因旦外因旦咳因蛎俺因崖潅因議儀因旦害因旦崖因患寛蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填粗桍鹿粡寂蝟赱齠洲粤讌将幹狸穐穐恭巻恭規飢階諜謙穐鹿粡寂蝟赱齠洲粤讌将穐恭喬穐諜幸恭桑繕狸其謙穐鹿粡寂蝟赱齠洲粤讌将穐穐挟桑諜銭原喬穐恭謙穐鹿粡寂蝟赱齠洲粤讌将厳測穐恭幸探階穐穐穐諜測鹿粡寂蝟赱齠洲粤讌将穐恭銭穐恭測穐穐恭狸恭潮鹿粡寂蝟赱齠洲粤讌将穐穐穐諜潮諜狸穐恭適諜頭鹿粡寂蝟赱齠洲粤讌将穐恭頭穐諜適穐穐穐挟穐鹿粡寂蝟赱齠洲粤讌将穐挟卯穐穐穐穐穐挟岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗異蝟昭粡竚癈鷭т繻Ь因旦干因旦幹因旦患蝟昭粡竚癈鷭т繻Ь因議怯因旦感因旦慣因旦憾因蛎怯蝟昭粡竚癈鷭т繻Ь因旦換因潅咳因旦漢因議恐因議恭因概牡蝟昭粡竚癈鷭т繻Ь因旦澗因議挟因旦潅蝟昭粡竚癈鷭т繻Ь因議橋因議教因旦環因旦甘蝟昭粡竚癈鷭т繻Ь因旦監因旦軌因旦輝蝟昭粡竚癈鷭т繻Ь因旦飢因各教因旦騎因旦鬼因換街蝟昭粡竚癈鷭т繻Ь因咳漢因旦亀因旦偽因憾患因旦儀蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填賊桍鹿粡寂蝟赱齠洲粤讌将慣規調卯偽卯穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐教謙教幸穐教銭鹸喬教測鹿粡寂蝟赱齠洲粤讌将嘆適穐教狸穐教潮超謙穐幹穐鹿粡寂蝟赱齠洲粤讌将穐教適鰻謙教頭橋穐況岡超桑抗適鹿粡寂蝟赱齠洲粤讌将概階穐超幸穐穐穐穐軍喬鹿粡寂蝟赱齠洲粤讌将跳卯穐超銭橋卯穐橋岡穐橋階鹿粡寂蝟赱齠洲粤讌将牡卯穐偽岡跳岡橋巻穐橋規穐鹿粡寂蝟赱齠洲粤讌将橋喬橋桑袈謙橋謙穐飢規跳穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗菓蝟昭粡竚癈鷭т繻Ь因議凝因議饗因環彊因旦狭因旦響因旦饗蝟昭粡竚癈鷭т繻Ь因幹完因旦驚因感宜因議驚蝟昭粡竚癈鷭т繻Ь因議郡因議軍因碍桶因旦仰因旦凝因害可因旦尭蝟昭粡竚癈鷭т繻Ь因旦薫因柿蛎因議仰因議尭因旦訓因旦群蝟昭粡竚癈鷭т繻Ь因澗儀因寛郡蝟昭粡竚癈鷭т繻Ь因澗祁因議恵蝟昭粡竚癈鷭т繻Ь因旦軍因議慶因旦郡因害監因旦卦蝟昭粡竚癈鷭т繻Ь因漢恩因潅慶因掬憶因鈎桶因嚇寛因議係因議慧因咳狂蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填続桍鹿粡寂蝟赱齠洲粤讌将穐恭桑況喬穐跳規跳銭況桑穐鹿粡寂蝟赱齠洲粤讌将穐扱巻祁卯穐原桑況謙穐況幸鹿粡寂蝟赱齠洲粤讌将況銭況測況狸跳桑況潮族卯況適跳幸鹿粡寂蝟赱齠洲粤讌将穐轍巻群卯轍岡群岡跳測穐穐鹿粡寂蝟赱齠洲粤讌将群階族岡郡謙偽階穐飢規穐群巻鹿粡寂蝟赱齠洲粤讌将涯潮群規轍規群喬群桑穐群謙轍階鹿粡寂蝟赱齠洲粤讌将乙幸跳喬群幸唄測群銭穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗館蝟昭粡竚癈鷭т繻Ь因歎佳因歎加蝟昭粡竚癈鷭т繻Ь因歎可因環甘因掬外因歎嘉因歎夏蝟昭粡竚癈鷭т繻Ь因歎外因掬夏因歎咳因完袈蝟昭粡竚癈鷭т繻Ь因掬加因歎害因環驚因感涯因掬俺蝟昭粡竚癈鷭т繻Ь因幹患因歎崖因歎慨蝟昭粡竚癈鷭т繻Ь因歎概因咳潅因街各因掬温因歎碍因歎蓋蝟昭粡竚癈鷭т繻Ь因歎街因劃卸因掬嘉因掬可因掬恩蝟昭粡竚癈鷭т繻Ь因掬佳因歎柿因崖狂因歎蛎因掬価因慣換因歎鈎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填袖桍鹿粡寂蝟赱齠洲粤讌将穐轍適穐穐天巻扱規穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐軍潮鹿粡寂蝟赱齠洲粤讌将穐迭喬迭巻穐拘潮穐軍適軍頭鹿粡寂蝟赱齠洲粤讌将穐郡穐穐迭卯迭階郡卯嘘銭郡岡鹿粡寂蝟赱齠洲粤讌将穐拘穐導岡穐崖潮穐攻岡郡階鹿粡寂蝟赱齠洲粤讌将郡巻穐穐穐超卯穐穐害巻鹿粡寂蝟赱齠洲粤讌将導測迭規穐穐郡規穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗緊蝟昭粡竚癈鷭т繻Ь因歎感因掬柿因歎慣蝟昭粡竚癈鷭т繻Ь因嚇干因環外因掬碍蝟昭粡竚癈鷭т繻Ь因歎憾因歎換因掬害因歎漢因掬蓋因歎澗因歎潅蝟昭粡竚癈鷭т繻Ь因歎環因甘掬因患軍因感寛蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因歎甘因歎監因崖涯蝟昭粡竚癈鷭т繻Ь因咳亀因歎軌因掬嚇因歎輝蝟昭粡竚癈鷭т繻Ь因掬官因歎飢因甘干因歎騎因歎鬼蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填揃桍鹿粡寂蝟赱齠洲粤讌将超巻穐穐穐卦規鉄謙鉄岡迭頭鹿粡寂蝟赱齠洲粤讌将卦喬穐卦桑典巻鉄規穐卦謙卦幸鹿粡寂蝟赱齠洲粤讌将穐調銭鉄桑穐穐鉄狸卦銭穐鹿粡寂蝟赱齠洲粤讌将儀卯鉄銭穐卦測穐卦狸鉄巻卦潮鹿粡寂蝟赱齠洲粤讌将卦適崖謙卦頭穐鉄測袈穐鉄穐穐鹿粡寂蝟赱齠洲粤讌将鉄喬袈卯鉄潮扱狸鉄階穐鉄適袈岡鹿粡寂蝟赱齠洲粤讌将袈階導狸幹狸諜頭袈巻漸規袈規漸適鹿粡寂蝟赱齠洲粤讌将幹測迭測鉄幸騎銭袈喬穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗雇蝟昭粡竚癈鷭т繻Ь因歎況因歎狂因完涯因崖狭蝟昭粡竚癈鷭т繻Ь因柿輝因嚇幹因掬劃因劃寛蝟昭粡竚癈鷭т繻Ь因碍潅因掬鈎蝟昭粡竚癈鷭т繻Ь因掬飢因劃仰因蓋柿因掬怯因歎狭因掬蟻蝟昭粡竚癈鷭т繻Ь因概郡因患監因歎響因掬偽因掬菊因外夏因咳害因歎饗蝟昭粡竚癈鷭т繻Ь因害街因掬妓因寛加因掬監因掬輝因街官蝟昭粡竚癈鷭т繻Ь因歎驚因歎仰蝟昭粡竚癈鷭т繻Ь因掬恐因歎凝因掬議因歎尭因歎薫因掬亀蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填孫桍鹿粡寂蝟赱齠洲粤讌将穐穐穐典狸祁卯祁岡穐穐鹿粡寂蝟赱齠洲粤讌将祁階祁巻嘆測祁規穐典銭典適祁喬鹿粡寂蝟赱齠洲粤讌将穐祁桑祁謙祁幸祁銭穐元穐祁測鹿粡寂蝟赱齠洲粤讌将鉄規穐穐崖幸祁狸祁潮祁適典巻鹿粡寂蝟赱齠洲粤讌将穐穐顕卯顕岡穐穐穐腸頭鹿粡寂蝟赱齠洲粤讌将顕階穐穐典桑穐穐典穐儀岡鹿粡寂蝟赱齠洲粤讌将穐穐典階顕巻穐穐典幸穐鹿粡寂蝟赱齠洲粤讌将穐穐穐顕規穐顕喬撞卯坦適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗想蝟昭粡竚癈鷭т繻Ь因澗慧因掬恭蝟昭粡竚癈鷭т繻Ь因憾嘉因淡卸因掬尭蝟昭粡竚癈鷭т繻Ь因蓋蛎因淡恩因劃彊蝟昭粡竚癈鷭т繻Ь因掬教因淡温因甘夏因街寛因掬群蝟昭粡竚癈鷭т繻Ь因淡価因外凝因掬薫因淡佳蝟昭粡竚癈鷭т繻Ь因掬挟因淡加因淡可因掬響蝟昭粡竚癈鷭т繻Ь因淡嘉因掬驚因淡夏因環監因掬況蝟昭粡竚癈鷭т繻Ь因患嘉因淡外因掬狭因淡咳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填詑桍鹿粡寂蝟赱齠洲粤讌将験岡験階天卯験巻填測担桑穐験規鹿粡寂蝟赱齠洲粤讌将験喬填喬験桑嘆岡天適験謙験幸験銭鹿粡寂蝟赱齠洲粤讌将穐涯銭穐填謙填潮填適穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐俺狸乙銭穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐験測天喬験狸験潮天狸鹿粡寂蝟赱齠洲粤讌将穐穐天銭穐飢幸穐穐堂階鹿粡寂蝟赱齠洲粤讌将天桑験適穐験頭穐鹸穐天謙填穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗築蝟昭粡竚癈鷭т繻Ь因概傾因換柿因淡官因鈎各蝟昭粡竚癈鷭т繻Ь因淡寛因街祁因淡干因淡幹因淡患因監崖蝟昭粡竚癈鷭т繻Ь因掬郡因菊臆因咳狭因官橋因淡感蝟昭粡竚癈鷭т繻Ь因淡慣因淡憾因淡換蝟昭粡竚癈鷭т繻Ь因慣傾因慨官因甘形因淡漢蝟昭粡竚癈鷭т繻Ь因淡澗因淡潅因潅憶因幹飢因淡騎因淡環蝟昭粡竚癈鷭т繻Ь因淡甘因掬径因掬慶因淡監因淡軌蝟昭粡竚癈鷭т繻Ь因官害因淡輝因淡飢因菊憶因掬傾蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填堕桍鹿粡寂蝟赱齠洲粤讌将穐天階穐穐穐幹階穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐元巻鹿粡寂蝟赱齠洲粤讌将穐元規元喬元桑袈幸穐穐元謙鹿粡寂蝟赱齠洲粤讌将堂頭元幸元銭堂銭扱謙元測元狸涯階鹿粡寂蝟赱齠洲粤讌将穐元潮元適穐超卯穐導階穐鹿粡寂蝟赱齠洲粤讌将元頭穐穐穐原穐堂狸寛狸堂幸鹿粡寂蝟赱齠洲粤讌将患幸穐穐穐憧狸穐穐穐鹿粡寂蝟赱齠洲粤讌将堂喬穐堂規穐堂適原卯原岡穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺饗奴蝟昭粡竚癈鷭т繻Ь因菊恩因菊卸因菊可因淡恭因完憶因菊牡因淡挟蝟昭粡竚癈鷭т繻Ь因淡教因淡橋因淡況因淡狂因菊外蝟昭粡竚癈鷭т繻Ь因淡狭因菊咳因淡響因淡饗因淡驚因淡仰因慨寛蝟昭粡竚癈鷭т繻Ь因淡凝因淡尭蝟昭粡竚癈鷭т繻Ь因淡薫因菊涯因菊概因菊碍因淡訓因淡群因淡軍蝟昭粡竚癈鷭т繻Ь因淡郡因菊柿因淡卦因淡袈蝟昭粡竚癈鷭т繻Ь因淡祁因患干因菊慨因淡係因淡傾蝟昭粡竚癈鷭т繻Ь因菊蓋因淡形蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰填惰桍鹿粡寂蝟赱齠洲粤讌将袈階卸幸導岡軍測穐厳測導幸厳狸鹿粡寂蝟赱齠洲粤讌将厳潮穐厳適穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐導適導狸穐穐鹿粡寂蝟赱齠洲粤讌将導頭穐慌卯憧岡穐穐慌岡導測鹿粡寂蝟赱齠洲粤讌将攻銭群謙穐穐迭幸穐穐穐鹿粡寂蝟赱齠洲粤讌将慌階慌巻穐跳巻導潮穐憧卯卸規鹿粡寂蝟赱齠洲粤讌将慌規憧穐穐堂測穐慌喬洞幸穐鹿粡寂蝟赱齠洲粤讌将穐慌桑憧規穐慌謙慌幸憧幸穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係異蝟昭粡竚癈鷭т繻Ь因湛価因菊慣因湛佳因湛加因湛可蝟昭粡竚癈鷭т繻Ь因菊干因菊幹因湛嘉因菊憾蝟昭粡竚癈鷭т繻Ь因菊感因換甘因湛夏蝟昭粡竚癈鷭т繻Ь因菊甘因菊澗因菊漢因菊環因感鬼因菊監蝟昭粡竚癈鷭т繻Ь因湛外因湛咳因干卦因寛仰蝟昭粡竚癈鷭т繻Ь因憧環因完乙因湛害蝟昭粡竚癈鷭т繻Ь因菊軌因菊飢因湛崖因湛慨蝟昭粡竚癈鷭т繻Ь因湛概因湛涯因菊輝蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天険桍鹿粡寂蝟赱齠洲粤讌将穐穐穐抗桑抗謙穐穐穐鹿粡寂蝟赱齠洲粤讌将抗幸抗銭抗測抗狸天規穐拘卯穐鹿粡寂蝟赱齠洲粤讌将穐撞階穐穐抗潮抗適穐穐鹿粡寂蝟赱齠洲粤讌将橋桑穐穐穐穐抗頭拘穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐撞巻拘岡拘階穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐乙穐拘巻穐拘規儀巻鹿粡寂蝟赱齠洲粤讌将害規穐穐穐穐拘喬拘桑穐鹿粡寂蝟赱齠洲粤讌将偽巻穐穐穐探適禅岡拘謙穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係菓蝟昭粡竚癈鷭т繻Ь因湛換因湛漢因湛澗蝟昭粡竚癈鷭т繻Ь因監卸因各橋因咳響蝟昭粡竚癈鷭т繻Ь因菊偽因湛潅因湛環因湛甘因湛監蝟昭粡竚癈鷭т繻Ь因湛軌因菊亀因湛輝蝟昭粡竚癈鷭т繻Ь因湛飢蝟昭粡竚癈鷭т繻Ь因湛騎因菊宜因干柿因菊誼因菊儀蝟昭粡竚癈鷭т繻Ь因湛鬼因湛亀因菊蟻因湛偽因湛儀蝟昭粡竚癈鷭т繻Ь因菊義因患完因外宜因憧嘉蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天験桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将天規穐控謙撞適穐穐穐渦謙鹿粡寂蝟赱齠洲粤讌将穐控幸穐控銭控測控狸控潮穐鹿粡寂蝟赱齠洲粤讌将控適洞穐穐穐控頭撞頭穐撞潮鹿粡寂蝟赱齠洲粤讌将穐穐穐穐攻穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐撞謙穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐族階攻卯穐穐洞岡穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係館蝟昭粡竚癈鷭т繻Ь因湛恐因湛恭因湛挟因湛教因湛橋蝟昭粡竚癈鷭т繻Ь因菊怯因湛況因湛狂因湛狭蝟昭粡竚癈鷭т繻Ь因咳饗蝟昭粡竚癈鷭т繻Ь因菊挟因漢害因菊恭因湛響蝟昭粡竚癈鷭т繻Ь因湛饗因潅概因嚇慣蝟昭粡竚癈鷭т繻Ь因湛驚因湛仰因湛凝蝟昭粡竚癈鷭т繻Ь因湛尭因湛薫因官崖蝟昭粡竚癈鷭т繻Ь因湛訓因嚇感蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天元桍鹿粡寂蝟赱齠洲粤讌将穐昂岡穐穐穐昂階昂巻昂規鹿粡寂蝟赱齠洲粤讌将穐天測昂喬昂桑洞銭穐扱幸穐鹿粡寂蝟赱齠洲粤讌将昂謙穐昂幸穐穐洞喬洞測昂銭鹿粡寂蝟赱齠洲粤讌将穐蔚狸昂測穐昂狸穐昂潮穐鹿粡寂蝟赱齠洲粤讌将昂適穐洞幸穐袈卯洞規洞謙鉄謙鹿粡寂蝟赱齠洲粤讌将漸卯元卯穐穐洞狸穐探卯穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐漸岡穐穐穐扱銭穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係緊蝟昭粡竚癈鷭т繻Ь因蛋桶因菊尭因蛋牡因蛋乙蝟昭粡竚癈鷭т繻Ь因菊況因碍卸因蛋俺因菊仰蝟昭粡竚癈鷭т繻Ь因蛋卸因環軌因菊薫蝟昭粡竚癈鷭т繻Ь因郡俺因蛋恩因蛋温因劃監蝟昭粡竚癈鷭т繻Ь因蛋価因蛋佳蝟昭粡竚癈鷭т繻Ь因菊訓因菊群因蛋加蝟昭粡竚癈鷭т繻Ь因蛋可因慣嘉因蛋嘉因蛋夏蝟昭粡竚癈鷭т繻Ь因菊郡因蛋外因菊卦因蛋咳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天厳桍鹿粡寂蝟赱齠洲粤讌将然岡然階穐軍階然巻穐穐穐鹿粡寂蝟赱齠洲粤讌将儀規瞳桑穐然規然喬穐瞳幸穐鹿粡寂蝟赱齠洲粤讌将典規穐瞳喬然桑瞳謙蔚潮然謙瞳階鹿粡寂蝟赱齠洲粤讌将穐然幸然銭穐然測穐穐概測鹿粡寂蝟赱齠洲粤讌将瞳銭穐穐穐穐蔚桑続謙瞳狸鹿粡寂蝟赱齠洲粤讌将穐穐穐穐瞳測堂巻乙幸穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐瞳潮穐穐鹿粡寂蝟赱齠洲粤讌将然狸芦卯穐洞適瞳適穐然潮芦岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係雇蝟昭粡竚癈鷭т繻Ь因蛋嚇因慣形因蛋各蝟昭粡竚癈鷭т繻Ь因蛋完因蛋官因彊桶蝟昭粡竚癈鷭т繻Ь因彊牡因蛋寛因蛋干蝟昭粡竚癈鷭т繻Ь因蛋幹因彊乙因蛋患因蛋感蝟昭粡竚癈鷭т繻Ь因蛋慣蝟昭粡竚癈鷭т繻Ь因彊俺因幹掬因蛋憾因彊恩因彊卸因蛋換蝟昭粡竚癈鷭т繻Ь因彊温因彊価因蛋漢因鈎菊因換恭蝟昭粡竚癈鷭т繻Ь因蛋澗因蛋潅因潅驚因彊佳因彊加因官偽因鈎牡因彊可蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天弦桍鹿粡寂蝟赱齠洲粤讌将芦適全潮全適全頭穐禅穐芦頭禅岡鹿粡寂蝟赱齠洲粤讌将鹸桑穐穐鯵穐卦桑穐禅卯禅岡鹿粡寂蝟赱齠洲粤讌将禅階穐寛潮禅巻穐禅規禅喬穐鹿粡寂蝟赱齠洲粤讌将鯵卯俺桑禅桑偽潮禅謙担喬禅幸坦喬鹿粡寂蝟赱齠洲粤讌将禅銭桶巻導巻禅測穐穐穐袖岡鹿粡寂蝟赱齠洲粤讌将禅狸漸銭穐禅潮穐穐禅適禅頭鹿粡寂蝟赱齠洲粤讌将穐繕穐鯵桑穐鯵岡穐穐繕卯鹿粡寂蝟赱齠洲粤讌将繕岡挟階穐繕階繕巻顕階鯵階繕規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係想蝟昭粡竚癈鷭т繻Ь因柿鬼因彊概因彊慨因蛋橋因彊涯蝟昭粡竚癈鷭т繻Ь因蛋況因蛋狂因蛋狭蝟昭粡竚癈鷭т繻Ь因彊碍因蛋響因彊蓋蝟昭粡竚癈鷭т繻Ь因蛋饗蝟昭粡竚癈鷭т繻Ь因概嚇因彊街因彊柿蝟昭粡竚癈鷭т繻Ь因蛋驚因蓋牡因蛋仰因蛋凝因憾憾蝟昭粡竚癈鷭т繻Ь因蛋尭因彊鈎因蛋薫因嚇卦蝟昭粡竚癈鷭т繻Ь因彊蛎因蛋訓蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天限桍鹿粡寂蝟赱齠洲粤讌将穐膳岡恭謙鯵潮鯵頭穐鯵適膳階鹿粡寂蝟赱齠洲粤讌将穐膳巻穐穐膳規穐梓穐穐鹿粡寂蝟赱齠洲粤讌将元卯穐梓卯穐穐膳喬膳桑橋幸鹿粡寂蝟赱齠洲粤讌将膳謙唄穐穐昂潮穐穐穐膳幸鹿粡寂蝟赱齠洲粤讌将梓階梓巻梓岡穐穐膳銭穐穐鹿粡寂蝟赱齠洲粤讌将穐旦潮穐穐挟謙恭幸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐膳測膳狸穐穐梓喬鹿粡寂蝟赱齠洲粤讌将害狸梓規膳潮膳適導規袈岡族卯穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係築蝟昭粡竚癈鷭т繻Ь因誕臆因誕桶因誕牡因誕乙蝟昭粡竚癈鷭т繻Ь因彊換因誕俺因誕卸蝟昭粡竚癈鷭т繻Ь因誕恩因誕温因彊澗因彊憾蝟昭粡竚癈鷭т繻Ь因誕価因誕佳因潅鬼因彊漢因彊潅因誕加因甘幹蝟昭粡竚癈鷭т繻Ь因誕可因誕嘉因彊軌因誕夏蝟昭粡竚癈鷭т繻Ь因誕外因彊監因干袈因慣可因誕咳因蓋乙因彊甘蝟昭粡竚癈鷭т繻Ь因誕害因誕崖因彊環因誕慨因環咳因環害蝟昭粡竚癈鷭т繻Ь因誕概因誕涯因誕碍因彊輝因咳凝蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天個桍鹿粡寂蝟赱齠洲粤讌将穐穐穐続謙昂喬其岡穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐続幸圧岡圧階鹿粡寂蝟赱齠洲粤讌将続銭穐続測穐穐穐続狸圧規鹿粡寂蝟赱齠洲粤讌将続潮穐穐穐穐続適続頭卒穐鹿粡寂蝟赱齠洲粤讌将卒卯穐穐調階穐穐卒岡卒階鹿粡寂蝟赱齠洲粤讌将圧桑卒巻圧喬卒規卒喬穐卒桑卒謙鹿粡寂蝟赱齠洲粤讌将圧謙卒幸慨潮穐穐圧銭穐卒銭鹿粡寂蝟赱齠洲粤讌将圧幸卒測圧狸圧測卒狸穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺係奴蝟昭粡竚癈鷭т繻Ь因誕環因誕甘因誕監因蓋鈎因誕軌因誕輝因甘恩蝟昭粡竚癈鷭т繻Ь因涯潅因害俺因誕飢蝟昭粡竚癈鷭т繻Ь因誕騎因誕鬼因誕亀因涯響因誕偽蝟昭粡竚癈鷭т繻Ь因誕儀因誕妓因誕宜因誕義蝟昭粡竚癈鷭т繻Ь因誕蟻因誕誼因誕議因誕掬蝟昭粡竚癈鷭т繻Ь因慨怯因誕菊因誕彊因誕怯蝟昭粡竚癈鷭т繻Ь因甘狂因彊掬因誕恐因誕恭蝟昭粡竚癈鷭т繻Ь因誕挟因彊彊因誕教因誕橋因誕況蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天呼桍鹿粡寂蝟赱齠洲粤讌将斡卯穐乙卯穐穐其謙其幸穐鹿粡寂蝟赱齠洲粤讌将圧潮其銭続幸其測其狸幹卯圧頭其潮鹿粡寂蝟赱齠洲粤讌将穐穐其適其頭穐穐揃穐穐鹿粡寂蝟赱齠洲粤讌将穐揃卯穐穐穐揃岡斡巻穐鹿粡寂蝟赱齠洲粤讌将旦適揃階穐揃巻穐斡岡揃規揃喬鹿粡寂蝟赱齠洲粤讌将穐揃桑軍適穐穐鹸幸斡階穐鹿粡寂蝟赱齠洲粤讌将穐扱適穐穐揃謙揃幸穐揃銭鹿粡寂蝟赱齠洲粤讌将斡幸揃測揃狸揃潮穐揃適験潮嘆卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾異蝟昭粡竚癈鷭т繻Ь因鍛臆因鍛桶因概教因鍛牡因彊橋因環慶因鍛乙蝟昭粡竚癈鷭т繻Ь因甘外因鍛俺蝟昭粡竚癈鷭т繻Ь因鍛卸蝟昭粡竚癈鷭т繻Ь因鍛恩因鍛温蝟昭粡竚癈鷭т繻Ь因寛袈因鍛価因彊狂因鍛佳蝟昭粡竚癈鷭т繻Ь因鍛加因鍛可因鍛嘉因鍛夏因鍛外因鍛咳因鍛害因鍛崖蝟昭粡竚癈鷭т繻Ь因鍛慨因鍛概因彊響因甘偽因涯儀因憾恵因慣漢蝟昭粡竚癈鷭т繻Ь因鍛涯因彊饗因彊仰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天恒桍鹿粡寂蝟赱齠洲粤讌将坦桑扱穐穐坦謙坦幸穐坦銭坦測鹿粡寂蝟赱齠洲粤讌将穐穐穐坦狸穐坦潮穐穐鹿粡寂蝟赱齠洲粤讌将穐坦適坦頭穐穐斡狸穐担穐鹿粡寂蝟赱齠洲粤讌将穐斡頭原銭唄潮扱卯担卯瞳穐斡適鹿粡寂蝟赱齠洲粤讌将典狸穐担岡扱巻寛巻穐担階担巻鹿粡寂蝟赱齠洲粤讌将担規扱岡扱規担喬穐担桑担謙斡桑鹿粡寂蝟赱齠洲粤讌将扱階担幸担銭然狸穐穐扱喬穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐扱桑穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾菓蝟昭粡竚癈鷭т繻Ь因鍛澗因鍛潅因環慧因鍛環因鍛甘因鍛監蝟昭粡竚癈鷭т繻Ь因鍛軌因彊係因鍛輝蝟昭粡竚癈鷭т繻Ь因鍛飢因鍛騎因鍛鬼蝟昭粡竚癈鷭т繻Ь因鍛亀因鍛偽因鍛儀因鍛妓因彊傾因鍛宜蝟昭粡竚癈鷭т繻Ь因鍛義因鍛蟻因彊教因鍛誼因鍛議因彊形蝟昭粡竚癈鷭т繻Ь因鍛掬因鍛菊因鍛彊因鍛怯因鍛恐因鍛恭蝟昭粡竚癈鷭т繻Ь因慨幹因鍛挟因鍛教因鍛橋蝟昭粡竚癈鷭т繻Ь因鍛況因鍛狂因鈎乙因鍛狭蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天抗桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将旦銭旦測扱測穐旦狸穐穐扱狸鹿粡寂蝟赱齠洲粤讌将旦潮穐穐旦適扱潮穐穐穐鹿粡寂蝟赱齠洲粤讌将旦頭穐歎穐歎卯嘘測穐歎岡歎階鹿粡寂蝟赱齠洲粤讌将渦卯穐抗測渦岡歎巻穐寛巻渦階鹿粡寂蝟赱齠洲粤讌将歎規渦巻歎喬歎桑穐穐渦規歎謙鹿粡寂蝟赱齠洲粤讌将渦桑渦謙渦喬穐歎幸穐控階渦銭鹿粡寂蝟赱齠洲粤讌将渦幸穐歎銭歎測歎狸穐穐歎潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾館蝟昭粡竚癈鷭т繻Ь因憧軌因怯加因怯佳因怯可因鍛慧蝟昭粡竚癈鷭т繻Ь因怯嘉因怯外因怯夏蝟昭粡竚癈鷭т繻Ь因街傾因団憶因怯害因怯咳因団臆因団桶蝟昭粡竚癈鷭т繻Ь因慨患因各騎因患鈎因怯崖因完蓋蝟昭粡竚癈鷭т繻Ь因団牡因団乙因蛎柿因団俺因咳傾因怯慨因団卸蝟昭粡竚癈鷭т繻Ь因環輝因団恩因団温因漢恭因怯概因団価蝟昭粡竚癈鷭т繻Ь因患幹因環崖因街干因各劃因団佳因干澗蝟昭粡竚癈鷭т繻Ь因飢慨因団加因幹嘉因害狂因怯涯因団可因団嘉因団夏蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天控桍鹿粡寂蝟赱齠洲粤讌将蝶穐穐穐蝶卯嘘桑穐嘘狸蝶岡鹿粡寂蝟赱齠洲粤讌将蝶階嘘銭嘘幸全岡害喬嘘謙蝶巻圧銭鹿粡寂蝟赱齠洲粤讌将蝶規顕銭蝶喬穐鹸銭穐穐蝶桑鹿粡寂蝟赱齠洲粤讌将穐迭卯嘘潮嘘測概狸芦喬蝶謙蝶幸鹿粡寂蝟赱齠洲粤讌将顕測蝶銭慌潮穐嘘頭轍狸郡潮唄穐鹿粡寂蝟赱齠洲粤讌将穐嘘適元喬唄卯穐唄岡穐蝶測鹿粡寂蝟赱齠洲粤讌将圧測蝶狸穐天喬唄桑穐唄巻橋潮鹿粡寂蝟赱齠洲粤讌将唄階蝶潮蝶適蝶頭調穐調卯調岡飢喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾緊蝟昭粡竚癈鷭т繻Ь因団干因怯漢因団幹因怯患因怯感蝟昭粡竚癈鷭т繻Ь因怯換因怯憾因換乙因官寛因官官蝟昭粡竚癈鷭т繻Ь因団患因概各因団感因団慣因怯澗因団憾蝟昭粡竚癈鷭т繻Ь因団換因怯潅因団漢因怯環蝟昭粡竚癈鷭т繻Ь因団澗因怯監因団潅因怯甘蝟昭粡竚癈鷭т繻Ь因咳偽蝟昭粡竚癈鷭т繻Ь因怯儀因憾狂因怯輝因団環因怯騎蝟昭粡竚癈鷭т繻Ь因怯亀因各嚇因団甘因怯偽因怯鬼因鈎完因団監蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天昂桍鹿粡寂蝟赱齠洲粤讌将諜穐諜卯欝穐欝岡諜岡拘岡諜階鉄幸鹿粡寂蝟赱齠洲粤讌将穐穐欝幸穐諜巻欝謙諜規諜喬鹿粡寂蝟赱齠洲粤讌将穐穐欝銭穐嘆喬漸頭穐諜桑鹿粡寂蝟赱齠洲粤讌将儀桑欝測穐幹測諜謙穐欝潮諜幸鹿粡寂蝟赱齠洲粤讌将諜銭諜測轍卯欝狸諜狸穐穐諜潮鹿粡寂蝟赱齠洲粤讌将穐蔚幸穐穐諜適穐諜頭超穐鹿粡寂蝟赱齠洲粤讌将蔚岡超卯蔚巻蔚規概巻穐穐穐鹿粡寂蝟赱齠洲粤讌将穐超岡蔚階穐蔚穐穐欝適欝頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾雇蝟昭粡竚癈鷭т繻Ь因団恭因怯怯因団挟因団教因団橋因団況蝟昭粡竚癈鷭т繻Ь因団狂因怯狂因団狭因怯橋因団響因怯況因団饗蝟昭粡竚癈鷭т繻Ь因団驚因団仰因団凝因団尭蝟昭粡竚癈鷭т繻Ь因団薫因団訓因団群因団軍因団郡因怯狭蝟昭粡竚癈鷭т繻Ь因怯饗因怯驚因怯仰因団卦因怯凝因団袈因団祁因怯響蝟昭粡竚癈鷭т繻Ь因団係因団傾蝟昭粡竚癈鷭т繻Ь因怯薫因団形因団径因怯尭因団恵蝟昭粡竚癈鷭т繻Ь因団慶因団慧因壇憶因怯訓因壇臆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天更桍鹿粡寂蝟赱齠洲粤讌将轍巻轍規鉄規轍喬轍桑轍謙鰻巻鰻岡鹿粡寂蝟赱齠洲粤讌将鰻階轍幸轍階轍銭感岡穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐歎適穐穐轍測全銭穐鹿粡寂蝟赱齠洲粤讌将鰻喬轍狸穐穐鰻規穐穐轍潮鹿粡寂蝟赱齠洲粤讌将穐鰻桑鰻謙穐轍適轍頭穐鰻狸鹿粡寂蝟赱齠洲粤讌将鰻幸鰻銭鰻測穐鰻潮迭穐迭卯迭岡鹿粡寂蝟赱齠洲粤讌将鰻適迭階臆卯穐迭巻穐臆岡穐鹿粡寂蝟赱齠洲粤讌将臆階穐顕頭亀穐臆巻祁岡抗巻穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾想蝟昭粡竚癈鷭т繻Ь因恐乙因壇概因憧輝因恐俺因患価因壇涯因崖卸因街幹蝟昭粡竚癈鷭т繻Ь因恐卸因恐恩因壇碍因壇蓋因恐温蝟昭粡竚癈鷭т繻Ь因蛎温因恐佳因壇街因恐価蝟昭粡竚癈鷭т繻Ь因恐加因恐可因壇柿因壇蛎因壇鈎因憧飢因壇劃蝟昭粡竚癈鷭т繻Ь因壇嚇因壇各因壇完因壇官因壇寛因壇干因壇幹蝟昭粡竚癈鷭т繻Ь因壇患因壇感因壇慣因憾狭蝟昭粡竚癈鷭т繻Ь因恐嘉因恐夏因軍狭蝟昭粡竚癈鷭т繻Ь因恐外因恐咳因恐害因壇憾因蛎嘉蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天溝桍鹿粡寂蝟赱齠洲粤讌将穐鉄幸桶階卦喬穐鉄銭袖頭穐鹿粡寂蝟赱齠洲粤讌将唄適鉄測欝桑鉄狸鉄潮桶巻鉄適穐鹿粡寂蝟赱齠洲粤讌将穐穐桶喬穐鉄頭穐桶規儀穐鹿粡寂蝟赱齠洲粤讌将穐典穐穐鯵幸蝶幸穐桶桑担卯鹿粡寂蝟赱齠洲粤讌将典卯桶謙穐幹喬元桑桶幸典岡桶銭鹿粡寂蝟赱齠洲粤讌将典階穐桶測穐典巻穐探狸穐鹿粡寂蝟赱齠洲粤讌将典規典喬探規穐干適穐典桑穐鹿粡寂蝟赱齠洲粤讌将蔚銭典謙穐桶潮典幸穐超岡穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾築蝟昭粡竚癈鷭т繻Ь因壇義因嚇漢因恐完因壇蟻因恐各蝟昭粡竚癈鷭т繻Ь因恐嚇因憾慶因壇誼因慨慣因蓋温因壇議蝟昭粡竚癈鷭т繻Ь因壇掬因壇菊因壇彊因壇怯蝟昭粡竚癈鷭т繻Ь因壇恐因壇恭因恐感因壇挟因恐干因各各蝟昭粡竚癈鷭т繻Ь因潅害因壇教因恐寛因恐幹因恐患蝟昭粡竚癈鷭т繻Ь因壇橋因恐官因壇況因壇狂因壇狭蝟昭粡竚癈鷭т繻Ь因壇響因壇饗因壇驚因恐慣蝟昭粡竚癈鷭т繻Ь因恐憾因壇仰因幹夏因慨恭因壇凝因壇尭蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天皇桍鹿粡寂蝟赱齠洲粤讌将涯規穐天穐穐穐天卯天岡牡幸鹿粡寂蝟赱齠洲粤讌将穐穐天階穐穐天巻天規天喬鹿粡寂蝟赱齠洲粤讌将穐穐天桑穐穐穐天謙天幸鹿粡寂蝟赱齠洲粤讌将穐穐牡銭牡潮天銭穐天測天狸鹿粡寂蝟赱齠洲粤讌将天潮洞桑天適挟巻堂卯牡適袖階堂岡鹿粡寂蝟赱齠洲粤讌将牡測穐堂階牡狸堂巻穐穐穐鹿粡寂蝟赱齠洲粤讌将堂規穐堂喬堂桑堂謙穐穐穐鹿粡寂蝟赱齠洲粤讌将穐乙卯堂幸穐穐堂銭乙穐牡頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺傾奴蝟昭粡竚癈鷭т繻Ь因弾佳因弾加蝟昭粡竚癈鷭т繻Ь因恐騎因弾可因弾嘉因恐飢蝟昭粡竚癈鷭т繻Ь因恐鬼因弾夏因弾外因弾咳蝟昭粡竚癈鷭т繻Ь因弾害因恐偽因弾崖蝟昭粡竚癈鷭т繻Ь因恐亀因弾慨因漢環因弾概蝟昭粡竚癈鷭т繻Ь因弾涯因劃偽因甘感因弾碍因弾蓋蝟昭粡竚癈鷭т繻Ь因恐儀因弾街因感碍因弾柿因恐妓蝟昭粡竚癈鷭т繻Ь因恐宜因恐議因恐蟻因恐誼因弾蛎因恐義蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天稿桍鹿粡寂蝟赱齠洲粤讌将穐穐穐導狸穐穐穐乙適鹿粡寂蝟赱齠洲粤讌将穐導潮穐穐穐乙頭穐穐鹿粡寂蝟赱齠洲粤讌将穐導適導頭穐穐憧穐穐俺穐鹿粡寂蝟赱齠洲粤讌将穐憧卯俺卯坦桑俺岡穐憧岡憧階鹿粡寂蝟赱齠洲粤讌将憧巻穐歎穐俺階憧規慨適憧喬袈銭鹿粡寂蝟赱齠洲粤讌将穐橋測憧桑穐憧謙崖測俺巻恭銭鹿粡寂蝟赱齠洲粤讌将憧幸憧銭穐圧穐憧測穐穐穐鹿粡寂蝟赱齠洲粤讌将憧狸穐穐憧潮俺規穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形異蝟昭粡竚癈鷭т繻Ь因柿劃因弾甘因弾監蝟昭粡竚癈鷭т繻Ь因弾軌因恐橋因弾輝因弾飢蝟昭粡竚癈鷭т繻Ь因弾騎因恐況因蓋俺因柿亀蝟昭粡竚癈鷭т繻Ь因弾鬼蝟昭粡竚癈鷭т繻Ь因恐狭因弾亀因弾偽因弾儀因患偽因柿偽因概甘蝟昭粡竚癈鷭т繻Ь因弾妓因弾宜蝟昭粡竚癈鷭т繻Ь因弾義因澗牡因慣澗因弾蟻因弾誼蝟昭粡竚癈鷭т繻Ь因患儀因街誼蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天善桍鹿粡寂蝟赱齠洲粤讌将穐穐穐撞潮撞適俺測穐撞頭鹿粡寂蝟赱齠洲粤讌将洞穐穐穐穐洞卯穐洞岡穐鹿粡寂蝟赱齠洲粤讌将穐穐洞階穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐洞巻鉄測洞規穐鹿粡寂蝟赱齠洲粤讌将洞喬洞桑穐洞謙洞幸穐穐穐鹿粡寂蝟赱齠洲粤讌将洞銭穐洞測迭岡拘規穐洞狸顕桑鹿粡寂蝟赱齠洲粤讌将穐穐顕階穐俺潮穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐洞潮穐俺頭穐洞適穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形菓蝟昭粡竚癈鷭т繻Ь因蓋饗因恐凝因幹袈蝟昭粡竚癈鷭т繻Ь因弾尭因恐訓因崖碍因恐驚因弾薫蝟昭粡竚癈鷭т繻Ь因憾響因咳外因弾訓因柿驚因監飢蝟昭粡竚癈鷭т繻Ь因弾群因恐薫因弾郡因弾卦因弾袈蝟昭粡竚癈鷭т繻Ь因弾軍因恐群因弾祁因漢澗蝟昭粡竚癈鷭т繻Ь因弾係因完宜因恐郡因弾傾因弾形因恐卦蝟昭粡竚癈鷭т繻Ь因弾径因弾恵因弾慶因弾慧因恐軍蝟昭粡竚癈鷭т繻Ь因崖甘因聴憶因恐径因聴臆因恐形因聴桶蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天然桍鹿粡寂蝟赱齠洲粤讌将穐嘆桑穐穐穐卸狸卸桑芦巻鹿粡寂蝟赱齠洲粤讌将芦規芦喬卸潮卸謙芦桑穐芦謙穐鹿粡寂蝟赱齠洲粤讌将元謙卸喬芦幸芦銭卸幸芦測芦狸穐鹿粡寂蝟赱齠洲粤讌将穐穐害岡芦適穐穐穐芦頭鹿粡寂蝟赱齠洲粤讌将鯵穐鯵卯穐穐芦潮穐鯵岡害卯鹿粡寂蝟赱齠洲粤讌将其卯穐鯵階穐卸適穐穐斡測鹿粡寂蝟赱齠洲粤讌将穐穐鯵巻鯵規害巻穐鯵桑鯵謙鹿粡寂蝟赱齠洲粤讌将穐穐鯵幸鯵銭穐害階穐鯵測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形館蝟昭粡竚癈鷭т繻Ь因聴涯因嚇潅因聴鈎因恭乙蝟昭粡竚癈鷭т繻Ь因聴劃因官干蝟昭粡竚癈鷭т繻Ь因聴嚇因恭卸因恭俺蝟昭粡竚癈鷭т繻Ь因恭恩因聴各因聴完因聴官因聴寛蝟昭粡竚癈鷭т繻Ь因聴干因聴幹因恐狂因聴患蝟昭粡竚癈鷭т繻Ь因聴感因恐響因恭価因恭温因聴慣蝟昭粡竚癈鷭т繻Ь因憧鬼因聴憾因聴換因聴漢蝟昭粡竚癈鷭т繻Ь因鈎恩因聴澗因甘狭因聴潅因鈎飢因聴環蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天禅桍鹿粡寂蝟赱齠洲粤讌将害測軍桑穐穐梓適梓頭圧穐鬼穐鹿粡寂蝟赱齠洲粤讌将飢桑其階圧卯圧岡穐穐穐圧階鹿粡寂蝟赱齠洲粤讌将蝶巻圧巻穐崖卯圧規崖穐唄巻害潮鹿粡寂蝟赱齠洲粤讌将圧喬穐害頭圧桑圧謙調測憧穐害適鹿粡寂蝟赱齠洲粤讌将害狸穐群銭穐穐鉄潮穐圧幸鹿粡寂蝟赱齠洲粤讌将抗狸圧銭穐圧測穐禅桑穐穐鹿粡寂蝟赱齠洲粤讌将穐穐圧狸穐穐穐穐儀謙鹿粡寂蝟赱齠洲粤讌将穐圧潮崖岡圧適圧頭穐斡穐崖階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形緊蝟昭粡竚癈鷭т繻Ь因恭換因涯妓因監劃因官概蝟昭粡竚癈鷭т繻Ь因恭慨因聴怯因聴恐因害飢因幹祁因漢憶蝟昭粡竚癈鷭т繻Ь因聴恭因聴挟因聴教因聴橋因聴況蝟昭粡竚癈鷭т繻Ь因聴狂因聴狭因聴響因恭概蝟昭粡竚癈鷭т繻Ь因聴饗因概形因恭涯蝟昭粡竚癈鷭т繻Ь因聴驚因聴仰因恭蓋因聴凝因恭街因聴尭蝟昭粡竚癈鷭т繻Ь因慣温因聴薫因恭柿因聴訓蝟昭粡竚癈鷭т繻Ь因聴群因恭蛎因恭鈎因聴軍因涯宜因害騎因感患蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天膳桍鹿粡寂蝟赱齠洲粤讌将腸謙其巻扱巻穐扱規穐穐扱喬鹿粡寂蝟赱齠洲粤讌将扱桑崖潮扱謙腸幸穐穐穐扱幸鹿粡寂蝟赱齠洲粤讌将穐牡銭拘階穐扱銭崖適扱測穐鹿粡寂蝟赱齠洲粤讌将原測穐扱狸穐穐扱潮扱適唄規鹿粡寂蝟赱齠洲粤讌将渦卯慨卯渦岡慨岡袈幸渦階憧卯崖頭鹿粡寂蝟赱齠洲粤讌将穐涯卯渦巻渦規慨穐渦喬穐穐鹿粡寂蝟赱齠洲粤讌将鉄適渦桑穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将渦謙穐穐圧狸渦幸穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形雇蝟昭粡竚癈鷭т繻Ь因概温因脹価因脹佳因脹加蝟昭粡竚癈鷭т繻Ь因恭干因脹可因脹嘉因幹係因脹夏因恭幹因完慣蝟昭粡竚癈鷭т繻Ь因脹外因潅可因脹咳因換桶蝟昭粡竚癈鷭т繻Ь因恭患因恭感因干亀因脹害因甘慣因脹崖因恭憾蝟昭粡竚癈鷭т繻Ь因恭慣因脹慨因脹概蝟昭粡竚癈鷭т繻Ь因脹涯因脹碍因鈎尭因脹蓋蝟昭粡竚癈鷭т繻Ь因脹街因恭漢因外薫因脹柿因脹蛎因恭環蝟昭粡竚癈鷭т繻Ь因脹鈎因脹劃因脹嚇因恭澗因害鬼因碍甘因恭潅因街感蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天噌桍鹿粡寂蝟赱齠洲粤讌将昂岡穐繕喬慨適嘘頭唄穐袖巻唄卯鹿粡寂蝟赱齠洲粤讌将唄岡概穐穐穐唄階圧卯唄頭桶銭鹿粡寂蝟赱齠洲粤讌将芦狸穐穐穐穐唄巻唄規慨頭鹿粡寂蝟赱齠洲粤讌将穐唄喬穐穐唄桑唄謙穐唄幸鹿粡寂蝟赱齠洲粤讌将唄銭概卯概岡天桑穐唄測穐唄狸鹿粡寂蝟赱齠洲粤讌将穐概階唄潮慨頭穐唄適穐穐鹿粡寂蝟赱齠洲粤讌将概規穐穐穐袈銭唄頭偽喬穐鹿粡寂蝟赱齠洲粤讌将欝穐概喬況規穐穐概桑欝卯扱狸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形想蝟昭粡竚癈鷭т繻Ь因脹飢因感環因脹騎因完彊因柿卦因脹鬼因脹亀蝟昭粡竚癈鷭т繻Ь因恭妓因脹偽因脹儀蝟昭粡竚癈鷭т繻Ь因脹妓因脹宜因干恐因官饗因脹義因恭義因恭誼因恭宜蝟昭粡竚癈鷭т繻Ь因恭蟻因脹蟻因碍臆蝟昭粡竚癈鷭т繻Ь因脹誼因脹議蝟昭粡竚癈鷭т繻Ь因恭議因碍俺因脹掬因概況因環飢蝟昭粡竚癈鷭т繻Ь因恭菊因脹菊因脹彊因恭彊蝟昭粡竚癈鷭т繻Ь因脹怯因咳嘉因脹恐因脹恭因恭恭蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天疎桍鹿粡寂蝟赱齠洲粤讌将穐穐穐碍喬涯岡涯卯蔚巻涯規鹿粡寂蝟赱齠洲粤讌将概適蔚規涯喬轍幸蔚喬涯桑蔚桑涯謙鹿粡寂蝟赱齠洲粤讌将穐蔚謙慣巻涯銭穐涯幸穐穐鹿粡寂蝟赱齠洲粤讌将穐涯測涯狸蔚幸迭規涯潮穐斡頭鹿粡寂蝟赱齠洲粤讌将鉄頭涯適涯頭諜桑穐恭謙碍穐患幸鹿粡寂蝟赱齠洲粤讌将蔚銭蔚測害謙蔚狸蔚潮碍卯穐崖狸鹿粡寂蝟赱齠洲粤讌将碍岡蔚適穐穐蔚頭穐恐規穐鹿粡寂蝟赱齠洲粤讌将嘘頭概潮坦階鰻穐穐鰻卯鰻岡幹謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形築蝟昭粡竚癈鷭т繻Ь因恭軍因挟臆因恭袈因脹軍蝟昭粡竚癈鷭т繻Ь因概狂因恭卦因挟牡因恭郡蝟昭粡竚癈鷭т繻Ь因嚇軌因脹郡蝟昭粡竚癈鷭т繻Ь因恭係因恭傾因患佳因恭形因脹卦蝟昭粡竚癈鷭т繻Ь因崖掬因脹袈因各義因換挟因脹祁蝟昭粡竚癈鷭т繻Ь因恭恵因脹係因脹傾因脹形因寛狂因脹径因脹恵因脹慶蝟昭粡竚癈鷭т繻Ь因脹慧因腸憶因恭祁因腸臆因恭径因恭慶蝟昭粡竚癈鷭т繻Ь因柿径因腸桶因腸牡蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天祖桍鹿粡寂蝟赱齠洲粤讌将臆規臆喬穐穐穐寛喬慌適臆桑鹿粡寂蝟赱齠洲粤讌将顕喬儀幸穐教銭寛規寛階臆謙験規鹿粡寂蝟赱齠洲粤讌将碍適概適儀測穐儀銭臆幸膳喬穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐干謙穐穐鹿粡寂蝟赱齠洲粤讌将臆銭穐穐穐臆測寛謙臆狸寛銭鹿粡寂蝟赱齠洲粤讌将穐臆潮臆適穐寛潮臆頭寛適桶穐鹿粡寂蝟赱齠洲粤讌将寛測寛狸桶卯桶岡寛幸寛桑穐桶階鹿粡寂蝟赱齠洲粤讌将穐穐寛卯穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺形奴蝟昭粡竚癈鷭т繻Ь因腸慨因漢監因害亀蝟昭粡竚癈鷭т繻Ь因腸概因挟概因挟害因腸涯因挟碍蝟昭粡竚癈鷭т繻Ь因腸碍因腸蓋因挟涯因慣軍因潅卸因腸街因蛎蛎蝟昭粡竚癈鷭т繻Ь因挟外因挟街因挟慨因腸柿因挟崖因挟夏因腸蛎因挟咳蝟昭粡竚癈鷭т繻Ь因腸鈎因慨換因腸劃蝟昭粡竚癈鷭т繻Ь因干劃因腸嚇因完慶因腸各蝟昭粡竚癈鷭т繻Ь因腸完因憾臆因腸官因挟嚇因腸寛因腸干蝟昭粡竚癈鷭т繻Ь因憾牡因腸幹因腸患因腸感因腸慣蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天粗桍鹿粡寂蝟赱齠洲粤讌将斡卯干測牡謙穐鹸頭牡幸干頭禅階鹿粡寂蝟赱齠洲粤讌将牡銭概測牡測干銭干狸穐穐干潮鹿粡寂蝟赱齠洲粤讌将穐穐穐穐牡狸穐牡潮牡適鹿粡寂蝟赱齠洲粤讌将穐牡頭乙穐乙卯穐幹穐穐穐鹿粡寂蝟赱齠洲粤讌将担巻穐穐穐挟喬幹規幹巻穐鹿粡寂蝟赱齠洲粤讌将乙岡幹卯乙階穐穐導喬穐穐鹿粡寂蝟赱齠洲粤讌将穐穐乙巻幹銭乙規乙喬幹適幹測鹿粡寂蝟赱齠洲粤讌将乙桑乙謙乙幸穐乙銭穐乙測穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径異蝟昭粡竚癈鷭т繻Ь因挟慣因腸誼因腸議因腸掬因腸菊因腸彊因挟憾蝟昭粡竚癈鷭т繻Ь因腸怯因腸恐因腸恭因挟環因腸挟因腸教蝟昭粡竚癈鷭т繻Ь因挟寛因飢亀因挟換因挟干因挟潅蝟昭粡竚癈鷭т繻Ь因腸橋因腸況因挟飢蝟昭粡竚癈鷭т繻Ь因腸狂因慨漢因挟監因腸狭因腸響因挟軌蝟昭粡竚癈鷭т繻Ь因腸饗因挟輝因挟鬼因腸驚蝟昭粡竚癈鷭т繻Ь因腸仰因腸凝因腸尭因腸薫因挟騎蝟昭粡竚癈鷭т繻Ь因憾袈因腸訓因腸群因挟亀因甘恵因漢仰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天賊桍鹿粡寂蝟赱齠洲粤讌将患銭穐穐患桑穐穐卸階穐鹿粡寂蝟赱齠洲粤讌将穐穐卸巻穐患喬圧岡穐患幸鹿粡寂蝟赱齠洲粤讌将患測卸喬卸桑卸謙患謙卸規患頭穐鹿粡寂蝟赱齠洲粤讌将患狸卸幸卸銭卸測卸狸卸潮卸適患潮鹿粡寂蝟赱齠洲粤讌将幹喬害卯穐害岡患適感穐穐害階鹿粡寂蝟赱齠洲粤讌将穐害巻穐穐感卯害規害喬穐鹿粡寂蝟赱齠洲粤讌将害桑穐害謙全喬穐感岡穐穐鹿粡寂蝟赱齠洲粤讌将穐害幸穐穐害銭害測旦岡穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径菓蝟昭粡竚癈鷭т繻Ь因涯甘因碍温因挟恭因蝶加因蝶可蝟昭粡竚癈鷭т繻Ь因漢慨因各狂因潅外因蝶嘉蝟昭粡竚癈鷭т繻Ь因挟挟因甘崖因蝶夏因慣郡因官感蝟昭粡竚癈鷭т繻Ь因慣慨因劃環因蝶外因外完蝟昭粡竚癈鷭т繻Ь因蝶咳因挟狭因挟況因挟教因慨憶因蝶害因嚇輝蝟昭粡竚癈鷭т繻Ь因挟響因挟狂因挟橋因挟凝蝟昭粡竚癈鷭т繻Ь因蝶崖因挟仰因挟驚因挟饗因蝶慨因蝶概蝟昭粡竚癈鷭т繻Ь因挟尭因蝶涯因蝶碍因蝶蓋因挟薫因完柿因蝶街蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天続桍鹿粡寂蝟赱齠洲粤讌将慣卯穐慣階穐崖銭慣岡穐崖測鹿粡寂蝟赱齠洲粤讌将崖狸崖潮元岡穐穐崖適嘘謙崖頭鹿粡寂蝟赱齠洲粤讌将穐穐慣規慨穐慨卯慨岡儀狸慨階鹿粡寂蝟赱齠洲粤讌将慣巻慨巻慨規穐慣喬慨喬然規蔚狸鹿粡寂蝟赱齠洲粤讌将拘桑穐慣桑穐穐穐慨桑鉄謙鹿粡寂蝟赱齠洲粤讌将穐慨謙穐慨幸穐穐穐慣幸鹿粡寂蝟赱齠洲粤讌将穐穐慣銭穐慣測慨銭慣狸穐鹿粡寂蝟赱齠洲粤讌将其規穐慣潮郡頭穐穐偽銭穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径館蝟昭粡竚癈鷭т繻Ь因概価因教憶因蝶澗因潅軍因街憾因挟慧因蝶潅蝟昭粡竚癈鷭т繻Ь因蝶環因蝶甘因教牡因潅橋因慣鈎因蝶監蝟昭粡竚癈鷭т繻Ь因換崖因蝶軌因蝶輝因蝶飢因劃恭因教桶因蝶騎因鈎騎蝟昭粡竚癈鷭т繻Ь因街換因蛎橋因概狭因漢涯因教臆因蝶鬼因蝶亀蝟昭粡竚癈鷭т繻Ь因官慣因澗寛因柿祁因蝶偽因蝶儀蝟昭粡竚癈鷭т繻Ь因蝶妓因蛎況因幹議因蝶宜因教卸因甘菊蝟昭粡竚癈鷭т繻Ь因柿宜因蝶義因教恩因各寛因教価蝟昭粡竚癈鷭т繻Ь因嚇飢因柿外因蝶蟻因蝶誼因蝶議因教温蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天袖桍鹿粡寂蝟赱齠洲粤讌将概適概頭腸銭験適唄謙飢規飢測涯穐鹿粡寂蝟赱齠洲粤讌将涯卯穐穐飢喬卦穐涯岡飢適騎岡鹿粡寂蝟赱齠洲粤讌将袈測涯階穐涯巻穐穐飢潮涯規鹿粡寂蝟赱齠洲粤讌将穐涯喬涯桑騎喬涯謙涯幸拘銭穐鹿粡寂蝟赱齠洲粤讌将穐超潮鯵狸騎階穐涯銭偽測涯測鹿粡寂蝟赱齠洲粤讌将騎穐穐涯狸穐穐穐騎卯穐鹿粡寂蝟赱齠洲粤讌将涯潮儀潮飢頭飢狸穐害謙斡巻穐鹿粡寂蝟赱齠洲粤讌将涯適顕謙涯頭碍穐穐騎謙穐碍卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径緊蝟昭粡竚癈鷭т繻Ь因蝶群因蝶軍因蝶郡因蝶卦因蝶袈蝟昭粡竚癈鷭т繻Ь因蝶祁因教概因蝶係因蝶傾因蝶形因教碍蝟昭粡竚癈鷭т繻Ь因蝶径因教慨因蝶恵因蝶慶蝟昭粡竚癈鷭т繻Ь因碍輝因寛崖因教街因官凝因蝶慧因調憶因教感蝟昭粡竚癈鷭т繻Ь因憧誼因教寛因教鈎因調臆因調桶蝟昭粡竚癈鷭т繻Ь因調牡因教完因鈎形因外議因教蛎因教干蝟昭粡竚癈鷭т繻Ь因教慣因街澗因潅偽因調乙因幹偽因教劃因調俺因調卸蝟昭粡竚癈鷭т繻Ь因教患因調恩因教柿因干嚇因教各因外劃因潅漢蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天揃桍鹿粡寂蝟赱齠洲粤讌将穐穐寛幸寛銭寛測寛狸寛潮騎適鹿粡寂蝟赱齠洲粤讌将穐穐教測原狸寛適寛頭干穐蔚潮鹿粡寂蝟赱齠洲粤讌将穐典穐超頭穐穐偽適患潮干卯鹿粡寂蝟赱齠洲粤讌将鬼謙干岡扱適穐鬼巻鬼幸鬼測穐鹿粡寂蝟赱齠洲粤讌将慣幸鬼適干巻穐鬼銭干規干喬穐鹿粡寂蝟赱齠洲粤讌将禅巻幹測干桑干謙担測干幸穐圧適鹿粡寂蝟赱齠洲粤讌将穐干銭鬼潮穐天潮干測干狸穐鹿粡寂蝟赱齠洲粤讌将穐干潮干適鬼狸穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径雇蝟昭粡竚癈鷭т繻Ь因調崖因咳尭因感驚因教監蝟昭粡竚癈鷭т繻Ь因調各因教偽因教軌因教儀蝟昭粡竚癈鷭т繻Ь因調完因調官因教騎因調寛因調干蝟昭粡竚癈鷭т繻Ь因慣径因調幹因調患因鈎漢因教亀蝟昭粡竚癈鷭т繻Ь因調感因教飢因教妓因教輝因劃幹因調慣蝟昭粡竚癈鷭т繻Ь因調憾因澗乙因調換因調漢因劃潅因調澗蝟昭粡竚癈鷭т繻Ь因教鬼因教彊因調潅因教誼因調環因教菊蝟昭粡竚癈鷭т繻Ь因教議因教怯因教蟻因教官因完騎因調甘蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天孫桍鹿粡寂蝟赱齠洲粤讌将穐鹸測穐亀適幹頭患穐亀幸患卯鹿粡寂蝟赱齠洲粤讌将穐穐渦卯卦岡穐腸測患岡穐鹿粡寂蝟赱齠洲粤讌将患階穐患巻穐堂規嘘喬偽巻穐鹿粡寂蝟赱齠洲粤讌将患規偽喬偽桑穐穐偽階偽規患喬鹿粡寂蝟赱齠洲粤讌将穐患桑患謙穐穐患幸亀銭偽岡鹿粡寂蝟赱齠洲粤讌将穐偽銭偽幸患銭穐揃銭患測患狸鹿粡寂蝟赱齠洲粤讌将群測穐穐患潮穐穐穐穐鹿粡寂蝟赱齠洲粤讌将患適偽謙穐偽狸偽測偽頭患頭儀卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径想蝟昭粡竚癈鷭т繻Ь因調彊因蛎鈎因教仰因調怯因調恐蝟昭粡竚癈鷭т繻Ь因教群因教軍因調恭因教郡因調挟因教形因患蛎蝟昭粡竚癈鷭т繻Ь因教袈因調教因教卦因教祁因教係因調橋因教傾蝟昭粡竚癈鷭т繻Ь因調況因調狂因教径因教恵因調狭因調響蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天唾桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐幹狸穐鹿粡寂蝟赱齠洲粤讌将儀潮穐儀適感狸感測感潮感適感頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径壷蝟昭粡竚癈鷭т繻Ь因調薫因調訓因橋憶因調群蝟昭粡竚癈鷭т繻Ь因橋臆因橋桶因橋牡因調軍蝟昭粡竚癈鷭т繻Ь因橋乙因橋俺因調郡因調卦因橋恩因橋卸蝟昭粡竚癈鷭т繻Ь因橋温因調袈因調祁因調係因橋価蝟昭粡竚癈鷭т繻Ь因橋佳因調傾因調形因調径因調恵因調慶因橋嘉蝟昭粡竚癈鷭т繻Ь因橋加因橋可因柿怯因碍騎因調慧因干偽蝟昭粡竚癈鷭т繻Ь因憾崖因諜憶因劃薫因慣環因憾仰蝟昭粡竚癈鷭т繻Ь因橋夏因妓仰因諜臆因諜桶因諜牡蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰天妥桍鹿粡寂蝟赱齠洲粤讌将飢規穐恭穐恭岡穐超規恭卯恭巻鹿粡寂蝟赱齠洲粤讌将恭階穐諜階飢喬恭規飢桑厳適飢謙鹿粡寂蝟赱齠洲粤讌将飢幸飢銭穐穐恭喬穐飢測飢狸鹿粡寂蝟赱齠洲粤讌将穐穐恭幸穐飢潮恭謙恭桑穐鹿粡寂蝟赱齠洲粤讌将穐飢適飢頭恭銭軍岡穐騎穐穐鹿粡寂蝟赱齠洲粤讌将渦岡鬼卯騎卯穐穐騎岡恭適恭測鹿粡寂蝟赱齠洲粤讌将穐穐恭狸穐騎階穐恭頭穐鹿粡寂蝟赱齠洲粤讌将挟穐恭潮穐穐騎巻渦幸穐騎規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺径遁蝟昭粡竚癈鷭т繻Ь因諜涯因害卸因諜碍因橋寛因橋干蝟昭粡竚癈鷭т繻Ь因諜蓋因橋幹因環恐因諜街因諜柿蝟昭粡竚癈鷭т繻Ь因劃加因橋感因橋患蝟昭粡竚癈鷭т繻Ь因諜蛎因諜鈎蝟昭粡竚癈鷭т繻Ь因各狭因橋慣因諜劃因諜嚇因橋憾蝟昭粡竚癈鷭т繻Ь因諜各因橋換因慨教因諜完因諜官因諜寛蝟昭粡竚癈鷭т繻Ь因慨環因諜干因橋漢蝟昭粡竚癈鷭т繻Ь因橋澗因諜幹因澗議因環恭因諜患因諜感因諜慣蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展鍵桍鹿粡寂蝟赱齠洲粤讌将諜巻導桑穐拘潮挟適探巻挟潮鬼謙鹿粡寂蝟赱齠洲粤讌将鬼幸穐鬼銭挟頭嘆幸鬼測鬼狸鬼潮鹿粡寂蝟赱齠洲粤讌将乙卯鬼適教穐鬼頭亀穐拘狸亀卯探桑鹿粡寂蝟赱齠洲粤讌将教卯教岡穐穐教階亀岡亀階亀巻鹿粡寂蝟赱齠洲粤讌将亀規教巻穐穐亀喬穐亀桑穐鹿粡寂蝟赱齠洲粤讌将教規穐穐穐亀謙穐亀幸穐鹿粡寂蝟赱齠洲粤讌将亀銭穐穐嘆銭亀測亀狸旦潮亀潮鹿粡寂蝟赱齠洲粤讌将穐亀適亀頭教桑偽穐崖頭偽卯教喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻越蝟昭粡竚癈鷭т繻Ь因諜恐因諜恭因橋宜蝟昭粡竚癈鷭т繻Ь因橋妓蝟昭粡竚癈鷭т繻Ь因橋義因完蛎蝟昭粡竚癈鷭т繻Ь因橋蟻因橋誼因漢街因橋議蝟昭粡竚癈鷭т繻Ь因諜挟因官尭因橋掬因諜教因諜橋蝟昭粡竚癈鷭т繻Ь因橋菊因諜況因甘慧蝟昭粡竚癈鷭т繻Ь因橋恐因諜狂因橋怯因橋彊因幹外因諜狭因橋恭因各俺蝟昭粡竚癈鷭т繻Ь因橋挟因橋教因監蓋因橋橋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展顕桍鹿粡寂蝟赱齠洲粤讌将穐偽銭穐穐橋桑橋幸橋謙顕規鹿粡寂蝟赱齠洲粤讌将偽測況幸穐導適顕幸穐偽狸穐鹿粡寂蝟赱齠洲粤讌将穐穐穐橋測穐穐典階穐鹿粡寂蝟赱齠洲粤讌将慌銭穐橋狸橋銭偽潮幹適偽適穐鹿粡寂蝟赱齠洲粤讌将穐元巻其謙穐穐原適偽頭儀穐鹿粡寂蝟赱齠洲粤讌将穐顕銭卒階儀卯橋頭橋潮穐拘適鹿粡寂蝟赱齠洲粤讌将穐拘頭斡幸穐繕謙穐穐穐鹿粡寂蝟赱齠洲粤讌将儀岡儀階卦幸穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻額蝟昭粡竚癈鷭т繻Ь因外菊因橋郡因干完蝟昭粡竚癈鷭т繻Ь因諜郡因慣妓因諜卦因寛蟻因諜袈蝟昭粡竚癈鷭т繻Ь因諜祁因諜係因諜傾因橋袈因諜形蝟昭粡竚癈鷭т繻Ь因諜径因橋群因橋卦因橋薫因橋軍因澗俺蝟昭粡竚癈鷭т繻Ь因諜恵因蓋亀因外慶因橋訓蝟昭粡竚癈鷭т繻Ь因諜慶因諜慧因橋係蝟昭粡竚癈鷭т繻Ь因超憶因橋傾因超臆因超桶因感街因超牡蝟昭粡竚癈鷭т繻Ь因涯蛎因超乙因超俺因況俺因慣劃因超卸蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展鹸桍鹿粡寂蝟赱齠洲粤讌将穐穐其幸恐謙穐恭狸梓謙憧喬鹿粡寂蝟赱齠洲粤讌将嘆適況桑圧巻恐幸穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐恐銭恐測鹿粡寂蝟赱齠洲粤讌将恐狸穐亀階況銭恐潮穐恐適穐鹿粡寂蝟赱齠洲粤讌将恐頭穐穐況狸恭穐穐穐恭卯鹿粡寂蝟赱齠洲粤讌将穐況測穐穐恭岡穐穐況潮鹿粡寂蝟赱齠洲粤讌将恭階害喬穐軍適穐恭巻穐穐鹿粡寂蝟赱齠洲粤讌将穐干卯恭規穐恭喬穐群階穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻吸蝟昭粡竚癈鷭т繻Ь因超碍因況臆因超蓋蝟昭粡竚癈鷭т繻Ь因超街因橋慧因超柿因各亀蝟昭粡竚癈鷭т繻Ь因換教因況乙因超蛎因況牡因街軌因監騎因超鈎蝟昭粡竚癈鷭т繻Ь因況概蝟昭粡竚癈鷭т繻Ь因超劃因超嚇因況温因況価因超各蝟昭粡竚癈鷭т繻Ь因超完因超官因鈎薫因超寛因況恩因超干蝟昭粡竚癈鷭т繻Ь因街係因況卸因況佳因超幹蝟昭粡竚癈鷭т繻Ь因幹害因漢臆因官桶因寛誼蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展原桍鹿粡寂蝟赱齠洲粤讌将群頭挟規軍穐群狸挟桑挟謙挟幸穐鹿粡寂蝟赱齠洲粤讌将群潮穐群適挟銭穐穐挟測控卯鹿粡寂蝟赱齠洲粤讌将挟喬穐穐軍喬穐軍岡挟狸穐鹿粡寂蝟赱齠洲粤讌将挟潮穐攻喬挟適其狸慌謙挟頭穐鹿粡寂蝟赱齠洲粤讌将軍卯穐教穐軍巻軍階穐穐穐鹿粡寂蝟赱齠洲粤讌将卒巻軍桑穐穐穐穐教卯穐鹿粡寂蝟赱齠洲粤讌将軍謙穐教岡嘘桑教階軍幸穐穐鹿粡寂蝟赱齠洲粤讌将軍測穐軍頭教巻穐軍狸軍銭軍頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻頚蝟昭粡竚癈鷭т繻Ь因況劃因況嚇因超偽因超儀因害害蝟昭粡竚癈鷭т繻Ь因況患因況完因超妓因超亀因況官因超宜因超義蝟昭粡竚癈鷭т繻Ь因況寛因寛憶因超蟻因超誼蝟昭粡竚癈鷭т繻Ь因況幹因況干因況感因超議因超掬因超菊因況慣蝟昭粡竚癈鷭т繻Ь因況憾因超彊因各干因超怯因害狭因況換蝟昭粡竚癈鷭т繻Ь因甘儀因鈎佳因超恐因超恭因劃可蝟昭粡竚癈鷭т繻Ь因超挟因超教因超橋因蛎響因干儀因超況因超狂蝟昭粡竚癈鷭т繻Ь因超狭因超響因況漢因況澗因咳咳因超饗因況潅因超驚蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展幻桍鹿粡寂蝟赱齠洲粤讌将橋潮郡潮郡適橋適穐郡頭穐卦穐鹿粡寂蝟赱齠洲粤讌将恭潮漸銭卦卯穐斡規卦岡担測橋頭鹿粡寂蝟赱齠洲粤讌将卦階穐鯵穐況穐況卯穐卦巻禅適鹿粡寂蝟赱齠洲粤讌将患狸況岡況階渦巻諜謙況巻昂卯腸適鹿粡寂蝟赱齠洲粤讌将穐況規況喬穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将況桑卦規控岡卦喬鹸狸穐袈巻穐鹿粡寂蝟赱齠洲粤讌将穐穐況謙卦謙況幸牡幸祁規験頭鹿粡寂蝟赱齠洲粤讌将卦桑渦規況銭穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻鉱蝟昭粡竚癈鷭т繻Ь因況宜因超径因超恵因超慶因超慧因幹形蝟昭粡竚癈鷭т繻Ь因跳憶因跳臆因跳桶蝟昭粡竚癈鷭т繻Ь因跳牡因跳乙蝟昭粡竚癈鷭т繻Ь因況蟻因況義因況議因跳俺因況誼因況掬蝟昭粡竚癈鷭т繻Ь因跳卸因況彊因跳恩因況菊因慨監因跳温蝟昭粡竚癈鷭т繻Ь因況怯因況恐因況恭因跳価因柿咳因甘換蝟昭粡竚癈鷭т繻Ь因況教因各卸因跳佳因咳薫因況橋蝟昭粡竚癈鷭т繻Ь因況況因跳加因跳可因況狂因跳嘉蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展諺桍鹿粡寂蝟赱齠洲粤讌将群頭軍穐穐軍卯軍岡穐穐軍階鹿粡寂蝟赱齠洲粤讌将穐軍巻軍規扱岡穐袈幸軍喬穐鹿粡寂蝟赱齠洲粤讌将穐軍桑袈銭穐軍謙穐軍幸穐鹿粡寂蝟赱齠洲粤讌将軍銭攻桑軍測軍狸穐担桑穐袈狸鹿粡寂蝟赱齠洲粤讌将軍潮軍適穐軍頭郡穐害幸鯵岡郡卯鹿粡寂蝟赱齠洲粤讌将郡岡郡階郡巻袈測袈適郡適郡規憧巻鹿粡寂蝟赱齠洲粤讌将郡喬乙喬郡桑族桑郡謙穐穐郡幸鹿粡寂蝟赱齠洲粤讌将卦潮教狸郡銭袈潮郡測俺銭郡狸郡潮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻胎蝟昭粡竚癈鷭т繻Ь因慨桶因跳甘蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因跳監因咳訓因況群因甘響因寛議因跳軌因換幹蝟昭粡竚癈鷭т繻Ь因況慧因跳輝因害儀因況恵因況形因況訓蝟昭粡竚癈鷭т繻Ь因跳飢因況尭因跳騎因況薫因跳鬼因鈎恭因涯驚因干祁蝟昭粡竚癈鷭т繻Ь因跳亀因跳偽因感輝因跳儀因跳妓蝟昭粡竚癈鷭т繻Ь因咳輝因況郡因況軍因跳宜因跳義蝟昭粡竚癈鷭т繻Ь因況傾因況卦因況係因跳蟻因跳誼蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展乎桍鹿粡寂蝟赱齠洲粤讌将卦潮卦適探穐祁桑乙謙碍潮祁測卦頭鹿粡寂蝟赱齠洲粤讌将袈穐祁潮袈卯袈岡穐穐卦巻穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐顕階顕狸鹿粡寂蝟赱齠洲粤讌将顕潮穐穐袈巻芦測袈規袈喬袈桑鹿粡寂蝟赱齠洲粤讌将穐袈謙袈幸験巻穐穐穐穐鹿粡寂蝟赱齠洲粤讌将扱卯穐穐顕測袈銭袈測袈狸顕銭鹿粡寂蝟赱齠洲粤讌将袈潮顕規顕巻袈適顕岡顕卯涯階袈頭鹿粡寂蝟赱齠洲粤讌将卸測顕桑祁穐穐祁卯祁岡穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻壷蝟昭粡竚癈鷭т繻Ь因狂俺因跳軍因跳郡因跳卦因狂温因跳袈蝟昭粡竚癈鷭т繻Ь因官薫因碍亀因跳祁因跳係因咳官蝟昭粡竚癈鷭т繻Ь因狂恩因跳傾因街騎因銚嚇因跳恭因跳形因跳径因跳恵蝟昭粡竚癈鷭т繻Ь因官訓蝟昭粡竚癈鷭т繻Ь因憧菊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因跳慶因狂柿因狂蛎因害宜蝟昭粡竚癈鷭т繻Ь因跳慧因害嘉因狂蓋因銚憶因銚臆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展古桍鹿粡寂蝟赱齠洲粤讌将顕階穐顕巻穐顕規顕適顕喬験喬鹿粡寂蝟赱齠洲粤讌将穐験潮験桑穐穐顕桑験規穐鹿粡寂蝟赱齠洲粤讌将穐穐顕謙祁喬顕幸顕銭験階穐鹿粡寂蝟赱齠洲粤讌将顕測顕狸顕頭顕潮顕適顕頭患穐験卯鹿粡寂蝟赱齠洲粤讌将験狸穐験岡穐穐穐験穐験卯鹿粡寂蝟赱齠洲粤讌将験適験岡験穐祁狸験階鹸狸穐穐鹿粡寂蝟赱齠洲粤讌将穐超幸穐穐穐験幸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐鹸頭験巻験規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺幻遁蝟昭粡竚癈鷭т繻Ь因銚涯因狂慣因各径因銚碍蝟昭粡竚癈鷭т繻Ь因銚蓋因概感因涯議因狂寛因銚街蝟昭粡竚癈鷭т繻Ь因銚柿因銚蛎因害蟻因銚鈎因嚇鬼蝟昭粡竚癈鷭т繻Ь因狂患因柿義因銚劃因患輝蝟昭粡竚癈鷭т繻Ь因狂漢蝟昭粡竚癈鷭т繻Ь因銚各因漢凝因銚完因狂官因害義蝟昭粡竚癈鷭т繻Ь因蓋偽因換温因狂澗因狂各因銚官因狂憾蝟昭粡竚癈鷭т繻Ь因銚寛因銚干因狂飢因銚幹因狂干蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展弘桍鹿粡寂蝟赱齠洲粤讌将穐鹸規穐鹸巻恭銭穐鹸喬鹸幸鹿粡寂蝟赱齠洲粤讌将穐穐鹸桑鹸喬族謙鹸狸斡穐鹸謙鹿粡寂蝟赱齠洲粤讌将穐鹸幸穐鹸穐穐鹸銭穐穐鹿粡寂蝟赱齠洲粤讌将穐鹸測穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹸適穐鹸潮穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐袈測元巻穐元頭穐穐鹸潮鹿粡寂蝟赱齠洲粤讌将穐碍適穐穐穐原岡穐穐鹿粡寂蝟赱齠洲粤讌将元穐鹸適穐穐元規超適穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦越蝟昭粡竚癈鷭т繻Ь因銚監因狂掬因銚軌蝟昭粡竚癈鷭т繻Ь因銚輝因環亀因銚飢因銚騎因甘価因銚鬼蝟昭粡竚癈鷭т繻Ь因銚亀因銚偽因銚儀因干係蝟昭粡竚癈鷭т繻Ь因銚妓因銚宜因銚義因崖饗因銚蟻蝟昭粡竚癈鷭т繻Ь因銚誼因換群因狂挟因感憶因銚議因銚掬因外咳因銚菊蝟昭粡竚癈鷭т繻Ь因狂議因銚彊因狂宜因官群因狂騎因狂蟻因狂彊蝟昭粡竚癈鷭т繻Ь因銚怯因慣加因銚恐因銚恭因外価因銚挟因狂妓蝟昭粡竚癈鷭т繻Ь因銚教因狂怯因換係因銚橋因銚況蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展慌桍鹿粡寂蝟赱齠洲粤讌将穐原謙元狸穐元桑原幸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐典規穐穐穐穐鹿粡寂蝟赱齠洲粤讌将腸頭穐原銭原測嘆狸原狸穐穐鹿粡寂蝟赱齠洲粤讌将穐探謙穐穐拘桑穐原潮原桑鹿粡寂蝟赱齠洲粤讌将穐厳穐穐穐穐穐原適穐鹿粡寂蝟赱齠洲粤讌将原頭厳穐厳卯穐穐元銭穐厳岡鹿粡寂蝟赱齠洲粤讌将穐厳階碍桑穐厳巻穐穐穐鹿粡寂蝟赱齠洲粤讌将天謙原規厳規原銭鰻階厳喬厳桑原喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦額蝟昭粡竚癈鷭т繻Ь因銚係因狂仰因銚傾因干菊因狂凝因銚形蝟昭粡竚癈鷭т繻Ь因銚径因環偽因狂恭因崖蓋因銚恵因狂狭因銚慶蝟昭粡竚癈鷭т繻Ь因狂驚因潅加因銚慧因狂尭蝟昭粡竚癈鷭т繻Ь因狂狂因狂饗因長憶蝟昭粡竚癈鷭т繻Ь因長臆蝟昭粡竚癈鷭т繻Ь因長桶因澗温因監憶因長牡蝟昭粡竚癈鷭т繻Ь因長乙因長俺因長卸因狂軍因長恩蝟昭粡竚癈鷭т繻Ь因長価因長佳因狂形因長加因狂群蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展拘桍鹿粡寂蝟赱齠洲粤讌将担階穐慌潮慌適穐穐元卯慌頭鹿粡寂蝟赱齠洲粤讌将穐穐穐穐抗穐穐抗卯穐鹿粡寂蝟赱齠洲粤讌将抗岡全適穐嘆岡厳幸厳謙穐厳巻鹿粡寂蝟赱齠洲粤讌将厳規穐嘘喬穐抗階穐抗巻厳桑鹿粡寂蝟赱齠洲粤讌将穐厳卯抗規抗喬抗桑抗謙患規抗幸鹿粡寂蝟赱齠洲粤讌将穐穐抗銭抗測厳喬扱適穐抗狸鹿粡寂蝟赱齠洲粤讌将穐穐慌幸抗潮抗適臆岡抗頭穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐全階穐拘穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦吸蝟昭粡竚癈鷭т繻Ь因狂径因狭憶因憾宜因長官蝟昭粡竚癈鷭т繻Ь因狂慧因嚇偽因鈎換因狭桶因涯嚇因長寛蝟昭粡竚癈鷭т繻Ь因長干因長幹因長患因長感因狭牡因長慣因換傾蝟昭粡竚癈鷭т繻Ь因狂慶因長憾因狂偽因長換因長漢因長澗因長潅蝟昭粡竚癈鷭т繻Ь因長環因長甘因長監因狂恵因長軌蝟昭粡竚癈鷭т繻Ь因監監因感臆因換軍因長輝因狭佳因長飢蝟昭粡竚癈鷭т繻Ь因狭咳蝟昭粡竚癈鷭т繻Ь因長騎因長鬼因長亀因長偽因狭害因長儀蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展攻桍鹿粡寂蝟赱齠洲粤讌将慌規控謙穐穐祁喬控幸控銭慌頭鹿粡寂蝟赱齠洲粤讌将慌桑控測慌幸控狸控潮穐穐控適鹿粡寂蝟赱齠洲粤讌将抗階慌謙穐控頭慌狸穐穐鰻岡鹿粡寂蝟赱齠洲粤讌将攻穐橋規穐慌潮抗穐攻卯穐攻岡鹿粡寂蝟赱齠洲粤讌将攻階穐攻巻穐慌喬攻規渦喬攻喬鹿粡寂蝟赱齠洲粤讌将慌銭族桑憧規軍穐歎巻昂巻歎幸跳岡鹿粡寂蝟赱齠洲粤讌将感卯穐穐穐攻桑穐攻謙攻幸鹿粡寂蝟赱齠洲粤讌将攻銭抗桑抗規穐攻測攻狸攻潮攻適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦頚蝟昭粡竚癈鷭т繻Ь因監甘因長尭因長薫蝟昭粡竚癈鷭т繻Ь因狭慨因長訓因長群因環卦因長軍因狭涯蝟昭粡竚癈鷭т繻Ь因狭蓋因狭街蝟昭粡竚癈鷭т繻Ь因長卦因長袈因狭鈎因狭柿因長祁蝟昭粡竚癈鷭т繻Ь因長係因感桶因狭蛎因長傾蝟昭粡竚癈鷭т繻Ь因長形因憾環因狭嘉因長径蝟昭粡竚癈鷭т繻Ь因長恵因長慶因劃軍蝟昭粡竚癈鷭т繻Ь因狭劃因狭寛因官郡因長慧因狭官因珍憶蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展晃桍鹿粡寂蝟赱齠洲粤讌将漸岡穐慌岡穐漸階漸巻拘階唄幸鹿粡寂蝟赱齠洲粤讌将穐穐抗適拘穐穐漸規漸喬穐鹿粡寂蝟赱齠洲粤讌将漸桑漸謙漸幸抗頭穐穐蝶卯腸岡鹿粡寂蝟赱齠洲粤讌将漸銭漸測拘規漸狸穐穐漸潮穐鹿粡寂蝟赱齠洲粤讌将穐漸適拘巻穐穐穐穐漸頭鹿粡寂蝟赱齠洲粤讌将穐然穐穐穐穐跳喬穐桶狸鹿粡寂蝟赱齠洲粤讌将拘喬穐穐穐穐穐然卯穐鹿粡寂蝟赱齠洲粤讌将然岡穐然階穐然巻然規穐拘桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦鉱蝟昭粡竚癈鷭т繻Ь因珍涯因存橋因珍碍因珍蓋蝟昭粡竚癈鷭т繻Ь因狭憾因蓋儀蝟昭粡竚癈鷭т繻Ь因概鬼因珍街因珍柿因狭漢因輝議因珍蛎因珍鈎蝟昭粡竚癈鷭т繻Ь因珍劃因珍嚇因概卦因甘柿因珍各因涯軍因狭澗蝟昭粡竚癈鷭т繻Ь因珍完因珍官因珍寛因珍干因珍幹因狭潅蝟昭粡竚癈鷭т繻Ь因珍患因干凝因珍感因珍慣蝟昭粡竚癈鷭т繻Ь因狭環因珍憾因珍換因珍漢蝟昭粡竚癈鷭т繻Ь因感形因珍澗因外柿蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展港桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将繕潮穐俺階控岡控階全狸穐穐鹿粡寂蝟赱齠洲粤讌将穐全潮穐拘適穐続潮全適穐鹿粡寂蝟赱齠洲粤讌将全頭穐禅穐穐禅卯穐穐穐鹿粡寂蝟赱齠洲粤讌将穐禅岡穐拘頭郡岡穐禅階禅巻鹿粡寂蝟赱齠洲粤讌将禅規控穐控卯控測穐禅喬穐控規鹿粡寂蝟赱齠洲粤讌将控謙禅桑穐禅謙禅幸禅銭控巻禅測鹿粡寂蝟赱齠洲粤讌将禅狸禅潮穐穐穐穐穐禅適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦胎蝟昭粡竚癈鷭т繻Ь因珍菊因珍彊因珍怯因狭偽因珍恐因狭儀因鈎妓蝟昭粡竚癈鷭т繻Ь因狭宜因干官因碍偽因崖寛蝟昭粡竚癈鷭т繻Ь因珍恭因珍挟因狭誼因珍教因珍橋蝟昭粡竚癈鷭т繻Ь因崖各因珍況因狭怯因珍狂因狭議因狭彊蝟昭粡竚癈鷭т繻Ь因珍狭因珍響因憾柿因珍饗因珍驚蝟昭粡竚癈鷭т繻Ь因狭掬因狭菊因換憾因憾義因狭恐蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因寛慶因狭驚因珍凝因狭狂因珍尭因珍薫因害饗蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展甲桍鹿粡寂蝟赱齠洲粤讌将攻喬穐族銭攻桑膳卯膳岡攻巻膳階鹿粡寂蝟赱齠洲粤讌将攻規攻銭攻潮膳巻穐攻測膳規膳喬鹿粡寂蝟赱齠洲粤讌将膳桑攻幸攻階膳謙膳幸穐穐穐鹿粡寂蝟赱齠洲粤讌将概謙膳銭昂巻穐嘆銭穐膳測膳狸鹿粡寂蝟赱齠洲粤讌将穐膳潮穐膳適穐昂岡穐穐鹿粡寂蝟赱齠洲粤讌将族卯昂階穐穐穐穐族岡族階鹿粡寂蝟赱齠洲粤讌将穐族巻族規穐攻適穐穐昂穐鹿粡寂蝟赱齠洲粤讌将穐族喬族桑昂卯族謙族幸族銭攻頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦壷蝟昭粡竚癈鷭т繻Ь因賃佳因賃加因賃可蝟昭粡竚癈鷭т繻Ь因完橋因監街因狭係因賃嘉因狭傾蝟昭粡竚癈鷭т繻Ь因響憶因各価因狭径蝟昭粡竚癈鷭т繻Ь因賃夏因狭慧因賃外因狭袈蝟昭粡竚癈鷭т繻Ь因狭卦因賃咳因響臆因賃害因賃崖因害誼蝟昭粡竚癈鷭т繻Ь因狭恵因響桶因狭慶因賃慨蝟昭粡竚癈鷭т繻Ь因賃概因賃涯因狭形因幹崖蝟昭粡竚癈鷭т繻Ь因狭祁因賃碍因慣狂蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展硬桍鹿粡寂蝟赱齠洲粤讌将穐穐漸桑続謙続幸続銭続測続狸鹿粡寂蝟赱齠洲粤讌将続潮続適穐続頭卒穐蝶測穐穐鹿粡寂蝟赱齠洲粤讌将卒卯穐穐卒岡穐卒階穐卒巻鹿粡寂蝟赱齠洲粤讌将卒規卒喬穐穐穐穐卒桑漸喬鹿粡寂蝟赱齠洲粤讌将卒謙穐漸規卒幸穐穐穐卒銭鹿粡寂蝟赱齠洲粤讌将穐穐穐漸適卒測卒狸卒潮漸謙鹿粡寂蝟赱齠洲粤讌将穐卒適穐然穐穐卒頭穐穐鹿粡寂蝟赱齠洲粤讌将穐穐超喬然階穐漸銭袖穐袖卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺弦遁蝟昭粡竚癈鷭т繻Ь因響佳因賃飢因響夏因響害因響咳蝟昭粡竚癈鷭т繻Ь因賃騎因賃鬼因賃亀因響温因賃偽蝟昭粡竚癈鷭т繻Ь因響加因響劃因賃儀因賃妓蝟昭粡竚癈鷭т繻Ь因賃宜因賃義因賃蟻因賃誼蝟昭粡竚癈鷭т繻Ь因響涯因賃議因賃掬因賃菊蝟昭粡竚癈鷭т繻Ь因賃彊因賃怯因賃恐因響慨蝟昭粡竚癈鷭т繻Ь因賃恭因響概因賃挟因響柿因響蛎蝟昭粡竚癈鷭т繻Ь因賃教因崖価因賃橋因概寛因響街因賃況蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展前桍鹿粡寂蝟赱齠洲粤讌将穐其謙穐其幸穐漸巻其銭感巻鹿粡寂蝟赱齠洲粤讌将穐其測其狸其潮穐然謙然狸然桑鹿粡寂蝟赱齠洲粤讌将其適然適揃穐揃卯揃岡全穐然頭穐鹿粡寂蝟赱齠洲粤讌将揃階其頭揃巻揃規揃喬穐揃桑揃謙鹿粡寂蝟赱齠洲粤讌将穐全岡全卯控銭穐穐穐全喬鹿粡寂蝟赱齠洲粤讌将揃幸穐穐穐穐揃銭揃測穐鹿粡寂蝟赱齠洲粤讌将揃狸全階揃潮穐穐揃適全巻穐鹿粡寂蝟赱齠洲粤讌将穐全規嘆卯全桑嘆岡穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺諺越蝟昭粡竚癈鷭т繻Ь因碍驚因鎮桶因響換因鎮牡因響憾因鎮乙因劃外蝟昭粡竚癈鷭т繻Ь因鎮俺因鎮卸因鎮恩因鎮温因街鬼因掬卸因鎮価蝟昭粡竚癈鷭т繻Ь因鎮佳因響漢因劃輝因鎮加因鎮可因崖街蝟昭粡竚癈鷭т繻Ь因鎮嘉因響澗因鎮夏因咳飢因鎮外因嚇儀因響潅因鎮咳蝟昭粡竚癈鷭т繻Ь因鎮害因街亀因響環因外怯因鎮崖蝟昭粡竚癈鷭т繻Ь因換劃因鎮慨因響甘蝟昭粡竚癈鷭т繻Ь因各響因鎮概因響亀因響飢因干尭蝟昭粡竚癈鷭т繻Ь因鎮涯因鎮碍因響騎因響軌因涯掬蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展漸桍鹿粡寂蝟赱齠洲粤讌将坦謙全頭禅喬穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将軍喬穐穐乙適穐禅狸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐禅謙穐穐穐桶規禅桑鹿粡寂蝟赱齠洲粤讌将坦幸禅銭坦銭坦測坦狸穐禅卯坦潮鹿粡寂蝟赱齠洲粤讌将坦適穐禅測穐禅潮穐穐穐鹿粡寂蝟赱齠洲粤讌将坦頭穐担穐原頭穐穐禅幸穐鹿粡寂蝟赱齠洲粤讌将禅適繕穐穐穐元階禅巻穐梓卯鹿粡寂蝟赱齠洲粤讌将穐穐担卯穐穐担岡担階禅頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺諺額蝟昭粡竚癈鷭т繻Ь因鎮幹因柿蟻因甘袈因響怯因響恐因官卦蝟昭粡竚癈鷭т繻Ь因鎮患因鎮感因鎮慣因鎮憾因鎮換因甘臆蝟昭粡竚癈鷭т繻Ь因鎮漢因鎮澗因鎮潅因響恭因環概蝟昭粡竚癈鷭т繻Ь因響挟因響教因鎮環因漢挟因響橋因鎮甘因柿完蝟昭粡竚癈鷭т繻Ь因甘桶因鎮監蝟昭粡竚癈鷭т繻Ь因響饗因鎮軌蝟昭粡竚癈鷭т繻Ь因鎮輝因鎮飢因響驚因嚇妓因響響因鎮騎因鎮鬼蝟昭粡竚癈鷭т繻Ь因環況因響況因響狭因完劃因各慧蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展全桍鹿粡寂蝟赱齠洲粤讌将穐探規繕謙穐繕潮穐探喬漸階鹿粡寂蝟赱齠洲粤讌将穐穐繕頭穐繕適探桑探謙探幸鹿粡寂蝟赱齠洲粤讌将涯狸穐族測膳穐穐探銭探測穐鹿粡寂蝟赱齠洲粤讌将探狸探潮探適穐探頭膳狸膳岡穐鹿粡寂蝟赱齠洲粤讌将旦穐穐穐穐穐膳階旦卯旦岡鹿粡寂蝟赱齠洲粤讌将旦階穐膳巻膳規穐穐穐穐鹿粡寂蝟赱齠洲粤讌将旦巻旦規旦喬穐穐旦桑膳幸穐鹿粡寂蝟赱齠洲粤讌将膳銭旦謙旦幸膳謙穐穐旦銭穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺諺吸蝟昭粡竚癈鷭т繻Ь因鎮饗因響袈因鎮驚因響訓因響祁因鎮仰因鎮凝蝟昭粡竚癈鷭т繻Ь因鎮尭因響径因薫碍因鎮薫蝟昭粡竚癈鷭т繻Ь因鎮訓因害恩因鎮群蝟昭粡竚癈鷭т繻Ь因鎮軍因鎮郡因鎮卦因響慧因涯菊蝟昭粡竚癈鷭т繻Ь因響慶因鎮袈因鎮祁因鎮係因饗臆因饗憶蝟昭粡竚癈鷭т繻Ь因饗牡因鎮傾因饗桶因鎮形因饗乙蝟昭粡竚癈鷭т繻Ь因鎮径因劃咳因鎮恵因饗俺因鎮慶因饗卸蝟昭粡竚癈鷭т繻Ь因鎮慧因陳憶因陳臆因陳桶因饗恩因完嚇蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展繕桍鹿粡寂蝟赱齠洲粤讌将穐諜桑穐族幸穐穐漸巻郡喬鹿粡寂蝟赱齠洲粤讌将族銭腸巻族測顕測穐腸規穐飢狸鹿粡寂蝟赱齠洲粤讌将腸喬穐穐族狸腸桑腸謙其測郡卯鹿粡寂蝟赱齠洲粤讌将族潮穐概穐腸幸腸銭穐穐腸測鹿粡寂蝟赱齠洲粤讌将腸狸族適穐穐穐腸潮続穐跳桑鹿粡寂蝟赱齠洲粤讌将穐族頭憧喬穐続卯穐穐続岡鹿粡寂蝟赱齠洲粤讌将腸適穐続階患卯腸頭蝶穐蝶卯蝶岡鹿粡寂蝟赱齠洲粤讌将穐穐続巻穐蝶階続規穐続喬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺諺頚蝟昭粡竚癈鷭т繻Ь因饗碍蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因崖輝因陳慨因陳概因陳涯因陳碍蝟昭粡竚癈鷭т繻Ь因陳蓋因饗蓋因饗街因饗柿蝟昭粡竚癈鷭т繻Ь因害群因陳街因各恩因饗蛎蝟昭粡竚癈鷭т繻Ь因陳柿因陳蛎因陳鈎蝟昭粡竚癈鷭т繻Ь因陳劃因陳嚇因饗鈎因陳各蝟昭粡竚癈鷭т繻Ь因饗劃因陳完因陳官因陳寛蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展糎桍鹿粡寂蝟赱齠洲粤讌将鹸穐穐慣測続適調階調巻穐調規鹿粡寂蝟赱齠洲粤讌将卦桑穐撞喬穐卒卯穐恐巻調喬鹿粡寂蝟赱齠洲粤讌将卒穐調桑調謙軍卯調幸調銭続頭卸桑鹿粡寂蝟赱齠洲粤讌将飢潮穐穐卒岡穐卒階調測典幸鹿粡寂蝟赱齠洲粤讌将調狸穐調潮袈潮調適卒巻調頭穐鹿粡寂蝟赱齠洲粤讌将穐穐族狸諜穐諜卯圧頭穐諜岡鹿粡寂蝟赱齠洲粤讌将穐儀喬穐歎規唄銭諜階卒規諜巻鹿粡寂蝟赱齠洲粤讌将穐穐憧桑碍穐典銭諜規諜喬穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺諺鉱蝟昭粡竚癈鷭т繻Ь因陳儀因饗感因陳妓因陳宜因饗換因陳義蝟昭粡竚癈鷭т繻Ь因饗漢因陳蟻因陳誼因陳議蝟昭粡竚癈鷭т繻Ь因柿嚇因寛寛因饗憾因陳掬因嚇蟻因換嚇因陳菊因陳彊蝟昭粡竚癈鷭т繻Ь因陳怯因饗慣因陳恐因陳恭因蛎驚蝟昭粡竚癈鷭т繻Ь因咳騎因陳挟因饗甘因碍妓因陳教因蛎凝因陳橋蝟昭粡竚癈鷭т繻Ь因蛎仰因監環因饗環因饗潅因官卸蝟昭粡竚癈鷭т繻Ь因概環因監干因崖柿因嚇誼因陳況因陳狂因陳狭蝟昭粡竚癈鷭т繻Ь因陳響因陳饗因陳驚因饗澗因陳仰因陳凝蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展疏桍鹿粡寂蝟赱齠洲粤讌将超頭穐袖穐跳穐袖卯卒頭跳卯元謙鹿粡寂蝟赱齠洲粤讌将穐調穐穐跳岡其頭群桑穐跳階鹿粡寂蝟赱齠洲粤讌将跳巻袖巻跳規梓穐穐慨岡跳喬跳桑鹿粡寂蝟赱齠洲粤讌将蝶喬跳謙袖桑穐穐穐原狸跳幸鹿粡寂蝟赱齠洲粤讌将鯵頭袖階穐袖謙原潮袖規袖喬跳銭鹿粡寂蝟赱齠洲粤讌将袖岡跳測穐穐斡岡挟幸跳狸跳潮鹿粡寂蝟赱齠洲粤讌将害頭穐乙潮跳適穐穐轍卯轍岡鹿粡寂蝟赱齠洲粤讌将穐厳穐穐轍階鬼階穐轍巻干巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺諺胎蝟昭粡竚癈鷭т繻Ь因饗蟻因津乙因饗宜因津俺因干潅蝟昭粡竚癈鷭т繻Ь因津卸因津恩因津温因完官因慨飢因饗義因各蟻蝟昭粡竚癈鷭т繻Ь因津価因甘漢因津佳因津加因津可因監完因津嘉蝟昭粡竚癈鷭т繻Ь因饗誼因饗況因幹概因津夏因饗橋因津外蝟昭粡竚癈鷭т繻Ь因饗恭因饗饗因饗挟因饗彊因幹恵因饗菊蝟昭粡竚癈鷭т繻Ь因饗議因津咳因環憶因蛎薫蝟昭粡竚癈鷭т繻Ь因津害因饗怯因饗掬因津崖因津慨因津概因饗教蝟昭粡竚癈鷭т繻Ь因劃郡因蓋官因津涯因寛形因津碍蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展礎桍鹿粡寂蝟赱齠洲粤讌将卒規欝銭斡岡穐恐規迭謙迭幸其幸鹿粡寂蝟赱齠洲粤讌将穐穐迭頭迭銭其謙穐橋喬穐鹿粡寂蝟赱齠洲粤讌将其潮迭測穐穐其岡穐其狸其適鹿粡寂蝟赱齠洲粤讌将穐顕狸其銭控喬迭狸探規迭潮迭適鹿粡寂蝟赱齠洲粤讌将其頭諜謙穐穐穐穐揃岡穐鹿粡寂蝟赱齠洲粤讌将揃規穐穐揃階抗規鉄穐穐穐鹿粡寂蝟赱齠洲粤讌将鉄卯穐穐揃穐穐穐穐鉄岡鹿粡寂蝟赱齠洲粤讌将穐橋穐穐穐鉄階穐揃巻穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺諺壷蝟昭粡竚癈鷭т繻Ь因饗袈因津幹因津患因津感因津慣因津憾蝟昭粡竚癈鷭т繻Ь因津換因饗形因饗祁因津甘因饗傾因饗係蝟昭粡竚癈鷭т繻Ь因津漢因津澗因津潅因饗径蝟昭粡竚癈鷭т繻Ь因鈎咳因津環因饗慶因饗恵因換狂因津監因驚憶蝟昭粡竚癈鷭т繻Ь因津軌因碍宜蝟昭粡竚癈鷭т繻Ь因饗慧因驚臆因津輝因驚桶蝟昭粡竚癈鷭т繻Ь因概幹因橋官因嚇傾因驚牡因津飢因蓋凝蝟昭粡竚癈鷭т繻Ь因津騎因津鬼因津亀因驚乙因津偽因憧橋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展租桍鹿粡寂蝟赱齠洲粤讌将嘆喬典桑穐続適典謙典幸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐全適典銭嘆桑典測嘆謙典狸鹿粡寂蝟赱齠洲粤讌将蝶岡穐嘆幸嘆銭典潮典適嘆測穐鹿粡寂蝟赱齠洲粤讌将穐嘆狸嘆潮穐典頭穐填穐填卯鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限異蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因干佳蝟昭粡竚癈鷭т繻Ь因津恐因津恭因驚嘉因津挟因津教因驚外蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展賊桍鹿粡寂蝟赱齠洲粤讌将穐嘆頭穐穐穐填喬恐喬填桑鹿粡寂蝟赱齠洲粤讌将坦卯填謙族潮填幸坦岡穐坦階填銭鹿粡寂蝟赱齠洲粤讌将坦巻填測穐填狸填潮坦規穐填適鹿粡寂蝟赱齠洲粤讌将填頭天岡教銭天穐穐天卯穐穐鹿粡寂蝟赱齠洲粤讌将穐典潮坦喬天階天巻穐天規穐鹿粡寂蝟赱齠洲粤讌将天喬天桑攻測芦適坦桑天謙穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐天幸穐天銭天測穐鹿粡寂蝟赱齠洲粤讌将坦謙抗頭坦幸天狸担卯穐天潮穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限菓蝟昭粡竚癈鷭т繻Ь因驚柿因驚鈎因津慧因墜憶蝟昭粡竚癈鷭т繻Ь因驚蛎因驚劃因墜臆因澗感因驚嚇因驚各蝟昭粡竚癈鷭т繻Ь因墜桶因墜牡因墜乙因驚完蝟昭粡竚癈鷭т繻Ь因驚寛因墜俺因墜卸因墜恩因崖可因幹況蝟昭粡竚癈鷭т繻Ь因換狭因柿恐因街儀因墜温因換監蝟昭粡竚癈鷭т繻Ь因害菊因憾甘因驚患因慨騎因完亀因驚幹因驚換因干傾蝟昭粡竚癈鷭т繻Ь因潅恭因驚慣因驚憾因概嘉因驚漢因慣恭蝟昭粡竚癈鷭т繻Ь因寛菊因墜価因墜佳因憾訓因患劃因驚感因澗慣蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展続桍鹿粡寂蝟赱齠洲粤讌将俺狸担狸堂謙幹岡憧規堂狸堂潮揃卯鹿粡寂蝟赱齠洲粤讌将担測堂適桶卯堂頭穐探狸渦謙導穐鹿粡寂蝟赱齠洲粤讌将穐況謙穐控穐穐導岡導卯穐鹿粡寂蝟赱齠洲粤讌将穐導階担頭続頭揃岡導巻典適穐鹿粡寂蝟赱齠洲粤讌将袈規導規顕潮担適担潮穐攻銭穐鹿粡寂蝟赱齠洲粤讌将導喬穐担卯穐導桑亀岡穐導謙鹿粡寂蝟赱齠洲粤讌将導幸穐導銭穐感桑導測穐導狸鹿粡寂蝟赱齠洲粤讌将導潮穐探卯探岡控謙探穐導適導頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限館蝟昭粡竚癈鷭т繻Ь因墜完因墜官因驚騎因驚鬼因驚偽蝟昭粡竚癈鷭т繻Ь因寛桶因墜寛因驚亀因慨橋因驚妓因驚儀蝟昭粡竚癈鷭т繻Ь因驚宜因墜干因驚蟻因驚議因驚掬因墜幹蝟昭粡竚癈鷭т繻Ь因墜患蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展袖桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐圧喬憧喬担頭探頭鹿粡寂蝟赱齠洲粤讌将穐憧桑穐概岡憧謙旦穐憧幸穐鹿粡寂蝟赱齠洲粤讌将鰻喬旦卯穐旦岡攻測穐感謙飢頭鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐憧銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限緊蝟昭粡竚癈鷭т繻Ь因驚恭因墜澗因墜潅因幹涯蝟昭粡竚癈鷭т繻Ь因墜環因咳蟻因墜甘蝟昭粡竚癈鷭т繻Ь因墜監因墜軌因墜輝蝟昭粡竚癈鷭т繻Ь因驚挟因墜飢因墜騎蝟昭粡竚癈鷭т繻Ь因墜鬼因鈎訓因墜亀蝟昭粡竚癈鷭т繻Ь因各袈因墜偽因墜儀因墜妓蝟昭粡竚癈鷭т繻Ь因墜宜因寛可因墜義因墜蟻蝟昭粡竚癈鷭т繻Ь因墜誼因驚況因墜議因墜尭因驚橋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展揃桍鹿粡寂蝟赱齠洲粤讌将撞適穐旦規穐穐撞頭洞穐洞卯鹿粡寂蝟赱齠洲粤讌将洞岡穐洞階旦潮旦測穐洞巻旦謙鹿粡寂蝟赱齠洲粤讌将穐洞規穐穐洞喬洞桑旦銭洞謙鹿粡寂蝟赱齠洲粤讌将穐洞幸旦幸旦狸穐儀桑穐歎穐鹿粡寂蝟赱齠洲粤讌将穐圧桑穐歎卯洞銭洞測穐洞狸鹿粡寂蝟赱齠洲粤讌将元幸穐旦適旦頭洞潮穐穐堂幸鹿粡寂蝟赱齠洲粤讌将洞適瞳穐瞳卯干桑瞳岡渦幸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐歎岡瞳階穐歎規鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限雇蝟昭粡竚癈鷭т繻Ь因墜郡因墜卦因墜袈因墜祁蝟昭粡竚癈鷭т繻Ь因驚軍因驚郡因環宜因墜係因感卸蝟昭粡竚癈鷭т繻Ь因驚係因墜傾因墜形因墜径蝟昭粡竚癈鷭т繻Ь因驚袈因驚祁因驚傾蝟昭粡竚癈鷭т繻Ь因墜恵因墜慶因墜慧因徹憶因徹臆因徹桶蝟昭粡竚癈鷭т繻Ь因仰温蝟昭粡竚癈鷭т繻Ь因驚恵因徹牡因徹乙因驚慶因驚径因徹俺因徹卸蝟昭粡竚癈鷭т繻Ь因徹恩因徹温因徹価蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展孫桍鹿粡寂蝟赱齠洲粤讌将芦測芦狸歎銭穐慣潮穐穐腸卯鹿粡寂蝟赱齠洲粤讌将腸規腸岡歎適芦潮腸階芦適芦頭鯵穐鹿粡寂蝟赱齠洲粤讌将腸巻穐穐穐鯵卯腸測穐穐鹿粡寂蝟赱齠洲粤讌将穐腸喬穐鯵岡鯵階鯵巻鯵規圧謙鹿粡寂蝟赱齠洲粤讌将腸謙鯵喬鯵桑腸銭腸桑穐穐穐鹿粡寂蝟赱齠洲粤讌将穐鯵謙穐穐鯵幸鯵銭穐鯵測鹿粡寂蝟赱齠洲粤讌将鯵狸鯵潮腸潮穐蝶階穐腸狸穐鹿粡寂蝟赱齠洲粤讌将穐鯵適鯵頭梓穐腸適穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限想蝟昭粡竚癈鷭т繻Ь因仰夏因徹官因徹寛因仰害因仰咳因仰外蝟昭粡竚癈鷭т繻Ь因徹干因仰慨因仰崖因潅袈蝟昭粡竚癈鷭т繻Ь因徹幹因仰涯因徹患因仰概因仰碍因徹感蝟昭粡竚癈鷭т繻Ь因仰蓋因徹慣因徹憾因徹換因徹漢蝟昭粡竚癈鷭т繻Ь因仰柿因徹澗因徹潅蝟昭粡竚癈鷭т繻Ь因徹環因仰街因各憾因仰蛎因徹甘因徹監因涯仰蝟昭粡竚癈鷭т繻Ь因仰鈎因仰嚇因徹軌因徹輝蝟昭粡竚癈鷭т繻Ь因徹飢因徹騎因仰各蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展詑桍鹿粡寂蝟赱齠洲粤讌将圧巻圧規穐圧喬圧桑調穐蝶潮圧謙鹿粡寂蝟赱齠洲粤讌将調卯穐探喬調岡騎穐軍階穐圧幸鹿粡寂蝟赱齠洲粤讌将穐圧銭顕適穐圧測穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐調階圧狸穐穐況穐鹿粡寂蝟赱齠洲粤讌将穐穐騎適調巻穐穐穐穐鹿粡寂蝟赱齠洲粤讌将圧潮穐穐調桑穐斡巻圧適穐鹿粡寂蝟赱齠洲粤讌将圧頭斡穐穐穐穐穐穐斡卯鹿粡寂蝟赱齠洲粤讌将坦巻斡岡斡階調喬調規卦銭調謙穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限築蝟昭粡竚癈鷭т繻Ь因徹教因徹橋因崖騎因仰漢因徹況蝟昭粡竚癈鷭т繻Ь因徹狂因柿誼因仰換因仰飢因徹狭蝟昭粡竚癈鷭т繻Ь因徹響因仰潅因仰甘因漢教因仰澗因徹饗因徹驚蝟昭粡竚癈鷭т繻Ь因徹仰因仰環因仰輝因仰監因概咳因徹凝因仰軌蝟昭粡竚癈鷭т繻Ь因徹尭因徹薫因徹訓因徹群因仰騎因徹軍蝟昭粡竚癈鷭т繻Ь因徹郡因慣義因甘妓因徹卦因徹袈因徹祁因劃慨蝟昭粡竚癈鷭т繻Ь因仰鬼因徹係因徹傾因徹形因徹径蝟昭粡竚癈鷭т繻Ь因環臆因仰偽因徹恵因仰亀因仰宜因環官蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展堕桍鹿粡寂蝟赱齠洲粤讌将扱潮扱適諜謙渦卯涯潮諜桑諜狸渦岡鹿粡寂蝟赱齠洲粤讌将穐諜測穐穐諜銭騎岡諜潮渦階鹿粡寂蝟赱齠洲粤讌将穐渦巻渦規渦喬渦桑渦謙穐諜適鹿粡寂蝟赱齠洲粤讌将渦幸穐穐穐諜頭渦銭渦測攻狸鹿粡寂蝟赱齠洲粤讌将穐群規超穐超卯超岡渦狸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺限奴蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因各換因仰恭因撤可因鈎可因仰挟蝟昭粡竚癈鷭т繻Ь因撤嘉因撤夏因仰教因撤外因撤咳因撤害因飢憶蝟昭粡竚癈鷭т繻Ь因輝慧因仰橋因教薫因仰況蝟昭粡竚癈鷭т繻Ь因干牡因各佳因慣完因撤崖因撤慨因仰狂蝟昭粡竚癈鷭т繻Ь因撤概因漢亀因幹鬼因街慧因撤涯因干温蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰展惰桍鹿粡寂蝟赱齠洲粤讌将嘘桑嘘謙渦銭穐揃謙撞桑嘘幸穐鹿粡寂蝟赱齠洲粤讌将穐穐嘘銭嘘測穐嘘狸卦適穐鹿粡寂蝟赱齠洲粤讌将嘘潮橋卯嘘適嘘頭禅喬唄穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐超幸穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将唄卯穐超測唄岡唄階超銭俺穐穐鹿粡寂蝟赱齠洲粤讌将唄巻況喬超狸祁桑穐騎階唄規超潮鹿粡寂蝟赱齠洲粤讌将諜岡唄喬穐穐超頭唄桑唄謙担岡鹿粡寂蝟赱齠洲粤讌将跳適跳卯跳岡唄幸穐幹幸唄銭穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃異蝟昭粡竚癈鷭т繻Ь因寛彊因官祁因撤澗因感恩因撤潅因仰薫因概亀蝟昭粡竚癈鷭т繻Ь因撤環因仰傾因撤甘因仰袈因凝乙因感温蝟昭粡竚癈鷭т繻Ь因干彊因仰軍因幹慧因患騎因仰郡因仰係因各彊蝟昭粡竚癈鷭т繻Ь因撤監因慣況因幹潅因撤軌因完寛因仰祁因寛嘉蝟昭粡竚癈鷭т繻Ь因寛牡因仰卦因外温因監臆因仰形蝟昭粡竚癈鷭т繻Ь因撤輝因撤飢因撤鬼因撤亀因撤偽因寛怯因撤騎蝟昭粡竚癈鷭т繻Ь因劃概因各漢因撤儀因撤妓因仰恵因仰径因撤宜蝟昭粡竚癈鷭т繻Ь因外尭因仰慶因換夏因凝卸因撤義蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店険桍鹿粡寂蝟赱齠洲粤讌将穐教測洞測欝測欝狸概幸穐況謙鹿粡寂蝟赱齠洲粤讌将穐轍喬蝶桑嘘頭欝潮禅桑俺卯轍卯鹿粡寂蝟赱齠洲粤讌将轍岡轍階轍巻恭測害階斡階轍謙穐鹿粡寂蝟赱齠洲粤讌将轍幸寛階穐欝適桶潮欝頭轍銭穐鹿粡寂蝟赱齠洲粤讌将鰻階唄狸蔚穐顕頭穐諜銭蔚卯蔚岡鹿粡寂蝟赱齠洲粤讌将轍測飢狸穐穐蔚階鰻謙探桑轍狸鹿粡寂蝟赱齠洲粤讌将蔚巻穐轍頭穐蔚規超規轍潮渦測鹿粡寂蝟赱齠洲粤讌将渦銭蔚喬斡巻穐鉄測迭卯穐厳岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃菓蝟昭粡竚癈鷭т繻Ь因凝崖因凝害因凝外因恭挟因慨鬼因撤況因仰凝蝟昭粡竚癈鷭т繻Ь因撤狂因凝概因凝慨因撤狭因撤響因撤饗因凝涯蝟昭粡竚癈鷭т繻Ь因撤驚因環蓋因撤仰因撤凝蝟昭粡竚癈鷭т繻Ь因撤尭因撤薫因撤訓蝟昭粡竚癈鷭т繻Ь因撤群因撤軍因撤郡因感怯因撤卦因澗嘉蝟昭粡竚癈鷭т繻Ь因凝碍因鈎宜因凝蓋蝟昭粡竚癈鷭т繻Ь因撤袈因凝街因撤祁因撤係因撤傾因凝柿因撤形蝟昭粡竚癈鷭т繻Ь因患憶因撤径因撤慶蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店験桍鹿粡寂蝟赱齠洲粤讌将穐斡銭穐鰻適臆卯臆岡穐臆階鹿粡寂蝟赱齠洲粤讌将臆巻穐控幸穐鰻狸穐導銭穐鹿粡寂蝟赱齠洲粤讌将穐穐臆潮穐穐臆規穐臆喬鹿粡寂蝟赱齠洲粤讌将臆桑臆謙穐迭適臆幸臆銭感狸臆測鹿粡寂蝟赱齠洲粤讌将穐軍巻迭測穐迭狸臆狸穐穐鹿粡寂蝟赱齠洲粤讌将昂巻穐穐臆頭穐概巻穐桶穐鹿粡寂蝟赱齠洲粤讌将桶卯穐穐穐桶岡蝶幸臆適恭頭鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐亀巻桶階桶巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃館蝟昭粡竚癈鷭т繻Ь因轍概因凝各因轍涯因轍碍因轍蓋蝟昭粡竚癈鷭т繻Ь因轍街因轍柿蝟昭粡竚癈鷭т繻Ь因轍蛎因凝完因轍鈎因憧凝因轍劃因轍嚇蝟昭粡竚癈鷭т繻Ь因轍各因凝官因轍完因轍官因轍寛蝟昭粡竚癈鷭т繻Ь因轍干因轍患因轍感因轍幹因轍慣蝟昭粡竚癈鷭т繻Ь因轍憾因患臆因轍換因轍漢蝟昭粡竚癈鷭т繻Ь因凝干因轍澗因凝寛因轍潅因轍環因轍甘蝟昭粡竚癈鷭т繻Ь因轍監因轍軌因轍輝因轍飢蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店元桍鹿粡寂蝟赱齠洲粤讌将穐穐穐乙階穐穐穐乙巻鹿粡寂蝟赱齠洲粤讌将乙規教階鉄巻蝶喬旦穐卦測碍卯乙喬鹿粡寂蝟赱齠洲粤讌将穐穐歎岡乙桑洞狸穐鉄規乙謙鹿粡寂蝟赱齠洲粤讌将鉄喬乙幸乙銭乙測穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐乙狸撞潮鉄桑乙潮鉄謙穐乙適鹿粡寂蝟赱齠洲粤讌将穐鉄幸超頭穐蝶桑乙頭穐穐鹿粡寂蝟赱齠洲粤讌将穐穐鉄測鉄銭俺穐控銭穐昂階鹿粡寂蝟赱齠洲粤讌将卒穐俺卯俺岡俺階穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃緊蝟昭粡竚癈鷭т繻Ь因轍挟因凝甘因轍教因轍橋因轍況因劃橋蝟昭粡竚癈鷭т繻Ь因凝環因轍狂因凝潅因寛狭因轍狭蝟昭粡竚癈鷭т繻Ь因蓋尭因轍響因完干因轍饗因轍驚因轍仰因憾外蝟昭粡竚癈鷭т繻Ь因轍凝因劃街因轍尭蝟昭粡竚癈鷭т繻Ь因轍薫因凝監因嚇菊因轍訓蝟昭粡竚癈鷭т繻Ь因轍群因凝飢因凝軌因轍軍因轍郡因轍卦因凝輝蝟昭粡竚癈鷭т繻Ь因轍袈因轍祁因轍係因轍傾因凝鬼因凝騎因轍形蝟昭粡竚癈鷭т繻Ь因嚇形因凝亀因轍径因轍恵因轍慶因轍慧蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店厳桍鹿粡寂蝟赱齠洲粤讌将典喬典桑害卯害岡穐害階元穐禅階鹿粡寂蝟赱齠洲粤讌将旦卯典謙穐典幸轍巻調規旦適鉄狸鹿粡寂蝟赱齠洲粤讌将典銭橋岡穐害巻害規穐典測害喬鹿粡寂蝟赱齠洲粤讌将飢階害桑害謙典適碍謙憧測害幸典狸鹿粡寂蝟赱齠洲粤讌将穐典潮穐感穐害銭害測袖規況狸鹿粡寂蝟赱齠洲粤讌将穐害狸害潮穐害適害頭崖穐崖卯鹿粡寂蝟赱齠洲粤讌将崖岡崖階穐穐穐填穐填卯崖巻鹿粡寂蝟赱齠洲粤讌将穐崖規穐崖喬典頭崖桑穐填階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃雇蝟昭粡竚癈鷭т繻Ь因迭蓋因迭街因迭柿因迭蛎因迭鈎因迭劃蝟昭粡竚癈鷭т繻Ь因迭嚇因迭各因迭完因感菊因崖干蝟昭粡竚癈鷭т繻Ь因迭官因凝況因迭寛因迭干因凝挟因凝橋因迭幹蝟昭粡竚癈鷭т繻Ь因迭患因迭感因迭慣因凝恐蝟昭粡竚癈鷭т繻Ь因迭憾因迭換因迭漢因迭澗蝟昭粡竚癈鷭т繻Ь因迭潅因尭監因凝教因迭環因迭甘蝟昭粡竚癈鷭т繻Ь因迭監因迭軌因甘饗因迭輝因迭飢因蓋義蝟昭粡竚癈鷭т繻Ь因迭騎因迭鬼因迭亀因迭偽因迭儀因凝尭蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店弦桍鹿粡寂蝟赱齠洲粤讌将概謙穐概幸概銭騎巻填銭概測概狸鹿粡寂蝟赱齠洲粤讌将填潮填測概潮天穐穐概適概頭涯穐鹿粡寂蝟赱齠洲粤讌将天卯涯卯穐穐穐穐穐填幸鹿粡寂蝟赱齠洲粤讌将涯岡涯階天喬鰻巻涯巻涯規填謙穐鹿粡寂蝟赱齠洲粤讌将涯喬涯桑顕潮穐填狸涯謙填穐涯幸鹿粡寂蝟赱齠洲粤讌将涯銭涯測穐穐穐穐涯狸涯潮鹿粡寂蝟赱齠洲粤讌将涯適控測穐穐穐涯頭碍穐碍卯鹿粡寂蝟赱齠洲粤讌将碍岡碍階穐碍巻碍規碍喬卒謙碍桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃想蝟昭粡竚癈鷭т繻Ь因涯挟因劃感因感鈎蝟昭粡竚癈鷭т繻Ь因迭係因迭傾因迭形因迭径因迭恵蝟昭粡竚癈鷭т繻Ь因官可因迭慶因凝郡因凝凝因凝軍因迭慧蝟昭粡竚癈鷭т繻Ь因潅干因鉄憶因幹蓋因凝卦因凝群因鉄臆蝟昭粡竚癈鷭т繻Ь因鉄桶因鉄牡因鉄乙因鉄俺蝟昭粡竚癈鷭т繻Ь因鉄卸因鉄恩因官加因鉄温蝟昭粡竚癈鷭т繻Ь因鉄価因鉄佳因凝傾蝟昭粡竚癈鷭т繻Ь因鉄加因凝係因鉄可因鉄嘉因鉄夏因鉄外因鉄咳蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店限桍鹿粡寂蝟赱齠洲粤讌将干岡干階干巻干規穐干喬干桑干謙鹿粡寂蝟赱齠洲粤讌将干幸穐穐干銭干測干狸干潮天桑鹿粡寂蝟赱齠洲粤讌将干適穐族頭干頭穐幹穐穐幹卯鹿粡寂蝟赱齠洲粤讌将幹岡幹階穐穐幹巻幹規穐幹喬鹿粡寂蝟赱齠洲粤讌将幹桑幹謙穐幹幸跳測幹銭穐幹測鹿粡寂蝟赱齠洲粤讌将幹狸天銭禅頭穐幹潮欝巻幹適穐鹿粡寂蝟赱齠洲粤讌将幹頭穐拘喬碍岡穐穐穐穐鹿粡寂蝟赱齠洲粤讌将儀謙患穐天狸患卯控潮穐穐患岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃築蝟昭粡竚癈鷭т繻Ь因鉄騎因鉄鬼因蛎加蝟昭粡竚癈鷭т繻Ь因鉄亀因鉄偽因凝径蝟昭粡竚癈鷭т繻Ь因各仰因鉄儀因鉄妓因鉄宜蝟昭粡竚癈鷭т繻Ь因各凝因尭憶因尭桶因鉄義因鉄蟻因鉄誼因鉄議蝟昭粡竚癈鷭т繻Ь因嚇径因鉄掬因尭臆因尭牡因鉄菊因鉄彊因涯騎因鉄怯蝟昭粡竚癈鷭т繻Ь因換患因鉄恐因鉄恭因鈎恐因監桶因凝慧因柿係蝟昭粡竚癈鷭т繻Ь因監各因鉄挟因鉄教因尭俺因鉄橋因鉄況蝟昭粡竚癈鷭т繻Ь因尭乙因尭卸蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店個桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐天潮穐穐感謙鹿粡寂蝟赱齠洲粤讌将感幸感銭穐橋幸穐亀規穐穐鹿粡寂蝟赱齠洲粤讌将感測感狸感潮穐患桑感適堂狸感頭鹿粡寂蝟赱齠洲粤讌将慣穐穐慣卯慨階堂謙穐慣岡穐鹿粡寂蝟赱齠洲粤讌将堂幸穐穐穐慣階慣巻穐慣規鹿粡寂蝟赱齠洲粤讌将穐慣喬慣桑穐群潮慣謙堂測慣幸鹿粡寂蝟赱齠洲粤讌将慣銭慣測穐慣狸慣潮験穐慣適穐鹿粡寂蝟赱齠洲粤讌将穐穐飢卯穐堂銭飢岡填卯飢階鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺晃奴蝟昭粡竚癈鷭т繻Ь因典牡因典乙因典俺蝟昭粡竚癈鷭т繻Ь因典卸因典恩因典温因崖傾因典価因典佳蝟昭粡竚癈鷭т繻Ь因典加因尭外因典可因柿各因官傾蝟昭粡竚癈鷭т繻Ь因典嘉因幹漢因典夏因典外蝟昭粡竚癈鷭т繻Ь因典咳因典害因典崖因典慨因崖蛎蝟昭粡竚癈鷭т繻Ь因典概因典蛎因典涯因尭嘉因尭夏因幹干蝟昭粡竚癈鷭т繻Ь因尭可因典碍因典蓋因典街蝟昭粡竚癈鷭т繻Ь因尭咳因典柿蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店呼桍鹿粡寂蝟赱齠洲粤讌将穐騎狸穐導桑騎潮騎適騎頭鬼穐鹿粡寂蝟赱齠洲粤讌将導銭鬼卯鬼岡鬼階鬼巻鬼規穐穐鹿粡寂蝟赱齠洲粤讌将導幸飢潮穐鬼喬穐穐導岡導階鹿粡寂蝟赱齠洲粤讌将導喬鬼桑穐穐鬼謙導謙鬼幸鬼銭鹿粡寂蝟赱齠洲粤讌将穐挟穐鬼測穐導測導規鬼狸鬼潮鹿粡寂蝟赱齠洲粤讌将導巻穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐鬼頭鹿粡寂蝟赱齠洲粤讌将亀穐鬼適亀卯亀岡穐亀階穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺更異蝟昭粡竚癈鷭т繻Ь因典鬼因典亀因尭各因典偽因尭完蝟昭粡竚癈鷭т繻Ь因典儀因典妓因典宜因典義因典蟻蝟昭粡竚癈鷭т繻Ь因尭官因尭嚇因尭劃因典誼因典議因典掬蝟昭粡竚癈鷭т繻Ь因嚇恐因感価因尭鈎因典菊蝟昭粡竚癈鷭т繻Ь因尭患蝟昭粡竚癈鷭т繻Ь因尭干因典彊因典怯蝟昭粡竚癈鷭т繻Ь因典恐因典恭因典挟因典教因尭幹因尭寛蝟昭粡竚癈鷭т繻Ь因寛係因尭感因典橋因典狂因典況蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店恒桍鹿粡寂蝟赱齠洲粤讌将穐憧桑穐偽幸憧幸偽銭穐穐鹿粡寂蝟赱齠洲粤讌将偽測穐偽狸穐偽潮穐穐穐鹿粡寂蝟赱齠洲粤讌将穐患規憧謙歎銭穐偽適穐穐鹿粡寂蝟赱齠洲粤讌将穐偽頭撞巻憧銭儀穐穐憧潮儀卯鹿粡寂蝟赱齠洲粤讌将憧測儀岡憧狸儀階穐穐穐穐鹿粡寂蝟赱齠洲粤讌将儀巻穐憧適儀規穐儀喬儀桑儀謙鹿粡寂蝟赱齠洲粤讌将撞穐儀幸儀銭穐穐撞卯穐撞岡鹿粡寂蝟赱齠洲粤讌将穐穐穐穐撞規撞階撞喬撞謙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺更菓蝟昭粡竚癈鷭т繻Ь因尭儀因典恵因典径蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店控桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐干幸鹿粡寂蝟赱齠洲粤讌将儀潮儀適穐穐穐穐恐卯穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺更緊蝟昭粡竚癈鷭т繻Ь因潅況因尭宜因官嘉因填臆因尭義蝟昭粡竚癈鷭т繻Ь因填桶因漢幹因尭蟻因崖佳因填牡因填乙因填俺因咳鈎蝟昭粡竚癈鷭т繻Ь因慨儀因憧訓因慨偽因尭誼因尭議蝟昭粡竚癈鷭т繻Ь因尭掬因尭菊因填卸因填恩因填温蝟昭粡竚癈鷭т繻Ь因尭彊因填価因慨妓因崖亀因街掬因憾涯因填佳因尭恐蝟昭粡竚癈鷭т繻Ь因尭怯因填加因填可因填嘉因尭恭蝟昭粡竚癈鷭т繻Ь因咳誼因填夏因填外蝟昭粡竚癈鷭т繻Ь因尭橋因填咳因尭教因尭挟因填害因尭況因填崖蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店昂桍鹿粡寂蝟赱齠洲粤讌将穐穐穐洞銭穐穐恭巻梓桑鹿粡寂蝟赱齠洲粤讌将恭規恭喬洞謙恭桑洞狸洞測穐穐鹿粡寂蝟赱齠洲粤讌将恭謙恭幸恭銭恭測洞適洞潮洞頭穐鹿粡寂蝟赱齠洲粤讌将恐適恭狸恭潮穐瞳穐恭適恭頭挟穐鹿粡寂蝟赱齠洲粤讌将挟卯瞳卯瞳階穐挟岡瞳岡挟階穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺更雇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因換驚因填幹因填患蝟昭粡竚癈鷭т繻Ь因尭郡因填感因填慣因填憾因填換蝟昭粡竚癈鷭т繻Ь因尭卦因柿教因填漢因尭袈因尭祁蝟昭粡竚癈鷭т繻Ь因填澗因澗換因填潅因填環蝟昭粡竚癈鷭т繻Ь因填甘因填監因填軌因官澗因填輝因填飢因外牡蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店更桍鹿粡寂蝟赱齠洲粤讌将牡測教階瞳謙穐攻潮穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐瞳測瞳幸控頭穐瞳銭鹿粡寂蝟赱齠洲粤讌将鹸岡穐教巻穐教規穐教喬教桑鹿粡寂蝟赱齠洲粤讌将教謙穐穐全規瞳潮芦卯瞳適芦岡鹿粡寂蝟赱齠洲粤讌将穐教幸渦卯撞謙跳狸患幸芦階穐鹿粡寂蝟赱齠洲粤讌将穐穐袈喬穐芦規穐教銭穐鹿粡寂蝟赱齠洲粤讌将渦岡穐芦巻幹巻教測鉄潮恐測瞳狸鹿粡寂蝟赱齠洲粤讌将轍喬穐験卯教狸教潮諜測教適教頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺更想蝟昭粡竚癈鷭т繻Ь因填彊因填怯因填恐因填恭因涯傾因甘慨蝟昭粡竚癈鷭т繻Ь因碍恩因填挟因寛恐因況憶因薫俺因崖加因各尭蝟昭粡竚癈鷭т繻Ь因填教因崖偽因薫恩因填橋因薫温蝟昭粡竚癈鷭т繻Ь因薫卸因碍挟因填況因柿議因嚇恭因填狂因填狭蝟昭粡竚癈鷭т繻Ь因咳桶因甘宜因填響因填饗因填驚因薫佳蝟昭粡竚癈鷭т繻Ь因凝嘉因填仰因薫価因填凝因填尭蝟昭粡竚癈鷭т繻Ь因薫嘉因薫加因薫可因填薫因薫夏因薫外因甘驚蝟昭粡竚癈鷭т繻Ь因薫咳因薫害因填訓因完換因憾蛎蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店溝桍鹿粡寂蝟赱齠洲粤讌将瞳潮感桑穐穐蝶銭俺潮蝶謙元測鹿粡寂蝟赱齠洲粤讌将穐鯵規況岡鯵巻揃階鯵喬鯵階穐鹿粡寂蝟赱齠洲粤讌将穐族謙況階穐穐鯵銭漸潮穐鹿粡寂蝟赱齠洲粤讌将況規乙喬況喬瞳桑鯵謙況桑況謙況幸鹿粡寂蝟赱齠洲粤讌将穐穐轍規況卯穐穐穐穐鹿粡寂蝟赱齠洲粤讌将渦測況銭斡階坦喬穐穐穐況測鹿粡寂蝟赱齠洲粤讌将然桑況狸唄穐穐穐穐填潮超測鹿粡寂蝟赱齠洲粤讌将穐鯵測況潮鬼規穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺更築蝟昭粡竚癈鷭т繻Ь因鈎径因填慧因天憶因薫鈎因天臆因薫劃因各潅蝟昭粡竚癈鷭т繻Ь因薫嚇因天桶因甘凝因薫街因薫完因薫寛蝟昭粡竚癈鷭т繻Ь因薫官因薫各因薫干蝟昭粡竚癈鷭т繻Ь因薫幹因天牡因天乙因官形因天俺因害恐蝟昭粡竚癈鷭т繻Ь因天卸因天恩因天温因薫患因潅蓋蝟昭粡竚癈鷭т繻Ь因天価因薫感蝟昭粡竚癈鷭т繻Ь因薫慣因天佳因監価因天加蝟昭粡竚癈鷭т繻Ь因蟻咳因薫憾因憧郡因薫換因薫漢蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店皇桍鹿粡寂蝟赱齠洲粤讌将穐群潮梓適群適梓測穐梓狸穐鹿粡寂蝟赱齠洲粤讌将梓潮梓頭群頭穐穐慣規軍穐軍卯鹿粡寂蝟赱齠洲粤讌将穐慣喬梓巻穐穐軍岡歎桑軍階鹿粡寂蝟赱齠洲粤讌将軍巻梓規軍規軍喬圧穐穐厳階穐鹿粡寂蝟赱齠洲粤讌将圧卯概階担狸軍桑圧岡穐圧階軍謙鹿粡寂蝟赱齠洲粤讌将圧巻概桑軍幸圧喬穐撞幸軍銭穐鹿粡寂蝟赱齠洲粤讌将穐圧桑穐軍測群巻穐軍狸軍潮鹿粡寂蝟赱齠洲粤讌将軍適圧謙圧狸軍頭圧銭郡穐穐郡卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺更奴蝟昭粡竚癈鷭т繻Ь因天寛因薫蟻因崖軍因薫宜因薫議蝟昭粡竚癈鷭т繻Ь因天干因薫掬因外憾因薫菊蝟昭粡竚癈鷭т繻Ь因薫彊因天幹因天患因天感蝟昭粡竚癈鷭т繻Ь因嚇挟因天慣因天憾因薫怯因天換因天漢蝟昭粡竚癈鷭т繻Ь因概慣因天澗因薫挟因薫恭蝟昭粡竚癈鷭т繻Ь因薫恐因饗訓因天潅因漢誼因天環蝟昭粡竚癈鷭т繻Ь因天甘因天監因薫教因薫橋因天軌因天輝蝟昭粡竚癈鷭т繻Ь因天飢因天騎因天鬼因天亀因天偽因天儀蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店稿桍鹿粡寂蝟赱齠洲粤讌将穐卦謙穐斡桑卦幸卦銭斡謙卦測鹿粡寂蝟赱齠洲粤讌将斡幸卦狸卦潮斡銭卦適卦頭袈穐穐鹿粡寂蝟赱齠洲粤讌将袈卯袈岡穐患銭袈階穐穐袈巻鹿粡寂蝟赱齠洲粤讌将袈規袈喬穐袈銭斡測袈桑袈謙穐鹿粡寂蝟赱齠洲粤讌将袈幸袈測穐穐袈狸穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐斡狸群階袈潮鹿粡寂蝟赱齠洲粤讌将穐袈適斡適桶測袈頭扱卯扱穐祁穐鹿粡寂蝟赱齠洲粤讌将祁卯穐祁岡渦巻穐穐穐挟卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港異蝟昭粡竚癈鷭т繻Ь因漢慣因幹柿因柿臆因街彊因劃況因天軍蝟昭粡竚癈鷭т繻Ь因各誼因天郡因薫軍因天袈因天祁因薫群蝟昭粡竚癈鷭т繻Ь因環寛因慨狂因憾飢因感誼因天係因天傾因各恵蝟昭粡竚癈鷭т繻Ь因甘甘因天卦因碍蟻因天形因天径蝟昭粡竚癈鷭т繻Ь因天恵因薫袈因天慶因薫卦因展恩因天慧蝟昭粡竚癈鷭т繻Ь因展憶因澗澗因感加因展臆因展桶蝟昭粡竚癈鷭т繻Ь因展牡因展乙因展俺因咳軌因展卸因薫祁蝟昭粡竚癈鷭т繻Ь因薫郡因換輝因環響因薫係因展温蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店善桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐顕銭穐扱幸顕測鹿粡寂蝟赱齠洲粤讌将穐穐顕狸扱測俺銭概測概狸扱銭鹿粡寂蝟赱齠洲粤讌将穐顕潮顕適顕頭感幸験岡験穐験卯鹿粡寂蝟赱齠洲粤讌将感銭験岡験階騎頭穐穐填穐穐鹿粡寂蝟赱齠洲粤讌将穐穐験巻験規穐験喬験桑元狸鹿粡寂蝟赱齠洲粤讌将穐穐験謙扱狸験幸穐穐扱潮鹿粡寂蝟赱齠洲粤讌将扱適渦卯穐渦階渦岡穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港菓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因換祁因訓牡因展柿因展蛎因展鈎因訓乙蝟昭粡竚癈鷭т繻Ь因展劃因訓俺因展嚇因訓卸因展各蝟昭粡竚癈鷭т繻Ь因展完因展官因展寛因展干蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店然桍鹿粡寂蝟赱齠洲粤讌将穐穐鹸巻渦幸渦謙鹸規渦銭穐鹿粡寂蝟赱齠洲粤讌将鹸喬穐穐穐鹸桑穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐厳巻挟狸穐穐堂幸鹿粡寂蝟赱齠洲粤讌将穐鹸謙騎岡鹸幸穐鹸銭鹸測鹸狸鹿粡寂蝟赱齠洲粤讌将穐渦測鹸潮渦狸穐臆狸蝶測元階鹿粡寂蝟赱齠洲粤讌将穐穐扱測鹸適鯵測穐鹸頭穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐揃巻続穐天適穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港館蝟昭粡竚癈鷭т繻Ь因展軌因訓可因潅菊因展輝蝟昭粡竚癈鷭т繻Ь因展飢因訓嘉因環誼因咳寛蝟昭粡竚癈鷭т繻Ь因蛎官因展騎因訓夏因害凝因訓外因展鬼因展亀因展偽蝟昭粡竚癈鷭т繻Ь因訓咳因展儀因展妓因展宜因訓崖因訓慨因展義蝟昭粡竚癈鷭т繻Ь因訓涯因訓害因展蟻因訓概因展誼因展議蝟昭粡竚癈鷭т繻Ь因慨蟻因展掬因訓碍因訓蓋蝟昭粡竚癈鷭т繻Ь因展菊因展彊因展怯因展恐因展恭蝟昭粡竚癈鷭т繻Ь因展挟因展教因展橋因展況因訓街因訓柿蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店禅桍鹿粡寂蝟赱齠洲粤讌将原謙原幸嘘測穐穐嘘潮原銭原測鹿粡寂蝟赱齠洲粤讌将原狸嘘狸穐嘘頭唄岡原潮原適穐鹿粡寂蝟赱齠洲粤讌将嘘適唄穐唄卯穐原頭唄階穐挟岡鹿粡寂蝟赱齠洲粤讌将厳穐厳卯穐厳岡厳階穐厳巻厳規鹿粡寂蝟赱齠洲粤讌将厳喬穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港緊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因鈎軍因訓幹蝟昭粡竚癈鷭т繻Ь因訓患因街怯因展祁因展係因憧形因展傾蝟昭粡竚癈鷭т繻Ь因訓感因展形蝟昭粡竚癈鷭т繻Ь因崖嚇因慣監因訓慣因訓憾蝟昭粡竚癈鷭т繻Ь因展径因展恵因展慶因干義因感饗因展慧蝟昭粡竚癈鷭т繻Ь因店憶因店臆因訓換因店桶因店牡蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店膳桍鹿粡寂蝟赱齠洲粤讌将穐祁潮穐慌規牡狸欝謙橋適穐鹿粡寂蝟赱齠洲粤讌将橋頭慌喬穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将碍階唄適況穐慌桑慌謙俺頭穐穐鹿粡寂蝟赱齠洲粤讌将唄潮慌幸慌銭唄測慌測唄狸慌狸唄銭鹿粡寂蝟赱齠洲粤讌将穐穐欝謙穐穐穐穐慌潮鹿粡寂蝟赱齠洲粤讌将穐穐慌適慌頭抗穐唄頭欝穐穐鹿粡寂蝟赱齠洲粤讌将抗卯欝卯欝岡穐抗岡抗階穐穐鹿粡寂蝟赱齠洲粤讌将欝巻抗巻穐欝階穐抗規抗喬諜幸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港雇蝟昭粡竚癈鷭т繻Ь因訓亀因店碍因店蓋因店街因訓儀蝟昭粡竚癈鷭т繻Ь因店柿因店蛎因概崖因訓偽蝟昭粡竚癈鷭т繻Ь因店鈎因店劃因官径因蓋崖因店嚇蝟昭粡竚癈鷭т繻Ь因訓宜因店各蝟昭粡竚癈鷭т繻Ь因店完因店官因店寛因店干因店幹蝟昭粡竚癈鷭т繻Ь因寛環因訓義因店患因店感蝟昭粡竚癈鷭т繻Ь因感可因店慣因店憾因店換因訓蟻蝟昭粡竚癈鷭т繻Ь因店漢因訓彊蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店噌桍鹿粡寂蝟赱齠洲粤讌将欝適拘狸欝潮欝頭拘潮欝狸穐拘測鹿粡寂蝟赱齠洲粤讌将穐穐拘適拘頭控穐蔚岡控卯穐鹿粡寂蝟赱齠洲粤讌将穐控岡穐穐控階蔚卯控巻蔚巻鹿粡寂蝟赱齠洲粤讌将穐穐挟階蔚階穐控規穐蔚規鹿粡寂蝟赱齠洲粤讌将穐穐蔚喬穐蔚謙蔚桑穐穐鹿粡寂蝟赱齠洲粤讌将穐蔚幸蔚測蔚銭穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港想蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因街恵因店偽因店儀因訓驚因店妓因店宜蝟昭粡竚癈鷭т繻Ь因訓仰因店義因店蟻因店誼因店議蝟昭粡竚癈鷭т繻Ь因崖鈎因店掬因店菊因訓凝因店彊因店怯蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店疎桍鹿粡寂蝟赱齠洲粤讌将蔚頭攻岡穐攻階瞳卯穐攻巻穐鹿粡寂蝟赱齠洲粤讌将攻規穐穐穐穐穐攻喬鰻穐鹿粡寂蝟赱齠洲粤讌将攻桑鰻卯攻謙鰻岡鰻階攻幸攻銭攻測鹿粡寂蝟赱齠洲粤讌将攻岡慣測穐攻狸攻潮穐鰻巻鰻規鹿粡寂蝟赱齠洲粤讌将攻適穐鰻喬鰻桑攻頭昂穐鰻謙昂卯鹿粡寂蝟赱齠洲粤讌将穐昂岡験卯鰻銭昂階慌喬鰻測鰻幸鹿粡寂蝟赱齠洲粤讌将穐鰻潮昂巻昂規鰻狸昂喬穐鰻適鹿粡寂蝟赱齠洲粤讌将穐昂桑昂謙臆卯穐昂幸穐昂銭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港築蝟昭粡竚癈鷭т繻Ь因店径因店恵因店慶因店慧因伝憶因伝臆因群臆蝟昭粡竚癈鷭т繻Ь因伝桶因伝牡因伝乙因伝俺因伝卸因伝恩蝟昭粡竚癈鷭т繻Ь因伝温因伝価因伝佳蝟昭粡竚癈鷭т繻Ь因群桶因伝加因群牡因伝可因伝嘉因群乙蝟昭粡竚癈鷭т繻Ь因伝夏因群俺因群卸因群恩因伝外因群温蝟昭粡竚癈鷭т繻Ь因群価因群佳因群加因伝咳因伝害因群可因群嘉蝟昭粡竚癈鷭т繻Ь因議概因群夏因伝崖因伝慨因伝概因伝涯蝟昭粡竚癈鷭т繻Ь因伝碍因伝蓋因挟係因概慨因伝街蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店祖桍鹿粡寂蝟赱齠洲粤讌将穐害卯然岡桶卯桶穐嘆規穐穐鹿粡寂蝟赱齠洲粤讌将然銭穐穐然測然狸桶階桶巻桶岡鹿粡寂蝟赱齠洲粤讌将穐桶規穐穐其岡然潮然適然頭鹿粡寂蝟赱齠洲粤讌将桶喬穐儀測全穐穐穐全卯穐鹿粡寂蝟赱齠洲粤讌将穐全岡穐全階穐全巻全規穐鹿粡寂蝟赱齠洲粤讌将全喬穐全桑全謙全幸全銭全測堂規鹿粡寂蝟赱齠洲粤讌将穐穐慣狸全狸桶桑全潮穐全適鹿粡寂蝟赱齠洲粤讌将全頭禅穐穐穐穐穐穐禅卯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺港奴蝟昭粡竚癈鷭т繻Ь因伝飢因群街因伝騎因伝鬼因伝亀因伝偽蝟昭粡竚癈鷭т繻Ь因伝儀因伝妓因伝宜因伝義因外嚇因伝蟻蝟昭粡竚癈鷭т繻Ь因伝誼因群柿因漢佳因群蓋因伝議因群蛎因群鈎蝟昭粡竚癈鷭т繻Ь因伝掬因伝菊因伝彊因群劃蝟昭粡竚癈鷭т繻Ь因群嚇因伝怯因伝恐蝟昭粡竚癈鷭т繻Ь因群各因伝恭因澗凝因蛎可因伝挟因柿形因官夏蝟昭粡竚癈鷭т繻Ь因伝教因伝橋因伝況因群完因伝狂蝟昭粡竚癈鷭т繻Ь因伝狭因群干因伝響因伝饗因伝驚因伝仰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店粗桍鹿粡寂蝟赱齠洲粤讌将牡卯繕適穐穐穐穐牡巻繕頭鹿粡寂蝟赱齠洲粤讌将膳穐厳卯牡岡穐穐穐膳卯牡規鹿粡寂蝟赱齠洲粤讌将膳岡牡喬牡桑穐牡測穐族銭膳階鹿粡寂蝟赱齠洲粤讌将膳巻穐穐俺巻穐膳規穐膳喬鹿粡寂蝟赱齠洲粤讌将穐牡狸牡幸牡謙牡銭膳桑穐膳謙鹿粡寂蝟赱齠洲粤讌将卦頭穐膳幸膳銭穐穐穐膳測鹿粡寂蝟赱齠洲粤讌将乙穐牡頭牡適膳狸穐鯵階穐膳潮鹿粡寂蝟赱齠洲粤讌将膳適族卯族岡穐穐族階穐族巻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺溝異蝟昭粡竚癈鷭т繻Ь因殿乙因殿俺因群義因群偽蝟昭粡竚癈鷭т繻Ь因群儀因群騎因群宜因殿卸因群亀因崖恐因殿恩蝟昭粡竚癈鷭т繻Ь因監潅因殿温因群妓因群鬼因群飢因群輝因殿価蝟昭粡竚癈鷭т繻Ь因殿佳因殿加因殿可因群誼因殿嘉因殿夏蝟昭粡竚癈鷭т繻Ь因群菊因殿外因殿咳因群掬因群議因殿害因殿崖蝟昭粡竚癈鷭т繻Ь因殿慨因殿概因殿涯因換換因群蟻因外軍蝟昭粡竚癈鷭т繻Ь因群彊因殿碍因群恐因殿蓋因殿街因殿柿蝟昭粡竚癈鷭т繻Ь因崖尭因群環因咳碍因殿蛎因群挟蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店賊桍鹿粡寂蝟赱齠洲粤讌将穐続狸穐続潮続適続頭俺階俺卯鹿粡寂蝟赱齠洲粤讌将害潮卒穐卒卯穐穐穐卒岡卒階鹿粡寂蝟赱齠洲粤讌将卒巻穐揃穐卒規卒喬穐卒桑典銭鹿粡寂蝟赱齠洲粤讌将卒謙穐俺規卒幸袖穐卒銭卒測卒狸鹿粡寂蝟赱齠洲粤讌将俺喬穐穐卒潮穐穐穐俺桑鹿粡寂蝟赱齠洲粤讌将袖岡卒適卒頭袖卯穐穐袖階穐鹿粡寂蝟赱齠洲粤讌将袖巻穐袖規穐穐袖喬俺謙袖桑鹿粡寂蝟赱齠洲粤讌将俺幸穐穐袖謙穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺溝額蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因幹蛎因殿宜因群響蝟昭粡竚癈鷭т繻Ь因憾碍因群尭因群饗蝟昭粡竚癈鷭т繻Ь因群驚因殿義因澗咳因潅幹因感軌因殿蟻蝟昭粡竚癈鷭т繻Ь因殿誼蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店卒桍鹿粡寂蝟赱齠洲粤讌将穐穐袖適卸穐穐穐卸卯恭適鹿粡寂蝟赱齠洲粤讌将俺適俺潮穐袖潮穐穐臆銭穐鹿粡寂蝟赱齠洲粤讌将穐袖頭卸幸穐穐卸謙穐其穐鹿粡寂蝟赱齠洲粤讌将其卯穐穐鰻規其岡其階其巻卸喬鹿粡寂蝟赱齠洲粤讌将穐穐穐卸規穐穐卸階穐鹿粡寂蝟赱齠洲粤讌将碍測穐卸岡坦岡臆幸穐穐其規鹿粡寂蝟赱齠洲粤讌将其喬穐其桑其謙其幸穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐其銭攻階其測其潮卸狸卸測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺溝吸蝟昭粡竚癈鷭т繻Ь因群形因殿凝因殿尭因群祁因殿驚因群慶因殿薫蝟昭粡竚癈鷭т繻Ь因群慧因殿訓蝟昭粡竚癈鷭т繻Ь因軍乙因軍牡因殿群因殿軍蝟昭粡竚癈鷭т繻Ь因軍俺因咳可因軍憶因軍臆因殿郡蝟昭粡竚癈鷭т繻Ь因街郡因潅街因殿袈因殿卦因軍桶因殿祁蝟昭粡竚癈鷭т繻Ь因殿係因殿傾因殿形因澗害因軍佳蝟昭粡竚癈鷭т繻Ь因殿径因軍卸因殿恵因殿慶蝟昭粡竚癈鷭т繻Ь因軍加因殿慧因澱憶因澱臆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店其桍鹿粡寂蝟赱齠洲粤讌将穐穐穐嘆階嘆巻穐嘆規害幸鹿粡寂蝟赱齠洲粤讌将穐害謙嘆喬穐穐嘆桑嘆謙卦狸鹿粡寂蝟赱齠洲粤讌将穐穐嘆幸嘆銭穐嘆測嘆狸嘆潮鹿粡寂蝟赱齠洲粤讌将嘆適穐害潮穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐嘆頭穐穐害適穐穐穐鹿粡寂蝟赱齠洲粤讌将穐害頭坦穐害銭坦卯穐坦岡卸巻鹿粡寂蝟赱齠洲粤讌将穐坦階崖穐穐感卯坦巻穐穐鹿粡寂蝟赱齠洲粤讌将崖巻坦規崖規崖階坦喬穐穐坦桑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺溝頚蝟昭粡竚癈鷭т繻Ь因軍害因軍蓋因澱蓋因軍咳因軍涯因澱街蝟昭粡竚癈鷭т繻Ь因澱柿因澱蛎因軍碍蝟昭粡竚癈鷭т繻Ь因軍柿因澱鈎因澱劃因澱嚇因澱各蝟昭粡竚癈鷭т繻Ь因軍街因澱完因澱官因澱寛蝟昭粡竚癈鷭т繻Ь因澱干因澱幹因軍鈎因澱患蝟昭粡竚癈鷭т繻Ь因澱感因澱慣因軍劃因澱憾因軍嚇蝟昭粡竚癈鷭т繻Ь因澱換因監換因澱漢因澱澗蝟昭粡竚癈鷭т繻Ь因軍蛎因寛饗因柿仰因軍各因澱潅蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店存桍鹿粡寂蝟赱齠洲粤讌将穐穐担適穐穐穐穐担頭鹿粡寂蝟赱齠洲粤讌将穐穐担潮穐穐穐探穐穐鹿粡寂蝟赱齠洲粤讌将探卯探岡探階穐穐探巻探規穐鹿粡寂蝟赱齠洲粤讌将穐探喬慨穐慨卯探桑探謙慨岡穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺溝鉱蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因軍干蝟昭粡竚癈鷭т繻Ь因蓋慨因軍幹因澱宜因澱義因澱蟻因軍患因鈎夏蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店汰桍鹿粡寂蝟赱齠洲粤讌将探狸慨喬探潮探適探頭旦穐穐旦卯鹿粡寂蝟赱齠洲粤讌将慨桑穐穐慨謙慨幸穐旦岡旦階鹿粡寂蝟赱齠洲粤讌将穐慨狸慨銭導狸穐慨測旦巻填頭鹿粡寂蝟赱齠洲粤讌将旦規穐穐旦喬穐慨潮旦桑典測鹿粡寂蝟赱齠洲粤讌将穐穐穐穐旦謙慨適祁適穐鹿粡寂蝟赱齠洲粤讌将旦幸慨頭概卯穐旦銭概岡旦測旦狸鹿粡寂蝟赱齠洲粤讌将旦潮穐穐旦適旦頭歎穐穐穐鹿粡寂蝟赱齠洲粤讌将概穐攻潮担潮其階況桑穐超穐揃測鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺溝胎蝟昭粡竚癈鷭т繻Ь因害佳因澱訓蝟昭粡竚癈鷭т繻Ь因澱群因澱軍因軍鬼因概軌因軍亀因軍偽蝟昭粡竚癈鷭т繻Ь因軍儀因憧慧因街卦因軍妓因澱郡蝟昭粡竚癈鷭т繻Ь因彊鬼因潅蟻因寛恭因軍宜因軍蟻因軍義因澱卦蝟昭粡竚癈鷭т繻Ь因軍誼因澱袈因軍議因澱祁蝟昭粡竚癈鷭т繻Ь因軍掬因澱係因澱傾因澱形因軍菊蝟昭粡竚癈鷭т繻Ь因澱径因澱恵因澱慶因軍彊因澱慧因軍怯因軍恐蝟昭粡竚癈鷭т繻Ь因田憶因軍恭因軍挟因軍教因軍橋因田臆蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店唾桍鹿粡寂蝟赱齠洲粤讌将穐穐腸階腸巻穐穐穐涯桑鹿粡寂蝟赱齠洲粤讌将涯謙腸規穐穐穐穐飢巻腸喬鹿粡寂蝟赱齠洲粤讌将腸桑腸謙腸幸元潮腸銭涯銭腸測腸狸鹿粡寂蝟赱齠洲粤讌将穐腸潮腸適腸頭穐穐穐蝶穐鹿粡寂蝟赱齠洲粤讌将唄潮涯測蝶卯穐穐穐蝶岡穐鹿粡寂蝟赱齠洲粤讌将穐穐蝶階蝶巻涯狸穐穐蝶規鹿粡寂蝟赱齠洲粤讌将穐蝶喬蝶桑穐蝶謙穐穐蝶幸鹿粡寂蝟赱齠洲粤讌将穐蝶銭蝶測慌卯蝶狸蝶潮涯潮蝶適鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺溝壷蝟昭粡竚癈鷭т繻Ь因田各因田完因田官因田寛因田干因田幹蝟昭粡竚癈鷭т繻Ь因軍凝因恭碍因驚義因薫仰蝟昭粡竚癈鷭т繻Ь因軍尭因田患因軍薫因田感因田慣因田憾蝟昭粡竚癈鷭т繻Ь因田換因田漢因田澗因田潅因軍群蝟昭粡竚癈鷭т繻Ь因軍軍因軍郡因甘薫因軍訓因軍卦因軍袈蝟昭粡竚癈鷭т繻Ь因田環因田甘因軍係因軍祁因田監因田軌因田輝蝟昭粡竚癈鷭т繻Ь因田飢因田騎因軍形因田鬼因田亀因軍径因軍傾蝟昭粡竚癈鷭т繻Ь因田偽因田儀蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰店妥桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐迭喬穐諜謙鹿粡寂蝟赱齠洲粤讌将諜幸諜銭諜測穐諜狸碍狸諜潮諜適鹿粡寂蝟赱齠洲粤讌将穐穐穐穐碍潮概巻諜頭穐鹿粡寂蝟赱齠洲粤讌将碍適超穐超卯超岡穐超階穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺徳館蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憧患蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰兎膳桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐慣岡穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺徳雇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憧慨因憧碍蝟昭粡竚癈鷭т繻Ь因憧蓋因憧劃因憧幹因憧慣因憧憾因憧甘因憧監因憧騎蝟昭粡竚癈鷭т繻Ь因憧亀因憧偽因憧儀因憧妓因憧義因憧蟻因憧掬因憧彊蝟昭粡竚癈鷭т繻Ь因憧恐因憧恭因憧教因憧狭因憧響因憧饗因憧仰因憧尭蝟昭粡竚癈鷭т繻Ь因憧薫因憧軍因憧祁因憧係因憧傾因憧慶蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰兎唾桍鹿粡寂蝟赱齠洲粤讌将穐渦銭寛銭鰻巻鰻穐鰻階鰻規寛幸鹿粡寂蝟赱齠洲粤讌将唄銭唄測鰻喬欝狸渦巻欝潮渦規嘘頭鹿粡寂蝟赱齠洲粤讌将崖穐崖卯崖岡崖階崖巻崖規崖喬崖桑鹿粡寂蝟赱齠洲粤讌将崖謙崖幸渦桑渦謙蔚階蔚卯蔚巻渦幸鹿粡寂蝟赱齠洲粤讌将鰻桑慨卯慨岡慨階慨巻慨規慨喬慨桑鹿粡寂蝟赱齠洲粤讌将慨謙慨幸慨銭慨測慨狸慨潮慨適慨頭鹿粡寂蝟赱齠洲粤讌将概穐概卯概岡概階概巻概規概喬概桑鹿粡寂蝟赱齠洲粤讌将概謙概幸概銭唄適唄穐唄頭嘘穐嘘岡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺涜壷蝟昭粡竚癈鷭т繻Ь因憶嘉因桶怯因桶恐因桶恭因桶挟因桶教因桶橋因桶況蝟昭粡竚癈鷭т繻Ь因桶狂因桶狭因桶響因桶饗因桶驚因桶仰因桶凝因桶尭蝟昭粡竚癈鷭т繻Ь因桶薫因桶訓因桶群因桶軍因桶郡因桶卦因桶袈因桶祁蝟昭粡竚癈鷭т繻Ь因桶係因桶傾因桶形因憶軌因憶干因憶輝因漸碍蝟昭粡竚癈鷭т繻Ь因暗憶因暗臆因暗桶因暗牡因暗乙因暗俺因暗卸蝟昭粡竚癈鷭т繻Ь因暗恩因暗温因暗価因暗佳因暗加因暗可因暗嘉因暗夏蝟昭粡竚癈鷭т繻Ь因暗外因暗咳因暗害因暗崖因暗慨因暗概因暗涯因暗碍蝟昭粡竚癈鷭т繻Ь因暗蓋因暗街因暗柿因暗蛎因暗鈎因暗劃因暗嚇因暗各蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰兎堕熏黝蝟昭粡竚癈鷭т繻Ь因憶嘉因桶怯因桶恐因桶恭因桶挟因桶教因桶橋因桶況蝟昭粡竚癈鷭т繻Ь因桶狂因桶狭因桶響因桶饗因桶驚因桶仰因桶凝因桶尭蝟昭粡竚癈鷭т繻Ь因桶薫因桶訓因桶群因桶軍因桶郡因桶卦因桶袈因桶祁蝟昭粡竚癈鷭т繻Ь因桶係因桶傾因桶形因憶軌因憶干因憶輝因憶官蝟昭粡竚癈鷭т繻Ь因暗憶因暗臆因暗桶因暗牡因暗乙因暗俺因暗卸蝟昭粡竚癈鷭т繻Ь因暗恩因暗温因暗価因暗佳因暗加因暗可因暗嘉因暗夏蝟昭粡竚癈鷭т繻Ь因暗外因暗咳因暗害因暗崖因暗慨因暗概因暗涯因暗碍蝟昭粡竚癈鷭т繻Ь因暗蓋因暗街因暗柿因暗蛎因暗鈎因暗劃因暗嚇因暗各蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥羝熹閙纒窰兎妥桍鹿粡寂蝟赱齠洲粤讌将鉄穐鉄卯鉄岡鉄階鉄巻鉄規鉄喬鉄桑鹿粡寂蝟赱齠洲粤讌将鉄謙鉄幸鉄銭鉄測鉄狸鉄潮鉄適鉄頭鹿粡寂蝟赱齠洲粤讌将典穐典卯典岡典階典巻典規典喬典桑鹿粡寂蝟赱齠洲粤讌将典謙典幸典銭典測典狸典潮典適典頭鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯互煥濺涜遁蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因憶訓因憶群因臆潅因憶咳因漸干因憶尭蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺菓蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍鍵蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍鹸羝熹閙纒窰轍元羝熹閙纒窰轍原羝熹閙纒窰轍厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍幻羝熹閙纒窰轍弦羝熹閙纒窰轍諺蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍乎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍恒蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍拘羝熹閙纒窰轍控羝熹閙纒窰轍攻羝熹閙纒窰轍昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍晃羝熹閙纒窰轍更蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺貨逑桍鹿粡寂蝟赱齠洲粤讌将互煥濺恩胃逑蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍鹸羝熹閙纒窰轍元羝熹閙纒窰轍原羝熹閙纒窰轍厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍幻羝熹閙纒窰轍弦羝熹閙纒窰轍諺蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍乎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍恒蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍拘羝熹閙纒窰轍控羝熹閙纒窰轍攻羝熹閙纒窰轍昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍晃羝熹閙纒窰轍更蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺貨抗菓蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍鍵濆害蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍鹸羝熹閙纒窰轍元羝熹閙纒窰轍原羝熹閙纒窰轍厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍幻濆害羝熹閙纒窰轍弦羝熹閙纒窰轍諺蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍乎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍恒蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍拘羝熹閙纒窰轍控羝熹閙纒窰轍攻羝熹閙纒窰轍昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍晃羝熹閙纒窰轍更蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺額蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰迭鍵羝熹閙纒窰迭険羝熹閙纒窰迭顕羝熹閙纒窰迭験蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰迭幻羝熹閙纒窰迭諺蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰迭乎羝熹閙纒窰迭個羝熹閙纒窰迭古羝熹閙纒窰迭呼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺樫抗菓蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰迭鍵濆害羝熹閙纒窰迭険羝熹閙纒窰迭顕濆害羝熹閙纒窰迭験蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰迭幻羝熹閙纒窰迭諺蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰迭乎羝熹閙纒窰迭個羝熹閙纒窰迭古羝熹閙纒窰迭呼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺館蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰鉄存羝熹閙纒窰鉄孫羝熹閙纒窰鉄汰羝熹閙纒窰鉄詑蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰鉄唾羝熹閙纒窰鉄堕羝熹閙纒窰鉄妥羝熹閙纒窰鉄惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺吸蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典鍵羝熹閙纒窰典険羝熹閙纒窰典顕羝熹閙纒窰典験蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典鹸羝熹閙纒窰典元羝熹閙纒窰典原羝熹閙纒窰典厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典幻羝熹閙纒窰典弦羝熹閙纒窰典諺羝熹閙纒窰典限蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典乎羝熹閙纒窰典個羝熹閙纒窰典古羝熹閙纒窰典呼蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典弘羝熹閙纒窰典恒羝熹閙纒窰典慌羝熹閙纒窰典抗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典拘羝熹閙纒窰典控羝熹閙纒窰典攻羝熹閙纒窰典昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典晃羝熹閙纒窰典更羝熹閙纒窰典港羝熹閙纒窰典溝蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典甲羝熹閙纒窰典皇羝熹閙纒窰典硬羝熹閙纒窰典稿蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典前羝熹閙纒窰典善羝熹閙纒窰典漸羝熹閙纒窰典然蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典全羝熹閙纒窰典禅羝熹閙纒窰典繕羝熹閙纒窰典膳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典糎羝熹閙纒窰典噌羝熹閙纒窰典疏羝熹閙纒窰典疎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典礎羝熹閙纒窰典祖羝熹閙纒窰典租羝熹閙纒窰典粗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典属羝熹閙纒窰典賊羝熹閙纒窰典族羝熹閙纒窰典続蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典卒羝熹閙纒窰典袖羝熹閙纒窰典其羝熹閙纒窰典揃蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典存羝熹閙纒窰典孫羝熹閙纒窰典汰羝熹閙纒窰典詑蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰典唾羝熹閙纒窰典堕羝熹閙纒窰典妥羝熹閙纒窰典惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺緊蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填鍵羝熹閙纒窰填険羝熹閙纒窰填顕羝熹閙纒窰填験蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填鹸羝熹閙纒窰填元羝熹閙纒窰填原羝熹閙纒窰填厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填幻羝熹閙纒窰填弦羝熹閙纒窰填諺羝熹閙纒窰填限蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填乎羝熹閙纒窰填個羝熹閙纒窰填古羝熹閙纒窰填呼蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填弘羝熹閙纒窰填恒羝熹閙纒窰填慌羝熹閙纒窰填抗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填拘羝熹閙纒窰填控羝熹閙纒窰填攻羝熹閙纒窰填昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填晃羝熹閙纒窰填更羝熹閙纒窰填港羝熹閙纒窰填溝蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填甲羝熹閙纒窰填皇羝熹閙纒窰填硬羝熹閙纒窰填稿蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填前羝熹閙纒窰填善羝熹閙纒窰填漸羝熹閙纒窰填然蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填全羝熹閙纒窰填禅羝熹閙纒窰填繕羝熹閙纒窰填膳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填糎羝熹閙纒窰填噌羝熹閙纒窰填疏羝熹閙纒窰填疎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填礎羝熹閙纒窰填祖羝熹閙纒窰填租羝熹閙纒窰填粗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填属羝熹閙纒窰填賊羝熹閙纒窰填族羝熹閙纒窰填続蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填卒羝熹閙纒窰填袖羝熹閙纒窰填其羝熹閙纒窰填揃蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填存羝熹閙纒窰填孫羝熹閙纒窰填汰羝熹閙纒窰填詑蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰填唾羝熹閙纒窰填堕羝熹閙纒窰填妥羝熹閙纒窰填惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺頚蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天鍵羝熹閙纒窰天険羝熹閙纒窰天顕羝熹閙纒窰天験蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天鹸羝熹閙纒窰天元羝熹閙纒窰天原羝熹閙纒窰天厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天幻羝熹閙纒窰天弦羝熹閙纒窰天諺羝熹閙纒窰天限蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天乎羝熹閙纒窰天個羝熹閙纒窰天古羝熹閙纒窰天呼蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天弘羝熹閙纒窰天恒羝熹閙纒窰天慌羝熹閙纒窰天抗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天拘羝熹閙纒窰天控羝熹閙纒窰天攻羝熹閙纒窰天昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天晃羝熹閙纒窰天更羝熹閙纒窰天港羝熹閙纒窰天溝蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天甲羝熹閙纒窰天皇羝熹閙纒窰天硬羝熹閙纒窰天稿蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天前羝熹閙纒窰天善羝熹閙纒窰天漸羝熹閙纒窰天然蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天全羝熹閙纒窰天禅羝熹閙纒窰天繕羝熹閙纒窰天膳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天糎羝熹閙纒窰天噌羝熹閙纒窰天疏羝熹閙纒窰天疎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天礎羝熹閙纒窰天祖羝熹閙纒窰天租羝熹閙纒窰天粗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天属羝熹閙纒窰天賊羝熹閙纒窰天族羝熹閙纒窰天続蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天卒羝熹閙纒窰天袖羝熹閙纒窰天其羝熹閙纒窰天揃蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天存羝熹閙纒窰天孫羝熹閙纒窰天汰蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰天唾羝熹閙纒窰天堕羝熹閙纒窰天妥羝熹閙纒窰天惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺雇蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展鍵羝熹閙纒窰展険羝熹閙纒窰展顕羝熹閙纒窰展験蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展鹸羝熹閙纒窰展元羝熹閙纒窰展原羝熹閙纒窰展厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展幻羝熹閙纒窰展弦羝熹閙纒窰展諺羝熹閙纒窰展限蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展乎羝熹閙纒窰展個羝熹閙纒窰展古羝熹閙纒窰展呼蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展弘羝熹閙纒窰展恒羝熹閙纒窰展慌羝熹閙纒窰展抗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展拘羝熹閙纒窰展控羝熹閙纒窰展攻羝熹閙纒窰展昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展晃羝熹閙纒窰展更羝熹閙纒窰展港羝熹閙纒窰展溝蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展甲羝熹閙纒窰展皇羝熹閙纒窰展硬羝熹閙纒窰展稿蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展前羝熹閙纒窰展善羝熹閙纒窰展漸羝熹閙纒窰展然蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展全羝熹閙纒窰展禅羝熹閙纒窰展繕羝熹閙纒窰展膳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展糎羝熹閙纒窰展噌羝熹閙纒窰展疏羝熹閙纒窰展疎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展礎羝熹閙纒窰展祖羝熹閙纒窰展租蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展属羝熹閙纒窰展賊羝熹閙纒窰展族羝熹閙纒窰展続蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展卒羝熹閙纒窰展袖羝熹閙纒窰展其羝熹閙纒窰展揃蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展存羝熹閙纒窰展孫羝熹閙纒窰展汰羝熹閙纒窰展詑蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展唾羝熹閙纒窰展堕羝熹閙纒窰展妥羝熹閙纒窰展惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺鉱蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店鍵羝熹閙纒窰店険羝熹閙纒窰店顕羝熹閙纒窰店験蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店鹸羝熹閙纒窰店元羝熹閙纒窰店原羝熹閙纒窰店厳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店幻羝熹閙纒窰店弦羝熹閙纒窰店諺羝熹閙纒窰店限蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店乎羝熹閙纒窰店個羝熹閙纒窰店古羝熹閙纒窰店呼蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店弘羝熹閙纒窰店恒羝熹閙纒窰店慌蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店控羝熹閙纒窰店攻羝熹閙纒窰店昂蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店晃羝熹閙纒窰店更羝熹閙纒窰店港羝熹閙纒窰店溝蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店甲羝熹閙纒窰店皇羝熹閙纒窰店硬羝熹閙纒窰店稿蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店前羝熹閙纒窰店善羝熹閙纒窰店漸羝熹閙纒窰店然蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店全羝熹閙纒窰店禅羝熹閙纒窰店繕羝熹閙纒窰店膳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店糎羝熹閙纒窰店噌羝熹閙纒窰店疏羝熹閙纒窰店疎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店礎羝熹閙纒窰店祖羝熹閙纒窰店租羝熹閙纒窰店粗蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店属羝熹閙纒窰店賊羝熹閙纒窰店続蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店卒羝熹閙纒窰店袖羝熹閙纒窰店其羝熹閙纒窰店揃蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店存羝熹閙纒窰店孫羝熹閙纒窰店汰羝熹閙纒窰店詑蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰店唾羝熹閙纒窰店堕羝熹閙纒窰店妥蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺遁蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰兎全羝熹閙纒窰兎膳蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰兎糎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰兎唾羝熹閙纒窰兎堕羝熹閙纒窰兎妥羝熹閙纒窰兎惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濺鈍逑桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将互煥濺徳巻穐穐互煥濺徳桑鹿粡寂蝟赱齠洲粤讌将互煥濺徳謙穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将互煥濺涜狸互煥濺涜吊逑羝熹閙纒窰兎妥羝熹閙纒窰兎惰蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濂磔黝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰嘆羝熹閙纒窰坦蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰担羝熹閙纒窰探羝熹閙纒窰歎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰誕蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰壇羝熹閙纒窰弾蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰聴羝熹閙纒窰脹蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濂磔黯逑桍鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐穐鹿粡寂蝟赱齠洲粤讌将穐穐互煥瀉貨逑羝熹閙纒窰坦蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰担羝熹閙纒窰探羝熹閙纒窰歎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰誕蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰壇羝熹閙纒窰弾蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰聴羝熹閙纒窰脹蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡互煥濂磔黯抗菓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰嘆濆害羝熹閙纒窰坦濆害蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰担羝熹閙纒窰探羝熹閙纒窰歎蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰誕蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰壇羝熹閙纒窰弾蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰聴羝熹閙纒窰脹蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡竢銖羝熹閙纒窰鰍纉桍鹿粡寂蝟赱齠洲粤讌将穐穐互煥濺岡互煥濺階鹿粡寂蝟赱齠洲粤讌将互煥濺巻互煥濺規互煥濺喬互煥濺桑鹿粡寂蝟赱齠洲粤讌将互煥濺謙互煥濺幸穐穐鹿粡寂蝟赱齠洲粤讌将穐穐穐互煥濺頭鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯竢銖闔齡互煥潦磔黯逑桍鹿粡寂蝟赱齠洲粤讌将穐穐互煥濺貨逑羝熹閙纒窰迭蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰鉄羝熹閙纒窰典羝熹閙纒窰填羝熹閙纒窰天蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展羝熹閙纒窰店蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰兎熏鵺鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯竢銖闔齡互煥潦磔黯抗菓蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰轍濆害羝熹閙纒窰迭濆害蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰鉄羝熹閙纒窰典羝熹閙纒窰填羝熹閙纒窰天蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰展羝熹閙纒窰店蝟昭粡竚癈鷭т繻Ь羝熹閙纒窰兎熏鵺鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙良地津瀘碗輿棉攸塢藁鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将闥轣跚闔痰跂草韭鹿粡寂蝟赱齠洲粤讌将雕粤跫鞳鬯瘰韭絎竢躁竏鈿鶩遽欝允痰跂鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖齡鴣笏闥轣跚闔熕瘟鈿鴉瘡蝴癆蜿釼碎縻蝟昭粡竚癈鷭т繻Ь筱因矼 磊鹿粡寂蝟赱齠洲粤讌将因祿胤卯因窿穐因旭蝟昭粡竚癈鷭т繻Ь階因険 卯因窿往鹿粡寂蝟赱齠洲粤讌将因祿拐卯因窿拐鹿粡寂蝟赱齠洲粤讌将因絮甃因甼 卯因窿岡因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因甦 卯因窿岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因瘁 卯因窿岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因畍 卯因窿岡因窿狛鹿粡寂蝟赱齠洲粤讌将因祿茅卯因窿茅鹿粡寂蝟赱齠洲粤讌将因禊胤卯因窿棋鹿粡寂蝟赱齠洲粤讌将因禊拐卯因窿屑鹿粡寂蝟赱齠洲粤讌将因絮甃因皸 卯因窿喬因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因痳 卯因窿喬因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因盍 卯因窿喬因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因皺 卯因窿喬因窿狛鹿粡寂蝟赱齠洲粤讌将因齋胤卯因窿桑因窿棋鹿粡寂蝟赱齠洲粤讌将因祿棋卯因窿口鹿粡寂蝟赱齠洲粤讌将因齋缸卯因窿謙因窿棋鹿粡寂蝟赱齠洲粤讌将因絮甃因甓 卯因窿狛鹿粡寂蝟赱齠洲粤讌将因祿享卯因窿癬鹿粡寂蝟赱齠洲粤讌将因齋癬卯因窿甃因窿往鹿粡寂蝟赱齠洲粤讌将因齋糺卯因窿笶鹿粡寂蝟赱齠洲粤讌将因禪胤卯因窿脯鹿粡寂蝟赱齠洲粤讌将因禪拐卯因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因甍 卯因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因痺 卯因窿階因窿拐鹿粡寂蝟赱齠洲粤讌将因絮甃因盒 卯因窿階因窿屑鹿粡寂蝟赱齠洲粤讌将因絮謙因鍵 卯因窿享鹿粡寂蝟赱齠洲粤讌将因禊棋卯因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因顕 岡因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因鹸 岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因原 岡因窿往鹿粡寂蝟赱齠洲粤讌将因禊屑階因窿往鹿粡寂蝟赱齠洲粤讌将因禊口階因窿拐鹿粡寂蝟赱齠洲粤讌将因禊癬階因窿拳鹿粡寂蝟赱齠洲粤讌将因禊笶階因窿笶鹿粡寂蝟赱齠洲粤讌将因祿拳階因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因幻 階因窿桑因窿往鹿粡寂蝟赱齠洲粤讌将因絮謙因午 巻因窿拳鹿粡寂蝟赱齠洲粤讌将因禊缸巻因窿笶鹿粡寂蝟赱齠洲粤讌将因絮謙因吾 巻因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因弘 巻因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因慌 巻因窿糺鹿粡寂蝟赱齠洲粤讌将因絮謙因後 巻因窿往鹿粡寂蝟赱齠洲粤讌将因祿口規因窿胤鹿粡寂蝟赱齠洲粤讌将因祿狛規因窿往鹿粡寂蝟赱齠洲粤讌将因祿癬規因窿拐鹿粡寂蝟赱齠洲粤讌将因絮皙因鍵 規因窿岡因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因矼 規因窿岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因鹸 規因窿岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因顕 規因窿岡因窿狛鹿粡寂蝟赱齠洲粤讌将因絮甃因矣 規因窿茅鹿粡寂蝟赱齠洲粤讌将因禊拐規因窿棋鹿粡寂蝟赱齠洲粤讌将因絮謙因拘 規因窿巻因窿胤鹿粡寂蝟赱齠洲粤讌将因絮謙因攻 規因窿巻因窿往鹿粡寂蝟赱齠洲粤讌将因禊棋規因窿屑鹿粡寂蝟赱齠洲粤讌将因禊屑規因窿拳鹿粡寂蝟赱齠洲粤讌将因祿磊規因窿口鹿粡寂蝟赱齠洲粤讌将因絮甃因矚 規因窿狛鹿粡寂蝟赱齠洲粤讌将因禊癬規因窿笶鹿粡寂蝟赱齠洲粤讌将因禪棋規因窿脯鹿粡寂蝟赱齠洲粤讌将因禪屑規因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因盡 規因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因原 規因窿階因窿拐鹿粡寂蝟赱齠洲粤讌将因絮謙因鴻 規因窿桑因窿屑鹿粡寂蝟赱齠洲粤讌将因禊口規因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因晃 規因窿糺鹿粡寂蝟赱齠洲粤讌将因絮謙因香 規因窿胤鹿粡寂蝟赱齠洲粤讌将因絮謙因劫 喬因窿拳鹿粡寂蝟赱齠洲粤讌将因齋棋桑因窿往鹿粡寂蝟赱齠洲粤讌将因禊笶桑因窿拐鹿粡寂蝟赱齠洲粤讌将因絮謙因甍 桑因窿棋鹿粡寂蝟赱齠洲粤讌将因禊缸桑因窿屑鹿粡寂蝟赱齠洲粤讌将因禊胤桑因窿拳鹿粡寂蝟赱齠洲粤讌将因齋屑桑因窿笶鹿粡寂蝟赱齠洲粤讌将因禊拐桑因窿拳鹿粡寂蝟赱齠洲粤讌将因禊棋謙因窿拐鹿粡寂蝟赱齠洲粤讌将因絮謙因甓 謙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因甼 謙因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因甦 謙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因畍 謙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因瘁 謙因窿缸鹿粡寂蝟赱齠洲粤讌将因祿笶幸因窿胤鹿粡寂蝟赱齠洲粤讌将因祿糺幸因窿往鹿粡寂蝟赱齠洲粤讌将因祿缸幸因窿拐鹿粡寂蝟赱齠洲粤讌将因禊口幸因窿茅鹿粡寂蝟赱齠洲粤讌将因禊癬幸因窿棋鹿粡寂蝟赱齠洲粤讌将因禊笶幸因窿屑鹿粡寂蝟赱齠洲粤讌将因禊胤幸因窿拳鹿粡寂蝟赱齠洲粤讌将因祿脯幸因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因痳 幸因窿謙因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因幻 幸因窿狛鹿粡寂蝟赱齠洲粤讌将因齋脯幸因窿笶鹿粡寂蝟赱齠洲粤讌将因禪口幸因窿脯鹿粡寂蝟赱齠洲粤讌将因禪癬幸因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因午 幸因窿茅鹿粡寂蝟赱齠洲粤讌将因禊缸幸因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因痺 幸因窿胤鹿粡寂蝟赱齠洲粤讌将因禊棋甃因窿拐鹿粡寂蝟赱齠洲粤讌将因絮謙因皸 皙因窿往鹿粡寂蝟赱齠洲粤讌将因齋口皙因窿笶鹿粡寂蝟赱齠洲粤讌将因絮謙因皺 皙因窿茅鹿粡寂蝟赱齠洲粤讌将因禊屑皙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因盍 皙因窿往鹿粡寂蝟赱齠洲粤讌将因禊狛祠因窿往鹿粡寂蝟赱齠洲粤讌将因禊糺祠因窿笶鹿粡寂蝟赱齠洲粤讌将因絮謙因盒 祠因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因盡 祠因窿階因窿棋鹿粡寂蝟赱齠洲粤讌将因禊磊祠因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因矣 祠因窿糺鹿粡寂蝟赱齠洲粤讌将因絮謙因矚 祠因窿往鹿粡寂蝟赱齠洲粤讌将因絮謙因矼 筱因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因鍵 筱因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因顕 筱因窿茅鹿粡寂蝟赱齠洲粤讌将因禝茅絳因窿往鹿粡寂蝟赱齠洲粤讌将因祿往絳因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因鹸 絳因窿拳鹿粡寂蝟赱齠洲粤讌将因禝拳絳因窿笶鹿粡寂蝟赱齠洲粤讌将因絮幸因原 絳因窿茅鹿粡寂蝟赱齠洲粤讌将因禝享絳因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因午 絳因窿糺鹿粡寂蝟赱齠洲粤讌将因絮幸因幻 絳因窿往鹿粡寂蝟赱齠洲粤讌将因祿拐罨因窿胤鹿粡寂蝟赱齠洲粤讌将因祿茅罨因窿往鹿粡寂蝟赱齠洲粤讌将因祿棋罨因窿拐鹿粡寂蝟赱齠洲粤讌将因絮皙因慌 罨因窿岡因窿胤鹿粡寂蝟赱齠洲粤讌将因絮皙因弘 罨因窿岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因攻 罨因窿岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因拘 罨因窿岡因窿狛鹿粡寂蝟赱齠洲粤讌将因祿享罨因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因吾 罨因窿階因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因後 罨因窿階因窿口鹿粡寂蝟赱齠洲粤讌将因禝笶罨因窿棋鹿粡寂蝟赱齠洲粤讌将因絮幸因弘 罨因窿巻因窿胤鹿粡寂蝟赱齠洲粤讌将因絮幸因慌 罨因窿巻因窿往鹿粡寂蝟赱齠洲粤讌将因禝缸罨因窿屑鹿粡寂蝟赱齠洲粤讌将因祿屑罨因窿口鹿粡寂蝟赱齠洲粤讌将因絮皙因後 罨因窿狛鹿粡寂蝟赱齠洲粤讌将因禝胤罨因窿磊鹿粡寂蝟赱齠洲粤讌将因齋往罨因窿笶鹿粡寂蝟赱齠洲粤讌将因禪笶罨因窿脯鹿粡寂蝟赱齠洲粤讌将因禪缸罨因窿往鹿粡寂蝟赱齠洲粤讌将因禧胤罨因窿磊鹿粡寂蝟赱齠洲粤讌将因絮皙因鴻 罨因窿皙因窿胤鹿粡寂蝟赱齠洲粤讌将因絮皙因香 罨因窿皙因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因甍 罨因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因劫 罨因窿皙因窿狛鹿粡寂蝟赱齠洲粤讌将因絮皙因甓 罨因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因吾 罨因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因晃 罨因窿階因窿拐鹿粡寂蝟赱齠洲粤讌将因齋癬罨因窿口鹿粡寂蝟赱齠洲粤讌将因齋笶罨因窿謙因窿棋鹿粡寂蝟赱齠洲粤讌将因絮幸因拘 穐因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因攻 穐因窿拳鹿粡寂蝟赱齠洲粤讌将因禝棋岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因晃 岡因窿拳鹿粡寂蝟赱齠洲粤讌将因禝口岡因窿笶鹿粡寂蝟赱齠洲粤讌将因禪胤岡因窿脯鹿粡寂蝟赱齠洲粤讌将因禪拐岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因香 岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因鴻 岡因窿階因窿棋鹿粡寂蝟赱齠洲粤讌将因禝屑岡因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因劫 岡因窿往鹿粡寂蝟赱齠洲粤讌将因禝癬階因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因甦 階因窿卯因窿拳鹿粡寂蝟赱齠洲粤讌将因禝笶階因窿拐鹿粡寂蝟赱齠洲粤讌将因絮幸因甍 階因窿拳鹿粡寂蝟赱齠洲粤讌将因禝胤階因窿笶鹿粡寂蝟赱齠洲粤讌将因絮幸因甼 階因窿祠因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因甓 階因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因畍 階因窿階因窿拳鹿粡寂蝟赱齠洲粤讌将因禝缸階因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因瘁 巻因窿拳鹿粡寂蝟赱齠洲粤讌将因禝棋巻因窿笶鹿粡寂蝟赱齠洲粤讌将因絮幸因痺 巻因窿茅鹿粡寂蝟赱齠洲粤讌将因禝拐巻因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因皸 巻因窿糺鹿粡寂蝟赱齠洲粤讌将因絮幸因痳 巻因窿往鹿粡寂蝟赱齠洲粤讌将因祿狛規因窿胤鹿粡寂蝟赱齠洲粤讌将因祿癬規因窿往鹿粡寂蝟赱齠洲粤讌将因祿磊規因窿拐鹿粡寂蝟赱齠洲粤讌将因禝口規因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因盡 規因窿階因窿往鹿粡寂蝟赱齠洲粤讌将因禝癬規因窿棋鹿粡寂蝟赱齠洲粤讌将因絮幸因矚 規因窿巻因窿口鹿粡寂蝟赱齠洲粤讌将因禝笶規因窿屑鹿粡寂蝟赱齠洲粤讌将因祿笶規因窿口鹿粡寂蝟赱齠洲粤讌将因齋磊規因窿謙因窿胤鹿粡寂蝟赱齠洲粤讌将因齋拳規因窿謙因窿往鹿粡寂蝟赱齠洲粤讌将因齋享規因窿謙因窿棋鹿粡寂蝟赱齠洲粤讌将因齋狛規因窿謙因窿笶鹿粡寂蝟赱齠洲粤讌将因絮皙因甼 規因窿狛鹿粡寂蝟赱齠洲粤讌将因禝缸規因窿癬鹿粡寂蝟赱齠洲粤讌将因禝胤規因窿磊鹿粡寂蝟赱齠洲粤讌将因齋茅規因窿笶鹿粡寂蝟赱齠洲粤讌将因禪棋規因窿脯鹿粡寂蝟赱齠洲粤讌将因禪屑規因窿往鹿粡寂蝟赱齠洲粤讌将因禧脯規因窿磊鹿粡寂蝟赱齠洲粤讌将因絮皙因瘁 規因窿皙因窿胤鹿粡寂蝟赱齠洲粤讌将因絮皙因畍 規因窿皙因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因痳 規因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因痺 規因窿皙因窿狛鹿粡寂蝟赱齠洲粤讌将因絮皙因皸 規因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因甦 規因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因皺 規因窿棋鹿粡寂蝟赱齠洲粤讌将因禝拐規因窿口鹿粡寂蝟赱齠洲粤讌将因絮幸因盒 規因窿糺鹿粡寂蝟赱齠洲粤讌将因絮幸因盍 規因窿胤鹿粡寂蝟赱齠洲粤讌将因絮幸因矣 喬因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因矼 喬因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因鍵 桑因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因顕 桑因窿往鹿粡寂蝟赱齠洲粤讌将因禝棋桑因窿拐鹿粡寂蝟赱齠洲粤讌将因絮甃因原 桑因窿拳鹿粡寂蝟赱齠洲粤讌将因絮甃因鹸 桑因窿口鹿粡寂蝟赱齠洲粤讌将因絮甃因幻 桑因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因午 謙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮甃因吾 謙因窿口鹿粡寂蝟赱齠洲粤讌将因絮皙因皺 幸因窿胤鹿粡寂蝟赱齠洲粤讌将因祿糺幸因窿往鹿粡寂蝟赱齠洲粤讌将因禝屑幸因窿拐鹿粡寂蝟赱齠洲粤讌将因絮皙因盡 幸因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因後 幸因窿拳鹿粡寂蝟赱齠洲粤讌将因禝口幸因窿口鹿粡寂蝟赱齠洲粤讌将因絮皙因盒 幸因窿狛鹿粡寂蝟赱齠洲粤讌将因絮皙因盍 幸因窿茅鹿粡寂蝟赱齠洲粤讌将因禝狛甃因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因弘 甃因窿拐鹿粡寂蝟赱齠洲粤讌将因禝磊甃因窿拳鹿粡寂蝟赱齠洲粤讌将因禝糺甃因窿笶鹿粡寂蝟赱齠洲粤讌将因絮甃因慌 甃因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因拘 甃因窿往鹿粡寂蝟赱齠洲粤讌将因絮罨因瘋 胤鹿粡寂蝟赱齠洲粤讌将因祿胤卯因窿胤鹿粡寂蝟赱齠洲粤讌将因祿往卯因窿往鹿粡寂蝟赱齠洲粤讌将因祿拐卯因窿拐鹿粡寂蝟赱齠洲粤讌将因絮甃因畄 卯因窿岡因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因甬 卯因窿岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因痰 卯因窿岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因畊 卯因窿岡因窿狛鹿粡寂蝟赱齠洲粤讌将因祿茅卯因窿茅鹿粡寂蝟赱齠洲粤讌将因禊往卯因窿棋鹿粡寂蝟赱齠洲粤讌将因禊茅卯因窿屑鹿粡寂蝟赱齠洲粤讌将因絮甃因皹 卯因窿喬因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因瘋 卯因窿喬因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因盖 卯因窿喬因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因盂 卯因窿喬因窿狛鹿粡寂蝟赱齠洲粤讌将因齋往卯因窿桑因窿棋鹿粡寂蝟赱齠洲粤讌将因祿棋卯因窿口鹿粡寂蝟赱齠洲粤讌将因齋脯卯因窿謙因窿棋鹿粡寂蝟赱齠洲粤讌将因絮甃因甞 卯因窿狛鹿粡寂蝟赱齠洲粤讌将因祿享卯因窿癬鹿粡寂蝟赱齠洲粤讌将因齋磊卯因窿甃因窿往鹿粡寂蝟赱齠洲粤讌将因齋缸卯因窿笶鹿粡寂蝟赱齠洲粤讌将因禪往卯因窿脯鹿粡寂蝟赱齠洲粤讌将因禪茅卯因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因甕 卯因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因痲 卯因窿階因窿拐鹿粡寂蝟赱齠洲粤讌将因絮甃因盞 卯因窿階因窿屑鹿粡寂蝟赱齠洲粤讌将因絮謙因険 卯因窿享鹿粡寂蝟赱齠洲粤讌将因禊享卯因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因験 岡因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因元 岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因厳 岡因窿往鹿粡寂蝟赱齠洲粤讌将因禊拳階因窿往鹿粡寂蝟赱齠洲粤讌将因禊狛階因窿拐鹿粡寂蝟赱齠洲粤讌将因禊磊階因窿拳鹿粡寂蝟赱齠洲粤讌将因禊糺階因窿笶鹿粡寂蝟赱齠洲粤讌将因祿拳階因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因弦 階因窿桑因窿往鹿粡寂蝟赱齠洲粤讌将因絮謙因呉 巻因窿拳鹿粡寂蝟赱齠洲粤讌将因禊脯巻因窿笶鹿粡寂蝟赱齠洲粤讌将因絮謙因娯 巻因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因恒 巻因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因抗 巻因窿糺鹿粡寂蝟赱齠洲粤讌将因絮謙因御 巻因窿往鹿粡寂蝟赱齠洲粤讌将因祿口規因窿胤鹿粡寂蝟赱齠洲粤讌将因祿狛規因窿往鹿粡寂蝟赱齠洲粤讌将因祿癬規因窿拐鹿粡寂蝟赱齠洲粤讌将因絮皙因険 規因窿岡因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因砌 規因窿岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因元 規因窿岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因験 規因窿岡因窿狛鹿粡寂蝟赱齠洲粤讌将因絮甃因矮 規因窿茅鹿粡寂蝟赱齠洲粤讌将因禊茅規因窿棋鹿粡寂蝟赱齠洲粤讌将因絮謙因控 規因窿巻因窿胤鹿粡寂蝟赱齠洲粤讌将因絮謙因昂 規因窿巻因窿往鹿粡寂蝟赱齠洲粤讌将因禊享規因窿屑鹿粡寂蝟赱齠洲粤讌将因禊拳規因窿拳鹿粡寂蝟赱齠洲粤讌将因祿磊規因窿口鹿粡寂蝟赱齠洲粤讌将因絮甃因矜 規因窿狛鹿粡寂蝟赱齠洲粤讌将因禊磊規因窿笶鹿粡寂蝟赱齠洲粤讌将因禪享規因窿脯鹿粡寂蝟赱齠洲粤讌将因禪拳規因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因盥 規因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因厳 規因窿階因窿拐鹿粡寂蝟赱齠洲粤讌将因絮謙因剛 規因窿桑因窿屑鹿粡寂蝟赱齠洲粤讌将因禊狛規因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因更 規因窿糺鹿粡寂蝟赱齠洲粤讌将因絮謙因高 規因窿胤鹿粡寂蝟赱齠洲粤讌将因絮謙因号 喬因窿拳鹿粡寂蝟赱齠洲粤讌将因齋享桑因窿往鹿粡寂蝟赱齠洲粤讌将因禊糺桑因窿拐鹿粡寂蝟赱齠洲粤讌将因絮謙因甕 桑因窿棋鹿粡寂蝟赱齠洲粤讌将因禊脯桑因窿屑鹿粡寂蝟赱齠洲粤讌将因禊往桑因窿拳鹿粡寂蝟赱齠洲粤讌将因齋拳桑因窿笶鹿粡寂蝟赱齠洲粤讌将因禊茅桑因窿拳鹿粡寂蝟赱齠洲粤讌将因禊享謙因窿拐鹿粡寂蝟赱齠洲粤讌将因絮謙因甞 謙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因畄 謙因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因甬 謙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因畊 謙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因痰 謙因窿缸鹿粡寂蝟赱齠洲粤讌将因絮甃因攻 謙因窿往鹿粡寂蝟赱齠洲粤讌将因祿笶幸因窿胤鹿粡寂蝟赱齠洲粤讌将因祿糺幸因窿往鹿粡寂蝟赱齠洲粤讌将因祿缸幸因窿拐鹿粡寂蝟赱齠洲粤讌将因禊狛幸因窿茅鹿粡寂蝟赱齠洲粤讌将因禊磊幸因窿棋鹿粡寂蝟赱齠洲粤讌将因禊糺幸因窿屑鹿粡寂蝟赱齠洲粤讌将因祿脯幸因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因瘋 幸因窿謙因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因弦 幸因窿狛鹿粡寂蝟赱齠洲粤讌将因齋胤幸因窿笶鹿粡寂蝟赱齠洲粤讌将因禪狛幸因窿脯鹿粡寂蝟赱齠洲粤讌将因禪磊幸因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因呉 幸因窿茅鹿粡寂蝟赱齠洲粤讌将因禊脯幸因窿口鹿粡寂蝟赱齠洲粤讌将因絮謙因痲 幸因窿胤鹿粡寂蝟赱齠洲粤讌将因禊享甃因窿拐鹿粡寂蝟赱齠洲粤讌将因齋胤甃因窿笶鹿粡寂蝟赱齠洲粤讌将因絮謙因皹 皙因窿往鹿粡寂蝟赱齠洲粤讌将因齋狛皙因窿笶鹿粡寂蝟赱齠洲粤讌将因絮謙因盂 皙因窿茅鹿粡寂蝟赱齠洲粤讌将因禊拳皙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因盖 皙因窿往鹿粡寂蝟赱齠洲粤讌将因禊癬祠因窿往鹿粡寂蝟赱齠洲粤讌将因禊缸祠因窿笶鹿粡寂蝟赱齠洲粤讌将因絮謙因盞 祠因窿茅鹿粡寂蝟赱齠洲粤讌将因絮謙因盥 祠因窿階因窿棋鹿粡寂蝟赱齠洲粤讌将因禊笶祠因窿拳鹿粡寂蝟赱齠洲粤讌将因絮謙因矮 祠因窿糺鹿粡寂蝟赱齠洲粤讌将因絮謙因矜 祠因窿往鹿粡寂蝟赱齠洲粤讌将因絮謙因砌 筱因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因険 筱因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因験 筱因窿茅鹿粡寂蝟赱齠洲粤讌将因禝棋絳因窿往鹿粡寂蝟赱齠洲粤讌将因祿往絳因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因元 絳因窿拳鹿粡寂蝟赱齠洲粤讌将因禝口絳因窿笶鹿粡寂蝟赱齠洲粤讌将因絮幸因厳 絳因窿茅鹿粡寂蝟赱齠洲粤讌将因禝屑絳因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因呉 絳因窿糺鹿粡寂蝟赱齠洲粤讌将因絮幸因弦 絳因窿往鹿粡寂蝟赱齠洲粤讌将因祿拐罨因窿胤鹿粡寂蝟赱齠洲粤讌将因祿茅罨因窿往鹿粡寂蝟赱齠洲粤讌将因祿棋罨因窿拐鹿粡寂蝟赱齠洲粤讌将因絮皙因抗 罨因窿岡因窿胤鹿粡寂蝟赱齠洲粤讌将因絮皙因恒 罨因窿岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因昂 罨因窿岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因控 罨因窿岡因窿狛鹿粡寂蝟赱齠洲粤讌将因祿享罨因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因娯 罨因窿階因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因御 罨因窿階因窿口鹿粡寂蝟赱齠洲粤讌将因禝糺罨因窿棋鹿粡寂蝟赱齠洲粤讌将因絮幸因恒 罨因窿巻因窿胤鹿粡寂蝟赱齠洲粤讌将因絮幸因抗 罨因窿巻因窿往鹿粡寂蝟赱齠洲粤讌将因禝脯罨因窿屑鹿粡寂蝟赱齠洲粤讌将因祿屑罨因窿口鹿粡寂蝟赱齠洲粤讌将因絮皙因御 罨因窿狛鹿粡寂蝟赱齠洲粤讌将因禝往罨因窿磊鹿粡寂蝟赱齠洲粤讌将因齋拐罨因窿笶鹿粡寂蝟赱齠洲粤讌将因禪糺罨因窿脯鹿粡寂蝟赱齠洲粤讌将因禪脯罨因窿往鹿粡寂蝟赱齠洲粤讌将因禧往罨因窿磊鹿粡寂蝟赱齠洲粤讌将因絮皙因剛 罨因窿皙因窿胤鹿粡寂蝟赱齠洲粤讌将因絮皙因高 罨因窿皙因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因甕 罨因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因号 罨因窿皙因窿狛鹿粡寂蝟赱齠洲粤讌将因絮皙因甞 罨因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因娯 罨因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因更 罨因窿階因窿拐鹿粡寂蝟赱齠洲粤讌将因齋磊罨因窿口鹿粡寂蝟赱齠洲粤讌将因齋糺罨因窿謙因窿棋鹿粡寂蝟赱齠洲粤讌将因絮幸因控 穐因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因昂 穐因窿拳鹿粡寂蝟赱齠洲粤讌将因禝享岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因更 岡因窿拳鹿粡寂蝟赱齠洲粤讌将因禝狛岡因窿笶鹿粡寂蝟赱齠洲粤讌将因禪往岡因窿脯鹿粡寂蝟赱齠洲粤讌将因禪茅岡因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因高 岡因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因剛 岡因窿階因窿棋鹿粡寂蝟赱齠洲粤讌将因禝拳岡因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因号 岡因窿往鹿粡寂蝟赱齠洲粤讌将因禝磊階因窿往鹿粡寂蝟赱齠洲粤讌将因絮幸因甬 階因窿卯因窿拳鹿粡寂蝟赱齠洲粤讌将因禝糺階因窿拐鹿粡寂蝟赱齠洲粤讌将因絮幸因甕 階因窿拳鹿粡寂蝟赱齠洲粤讌将因禝往階因窿笶鹿粡寂蝟赱齠洲粤讌将因絮幸因畄 階因窿祠因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因甞 階因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因畊 階因窿階因窿拳鹿粡寂蝟赱齠洲粤讌将因禝脯階因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因痰 巻因窿拳鹿粡寂蝟赱齠洲粤讌将因絮甃因昂 巻因窿口鹿粡寂蝟赱齠洲粤讌将因禝享巻因窿笶鹿粡寂蝟赱齠洲粤讌将因絮幸因痲 巻因窿茅鹿粡寂蝟赱齠洲粤讌将因禝茅巻因窿拳鹿粡寂蝟赱齠洲粤讌将因絮幸因皹 巻因窿糺鹿粡寂蝟赱齠洲粤讌将因絮幸因瘋 巻因窿往鹿粡寂蝟赱齠洲粤讌将因祿狛規因窿胤鹿粡寂蝟赱齠洲粤讌将因祿癬規因窿往鹿粡寂蝟赱齠洲粤讌将因祿磊規因窿拐鹿粡寂蝟赱齠洲粤讌将因禝狛規因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因盥 規因窿階因窿往鹿粡寂蝟赱齠洲粤讌将因禝磊規因窿棋鹿粡寂蝟赱齠洲粤讌将因絮幸因矜 規因窿巻因窿口鹿粡寂蝟赱齠洲粤讌将因禝糺規因窿屑鹿粡寂蝟赱齠洲粤讌将因祿笶規因窿口鹿粡寂蝟赱齠洲粤讌将因齋笶規因窿謙因窿胤鹿粡寂蝟赱齠洲粤讌将因齋口規因窿謙因窿往鹿粡寂蝟赱齠洲粤讌将因齋屑規因窿謙因窿棋鹿粡寂蝟赱齠洲粤讌将因齋癬規因窿謙因窿笶鹿粡寂蝟赱齠洲粤讌将因絮皙因畄 規因窿狛鹿粡寂蝟赱齠洲粤讌将因禝脯規因窿癬鹿粡寂蝟赱齠洲粤讌将因禝往規因窿磊鹿粡寂蝟赱齠洲粤讌将因齋棋規因窿笶鹿粡寂蝟赱齠洲粤讌将因禪享規因窿脯鹿粡寂蝟赱齠洲粤讌将因禪拳規因窿往鹿粡寂蝟赱齠洲粤讌将因禧胤規因窿磊鹿粡寂蝟赱齠洲粤讌将因絮皙因痰 規因窿皙因窿胤鹿粡寂蝟赱齠洲粤讌将因絮皙因畊 規因窿皙因窿往鹿粡寂蝟赱齠洲粤讌将因絮皙因瘋 規因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因痲 規因窿皙因窿狛鹿粡寂蝟赱齠洲粤讌将因絮皙因皹 規因窿皙因窿茅鹿粡寂蝟赱齠洲粤讌将因絮皙因甬 規因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因盂 規因窿棋鹿粡寂蝟赱齠洲粤讌将因禝茅規因窿口鹿粡寂蝟赱齠洲粤讌将因絮幸因盞 規因窿糺鹿粡寂蝟赱齠洲粤讌将因絮幸因盖 規因窿胤鹿粡寂蝟赱齠洲粤讌将因絮幸因矮 喬因窿茅鹿粡寂蝟赱齠洲粤讌将因絮幸因砌 喬因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因険 桑因窿胤鹿粡寂蝟赱齠洲粤讌将因絮甃因験 桑因窿往鹿粡寂蝟赱齠洲粤讌将因禝享桑因窿拐鹿粡寂蝟赱齠洲粤讌将因絮甃因厳 桑因窿拳鹿粡寂蝟赱齠洲粤讌将因絮甃因元 桑因窿口鹿粡寂蝟赱齠洲粤讌将因絮甃因晃 桑因窿癬鹿粡寂蝟赱齠洲粤讌将因絮甃因弦 桑因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因呉 謙因窿拳鹿粡寂蝟赱齠洲粤讌将因絮甃因娯 謙因窿口鹿粡寂蝟赱齠洲粤讌将因絮皙因盂 幸因窿胤鹿粡寂蝟赱齠洲粤讌将因祿糺幸因窿往鹿粡寂蝟赱齠洲粤讌将因禝拳幸因窿拐鹿粡寂蝟赱齠洲粤讌将因絮皙因盥 幸因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因御 幸因窿拳鹿粡寂蝟赱齠洲粤讌将因祿脯幸因窿口鹿粡寂蝟赱齠洲粤讌将因絮皙因盞 幸因窿狛鹿粡寂蝟赱齠洲粤讌将因絮甃因更 幸因窿癬鹿粡寂蝟赱齠洲粤讌将因絮皙因盖 幸因窿茅鹿粡寂蝟赱齠洲粤讌将因禝癬甃因窿往鹿粡寂蝟赱齠洲粤讌将因絮甃因恒 甃因窿拐鹿粡寂蝟赱齠洲粤讌将因禝笶甃因窿拳鹿粡寂蝟赱齠洲粤讌将因禝缸甃因窿笶鹿粡寂蝟赱齠洲粤讌将因絮甃因抗 甃因窿茅鹿粡寂蝟赱齠洲粤讌将因絮甃因控 甃因窿往鹿粡寂蝟赱齠洲粤讌将因絮罨因痲 岡因畍祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌缸岡因畍祠因険蝟昭粡竚癈鷭т繻Ь絳因元 岡因畍祠因娯蝟昭粡竚癈鷭т繻Ь卯因砌往岡因畍筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌糺岡因盍蝟昭粡竚癈鷭т繻Ь絳因厳 岡因盞蝟昭粡竚癈鷭т繻Ь階因拘 階因原蝟昭粡竚癈鷭т繻Ь桑因矣 階因原祠因険蝟昭粡竚癈鷭т繻Ь桑因甓 階因原祠因鹸蝟昭粡竚癈鷭т繻Ь桑因矼 階因晃祠因険蝟昭粡竚癈鷭т繻Ь階因控 階因甼蝟昭粡竚癈鷭т繻Ь桑因矮 階因甼祠因険蝟昭粡竚癈鷭т繻Ь桑因甞 階因甼祠因鹸蝟昭粡竚癈鷭т繻Ь桑因砌 階因盡祠因険蝟昭粡竚癈鷭т繻Ь卯因矚磊規因砌祠因厳蝟昭粡竚癈鷭т繻Ь階因晃 喬因御蝟昭粡竚癈鷭т繻Ь階因香 喬因御祠因幻蝟昭粡竚癈鷭т繻Ь階因畍 喬因号蝟昭粡竚癈鷭т繻Ь階因瘁 喬因号祠因幻蝟昭粡竚癈鷭т繻Ь階因甍 喬因盞蝟昭粡竚癈鷭т繻Ь桑因痳 喬因盞祠因吾蝟昭粡竚癈鷭т繻Ь階因更 幸因更蝟昭粡竚癈鷭т繻Ь階因高 幸因更祠因幻蝟昭粡竚癈鷭т繻Ь階因畊 幸因盖蝟昭粡竚癈鷭т繻Ь階因痰 幸因盖祠因幻蝟昭粡竚癈鷭т繻Ь階因甕 甃因慌蝟昭粡竚癈鷭т繻Ь桑因瘋 甃因慌祠因吾蝟昭粡竚癈鷭т繻Ь筱因盍 甃因盥蝟昭粡竚癈鷭т繻Ь筱因鍵 祠因鍵蝟昭粡竚癈鷭т繻Ь筱因険 祠因険蝟昭粡竚癈鷭т繻Ь祠因弘 祠因原祠因厳蝟昭粡竚癈鷭т繻Ь筱因鹸 祠因幻祠因娯蝟昭粡竚癈鷭т繻Ь筱因験 祠因抗蝟昭粡竚癈鷭т繻Ь卯因矼癬絳因恒祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼磊絳因恒祠因険蝟昭粡竚癈鷭т繻Ь卯因矼狛絳因恒祠因鹸蝟昭粡竚癈鷭т繻Ь卯因矼口絳因恒祠因原蝟昭粡竚癈鷭т繻Ь絳因原 絳因恒祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣口絳因恒祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣癬絳因恒祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣笶絳因恒祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣缸絳因恒祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矣狛絳因恒祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣磊絳因恒祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣糺絳因恒祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矣脯絳因恒祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼笶絳因恒筱因元蝟昭粡竚癈鷭т繻Ь卯因矼口絳因恒筱因元祠因抗蝟昭粡竚癈鷭т繻Ь卯因矼癬絳因恒筱因元祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼笶絳因恒筱因元祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矼缸絳因恒筱因元祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼狛絳因恒筱因元祠因拘蝟昭粡竚癈鷭т繻Ь卯因矼磊絳因恒筱因元祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼糺絳因恒筱因元祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矼脯絳因恒筱因元祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌口絳因控祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌狛絳因控祠因険蝟昭粡竚癈鷭т繻Ь絳因幻 絳因控祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣口絳因控祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣癬絳因控祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣笶絳因控祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣狛絳因控祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣磊絳因控祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣糺絳因控祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因砌癬絳因昂祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌磊絳因昂祠因険蝟昭粡竚癈鷭т繻Ь絳因弦 絳因昂祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣口絳因昂祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣癬絳因昂祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣笶絳因昂祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣缸絳因昂祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矣狛絳因昂祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣磊絳因昂祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣糺絳因昂祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矣脯絳因昂祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌笶絳因昂筱因元蝟昭粡竚癈鷭т繻Ь卯因矼口絳因昂筱因元祠因抗蝟昭粡竚癈鷭т繻Ь卯因矼癬絳因昂筱因元祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼笶絳因昂筱因元祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矼缸絳因昂筱因元祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼狛絳因昂筱因元祠因拘蝟昭粡竚癈鷭т繻Ь卯因矼磊絳因昂筱因元祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼糺絳因昂筱因元祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矼脯絳因昂筱因元祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌癬絳因更祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌磊絳因更祠因険蝟昭粡竚癈鷭т繻Ь卯因砌狛絳因更祠因鹸蝟昭粡竚癈鷭т繻Ь卯因砌口絳因更祠因原蝟昭粡竚癈鷭т繻Ь絳因瘁 絳因更祠因幻蝟昭粡竚癈鷭т繻Ь絳因午 絳因更祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣口絳因更祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣癬絳因更祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣笶絳因更祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣缸絳因更祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矣狛絳因更祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣磊絳因更祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣糺絳因更祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矣脯絳因更祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌口絳因号祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌狛絳因号祠因険蝟昭粡竚癈鷭т繻Ь絳因吾 絳因号祠因娯蝟昭粡竚癈鷭т繻Ь卯因矮口絳因号祠因抗蝟昭粡竚癈鷭т繻Ь卯因矮癬絳因号祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮笶絳因号祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矮狛絳因号祠因拘蝟昭粡竚癈鷭т繻Ь卯因矮磊絳因号祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮糺絳因号祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因砌笶絳因甕祠因拘蝟昭粡竚癈鷭т繻Ь卯因砌癬絳因甬祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌磊絳因甬祠因険蝟昭粡竚癈鷭т繻Ь卯因砌狛絳因甬祠因鹸蝟昭粡竚癈鷭т繻Ь卯因砌口絳因甬祠因原蝟昭粡竚癈鷭т繻Ь絳因痰 絳因甬祠因幻蝟昭粡竚癈鷭т繻Ь絳因後 絳因甬祠因娯蝟昭粡竚癈鷭т繻Ь卯因矮狛絳因甬祠因拘蝟昭粡竚癈鷭т繻Ь卯因矮磊絳因甬祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮糺絳因甬祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矮脯絳因甬祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌癬絳因畊祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌磊絳因畊祠因険蝟昭粡竚癈鷭т繻Ь絳因御 絳因畊祠因娯蝟昭粡竚癈鷭т繻Ь卯因矮口絳因畊祠因抗蝟昭粡竚癈鷭т繻Ь卯因矮癬絳因畊祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮笶絳因畊祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矮缸絳因畊祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矮狛絳因畊祠因拘蝟昭粡竚癈鷭т繻Ь卯因矮磊絳因畊祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮糺絳因畊祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矮脯絳因畊祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌笶絳因畊筱因元蝟昭粡竚癈鷭т繻Ь卯因矼口絳因畊筱因元祠因抗蝟昭粡竚癈鷭т繻Ь卯因矼癬絳因畊筱因元祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼笶絳因畊筱因元祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矼缸絳因畊筱因元祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼狛絳因畊筱因元祠因拘蝟昭粡竚癈鷭т繻Ь卯因矼磊絳因畊筱因元祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼糺絳因畊筱因元祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矼脯絳因畊筱因元祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因矮胤絳因皹祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮往絳因皹祠因険蝟昭粡竚癈鷭т繻Ь卯因矼往絳因皹祠因鹸蝟昭粡竚癈鷭т繻Ь卯因矼胤絳因皹祠因原蝟昭粡竚癈鷭т繻Ь絳因痺 絳因皹祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣胤絳因皹祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣拐絳因皹祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣棋絳因皹祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣屑絳因皹祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矣往絳因皹祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣茅絳因皹祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣享絳因皹祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矣拳絳因皹祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼屑絳因皹筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼茅絳因皹筱因元蝟昭粡竚癈鷭т繻Ь卯因矼拐絳因皹筱因元祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼棋絳因皹筱因元祠因険蝟昭粡竚癈鷭т繻Ь卯因矼胤絳因皹筱因元祠因抗蝟昭粡竚癈鷭т繻Ь卯因矼拐絳因皹筱因元祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼棋絳因皹筱因元祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矼屑絳因皹筱因元祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼往絳因皹筱因元祠因拘蝟昭粡竚癈鷭т繻Ь卯因矼茅絳因皹筱因元祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼享絳因皹筱因元祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矼拳絳因皹筱因元祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼拳絳因皹筱因元筱因顕蝟昭粡竚癈鷭т繻Ь卯因矮拐絳因盖祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮茅絳因盖祠因険蝟昭粡竚癈鷭т繻Ь絳因痲 絳因盖祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣胤絳因盖祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣拐絳因盖祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣棋絳因盖祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣往絳因盖祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣茅絳因盖祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣享絳因盖祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矮棋絳因盞祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮享絳因盞祠因険蝟昭粡竚癈鷭т繻Ь絳因痳 絳因盞祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣胤絳因盞祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣拐絳因盞祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣棋絳因盞祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣屑絳因盞祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矣往絳因盞祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣茅絳因盞祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣享絳因盞祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矣拳絳因盞祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌屑絳因盞筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌茅絳因盞筱因元蝟昭粡竚癈鷭т繻Ь卯因砌拐絳因盞筱因元祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌棋絳因盞筱因元祠因険蝟昭粡竚癈鷭т繻Ь卯因矼胤絳因盞筱因元祠因抗蝟昭粡竚癈鷭т繻Ь卯因矼拐絳因盞筱因元祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼棋絳因盞筱因元祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矼屑絳因盞筱因元祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼往絳因盞筱因元祠因拘蝟昭粡竚癈鷭т繻Ь卯因矼茅絳因盞筱因元祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼享絳因盞筱因元祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矼拳絳因盞筱因元祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌拳絳因盞筱因元筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼缸絳因盥蝟昭粡竚癈鷭т繻Ь卯因矮屑絳因盥祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮拳絳因盥祠因険蝟昭粡竚癈鷭т繻Ь卯因砌往絳因盥祠因鹸蝟昭粡竚癈鷭т繻Ь卯因砌胤絳因盥祠因原蝟昭粡竚癈鷭т繻Ь罨因午 絳因盥祠因幻蝟昭粡竚癈鷭т繻Ь卯因砌拐絳因盥祠因幻祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌茅絳因盥祠因幻祠因険蝟昭粡竚癈鷭т繻Ь絳因弘 絳因盥祠因幻祠因娯蝟昭粡竚癈鷭т繻Ь卯因砌拳絳因盥祠因幻筱因顕蝟昭粡竚癈鷭т繻Ь絳因瘋 絳因盥祠因娯蝟昭粡竚癈鷭т繻Ь卯因矣胤絳因盥祠因抗蝟昭粡竚癈鷭т繻Ь卯因矣拐絳因盥祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣棋絳因盥祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矣屑絳因盥祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矣往絳因盥祠因拘蝟昭粡竚癈鷭т繻Ь卯因矣茅絳因盥祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矣享絳因盥祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矣拳絳因盥祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌屑絳因盥筱因顕蝟昭粡竚癈鷭т繻Ь卯因矮口絳因砌祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮狛絳因砌祠因険蝟昭粡竚癈鷭т繻Ь罨因吾 絳因砌祠因娯蝟昭粡竚癈鷭т繻Ь卯因矮胤絳因砌祠因抗蝟昭粡竚癈鷭т繻Ь卯因矮拐絳因砌祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮棋絳因砌祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矮往絳因砌祠因拘蝟昭粡竚癈鷭т繻Ь卯因矮茅絳因砌祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮享絳因砌祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因砌棋絳因砌筱因元祠因険蝟昭粡竚癈鷭т繻Ь卯因砌棋罨因険祠因抗蝟昭粡竚癈鷭т繻Ь卯因砌享罨因険祠因拘蝟昭粡竚癈鷭т繻Ь卯因矮癬罨因元祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮磊罨因元祠因険蝟昭粡竚癈鷭т繻Ь卯因砌往罨因元祠因鹸蝟昭粡竚癈鷭т繻Ь卯因砌胤罨因元祠因原蝟昭粡竚癈鷭т繻Ь罨因呉 罨因元祠因幻蝟昭粡竚癈鷭т繻Ь卯因砌拐罨因元祠因幻祠因鍵蝟昭粡竚癈鷭т繻Ь卯因砌茅罨因元祠因幻祠因険蝟昭粡竚癈鷭т繻Ь絳因皸 罨因元祠因幻祠因娯蝟昭粡竚癈鷭т繻Ь卯因砌拳罨因元祠因幻筱因顕蝟昭粡竚癈鷭т繻Ь罨因娯 罨因元祠因娯蝟昭粡竚癈鷭т繻Ь卯因矮胤罨因元祠因抗蝟昭粡竚癈鷭т繻Ь卯因矮拐罨因元祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮棋罨因元祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矮屑罨因元祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矮往罨因元祠因拘蝟昭粡竚癈鷭т繻Ь卯因矮茅罨因元祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮享罨因元祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矮拳罨因元祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌屑罨因元筱因顕蝟昭粡竚癈鷭т繻Ь卯因矮笶罨因弦祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮糺罨因弦祠因険蝟昭粡竚癈鷭т繻Ь罨因後 罨因弦祠因娯蝟昭粡竚癈鷭т繻Ь卯因矮胤罨因弦祠因抗蝟昭粡竚癈鷭т繻Ь卯因矮拐罨因弦祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮棋罨因弦祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矮屑罨因弦祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矮往罨因弦祠因拘蝟昭粡竚癈鷭т繻Ь卯因矮茅罨因弦祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矮享罨因弦祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矮拳罨因弦祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌屑罨因弦筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌茅罨因弦筱因元蝟昭粡竚癈鷭т繻Ь卯因砌拐罨因弦筱因元祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼胤罨因弦筱因元祠因抗蝟昭粡竚癈鷭т繻Ь卯因矼拐罨因弦筱因元祠因抗祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼棋罨因弦筱因元祠因抗祠因険蝟昭粡竚癈鷭т繻Ь卯因矼屑罨因弦筱因元祠因抗筱因顕蝟昭粡竚癈鷭т繻Ь卯因矼往罨因弦筱因元祠因拘蝟昭粡竚癈鷭т繻Ь卯因矼茅罨因弦筱因元祠因拘祠因鍵蝟昭粡竚癈鷭т繻Ь卯因矼享罨因弦筱因元祠因拘祠因険蝟昭粡竚癈鷭т繻Ь卯因矼拳罨因弦筱因元祠因拘筱因顕蝟昭粡竚癈鷭т繻Ь卯因砌拳罨因弦筱因元筱因顕蝟昭粡竚癈鷭т繻Ь罨因拘 罨因慌祠因幻蝟昭粡竚癈鷭т繻Ь罨因抗 罨因慌祠因娯蝟昭粡竚癈鷭т繻Ь穐因厳 穐因原祠因幻蝟昭粡竚癈鷭т繻Ь階因弘 穐因弘祠因原蝟昭粡竚癈鷭т繻Ь階因慌 穐因弘祠因幻蝟昭粡竚癈鷭т繻Ь穐因験 穐因抗祠因険蝟昭粡竚癈鷭т繻Ь階因攻 穐因控祠因原蝟昭粡竚癈鷭т繻Ь穐因険 穐因控祠因幻蝟昭粡竚癈鷭т繻Ь階因険 穐因攻祠因原蝟昭粡竚癈鷭т繻Ь階因鴻 穐因攻祠因幻蝟昭粡竚癈鷭т繻Ь階因劫 穐因昂祠因幻蝟昭粡竚癈鷭т繻Ь階因甓 穐因晃祠因鹸蝟昭粡竚癈鷭т繻Ь穐因更 穐因晃祠因原蝟昭粡竚癈鷭т繻Ь階因甦 穐因晃祠因幻蝟昭粡竚癈鷭т繻Ь穐因吾 穐因香祠因険蝟昭粡竚癈鷭т繻Ь階因甼 穐因劫祠因幻蝟昭粡竚癈鷭т繻Ь階因痳 穐因甞祠因鹸蝟昭粡竚癈鷭т繻Ь穐因後 穐因甞祠因原蝟昭粡竚癈鷭т繻Ь階因皸 穐因甞祠因幻蝟昭粡竚癈鷭т繻Ь階因皺 穐因甞祠因呉蝟昭粡竚癈鷭т繻Ь階因盍 穐因畄祠因幻蝟昭粡竚癈鷭т繻Ь階因盡 穐因痰祠因幻蝟昭粡竚癈鷭т繻Ь階因恒 穐因皸祠因原蝟昭粡竚癈鷭т繻Ь階因抗 穐因皸祠因幻蝟昭粡竚癈鷭т繻Ь卯因抗 穐因盂祠因険蝟昭粡竚癈鷭т繻Ь階因昂 穐因盖祠因原蝟昭粡竚癈鷭т繻Ь卯因恒 穐因盖祠因幻蝟昭粡竚癈鷭т繻Ь階因顕 穐因盒祠因原蝟昭粡竚癈鷭т繻Ь階因剛 穐因盒祠因幻蝟昭粡竚癈鷭т繻Ь階因号 穐因盞祠因幻蝟昭粡竚癈鷭т繻Ь階因甞 穐因盡祠因鹸蝟昭粡竚癈鷭т繻Ь穐因盥 穐因盡祠因原蝟昭粡竚癈鷭т繻Ь階因甬 穐因盡祠因幻蝟昭粡竚癈鷭т繻Ь卯因鴻 穐因矚祠因険蝟昭粡竚癈鷭т繻Ь階因畄 穐因矼祠因幻蝟昭粡竚癈鷭т繻Ь階因瘋 卯因験祠因鹸蝟昭粡竚癈鷭т繻Ь卯因劫 卯因験祠因原蝟昭粡竚癈鷭т繻Ь階因皹 卯因験祠因幻蝟昭粡竚癈鷭т繻Ь階因盂 卯因験祠因呉蝟昭粡竚癈鷭т繻Ь階因盖 卯因厳祠因幻蝟昭粡竚癈鷭т繻Ь階因盥 卯因呉祠因幻蝟昭粡竚癈鷭т繻Ь卯因昂 卯因攻祠因幻蝟昭粡竚癈鷭т繻Ь卯因盒 卯因盍祠因御蝟昭粡竚癈鷭т繻Ь卯因盞 卯因盖祠因御蝟昭粡竚癈鷭т繻Ь罨因痺缸桑因弘喬因盞蝟昭粡竚癈鷭т繻Ь罨因痺脯桑因弘喬因盡蝟昭粡竚癈鷭т繻Ь罨因痺胤桑因弘喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺往桑因恒喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲笶桑因恒喬因砌蝟昭粡竚癈鷭т繻Ь罨因痺拐桑因慌喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺茅桑因抗喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺棋桑因拘喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲磊桑因控喬因盥蝟昭粡竚癈鷭т繻Ь罨因痺享桑因控喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺屑桑因攻喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺口桑因晃喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺狛桑因更喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺癬桑因香喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺磊桑因高喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲糺桑因高喬因砌蝟昭粡竚癈鷭т繻Ь罨因痺笶桑因鴻喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺缸桑因劫喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲胤桑因甍喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲往桑因甕喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲茅桑因甞喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲棋桑因甦喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲缸桑因甦喬因砌蝟昭粡竚癈鷭т繻Ь罨因痲屑桑因甼喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲拳桑因畄喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲口桑因畍喬因矣蝟昭粡竚癈鷭т繻Ь罨因痲狛桑因畊喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺笶桑因畊喬因矣桑因険蝟昭粡竚癈鷭т繻Ь罨因痺糺桑因畊喬因矣桑因顕蝟昭粡竚癈鷭т繻Ь罨因痺癬桑因畊桑因険蝟昭粡竚癈鷭т繻Ь罨因痺磊桑因畊桑因顕蝟昭粡竚癈鷭т繻Ь罨因痲癬桑因瘁喬因矣蝟昭粡竚癈鷭т繻Ь罨因痺脯桑因皺喬因盞蝟昭粡竚癈鷭т繻Ь穐因甬口穐因甦規因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甬狛穐因甦喬因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甬癬穐因甦桑因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甬磊穐因甦祠因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甬笶穐因甦卯因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甬糺穐因甦岡因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甦狛穐因甦謙因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甬缸穐因甦皙因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甬脯穐因甦罨因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甦往穐因甦穐因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因甦棋穐因甦階因絨巻因矣蝟昭粡竚癈鷭т繻Ь穐因畄笶穐因甼卯因絨喬因矣蝟昭粡竚癈鷭т繻Ь穐因畄糺穐因甼岡因絨喬因矣蝟昭粡竚癈鷭т繻Ь穐因甼胤穐因甼祠因絨喬因矣蝟昭粡竚癈鷭т繻Ь穐因畄脯穐因甼罨因絨喬因矣蝟昭粡竚癈鷭т繻Ь穐因畄磊穐因畄桑因絨喬因矼蝟昭粡竚癈鷭т繻Ь穐因畄笶穐因畄桑因絨桑因昂蝟昭粡竚癈鷭т繻Ь穐因畊狛穐因畍喬因絨謙因矣蝟昭粡竚癈鷭т繻Ь穐因畊癬穐因畍桑因絨謙因矣蝟昭粡竚癈鷭т繻Ь穐因畊磊穐因畍祠因絨謙因矣蝟昭粡竚癈鷭т繻Ь穐因畊笶穐因畍卯因絨謙因矣蝟昭粡竚癈鷭т繻Ь穐因畊缸穐因畍皙因絨謙因矣蝟昭粡竚癈鷭т繻Ь穐因痲笶穐因痺卯因絨祠因矣蝟昭粡竚癈鷭т繻Ь穐因痲糺穐因痺岡因絨祠因矣蝟昭粡竚癈鷭т繻Ь穐因痲脯穐因痺罨因絨祠因矣蝟昭粡竚癈鷭т繻Ь穐因痲磊穐因痲桑因絨祠因矼蝟昭粡竚癈鷭т繻Ь穐因痲口穐因痲桑因絨筱因攻蝟昭粡竚癈鷭т繻Ь穐因痲笶穐因痲桑因絨筱因昂蝟昭粡竚癈鷭т繻Ь穐因痳棋穐因痳岡因絨罨因昂蝟昭粡竚癈鷭т繻Ь穐因瘋癬穐因瘋喬因絨絳因矼蝟昭粡竚癈鷭т繻Ь穐因瘋笶穐因瘋喬因絨罨因昂蝟昭粡竚癈鷭т繻Ь穐因瘋磊穐因瘋桑因絨絳因矼蝟昭粡竚癈鷭т繻Ь穐因皹口穐因皹喬因絨卯因攻蝟昭粡竚癈鷭т繻Ь穐因盂胤穐因皺罨因絨階因控蝟昭粡竚癈鷭т繻Ь穐因盂癬穐因盂喬因絨階因顕蝟昭粡竚癈鷭т繻Ь穐因盂磊穐因盂喬因絨階因顕穐因盂享鹿粡寂蝟赱齠洲粤讌将因絨階因厳 穐因盂喬因絨階因控蝟昭粡竚癈鷭т繻Ь穐因盂口穐因盂喬因絨階因攻蝟昭粡竚癈鷭т繻Ь穐因盖癬穐因盖喬因絨巻因矼蝟昭粡竚癈鷭т繻Ь穐因盖笶穐因盖喬因絨規因昂蝟昭粡竚癈鷭т繻Ь穐因盖磊穐因盖桑因絨巻因矼蝟昭粡竚癈鷭т繻Ь穐因盡茅穐因盥筱因絨謙因皺蝟昭粡竚癈鷭т繻Ь穐因矚茅穐因矜筱因絨甃因皺蝟昭粡竚癈鷭т繻Ь穐因矮狛穐因矮穐因絨絳因盖蝟昭粡竚癈鷭т繻Ь穐因矮茅穐因矮岡因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矮糺穐因矮祠因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矮拐穐因矮卯因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矮拳穐因矮喬因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矮笶穐因矮皙因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矮茅穐因矮岡因絨筱因皹蝟昭粡竚癈鷭т繻Ь穐因矮享穐因矮巻因絨筱因皹蝟昭粡竚癈鷭т繻Ь穐因矼往穐因矼穐因絨筱因皹蝟昭粡竚癈鷭т繻Ь穐因矼狛穐因矼穐因絨絳因盖蝟昭粡竚癈鷭т繻Ь穐因矼茅穐因矼岡因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矼糺穐因矼祠因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矼拐穐因矼卯因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矼拳穐因矼喬因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矼笶穐因矼皙因絨絳因盞蝟昭粡竚癈鷭т繻Ь穐因矮屑穐因矼岡因絨絳因鍵蝟昭粡竚癈鷭т繻Ь穐因矮拳穐因矼岡因絨絳因鍵穐因矮往鹿粡寂蝟赱齠洲粤讌将因絨筱因盡 穐因矼階因絨絳因鍵蝟昭粡竚癈鷭т繻Ь穐因矮狛穐因矼階因絨絳因鍵穐因矮往鹿粡寂蝟赱齠洲粤讌将因絮罨因娯 卯因矼罨因窿胤鹿粡寂蝟赱齠洲粤讌将因絮罨因後 卯因矼罨因窿往鹿粡寂蝟赱齠洲粤讌将因絮罨因御 卯因矼罨因邃拐鹿粡寂蝟赱齠洲粤讌将因絮罨因剛 卯因砌絳因窿胤鹿粡寂蝟赱齠洲粤讌将因絮罨因劫 卯因砌絳因窿往鹿粡寂蝟赱齠洲粤讌将因絮罨因号 卯因砌絳因邃拐鹿粡寂蝟赱齠洲粤讌将因絣岡因拘 階因険喬因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険笶階因険皙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険缸階因険筱因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険胤階因険罨因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険拐階因険卯因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険棋階因険階因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険屑階因険規因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険口階因険桑因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険癬階因険幸因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険笶階因険皙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険缸階因険筱因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険胤階因険罨因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険拐階因険卯因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険享階因険巻因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険拳階因険喬因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険狛階因険謙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険胤階因険罨因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険往階因険罨因絣岡因香蝟昭粡竚癈鷭т繻Ь階因険茅階因険岡因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険棋階因険岡因絣岡因香蝟昭粡竚癈鷭т繻Ь階因険屑階因険規因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険拳階因険規因絣岡因香蝟昭粡竚癈鷭т繻Ь階因険狛階因険謙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険癬階因険謙因絣岡因香蝟昭粡竚癈鷭т繻Ь階因険笶階因険皙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因険糺階因険皙因絣岡因香蝟昭粡竚癈鷭т繻Ь階因顕缸階因顕筱因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験棋階因顕喬因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕笶階因顕皙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕缸階因顕筱因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕胤階因顕罨因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕拐階因顕卯因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕棋階因顕階因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕屑階因顕規因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕口階因顕桑因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕癬階因顕幸因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕笶階因顕皙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因顕缸階因顕筱因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験胤階因顕罨因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験拐階因験卯因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験享階因験巻因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験拳階因験喬因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験狛階因験謙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験胤階因験罨因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験往階因験罨因絣岡因香蝟昭粡竚癈鷭т繻Ь階因験茅階因験岡因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験棋階因験岡因絣岡因香蝟昭粡竚癈鷭т繻Ь階因験屑階因験規因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験拳階因験規因絣岡因香蝟昭粡竚癈鷭т繻Ь階因験狛階因験謙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験癬階因験謙因絣岡因香蝟昭粡竚癈鷭т繻Ь階因験笶階因験皙因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験糺階因験皙因絣岡因香蝟昭粡竚癈鷭т繻Ь階因験拳階因験罨因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験口階因験穐因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験狛階因験卯因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験癬階因験岡因絣岡因更蝟昭粡竚癈鷭т繻Ь階因験缸階因験筱因絣岡因更蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь緕粡良地津瀘碗輿棉攸塢藁蝟昭粡竚癈鷭т繻Ь緕粡堝互瀕侖壥杜疎姪蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯蓍胄裼黯竦抗菓掛霸弦蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь電頭兎穐兎卯兎岡兎階兎巻兎規兎喬鹿粡寂蝟赱齠洲粤讌将因電瞳因電童因厳鬼因厳亀因厳偽因厳儀因厳妓因厳宜蝟昭粡竚癈鷭т繻Ь卦銭卦測卦狸卦潮叡銭兎銭兎測兎狸鹿粡寂蝟赱齠洲粤讌将因厳諺因厳顕因厳鹸因険填因田完因田官因田寛因田干蝟昭粡竚癈鷭т繻Ь調巻調規調喬調桑調謙調幸調銭調測鹿粡寂蝟赱齠洲粤讌将因田潅因田環因田甘因田監因田軌因田輝因田飢因田騎蝟昭粡竚癈鷭т繻Ь諜巻諜規諜喬諜桑諜謙諜幸諜銭諜測鹿粡寂蝟赱齠洲粤讌将因田誼因田議因田掬因田菊因田彊因田怯因田恐蝟昭粡竚癈鷭т繻Ь超階超巻超規超喬超桑超謙超幸超銭鹿粡寂蝟赱齠洲粤讌将因田饗因田驚因田仰因田凝因田尭因田薫因田訓因田群蝟昭粡竚癈鷭т繻Ь跳階跳巻跳規跳喬跳桑跳謙跳幸跳銭鹿粡寂蝟赱齠洲粤讌将因田径因田恵因田慶因田慧因田鍵因田険因田顕因田験蝟昭粡竚癈鷭т繻Ь銚巻銚規銚喬銚桑銚謙銚幸銚銭銚測鹿粡寂蝟赱齠洲粤讌将因田乎因田個因田古因田呼因田弘因田恒因田慌因田抗蝟昭粡竚癈鷭т繻Ь長巻長規長喬長桑長謙長幸長銭長測鹿粡寂蝟赱齠洲粤讌将因田甲因田皇因田硬因田稿因田前因田善因田漸因田然蝟昭粡竚癈鷭т繻Ь珍巻珍規珍喬珍桑珍謙珍幸珍銭珍測鹿粡寂蝟赱齠洲粤讌将因田礎因田祖因田租因田粗因田属因田賊因田族因田続蝟昭粡竚癈鷭т繻Ь賃巻賃規賃喬賃桑賃謙賃幸賃銭賃測鹿粡寂蝟赱齠洲粤讌将因田唾因田堕因田妥因田惰因田丹因田単因田嘆因田坦蝟昭粡竚癈鷭т繻Ь鎮巻鎮規鎮喬鎮桑鎮謙鎮幸鎮銭鎮測鹿粡寂蝟赱齠洲粤讌将因田鍛因田団因田壇因田弾因田聴因田脹因田腸因田蝶蝟昭粡竚癈鷭т繻Ь陳巻陳規陳喬陳桑陳謙陳幸陳銭陳測鹿粡寂蝟赱齠洲粤讌将因田鎮因田陳因田津因田墜因田徹蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将因田撤因田轍因田迭因田鉄因田典因田填因田天因田展蝟昭粡竚癈鷭т繻Ь津幸津銭津測津狸津潮津適津頭墜穐鹿粡寂蝟赱齠洲粤讌将因田同因田堂因田導因田憧因田撞因田洞因田瞳因田童蝟昭粡竚癈鷭т繻Ь墜幸墜銭墜測墜狸鉄穐鉄卯鉄岡鉄階鹿粡寂蝟赱齠洲粤讌将因電幹因電患因電感因電慣因電憾因電換因電漢因電澗蝟昭粡竚癈鷭т繻Ь鉄狸鉄潮鉄適鉄頭典穐典卯典岡典階鹿粡寂蝟赱齠洲粤讌将因電鬼因電亀因電偽因電儀因電妓因電宜因電義因電蟻蝟昭粡竚癈鷭т繻Ь典狸典潮典適典頭填穐填卯填岡穐鹿粡寂蝟赱齠洲粤讌将因電恭因電挟因電教因電橋因電況因電狂因電狭因電響蝟昭粡竚癈鷭т繻Ь填測填狸填潮填適填頭天穐天卯天岡鹿粡寂蝟赱齠洲粤讌将因電軍因電郡因電卦因電袈因電祁因電係因電傾因電形蝟昭粡竚癈鷭т繻Ь天測天狸天潮天適展穐展卯展岡展階鹿粡寂蝟赱齠洲粤讌将因電鹸因電元因電原因電厳因電幻因電弦因電諺因電限蝟昭粡竚癈鷭т繻Ь展狸展潮展適展頭店穐店卯店岡店階鹿粡寂蝟赱齠洲粤讌将因電拘因電控因電攻因電昂因電晃因電更因電港因電溝蝟昭粡竚癈鷭т繻Ь店狸店潮店適店頭伝穐伝卯伝岡伝階鹿粡寂蝟赱齠洲粤讌将因電全因電禅因電繕因電膳因電糎因電噌因電疏因電疎蝟昭粡竚癈鷭т繻Ь伝狸伝潮伝適伝頭殿穐殿卯殿岡殿階鹿粡寂蝟赱齠洲粤讌将因電卒因電袖因電其因電揃因電存因電孫因電汰因電詑蝟昭粡竚癈鷭т繻Ь殿狸殿潮殿適殿頭澱穐澱卯澱岡澱階鹿粡寂蝟赱齠洲粤讌将因電担因電探因電旦因電歎因電淡因電湛因電蛋因電誕蝟昭粡竚癈鷭т繻Ь澱狸澱潮澱適澱頭田穐田卯田岡田階鹿粡寂蝟赱齠洲粤讌将因電調因電諜因電超因電跳因電銚因電長因電珍因電賃蝟昭粡竚癈鷭т繻Ь田狸田潮田適田頭電穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь電卯電岡電階電巻電規電喬電桑電謙鹿粡寂蝟赱齠洲粤讌将因電店因電伝因電殿因電澱蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢銖皷芬繖蓖鶯霍害蜴課霸弦蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь禅狸禅潮禅適禅頭繕穐繕卯繕岡繕階鹿粡寂蝟赱齠洲粤讌将因徳挟因徳教因徳橋因徳況因徳狂因徳狭因徳響因徳饗蝟昭粡竚癈鷭т繻Ь繕狸繕潮繕適繕頭膳穐膳卯膳岡膳階鹿粡寂蝟赱齠洲粤讌将因徳郡因徳卦因徳袈因徳祁因徳係因徳傾因徳形因徳径蝟昭粡竚癈鷭т繻Ь膳狸膳潮膳適糎穐糎卯糎岡糎階糎巻鹿粡寂蝟赱齠洲粤讌将因徳元因徳原因徳厳因徳幻因徳弦因徳諺因徳限因徳乎蝟昭粡竚癈鷭т繻Ь糎潮糎適糎頭噌穐噌卯噌岡噌階噌巻鹿粡寂蝟赱齠洲粤讌将因徳控因徳攻因徳昂因徳晃因徳更因徳港因徳溝蝟昭粡竚癈鷭т繻Ь噌狸噌潮噌適噌頭疏穐疏卯疏岡疏階鹿粡寂蝟赱齠洲粤讌将因徳全因徳禅因徳繕因徳膳因徳糎因徳噌因徳疏因徳疎蝟昭粡竚癈鷭т繻Ь疏狸疏潮疏適疏頭疎穐疎卯疎岡疎階鹿粡寂蝟赱齠洲粤讌将因徳卒因徳袖因徳其因徳揃因徳存因徳孫因徳汰因徳詑蝟昭粡竚癈鷭т繻Ь疎狸疎潮疎適疎頭礎穐礎卯礎岡礎階鹿粡寂蝟赱齠洲粤讌将因徳担因徳探因徳旦因徳歎因徳淡因徳湛因徳蛋因徳誕蝟昭粡竚癈鷭т繻Ь礎狸礎潮礎適礎頭祖穐祖卯祖岡祖階鹿粡寂蝟赱齠洲粤讌将因徳調因徳諜因徳超因徳跳因徳銚因徳長因徳珍因徳賃蝟昭粡竚癈鷭т繻Ь祖狸祖潮祖適祖頭租穐租卯租岡租階鹿粡寂蝟赱齠洲粤讌将因徳鉄因徳典因徳填因徳天因徳展因徳店因徳伝因徳殿蝟昭粡竚癈鷭т繻Ь租狸租潮租適租頭粗穐粗卯粗岡粗階鹿粡寂蝟赱齠洲粤讌将因徳憧因徳撞因徳洞因徳瞳因徳童因徳胴因徳徳因徳涜蝟昭粡竚癈鷭т繻Ь粗狸卒穐卒卯卒岡卒階卒巻卒規卒喬鹿粡寂蝟赱齠洲粤讌将因涜慣因涜憾因涜換因涜漢因涜澗因涜潅因涜環因涜甘蝟昭粡竚癈鷭т繻Ь卒頭袖穐袖卯袖岡袖階袖巻袖規袖喬鹿粡寂蝟赱齠洲粤讌将因涜儀因涜妓因涜宜因涜義因涜蟻蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将因涜誼因涜議因涜掬因涜菊因涜彊因涜怯因涜恐因涜恭蝟昭粡竚癈鷭т繻Ь其巻其規其喬其桑其謙其幸其銭其測鹿粡寂蝟赱齠洲粤讌将因涜驚因涜仰因涜凝因涜尭因涜薫因涜訓因涜群因涜軍蝟昭粡竚癈鷭т繻Ь揃巻揃規揃喬揃桑揃謙揃幸揃銭揃測鹿粡寂蝟赱齠洲粤讌将因涜恵因涜慶因涜慧因涜鍵因涜険因涜顕因涜験因涜鹸蝟昭粡竚癈鷭т繻Ь存規存喬存桑存謙存幸存銭存測存狸鹿粡寂蝟赱齠洲粤讌将因涜個因涜古因涜呼因涜弘因涜恒因涜慌因涜抗因涜拘蝟昭粡竚癈鷭т繻Ь孫規孫喬孫桑孫謙孫幸孫銭孫測穐鹿粡寂蝟赱齠洲粤讌将因涜甲因涜皇因涜硬因涜稿因涜前因涜善因涜漸因涜然蝟昭粡竚癈鷭т繻Ь汰巻汰規汰喬汰桑汰謙汰幸汰銭汰測鹿粡寂蝟赱齠洲粤讌将因涜礎因涜祖因涜租因涜粗因涜属因涜賊因涜族因涜続蝟昭粡竚癈鷭т繻Ь詑巻詑規詑喬詑桑詑謙詑幸詑銭詑測鹿粡寂蝟赱齠洲粤讌将因涜唾因涜堕因涜妥因涜惰因涜丹因涜単因涜嘆因涜坦蝟昭粡竚癈鷭т繻Ь唾巻唾規唾喬唾桑唾謙唾幸唾銭唾測鹿粡寂蝟赱齠洲粤讌将因涜鍛因涜団因涜壇因涜弾因涜聴因涜脹因涜腸因涜蝶蝟昭粡竚癈鷭т繻Ь堕巻堕規堕喬堕桑堕謙堕幸堕銭堕測鹿粡寂蝟赱齠洲粤讌将因涜鎮因涜陳因涜津因涜墜因涜徹因涜撤因涜轍因涜迭蝟昭粡竚癈鷭т繻Ь妥巻妥規妥喬妥桑妥謙妥幸妥銭妥測鹿粡寂蝟赱齠洲粤讌将因涜澱因涜田因涜電因涜兎因涜動因涜同因涜堂因涜導蝟昭粡竚癈鷭т繻Ь惰巻惰規惰喬惰桑惰謙惰幸惰銭惰測鹿粡寂蝟赱齠洲粤讌将因涜特因特完因特官因特寛因特干因特幹因特患因特感蝟昭粡竚癈鷭т繻Ь担桑担謙担幸担銭担測穐穐全穐鹿粡寂蝟赱齠洲粤讌将因徳官因徳寛因徳干因徳幹因徳患因徳感因徳慣因徳憾蝟昭粡竚癈鷭т繻Ь全幸叡銭禅規禅喬禅桑鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь緕粡班瀞壁嘸弛抗鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙芦渦濺料駄甜蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥鼈蜀蜩燔芦渦朿毟姥鋼鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将因導軍因導郡因導卦因導袈因導祁因導係因導傾因導形蝟昭粡竚癈鷭т繻Ь碍測碍狸碍潮碍適寛卯寛岡寛階寛巻鹿粡寂蝟赱齠洲粤讌将因憧乙因憧俺因憧卸因憧恩因臆潅因漸干因憧温因憧価蝟昭粡竚癈鷭т繻Ь寛測寛狸寛潮俺謙感階探頭感幸碍謙鹿粡寂蝟赱齠洲粤讌将因長憶因賊蛎因憧嘉因嘆可因坦恵因鉄軌因嘆各因唾郡蝟昭粡竚癈鷭т繻Ь芦幸梓謙寛頭圧岡圧巻斡階斡適渦桑鹿粡寂蝟赱齠洲粤讌将因賊桶因賊加因賊温因賊嚇因賊菊因賊妓因賊憾因賊儀蝟昭粡竚癈鷭т繻Ь蔚階鰻巻蔚卯臆階干穐桶測俺喬穐鹿粡寂蝟赱齠洲粤讌将因族仰因族卦因族恵因憧咳因続概因続妓因続蟻因続教蝟昭粡竚癈鷭т繻Ь涯適碍測干岡干階幹穐幹桑患穐患適鹿粡寂蝟赱齠洲粤讌将因憧慨因袖価因憧概因袖夏因袖幹因袖狂因憧涯因揃寛蝟昭粡竚癈鷭т繻Ь袈巻袈謙袈桑干桑干謙干幸鹸適原卯鹿粡寂蝟赱齠洲粤讌将因存卦因存祁因存係因存恵因孫夏因孫碍因汰嚇因汰蟻蝟昭粡竚癈鷭т繻Ь腸銭繕卯干銭繕測続階続謙干測卒銭鹿粡寂蝟赱齠洲粤讌将因憧鈎因憧劃因詑軌因詑掬因詑郡因詑卦因詑傾因唾挟蝟昭粡竚癈鷭т繻Ь旦潮歎適干適調岡超桑干頭跳穐迭穐鹿粡寂蝟赱齠洲粤讌将因妥加因憧完因妥崖因妥劃因妥環因妥換因妥挟因惰恩蝟昭粡竚癈鷭т繻Ь憧幸梓巻斡巻扱巻渦喬幹卯鰻規鰻狸鹿粡寂蝟赱齠洲粤讌将因憧寛因単係因嘆佳因嘆憶因嘆乙因憧干因嘆蓋因嘆柿蝟昭粡竚癈鷭т繻Ь幹巻牡巻乙岡乙桑乙測乙適俺潮卸穐鹿粡寂蝟赱齠洲粤讌将因憧患因坦憶因坦概因坦換因坦街因憧感因坦妓因坦慧蝟昭粡竚癈鷭т繻Ь幹桑幹狸幹謙患幸感銭慣潮幹幸飢桑鹿粡寂蝟赱齠洲粤讌将因探概因探涯因憧漢因探亀因旦蓋因旦儀因旦彊因旦響蝟昭粡竚癈鷭т繻Ь橋階群卯群測郡桑郡階鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь郡測郡頭卦幸幹測幹狸袈喬袈適祁狸鹿粡寂蝟赱齠洲粤讌将因歎饗因歎薫因淡咳因淡教因淡係因湛俺因湛佳因湛可蝟昭粡竚癈鷭т繻Ь幹潮拘銭控階攻幸攻階昂狸昂巻昂規鹿粡寂蝟赱齠洲粤讌将因憧甘因蛋崖因蛋劃因蛋尭因蛋訓因誕嘉因憧監因誕漢蝟昭粡竚癈鷭т繻Ь其喬其銭揃穐揃巻其適嘆規揃幸嘆測鹿粡寂蝟赱齠洲粤讌将因鍛嘉因鍛可因鍛害因鍛寛因鍛軌因鍛宜因憧軌因団蛎蝟昭粡竚癈鷭т繻Ь患卯迭測患岡迭銭鉄階患階天岡概潮鹿粡寂蝟赱齠洲粤讌将因弾亀因弾恐因弾狭因弾仰因憧鬼因憧亀因憧偽蝟昭粡竚癈鷭т繻Ь患桑斡規患謙斡幸蔚謙患幸患銭蔚狸鹿粡寂蝟赱齠洲粤讌将因腸蛎因憧蟻因蝶怯因蝶狂因調卸因憧誼因憧議因調鬼蝟昭粡竚癈鷭т繻Ь慣岡飢適患適卦適患頭顕岡験桑鹸卯鹿粡寂蝟赱齠洲粤讌将因銚輝因銚郡因長感因長憾因長輝因憧彊因憧怯因憧恐蝟昭粡竚癈鷭т繻Ь感階感巻探階調謙諜巻超銭跳銭轍巻鹿粡寂蝟赱齠洲粤讌将因津外因憧教因津概因津澗因憧橋因墜街因憧況因墜干蝟昭粡竚癈鷭т繻Ь感謙感幸圧幸感銭感測蔚岡感狸感潮鹿粡寂蝟赱齠洲粤讌将因憧凝因轍慣因迭恩因迭俺因迭温因迭夏因迭外因迭価蝟昭粡竚癈鷭т繻Ь害測崖狸慨卯崖頭概規概謙概喬概頭鹿粡寂蝟赱齠洲粤讌将因迭恭因迭怯因迭鬼因迭狭因鉄俺因迭訓因迭群因鉄澗蝟昭粡竚癈鷭т繻Ь幹卯幹階干適感頭幹穐幹桑干頭感穐鹿粡寂蝟赱齠洲粤讌将因鉄掬因鉄輝因憧薫因鉄誼因鉄飢因鉄蟻因鉄鬼因鉄形蝟昭粡竚癈鷭т繻Ь感頭騎階騎頭鬼幸亀穐偽岡偽銭偽測鹿粡寂蝟赱齠洲粤讌将因憧訓因憧群因憧軍因填狂因填尭因天加因憧郡因天嘉蝟昭粡竚癈鷭т繻Ь慣規軍卯慣喬軍岡験卯験喬慣桑慣謙鹿粡寂蝟赱齠洲粤讌将因展議因憧傾因憧形因店輝因憧径蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将因店仰因伝環因憧恵因伝蟻因伝橋因伝響因殿乙因殿径蝟昭粡竚癈鷭т繻Ь揃銭慣潮探喬慣適穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь穐穐穐穐穐鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濮菓蝟昭粡竚癈鷭т繻Ь因険稿蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因険干因険軌因険彊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳亀蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛異蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳狂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳狭蝟昭粡竚癈鷭т繻Ь因徳饗因徳驚蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳仰蝟昭粡竚癈鷭т繻Ь因徳凝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛越蝟昭粡竚癈鷭т繻Ь因徳薫因徳尭蝟昭粡竚癈鷭т繻Ь因徳群因徳訓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳怯因徳軍蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳袈蝟昭粡竚癈鷭т繻Ь因徳祁蝟昭粡竚癈鷭т繻Ь因徳卦因徳郡蝟昭粡竚癈鷭т繻Ь因徳形因徳係蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳傾蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛菓蝟昭粡竚癈鷭т繻Ь因徳径蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳慶蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳慧蝟昭粡竚癈鷭т繻Ь因徳鍵蝟昭粡竚癈鷭т繻Ь因徳険蝟昭粡竚癈鷭т繻Ь因徳顕蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛額蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳鹸蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳元因徳原因涜祁蝟昭粡竚癈鷭т繻Ь因徳厳蝟昭粡竚癈鷭т繻Ь因徳幻蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳弦蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛館蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳乎因徳個蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳古蝟昭粡竚癈鷭т繻Ь因徳呼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛吸蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳恒因徳抗蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳拘蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳控蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛頚蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳昂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳晃因徳港蝟昭粡竚癈鷭т繻Ь因徳更蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛雇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳硬蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳稿蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳前因徳善蝟昭粡竚癈鷭т繻Ь因徳漸因徳然蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛鉱蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳全蝟昭粡竚癈鷭т繻Ь因徳禅蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛想蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳繕蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳膳蝟昭粡竚癈鷭т繻Ь因徳噌蝟昭粡竚癈鷭т繻Ь因徳疎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛胎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳礎蝟昭粡竚癈鷭т繻Ь因徳祖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳粗蝟昭粡竚癈鷭т繻Ь因徳族蝟昭粡竚癈鷭т繻Ь因徳続蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳卒因徳袖蝟昭粡竚癈鷭т繻Ь因徳其蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛築蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳揃蝟昭粡竚癈鷭т繻Ь因徳存蝟昭粡竚癈鷭т繻Ь因徳況蝟昭粡竚癈鷭т繻Ь因徳孫蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛壷蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳詑蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳唾蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳妥蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛奴蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳丹蝟昭粡竚癈鷭т繻Ь因徳惰因徳嘆蝟昭粡竚癈鷭т繻Ь因徳坦蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳探因徳担蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳旦蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濛遁蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳歎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳淡蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉異蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳湛蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳蛋蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳誕蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉越蝟昭粡竚癈鷭т繻Ь因徳鍛蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳壇蝟昭粡竚癈鷭т繻Ь因徳脹因徳弾蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉菓蝟昭粡竚癈鷭т繻Ь因徳蝶因徳調蝟昭粡竚癈鷭т繻Ь因徳腸因徳恭蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳超因徳跳因徳橋蝟昭粡竚癈鷭т繻Ь因徳長蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳珍因徳賃蝟昭粡竚癈鷭т繻Ь因徳鎮因徳陳蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳津蝟昭粡竚癈鷭т繻Ь因徳墜蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉額蝟昭粡竚癈鷭т繻Ь因徳撤蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳轍蝟昭粡竚癈鷭т繻Ь因徳鉄蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳迭蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳填蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳挟因徳天蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉館蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳店蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳殿蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳澱蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳田蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉吸蝟昭粡竚癈鷭т繻Ь因徳兎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳動因徳同蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳導蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉緊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳憧蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳撞蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳洞因徳童蝟昭粡竚癈鷭т繻Ь因徳瞳蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉頚蝟昭粡竚癈鷭т繻Ь因徳胴蝟昭粡竚癈鷭т繻Ь因徳徳蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳特因徳涜蝟昭粡竚癈鷭т繻Ь因涜完因涜官蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜寛蝟昭粡竚癈鷭т繻Ь因涜患蝟昭粡竚癈鷭т繻Ь因涜憾因涜感蝟昭粡竚癈鷭т繻Ь因涜換蝟昭粡竚癈鷭т繻Ь因涜慣蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉雇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜漢蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜澗蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜潅蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉鉱蝟昭粡竚癈鷭т繻Ь因涜環蝟昭粡竚癈鷭т繻Ь因涜甘因涜監蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜輝蝟昭粡竚癈鷭т繻Ь因涜飢蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜鬼蝟昭粡竚癈鷭т繻Ь因涜騎蝟昭粡竚癈鷭т繻Ь因涜偽因涜儀蝟昭粡竚癈鷭т繻Ь因涜亀蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉想蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜宜蝟昭粡竚癈鷭т繻Ь因涜義蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜蟻蝟昭粡竚癈鷭т繻Ь因涜誼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉胎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜議蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜菊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜彊蝟昭粡竚癈鷭т繻Ь因涜怯因涜挟蝟昭粡竚癈鷭т繻Ь因涜恐因涜恭蝟昭粡竚癈鷭т繻Ь因涜橋蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉築蝟昭粡竚癈鷭т繻Ь因涜教蝟昭粡竚癈鷭т繻Ь因涜況因涜狭因涜狂蝟昭粡竚癈鷭т繻Ь因涜響蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜饗蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜驚蝟昭粡竚癈鷭т繻Ь因涜仰蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉壷蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳糎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜尭蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉奴蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜軍因涜訓蝟昭粡竚癈鷭т繻Ь因涜郡蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜袈蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀉遁蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜係蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜傾蝟昭粡竚癈鷭т繻Ь因涜形因涜径蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋異蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜険蝟昭粡竚癈鷭т繻Ь因涜験蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋越蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜鹸因涜厳蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋菓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜幻蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋額蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜諺蝟昭粡竚癈鷭т繻Ь因涜限蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋館蝟昭粡竚癈鷭т繻Ь因涜乎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜呼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳誼蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜弘蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋吸蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜恒蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋頚蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜抗蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋雇蝟昭粡竚癈鷭т繻Ь因涜控蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜攻蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜昂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜晃蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜更蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋鉱蝟昭粡竚癈鷭т繻Ь因徳彊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜港蝟昭粡竚癈鷭т繻Ь因涜溝蝟昭粡竚癈鷭т繻Ь因涜甲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋築蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜漸蝟昭粡竚癈鷭т繻Ь因徳議蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋壷蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜然蝟昭粡竚癈鷭т繻Ь因涜全蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜禅蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜繕蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋奴蝟昭粡竚癈鷭т繻Ь因涜膳蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜糎因涜疏蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜疎蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀋遁蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜祖蝟昭粡竚癈鷭т繻Ь因涜粗蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺異蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜族蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺越蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜袖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺菓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜孫蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺額蝟昭粡竚癈鷭т繻Ь因涜詑蝟昭粡竚癈鷭т繻Ь因涜汰因涜唾因涜惰因涜丹因涜堕蝟昭粡竚癈鷭т繻Ь因涜妥蝟昭粡竚癈鷭т繻Ь因涜単因涜坦蝟昭粡竚癈鷭т繻Ь因涜嘆蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜蛋因涜担因涜旦蝟昭粡竚癈鷭т繻Ь因涜探因涜歎蝟昭粡竚癈鷭т繻Ь因涜湛因涜淡蝟昭粡竚癈鷭т繻Ь因涜誕蝟昭粡竚癈鷭т繻Ь因涜団因涜壇蝟昭粡竚癈鷭т繻Ь因徳菊蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺館蝟昭粡竚癈鷭т繻Ь因涜鍛蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜腸因涜超蝟昭粡竚癈鷭т繻Ь因涜調因涜聴因涜脹因涜諜蝟昭粡竚癈鷭т繻Ь因涜弾蝟昭粡竚癈鷭т繻Ь因徳教因涜長因涜鎮因涜津蝟昭粡竚癈鷭т繻Ь因涜陳因涜賃因涜銚蝟昭粡竚癈鷭т繻Ь因涜跳蝟昭粡竚癈鷭т繻Ь因徳掬因涜徹蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜墜蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺吸蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜撤蝟昭粡竚癈鷭т繻Ь因涜轍蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜迭蝟昭粡竚癈鷭т繻Ь因涜鉄蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜典蝟昭粡竚癈鷭т繻Ь因涜填因涜天蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺緊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜殿因涜澱蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺頚蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜田因涜兎蝟昭粡竚癈鷭т繻Ь因涜同因涜導蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺雇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜憧因涜撞蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜童蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺鉱蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因涜涜蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因特完蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺想蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因特官蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因特干蝟昭粡竚癈鷭т繻Ь因特幹蝟昭粡竚癈鷭т繻Ь因特患蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺胎蝟昭粡竚癈鷭т繻Ь因特感蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因特憾因特慣蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩濺築蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因特漢蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀑額蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь因徳完因徳官因徳寛因徳干因徳幹蝟昭粡竚癈鷭т繻Ь因徳患因徳感因徳慣因徳憾因徳換因徳漢因徳澗蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥憶貨鼈蜀蜩瀑館蝟昭粡竚癈鷭т繻Ь因徳潅因徳環因徳甘因徳監因徳軌因徳輝因徳飢蝟昭粡竚癈鷭т繻Ь因徳騎因徳偽因徳儀因徳妓因徳宜因徳義因徳恐因徳響蝟昭粡竚癈鷭т繻Ь因徳恵因徳験因徳諺因徳限因徳弘因徳慌因徳攻因徳溝蝟昭粡竚癈鷭т繻Ь因徳甲因徳皇因徳疏因徳租因徳属因徳賊因徳汰因徳堕蝟昭粡竚癈鷭т繻Ь因徳単因徳団因徳聴因徳諜因徳銚因徳徹因徳典因徳展蝟昭粡竚癈鷭т繻Ь因徳伝因徳電因徳堂因涜干因涜幹因涜軌因涜妓因涜掬蝟昭粡竚癈鷭т繻Ь因涜凝因涜薫因涜群因涜卦因涜恵因涜慶因涜慧因涜鍵蝟昭粡竚癈鷭т繻Ь因涜顕因涜元因涜原因涜弦因涜個因涜古因涜慌因涜拘蝟昭粡竚癈鷭т繻Ь因涜皇因涜硬因涜稿因涜前因涜善因涜噌因涜礎因涜租蝟昭粡竚癈鷭т繻Ь因涜属因涜賊因涜続因涜卒因涜其因涜揃因涜存因涜蝶蝟昭粡竚癈鷭т繻Ь因涜珍因涜展因涜店因涜伝因涜電因涜動因涜堂因涜洞蝟昭粡竚癈鷭т繻Ь因涜瞳因涜胴因涜徳因涜特因特寛因特換因特澗蝟昭粡竚癈鷭т繻Ь纂蝟昭粡竚癈鷭т繻Ь闔齡銖蜃鈬鼈闥闔齡芦渦燗蓍胄裼黝蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濮岡蝟昭粡竚癈鷭т繻Ь穐穐蝟昭粡竚癈鷭т繻Ь穐穐蝟昭粡竚癈鷭т繻Ь穐穐蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濛穐芦渦燗蓍胄裼黯賊憶貨鼈蜀蜩濛岡芦渦燗蓍胄裼黯続蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濛巻芦渦燗蓍胄裼黯袖穐芦渦燗蓍胄裼黯揃蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濛謙芦渦燗蓍胄裼黯孫憶貨鼈蜀蜩濛銭芦渦燗蓍胄裼黯詑蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濛狸芦渦燗蓍胄裼黯堕憶貨鼈蜀蜩濛適芦渦燗蓍胄裼黯惰蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀉穐芦渦燗蓍胄裼黯単憶貨鼈蜀蜩瀉岡芦渦燗蓍胄裼黯坦蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀉巻芦渦燗蓍胄裼黯探憶貨鼈蜀蜩瀉喬芦渦燗蓍胄裼黯歎蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀉謙芦渦燗蓍胄裼黯湛憶貨鼈蜀蜩瀉銭芦渦燗蓍胄裼黯誕蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀉狸芦渦燗蓍胄裼黯団憶貨鼈蜀蜩瀉適芦渦燗蓍胄裼黯弾蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀋穐芦渦燗蓍胄裼黯脹憶貨鼈蜀蜩瀋岡芦渦燗蓍胄裼黯蝶蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀋巻芦渦燗蓍胄裼黯諜穐芦渦燗蓍胄裼黯跳蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀋謙芦渦燗蓍胄裼黯長穐蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀋狸芦渦燗蓍胄裼黯陳憶貨鼈蜀蜩瀋適芦渦燗蓍胄裼黯墜蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濺穐芦渦燗蓍胄裼黯撤憶貨鼈蜀蜩濺岡芦渦燗蓍胄裼黯迭蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濺巻芦渦燗蓍胄裼黯典憶貨鼈蜀蜩濺喬芦渦燗蓍胄裼黯天蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濺謙芦渦燗蓍胄裼黯店憶貨鼈蜀蜩濺銭芦渦燗蓍胄裼黯殿蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩濺狸穐蝟昭粡竚癈鷭т繻Ь穐穐芦渦燗蓍胄裼黯導蝟昭粡竚癈鷭т繻Ь憶貨鼈蜀蜩瀑巻穐蝟昭粡竚癈鷭т繻Ь穐穐蝟昭粡竚癈鷭т繻Ь穐穐鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将e鈔蜀悵憶貨杜疎姪蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎纔鉉罸鉉罩羝侯碎諞諞遣羝谺莠碣粤跂肅跂閼碓斡幹錫鬲冗鈔纔羇井謂涯凱旭旭旭旭絢碣甎釈鱚羹Н鴣磔蜚鱚絲纔鉉罸鉉罩羝侯碎粋叙円襟岸頏纐蜈逅脂篏倶絛芦痳害瘋幹嘘飢拘咳繙宴姥蔚盖幹騎盥蚊Ь纔鉉罸鉉罩羝侯碎鹿畩錫鬲娼粤銛跛鹿粡寂蝟赱齠洲蔘鉉Ь誓卯慨穐誓鹿粡寂蝟赱齠洲粤讌将i冐粤炙堝股駄瀏濕蝟昭粡竚癈鷭т繻Ь粤肅鈬孕童埖餅庇鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙堝互墅孕濺料駄甜蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯熹閙羝澑磔桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖纒窰熾互霞纉桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖纒窰熾互霞纉熏黝飮鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡芦渦熹閙羝濂磔黝飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀孕童瀟孕侖壥杜疎姪蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤孕童濾緑孕濺料駄甜蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖羝熹閙纒窰霞纉桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖羝熹閙纒窰霞纉熏黝飮鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡互煥濂磔黯抗菓飮鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥闔齡竢銖羝熹閙纒窰鰍纉桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖闔齡互煥潦磔黯逑桍纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖闔齡互煥潦磔黯抗菓飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀孕童濾緑孕濺料駄鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将i聹繙良地津瀘碗輿棉攸塢藁鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡鈿鴉瘡蝴癆蜿釼鞜蜥闥轣跚闔熹痰跂桍纂蝟昭粡竚癈鷭т繻Ь緕粡羲蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤喩鋲塋瓶瀉亶害鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥鼈蜀蜩焜霍害朿毟姥鋼纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯霍害蜴課霸弦飮鹿粡寂蝟赱齠洲粤讌将e鈔蜀喩鋲塋瓶瀉亶害蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜀粤悵憶貨杜疎姪鹿粡寂蝟赱齠洲粤讌将纔鴈闔齡銖蜃鈬鼈闥鼈蜀蜩燔芦渦朿毟姥鋼纂蝟昭粡竚癈鷭т繻Ь纈竢銖皷芬繖蓖鶯竢銖憶貨鼈蜀蜩桍纂蝟昭粡竚癈鷭т繻Ь緕粡芦渦濺料駄鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将e鈔蜀鹿粡寂蝟赱齠洲蒹痲Ь粡聿蜚諞諞諞諞錫鬲冗鈔纔矜鯵完甼堪宜狂吾皸碓斡幹錫鬲将蓿繙洲芍繞諞諞粋叙円襟岸頏纐蜈逅脂篏倶絛芦痳害瘋幹嘘飢拘咳繙宴姥蔚盖幹騎盥蚊Ь纔鉉罸鉉罧禺昭碣皴釈鱚羹Н鴣磔蜚鱚絲纔鉉罸鉉罧秧莉澡澳熕鱚纓界瘢雹蜆輯鰍飢呉謂蚊羇盥撃羞箜禧恰盡粭經教繖竅繞冠上諞諞鹿畩鹿粡寂蝟赱齠洲蔘鉉Ь誓卯桶屋声蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь貌纔銖蜿肬励闥磨鉅鍋踉纈鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将闥蜃蜴瘡諞荻蜩瘟銓瘟鈬癆雕齒竇肬鱧絎褓鳫裙笏鶩鉉罸鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将ど笋鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь粤肅鈬嫗捫遼鈍凖嵒喇藁ひ纐蜩蜿遒⊆蝟昭粡竚癈鷭т繻Ь粤肅鈬嫗捫遼鈍崚厶貧遼鈍崚厶貧│貌瀲徒伝單瀋壮〒⊆蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭сЬ蜴竚Å茴鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲粤讌将釿閼蜴衷銖銓鹿粡寂蝟赱齠洲笏d繙蜴濮孕 絢蝟昭粡竚癈鷭сЬ粤肅鈬 瀛瓶 閏蝟昭粡竚癈鷭сЬ粤肅鈬 濺嫦 下蝟昭粡竚癈鷭сЬ粤肅鈬 灑壁 骸蝟昭粡竚癈鷭сЬ粤肅鈬 濛瀕倉 桓蝟昭粡竚癈鷭сЬ粤肅鈬 瀘話藁 桓蝟昭粡竚癈鷭т繻Ь粤肅鈬 濮喘鰭 擬蝟昭粡竚癈鷭т繻Ь謂葦汚鱚黼鴟繖闥堝瘢蛹鹿粡寂蝟赱齠洲粤讌将d繙蜴炙堝 脅蝟昭粡竚癈鷭т繻Ь謂碓鱚黼鴟繖闥堝那迚踟蝟昭粡竚癈鷭т繻Ь粤肅鈬 炙堝蔚 玄蝟昭粡竚癈鷭т繻Ь謂臼鱚黼鴟繖闥堝那迚踟蝟昭粡竚癈鷭т繻Ь粤肅鈬 炙堝害 渦鹿粡寂蝟赱齠洲粤讌将d繙蜴瀟堡賭 蔚鹿粡寂蝟赱齠洲笏d繙蜴炙遼力徇 濮孕麓蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭т繻Ь吶韭痺鉉罕艱葹鬲頤葹肬鱸痰跂閼蜀蜒癆蜿鹿粡寂蝟赱齠洲粤讌将鈬艱艱蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭сЬ粤艱鹿粡寂蝟赱齠洲笏u鈔繙鈑續禺蝟昭粡竚癈鷭т繻Ь粤肅鈬續礙罘蜴頤笏鬢苳蚕蛬跂鄂咲鉋梔鉋焜櫞鹿粡寂蝟赱齠洲粤讌将d繙蜴艱蜴頤笏鬮蝟昭粡竚癈鷭п粐Ь粤肅鈬續礙罘鉋焜蛬跂鄂蜴頤蜴頤笏鬩梱羽鹿粡寂蝟赱齠洲痲筵娼d繙蜴艱蜴頤笏鬮蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭т繻Ь粤肅鈬涼喇敕下蝟昭粡竚癈鷭сЬ粤頤葹鮗蝟昭粡竚癈鷭т繻Ь粤墟嫖鹿粡寂蝟赱齠洲粤讌将u鈔繙遡單鹿粡寂蝟赱齠洲粤讌将d繙蜴頤葹鬥礬鰲燻諞熕竏癇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь侮頤濶銓纈鹿粡寂蝟赱齠洲痲筵娼d繙蜴頤葹鬥礬 鰲燻諞熕竏癇蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭т繻Ь皷芬繖葹頤鹿粡寂蝟赱齠洲粤讌将齡癆蜒銖蜃鈬竏癇蜴頤鹿粡寂蝟赱齠洲粤讌将齡癆蜒銓鉋焜纂蝟昭粡竚癈鷭т繻Ь蜴蛬跂郢鹿粡寂蝟赱齠洲粤讌将齡癆蜒銓頤笏鮖鹿粡寂蝟赱齠洲粤讌将齡癆蜒銓煬緕纂蝟昭粡竚癈鷭п粐Ь粤肅鈬涼喇敕 害鹿粡寂蝟赱齠洲笏齡癆蜒銓釿皷纂蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭т繻Ь崛盲鱚齦踉纂蝟昭粡竚癈鷭п粐Ь皷芬繖葹鉋頤鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓鉋焜蛬跂郢鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓頤笏鬪煬緕纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь崛盲糂鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲笏齡癆蜒銓鹿粡寂蝟赱齠洲笏鰲燻諞熕竏癇蝟昭粡竚癈鷭т繻Ь銖蜃鈬蜴禹鹿粡寂蝟赱齠洲痲筵娼銖蜃鈬蜴禹鹿粡寂蝟赱齠洲笏蝟昭粡竚癈鷭сЬ頤笏閙跂遘鹿粡寂蝟赱齠洲笏閙跂釿皷纂蝟昭粡竚癈鷭т繻Ь矍齡鰡鱚皷纉煬緕鹿粡寂蝟赱齠洲痲筵娼鰲燗焜癆齡穐釿皷鹿粡寂蝟赱齠洲痲筵娼阨嘖夘稜齡頸鮖鹿粡寂蝟赱齠洲笏蜴笂蝴纂蝟昭粡竚癈鷭т繻Ь頤銖蜃鈬竏癇嘖夘稜纉苳諮纂蝟昭粡竚癈鷭сЬ鹿粡寂蝟赱齠洲笏阨桴頤笏鬩纂蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭сЬ續禹鹿粡寂蝟赱齠洲笏蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭т繻Ь侮竚諱鉅肅踉纈瘟鞜鶯蝟昭粡竚癈鷭т繻Ь艱葹瘤頤葹跛鱚韭痺繖蜴蜴竚蜿鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲笏d繙蜴佚厂烱閏蝟昭粡竚癈鷭т繻Ь蜴竚諞遣竢鈕蜃⊆蝟昭粡竚癈鷭т繻Ь蜴竚諞遣羝谺磚鹿粡寂蝟赱齠洲粤讌将i釿跿粤鉉罩羝諞⊆蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь銓諞燗韭蜚熄頸蜿銖鱧蝟昭粡竚癈鷭т繻Ь闔齡葹鬨鱧纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜴竢飴鹿粡寂蝟赱齠洲粤讌将竏癇頸蜿釖乙菌纂蝟昭粡竚癈鷭т繻Ь銓飴鹿粡寂蝟赱齠洲粤讌将蜴蜩煥黹瘰繖遡單纂蝟昭粡竚癈鷭т繻Ь銓黯皷鈑跂熨徳毛纏鹿粡寂蝟赱齠洲粤讌将蜴蜩焙阨碎縷髟阡繖遡單纂蝟昭粡竚癈鷭т繻Ь闥癇艘蛞蕭蝟昭粡竚癈鷭т繻Ь蜀乙稀蝟昭粡竚癈鷭т繻Ь鱚鴈瓜鹿粡寂蝟赱齠洲粤讌将 踈蜀黯皷鈑跂熨筴蝟昭粡竚癈鷭т繻Ь蜀鱧梔十棗З蝟昭粡竚癈鷭т繻Ь 蜩燗蜴芟縷髟阡繖遡單纂蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 關闔條癇艘蛞纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь踈蜀黯纉竅鞳筴蝟昭粡竚癈鷭т繻Ь蜩煥黹瘰繖遡單纂蝟昭粡竚癈鷭т繻Ь關闔條癇艘蛞纂蝟昭粡竚癈鷭т繻Ь踈蜀鱧梔十樛З蝟昭粡竚癈鷭т繻Ь蜩煥黹瘰繖簒纏鹿粡寂蝟赱齠洲粤讌将 踈蜀黯粹跂熨筴蝟昭粡竚癈鷭т繻Ь蜀鱧梔十▼鹿粡寂蝟赱齠洲粤讌将 蜩焙阨碎縷髟阡繖遡單纂蝟昭粡竚癈鷭т繻Ь踈纛鹿粡寂蝟赱齠洲粤讌将 關闔條癇艘蛞纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь踈蜀鱧梔十棗З蝟昭粡竚癈鷭т繻Ь蜩燗蜴芟縷髟阡繖簒纏鹿粡寂蝟赱齠洲粤讌将 踈蜀鱧梔十▼鹿粡寂蝟赱齠洲粤讌将 蜩焙阨碎縷髟阡繖簒纏鹿粡寂蝟赱齠洲粤讌将 踈蜀鱧梔十鹿粡寂蝟赱齠洲粤讌将 關闔條к挨纂蝟昭粡竚癈鷭т繻Ь關闔鶉關闔鹿粡寂蝟赱齠洲粤讌将 飴鹿粡寂蝟赱齠洲粤讌将 踈纛鹿粡寂蝟赱齠洲粤讌将 關闔條癇艘蛞纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蜀鹿粡寂蝟赱齠洲粤讌将 關闔條к挨纂蝟昭粡竚癈鷭т繻Ь關闔鶉關闔鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь續竢鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь瘡讚黼餾鹿粡寂蝟赱齠洲粤讌将貌諞頸齡鬧蜴膽蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闔鶯齡鰡鈔續竢鉚纈鱚齦踉蝟昭粡竚癈鷭т繻Ь闔鴦蜿粤蛹癇齔繝蜀蜈磔關囈鱸鈑蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鱚髟蜥ь諞Ъ蝟昭粡竚癈鷭т繻Ь阨貌諞│↑鉋蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь麗蝟昭粡竚癈鷭т繻Ь粤聲諞繝閼纉浜緕竢粤齡鱸鈑蝟昭粡竚癈鷭т繻Ь銓阡粤竢粤鉋遼闘鉉踉獅愛踉晒皃苳肚瘍蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲痲筵娼i釿跿粤鉉羆諞⊆蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭сЬ崛盲甜蝟昭粡竚癈鷭сЬ矍鉉聨諠闔閧蟐頸齟礬鹿粡寂蝟赱齠洲粤讌将崛盲閧蟐頸齟禹鹿粡寂蝟赱齠洲痲筵娼遡嫖礪關鱆纂蝟昭粡竚癈鷭сЬ鹿粡寂蝟赱齠洲痲筵娼蜴藥鹿粡寂蝟赱齠洲笏竏癇關頸鬪關緕篁鹿粡寂蝟赱齠洲笏赱跂遡嫖纂蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭сЬ繪鉗鹿粡寂蝟赱齠洲粤讌将囈鱸鈑已跿紲關纂蝟昭粡竚癈鷭т繻Ь頸熕嘖夘稜頸頸鮖鹿粡寂蝟赱齠洲粤讌将關緕關頸厶墟瀕濡關苳詞緕纂蝟昭粡竚癈鷭т繻Ь諞燗韭蜚熄頸蜿銖頸熕鹿粡寂蝟赱齠洲痲筵娼關頸齡魏笂頸逅脂鹿粡寂蝟赱齠洲痲筵娼關緕關頸藥鹿粡寂蝟赱齠洲痲筵娼肬┿頸熕踉關緕篁頸熕蝟昭粡竚癈鷭п粐Ь┴關頸―蝟昭粡竚癈鷭п粐Ь闔銛綮鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь鱧緕頸熕鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭сЬ釿皷涼喇敕纂蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭т繻Ь鉋焜纂蝟昭粡竚癈鷭т繻Ь蜴舫瘡鱆鹿粡寂蝟赱齠洲粤讌将蜴頤銖蜃鈬竏癇嘖夘稜鱆頸鮖鹿粡寂蝟赱齠洲粤讌将蛬跂厶墟瀕濡齟礬苳詞緕纂蝟昭粡竚癈鷭т繻Ь纉鰲燗燻纓┛蛬跂遞碓鹿粡寂蝟赱齠洲粤讌将鱚齦踉纂蝟昭粡竚癈鷭п粐Ь鉋焜鹿粡寂蝟赱齠洲痲筵娼蜴頤齡魏笂鱆逅脂煬緕鹿粡寂蝟赱齠洲痲筵娼糂鰲燗燻纓┛蛬跂遞碓鹿粡寂蝟赱齠洲痲筵娼糂鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲笏阨焜纂蝟昭粡竚癈鷭т繻Ь頤銖蜃鈬竏癇嘖夘稜纉苳諮纂蝟昭粡竚癈鷭т繻Ь煬緕厶墟瀕濡鱚齦踉跂郢鹿粡寂蝟赱齠洲痲筵娼阨嘖夘稜齡頸鮖鹿粡寂蝟赱齠洲痲筵娼閙跂嘖夘稜齡跂郢鹿粡寂蝟赱齠洲笏頤椣Щ鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲粤讌将蜀芦葦煕徂喩灣簒滴鹿粡寂蝟赱齠洲粤讌将屋円┬♂齒屋臆褓煕簒力烱芦葦鹿粡寂蝟赱齠洲痲筵娼蜀齒幻宜煕瘢雹逅竢鉚袿閭闔屋円鹿粡寂蝟赱齠洲痲筵娼蜩鏝元降徳毛纏鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲笏諱鉅蛬竢鉚纈燐面鹿粡寂蝟赱齠洲粤讌将厶墟瀕濡鱚齦踉頸鰮阨焜к挨纂蝟昭粡竚癈鷭т繻Ь嘖夘稜纉苳詞緕頤笏鮖鹿粡寂蝟赱齠洲粤讌将和鋪瀕禿痴纉鱆鹿粡寂蝟赱齠洲痲筵娼厶墟瀕濡糂苳諮桴頤笏鰥椣Щ鹿粡寂蝟赱齠洲痲筵娼厶墟瀕濡糂苳詞緕頤笏鮖鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲粤讌将鱚鴈纉鹿粡寂蝟赱齠洲痲筵娼鱚鴈齡纂蝟昭粡竚癈鷭сЬ鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲粤讌将竅跛繿瑳蝟昭粡竚癈鷭т繻Ь遼闘苺纉鷄銓繚纈鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将吶鴈苺纉黼緕竢粡鈑燗癈銓繚纈蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь趺闥蜚蓁纉竰蛯繖邵鹿粡寂蝟赱齠洲粤讌将妹訳鈔絎寰粤鴦鈔蜴捕鞜鈬黼鈕闥轣闔鳫竇齠蜴腱鹿粡寂蝟赱齠洲粤讌将嚆矚齡關闌蛋炉吶蛹踟瘢雹齠閭蛛鶤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竅黼貌齠烏蜴頤鹿粡寂蝟赱齠洲粤讌将緕貌査壁喙蝟昭粡竚癈鷭т繻Ь瓶廊屋臆丐鹿粡寂蝟赱齠洲粤讌将緕貌査喨瓶鹿粡寂蝟赱齠洲粤讌将蓍胄瀛瓶⊆蝟昭粡竚癈鷭т繻Ь蒹遼萄催嫦鹿粡寂蝟赱齠洲粤讌将嫦丐鹿粡寂蝟赱齠洲粤讌将緕貌査嬶卜亮蝟昭粡竚癈鷭т繻Ь嬶卜率喪檀菱⊆蝟昭粡竚癈鷭т繻Ь蒹遼萄座瀕倉拏蝟昭粡竚癈鷭т繻Ь舵料燮⊆蝟昭粡竚癈鷭т繻Ь鈔鹿粡寂蝟赱齠洲痲筵娼葹鱇笏纈閼粤笏蜿糟苡鱸粤黹鱸矼蜴瑳蝟昭粡竚癈鷭п粐Ь妹訳鈔絎寰粤鴦鈔蜴捕鞜鈬黼鈕闥轣闔鳫竇齠蜴腱鹿粡寂蝟赱齠洲痲筵娼繧癈竟讙塑б繪跛逅蒼齒竕癆纉蝟昭粡竚癈鷭сЬ鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲笏齡癆蜒遡嫖鹿粡寂蝟赱齠洲粤讌将鰲燻諞熈齠烏閧蟐鱆蝟昭粡竚癈鷭т繻Ь遡嫖礪齟禹鹿粡寂蝟赱齠洲痲筵娼鰲燻諞熈齠礪齟礬鹿粡寂蝟赱齠洲痲筵娼遡嫖礪齟禹鹿粡寂蝟赱齠洲笏蝟昭粡竚癈鷭сЬ銖蜃鈬竏癇雹鹿粡寂蝟赱齠洲笏皷芬繖葹緕篁鹿粡寂蝟赱齠洲痲筵娼蜴韭緕纂蝟昭粡竚癈鷭сЬ銓繿釿縷竢飴鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲粤讌将囈鱸鈑已跿紲齟礬纂蝟昭粡竚癈鷭т繻Ь皷芬繖葹厶墟瀕濡齟礬苳諮纂蝟昭粡竚癈鷭т繻Ь緕厶墟瀕濡齟礬苳詞緕纂蝟昭粡竚癈鷭т繻Ь鞳鈔鱚鴈淋夏婦嬶卜立纂蝟昭粡竚癈鷭п粐Ь蒹站灣紲齟祠灑墟瀕禰纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蚊齡鬥齟祠瘢雹韭緕鹿粡寂蝟赱齠洲痲筵娼鞳鈔跂郢鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲笏d繙蜴瀕智鹿粡寂蝟赱齠洲粤讌将隧楴蝟昭粡竚癈鷭т繻Ь十鞳鈔鱚鴈淋夏婦嬶卜立施鹿粡寂蝟赱齠洲粤讌将黼髟緕竇焜阨銓纈施鹿粡寂蝟赱齠洲粤讌将蜀黼髟緕竇焜阨銓纈逅殺瘢雹―刊楴蝟昭粡竚癈鷭п粐Ь施鹿粡寂蝟赱齠洲痲筵娼蜀霆署緕筴續瀕垈読惡炙遼力徇楴蝟昭粡竚癈鷭п粐Ь繿釿縷竢鬩楴蝟昭粡竚癈鷭п粐Ь繿釿縷竢十瘢雹逅因甦鹿粡寂蝟赱齠洲笏 黼髟緕竇焜阨銓纈施鹿粡寂蝟赱齠洲粤讌将蜀黼髟緕竇焜阨銓纈鹿粡寂蝟赱齠洲粤讌将 黼髟緕竇焜阨銓纈施鹿粡寂蝟赱齠洲粤讌将 鱚鴈淋夏婦鍍辿施鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蛹┛蝟昭粡竚癈鷭п粐Ь╋踉蚕繿釿縷竢鬧楴蝟昭粡竚癈鷭п粐Ь黼髟緕竇焜阨銓纈施鹿粡寂蝟赱齠洲痲筵娼 鱚鴈淋夏婦鍍辿施鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼蛹┛蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭сЬ┴十刊鹿粡寂蝟赱齠洲笏黼髟緕竇焜阨銓纈纂蝟昭粡竚癈鷭ц襷樟恒挟鰻謙厩鰲燻諞熈齠烏閧蟐鱆蝟昭粡竚癈鷭сЬ續瀕垈読惡炙遼力徇鹿粡寂蝟赱齠洲笏蝟昭粡竚癈鷭сЬ蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь瘡讚黼餾鹿粡寂蝟赱齠洲粤讌将貌齠襖齡鬧苳蜴艱鮗蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь續銖齠繖釿閼蜴閹齡鰡蜴艱磔諞阨鈬蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь竅黼貌齠鉋蝟昭粡竚癈鷭т繻Ь緕貌査喪檀票蝟昭粡竚癈鷭т繻Ь∩喘鰭⊆蝟昭粡竚癈鷭т繻Ь緕貌査壁喙蝟昭粡竚癈鷭т繻Ь嗜芦沖偏⊆蝟昭粡竚癈鷭т繻Ь緕貌査喨瓶鹿粡寂蝟赱齠洲粤讌将嚠蜀壁哂鹿粡寂蝟赱齠洲粤讌将蒹遼萄催嫦鹿粡寂蝟赱齠洲粤讌将鍍鱈偏⊆蝟昭粡竚癈鷭т繻Ь緕貌査孕童鹿粡寂蝟赱齠洲粤讌将孕騰権鹿粡寂蝟赱齠洲粤讌将蒹遼萄砕堝蔚鹿粡寂蝟赱齠洲粤讌将孕騰蔚⊆蝟昭粡竚癈鷭т繻Ь緕貌査嬶卜亮蝟昭粡竚癈鷭т繻Ь遼力徇⊆蝟昭粡竚癈鷭т繻Ь緕貌査舵料燮鹿粡寂蝟赱齠洲粤讌将舵料燮⊆蝟昭粡竚癈鷭т繻Ь緕篌蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将齡癆蜒遡嫖鹿粡寂蝟赱齠洲粤讌将鰲燻諞熈齠襖閧蟐鱆蝟昭粡竚癈鷭т繻Ь遡嫖礪齟禹鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь銓閼濛瀕倉抻鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鱚蜴蜚┤纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鉋焜纂蝟昭粡竚癈鷭т繻Ь蜴舫瘡鱆鹿粡寂蝟赱齠洲粤讌将蜴頤銖蜃鈬竏癇嘖夘稜鱆頸鮖鹿粡寂蝟赱齠洲粤讌将蛬跂厶墟瀕濡齟礬苳詞緕纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь罔屋円十瓶庇墟嫖蝟昭粡竚癈鷭т繻Ь芦葦煕─蜩鏖芦芽鞏罘墟嫖悵屋羽纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь齠煕簒纏鹿粡寂蝟赱齠洲粤讌将諱鉅蛬竢鉚纈嫐鹿粡寂蝟赱齠洲粤讌将苺纉黯徳毛纏鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蜀♂黯蜴頤閼縷迚筴鹿粡寂蝟赱齠洲粤讌将蜀齡鱆逅鉋焜閼緕瘢絳〒逢鹿粡寂蝟赱齠洲粤讌将竢粤喪檀瓢鹿粡寂蝟赱齠洲粤讌将繻黼竝隕蜴頤竢粤釶辣嗜芦沖偏〒逢鹿粡寂蝟赱齠洲粤讌将竢粤壁啝鹿粡寂蝟赱齠洲粤讌将繻黼竝隕蜴頤竢粤釶辣嫦丐十蝟昭粡竚癈鷭т繻Ь閼濺嫦纂蝟昭粡竚癈鷭т繻Ь踈蜀齡鱆逅鉋焜閼緕瘢絳嚠蜀壁哂十蝟昭粡竚癈鷭т繻Ь閼灑壁啝鹿粡寂蝟赱齠洲粤讌将繻黼竝隕蜴頤竢粤釶辣堝〒逢鹿粡寂蝟赱齠洲粤讌将竢粤孕童纂蝟昭粡竚癈鷭т繻Ь踈蜀齡鱆逅鉋焜閼緕瘢絳孕騰蔚〒逢鹿粡寂蝟赱齠洲粤讌将竢粤孕同胸鹿粡寂蝟赱齠洲粤讌将繻黼跂遖蜴頤竢粤釶辣蝟昭粡竚癈鷭т繻Ь閼炙遼力徇纂蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь續瀕垈読惡閼鹿粡寂蝟赱齠洲粤讌将蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь貌纔銖蜿肬励闥磨鉅鍋踉纈蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь偵黹鱸頸蜿郤蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蓍蜩祷銖蜿鴦蜿閹諞励磨鉅鍋踉纈鹿粡寂蝟赱齠洲粤讌将部闔鶯肅鴦癇苺辣銓鈔續竢鉚纈鱚齦踉衷鉚纈皷闔鹿粡寂蝟赱齠洲粤讌将粤蛹癇齔繝蜀蜈磔赱苴肅鴦癇苺辣銓蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鈴罟瘤阡蒹諱鉅竢粤闔鶯纈迴鈑續鳬鵺闢鈔纈迚釶踈蝟昭粡竚癈鷭т繻Ь竢鉚纈鉋瘤裼閼纉蜃釶諱鉅竢粤鹿粡寂蝟赱齠洲粤讌将齦竏瓶廊屋臆亂蓍胄瀛瓶鍍鱈偏孕騰闥堝峡鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将閹蒹闢蜻痺諞蜩蒹齠蜴頤諱鉅緕竢粡鈑鶤鹿粡寂蝟赱齠洲粤讌将部鱚銓踟繝閾鉗瓶廊屋臆亂蓍胄瀛瓶鍍鱈偏孕騰瘤孕騰蔚蝟昭粡竚癈鷭т繻Ь纈鈬繖逾黼蜴頤諱鉅竢粤跚竕鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将濁繙癜踉悵屋諱釶竢鉚纈蜴芦宛瘤甌鹿粡寂蝟赱齠洲粤讌将楠悵屋諱釶嗜必嗜鈔喘續蓖糂鱚竟鶯繖蝟昭粡竚癈鷭т繻Ь闥闕癆蜒閼粤笏蜿遯諞齠纉悵屋諱釶嚠蜀壁哺鹿粡寂蝟赱齠洲粤讌将夬窿辮悵屋蜴蓍胄瀛瓶皃苳鮫悧踉晒皃苳錆踉獅皃苳鮫哘踉晒皃苳皿鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十赱苴鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь頤蜩聽鱚兎奏猛頤蜩鈞聽鱚筮鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十蔚鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将閼蜩嗜芦沖偏撃蜚瓶蓍胄瀛瓶鍍鱈偏蝟昭粡竚癈鷭т繻Ь堝略堝饗溺鹿粡寂蝟赱齠洲粤讌将怏阨蜩頸蜿瘤竢逅蛹關闔瓶廊屋臆蜩齠繖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十弃脅蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鉋齠頸蜿蜩瓶蜚嚠蜀壁哮嫦亂鹿粡寂蝟赱齠洲粤讌将孕騰謙堝玉溺鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十十兵蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь齠瓶鉋部踈痺竇頸鍍鱈偏蝟昭粡竚癈鷭т繻Ь蓍蜩蒹繙癜踉壽蜩赱粹纉阡跿粤蓍胄瀛瓶蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蒼齦辣蓍胄瀛瓶鈔芦葦瘤蜴頤瘡齒窿辮瓶蝟昭粡竚癈鷭т繻Ь嫦蜩繝閾鉗癈芦葦瘤甌蜚蓖踉獅赱膃鹿粡寂蝟赱齠洲粤讌将悵屋諱釶葹趾糘諱釶蜩闔鶯繖銓悵屋軒鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十十甜蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь齠鍍鱈偏鉋部踈痺竇頸壁哺鹿粡寂蝟赱齠洲粤讌将噤辣蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь竢鉚纈皷闔蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十蛬鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将繿釿纉蜃釶瓶瘤裼兎奏猛蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十閙鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将繿釿纉蜃釶喘鰭兎奏猛蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十鮗蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь粤鍄竰厦埀劾慣鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十霸桶蓍鱇艨釶癆瘠瘤諱諱釶蜥瘍瘤畆蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蓍鱇艨釶磨諱釶皮鱇艨釶闔鴦蜿隨鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将朖莢癆瘠瘤痞蜥瘍瘤癆瘠瘤竢鉚纈皷闔蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь諱諱釶蜥瘍瘤痞癆瘠瘤蜥瘍瘤瘤皮鱇艨釶磨諱釶闔鴦蜿隨鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将壹閼阨羊腕蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十貅蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь嗜幻宜戻遶羽竟鶯鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十昿踉祉閼絋苳詩閼絋苳朖踉祉閼絋苳試閼絋苳旨歇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь闌粡鈑竢粤蹙踉晒竢粤緕苳踉祉閼絋苳試閼絋苳轣鱧蜴跚鈬蝟昭粡竚癈鷭т繻Ь蜚蓖蓍關闔肬趙緕苳蜩瘤肬趙癇芍蜩握鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将励跚鈬鱚黼鴟蜴跚鈬闌粡鈑蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十无悪掛鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将衷鉚纈悵屋瘡韆痰續弐跛糘糟韆痰續鶇喪檀筆鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将朖維闔鶯芦宛跟葹矼喘鰭蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь榎闔鶯悵屋諱鉉瘠蜴芟喪檀齔痺絎鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将朖擴衷鉚纈芦宛瘤諱謨粹跂喘鰭鞜竇鶤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将朖擲吶韭痺蜴弐跛糘↑瘢雹銓Е瘢雹苳薩Е瘢雹踉薩Е瘢雹髟阡薩Е瘢雹瘢雹癈挽楊蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蒼齦辣芦葦瘤蜴哭磨鉅藪鹿粡寂蝟赱齠洲粤讌将怏踉獅阨蜩頸蜿遯芦葦竢鉚纈蜴芦宛瘤甌鹿粡寂蝟赱齠洲粤讌将怏踉獅鱚黼鴟悵屋諱釶鈔鈿竢鉚纈悵屋諱釶悵屋軒鹿粡寂蝟赱齠洲粤讌将侮瓶頤喘繖侮嫦頤嗜繖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十胎悪課鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将蒼齦辣鳫諷壁哭磨鉅蜴頤蓍竏闢途樽鹿粡寂蝟赱齠洲粤讌将專繙蒹蜚蜩皷鈑趙纓礼蓖鈑鞜莅鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将朖賊瘡跫銷葹瘋途鱈闥喘蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь課闥竇喪檀瘋量蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十票蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь辮赱竕鈑闔齒芦沖褓葹蜴續竏癇痺鮗蝟昭粡竚癈鷭т繻Ь齦碵葹鱇笏纈捕鞜鈬黼鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十禺蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь繻續橇跚鈬繞筱粐蜴蜴聽繖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十轉耐琉歇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь浜瓶廊屋臆亊瓶聾元広粤竢粤兎奏猛蝟昭粡竚癈鷭т繻Ь黼瓶聾元広癆蜴鈬竇齠癇鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将朖軋偵竢粤浜矚黼挟釿閼繖縺蹼纃阮蒹痲纈阡蒹鞜鶯繙闥綣蝟昭粡竚癈鷭т繻Ь闔鴦蜿隨蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь處繝閼揺妖齡鱚瘢н蜴齡鱚瘢竢鉚纈鞜竇蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь塁闔蜒粤竢粡鈑蝟昭粡竚癈鷭т繻Ь瘡跫蜴碣縺蜴蒹蜆粲閹蒹癈絛緕竢粡鈑蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь維揺妖繝閼絎鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将揺妖釿閼絎縺粤齡絎跛喘鰭閼瘤竢銓鳫竏癇痺鴦鱚銓痺鹿粡寂蝟赱齠洲粤讌将磨鉅竢鉚纈皷闔鞳鱠闥辣矼肬鱚釿閼蜴膃蜩瘤鈿矼黼癈蜒鱚釿閼纈蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь苔浜緕竢粤癈絛齡鱚瘢蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь處纈肬辣緕竢粡鈑蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十貅蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь鉋鈔頤竢粤瓶聾元広癆蜴瘤瓶廊屋臆豫鹿粡寂蝟赱齠洲粤讌将皃苳鮫鵙踉晒皃苳錆踉獅鈔踉獅鱚阡闕鞜碎蓍關闔蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十黙轎鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将鈬跚鈬閼綣蝟昭粡竚癈鷭т繻Ь蜚蓖蓍關闔鉉粹纉逾竢鉚纈跚鈬鱚瘠鶤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将朖訳蝌牝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蜴粹智牝蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь轎痺智蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十蝌痺黻闢蜴粹鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢鉚纈肬纉齷齡纃鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十裼纒鼕蜩蜊矚黼挟鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将竢鉚纈肬釶辣竢粤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十裼鶚蜴頤纒祗蜴頤鼕蜩鉋蜊絖蜴頤矚黼挟鉋鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将癈齦辣鉋躰蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十秉竢粤蜴頤竢粤黼熙踉晒竢粤秉竢粤阨閼纉續閼絋苳纂蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь續蒹鉋阨閼纉續蝟昭粡竚癈鷭т繻Ь貌竟鶯肬跛阯蜴竢粤黼鈔蓖黼閼纉續瘢癇竅黼銖緕皷蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь瓶廊屋臆俚卞単感謙砠壁哮嬶都鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将枦嫦偏諞壮逅市瓶捕鞜鈬黼嫦嬖瓶鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将桿偏黹蜑甌覡甌褓鞳遶厩昂扱欝黹蜑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将桿偏黥纒竓隲關緕更薫訓記逑鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将枌亠厩害莱竰闢閹帙鴦蜿閹嫦豫鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将柮蓍胄瀛瓶喨瓶羊瘤裼鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将枌亶害甌覡甌蜴粹永鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将柎堝黶辣孕騰故鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将柎堝塁堝蜚蓖詫鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将柎堝詫孕騰詫鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将柎堝菌瘢癈堝饗甜蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь孕騰蔚妥孕騰蔚蜃鈔蛛阨堆夕蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь孕騰蔚妥詫孕騰蔚蜃鈔蛛詫鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将柎堝玉倒堝也跂鈔蛛阨堆夕蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь孕騰蔚姪詫孕騰蔚蜚梼粡瘤蜚堆夕蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь孕童礎遼偵孕騰謙孕童督蜴頤闔踟蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十皚謇隱讙迪鞳鳰裃齦矣葹鵆鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将嚼繝蜀癆諞瘤粲纉釶齠蜃鈬竏癇痺鴦蝟昭粡竚癈鷭т繻Ь蜚蓖蓍關闔聰謇蜩齠繖蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十鱚肅踉祉閼絋苳糸黹瘰竏癇痺鬢踉晒竢粤踉祉閼絋苳飼癇艱竏癇痺鬢踉晒竢粤蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь蒹鉉竢鉚纈嚠蜀壁哮鹿粡寂蝟赱齠洲粤讌将鉉痲糂鞳竕肅繖黹瘰竏癇痺鞳竕肅繖鈔閹蓍胄瀛瓶葹鱇笏纈鶤鹿粡寂蝟赱齠洲粤讌将遠磔癇苺辣銓纉竅鞳葹鱇笏纈鈔闌跫鈑纉鱚癇艱竏癇痺鴦蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十蜩痰跂霍害纔蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь瘤粲竏癇痺鴦緕粤蜴亶害癈皷芬繖葹鱇笏纈鶤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十竅隲蜴頤蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь繝閼蒹緕竢粤竏癇痺鴦蝟昭粡竚癈鷭т繻Ь蝟昭粡竚癈鷭т繻Ь十鳰鉋鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将寰纉竅鞳纈竇銓黹瘰繖葹鱇笏纈鶤鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将十鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲粤讌将芙鈿鱚纉閹關闔蝟昭粡竚癈鷭т繻Ь鹿粡寂蝟赱齠洲粤讌将鹿粡寂蝟赱齠洲笏蜆鹿粡寂蝟赱齠洲笏侮蜚燻諞┤鹿粡寂蝟赱齠洲笏蝟昭粡竚癈鷭т繻Ь蓖艱蝟昭粡竚癈鷭сЬ遡嫖麻闔鰲焙繙蜴縷迴糒跂│遼蕩鹿粡寂蝟赱齠洲粤讌将閾鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲笏鰲焙繙蜴縷迴糒跂煕笏蜿遖輕竢鉚諞↑矍鉉聨諠闔鹿粡寂蝟赱齠洲粤讌将鰲焙繙蜴縷迴糒跂煕笏蜿遖輕竢鉚∝齠陰鰲燻諞熈齠卯鹿粡寂蝟赱齠洲粤讌将鰲焙繙蜴縷迴糒跂煕笏蜿遖輕竢鉚∝齠旺鰲燻諞熈齠岡鹿粡寂蝟赱齠洲粤讌将鰲焙繙蜴縷瘡蛛鶉輕竢鉚∝齠↑苺纉鷁〒纂蝟昭粡竚癈鷭т繻Ь矍粤肅鈬焉跚癈矍皷鈑跂釼竚癈鶉輕竢鉚苺纉鵞∝齠旺鹿粡寂蝟赱齠洲痲筵娼鰲焙繙蜴縷迴糒跂煕笏蜿遖輕竢鉚∝齠↑矍鉉聨苺纉鵺鹿粡寂蝟赱齠洲笏鹿粡寂蝟赱齠洲粤讌将鎰偵笏蝟昭粡竚癈鷭сЬ矍粤肅鈬焜闔齡麻闔奏塹↑淋夏婦奏塹纂蝟昭粡竚癈鷭т繻Ь瓶廊屋臆鹿粡寂蝟赱齠洲笏鰲焙繙蜴縷竢銖輕竢鉚∧瓶↑淋夏婦壁唏鹿粡寂蝟赱齠洲粤讌将嫦鹿粡寂蝟赱齠洲笏鰲焙繙蜴縷竢銖輕竢鉚嫦↑淋夏婦鍍辿鹿粡寂蝟赱齠洲粤讌将蓍胄瀛瓶蝟昭粡竚癈鷭сЬ矍粤肅鈬焜闔齡麻闔喨瓶↑淋夏婦喨瓶纂蝟昭粡竚癈鷭т繻Ь舵料燮蝟昭粡竚癈鷭сЬ矍粤肅鈬焜闔齡麻闔舵料燮↑淋夏婦舵料燮纂蝟昭粡竚癈鷭т繻Ь麗闔鴦蜿鹿粡寂蝟赱齠洲笏鰲焙繙蜴縷竢銖輕竢鉚⇔話藁屏瀕垈読惡瀘話藁岌鹿粡寂蝟赱齠洲粤讌将喘鰭蝟昭粡竚癈鷭т繻Ь矍粤肅鈬焜闔齡麻闔喪檀柊瀕垈読惡濮喘鰭纂蝟昭粡竚癈鷭т繻Ь孕騰鹿粡寂蝟赱齠洲粤讌将鰲焙繙蜴縷竢銖輕竢鉚堝権瀕垈読惡炙堝県鹿粡寂蝟赱齠洲粤讌将堝鹿粡寂蝟赱齠洲粤讌将鰲焙繙蜴縷竢銖輕竢鉚堝蔚↑淋夏婦孕同匡鹿粡寂蝟赱齠洲粤讌将堝鹿粡寂蝟赱齠洲粤讌将鰲焙繙蜴縷竢銖輕竢鉚堝害↑淋夏婦孕導鴬鹿粡寂蝟赱齠洲粤讌将遼力徇蝟昭粡竚癈鷭сЬ矍粤肅鈬焜闔齡麻闔嬶卜裏瀕垈読惡炙遼力徇纂蝟昭粡竚癈鷭т繻Ь弐跛纈皷闔蜴閹諞蝟昭粡竚癈鷭т繻Ь矍粤肅鈬焜闔齡麻闔崚厶貧裏鰲燗燻纓襖簒泰瀘貌炒賭喇藁纂蝟昭粡竚癈鷭т繻Ь帙鴦蜿閹諞蝟昭粡竚癈鷭т繻Ь矍粤肅鈬焜闔齡麻闔遼鈍崚厶貧裏鰲燗燻纓襖遼鈍崚厶貧立鹿粡寂蝟赱齠洲粤讌将繻縺黼癆閹諞蝟昭粡竚癈鷭т繻Ь矍粤肅鈬焜闔齡麻闔遼鈍凖姪喪冬珍堙↑矍齡鰡鈬貌瀲徒伝單瀋壮滴鹿粡寂蝟赱齠洲笏蝟昭粡竚癈鷭ц縺筵鞘蜀芍甎纔鉉罸鉉羆諞諞諞窺君鉉罧禺碣鈬肅跂閼碓斡幹錫鬲冗鈔纔旭旭旭旭握拘厩羇衣啓碣纐貅碣皴釈鱚羹Н鴣磔蜚鱚絲纔鉉罸鉉羆諞粋叙円襟岸頏纐蜈逅脂篏干盖恩皸皺竊癌昂砌隙潟恭聰娯聽感球粃痳經Ь纔鉉罸鉉羆諞鹿畩鹿粡寂蝟赱齠洲蔘鉉Ь誓穐弘誓鹿粡寂蝟赱齠洲痲筵娼励闥磨鉅鍋踉纈柘纈皷闔蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь衷顆鱸艾厩厳弐裼猛町部癇秒班冒彖蝟昭粡竚癈鷭п粐Ь連絡先: (株)富士通研瘢雹究所 ソフト3研瘢雹 市川 至
+** (E-Mail Address: ichikawa@flab.fujitsu.co.jp)
+** Copyright (C) 1996,1998
+** 連絡先: 琉球大学霾鷙慍ぢ河野 真迚鈬芦宛竟鶯鹿粡寂蝟赱齠洲痲筵娼ぢ(E-Mail Address: kono@ie.u-ryukyu.ac.jp)
+** 連絡先: COW for DOS & Win16 & Win32 & OS/2
+** (E-Mail Address: GHG00637@niftyserve.or.p)
+** このソ・踉札垢里い覆詈踉嗣,改変,修正も許諾します。ただし、
+** その際には、誰が貢献したを┐垢海良鮖弔垢海函鹿粡寂蝟赱齠洲痲筵娼再配布や雑誌の付録などの問い合わせも必要ありません。
+** このプログラムについては特に何の保擇發靴覆ぁ靴蕕此鹿粡寂蝟赱齠洲痲筵娼当纈鈬鞳鴉蜚瘤蓍鈑蜩鳫苒瘢蝟昭粡竚癈鷭п粐Ь釿跿粡鈑關鈑迴粡胱蜴膃逅鳫鈑蝟昭粡竚癈鷭п粐Ь跫鈑粹逾鱚鈔葹阡蜚蝟昭粡竚癈鷭п粐Ь蒹硼關蜃蔗阡蜒葹韶縺蜴跛關蜈鶤鹿粡寂蝟赱齠洲痲筵娼搶粹逾葹癈矼肬鱚關鈑頤碎蜩蓍鈑蝟昭粡竚癈鷭п粐Ь氾孕範追喘盟浜遡彖厰僧塢途不凖覗卍堡瓶脇墸倉溺鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齡癆蜒葹關蜃蔗鹿粡寂蝟赱齠洲痲筵娼關蜃蔗辿晃桑嬖不嗾堋竏蜍癡瓸更哺闔鍖∋鹿粡寂蝟赱齠洲痲筵娼齡癆蜒葹纈皷闔鹿粡寂蝟赱齠洲痲筵娼∋鹿粡寂蝟赱齠洲痲筵娼齡癆蜒葹癆竏跂充蝟昭粡竚癈鷭п粐Ь渥昂臼蓍鉅柾鈿∋鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼啻播鉉梟赱苴梟蛹縹蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь縄瘍鷓鹿粡寂蝟赱齠洲痲筵娼碯聿纈鱚兎奏猛蝟昭粡竚癈鷭п粐Ь頤蜩鈞聽鴪繖鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鈿鞳鱇闔鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼閼蜩瓶蜚兎奏猛徒澱圦蝟昭粡竚癈鷭п粐Ь頤竢粤羊瘤裼津徳嫐單姪痴鹿粡寂蝟赱齠洲痲筵娼閼蜩圖瘢雹壁兎奏猛徒澱圦蝟昭粡竚癈鷭п粐Ь頤竢粤壁撃蜚鈔嗜幻宜癆蜴鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼揺妖闔鴦蜿肬瓶廊屋臆仄蝟昭粡竚癈鷭п粐Ь蛬頤黼髟緕竇粤皷芬癆壁哭諱鉅兎奏猛瀛蝟昭粡竚癈鷭п粐Ь閙頤黼髟緕竇粤皷芬癆皷鈑跂鳫轣竏癇痺鴦津徳嫐壥勞鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼絲緕鴒頸嘘啓蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜩韭癨纈皷闔鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼壹閼阨闥哭掴唏鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼弟阡闔鶯芦葦瘤蜴芦宛鹿粡寂蝟赱齠洲痲筵娼衷鉚纈悵屋瘡韆痰續喪檀票蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь羔闌關闔鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼揺妖繝閼綣蝟昭粡竚癈鷭п粐Ь鴒肅碣闍緕瓶迚齠蜴涛竅鞳鹿粡寂蝟赱齠洲痲筵娼霸鳫諷跂貅蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ьь諞肅跂蝟昭粡竚癈鷭п粐Ь偵跂蜴蜴聽繖蝟昭粡竚癈鷭п粐Ь槍橇跚鈬繞鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ьデフォルトの出力コ・踉札描蝟昭粡竚癈鷭п粐Ь嚆跂笏兎奏猛瀉歪鹿粡寂蝟赱齠洲痲筵娼d繙蜴津徳嫐壥地津瀛瓶鹿粡寂蝟赱齠洲痲筵娼粤肅鈬兎奏猛瀉歪冬喨瓶蝟昭粡竚癈鷭п粐Ьd繙蜴津徳嫐壥地津濺嫦蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜀粤肅鈬筥烝壞丗話烝繙蜴繖喇瀉瘢雹逅>繙蜴繖喞腕蝟昭粡竚癈鷭п粐Ь粤肅鈬喞腕鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼i冐粤佚厂烱喙蝟昭粡竚癈鷭п粐Ь蜴竚齡粡鎬荀苳纂蝟昭粡竚癈鷭п粐Ь緕粡羲蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜀繙蜴繖喞腕繙蜴繖瀟啣烝鹿粡寂蝟赱齠洲痲筵娼i釿跿粤踉雌跚皰荀苳纂蝟昭粡竚癈鷭п粐Ь蜴竚聶銓谺荀苳纂蝟昭粡竚癈鷭п粐Ь蜴竚蜿鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼i聹繙喞腕鹿粡寂蝟赱齠洲痲筵娼i聹繙喇瀉鹿粡寂蝟赱齠洲痲筵娼d繙蜴黼蜴迴粤隗黼蜴隗鹿粡寂蝟赱齠洲痲筵娼e踈蜒鳫齒胄奕鰲鹿粡寂蝟赱齠洲痲筵娼d繙蜴黼蜴迴粤隗續迴粤蛹緕鍜胛濛瀕倉扎鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼e踈良悴腕蝟昭粡竚癈鷭п粐Ь粤肅鈬續砠鉈閼紲胛蝟昭粡竚癈鷭п粐Ь緕粡羲蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜀粤濾脇惰囮黏鈔喞腕蝟昭粡竚癈鷭п粐Ь粤肅鈬續聽鬥胛碯罨蝴紿續隱濾脇惰皷蝟昭粡竚癈鷭п粐Ь繻黼帯鹿粡寂蝟赱齠洲痲筵娼d繙蜴黼碯聿纈隱皷黼聽鬥胛碯罨蝴紿鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼啄鳰瘤谷堪刀齷怏遞蝟昭粡竚癈鷭п粐Ь蜀繙蜴繖灣孀堆蓄潯瘢雹逅粤肅鈬筥炯蜴粹逅殺瘢雹粤肅鈬筥烝徂粒貨潯癈怏鹿粡寂蝟赱齠洲痲筵娼d繙蜴伝噎徂亮蝟昭粡竚癈鷭п粐Ь蜴竚鈔阯鶤荀苳纂蝟昭粡竚癈鷭п粐Ь緕粡羲蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粤肅鈬遡單鹿粡寂蝟赱齠洲痲筵娼d繙蜴墟嫖閏蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь齡癆閹頤迴粤鈔鉋熏閼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粤肅鈬喘鰭鹿粡寂蝟赱齠洲痲筵娼d繙蜴悵屋閏蝟昭粡竚癈鷭п粐Ь粤肅鈬芦葦鹿粡寂蝟赱齠洲痲筵娼d繙蜴力烱芦葦骸蝟昭粡竚癈鷭п粐Ь粤肅鈬瓶濾緑孕鹿粡寂蝟赱齠洲痲筵娼d繙蜴喨瓶濾緑孕擬蝟昭粡竚癈鷭п粐Ь粤肅鈬壮瀕円瀕侖鹿粡寂蝟赱齠洲痲筵娼d繙蜴読愿吊揺妖啓蝟昭粡竚癈鷭п粐Ь粤肅鈬駄冬嗤礎下蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粤肅鈬畆蝟昭粡竚癈鷭п粐Ь粤肅鈬喘蘯蝟昭粡竚癈鷭п粐Ь粤肅鈬仭壇絢蝟昭粡竚癈鷭п粐Ь粤肅鈬絢蝟昭粡竚癈鷭п粐Ь粤肅鈬嗤絢蝟昭粡竚癈鷭п粐Ь粤肅鈬徒羲蝟昭粡竚癈鷭п粐Ь粤肅鈬羲蝟昭粡竚癈鷭п粐Ь粤肅鈬綣蝟昭粡竚癈鷭п粐Ь粤肅鈬嗜綣蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粤肅鈬鰐吊喇敕下蝟昭粡竚癈鷭п粐Ь粤肅鈬和嫺灑冨恭鹸鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼d繙蜴津徳嫐壥Ъ蝟昭粡竚癈鷭п粐Ь粤肅鈬兎奏猛瀲則鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼d繙蜴喨葦恐因旭絮恐閹胝續蝟昭粡竚癈鷭п粐Ь粤肅鈬紛街蔚恭謨聿黼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼浜頏辮鳫竇齠闥蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粤嘖夘痴瀝浜齡蜆蜒迚辣銓繚鱸蒹站蝟昭粡竚癈鷭п粐Ь粤肅鈬都竪隗─迚辣熏閼紿睡續礙隗鷺蜊縷艱鹿粡寂蝟赱齠洲痲筵娼d繙蜴嬶播埣┬″蜊縷迴粤艱迚辣熾鈑續礙礬蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜀粤伝噎徂刀齷蜴蝟昭粡竚癈鷭п粐Ь纈佻瀕濛聽鰉蝴綮鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼胚釿闔鳫鞳鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼i冐粤濕蝟昭粡竚癈鷭п粐Ь聹繙灑堋蓄濕蝟昭粡竚癈鷭п粐Ь粤肅鈬鱧鶇鱧鷦蝟昭粡竚癈鷭п粐Ь踈綣蝟昭粡竚癈鷭п粐Ь粤肅鈬鱧鶇蝟昭粡竚癈鷭п粐Ь鈔蜀鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼i冐粤佚厂烱喙蝟昭粡竚癈鷭п粐Ь濶閭闔鶯┬読姪罘鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜴迚辣煢銓繚鱸┬読姪罨皷芬繖葹纂蝟昭粡竚癈鷭п粐Ь銓黶艱┬蜆纂蝟昭粡竚癈鷭п粐Ь竏癇齡粡碯聘貧怠鈍喇敕飮鹿粡寂蝟赱齠洲痲筵娼齡癆蜒葹閧柯和嫺灑冨倒纂蝟昭粡竚癈鷭п粐Ь皷芬繖銓迚辣煢鉋鈔繝閼繖蝟昭粡竚癈鷭п粐Ь蜴緕籖竏繝觧鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜆諱鉅蛬竢鉚纈澀斌纂蝟昭粡竚癈鷭п粐Ь濶焜闔澀斌銓岡蜴祓纂蝟昭粡竚癈鷭п粐Ь銓萬蓖趙烽┬蜴祺銓羽鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜆黯蜒闔澀銓岡蜴祓纂蝟昭粡竚癈鷭п粐Ь濶熄竢鉚┬蜴祺銓羽鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜆黯閭闔澀銓岡蜴祓纂蝟昭粡竚癈鷭п粐Ь濶熄竢鉚┬蜴祺銓羽鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜴跚鈬煕闌澀銓岡蜴祓纂蝟昭粡竚癈鷭п粐Ь銓鱚焜闔鶯┬蜴祓銓鴬鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜴迚辣烽繚蜴┬読姪罘鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜴迚辣熈續澀斌纂蝟昭粡竚癈鷭п粐Ь銓蜊縷艱┬皷芬繖銓纂蝟昭粡竚癈鷭п粐Ь銓癈絛岩繝閼澀銓纂蝟昭粡竚癈鷭п粐Ь濶鱧緕┬竏癇礬鹿粡寂蝟赱齠洲痲筵娼齡癆蜒蜆鱚蜴蜚┬蜆纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь碯聿纈鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銖蜃鈬竏癇闌籖碯聘範鳴灑冨的課纂蝟昭粡竚癈鷭п粐Ь蜴蓖趙焜阨銓纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь揺妖鱚頏閭纉齒肅肬蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь粤肅鈬浜冬怠鈍喇敕碓牡嘩鱸鈑聽鹿粡寂蝟赱齠洲痲筵娼d繙蜴揺妖濛嫺瀝喪浜冬怠鈍喇敕鹿粡寂蝟赱齠洲痲筵娼d繙蜴鍋肬迚辣烽曩遘逅四浜冬怠鈍輿嗚歇蝟昭粡竚癈鷭п粐Ь皷芬繖葹迚辣烽柩浜冬怠鈍喇敕飮鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銖蜃鈬蜴蜊縷飴鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銖蜃鈬蜴蜊縷赱齡粤竢粤鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼赱苴蝟昭粡竚癈鷭п粐Ь蜴碯聨徳毛纏鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓齡痰煕遡單纂蝟昭粡竚癈鷭п粐Ь蜴鈿鞏徳毛纏鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓蜴迴粤煕簒纏砠釶鴒閼鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓阡煕遡單鳫姦干閼鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓鉋煕遡單鈿肅蜴頤竢粤鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓跟葹煕遡單竢鉚纈壁屋瘡韆矼喘鰭蝟昭粡竚癈鷭п粐Ь蜴迚辣煕簒纏竢鉚纈揺妖癈絛闥蝟昭粡竚癈鷭п粐Ь蜴迚辣碯聨徳毛纏浜碯聿纈繖鉋蝟昭粡竚癈鷭п粐Ь蜴碣闍緕煕遡單闔鶯喘纉碣闍緕瓶蝟昭粡竚癈鷭п粐Ь蜴蜩鏝元降徳毛纏嗜幻宜蓿阨艾蝟昭粡竚癈鷭п粐Ь蜀繙蜴繖喞腕繙蜴繖瀟啣烝鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓芦葦煕簒纏蒼齦辣瓶悵屋諱釶蝟昭粡竚癈鷭п粐Ь繻黼鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓芦葦煕悵屋瓜蒼齦辣壁嗹芦葦蝟昭粡竚癈鷭п粐Ь緕粡羲蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь悵屋苳喪檀竢鉚纈鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓円鱚鴈纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь肬趙癇瘢續纈蝟昭粡竚癈鷭п粐Ь蜴跚鈬竏癇蜴蜴鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓鱚飴鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓闌籖遡單纂蝟昭粡竚癈鷭п粐Ь蜴肬趙煬緕飴鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼頸蜿銖蝟昭粡竚癈鷭п粐Ь竏癇諱鉅蛬蜴津徳嫐壥分鹿粡寂蝟赱齠洲痲筵娼癈竕蛬蜴津徳嫐壥匯鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼闌粡鈑蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь銓蜴縷肬趙┤纂蝟昭粡竚癈鷭п粐Ь粤肅鈬鰐吊輿卩瀕碓鹿粡寂蝟赱齠洲痲筵娼d繙蜴津徳嫐壥届鳴絢蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь竢鉚纈鴦蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜀粤津徳嫐壥地津瀛瓶鹿粡寂蝟赱齠洲痲筵娼粤肅鈬津徳嫐壥地琳熄竢鉚鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼i聹繙兎奏猛瀉歪冬喨瓶鹿粡寂蝟赱齠洲痲筵娼粤肅鈬津徳嫐壥地琳熄竢鉚鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼i聹繙兎奏猛瀉歪冬鍍端蝟昭粡竚癈鷭п粐Ь繙蜴兎奏猛瀉藁縷閭闔蝟昭粡竚癈鷭п粐Ь緕粡羲蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜆┴蜒闔┬蜴祺銓羽鹿粡寂蝟赱齠洲痲筵娼 煢竢鉚閭闔鹿粡寂蝟赱齠洲痲筵娼齡癆蜒濶竢鉚澀銓岡蜴祓兎奏猛瀉藁峪蝟昭粡竚癈鷭п粐Ь 繩黥熄竢鉚蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь伯閧瘡鹿粡寂蝟赱齠洲痲筵娼齡癆蜒銓頤迴粤喘鰭阨瘤裼閼鹿粡寂蝟赱齠洲痲筵娼蜴頤迴粤喪檀必鉋瘤裼閼鹿粡寂蝟赱齠洲痲筵娼鼈蜀迴粤徳毛纏簒鼈蜀阨悵屋蝟昭粡竚癈鷭п粐Ь蜴迚辣熏閼徳毛纏浜迴粤癈絛巻纔蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь悵屋悵屋竢鉚纈皷闔痰跂鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼芦葦瘤竢鉚纈皷闔痰跂蝟昭粡竚癈鷭п粐Ь弘前鹿粡寂蝟赱齠洲痲筵娼皷芬繖葹笆桍蝟昭粡竚癈鷭п粐Ь卯因憶卯因桶卯因偽卯因儀蝟昭粡竚癈鷭п粐Ь卯因臆卯因俺規因群規因憶蝟昭粡竚癈鷭п粐Ь規因桶規因乙規因卸規因温蝟昭粡竚癈鷭п粐Ь規因恭規因教規因況規因干蝟昭粡竚癈鷭п粐Ь卯因潟規因臆規因牡規因俺蝟昭粡竚癈鷭п粐Ь規因恩規因過規因霞規因俄蝟昭粡竚癈鷭п粐Ь規因我規因咳規因崖規因概蝟昭粡竚癈鷭п粐Ь規因碍規因街規因鰍規因割蝟昭粡竚癈鷭п粐Ь規因恰規因官規因幹規因感蝟昭粡竚癈鷭п粐Ь規因憾規因玩規因癌規因眼蝟昭粡竚癈鷭п粐Ь規因岩規因翫規因贋規因飢蝟昭粡竚癈鷭п粐Ь規因亀規因妓規因汲規因球蝟昭粡竚癈鷭п粐Ь規因究規因彊規因怯規因恐蝟昭粡竚癈鷭п粐Ь規因挟規因橋規因狂規因狭蝟昭粡竚癈鷭п粐Ь規因近規因金規因吟規因銀蝟昭粡竚癈鷭п粐Ь規因倶規因軍卯因霞卯因蚊蝟昭粡竚癈鷭п粐Ь穐因旭鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼芦葦瘤竢鉚纈皷闔痰跂闥瘍緕蝟昭粡竚癈鷭п粐Ь弘前鹿粡寂蝟赱齠洲痲筵娼皷芬繖葹糜桍鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因乙祠因乙絳鹿粡寂蝟赱齠洲痲筵娼因乙穐因乙岡因乙巻因乙喬鹿粡寂蝟赱齠洲痲筵娼因乙謙因乙甃因乙祠因乙絳鹿粡寂蝟赱齠洲痲筵娼因乙穐因乙岡因乙規因乙桑鹿粡寂蝟赱齠洲痲筵娼因乙幸因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因乙穐因乙階鹿粡寂蝟赱齠洲痲筵娼因乙喬因乙幸因乙祠因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭穐因旭穐因旭穐因旭穐鹿粡寂蝟赱齠洲痲筵娼因旭胤纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь悵屋諱釶闔鴦蜿碎肬葹遶籬苺鹿粡寂蝟赱齠洲痲筵娼悪稿悪墜蝟昭粡竚癈鷭п粐Ь銖蜃鈬竏癇歃蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭規因輝規因鬼蝟昭粡竚癈鷭п粐Ь規因儀規因求規因灸穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼芦宛蜃阨闔鴦蜿碎鹿粡寂蝟赱齠洲痲筵娼唄因険劫蝟昭粡竚癈鷭п粐Ь銖蜃鈬竏癇蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭祠因峨穐因梶蝟昭粡竚癈鷭п粐Ь皙因恰卯因旭穐因卸穐因旭蝟昭粡竚癈鷭п粐Ь絳因旭罨因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因俄穐因我蝟昭粡竚癈鷭п粐Ь祠因旭穐因激穐因旭穐因卸蝟昭粡竚癈鷭п粐Ь岡因臆謙因温穐因旭皙因灸蝟昭粡竚癈鷭п粐Ь皙因隙祠因喝穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭皙因俄穐因旭蝟昭粡竚癈鷭п粐Ь穐因割穐因潟絳因旭穐因旭蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭蝟昭粡竚癈鷭п粐Ь巻因旭穐因乙階因俺甃因完蝟昭粡竚癈鷭п粐Ь穐因旭穐因旭穐因旭穐因旭鹿粡寂蝟赱齠洲痲筵娼纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜴肅跂熄遡單纂蝟昭粡竚癈鷭п粐Ь蜴痲籖竰遡單纂蝟昭粡竚癈鷭п粐Ь蜴粤赧竰遡單纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜀鈔繙賭餅慯鹿粡寂蝟赱齠洲痲筵娼蜴蝟昭粡竚癈鷭п粐Ь瘟遖癇艫癇莓蝟昭粡竚癈鷭п粐Ь銓鱧禹鹿粡寂蝟赱齠洲痲筵娼竏癇癇莓纂蝟昭粡竚癈鷭п粐Ь鹿粡寂蝟赱齠洲痲筵娼読姪蜴纂蝟昭粡竚癈鷭п粐Ь葹竦纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь蜀粤伝噎徂刀齷蜴蝟昭粡竚癈鷭п粐Ь濯聿纈嚔旭晒續竰闌濯聿纈蝴紵蝟昭粡竚癈鷭п粐Ь緕粡羲蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь闥癇艫鱧癇艫苳逢瘢雹逅癇莓ЛЩ鱧祗鱧鹿粡寂蝟赱齠洲痲筵娼竦癇莓纂蝟昭粡竚癈鷭п粐Ь癇苺辣銓鶉竦鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь罔蜩鏝元降逅殺瘢雹閭闔―熄竢鉚§芦葦煕蝟昭粡竚癈鷭п粐Ь頏蜴纈鬪⇒蝌繖嗜幻宜瓶悵屋丑喨瓶嫦頤蜩阡跛阯繖遐鹿粡寂蝟赱齠洲痲筵娼纔蜚┗鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь罔砠鉈閼縷十簒滴鹿粡寂蝟赱齠洲痲筵娼i聹繙瀟啣烝鹿粡寂蝟赱齠洲痲筵娼蜀鱚關緕│↑†癶阨燐面鹿粡寂蝟赱齠洲痲筵娼鱚鴈鹿粡寂蝟赱齠洲痲筵娼e踈綣蝟昭粡竚癈鷭п粐Ь續砠鉈閼紲齡粹鹿粡寂蝟赱齠洲痲筵娼e鈔蜀鹿粡寂蝟赱齠洲痲筵娼鹿粡寂蝟赱齠洲痲筵娼蜀鈞煕蝟昭粡竚癈鷭п粐Ь續碯罔齡粹葹嫐密纂蝟昭粡竚癈鷭п粐Ь踈綣蝟昭粡竚癈鷭п粐Ь續聽鬥齡粹齡粹碯罨和嫺灑冨滴纂蝟昭粡竚癈鷭п粐Ь蝟昭粡竚癈鷭п粐Ь罔癇艫逢鹿粡寂蝟赱齠洲痲筵娼蜀蜴迴粤煕墟嫖蝟昭粡竚癈鷭п粐Ь蜀粤烝腕貨濕蝟昭粡竚癈鷭п粐Ь罔胙繽鞳遖□鰲↑齡粡遘燐面鱚鴈鹿粡寂蝟赱齠洲痲筵娼e踈綣蝟昭粡竚癈鷭п粐Ь續砠鉈閼紲齡粡遘纂蝟昭粡竚癈鷭п粐Ь緕粡羲蝟昭粡竚癈鷭п粐Ь續聽鬥齡粡遯蛯貧怠鈍喇敕鹿粡寂蝟赱齠洲痲筵娼蜀關煕蝟昭粡竚癈鷭п粐Ь閭闔鶯蜴鹿粡寂蝟赱齠洲痲筵娼繻黼鹿粡寂蝟赱齠洲痲筵娼諱鉅蛬竢鉚纈齡粡遘纂蝟昭粡竚癈鷭п粐Ь踈蝟昭粡竚癈鷭п粐Ь蓍跂癇艫蝟昭粡竚癈鷭п粐Ь罔蜴關緕┴癇莓Å〒十嫐密鹿粡寂蝟赱齠洲痲筵娼鞳鴪闥┴癇莓鹿粡寂蝟赱齠洲痲筵娼鱚鴈┃羽纂蝟昭粡竚癈鷭п粐Ь踈蝟昭粡竚癈鷭п粐Ь鱚關緕蛹肬齡粹蝟昭粡竚癈鷭п粐Ь罔肅跂熄墟嫖蝟昭粡竚癈鷭п粐Ь罔癇艫蝟昭粡竚癈鷭п粐Ь罔胙繽鞳遖鱧齡粹十嫐密鹿粡寂蝟赱齠洲痲筵娼鞳鴪闥┴癇莓鹿粡寂蝟赱齠洲痲筵娼鱚鴈鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь鱧祗鹿粡寂蝟赱齠洲痲筵娼繻黼鹿粡寂蝟赱齠洲痲筵娼蜀鱚關緕│鉉罧阨槇†↑阨燐面蝟昭粡竚癈鷭п粐Ь鞳鴪闥┴癇莓鹿粡寂蝟赱齠洲痲筵娼續┃羽纂蝟昭粡竚癈鷭п粐Ь鹿粡寂蝟赱齠洲痲筵娼蝟昭粡竚癈鷭п粐Ь罔砠鉈閼縷十簒滴鹿粡寂蝟赱齠洲痲筵娼i聹繙瀟啣烝鹿粡