diff options
3607 files changed, 179691 insertions, 353941 deletions
@@ -20,9 +20,7 @@ ChangeLog NEWS -README -README.EXT -README.EXT.ja -README.ja +README.md +README.ja.md doc @@ -245,6 +245,12 @@ define rp printf "%sT_UNDEF%s: ", $color_type, $color_end print (struct RBasic *)($arg0) else + if ($flags & RUBY_T_MASK) == RUBY_T_IMEMO + printf "%sT_IMEMO%s(", $color_type, $color_end + output (enum imemo_type)(($flags>>RUBY_FL_USHIFT)&imemo_mask) + printf "): " + rp_imemo $arg0 + else if ($flags & RUBY_T_MASK) == RUBY_T_NODE printf "%sT_NODE%s(", $color_type, $color_end output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT) @@ -289,6 +295,7 @@ define rp end end end + end end document rp Print a Ruby's VALUE. @@ -406,6 +413,13 @@ document rp_id Print an ID. end +define output_string + set $flags = ((struct RBasic*)($arg0))->flags + printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \ + ((struct RString*)($arg0))->as.heap.ptr : \ + ((struct RString*)($arg0))->as.ary) +end + define rp_string set $flags = ((struct RBasic*)($arg0))->flags set print address off @@ -448,8 +462,8 @@ end define rp_class printf "(struct RClass *) %p", (void*)$arg0 - if ((struct RClass *)($arg0))->ptr.origin != $arg0 - printf " -> %p", ((struct RClass *)($arg0))->ptr.origin + if ((struct RClass *)($arg0))->ptr.origin_ != $arg0 + printf " -> %p", ((struct RClass *)($arg0))->ptr.origin_ end printf "\n" rb_classname $arg0 @@ -460,6 +474,50 @@ document rp_class Print the content of a Class/Module. end +define rp_imemo + set $flags = (enum imemo_type)((((struct RBasic *)($arg0))->flags >> RUBY_FL_USHIFT) & imemo_mask) + if $flags == imemo_cref + printf "(rb_cref_t *) %p\n", (void*)$arg0 + print *(rb_cref_t *)$arg0 + else + if $flags == imemo_svar + printf "(struct vm_svar *) %p\n", (void*)$arg0 + print *(struct vm_svar *)$arg0 + else + if $flags == imemo_throw_data + printf "(struct vm_throw_data *) %p\n", (void*)$arg0 + print *(struct vm_throw_data *)$arg0 + else + if $flags == imemo_ifunc + printf "(struct vm_ifunc *) %p\n", (void*)$arg0 + print *(struct vm_ifunc *)$arg0 + else + if $flags == imemo_memo + printf "(struct MEMO *) %p\n", (void*)$arg0 + print *(struct MEMO *)$arg0 + else + if $flags == imemo_ment + printf "(rb_method_entry_t *) %p\n", (void*)$arg0 + print *(rb_method_entry_t *)$arg0 + else + if $flags == imemo_iseq + printf "(rb_iseq_t *) %p\n", (void*)$arg0 + print *(rb_iseq_t *)$arg0 + else + printf "(struct RIMemo *) %p\n", (void*)$arg0 + print *(struct RIMemo *)$arg0 + end + end + end + end + end + end + end +end +document rp_imemo + Print the content of a memo +end + define nd_type print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT) end @@ -869,33 +927,246 @@ end define rb_ps_vm print $ps_vm = (rb_vm_t*)$arg0 - set $ps_threads = (st_table*)$ps_vm->living_threads - if $ps_threads->entries_packed - set $ps_threads_i = 0 - while $ps_threads_i < $ps_threads->num_entries - set $ps_threads_key = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].key - set $ps_threads_val = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].val - rb_ps_thread $ps_threads_key $ps_threads_val - set $ps_threads_i = $ps_threads_i + 1 - end - else - set $ps_threads_ptr = (st_table_entry*)$ps_threads->head - while $ps_threads_ptr - set $ps_threads_key = (st_data_t)$ps_threads_ptr->key - set $ps_threads_val = (st_data_t)$ps_threads_ptr->record - rb_ps_thread $ps_threads_key $ps_threads_val - set $ps_threads_ptr = (st_table_entry*)$ps_threads_ptr->fore + set $ps_thread_ln = $ps_vm->living_threads.n.next + set $ps_thread_ln_last = $ps_vm->living_threads.n.prev + while 1 + set $ps_thread_th = (rb_thread_t *)$ps_thread_ln + set $ps_thread = (VALUE)($ps_thread_th->self) + rb_ps_thread $ps_thread + if $ps_thread_ln == $ps_thread_ln_last + loop_break end + set $ps_thread_ln = $ps_thread_ln->next end end document rb_ps_vm Dump all threads in a (rb_vm_t*) and their callstacks end +define print_lineno + set $cfp = $arg0 + set $iseq = $cfp->iseq + set $pos = $cfp->pc - $iseq->body->iseq_encoded + if $pos != 0 + set $pos = $pos - 1 + end + + set $i = 0 + set $size = $iseq->body->line_info_size + set $table = $iseq->body->line_info_table + #printf "size: %d\n", $size + if $size == 0 + else + set $i = 1 + while $i < $size + #printf "table[%d]: position: %d, line: %d, pos: %d\n", $i, $table[$i].position, $table[$i].line_no, $pos + if $table[$i].position > $pos + loop_break + end + set $i = $i + 1 + if $table[$i].position == $pos + loop_break + end + end + printf "%d", $table[$i-1].line_no + end +end + +define check_method_entry + # get $immeo and $can_be_svar and return $me + set $imemo = (struct RBasic *)$arg0 + set $can_be_svar = $arg1 + if $imemo != RUBY_Qfalse + set $type = ($imemo->flags >> 12) & 0x07 + if $type == imemo_ment + set $me = (rb_callable_method_entry_t *)$imemo + else + if $type == imemo_svar + set $imemo == ((struct vm_svar *)$imemo)->cref_or_me + check_method_entry $imemo 0 + end + end + end +end + +define output_id + set $id = $arg0 + # rb_id_to_serial + if $id > tLAST_OP_ID + set $serial = (rb_id_serial_t)($id >> RUBY_ID_SCOPE_SHIFT) + else + set $serial = (rb_id_serial_t)$id + end + if $serial && $serial <= global_symbols.last_id + set $idx = $serial / ID_ENTRY_UNIT + set $ids = (struct RArray *)global_symbols.ids + set $flags = $ids->basic.flags + if ($flags & RUBY_FL_USER1) + set $idsptr = $ids->as.ary + set $idslen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3)) + else + set $idsptr = $ids->as.heap.ptr + set $idslen = $ids->as.heap.len + end + if $idx < $idslen + set $t = 0 + set $ary = (struct RArray *)$idsptr[$idx] + if $ary != RUBY_Qnil + set $flags = $ary->basic.flags + if ($flags & RUBY_FL_USER1) + set $aryptr = $ary->as.ary + set $arylen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3)) + else + set $aryptr = $ary->as.heap.ptr + set $arylen = $ary->as.heap.len + end + set $result = $aryptr[($serial % ID_ENTRY_UNIT) * ID_ENTRY_SIZE + $t] + output_string $result + end + end + end +end + define rb_ps_thread set $ps_thread = (struct RTypedData*)$arg0 - set $ps_thread_id = $arg1 - print $ps_thread_th = (rb_thread_t*)$ps_thread->data + set $ps_thread_th = (rb_thread_t*)$ps_thread->data + printf "* #<Thread:%p rb_thread_t:%p native_thread:%p>\n", \ + $ps_thread, $ps_thread_th, $ps_thread_th->thread_id + set $cfp = $ps_thread_th->cfp + set $cfpend = (rb_control_frame_t *)($ps_thread_th->stack + $ps_thread_th->stack_size)-1 + while $cfp < $cfpend + if $cfp->iseq + if $cfp->pc + set $location = $cfp->iseq->body->location + output_string $location.path + printf ":" + print_lineno $cfp + printf ":in `" + output_string $location.label + printf "'\n" + else + printf "???.rb:???:in `???'\n" + end + else + # if VM_FRAME_TYPE($cfp->flag) == VM_FRAME_MAGIC_CFUNC + set $ep = $cfp->ep + if ($ep[0] & 0xffff0001) == 0x55550001 + #define VM_ENV_FLAG_LOCAL 0x02 + #define VM_ENV_PREV_EP(ep) GC_GUARDED_PTR_REF(ep[VM_ENV_DATA_INDEX_SPECVAL]) + set $me = 0 + set $env_specval = $ep[-1] + set $env_me_cref = $ep[-2] + while ($env_specval & 0x02) != 0 + check_method_entry $env_me_cref 0 + if $me != 0 + loop_break + end + set $ep = $ep[0] + set $env_specval = $ep[-1] + set $env_me_cref = $ep[-2] + end + if $me == 0 + check_method_entry $env_me_cref 1 + end + set print symbol-filename on + output/a $me->def->body.cfunc.func + set print symbol-filename off + set $mid = $me->def->original_id + printf ":in `" + output_id $mid + printf "'\n" + else + printf "unknown_frame:???:in `???'\n" + end + end + set $cfp = $cfp + 1 + end +end + +define rb_count_objects + set $objspace = ruby_current_vm->objspace + set $counts_00 = 0 + set $counts_01 = 0 + set $counts_02 = 0 + set $counts_03 = 0 + set $counts_04 = 0 + set $counts_05 = 0 + set $counts_06 = 0 + set $counts_07 = 0 + set $counts_08 = 0 + set $counts_09 = 0 + set $counts_0a = 0 + set $counts_0b = 0 + set $counts_0c = 0 + set $counts_0d = 0 + set $counts_0e = 0 + set $counts_0f = 0 + set $counts_10 = 0 + set $counts_11 = 0 + set $counts_12 = 0 + set $counts_13 = 0 + set $counts_14 = 0 + set $counts_15 = 0 + set $counts_16 = 0 + set $counts_17 = 0 + set $counts_18 = 0 + set $counts_19 = 0 + set $counts_1a = 0 + set $counts_1b = 0 + set $counts_1c = 0 + set $counts_1d = 0 + set $counts_1e = 0 + set $counts_1f = 0 + set $total = 0 + set $i = 0 + while $i < $objspace->heap_pages.allocated_pages + printf "\rcounting... %d/%d", $i, $objspace->heap_pages.allocated_pages + set $page = $objspace->heap_pages.sorted[$i] + set $p = $page->start + set $pend = $p + $page->total_slots + while $p < $pend + set $flags = $p->as.basic.flags & 0x1f + eval "set $counts_%02x = $counts_%02x + 1", $flags, $flags + set $p = $p + 1 + end + set $total = $total + $page->total_slots + set $i = $i + 1 + end + printf "\rTOTAL: %d, FREE: %d\n", $total, $counts_00 + printf "T_OBJECT: %d\n", $counts_01 + printf "T_CLASS: %d\n", $counts_02 + printf "T_MODULE: %d\n", $counts_03 + printf "T_FLOAT: %d\n", $counts_04 + printf "T_STRING: %d\n", $counts_05 + printf "T_REGEXP: %d\n", $counts_06 + printf "T_ARRAY: %d\n", $counts_07 + printf "T_HASH: %d\n", $counts_08 + printf "T_STRUCT: %d\n", $counts_09 + printf "T_BIGNUM: %d\n", $counts_0a + printf "T_FILE: %d\n", $counts_0b + printf "T_DATA: %d\n", $counts_0c + printf "T_MATCH: %d\n", $counts_0d + printf "T_COMPLEX: %d\n", $counts_0e + printf "T_RATIONAL: %d\n", $counts_0f + #printf "UNKNOWN_10: %d\n", $counts_10 + printf "T_NIL: %d\n", $counts_11 + printf "T_TRUE: %d\n", $counts_12 + printf "T_FALSE: %d\n", $counts_13 + printf "T_SYMBOL: %d\n", $counts_14 + printf "T_FIXNUM: %d\n", $counts_15 + printf "T_UNDEF: %d\n", $counts_16 + #printf "UNKNOWN_17: %d\n", $counts_17 + #printf "UNKNOWN_18: %d\n", $counts_18 + #printf "UNKNOWN_19: %d\n", $counts_19 + printf "T_IMEMO: %d\n", $counts_1a + printf "T_NODE: %d\n", $counts_1b + printf "T_ICLASS: %d\n", $counts_1c + printf "T_ZOMBIE: %d\n", $counts_1d + #printf "UNKNOWN_1E: %d\n", $counts_1e + printf "T_MASK: %d\n", $counts_1f +end +document rb_count_objects + Counts all objects grouped by type. end # Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB @@ -914,3 +1185,26 @@ define SDR call rb_vmdebug_stack_dump_raw_current() end +define rbi + if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_LABEL + p *(LABEL*)$arg0 + else + if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_INSN + p *(INSN*)$arg0 + else + if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_ADJUST + p *(ADJUST*)$arg0 + else + print *$arg0 + end + end + end +end + +define dump_node + set $str = rb_parser_dump_tree($arg0, 0) + set $flags = ((struct RBasic*)($str))->flags + printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \ + ((struct RString*)$str)->as.heap.ptr : \ + ((struct RString*)$str)->as.ary) +end diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..d9785fad00 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +*.gemspec diff=ruby +*.rb diff=ruby +bin/* diff=ruby +tool/update-deps diff=ruby +tool/make-snapshot diff=ruby diff --git a/.gitignore b/.gitignore index a9104e9ed5..9757768786 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,25 @@ *-*-*.def +*-*-*.exp +*-*-*.lib *.a *.bak +*.bc *.dSYM *.dmyh *.dylib *.elc +*.i *.inc *.log *.o +*.obj *.orig +*.pdb *.rej +*.s *.sav *.swp +*.yarb *~ .*-* .*.list @@ -24,13 +32,18 @@ .svn Makefile Makefile.old +cygruby*.def extconf.h y.output y.tab.c # / /*-fake.rb +/*.dll +/*.exe +/*.res /*.pc +/*.rc /*_prelude.c /COPYING.LIB /ChangeLog-* @@ -56,6 +69,8 @@ y.tab.c /config.status.lineno /configure /coverage/simplecov +/coverage/simplecov-html +/coverage/doclie /coverage/.last_run.json /coverage/.resultset.json* /coverage/assets @@ -90,6 +105,8 @@ y.tab.c /riscos /rubicon /ruby +/ruby-runner +/ruby-runner.h /ruby-man.rd.gz /sizes.c /test.rb @@ -97,6 +114,7 @@ y.tab.c /transdb.h /uncommon.mk /verconf.h +/verconf.mk /web /yasmdata.rb @@ -105,14 +123,25 @@ y.tab.c /benchmark/fasta.output.* /benchmark/wc.input +/enc/*.def +/enc/*.exp +/enc/*.lib /enc/unicode/data # /enc/trans/ /enc/trans/*.c +/enc/trans/*.def +/enc/trans/*.exp +/enc/trans/*.lib +/enc/trans/.time # /ext/ /ext/extinit.c +# /ext/-test-/win32/dln/ +/ext/-test-/win32/dln/dlntest.exp +/ext/-test-/win32/dln/dlntest.lib + # /ext/dl/callback/ /ext/dl/callback/callback-*.c /ext/dl/callback/callback.c @@ -138,9 +167,6 @@ y.tab.c /ext/socket/constdefs.h /ext/socket/constdefs.c -# /ext/tk/ -/ext/tk/config_list - # /gems /gems/*.gem diff --git a/.travis.yml b/.travis.yml index ccd4d3884c..24ce0c9113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,66 +18,57 @@ # Language specification. language: c +sudo: false # Compilers. Several compilers are provided in Travis, so we try them all. # The value set here is visible via $CC environment variable. compiler: - gcc - - clang os: - linux - - osx # Dependencies. Some header files are missing in a Travis' worker VM, so we # have to install them. The "1.9.1" here is OK. It is the most adopted # version string for Debian/Ubuntu, and no dependencies have been changed so # far since the 1.9.1 release. before_install: - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq update; fi" - # Travis ships an outdated, broken version of libssl by default - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq --only-upgrade install '^libssl.*'; fi" - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq install $CC; fi" # upgrade if any - - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j'; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf openssl; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then OPENSSL_FLAG=\"--with-openssl-dir=`brew --prefix openssl`\"; fi" - - "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then CC='gcc-4.9'; fi" -install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi" + - "CONFIG_FLAG=" + - "JOBS='-j 4'" # Script is where the test runs. Note we just do "make test", not other tests # like test-all, test-rubyspec. This is because they take too much time, # enough for Travis to shut down the VM as being stalled. before_script: - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then rm -f ~/Library/Logs/DiagnosticReports/ruby_*.crash; fi" - "uname -a" - "uname -r" - "rm -fr .ext autom4te.cache" - - "make -f common.mk BASERUBY=ruby srcdir=. update-config_files" + - "echo $TERM" + - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files" - "autoconf" - "mkdir config_1st config_2nd" - - "./configure -C --disable-install-doc --disable-install-rdoc --with-gcc=$CC $OPENSSL_FLAG" + - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG" - "cp -pr config.status .ext/include config_1st" - "make reconfig" - "cp -pr config.status .ext/include config_2nd" - - "diff -ru config_1st config_2nd || true" - - "make -s $JOBS encs" - - "make -s $JOBS exts" + - "diff -ru config_1st config_2nd" + - "make after-update BASERUBY=ruby" + - "make -s $JOBS" - "make update-rubyspec" script: - - "make test" - - "make test-all TESTS='-q -j2'" - - "make test-rubyspec" -after_failure: - - "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then find ~/Library/Logs/DiagnosticReports -type f -name ruby_\\*.crash -ls -execdir cat {} \\; -delete; fi" + - "make test TESTOPTS=--color=never" + - "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'" + - "make test-rubyspec MSPECOPT=-fm" # Branch matrix. Not all branches are Travis-ready so we limit branches here. branches: only: - trunk - - ruby_1_9_3 - - ruby_2_0_0 - ruby_2_1 - ruby_2_2 + - ruby_2_3 + - /^feature\// + - /^bug\// # We want to be notified when something happens. notifications: @@ -86,7 +77,7 @@ notifications: - "irc.freenode.org#ruby-core" - "irc.freenode.org#ruby-ja" on_success: change # [always|never|change] # default: always - on_failure: change # [always|never|change] # default: always + on_failure: always # [always|never|change] # default: always template: - "%{message} by @%{author}: See %{build_url}" @@ -97,6 +88,10 @@ notifications: on_success: always on_failure: never + email: + - ko1c-failure@atdot.net + - shibata.hiroshi@gmail.com + # Local Variables: # mode: YAML # coding: utf-8-unix @@ -44,9 +44,9 @@ You can redistribute it and/or modify it under either the terms of the For the list of those files and their copying conditions, see the file LEGAL. - 5. The scripts and library files supplied as input to or produced as + 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, + copyright of the software, but belong to whomever generated them, and may be sold commercially, and may be aggregated with this software. @@ -1,13262 +1,8045 @@ -Tue Aug 18 22:52:50 2015 NAKAMURA Usaku <usa@ruby-lang.org> +Fri Sep 9 22:43:29 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - * tool/downloader.rb: support old versions of ruby. + * gems/bundled_gems: sort lines. - * tool/downloader.rb: now can download gems by http if openssl is not - available (this may be danger!) +Fri Sep 9 17:59:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Aug 18 20:10:13 2015 Tanaka Akira <akr@fsij.org> + * thread.c (rb_threadptr_raise): set cause from the called thread, + but not from the thread to be interrupted. + [ruby-core:77222] [Bug #12741] - * numeric.c (Init_Numeric): Fix document for Float::MIN and - Float::EPSILON. +Fri Sep 9 13:50:05 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Aug 17 23:07:47 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> + * doc/extension.rdoc, doc/extension.ja.rdoc: fix file name. + pointed out by @takkanm in the RubyKaigi talk. - * lib/rubygems.rb: bump version to 2.4.5.1. this version fixed - CVE-2015-3900. - * lib/rubygems/remote_fetcher.rb: ditto. - * test/rubygems/test_gem_remote_fetcher.rb: added testcase for CVE-2015-3900 +Fri Sep 9 13:14:53 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Aug 17 23:00:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * News: Announcing update to Unicode version 9.0.0 [ci skip] - * ext/win32/lib/win32/registry.rb (API#SetValue): data size should - be in bytes, not in chars. [ruby-core:70365] [Bug #11439] +Fri Sep 9 10:10:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Aug 17 23:00:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * variable.c (rb_const_search): warn with the actual class/module + name which defines the deprecated constant. - * ext/win32/lib/win32/registry.rb (API#SetValue): add terminator - size, not 1 byte. [ruby-core:70365] [Bug #11439] + * variable.c (rb_const_search): raise with the actual class/module + name which defines the private constant. -Sun Aug 16 03:14:04 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Sep 8 17:47:18 2016 Kazuki Tsujimoto <kazuki@callcc.net> - * re.c (rb_memsearch): should match only char boundaries in wide - character encodings. [ruby-core:70220] [Bug #11413] + * array.c (flatten): use rb_obj_class instead of rb_class_of + because rb_class_of may return a singleton class. + [ruby-dev:49781] [Bug #12738] -Sun Aug 16 03:00:44 2015 Eric Wong <e@80x24.org> +Thu Sep 8 17:40:15 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * symbol.h (struct RSymbol): add hashval field - * symbol.c (dsymbol_alloc): setup hashval field once - * hash.c (rb_any_hash): return RSymbol->hashval directly - * common.mk: hash.o depends on symbol.h - Thanks to Bruno Escherl <bruno@escherl.net> for the bug report - [ruby-core:70129] [Bug #11396] + * tool/rbinstall.rb (gem): use the bindir of each gemspec instead + of hardcoded 'bin', since rdoc 5.0.0 overrides it. -Fri Aug 14 16:30:43 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Sep 8 16:47:03 2016 Shugo Maeda <shugo@ruby-lang.org> - * transcode.c (rb_econv_set_replacement): target encoding name can - be empty now. [ruby-core:69841] [Bug #11324] + * eval.c (rb_mod_s_used_modules): rename Module.used_refinements to + Module.used_modules. [Feature #7418] [ruby-core:49805] -Fri Aug 14 15:24:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Sep 8 14:21:48 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * hash.c (rb_any_hash): fix Float hash. rb_dbl_hash() returns a - Fixnum, but not a long. [Bug #9381] + * ext/psych/psych.gemspec, lib/rdoc/rdoc.gemspec: Use file list instead of + git output. It shows warning message when invoke `make install` + [Bug #12736][ruby-dev:49778] -Fri Aug 14 15:09:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Sep 8 13:41:46 2016 Shugo Maeda <shugo@ruby-lang.org> - * ext/json/parser/parser.rl: raise with messages in UTF-8 - encoding. [ruby-core:67386] [Bug #10705] + * insns.def (setclassvariable, setconstant): warn when self is a + refinement. [Bug #10103] [ruby-core:64143] -Fri Aug 14 00:44:34 2015 Eric Wong <e@80x24.org> +Thu Sep 8 11:29:00 2016 Kenta Murata <mrkn@mrkn.jp> - * io.c (rb_io_oflags_modestr): handle O_TRUNC correctly - * test/ruby/test_io.rb (test_reopen_stdio): new test - Patch-by: cremno phobia <cremno@mail.ru> - [ruby-core:69779] [Bug #11319] + * hash.c (rb_hash_transform_values, rb_hash_transform_values_bang): + Rename map_v to transform_values. + [Feature #12512] [ruby-core:76095] -Thu Aug 13 01:25:26 2015 Benoit Daloze <eregontp@gmail.com> + * test/ruby/test_hash.rb: ditto. - * lib/net/ftp.rb (makeport): close the TCPServer - when sending the port fails. +Thu Sep 8 10:08:35 2016 Kazuki Yamaguchi <k@rhe.jp> - * test/net/ftp/test_ftp.rb: test for above. + * {ext,test}/openssl: Import Ruby/OpenSSL 2.0.0.beta.2. The full commit + history since v2.0.0.beta.1 can be found at: + https://github.com/ruby/openssl/compare/v2.0.0.beta.1...v2.0.0.beta.2 -Thu Aug 13 01:03:13 2015 Kazuki Tsujimoto <kazuki@callcc.net> +Thu Sep 8 07:23:34 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish): - fix a bug that empty gzipped response body causes Zlib::BufError. - [ruby-core:68846] [Bug #11058] + * lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2 + Fixed ri parse defect with left-hand matched classes. + https://github.com/rdoc/rdoc/pull/420 - * test/net/http/test_httpresponse.rb: tests for the above. +Thu Sep 8 01:12:47 2016 Shugo Maeda <shugo@ruby-lang.org> -Thu Aug 13 01:03:13 2015 Kazuki Tsujimoto <kazuki@callcc.net> + * eval.c (rb_mod_s_used_refinements): new method + Module.used_refinements. based on the patch by Charlie + Somerville. [Feature #7418] [ruby-core:49805] - * lib/net/http/response.rb (Net::HTTPResponse#inflater): - fix TypeError. An exception object might be nil. - [ruby-core:68846] [Bug #11058] +Wed Sep 7 17:50:38 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Aug 13 00:03:24 2015 Aaron Patterson <tenderlove@ruby-lang.org> + * include/ruby/util.h (setenv): remove POSIX-noncompliant + definition with 2 arguments. - * .travis.yml: update libssl before running tests. - Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the - travis settings! +Wed Sep 7 17:35:37 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Aug 13 00:03:24 2015 Aaron Patterson <tenderlove@ruby-lang.org> + * unicode/8.0.0/casefold.h, name2ctype.h, unicode/data/8.0.0: + removing directories/files related to Unicode version 8.0.0 - * ext/openssl/lib/openssl/ssl.rb (module OpenSSL): raise a more - helpful exception when verifying the peer connection and an - anonymous cipher has been selected. [ruby-core:68330] [Bug #10910] - Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for the patch. +Wed Sep 7 17:21:55 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/openssl/test_ssl.rb (class OpenSSL): test for change + * lib/timeout.rb (Timeout#timeout): add custom error message + argument. [Feature #11650] -Wed Aug 12 23:57:01 2015 NARUSE, Yui <naruse@ruby-lang.org> +Wed Sep 7 17:13:05 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906] - ruby itself (including numeric.c) is built with strict compile - options including -std=iso9899:1999, but ext/date is not. - By the way -std=iso9899:1999 is not only a warning option but also - changes behavior like MACRO definitions for example INFINITY. - gcc on Solaris affect this. + * common.mk: Updated Unicode version to 9.0.0 [Feature #12513] -Wed Aug 12 23:53:39 2015 NAKAMURA Usaku <usa@ruby-lang.org> + * unicode/9.0.0/casefold.h, name2ctype.h, unicode/data/9.0.0: + new directories/files for Unicode version 9.0.0 - * win32/win32.c (waitpid): return immediately if interrupted. - reported by <takkanm AT gmail.com> [ruby-dev:49176] [Bug #11340] +Wed Sep 7 16:00:45 2016 Tanaka Akira <akr@fsij.org> -Wed Aug 12 01:05:58 2015 Jeremy Evans <merch-redmine@jeremyevans.net> + * lib/open-uri.rb: Allow http to https redirection. + Note that https to http is still forbidden. + [ruby-core:20485] [Feature #859] by Roman Shterenzon. - * test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised - in OpenSSL tests. [ruby-core:70020][Bug #11368] +Wed Sep 7 14:56:59 2016 Kazuki Tsujimoto <kazuki@callcc.net> -Wed Aug 12 00:54:29 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/csv.rb (CSV::{Row,Table}#{each,delete_if}): returns an enumerator + if no block is given. [ruby-core:75346] [Feature #12347] - * array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N - already multiplies element size. + * test/csv/test_row.rb: add test for above. -Tue Aug 11 01:51:53 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> - - * lib/timeout.rb (ExitException): leave Timeout::ExitException as an - alias of Timeout::Error for backward compatibility in stable branch. - [ruby-dev:49179] [Bug #11344] - -Tue Aug 11 01:51:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/timeout.rb (ExitException): removed internal exception class - and use Timeout::Error instead, as using throw/catch to isolate - each timeouts now. [ruby-dev:49179] [Bug #11344] - -Tue Aug 11 01:37:28 2015 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - - * test/net/http/test_httpresponse.rb - (HTTPResponseTest#test_read_body_content_encoding_deflate_uppercase): - fix a failure without zlib. - -Tue Aug 11 01:37:28 2015 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/net/http/response.rb (inflater): CONTENT_ENCODING can be upper - case. [ruby-core:69670] [Bug #11285] patched by Andy Chu - -Tue Aug 11 01:21:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm.c (m_core_hash_merge_ptr): copy the arguments to the machine - stack before rewinding the control frame pointer and leaving the - arguments outside valid region of the value stack. - [ruby-core:69969] [Bug #11352] - - * vm.c (REWIND_CFP): keep the arguments region inside the valid - value stack. [ruby-core:69969] [Bug #11352] - -Tue Aug 11 01:11:02 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * string.c (rb_str_reverse): reversed string is not a substring, - and should not set coderange of the original string. - [ruby-dev:49189] [Bug #11387] - -Tue Aug 11 00:42:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (lambda_body): pop cmdarg stack for lookahead - token. [ruby-core:70067] [Bug #11380] - -Tue Aug 11 00:21:56 2015 NARUSE, Yui <naruse@ruby-lang.org> - - * ext/socket/extconf.rb: Solaris 11 has struct tcp_info.tcpi_ca_state, - but it is a dummy. - - * ext/socket/option.c: Solaris 11 doesn't have u_intN_t. - - * ext/socket/option.c: Solaris 11 needs inspect_tcpi_msec. - - * ext/socket/raddrinfo.c: Solaris 11 has AF_PACKET but doesn't have - related macros. - -Tue Aug 4 04:11:34 2015 Tanaka Akira <akr@fsij.org> - - * lib/time.rb (strptime): Support %s.%N. - [ruby-core:68301] [Bug #10904] Patch by Sadayuki Furuhashi. - -Tue Aug 4 03:43:15 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * transcode.c (load_transcoder_entry): fix transcoder loading race - condition, by waiting in require. [ruby-dev:49106] [Bug #11277] - -Tue Aug 4 03:13:59 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * array.c (ary_ensure_room_for_push): check if array size will - exceed maximum size to get rid of buffer overflow. - [ruby-dev:49043] [Bug #11235] - - * array.c (ary_ensure_room_for_unshift, rb_ary_splice): ditto. - -Sat Jul 4 23:08:32 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * file.c (rb_file_load_ok): try opening file without gvl not to - lock entire process. [Bug #11060] - -Sat Jul 4 05:00:48 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option - is not available. patch in [ruby-core:69428] by Hans Mackowiak. - [ruby-core:69421] [Bug #11201] - -Sat Jul 4 04:46:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * compile.c (iseq_compile_each): out of range NTH_REF is always - nil. - - * parse.y (parse_numvar): check overflow of NTH_REF and range. - [ruby-core:69393] [Bug #11192] - - * util.c (ruby_scan_digits): make public and add length parameter. - -Sat Jul 4 04:35:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_eval.c (rb_method_call_status): resolve refined method entry - to check if undefined. [ruby-core:69064] [Bug #11117] - -Sat Jul 4 04:35:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_eval.c (rb_method_call_status): undefined refined method is - not callable unless using. [ruby-core:69064] [Bug #11117] - -Wed Jul 1 04:16:56 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - - * ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem. - [fix GH-929] Patch by @voxik - * ext/io/console/io-console.gemspec: ditto. - -Wed Jul 1 04:15:38 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - - * ext/zlib/zlib.c: Fix indentation for rdoc. - [Bug #11221][ruby-core:69465] - -Sat Jun 27 22:51:59 2015 Shota Fukumori <her@sorah.jp> - - * ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when - passed object is a special const, instead of SEGV. - Based patch by Kohei Suzuki (eagletmt). [ruby-core:69692] [Bug #11291] - - * test/objspace/test_objspace.rb(test_dump_special_consts): Test for above fix. - - -Wed Jun 17 02:53:59 2015 Koichi Sasada <ko1@atdot.net> - - * test/objspace/test_objspace.rb (test_dump_flags): relax pattern - because long_lived flag and marked flag can be false at major GC. - [Bug #10852] - -Mon Jun 15 03:24:23 2015 Koichi Sasada <ko1@atdot.net> - - * vm_insnhelper.c (lep_svar_set): add WBs. - -Fri Jun 12 01:39:49 2015 Eric Wong <e@80x24.org> - - * ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile - [ruby-core:69419] [Feature #11198] - -Fri Jun 12 01:16:13 2015 Eric Wong <e@80x24.org> - - * ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode, - ossl_asn1_decode_all): use RB_GC_GUARD instead of volatile - [ruby-core:69371] [Bug #11185] - -Fri Jun 12 01:14:00 2015 NARUSE, Yui <naruse@ruby-lang.org> - - * win32/win32.c (setup_overlapped): seek to the file end only when - writing (mode:a), not reading (mode:a+, read). - -Fri Jun 12 01:11:52 2015 Aaron Patterson <tenderlove@ruby-lang.org> - - * load.c (loaded_feature_path): stop returning false negatives for - filenames which are trailing substrings of file extensions. For - example, 'b', which a trailing substring of ".rb" should not return - false. [Bug #11155][ruby-core:69206] - - * test/ruby/test_autoload.rb: test for fix - -Sun May 24 03:56:27 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * marshal.c (r_symreal): register symbol names as strings first so - that r_symlink always returns valid names. - [ruby-core:68587] [Bug #10991] - - * marshal.c (r_ivar, r_object0): now need to intern symbol names. - - * marshal.c (r_object0): compare with symbol names. - -Sun May 24 03:53:07 2015 Eric Wong <e@80x24.org> - - * ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard - [Bug #11123] - -Sun May 24 03:44:42 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * range.c (linear_object_p, range_include): test if covered for - linear objects. [ruby-core:69052] [Bug #11113] - -Sun May 24 03:41:45 2015 Shugo Maeda <shugo@ruby-lang.org> - - * lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp - is omitted. [ruby-core:69093] [Bug #11128] - -Sun May 24 03:37:14 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - - * string.c: added documentation for character sequence \' with String#sub - [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127 - -Sun May 24 03:32:53 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> + * test/csv/test_table.rb: ditto. - * rational.c: Added documentation for rational literal. - [Bug #11075][fix GH-885][ci skip] Patch by @shishir127 +Wed Sep 7 14:50:01 2016 Kazuki Tsujimoto <kazuki@callcc.net> -Sun May 24 03:06:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * gems/bundled_gems: update to power_assert 0.3.1. - * ext/socket/ipsocket.c (init_inetsock_internal): preserve errno - before other library calls and use rb_syserr_fail. - [ruby-core:68531] [Bug #10975] +Wed Sep 7 12:16:09 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Sun May 24 03:01:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/psych/*, test/psych/*: Update psych-2.1.1 + This version fixed following pull requests. + https://github.com/tenderlove/psych/pull/284 + https://github.com/tenderlove/psych/pull/276 - * ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of - conflict on cygwin. [ruby-core:68877] [Bug #11065] +Wed Sep 7 11:51:06 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Sun May 24 02:44:53 2015 Koichi Sasada <ko1@atdot.net> + * lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta1 + This version is mostly same as r56072. It contains to remove code + for Ruby 1.8 - * vm.c (vm_exec): check other events when RETURN is thrown. - [Bug #10724] +Tue Sep 6 09:23:06 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * test/ruby/test_settracefunc.rb: add a test. + * lib/rdoc/rdoc.gemspec: partly reverted for default gem installer. + upstream configuration is not working on ruby core repository. -Sun May 24 02:21:47 2015 Masahiro Tomita <tommy@tmtm.org> +Mon Sep 5 19:35:22 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/socket/raddrinfo.c (addrinfo_mload): fix memory leak of - addrinfo. [ruby-dev:48923] [Bug #11051] + * lib/rdoc/*, test/rdoc/*: Update rdoc/rdoc master(f191513) + https://github.com/rdoc/rdoc/blob/master/History.rdoc#423--2016-- + https://github.com/rdoc/rdoc/blob/master/History.rdoc#422--2016-02-09 -Sun May 24 02:17:05 2015 Kenta Murata <mrkn@cookpad.com> +Sun Sep 4 00:17:55 2016 Sho Hashimoto <sho-h@ruby-lang.org> - * bigdecimal: conform to ruby's license. [ruby-core:68466] [Bug #10952] + * proc.c: [DOC] fix Object#define_singleton_method and + main.define_method return value. [ci skip] -Sun May 24 02:06:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Sep 3 11:28:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/-test-/file/fs.c (get_fsname): try magic number only if - f_type is included. [ruby-dev:48913] [Bug #11000] + * thread_pthread.c (ruby_init_stack): check stack bounds even if + get_main_stack succeeded, on the "co-routine" case. + https://github.com/ruby/ruby/commit/53953ee#commitcomment-18887413 -Sun May 24 02:06:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Sep 2 16:06:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/-test-/file/fs.c (get_fsname): return filesystem name by - statfs/statvfs. [ruby-core:68624] [Bug #10998] + * internal.h (MEMO_V1_SET, MEMO_V2_SET): fix typos. use the macro + parameter, not the local variable. -Sun May 24 02:02:00 2015 Koichi Sasada <ko1@atdot.net> +Fri Sep 2 00:55:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/test_symbol.rb: fix syntax error. + * ext/extmk.rb (timestamp_file): move extmk.rb specific tricks + from lib/mkmf.rb. keep RUBYCOMMONDIR prefix not to conflict + with a timestamp file in the toplevel. -Sun May 24 02:02:00 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Sep 1 14:24:16 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * hash.c (rb_any_hash): Symbols are compared by the identities - always. [ruby-core:68767] [Bug #11035] + * ext/extmk.rb (gems): move dirty hacks for bundled gems from + mkmf.rb. -Sun May 24 02:01:07 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/mkmf.rb (create_makefile): yield all configuration strings. - * hash.c (rb_any_hash): use same hash values with Float#hash so - that -0.0 and +0.0 will be identical. - [ruby-core:68541] [Bug #10979] +Wed Aug 31 17:39:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu May 21 01:34:48 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/extmk.rb (create_makefile): make gem.build_complete file + under TARGET_SO_DIR and install it only when the gem build + succeeded. [ruby-core:77057] [Bug #12681] - * gc.c (id2ref): prohibit from accessing internal objects. - [ruby-core:68348] [Bug #10918] +Wed Aug 31 15:36:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu May 21 01:32:02 2015 Rei Odaira <Rei.Odaira@gmail.com> + * ext/extmk.rb: move TARGET_SO_DIR stuffs to mkmf.rb. - * ext/pty/pty.c: AIX supports autopush. - Patch by Perry Smith [ruby-core:58539] [Bug #9144] + * lib/mkmf.rb (create_makefile): create target shared object files + under $(TARGET_SO_DIR) which is $sodir if it is defined with + $extout. [ruby-core:77058] [Bug #12681] -Thu May 21 01:07:41 2015 Misumi Rize <r@ayase-e.li> +Wed Aug 31 01:56:55 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> - * vm_insnhelper.c (vm_throw_start): search the target to break - from a block with nested rescue, from the nested blocks. - [ruby-core:67765] [Bug #10775] [Fix GH-820] + * doc/extension.ja.rdoc: [DOC] Fix a typo. [ci skip] -Thu May 21 00:55:45 2015 Koichi Sasada <ko1@atdot.net> +Wed Aug 31 00:52:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_args.c: protect value stack from calling other methods - during complex parameter setting process (splat, kw, and so on). - [Bug #11027] + * ext/extmk.rb: make the gems target directory under the expanded + name. [ruby-core:77102] [Bug #12714] - * vm_core.h: remove rb_thead_t::mark_stack_len. - With this modification, we don't need to use th->mark_stack_len. +Tue Aug 30 15:27:27 2016 Kouhei Yanagita <yanagi@shakenbu.org> - * test/ruby/test_keyword.rb: add a test. + * ext/json/lib/json/add/ostruct.rb (OpenStruct.json_create): + Correct documentation, fix the name of values. [Fix GH-1421] - * cont.c (cont_capture): catch up this fix. +Tue Aug 30 14:53:34 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * vm.c (rb_thread_mark): ditto. + * io.c (nogvl_fsync, nogvl_fdatasync): on Windows, just ignore if the + fd is associated to non-disk device. if call fsync and/or fdatasync + with such fds, it causes Errno::EBADF exception and the behavior is + incompatible with ruby 2.1 and earlier unintentionally introduced. -Thu May 21 00:07:54 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Aug 30 03:38:35 2016 NARUSE, Yui <naruse@ruby-lang.org> - * vm_eval.c (rb_obj_instance_eval, rb_obj_instance_exec): allow - symbols to just instance_eval/exec, except for definition of - singletons. [ruby-core:68961] [Bug #11086] + * vm_dump.c (backtrace): use rip in the saved context for the case + the SIGSEGV is received when the process is in userland. + Note that ip in the stack should be used if the signal is received + when it is in kernel (when it is calling syscall) [Bug #12711] -Wed May 20 04:33:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Aug 27 10:26:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * string.c (STR_SET_EMBED): clear NOFREE flag at embedding as - embedded strings no longer refer static strings. - [ruby-core:68436] [Bug #10942] + * array.c (rb_ary_concat_multi): take multiple arguments. based + on the patch by Satoru Horie. [Feature #12333] -Wed May 20 03:46:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c (rb_str_concat_multi, rb_str_prepend_multi): ditto. - * dir.c (need_normalization): use getattrlist() if fgetattrlist() - is unavailable, on OSX 10.5. [ruby-core:68829] [Bug #11054] +Thu Aug 25 00:42:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed May 20 03:25:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * win32/file.c (append_wstr): remove a codepage argument, and use + INVALID_CODE_PAGE for conversion by econv. - * proc.c (proc_binding): replicate env from method object, and - allocate the local variable area for the iseq local table. - [ruby-core:68673] [Bug #11012] + * win32/file.c (append_wstr): exclude the terminator from the + result length when input len == -1. -Wed May 20 03:25:34 2015 Koichi Sasada <ko1@atdot.net> +Wed Aug 24 22:41:30 2016 Kouhei Sutou <kou@cozmixng.org> - * proc.c: use RUBY_VM_IFUNC_P() to recognize IFUNC or not. + * gc.c (gc_reset_malloc_info): Remove too much ";". - * vm.c: ditto. +Wed Aug 24 20:07:57 2016 Naohisa Goto <ngotogenome@gmail.com> - * vm_dump.c: ditto. + * include/ruby/defines.h (ALWAYS_INLINE): Add alternative definition. + Fix compile error with compilers that do not have force inline + attribute, including old version of fcc on Solaris 10. + [ruby-dev:49773] [Bug #12701] - * vm_insnhelper.c: ditto. +Wed Aug 24 16:56:26 2016 NARUSE, Yui <naruse@ruby-lang.org> - * vm_core.h: use RB_TYPE_P() instead of BUILTIN_TYPE(). + * .gdbinit: follow r55766's VM change. -Wed May 20 03:10:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Aug 24 12:57:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * benchmark/bm_hash_aref_flo.rb: make more realistic data. - [ruby-core:68632] [[Bug #10999] + * object.c (rb_mod_initialize, rb_class_initialize): [DOC] these + methods do not invoke module_eval/class_eval, just eval the + given block under the new module/class but sharing the context + with the surrounding scope like those methods. + [ruby-core:77023] [Bug #12696] -Wed May 20 02:49:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Aug 23 10:34:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * proc.c (respond_to_missing_p): check if the receiver responds to - the given method by respond_to_missing?. + * test/psych/test_psych.rb (test_load_file_with_fallback): fix + Tempfile leak. https://github.com/tenderlove/psych/pull/288 - * proc.c (mnew_missing): create Method object for method_missing. - [ruby-core:68564] [Bug #10985] +Tue Aug 23 10:15:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed May 20 02:16:05 2015 NAKAMURA Usaku <usa@ruby-lang.org> + * string.c (rb_fs_setter): check and convert $; value at + assignment. - * dir.c (replace_real_basename): need to check the return value of - GLOB_REALLOC(). +Tue Aug 23 02:09:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed May 20 02:16:05 2015 NAKAMURA Usaku <usa@ruby-lang.org> + * string.c (rb_str_split_m): show $; name in error message when it + is a wrong object. - * dir.c (replace_real_basename): shouldn't create Ruby object before - the object system is loaded. - [ruby-core:68430] [Bug #10941] +Mon Aug 22 16:29:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed May 20 01:58:12 2015 Tanaka Akira <akr@fsij.org> + * lib/csv.rb (CSV#shift): store partial quoted strings in an array + and join at last, to improve performance with very long quoted + lines. [ruby-core:76987] [Bug #12691] - * lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality. - (Resolv::DNS::Name#initialize): Normalize labels as - Resolv::DNS::Label::Str objects. +Mon Aug 22 14:35:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed May 20 01:47:23 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * man/irb.1: remove useless -width option. + [ruby-dev:49767] [Bug #12692] - * iseq.c (rb_iseq_compile_with_option): check source type, must be - an IO or a String. [ruby-core:69219] [Bug #11159] +Mon Aug 22 09:02:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri May 15 05:01:25 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * iseq.c (Init_ISeq): undefine allocator of InstructionSequence, + to get rid of segfaults at method call on uninitialized object. - * symbol.c (Init_sym): make dsym_fstrs a hash compared by identity - as the keys are unique fstrings, to get rid of running hash and - compare methods and causing new object allocation during garbage - collection phase. [ruby-dev:48891] [Bug #10933] +Sat Aug 21 05:47:00 2016 Kenta Murata <mrkn@mrkn.jp> -Thu May 14 00:50:40 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * enum.c (enum_sort): prevent wasteful array duplication. - * parse.y (lambda): push and reset cmdarg_stack in lambda body. - [ruby-core:69017] [Bug #11107] +Sat Aug 20 11:20:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu May 14 00:39:29 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * rubystub.c: generalize win32/stub.c. - * dln.c (dln_load): check if a different libruby is loaded by the - extension library, and then bail out to get rid of very frequent - reported stale bug reports. +Fri Aug 19 11:39:06 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu May 14 00:29:44 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * parse.y (primary): allow parenthesised statement as a method + argument. [Feature #12686] - * lib/fileutils.rb (FileUtils#mv): show the exact target path in - the error message instead of the destination parent directory - name. patched by Joao Britto <jabcalves AT gmail.com> at - [ruby-core:68706]. [Bug #11021] +Fri Aug 19 09:12:45 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu May 14 00:19:04 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * vm.c (vm_set_main_stack): TOPLEVEL_BINDING must be built. + http://www.viva64.com/en/b/0414/#ID0EQ1CI [ruby-core:76973] - * thread_pthread.c (reserve_stack): keep sp safe zone to get rid - of crash by -fstack-check. [ruby-core:68740] [Bug #11030] +Fri Aug 19 01:00:53 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Tue Apr 14 23:33:39 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * proc.c (mnew_missing): Remove an unused argument. + After r51126 rid is not used. - * configure.in: check also procstat_getvmmap, which is not - available on FreeBSD 9. [ruby-core:68468] [Bug #10954] +Thu Aug 18 09:26:52 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_dump.c (procstat_vm): use kinfo_getvmmap instead if - procstat_getvmmap is not available. + * gems/bundled_gems: bump to test-unit-3.2.1 -Mon Apr 13 22:11:21 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> +Thu Aug 18 02:36:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/openssl/lib/openssl/ssl.rb: stricter hostname verification - following RFC 6125. with the patch provided by Tony Arcieri and - Hiroshi Nakamura [ruby-core:61545] [Bug #9644] - * test/openssl/test_ssl.rb: add tests for above. + * tool/rbinstall.rb: skip gems which failed to build extensions. + [ruby-dev:49764] [Bug #12683] -Mon Apr 13 13:03:33 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> +Wed Aug 17 23:35:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/securerandom.rb: skip Win32 libraries in SecureRandom if - OpenSSL::Random is available. - https://github.com/ruby/ruby/pull/848 [Bug #10948] [Bug #10995] + * gems/bundled_gems (tk): bump up to 0.1.1. -Mon Apr 13 00:49:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Aug 17 23:14:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (arg): fix segfault by null caused by syntax error. - [ruby-core:68851] [Bug #10957] + * ext/extmk.rb: build gem extensions into separate directories -Mon Apr 13 00:49:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * tool/rbinstall.rb: install pre-built gem extension files gem + extension directories. [ruby-core:76931] [Bug #12681] - * parse.y (primary): empty parentheses at cmdarg can be null. - [ruby-core:68477] [Bug #10957] +Tue Aug 16 21:04:30 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Apr 13 00:44:12 2015 Eric Wong <e@80x24.org> + * common.mk (UNICODE_HDR_DIR): separate unicode header files from + unicode data files. [ruby-core:76879] [Bug #12677] - * ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX - Thanks to Yura Sokolov <funny.falcon@gmail.com> - [ruby-core:68369] [Bug#10923] - * test/io/wait/test_io_wait.rb (test_nread_buffered): - fix broken test +Tue Aug 16 11:17:51 2016 Koichi ITO <koic.ito@gmail.com> -Mon Apr 13 00:16:32 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/net/http/header.rb: Fix typo. [ci skip][fix GH-1407] + * transcode.c: ditto. - * vm_eval.c (vm_call_super): search next super class from the - original class, to get rid of infinite recursion with - prepending. a patch by Seiei Higa <hanachin AT gmail.com> at - [ruby-core:68434]. [ruby-core:68093] [Bug #10847] +Tue Aug 16 11:02:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Apr 13 00:09:48 2015 Koichi Sasada <ko1@atdot.net> + * tool/make-snapshot (package): save generated header files from + unicode data. [ruby-core:76879] [Bug #12677] - * class.c (rb_prepend_module): need a WB for klass -> origin. +Mon Aug 15 20:31:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Apr 12 23:53:33 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * node.c (dump_array): show nd_alen field in NODE_ARRAY only in + the first node. it is nd_end in the rest nodes. - * ext/fiddle/extconf.rb: needs --enable-shared when linked to - libruby or fiddle.so. since --with-static-linked-ext does no - longer link extensions to ruby program with --enable-shared, the - only combination needs --enable-static is --disable-shared and - --with-static-linked-ext. [ruby-dev:48901] [Bug #10960] +Mon Aug 15 16:41:32 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Sun Apr 12 23:53:33 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * appveyor.yml: Update libressl version to 2.3.7. - * ext/fiddle/extconf.rb: make PIC objects if it will be linked as - a shared object eventually. [ruby-core:67128] +Mon Aug 15 11:46:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Mar 22 12:39:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/extmk.rb (extmake): extension libraries in gems cannot link + statically. - * spec/default.mspec: use default configuration file name. - https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf +Sun Aug 14 22:35:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Mar 22 12:39:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * id_table.c (hash_table_extend): should not shrink the table than + the previous capacity. [ruby-core:76534] [Bug #12614] - * spec/default.mspec: remove specific version number. - https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714 +Sun Aug 14 18:51:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Mar 22 12:39:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * gems/bundled_gems: add gemified tk 0.1.0. + this needs `extract-gems` to build. - * common.mk: use ruby organization for rubyspec. +Sun Aug 14 14:54:14 2016 Kouhei Sutou <kou@cozmixng.org> -Thu Feb 26 15:48:41 2015 NAKAMURA Usaku <usa@ruby-lang.org> + * object.c (InitVM_Object): Update referenced document path. - * ext/win32/Win32API.rb (initialize): accept both a string and an array - for the arguments of the imported function. - reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835] +Sat Aug 13 23:08:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Feb 25 15:36:26 2015 NARUSE, Yui <naruse@ruby-lang.org> + * numeric.c (num_funcall0, num_funcall1): get rid of infinite + recursion in fallback methods of Numeric. - * tool/merger.rb: support 2.1+ versioning scheme. +Sat Aug 13 11:10:08 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Feb 24 17:41:27 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * parse.y (command_asgn, arg): fix syntax errors with chained + assignment with op assign. [Bug #12669] - * time.c (time_zone_name): should be US-ASCII only if all 7-bits, - otherwise locale encoding. [ruby-core:68230] [Bug #10887] +Sat Aug 13 10:52:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Feb 24 17:41:27 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * parse.y (stmt, arg): rescue modifier in command op assignment + should be limited to rhs only. [ruby-core:75621] [Bug #12402] - * time.c (time_zone_name): should be US-ASCII only if all 7-bits, - otherwise locale encoding. [ruby-core:68230] [Bug #10887] +Sat Aug 13 07:51:40 2016 Masaki Suketa <masaki.suketa@nifty.ne.jp> -Tue Feb 24 17:41:27 2015 Benoit Daloze <eregontp@gmail.com> + * ext/win32ole/win32ole.c (ole_val2variant): fix integer conversion in + cygwin64. - * time.c: Zone encoding should be US-ASCII if all 7-bits. Fix r46907. +Fri Aug 12 21:05:19 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/ruby/test_time.rb, test/ruby/test_time_tz.rb: Update tests. + * lib/webrick/config.rb (WEBrick::Config::General): + disable reverse lookup by default. [ruby-core:45514] [Feature #6559] + Socket.do_not_reverse_lookup is true by default but WEBrick + overwrote it. + patch by Eric Hodel [ruby-core:45527] -Tue Feb 24 16:37:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Aug 12 12:50:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * string.c (chompped_length): enable smart chomp for all non-dummy - encoding strings, not only default_rs. - [ruby-core:68258] [Bug #10893] + * error.c (rb_syntax_error_append): fix newline in syntax error + message to the beginning, not after file name and line number. + [Feature #11951] -Tue Feb 24 16:31:53 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Aug 11 16:24:23 2016 Ferdinand Niedermann <nerdinand@nerdinand.com> - * string.c (rb_str_split_m): raise ArgumentError at broken string - not RegexpError, as Regexp is not involved in. - [ruby-core:68229] [Bug #10886] + * compar.c (cmp_clamp): Introduce Comparable#clamp. [Feature #10594] -Tue Feb 24 14:00:46 2015 Koichi Sasada <ko1@atdot.net> +Thu Aug 11 03:16:59 2016 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - * gc.c (rb_objspace_call_finalizer): control GC execution during - force firnalizations at the end of interpreter process. - [Bug #10768] + * lib/prime.rb: Optimize prime? + Adapted from patch by Jabari Zakiya [#12665] - 1) Prohibit incremental GC while running Ruby-level finalizers - to avoid any danger. - 2) Prohibit GC while invoking T_DATA/T_FILE data structure - because these operations break object relations consistency. + * test/test_prime.rb: Improve test - This patch can introduce another memory consuming issue because - Ruby-level finalizers can run after (2), GC is disabled. - However, basically object consistency was broken at (2) as I - described above. So that running Ruby-level finalizers contains - danger originally. Because of this point, I need to suggest to - remove these 3 lines (invoking remaining finalizers). And add a - rule to add that finalizers should not add new finalizers, or - say there is no guarantee to invoke finalizers that added by - another finalizer. +Wed Aug 10 22:37:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Feb 24 14:00:46 2015 Aman Gupta <ruby@tmm1.net> + * parse.y (command_rhs, arg_rhs): introduce new rules to reduce + repeated rules with rescue modifier. - * gc.c (rb_objspace_free): cause rb_bug if lazy sweep is in progress - during rb_objspace_free. Adds extra protection for r46340. - Patch by Vicent Marti. [Bug #10768] [ruby-core:67734] - * gc.c (rb_objspace_call_finalizer): Ensure GC is completed after - finalizers have run. We already call gc_rest() before invoking - finalizers, but finalizer can allocate new objects and start new GC - cycle, so we call gc_rest() again after finalizers are complete. +Wed Aug 10 17:26:43 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Feb 24 10:30:59 2015 Kazuki Tsujimoto <kazuki@callcc.net> + * parse.y (command_asgn): rescue modifier in command assignment + should be limited to rhs only. [ruby-core:75621] [Bug #12402] - * vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements - of original crefs. It fixes segmentation fault when calling - refined method in duplicate module. [ruby-dev:48878] [Bug #10885] +Wed Aug 10 15:35:03 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_core.h, class.c: change accordingly. + * ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on + cygwin. [ruby-core:76791] [Bug #12663] - * test/ruby/test_refinement.rb: add a test for above. + * ext/win32/resolv/resolv.c (w32error_make_error): use + Win32::Resolv::Error, an alias of Win32::Registry::Error. -Sun Feb 22 21:20:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Aug 9 17:50:00 2016 Kenta Murata <mrkn@mrkn.jp> - * re.c (match_aref): RMatch::regexp is Qnil after matching by a - string since r45451. [ruby-core:68209] [Bug #10877] + * hash.c (rb_hash_map_v, rb_hash_map_v_bang): implement Hash#map_v and + Hash#map_v! [Feature #12512] [ruby-core:76095] -Sun Feb 22 17:11:25 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/test_hash.rb: add tests for above change. - * Makefile.in (probes.stamp): rebuild dtrace dependent objects - only when `dtrace -G` modifies its input files. +Tue Aug 9 16:09:03 2016 NARUSE, Yui <naruse@ruby-lang.org> -Sun Feb 22 17:11:25 2015 Naohisa Goto <ngotogenome@gmail.com> + * vm_insnhelper.c (vm_getivar): use always_inline because + gcc7 doesn't inline this without always_inline. - * common.mk (ruby-glommed.o): dependency on $(OBJ) should be written - in common.mk (in which OBJ is defined) because of Makefile include - and parse order. This partly reverts r49419. - [ruby-dev:48849] [Bug #10808] +Tue Aug 9 15:41:24 2016 NARUSE, Yui <naruse@ruby-lang.org> - * Makefile.in (ruby-glommed.o): ditto. + * ext/tk: Tk is removed from stdlib. [Feature #8539] + https://github.com/ruby/tk is the new upstream. - * Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because - it is included in $(OBJS) since r49451. +Tue Aug 9 00:12:31 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - * Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS) + * doc/maintainers.rdoc: Remove moved file section. -Sun Feb 22 02:16:40 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Aug 8 20:56:46 2016 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * file.c (rb_file_identical_p): fix handle leak, ensure to close - the handle of the first argument. + * ext/win32ole/sample/excel1.rb, ext/win32ole/sample/excel2.rb, + ext/win32ole/sample/excel3.rb, ext/win32ole/sample/ie.rb, + ext/win32ole/sample/ienavi.rb, ext/win32ole/sample/ienavi2.rb: use + true instead of deprecated TRUE. [ci skip] -Sat Feb 21 13:48:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Aug 8 12:51:12 2016 Zarko Todorovski <zarko@ca.ibm.com> - * win32/win32.c (different_device_p): compare by volume serial - numbers, not by path names. [ruby-core:68162] [Bug #10865] + * internal.h (RBASIC_CLEAR_CLASS): Reroute ANSI C's strict + aliasing rule. + [ruby-core:74427][Bug #12191][ruby-core:76747][Bug #12657] -Sat Feb 21 13:48:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Aug 7 18:08:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * win32/win32.c (wrename): return EXDEV if moving a directory to - another drive, since MoveFileExW does not set proper error code. - [ruby-core:68162] [Bug #10865] + * object.c (InitVM_Object): deprecate toplevel constants TRUE, + FALSE, and NIL. [Feature #12574] -Sat Feb 21 12:46:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Aug 7 06:48:21 2016 Eric Wong <e@80x24.org> - * win32/file.c (rb_file_expand_path_internal): neither the drive - of base directory nor the current drive are involved in the - result if different than the drive of path. - [ruby-core:68130] [Bug #10858] + * ext/openssl/ossl_ssl.c (ossl_ssl_write_internal): + avoid undefined behavior + * test/openssl/test_pair.rb (test_write_zero): new test + [ruby-core:76751] [Bug #12660] -Sat Feb 21 12:46:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Aug 6 09:35:30 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * win32/file.c (rb_file_expand_path_internal): do not make invalid - (or ADS) path if the path has a drive letter, the result also - should have be under it. [ruby-core:68130] [Bug #10858] + * id_table.h (rb_id_table_iterator_result): add dummy sentinel + member because C standard prohibits a trailing comma. -Sat Feb 21 12:45:54 2015 Matt Hoyle <matt@deployable.co> +Sat Aug 6 00:39:44 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/bigdecimal/bigdecimal.c (VpSetPTR): fix a typo, 'expoennt' - to 'exponent'. [ruby-core:67980] [Bug #10823] [Fix GH-825] + * hash.c (env_enc_str_new): make string for an environment + variable name or value. -Fri Feb 20 17:47:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * hash.c (env_name_new): make environment value string with the + encoding for its name. - * vm_core.h (rb_call_info_kw_arg_struct): make keywords a symbols - list to get rid of inadvertent creation by variable keyword - arguments. [ruby-core:68031] [Bug #10831] +Fri Aug 5 23:18:35 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Fri Feb 20 15:08:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * hash.c (env_str_new): taint the string. get rid of a test failure + introduced at r55811. - * dir.c (has_magic): always get long path name on Windows even if - no tilde is there. [ruby-core:68011] [Bug #10819] +Fri Aug 5 17:04:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * dir.c (replace_real_basename): FindFirstFile ignore redirection - character, check if exists before call it. cf. [Bug #8597] + * hash.c (w32_getenv): call rb_w32_getenv and rb_w32_ugetenv via + this pointer without further comparisons. -Fri Feb 20 15:08:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Aug 4 11:54:30 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * dir.c (glob_helper): obtain real name with FindFirstFile API - instead of matchin all entries, on Windows. - [ruby-core:67954] [Bug #10819] + * hash.c (env_assoc): the encoding of the value should be the + locale, as well as other methods, [], fetch, values, etc. -Fri Feb 20 14:32:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Aug 3 21:31:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * dir.c (dir_initialize): workaround of opendir failure at symlink - directories on Windows via CIFS. + * parse.y (reg_fragment_enc_error): compile_error is different + between parser and ripper. [ruby-core:76397] [Bug #12651] -Thu Feb 19 17:05:47 2015 Shugo Maeda <shugo@ruby-lang.org> +Wed Aug 3 17:15:06 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * class.c (rb_obj_singleton_methods): should use RTEST() to convert - VALUE to int. + * object.c (rb_obj_clone2): restrict freeze option to true other + than false which only has the effect. [Feature #12300] -Thu Feb 19 16:14:04 2015 Shugo Maeda <shugo@ruby-lang.org> +Wed Aug 3 10:47:07 2016 Koichi Sasada <ko1@atdot.net> - * class.c (method_entry_i, class_instance_method_list, - rb_obj_singleton_methods): should not include methods of - superclasses if recur is false. [ruby-dev:48854] [Bug #10826] + * vm_core.h: introduce VM_FRAME_RUBYFRAME_P() + and VM_FRAME_CFRAME_P(). + Most of case, RUBY_VM_NORMAL_ISEQ_P() is no + longer needed. -Thu Feb 19 16:14:04 2015 Shugo Maeda <shugo@ruby-lang.org> + * vm_core.h: introduce rb_obj_is_iseq(). - * vm_method.c (remove_method): When remove refined - method, raise a NameError if the method is not - defined in refined class. + * cont.c, vm.c: VM_FRAME_MAGIC_DUMMY with + VM_FRAME_FLAG_CFRAME. - But if the method is defined in refined class, - it should keep refined method and remove original - method. +Wed Aug 3 09:25:16 2016 Koichi Sasada <ko1@atdot.net> - Patch by Seiei Higa. [ruby-core:67722] [Bug #10765] + * vm_core.h: rename macros and make them inline functions. -Thu Feb 19 16:07:03 2015 Seiei Higa <hanachin@gmail.com> + * rename VM_FRAME_TYPE_FINISH_P() to VM_FRAME_FINISHED_P(). + * rename VM_FRAME_TYPE_BMETHOD_P() to VM_FRAME_BMETHOD_P(). - * proc.c (rb_obj_singleton_method): Kernel#singleton_method should - not use refinements, as well as Kernel#method. - [ruby-core:67603] [Bug #10744] +Wed Aug 03 09:15:02 2016 Koichi Sasada <ko1@atdot.net> -Thu Feb 19 15:32:26 2015 Dave Stevens <dave@crowdlab.com> + * vm_core.h: introduce VM_FRAME_FLAG_CFRAME to represent cfp->iseq + type. - * string.c (str_make_independent_expand): terminate String when - moved from heap to embedded. [Fix GH-821]. +Tue Aug 2 21:42:40 2016 Chia-sheng Chen <qitar888@gmail.com> -Thu Feb 19 13:35:21 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * math.c (tanh): make faster by the extract form if three + hyperbolic functions are unavailable. [Feature #12647] - * ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a - macro `DEBUG` is defined. based on the patch by Owen Rodley in - [ruby-core:67987]. [Bug #10825] +Tue Aug 2 12:37:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Feb 17 18:57:13 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/socket/option.c, ext/socket/rubysocket.h (inet_ntop): share + the fallback definition. [ruby-core:76646] [Bug #12645] - * lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements - returned by Kernel#instance_variables are Symbols now. - [ruby-core:68128] [Bug #10857] +Tue Aug 2 04:07:29 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Tue Feb 17 15:39:01 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * win32/win32.c (set_pioinfo_extra): use more reliable way to search + the position of pioinfo of VC14, and also support debug library of it. + patched by davispuh AT gmail.com + [ruby-core:76644] [Bug #12644] + this fixes also [Bug #12631] - * ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide - versions of RegDeleteValue and RegDeleteKey. - [ruby-core:67958] [Bug #10820] +Mon Aug 1 21:39:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Feb 17 11:50:06 2015 Yusuke Endoh <mame@tsg.ne.jp> + * ext/extmk.rb: [EXPERIMENTAL] build extension libraries in + extracted gems. - * string.c (str_discard): does not free for STR_NOFREE string. - [Bug #10853][ruby-core:68110] +Mon Aug 1 16:07:18 2016 URABE Shyouhei <shyouhei@ruby-lang.org> - * bootstraptest/test_string.rb: test for above. + * include/ruby/ruby.h (struct RStruct): no longer. -Sun Feb 15 13:15:46 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * internal.h (struct RStruct): moved here. - * ext/socket/getaddrinfo.c (get_addr): reject too long hostname to - get rid of GHOST vulnerability on very old platforms. + * struct.c (rb_struct_ptr): a compensation function for the lack + of RSTRUCT_PTR. But now that we have RSTRUCT_GET/SET, that must + not be used anyway. I mark this deprecated. Dont use it. - * ext/socket/raddrinfo.c (make_hostent_internal): ditto, paranoic - check for the canonnical name. +Mon Aug 1 14:50:06 2016 Jeremy Evans <code@jeremyevans.net> -Sat Feb 14 13:27:41 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * object.c (rb_obj_clone2): Allow Object#clone to take freeze: + false keyword argument to not freeze the clone. + [ruby-core:75017][Feature #12300] - * vm_eval.c (send_internal), vm_insnhelper.c (vm_call_opt_send): - convert String method name into a Symbol, as method_missing - method expects its first argument to be a Symbol. [Bug #10828] + * test/ruby/test_object.rb (TestObject): test for it. - * vm_insnhelper.c (ci_missing_reason): return the reason of method - missing in call info. +Mon Aug 1 12:16:19 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_insnhelper.c (vm_call_opt_send): re-apply r49500 with the - proper missing reason. [Bug #10828] + * ext/json/*, test/json/json_parser_test.rb: Update json-2.0.2. -Sat Feb 14 13:27:41 2015 Marc-Andre Lafortune <ruby-core@marc-andre.ca> +Sun Jul 31 16:17:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_insnhelper.c: Fix symbol leak with +send+ [Bug #10828] + * ext/win32/resolv/resolv.c (get_dns_server_list): [Win32] get DNS + servers only for connected network devices by GetNetworkParams + API. [Bug #12604] -Sat Feb 14 08:53:50 2015 Shugo Maeda <shugo@ruby-lang.org> +Sat Jul 30 12:13:26 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * class.c (method_entry_i, class_instance_method_list, - rb_obj_singleton_methods): should not include methods of - superclasses if recur is false. [ruby-dev:48854] [Bug #10826] + * string.c (String#downcase), NEWS: Mentioned that case mapping for all + of ISO-8859-1~16 is now supported. [ci skip] -Fri Feb 13 13:59:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Jul 30 12:00:01 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of - interference by modifying global variables in have_devel? method. - [ruby-core:67962] [Bug #10821] + * enc/iso_8859_2.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-2, by Yushiro Ishii. -Fri Feb 13 03:13:05 2015 Scott Francis <scott.francis@shopify.com> +Fri Jul 29 20:57:12 2016 chuanshuo <lilijreey@126.com> - * thread_pthread.c (reserve_stack): fix intermittent SIGBUS on - Linux, by reserving the stack virtual address space at process - start up so that it will not clash with the heap space. - [Fix GH-822] + * *.c: rename rb_funcall2 to rb_funcallv, except for extensions + which are/will be/may be gems. [Fix GH-1406] -Fri Feb 6 12:05:13 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri Jul 29 10:51:34 2016 Koichi Sasada <ko1@atdot.net> - * thread.c: Improve documentation for Thread#value - [Bug #10694][ruby-core:67324][ci skip] + * proc.c (env_write): remove unused function. -Fri Feb 6 12:02:05 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jul 29 10:49:52 2016 Koichi Sasada <ko1@atdot.net> - * ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix. - workaround of a bug of VC12 ml, by unak at [ruby-core:67792]. - [ruby-core:67789] [Bug #10780] + * vm_core.h (VM_LOCAL_P): should return an integer value. + reported at + http://d.hatena.ne.jp/nagachika/20160728/ruby_trunk_changes_55764_55770 -Fri Feb 6 01:03:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jul 29 04:23:08 2016 Koichi Sasada <ko1@atdot.net> - * marshal.c (w_object, marshal_dump): use indetity tables for - arbitrary VALUE keys, because of performance of FLONUM. - [Bug #10761] + * vm_core.h (VM_ENV_LOCAL_P): return truthy (0 or not) value. - * marshal.c (obj_alloc_by_klass, marshal_load): ditto. + * vm.c (rb_vm_make_proc_lambda): use VM_ENV_ESCAPED_P() macro. -Fri Feb 6 01:03:38 2015 Eric Wong <e@80x24.org> +Fri Jul 29 03:49:04 2016 Koichi Sasada <ko1@atdot.net> - * benchmark/bm_marshal_dump_flo.rb: new benchmark for [Bug #10761] + * vm.c, internal.h: remove RubyVM::Env class and all of env objects + are imemo objects (imemo_env). -Fri Feb 6 01:03:38 2015 Eric Wong <e@80x24.org> + * NEWS: describe this change. I believe nobody touch these objects + because there are no method defined. - * st.c (st_numhash): mix float value for flonum - * hash.c (rb_any_hash): ditto - * benchmark/bm_hash_aref_flo.rb: new benchmark - * benchmark/bm_hash_ident_flo.rb: ditto - [Bug #10761] + * vm_core.h: remove the following definitions. + * rb_cEnv decl. + * GetEnvPtr() because Env is no longer T_DATA object. -Thu Feb 5 16:30:09 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * vm_core.h (rb_env_t): fix layout for imemo values. - * parse.y (gettable_gen): disable warnings of possible reference - to a local variable defined in a past scope. - [ruby-core:67162] [Bug #10661] + * vm_core.h (vm_assert_env): added. -Mon Jan 26 15:35:16 2015 Seiei Higa <hanachin@gmail.com> + * vm_core.h (vm_env_new): added. - * vm_method.c (check_definition): Module#public_method_defined?, - Module#private_method_defined?, Module#protected_method_defined? - should not use refinements. [ruby-core:67656] [Bug #10753] +Thu Jul 28 19:53:21 2016 Koichi Sasada <ko1@atdot.net> -Thu Jan 22 11:47:31 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * vm_core.h: revisit the structure of frame, block and env. + [Bug #12628] - * doc/syntax/literals.rdoc (Symbols): now Symbols created by - interpolation can be garbage collected. patch by Yihang Ho in - [ruby-core:67194]. [Bug #10671] + This patch introduce many changes. -Thu Jan 22 11:45:32 2015 Kazuki Tsujimoto <kazuki@callcc.net> + * Introduce concept of "Block Handler (BH)" to represent + passed blocks. - * eval_intern.h, vm.c, vm_eval.c, vm_insnhelper.c: - change throw mechanism (not save target ep, but save target cfp). - It fixes `unexpected break' bug that occurs when - TracePoint#binding is called. - [ruby-dev:48797] [Bug #10689] + * move rb_control_frame_t::flag to ep[0] (as a special local + variable). This flags represents not only frame type, but also + env flags such as escaped. - * test/ruby/test_settracefunc.rb: add a test. + * rename `rb_block_t` to `struct rb_block`. -Tue Jan 20 14:05:08 2015 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * Make Proc, Binding and RubyVM::Env objects wb-protected. - * ext/win32ole/win32ole.c (ole_invoke): avoid SEGV when VT_RECORD - variable is passed by reference. [ruby-dev:48803] [Bug #10697] + Check [Bug #12628] for more details. -Mon Jan 19 15:45:33 2015 Seiei Higa <hanachin@gmail.com> +Thu Jul 28 15:05:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_method.c (rb_method_entry): if no super class, no original - method entry. [ruby-core:67389] [Bug #10707] + * include/ruby/ruby.h (ruby_fl_type): use __extension__ to get rid + of pedantic warning against RUBY_FL_USER19. + https://github.com/skylightio/skylight-ruby/issues/64 -Mon Jan 19 12:03:59 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * include/ruby/ruby.h (rb_mul_size_overflow): ditto for use of + int128. - * vm_dump.c (rb_vm_bugreport): check by configured result instead - of system name for old FreeBSD. based on a patch by Steve Wills - at [ruby-core:67655]. [Bug #10752] +Wed Jul 27 10:32:59 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Jan 19 12:00:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * enc/windows_1253.c: Remove dead code found by Coverity Scan. - * configure.in: get rid of pattern substitution, which is not - supported by ash, and ash on NetBSD parses whole source first - and fails to start. [ruby-dev:48823] [Bug #10750] +Tue Jul 26 22:43:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Jan 19 11:57:14 2015 Vit Ondruch <vondruch@redhat.com> + * gc.c (run_finalizer): make saved running finalizer state + volatile to ensure not to be clobbered by longjmp. - * configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon - which causes a syntax error with autoconf 2.63. - [ruby-core:67429] [Bug #10716] +Tue Jul 26 19:26:00 2016 Koichi Sasada <ko1@atdot.net> -Mon Jan 19 11:44:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * vm_insnhelper.c: introduce rb_vm_pop_frame() and use it + instead of setting rb_thread_t::cfp directly. - * lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with - CR. should check if substitution occurred too. - [ruby-dev:48813] [Bug #10732] + * vm_insnhelper.c (vm_pop_frame): return the result of + finish frame or not. -Sun Jan 18 00:59:41 2015 Eric Wong <e@80x24.org> +Tue Jul 26 19:06:39 2016 Koichi Sasada <ko1@atdot.net> - * numeric.c (bit_coerce): use original value for error message - [ruby-core:67405] [Bug #10711] - * test/ruby/test_numeric.rb (test_coerce): check error message + * gc.c (rb_raw_obj_info): support to show Proc obj. -Sun Jan 18 00:53:38 2015 Seiei Higa <hanachin@gmail.com> +Tue Jul 26 18:55:55 2016 Koichi Sasada <ko1@atdot.net> - * vm_method.c (rb_alias): raise a NameError when creating alias to - a refined method if the original method of the refined method is - not defined. [ruby-core:67523] [Bug #10731] + * gc.c (gc_mark): add `inline' explicitly. + I expected to inline this function implicitly at the loop + (ex: marking T_ARRAY objects) but sometimes it remains as + normal call. -Sat Jan 17 22:25:50 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jul 26 16:33:16 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * dir.c (need_normalization): not only HFS+, CIFS (SMB) is also - decomposed. [Bug #10704] + * enc/windows_1257.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for Windows-1257, by Sho Koike. - * dir.c (NORMALIZE_UTF8PATH): Unicode decomposition seems to - perform in an upper layer than file systems on OSX, as all path - names are always decomposed regardless of file system types. +Tue Jul 26 16:19:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Jan 17 17:56:45 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * enc/windows_1250.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for Windows-1250, by Sho Koike. - * parse.y (assocs, assoc): eliminate splatting empty literal - hashes. [ruby-core:67446] [Bug #10719] + * ChangeLog: Fixed order of previous two entries. - * compile.c (compile_array_): supprt splatted hash in hash type. +Tue Jul 26 15:54:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Jan 17 16:49:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * enc/windows_1253.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for Windows-1253, by Takumi Koyama. - * ext/readline/readline.c (readline_s_refresh_line): initialize - before rl_refresh_line(), as some function make the internal - state non-clean but rl_refresh_line() does not re-initialize it. - [ruby-core:43957] [Bug #6232] +Tue Jul 26 15:30:37 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Jan 17 16:47:20 2015 NAKAMURA Usaku <usa@ruby-lang.org> + * enc/windows_1251.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for Windows-1251, by Shunsuke Sato. - * eval_error.c (error_print): pos and len parameters of rb_str_substr() - are counted by characters, not bytes. use rb_str_subseq() instead. - [Bug #10727] [ruby-core:67473] +Tue Jul 26 13:04:59 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Jan 17 16:35:59 2015 Seiei Higa <hanachin@gmail.com> + * test/ruby/enc/test_case_comprehensive.rb: Add explicit skip test for + availability of Unicode data files. - * vm_method.c (rb_export_method): bail out if the original method - is undefined when the method is refined. - [ruby-core:67387] [Bug #10706] +Mon Jul 25 21:33:13 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Jan 17 16:16:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * range.c (check_step_domain): check step argument domain by <=> + method, instead of < and >. - * dir.c (glob_helper): match in case-folding only if the directory - resides on a case-insensitve file system, on OSX. - [ruby-core:67364] [Bug #10700] +Mon Jul 25 21:11:32 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Sat Jan 17 02:04:01 2015 Eric Wong <e@80x24.org> + * doc/maintainers.rdoc: fix filenames. - * lib/resolv.rb: consider ENETUNREACH as ResolvTimeout - [ruby-core:67411] [Bug #10712] +Mon Jul 25 16:59:00 2016 Koichi Sasada <ko1@atdot.net> -Sat Jan 17 01:57:57 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * debug.c (ruby_debug_printf): use rb_raw_obj_info() + instead of rb_inspect() because it is more robust way + to see object internal. - * ext/zlib/zlib.c: fix document of method signatures. - [Bug #10668][ruby-core:67186][ci skip] +Sun Jul 24 16:33:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Jan 17 01:52:42 2015 Tanaka Akira <akr@fsij.org> + * regenc.h/c, include/ruby/oniguruma.h, enc/ascii.c, big5.c, cp949.c, + emacs_mule.c, euc_jp.c, euc_kr.c, euc_tw.c, gb18030.c, gbk.c, + iso_8859_1|2|3|4|5|6|7|8|9|10|11|13|14|15|16.c, koi8_r.c, koi8_u.c, + shift_jis.c, unicode.c, us_ascii.c, utf_16|32be|le.c, utf_8.c, + windows_1250|51|52|53|54|57.c, windows_31j.c, unicode.c: + Remove conditional compilation macro ONIG_CASE_MAPPING. [Feature #12386]. - * time.c (timelocalw): Set tm_isdst field -1 if vtm->isdst is - VTM_ISDST_INITVAL. This bug is introduced at packing struct - vtm (r45155). - [ruby-core:67345] [Bug #10698] Reported by Boris Ruf. +Sun Jul 24 12:53:42 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Fri Jan 16 21:17:34 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * doc/maintainers.rdoc: xmlrpc is bundled gem from Ruby 2.4. - * test/ruby/test_io.rb: added timeout for AIX environment. - [ruby-core:62983][Bug #9917] +Sun Jul 24 12:07:39 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Fri Jan 16 18:25:57 2015 Tanaka Akira <akr@fsij.org> + * doc/maintainers.rdoc: Update OpenSSL maintainer. - * lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str - objects. Label#Str#== is case-insensitive. +Sat Jul 23 22:43:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Jan 16 18:25:57 2015 Ben Miller <bmiller@rackspace.com> + * internal.h (Check_Type): inline check for the object type. - * lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the - comparison should be case-insensitive as well. - [ruby-core:66498] [Bug #10550] +Sat Jul 23 04:06:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Jan 16 18:25:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * include/ruby/ruby.h (RTEST, NIL_P): use RUBY prefixed name in + macros. - * lib/resolv.rb (Resolv::DNS::Name): names with different dots - should be different. +Sat Jul 23 01:41:29 2016 Eric Wong <e@80x24.org> -Fri Jan 16 17:34:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY + * test/webrick/test_cgi.rb (test_cgi_env): new test + * test/webrick/webrick.cgi (do_GET): new endpoint to dump env + [ruby-core:76511] [Bug #12610] - * parse.y (f_label): return tLABEL value as it is. - [ruby-core:67315] [Bug #10693] +Fri Jul 22 19:55:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Jan 16 16:49:04 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * vm.c (vm_set_main_stack): remove unnecessary check. toplevel + binding must be initialized. [Bug #12611] (N1) - * lib/net/http.rb (Net::HTTP#send_request): there is no response body - with HEAD request. Patch by @rodrigosaito [fix GH-520] + * win32/win32.c (w32_symlink): fix return type. [Bug #12611] (N3) -Fri Jan 16 16:49:04 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * string.c (rb_str_split_m): simplify the condition. + [Bug #12611](N4) - * test/net/http/test_http.rb (_test_send_request__HEAD): Added - failing test for send_request with HEAD method. +Fri Jul 22 17:13:37 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Fri Jan 16 14:56:08 2015 Eric Wong <e@80x24.org> + * string.c (String#dump): Change escaping of non-ASCII characters in + UTF-8 to use upper-case four-digit hexadecimal escapes without braces + where possible [Feature #12419]. - * symbol.c (rb_gc_free_dsymbol): delete from global fstr hash - * test/ruby/test_symbol.rb (test_symbol_fstr_leak): test for bug - [ruby-core:67268] [Bug #10686] + * test/ruby/test_string.rb (test_dump): Add tests for above. -Fri Jan 16 14:20:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jul 22 10:35:35 2016 Kouhei Sutou <kou@cozmixng.org> - * vm_args.c (keyword_hash_p): fix non-symbol keys hash. - rb_extract_keywords() returns 0 not Qnil when no symbol keys is - included. + * lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong + entry reference name of double quote. + [Bug #12609][ruby-core:76509] + Patch by Joseph Marrero. Thanks!!! -Fri Jan 16 11:06:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri Jul 22 10:32:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/unicode_normalize.rb: typo fix. [ci skip] - [ruby-dev:48794][misc #10675] - included. [ruby-core:67264] [Bug #10685] -Fri Jan 16 11:04:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * template/unicode_norm_gen.tmpl: Remove + UnicodeNormalize::UNICODE_VERSION at origin [Feature #12546]. - * re.c (unescape_nonascii): append excape sequence as-is not - unescaped character, to get rid of unexpected meta-character. - [ruby-core:67193] [Bug #10670] +Fri Jul 22 09:23:51 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Sat Jan 3 21:17:58 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * LEGAL: Added entries for files under the USD license. + [Bug #12598][ruby-core:76428][ci skip] - * thread.c (rb_thread_variable_get): fix dynamic symbol keys. - rb_check_id() returns non-zero only for static symbols, whereas - thread local variable keys can be dynamic symbols. - [ruby-core:67185] [Bug #10667] +Fri Jul 22 09:19:57 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Thu Jan 1 08:29:55 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + * LEGAL: Added entry for `lib/rdoc/generator/template/darkfish/css/fonts.css` + [Misc #12550][ruby-core:76255][ci skip] - * cygwin/GNUmakefile.in (EXTOBJS): override to add resource files - always. [ruby-core:67153] [Bug #10657] +Fri Jul 22 06:28:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Dec 31 15:26:46 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * gc.c (run_finalizer): push and exec tag just once, instead of + protecting for each finalizer. - * parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and - keywords bits arguments should be unique. since internal IDs - depend on the local variable index in the current scope, new ID - should be made before popping those vtables. - [ruby-core:67157] [Bug #10659] + * gc.c (gc_start_internal, rb_gc_start): set finalizing flag + whenever calling deferred finalizers not to recurse. -Wed Dec 31 14:11:58 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Thu Jul 21 22:26:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function - of tcllib. Patch by @zalt50 [fix GH-787] + * missing/strl{cat,cpy}.c: Update latest upstream files. + [Misc #12205][ruby-core:74487] + * LEGAL: Update license for missing/strl{cat,cpy}.c. -Wed Dec 31 13:26:22 2014 Eric Wong <e@80x24.org> +Thu Jul 21 21:53:30 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_core.h (rb_vm_living_threads_insert): preserve order - [Bug #10660] [ruby-core:67154] [ruby-core:67159] + * LEGAL: added file list with Public domain license. + [ruby-core:76254][Bug #12549] -Fri Dec 26 15:42:27 2014 NAKAMURA Usaku <usa@ruby-lang.org> +Wed Jul 20 17:44:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable. - [Bug #10647] [ruby-dev:48787] + * enumerator.c (lazy_uniq): new method Enumerator::Lazy#uniq. + [Feature #11090] -Thu Dec 25 17:42:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * enum.c (enum_uniq): new method Enumerable#uniq. + [Feature #11090] - * ext/io/console/console.c (console_dev): send the given arguments - to the opened console. as a special case, do nothing if :close - is given. +Wed Jul 20 17:35:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/lib/leakchecker.rb (LeakChecker#check_fd_leak): close if - console. + * hash.c (rb_hash_add_new_element): add new element or do nothing + if it is contained already. -Thu Dec 25 17:37:47 2014 Naohisa Goto <ngotogenome@gmail.com> + * array.c (ary_add_hash, ary_add_hash_by): use + rb_hash_add_new_element. - * gc.c (wmap_final_func): fix memory size shortage when realloc wmap. - Fix SEGV during finilize of WeakRef on Solaris (though the SEGV - could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646] +Tue Jul 19 18:21:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Dec 25 17:31:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/unicode_normalize/tables.rb: Remove + UnicodeNormalize::UNICODE_VERSION (#12546). - * configure.in (NET_LUID): include winsock2.h instead of windows.h. - patch by Jon Forums in [ruby-core:67125]. [Bug #10640] +Tue Jul 19 15:38:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Dec 25 16:01:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * variable.c (rb_local_constants_i): exclude private constants + when excluding inherited constants too. [Bug #12345] - * file.c (rb_file_expand_path_internal): drop characters ignored - by filesystem on Mac OS X. +Sun Jul 17 23:42:00 2016 Kenta Murata <mrkn@mrkn.jp> -Thu Dec 25 15:36:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (num_finite_p, num_infinite_p): Add Numeric#finite? and + Numeric#infinite? [Feature #12039] [ruby-core:73618] - * dir.c (replace_real_basename): get the real name and replace the - base name with it by getattrlist(2) if available. - suggested by Matthew Draper at [ruby-core:67116]. [Bug #10015] + * complex.c (rb_complex_finite_p): Add Complex#finite? - * dir.c (glob_helper): get the real name of the whole path, not - only the last name. + * complex.c (rb_complex_infinite_p): Add Complex#infinite? -Thu Dec 25 13:59:17 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/test_bignum.rb: Add test for Integer#finite? and + Integer#infinite? - * configure.in (NET_LUID): include also ifdef.h as a workaround of - a bug in mingw-w64 header. [ruby-core:67103] [Bug #10640] + * test/ruby/test_fixnum.rb: ditto. -Thu Dec 25 12:47:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/test_rational.rb: Add test for Rational#finite? and + Rational#infinite? - * parse.y (gettable_gen): warn possible reference to a local - variable defined in a past scope. + * test/ruby/test_complex.rb: Add test for Complex#finite? and + Complex#infinite? -Thu Dec 25 10:09:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jul 17 20:59:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/io/console/console.c (console_dev): id_console is not a - constant name, use rb_const_remove() to get rid of NameError. + * common.mk, enc/depend (casefold.h, name2ctype.h): move to + unicode data directory per version. -Thu Dec 25 09:18:55 2014 NAKAMURA Usaku <usa@ruby-lang.org> +Sat Jul 16 06:26:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address): - set timeout for recvfrom because if client thread is crashed, it - waits infinity. + * common.mk, enc/Makefile.in: moved timestamp files for + directories under the specific directory, to get rid of match + with files under the source directory. -Thu Dec 25 08:42:11 2014 Eric Wong <e@80x24.org> +Fri Jul 15 22:05:13 2016 Naohisa Goto <ngotogenome@gmail.com> - * lib/uri/generic.rb (split_userinfo): fstring for 1-byte split - (set_port): reduce bytecode size - (check_path): reduce garbage via opt_str_freeze - (query=): ditto - (fragment=): ditto - [misc #10628] - * lib/uri/rfc3986_parser.rb (regexp): cache as attr - (initialize): setup and freeze regexp attr once - (split): reduce bytecode size, use opt_str_freeze - (parse): minor bytecode and garbage reduction - (default_regexp): rename for initialize + * string.c (str_buf_cat): Fix potential integer overflow of capa. + In addition, termlen is used instead of +1. -Wed Dec 24 20:38:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jul 15 21:30:38 2016 Naohisa Goto <ngotogenome@gmail.com> - * dir.c (glob_make_pattern): restrict searching case-insensitive - name from the filesystem to only last part, for the performance. - [ruby-core:63591] [Bug #10015] + * string.c (str_buf_cat): Fix capa size for embed string. + Fix bug in r55547. [Bug #12536] -Wed Dec 24 18:21:27 2014 Koichi Sasada <ko1@atdot.net> +Fri Jul 15 18:13:15 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * gc.c: remove unused rb_objspace_t::rgengc::old_objects_at_gc_start. + * gems/bundled_gems: update latest gems. -Wed Dec 24 13:25:22 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Jul 15 17:08:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * tool/redmine-backporter.rb: require view_changesets permission. + * util.c (ruby_strtod): do not underflow only by preceding zeros, + which may be canceled out by the exponent. + http://twitter.com/kazuho/status/753829998767714305 -Wed Dec 24 13:00:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jul 15 09:53:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * tool/downloader.rb (Downloader.download): fix the exception to - re-raise. initialize methods of subclasses of Exception may - have different parameters. [ruby-core:67086] [Bug #10639] + * enc/unicode/case-folding.rb, tool/enc-unicode.rb: check if + Unicode versions are consistent with each other. -Wed Dec 24 12:16:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jul 15 08:25:15 2016 Jeremy Evans <code@jeremyevans.net> - * ruby.h (rb_data_type_t): revert r48647 and revise parent member. - [ruby-core:66969] [Bug #10621] + * string.c (STR_BUF_MIN_SIZE): reduce from 128 to 127 + [ruby-core:76371] [Feature #12025] + * string.c (rb_str_buf_new): adjust for above reduction -Wed Dec 24 05:40:52 2014 NARUSE, Yui <naruse@ruby-lang.org> +Thu Jul 14 17:26:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * tool/downloader.rb: use config.guess in gcc repo. + * Makefile.in (enc/unicode/name2ctype.h): remove stale recipe, + which did not support Unicode age properties. -Wed Dec 24 11:50:19 2014 Koichi Sasada <ko1@atdot.net> + * common.mk (enc/unicode/name2ctype.h): update by --header option + of tool/enc-unicode.rb. enc/unicode/name2ctype.kwd file has not + been used. - * hash.c (rb_hash_delete): return Qnil if there are no corresponding - entry. [Bug #10623] + * common.mk (enc/unicode/name2ctype.kwd): rule to create from + Unicode data files, used only when the target does not exist. - * hash.c (rb_hash_delete_entry): try delete and return Qundef if there - are no corresponding entry. +Thu Jul 14 13:10:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * internal.h: add rb_hash_delete_entry()'s declaration. + * ext/json/lib/json/ext: remove stale directory. bundled + extension libraries are placed under the directory for each + architectures, but not mixed with plain text script libraries. - * symbol.c: use rb_hash_delete_entry(). +Thu Jul 14 12:48:47 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * thread.c: use rb_hash_delete_entry(). + * ext/json/**/*.rb: merge original files from upstream repository. + It only fixes styles of frozen string literal. - * ext/-test-/hash/delete.c: use rb_hash_delete_entry(). +Wed Jul 13 22:23:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Wed Dec 24 09:35:11 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * test/json/json_common_interface_test.rb: use assert_raise instead of + assert_raises. - * ext/fiddle/extconf.rb: remove ffitarget.h generated by configure on - mswin, because it's not normal file (cygwin's symlink) and have - system attribute. +Wed Jul 13 22:14:23 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Wed Dec 24 05:40:52 2014 NARUSE, Yui <naruse@ruby-lang.org> + * test/lib/test/unit.rb: added test files with `_test` suffix for json + upstream. + * test/json: merge original test files from json upstream. - * tool/downloader.rb: support ruby 1.8. +Wed Jul 13 18:09:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Dec 24 02:44:06 2014 NARUSE, Yui <naruse@ruby-lang.org> + * enc/iso_8859_9.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-9, by Kazuki Iijima. - * lib/net/http/response.rb (Net::HTTPResponse): require one or more - spaces [Bug #10591]. - by leriksen <leif.eriksen.au@gmail.com> - https://github.com/ruby/ruby/pull/782 fix GH-782 - NOTE: graph.facebook.com returns without SP Reason-Phrase. + * enc/iso_8859_9.c: Exclude dotless i/I with dot from case-insensitive + matching because they are not a case pair. -Wed Dec 24 02:12:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_iso_8859.rb: Make test coverage for ISO-8859-9 + a bit more complete. - * tool/make-snapshot (package): VCS#branch_list expects glob a - pattern string but not a regexp. based on the patch by Vit - Ondruch. in [ruby-core:67064]. [Bug #10636] +Wed Jul 13 17:21:24 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * tool/vcs.rb (VCS::SVN#branch_list): strip newlines. + * enc/windows_1252.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for Windows-1252, by Serina Tai. - * tool/vcs.rb (VCS::GIT.get_revisions): retrieve modified time - from toplevel log too. + * test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings. - * tool/vcs.rb (VCS::GIT#branch_list): yield for each lines. +Wed Jul 13 16:19:14 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Dec 24 00:23:13 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * enc/iso_8859_7.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-7, by Kosuke Kurihara. - * tool/extlibs.rb (do_extract): the pipe should be binmode. + * test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings. -Wed Dec 24 00:21:44 2014 NAKAMURA Usaku <usa@ruby-lang.org> +Wed Jul 13 16:08:08 2016 Koichi Sasada <ko1@atdot.net> - * Makefile.in, common.mk: move common-srcs to Makefile.in because - it breaks build on mswin. + * gc.c (gc_mark_roots): should mark the VM object itself to mark + singleton class of the VM object. + Before this patch, we only set mark bit for the VM object and + invoke mark function separately. + [Bug #12583] -Wed Dec 24 00:04:45 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * test/ruby/test_gc.rb: add a test. - * lib/open-uri.rb (OpenURI.open_http): accept multiple certs path in - ssl_ca_certs. +Wed Jul 13 15:59:59 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * tool/downloader.rb: use certs of rubygems for downloading gems. + * math.c (_USE_MATH_DEFINES): it must be set before including internal.h + because internal.h includes ruby.h, ruby.h includes win32.h, and + win32.h includes system's math.h. + this change is to get rid of a compiler warning (redefinition of + a macro) introduced at r55641. -Tue Dec 23 22:39:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jul 13 15:19:03 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/fiddle/extlibs: libffi-3.2.1 and patch for mswin. + * enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if + there is no modification. -Tue Dec 23 22:04:38 2014 NARUSE, Yui <naruse@ruby-lang.org> +Wed Jul 13 14:40:04 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/uri/generic.rb (URI::Generic#query=): don't escape [\]^ - on both rfc2396 and rfc3986. [Bug #10619] + * enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-5, by Masaru Onodera. -Tue Dec 23 16:03:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings. - * ext/win32/lib/win32/registry.rb (Win32::Registry::Error#initialize): - try en_US message if the default message cannot be encoded to - locale. [ruby-core:65295] [Bug #10300] +Wed Jul 13 14:28:33 2016 NARUSE, Yui <naruse@ruby-lang.org> -Tue Dec 23 11:42:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * math.c (rb_math_sqrt): r55646 must use f_signbit. - * ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge - data gradually not to exceed INT_MAX. workaround of OpenSSL API - limitation. [ruby-core:67043] [Bug #10633] +Wed Jul 13 14:22:50 2016 Koichi Sasada <ko1@atdot.net> -Mon Dec 22 21:30:16 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * iseq.c (Init_ISeq): undef ISeq.translate and ISeq.load_iseq + to prevent calling super classes' methods. - * test/win32ole/test_win32ole_event.rb: some tests are - executed on standard Windows OS without ADO. + Without this patch, you can write workaround like: -Mon Dec 22 14:08:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + class << RubyVM::InstructionSequence + def translate; end + undef translate + end - * signal.c (received_signal): fix condition to define. - [ruby-core:67032] [Bug #10629] + * test/ruby/test_iseq.rb: add a test. -Sun Dec 21 10:51:51 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Wed Jul 13 14:16:03 2016 Koichi Sasada <ko1@atdot.net> - * test/win32ole/test_win32ole_event.rb: test_s_new_exception is - executed on standard Windows OS without ADO. + * vm_method.c (method_entry_get_without_cache): check + undefined method even if ruby_running is FALSE. -Sun Dec 21 08:35:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + We haven't call "undef"ed methods before ruby_running. + So that this issue does not make troubles. - * configure.in (jemalloc): fix option argument, should use - `$withval` but not `yes` always. [ruby-core:66994] [Bug #10625] +Wed Jul 13 14:15:22 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * configure.in (jemalloc): defer adding the liner option to get - rid of linking contest against jemalloc, so that it works - without runtime dynamic load path. + * enc/windows_1254.c: Adjust variable/macro names. -Sat Dec 20 17:49:03 2014 Tanaka Akira <akr@fsij.org> +Wed Jul 13 13:19:12 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1. - [ruby-core:66943] [Bug #10616] Fixed by Alex Slynko. + * enc/iso_8859_9.c, enc/windows_1254.c: Split Windows-1254 from + ISO-8859-9 to be able to implement different case conversions. -Sat Dec 20 11:22:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jul 13 13:08:30 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/fiddle/depend, ext/fiddle/extconf.rb: try to build bundled - libffi if existing. + * enc/iso_8859_7.c, enc/windows_1253.c: Split Windows-1253 from + ISO-8859-7 to be able to implement different case conversions. -Sat Dec 20 05:21:00 2014 Eric Wong <e@80x24.org> +Wed Jul 13 10:50:12 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * test/test_weakref.rb (test_repeated_object_leak): increase timeout - [Bug #10618] + * enc/iso_8859_13.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-13, by Kanon Shindo. -Fri Dec 19 22:33:13 2014 Tanaka Akira <akr@fsij.org> +Wed Jul 13 10:31:39 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * tool/update-deps: Use $(hdrdir) if possible. + * enc/iso_8859_13.c, enc/windows_1257.c: Split Windows-1257 from + ISO-8859-13 to be able to implement different case conversions. -Fri Dec 19 22:10:00 2014 Kenta Murata <mrkn@cookpad.com> +Wed Jul 13 09:02:30 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/bigdecimal/depend: Fix dependencies to make bigdecimal - installable by rubygems. + * enc/iso_8859_3.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-3, by Takuya Miyamoto. - * ext/bigdecimal/bigdecimal.gemspec: version 1.2.6. + * test/ruby/enc/test_case_comprehensive.rb: Extend special treatment + for Turkic. -Fri Dec 19 20:00:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * enc/iso_8859_3.c: Exclude dotless i/I with dot from case-insensitive + matching because they are not a case pair. - * include/ruby/ruby.h (PRIsVALUE): put a space after string - literals not to be confused with C++11 string literal suffix. - https://github.com/ruby/ruby/commit/a9f3eb7#commitcomment-9040169 +Wed Jul 13 08:40:21 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Fri Dec 19 15:36:02 2014 Simon Genier <simon.genier@shopify.com> + * test/ruby/enc/test_iso_8859.rb: Exclude dotless i/I with dot from + case-insensitive matching because they are not a case pair. - * hash.c (hash_equal): prefer true than the result of implicit - conversion from int returned by rb_eql() to VALUE. [Fix GH-789] +Tue Jul 12 23:13:43 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Dec 18 17:45:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * math.c (rb_math_sqrt): [EXPERIMENTAL] move Complex sqrt support + from mathn.rb. - * configure.in (rb_cv_binary_elf): get rid of -e option of cat - which is not available on BusyBox, use tr instead. - [ruby-core:64824] [Bug #10210] +Tue Jul 12 01:25:09 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Thu Dec 18 14:25:17 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * configure.in, lib/mkmf.rb, win32/Makefile.sub (CSRCFLAG): make the + compiler option replacable in Makefile. - * signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT, - should be treated before calling signal(3). - [Bug #10615] + * win32/Makefile.sub (OUTFLAG, COUTFLAG): ditto. -Wed Dec 17 12:20:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * win32/Makeile.sub, win32/setup.mak (CC): should not append `-nologo` + option forcely. - * compile.c (rb_method_for_self_aref, rb_method_for_self_aset): - move from iseq.c to build from node instead of arrays. +Mon Jul 11 18:05:40 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Dec 17 10:50:09 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * enc/iso_8859_1.c: Moved test for lowercase characters without + uppercase equivalent. - * test/gdbm/test_gdbm.rb: Added test for each_key called without a block. - Patch by @joeyates [fix GH-783] +Mon Jul 11 17:49:25 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Dec 17 10:18:42 2014 Koichi Sasada <ko1@atdot.net> + * enc/iso_8859_4.c, enc/iso_8859_10.c, enc/iso_8859_14.c, + enc/iso_8859_15.c, enc/iso_8859_16.c: Replace case-by-case code with + lookup in ENC_ISO_8859_xx_TO_LOWER_CASE table. - * compile.c (iseq_compile_each): check - iseq->compile_data->option->specialized_instruction for opt_* insn. +Mon Jul 11 16:00:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/test_iseq.rb: check no specialized_instructions option. + * ext/stringio/stringio.c (strio_each, strio_readlines): convert + arguments just once before reading, instead of conversions for + each lines, as r55603. -Wed Dec 17 09:48:57 2014 Eric Wong <e@80x24.org> +Sun Jul 10 19:53:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * compile.c (iseq_compile_each): only emit opt_str_freeze, - opt_aref_with, and opt_aset_with insn when no block is given - [Bug #10557] [ruby-core:66595] - * test/ruby/test_optimization.rb (test_block_given_aset_aref): - new test for bug thanks to Bartosz Kopinski. - (test_string_freeze): additional assertion for object_id + * enc/iso_8859_10.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-10, by Toya Hosokawa. -Wed Dec 17 01:06:47 2014 NAKAMURA Usaku <usa@ruby-lang.org> +Sun Jul 10 19:33:47 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/win32/lib/Win32API.rb (Win32API#call): need to splat. hmm, when - was this broken? + * test/ruby/enc/test_case_comprehensive.rb: Changed testing logic to + catch unintended modifications of characters that do not have a case + equivalent in the respective encoding. + * enc/iso_8859_1.c, enc/iso_8859_15.c: Fixed unintended modifications of + micro sign and y with diaeresis. -Tue Dec 16 15:18:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jul 10 17:05:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * iseq.c (rb_method_for_self_aref, rb_method_for_self_aset): call - accessor functions directly, not to be affected by [] and []= - methods. [ruby-core:66846] [Bug #10601] + * enc/iso_8859_4.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-4, by Kotaro Yoshida. - * struct.c (define_aref_method, define_aset_method): ditto. +Sun Jul 10 16:17:47 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * vm_insnhelper.c (rb_vm_opt_struct_aref, rb_vm_opt_struct_aset): - direct accessors of Struct. + * test/ruby/enc/test_case_comprehensive.rb: Fixed a comment + (message belongs to last commit). [ci skip] -Tue Dec 16 12:01:29 2014 Koichi Sasada <ko1@atdot.net> +Sun Jul 10 14:27:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): - extend timeout seconds to 60 for RGENGC_CHECK_MODE > 0 environment. + * util.c (ruby_dtoa): [EXPERIMENTAL] adjust the case that the + Float value is close to the exact but unrepresentable middle + value of two values in the given precision, as r55604. -Tue Dec 16 08:53:12 2014 Eric Wong <e@80x24.org> +Sun Jul 10 08:57:20 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * tool/vcs.rb: fix Ruby 1.8 compatibility harder + * thread.c: Fixed implicit conversion error with Apple clang-800.0.31 -Tue Dec 16 07:37:18 2014 Eric Wong <e@80x24.org> +Sat Jul 9 12:43:09 2016 Shugo Maeda <shugo@ruby-lang.org> - * gc.c (GC_HEAP_FREE_SLOTS): move definition to match use order - (RUBY_GC_HEAP_GROWTH_SLOTS): s/factor/number of slots/ + * lib/getoptlong.rb: use false instead of FALSE. - * man/ruby.1: add section for GC environment variables - [Feature #10197] +Fri Jul 8 21:49:28 2016 Naohisa Goto <ngotogenome@gmail.com> -Tue Dec 16 05:41:46 2014 Eric Wong <e@80x24.org> + * thread.c (rb_wait_for_single_fd): Clean up fds.revents every time + before calling ppoll(2). [Bug #12575] [ruby-dev:49725] - * tool/vcs.rb: fix Ruby 1.8 compatibility +Fri Jul 8 14:16:48 2016 Shugo Maeda <shugo@ruby-lang.org> -Mon Dec 15 17:51:28 2014 Koichi Sasada <ko1@atdot.net> + * vm_args.c (vm_caller_setup_arg_block): call rb_sym_to_proc() + directly to reduce method dispatch overhead. - * ext/objspace/objspace.c: ObjectSpace.memsize_of(obj) returns - with sizeof(RVALUE). [Bug #8984] +Fri Jul 8 08:43:31 2016 Shugo Maeda <shugo@ruby-lang.org> - * gc.c (obj_memsize_of): ditto. + * io.c (rb_io_s_read): add description of pipes to the documentation + of IO.read. - * NEWS: add a NEWS entry. +Fri Jul 8 03:54:22 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/objspace/test_objspace.rb: catch up this fix. + * vm_args.c (setup_parameters_complex): don't raise ArgumentError + if an array is given for instance_exec with optional argument. + [ruby-core:76300] [Bug #12568] + https://github.com/rails/rails/pull/25699 - * test/ruby/test_file_exhaustive.rb: ditto. +Fri Jul 8 00:47:36 2016 NARUSE, Yui <naruse@ruby-lang.org> -Mon Dec 15 16:19:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * vm_eval.c (yield_under): change prototype to get argc/argv. - * string.c (rb_enc_str_coderange): dummy wchar, non-endianness - encoding string cannot be ascii only. - [ruby-core:66835] [Bug #10598] + * vm_eval.c (specific_eval): change for above. -Sun Dec 14 20:11:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * vm_eval.c (rb_obj_instance_exec): avoid object allocation. - * parse.y (primary): restore current_arg so that circular - reference after a method definition is also warned. - [ruby-core:61299] [Bug #9593] + * vm_eval.c (rb_mod_module_exec): ditto. -Sat Dec 13 20:41:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Jul 7 20:08:37 2016 Shugo Maeda <shugo@ruby-lang.org> - * vm_trace.c (rb_postponed_job_flush): mask signal trap interrupt - too to defer handling after finalizers finished. - [ruby-core:66825] [Bug #10595] + * vm_args.c (vm_caller_setup_arg_block): disable symbol block + argument optimization when tail call optimization is enabled, + in order to avoid SEGV. [ruby-core:76288] [Bug #12565] -Sat Dec 13 18:33:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Thu Jul 7 16:37:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/openssl/test_pkey_ec.rb: ignored tests with old OpenSSL. + * numeric.c (flo_round): [EXPERIMENTAL] adjust the case that the + receiver is close to the exact but unrepresentable middle value + of two values in the given precision. + http://d.hatena.ne.jp/hnw/20160702 -Sat Dec 13 18:01:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Jul 7 16:31:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * signal.c (check_stack_overflow): check sp also on i386/x86_64 - FreeBSD. + * io.c (rb_io_s_foreach, rb_io_s_readlines): convert arguments + just once before reading, instead of conversions for each lines. -Sat Dec 13 09:58:41 2014 Eric Wong <e@80x24.org> +Wed Jul 6 19:54:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c (define_final0): avoid duplicate blocks - [Bug #10537] - * test/test_weakref.rb (test_repeated_object_leak): new test + * enc/iso_8859_14.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-14, by Yutaro Tada. -Sat Dec 13 04:59:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jul 6 19:24:48 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * bin/erb (ERB::Main#run): get rid of shadowing outer local - variables. [ruby-core:65772] [Feature #10395] + * enc/iso_8859_1.c, enc/iso_8859_15.c, enc/iso_8859_16.c: + Align indenting to onigmo convention. -Fri Dec 12 21:56:44 2014 Kouhei Sutou <kou@cozmixng.org> +Wed Jul 6 18:59:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gems/bundled_gems: Upgrade to test-unit 3.0.8. assert_throw and - assert_nothing_thrown in test-unit 3.0.7 were broken by - UncaughtThrowError change introduced in Ruby 2.2.0 - preview2. These assertions in test-unit 3.0.8 work well with - UncaughtThrowError in Ruby 2.2.0 preview2. + * enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-15, by Maho Harada. -Fri Dec 12 19:48:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jul 6 18:34:21 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * bin/erb (ARGV.switch, ERB::Main#run): allow variables to be set - from the command line. [ruby-core:65772] [Feature #10395] + * enc/iso_8859_16.c, test/ruby/enc/test_case_comprehensive.rb: + Implement non-ASCII case conversion for ISO-8859-16, by Satoshi Kayama. -Fri Dec 12 19:31:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jul 6 14:44:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/erb.rb (ERB#lineno): accessor for line number to eval. + * lib/mkmf.rb (create_makefile): store $headers in LOCAL_HDRS for + depend files. - * lib/erb.rb (ERB#location=): setter of file name and line number. + * ext/digest/digest_conf.rb (digest_conf): add implementation + specific headers to $header. -Fri Dec 12 13:09:13 2014 Koichi Sasada <ko1@atdot.net> + * ext/digest/{md5,rmd160,sha1,sha2}/depend: add LOCAL_HDRS to the + dependencies. - * gc.c (gc_latest_gc_info): return :state field to show current - GC state (none/marking/sweeping). - [Feature #10590] +Wed Jul 6 08:59:35 2016 Shugo Maeda <shugo@ruby-lang.org> -Fri Dec 12 10:49:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/net/http/generic_request.rb (write_header): A Request-Line must + not contain CR or LF. - * string.c (rb_str_crypt): check arguments more strictly. - * crypt() is not for wide char strings - * salt bytes should not be NUL +Wed Jul 6 07:11:27 2016 Shugo Maeda <shugo@ruby-lang.org> -Fri Dec 12 08:16:01 2014 Matt Hoyle <matt@deployable.co> + * lib/net/ftp.rb (putline): raise an ArgumentError when + CR or LF is included in a line. - * io.c (io_read) Fix spelling in docco for read. [Fix GH-781] - try > tries +Tue Jul 5 20:49:30 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Thu Dec 11 19:06:01 2014 Koichi Sasada <ko1@atdot.net> + * ext/json/*, test/json/*: Update json-2.0.1. + Changes of 2.0.0: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200 + Changes of 2.0.1: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201 + [Feature #12542][ruby-dev:49706][fix GH-1395] - * class.c (class_alloc): Start from age == 2. - Class and Module objects can be living long life. +Tue Jul 5 19:39:49 2016 Naohisa Goto <ngotogenome@gmail.com> - * iseq.c: Same for ISeq objects. + * string.c (rb_str_change_terminator_length): New function to change + termlen and resize heap for the terminator. This is split from + rb_str_fill_terminator (str_fill_term) because filling terminator + and changing terminator length are different things. [Bug #12536] - * gc.c (RVALUE_AGE_RESET): added. + * internal.h: declaration for rb_str_change_terminator_length. - * gc.c (newobj_of): allow to generate (age != 0) objects. + * string.c (str_fill_term): Simplify only to zero-fill the terminator. + For non-shared strings, it assumes that (capa + termlen) bytes of + heap is allocated. This partially reverts r55557. - * gc.c (rb_copy_wb_protected_attribute): reset age for wb unprotected - objects. + * encoding.c (rb_enc_associate_index): rb_str_change_terminator_length + is used, and it should be called whenever the termlen is changed. - * include/ruby/ruby.h: add RUBY_TYPED_PROMOTED1 as an unrecommended - flag. + * string.c (str_capacity): New static function to return capacity + of a string with the given termlen, because the termlen may + sometimes be different from TERM_LEN(str) especially during + changing termlen or filling terminator with specific termlen. -Thu Dec 11 05:37:52 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + * string.c (rb_str_capacity): Use str_capacity. - * lib/prime.rb: Remove useless loop and block capture. - See [#10354] +Tue Jul 5 11:07:14 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu Dec 11 04:27:24 2014 Koichi Sasada <ko1@atdot.net> + * pack.c (pack_pack): use union instead of bare variable to ease + optimizations and avoid assigning x87 floating point number. + [ruby-core:74496] [Bug #12209] - * vm_core.h: introduce new field - rb_thread_t::local_storage_recursive_hash_for_trace to store - recursive hash to avoid creating new recursive (nested) hashes - for each trace events. - [Bug #10511] + * pack.c (pack_unpack): ditto. - * vm_trace.c (rb_threadptr_exec_event_hooks_orig): use it. +Mon Jul 4 13:56:34 2016 NARUSE, Yui <naruse@ruby-lang.org> - * cont.c: catch up this fix. + * process.c: define sig_t if not exist. + at least Solaris 10 and 11 doesn't have sig_t. - * vm.c (rb_thread_mark): ditto. +Mon Jul 4 13:08:48 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Dec 10 13:39:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * random.c (random_ulong_limited): avoid left shift count >= width of + type on 32bit environment. - * struct.c (define_aref_method, define_aset_method): use iseq - VALUE instead of rb_iseq_t to prevent from GC, as RB_GC_GUARD - makes sense only for local variables. [Feature #10575] +Sun Jul 3 18:51:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Dec 10 09:38:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_comprehensive.rb, test_regex_casefold.rb, + test/test_unicode_normalize.rb: Replace UNICODE_VERSION from + UnicodeNormalize with RbConfig::CONFIG['UNICODE_VERSION'] from + feature 12460. - * thread.c (exec_recursive): use the same last method name as - recursive_push in the error message when recursive_pop failed. - [ruby-core:66742] [Bug #10579] +Sun Jul 3 06:04:09 2016 Eric Wong <e@80x24.org> -Wed Dec 10 02:48:46 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * process.c (disable_child_handler_fork_child): simplify + [ruby-core:75781] [Misc #12439] - * test/net/http/test_https.rb - (TestNetHTTPS#test_certificate_verify_failure): on Windows, - Errno::ECONNRESET will be raised when the verify is failure at the - client side, and it'll be eaten by WEBrick. +Sun Jul 3 05:25:46 2016 Eric Wong <e@80x24.org> - * test/open-uri/test_ssl.rb (TestOpenURISSL#test_validation_failure): - ditto. + * tool/asm_parse.rb: add description + * tool/change_maker.rb: ditto + * tool/downloader.rb: ditto + * tool/eval.rb: ditto + * tool/expand-config.rb: ditto + * tool/extlibs.rb: ditto + * tool/fake.rb: ditto + * tool/file2lastrev.rb: ditto + * tool/gem-unpack.rb: ditto + * tool/gen_dummy_probes.rb: ditto + * tool/gen_ruby_tapset.rb: ditto + * tool/generic_erb.rb: ditto + * tool/id2token.rb: ditto + * tool/ifchange: ditto + * tool/insns2vm.rb: ditto + * tool/instruction.rb: ditto + * tool/jisx0208.rb: ditto + * tool/merger.rb: ditto + * tool/mkrunnable.rb: ditto + * tool/node_name.rb: ditto + * tool/parse.rb: ditto + * tool/rbinstall.rb: ditto + * tool/rbuninstall.rb: ditto + * tool/rmdirs: ditto + * tool/runruby.rb: ditto + * tool/strip-rdoc.rb: ditto + * tool/vcs.rb: ditto + * tool/vtlh.rb: ditto + * tool/ytab.sed: ditto + * tool/enc-unicode.rb: fix typo + * tool/mk_call_iseq_optimized.rb: ditto + * tool/update-deps: ditto + [ruby-core:76215] [Bug #12539] + by Noah Gibbs <the.codefolio.guy@gmail.com> -Wed Dec 10 00:42:13 2014 Eric Wong <e@80x24.org> +Sat Jul 2 18:04:24 2016 NARUSE, Yui <naruse@ruby-lang.org> - * iseq.c (rb_method_for_self_aref, rb_method_for_self_aset): - new methods to generate bytecode for struct.c - [Feature #10575] - * struct.c (rb_struct_ref, rb_struct_set): remove - (define_aref_method, define_aset_method): new functions - (setup_struct): use new functions - * test/ruby/test_struct.rb: add test for struct >10 members - * benchmark/bm_vm2_struct_big_aref_hi.rb: new benchmark - * benchmark/bm_vm2_struct_big_aref_lo.rb: ditto - * benchmark/bm_vm2_struct_big_aset.rb: ditto - * benchmark/bm_vm2_struct_small_aref.rb: ditto - * benchmark/bm_vm2_struct_small_aset.rb: ditto + * lib/uri/mailto.rb (initialize): RFC3986_Parser#split sets opaque + only if the URI has path-rootless, not path-empty. + [ruby-core:76055] [Bug #12498] + patched by Chris Heisterkamp <cheister@squareup.com> -Tue Dec 9 20:24:41 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Sat Jul 2 04:26:14 2016 NARUSE, Yui <naruse@ruby-lang.org> - * string.c: [DOC] Add missing documentation around String#chomp. - Patch by @stderr [ci skip][fix GH-780] + * regcomp.c (noname_disable_map): don't optimize out group 0 + Ruby's Regexp doesn't allow normal numbered groups if the regexp + has named groups. On such case it optimizes out related NT_ENCLOSE. + But even on the case it can use \g<0>. + This fix not to remove NT_ENCLOSE whose regnum is 0. + [ruby-core:75828] [Bug #12454] -Tue Dec 9 18:20:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Jul 2 03:09:27 2016 Naohisa Goto <ngotogenome@gmail.com> - * object.c: [DOC] Revise documentation by Marcus Stollsteimer at - [ruby-core:66368]. [Bug #10526] + * string.c: Partially reverts r55547 and r55555. + ChangeLog about the reverted changes are also deleted in this file. + [Bug #12536] [ruby-dev:49699] [ruby-dev:49702] - * #inspect: be more specific about generated string, remove - obsolete example. - * #nil?: use code examples instead of different call-seq's. - * #tap: clarify what is yielded. - * Integer(): be more specific about to_int and to_i, remove - reference to Ruby 1.8. - * Array(): fix error. - * Class: fix variable name style and indentation in example. - * improve consistency, fix typos and formatting. +Sat Jul 2 02:22:22 2016 Naohisa Goto <ngotogenome@gmail.com> + + * string.c (str_fill_term): When termlen increases, re-allocation + of memory for termlen should always be needed. + In this fix, if possible, decrease capa instead of realloc. + [Bug #12536] [ruby-dev:49699] + +Fri Jul 1 20:20:20 2016 Naohisa Goto <ngotogenome@gmail.com> -Tue Dec 9 12:48:32 2014 Josef Simanek <josef.simanek@gmail.com> + * string.c: Specify termlen as far as possible. + Additional fix for [Bug #12536] [ruby-dev:49699]. + + * string.c (str_new_static): Specify termlen from the given encoding + when creating a new String object is needed. + + * string.c (rb_tainted_str_new_with_enc): New function to create a + tainted String object with the given encoding. This means that + the termlen is correctly specified. Currently static function. + The function name might be renamed to rb_tainted_enc_str_new + or rb_enc_tainted_str_new. + + * string.c (rb_external_str_new_with_enc): Use encoding by using the + above rb_tainted_str_new_with_enc(). + +Fri Jul 1 19:38:57 2016 Naohisa Goto <ngotogenome@gmail.com> + + * test/fiddle/test_pointer.rb (test_to_str, test_to_s, test_aref_aset): + Attempt to use independent strings for destructive tests that + directly modify values on memory by using Fiddle::Pointer. + [Bug #12537] [ruby-dev:49700] + +Fri Jul 1 18:20:00 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * .gdbinit (rb_ps_thread): show the detail of cfunc in ruby level + backtrace. - * vm_eval.c (rb_eval_string_wrap): [DOC] Fix `rb_eval_string_wrap` - documentation. It is referencing `require` instead of `load`. - The former does not have the optional argument. [Fix GH-779] +Fri Jul 1 13:26:39 2016 Naohisa Goto <ngotogenome@gmail.com> -Tue Dec 9 10:16:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c (rb_str_subseq, str_substr): When RSTRING_EMBED_LEN_MAX + is used, TERM_LEN(str) should be considered with it because + embedded strings are also processed by TERM_FILL. + Additional fix for [Bug #12536] [ruby-dev:49699]. - * eval.c (rb_frame_last_func): return the most recent frame method - name. +Fri Jul 1 12:11:01 2016 NARUSE, Yui <naruse@ruby-lang.org> - * thread.c (recursive_list_access): use the last method name, - instead of the current method name which can be unset in some - cases, not to use a symbol by the invalid ID. - [ruby-core:66742] [Bug #10579] + * .gdbinit (rb_count_objects): added gdb version of count_objects(). -Sun Dec 7 19:36:12 2014 Kazuki Tsujimoto <kazuki@callcc.net> +Fri Jul 1 04:32:52 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ext/socket/basicsocket.c, ext/socket/sockssocket.c: - remove code for $SAFE=4. + * .gdbinit (rb_ps_thread): show ruby level backtrace. + Usually you can call `rb_ps` to show ruby level backtraces + for all living threads. + Note that it can call with core file like `gcore <pid>` + and `gdb ruby core.<pid>`. -Sun Dec 7 10:20:55 2014 Eric Hodel <drbrain@segment7.net> +Thu Jun 30 19:15:13 2016 Naohisa Goto <ngotogenome@gmail.com> - * lib/rdoc: Update to RDoc 4.2.0. - * test/rdoc: ditto. + * string.c: Fix memory corruptions when using UTF-16/32 strings. + [Bug #12536] [ruby-dev:49699] -Sun Dec 7 09:52:30 2014 Eric Hodel <drbrain@segment7.net> + * string.c (rb_str_new_with_class): Use TERM_LEN of the "obj". - * lib/rubygems: Update to RubyGems 2.4.5. - * test/rubygems: ditto. + * string.c (rb_str_plus, rb_str_justify): Use str_new0 which is aware + of termlen. -Sat Dec 6 10:05:08 2014 Shugo Maeda <shugo@ruby-lang.org> + * string.c (str_shared_replace): Copy +termlen bytes instead of +1. - * lib/net/imap.rb: Fix undefined variable usage & refactor/DRY - code. Patch by @aledovsky. [Fixes GH-770] + * string.c (rb_str_times): termlen should not be included in capa. - * test/net/test_imap.rb: related test. + * string.c (RESIZE_CAPA_TERM): When using RSTRING_EMBED_LEN_MAX, + termlen should be counted with it because embedded strings are + also processed by TERM_FILL. -Sat Dec 6 10:09:44 2014 Eric Wong <e@80x24.org> + * string.c (rb_str_capacity, str_shared_replace, str_buf_cat): ditto. - * thread.c (do_select): rename parameters to avoid shadowing + * string.c (rb_str_drop_bytes, rb_str_setbyte, str_byte_substr): ditto. -Sat Dec 6 09:22:45 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed Jun 29 22:24:37 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * lib/rake: Update to rake 10.4.2 - * test/rake: ditto. + * ext/psych/lib/psych_jars.rb: removed needless file required to JRuby. -Sat Dec 6 06:48:03 2014 Eric Wong <e@80x24.org> +Wed Jun 29 22:21:38 2016 Kazuki Yamaguchi <k@rhe.jp> - * compile.c (rb_iseq_build_from_ary): remove misc handling + * ext/openssl/ossl_ocsp.c: The "reuse" behavior of d2i_ functions does + not work well with OpenSSL 1.0.0t. So avoid it. -Sat Dec 6 06:14:23 2014 Vit Ondruch <vondruch@redhat.com> +Wed Jun 29 15:18:28 2016 NARUSE, Yui <naruse@ruby-lang.org> - * configure.in (RUBY_LIB_VERSION): Fix --with-ruby-version - configuration option. get rid of quoting in config.status. + * insns.def (opt_succ): optimize like r55515. (but this argument is + constant) - * template/verconf.h.tmpl: quote RUBY_LIB_VERSION here. - [ruby-core:66724] [Bug #10572] +Wed Jun 29 12:41:58 2016 Shugo Maeda <shugo@ruby-lang.org> -Sat Dec 6 04:33:52 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * test/ruby/test_refinement.rb: skip + test_prepend_after_refine_wb_miss on ARM or MIPS. + [ruby-core:76031] [Bug #12491] - * lib/pp.rb (File::Stat#pretty_print): some platforms (such as Windows) - does not have major/minor parts of device. +Wed Jun 29 08:45:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Dec 5 22:43:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * proc.c (passed_block): convert passed block symbol to proc. + based on the patch by Daisuke Sato in [ruby-dev:49695]. + [Bug #12531] - * ext/psych/lib/psych.rb: bump version to 2.0.8 - * ext/psych/psych.gemspec: ditto. - * ext/psych/psych_emitter.c: ditto. - * ext/psych/psych_parser.c: ditto. +Wed Jun 29 03:34:41 2016 NARUSE, Yui <naruse@ruby-lang.org> -Fri Dec 5 17:09:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * bignum.c (rb_big2ulong): the old logic seems to try to avoid + calculating `-(long)(num-1)-1` if `num` is not LONG_MIN. (Note that + `-LONG_MIN` may be larger than LONG_MAX) But C compilers can + optimize it into single NEG instruction. + Therefore those two conditions can be single if-body. - * ext/socket/option.c (inet_ntop): link aliased inet_ntop in - libruby on mswin not rb_w32_inet_ntop which fails to link for - unknown reason. + * bignum.c (rb_big2long): ditto. -Fri Dec 5 11:09:54 2014 Eric Wong <e@80x24.org> + * bignum.c (rb_big2ull): ditto. - * iseq.c (prepare_iseq_build): remove unused block_opt param - (rb_iseq_new_with_bopt_and_opt): remove - (rb_iseq_new_with_opt): inline removed function - (rb_iseq_new_with_bopt): remove - (iseq_load): adjust prepare_iseq_build call - [Feature #10565] + * bignum.c (rb_big2ll): ditto. -Fri Dec 5 09:46:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 28 22:55:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (parser_yylex): fix lex_state after tLABEL_END, should - be EXPR_LABELARG to be followed by "paren with arg". - [ruby-core:66705] [Feature #4935] + * lib/pstore.rb (PStore::CHECKSUM_ALGO): extract the algorithm for + checksum, instead of qualified names for each times. -Fri Dec 5 02:27:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 28 22:29:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/extmk.rb: as all extension objects including initializations - of ext and enc should be linked to libruby if enable-shared, - EXTOBJS should not be linked to main programs. - [ruby-core:66675] [Bug #10566] + * bootstraptest/runner.rb: do not use safe navigation operator. + this runner may run on older ruby. partially revert r53110 + (GH-1142 patched by @mlarraz). -Thu Dec 4 07:06:02 2014 Eric Wong <e@80x24.org> +Tue Jun 28 22:09:09 2016 Akio Tajima <artonx@yahoo.co.jp> - * compile.c (rb_iseq_build_from_exception): entry->sp is unsigned - (iseq_build_callinfo_from_hash): account for kw_arg - (iseq_build_from_ary_body): update for r35459 - (CHECK_STRING, CHECK_INTEGER): remove unused checks - (int_param): new function for checking new `params' hash - (iseq_build_kw): new function for loading rb_iseq_param_keyword - (rb_iseq_build_from_ary): account for `misc' entry and general - structure changes - [Feature #8543] - * iseq.c (CHECK_HASH): new macro (for `misc' and `param' entries) - (iseq_load): account for `misc' and `params' hashes - (iseq_data_to_ary): add final opt to arg_opt_labels, - fix kw support, account for unsigned entry->sp - * ext/-test-/iseq_load/iseq_load.c: new ext for test - * ext/-test-/iseq_load/extconf.rb: ditto - * test/-ext-/iseq_load/test_iseq_load.rb: new test + * lib/fileutils.rb: rescue Errno:EACCES for chown. + [Bug #12520] -Thu Dec 4 06:56:57 2014 Eric Wong <e@80x24.org> +Tue Jun 28 18:38:09 2016 Naohisa Goto <ngotogenome@gmail.com> - * iseq.c (iseq_free): avoid segfault on incomplete iseq - * test/ruby/test_syntax.rb (test_invalid_next): new test - for syntax error, not segfault + * ext/digest/md5/md5ossl.h: Remove excess semicolons. + Suppress warning on Solaris with Oracle Solaris Studio 12. + [ruby-dev:49692] [Bug #12524] -Thu Dec 4 04:20:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/digest/md5/md5cc.h: ditto. + * ext/digest/sha1/sha1cc.h: ditto. + * ext/digest/sha1/sha1ossl.h: ditto. + * ext/digest/sha2/sha2cc.h: ditto. + * ext/digest/sha2/sha2ossl.h: ditto. + * ext/openssl/ossl_pkey_rsa.c: ditto. - * load.c (ruby_require_internal): ignore error detail, just return - an error. +Tue Jun 28 15:56:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Dec 3 17:13:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_comprehensive.rb: noting to test if + Unicode data files are available. + [ruby-core:76160] [Bug #12433] - * encoding.c (load_encoding): use rb_require_internal instead of - calling rb_require_safe with protection. + * test/test_unicode_normalize.rb: ditto. -Wed Dec 3 16:47:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 28 15:20:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * load.c (register_init_ext, ruby_init_ext): defer running the - registered initialization function until required, not to enable - extensions which have global effects just by loading, e.g., - mathn/complex and mathn/rational. fix `make test` with - --with-static-linked-ext. + * lib/net/http.rb (Net::HTTP#proxy_uri): cache the case no proxy + is used. - * enc/encinit.c.erb (Init_enc): initialize encdb and transdb - directly. +Tue Jun 28 09:56:29 2016 Stefan Schussler <mail@stefanschuessler.de> -Wed Dec 3 14:51:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * object.c (rb_mod_eqq): [DOC] Fix typo in RDoc. [Fix GH-1393] - * load.c (ruby_require_internal): separate from rb_require_safe, - not to raise exceptions. +Tue Jun 28 02:41:32 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ruby.c (process_options): remove unnatural encoding search. + * insns.def (opt_plus): use `- 1` instead of `& (~1)` to allow + compilers to use x86 LEA instruction (3 operand). + Even if 3 operand LEA's latency is 3 cycle after SandyBridge, + it reduces code size and can be faster because of super scalar. -Wed Dec 3 14:34:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * insns.def (opt_plus): calculate and use rb_int2big. + On positive Fixnum overflow, `recv - 1 + obj` doesn't carry + because recv's msb and obj's msb are 0, and resulted msb is 1. + Therefore simply rshift and cast as signed long works fine. + On negative Fixnum overflow, it will carry because both arguments' + msb are 1, and resulted msb is also 1. + In this case it needs to restore carried sign bit after rshift. - * string.c (setup_fake_str): fake string does not share another - string, but just should not free. +Mon Jun 27 16:58:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Dec 3 11:14:14 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * lib/fileutils.rb (FileUtils#install): accecpt symbolic mode, as + well as chmod. - * win32/win32.c (w32_spawn): `v2` is used not only for `shell` but also - `cmd`, so must not free before using `cmd`. - [ruby-core:66648] [Bug #10563] + * lib/fileutils.rb (FileUtils#install): add owner and group + options. -Wed Dec 3 09:48:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Jun 27 08:56:55 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/racc/cparse/cparse.c (cparse_params_type): use typed data. + * compile.c (ADD_TRACE): ignore trace instruction on non-positive + line. -Tue Dec 2 21:33:56 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * parse.y (coverage): get rid of ArgumentError when the starting + line number is not positive. [ruby-core:76141] [Bug #12517] - * ext/win32ole/win32ole.c: use typed data for com_hash. +Sun Jun 26 10:20:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Dec 2 15:30:30 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * ext/win32/lib/Win32API.rb (Win32API#initialize): Cygwin + 2.5.2-1 (perhaps) seems to no longer append ".dll" suffix + implicitly. - * array.c (rb_ary_plus): in documentation, added note about - inefficiency of repeated += operations. + * ext/win32/lib/win32/resolv.rb (Win32::Resolv): ditto. Fix the + error reported by yamataka AT u08.itscom.net in + [ruby-list:50339], and pointed out and patched by cerberus AT + m3.kcn.ne.jp in [ruby-list:50341]. -Tue Dec 2 07:20:21 2014 Eric Wong <e@80x24.org> +Sat Jun 25 10:07:52 2016 Kazuki Yamaguchi <k@rhe.jp> - * iseq.c (iseq_data_to_ary): keep hidden variables - Thanks to wanabe [ruby-core:66566] + * test/openssl/test_ocsp.rb: Ignore errors caused by bugs that exist in + LibreSSL >= 2.3.1. -Tue Dec 2 06:46:57 2014 Aaron Patterson <aaron@tenderlovemaking.com> +Sat Jun 25 02:33:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/psych/lib/psych.rb: bumping version + * vm_method.c (vm_respond_to): try method_missing if respond_to? + is undefined, as if it is the default definition. + [ruby-core:75377] [Bug #12353] - * ext/psych/psych.gemspec: ditto +Fri Jun 24 17:04:21 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Tue Dec 2 06:34:08 2014 Aaron Patterson <aaron@tenderlovemaking.com> + * ext/psych/*, test/psych/*: Update psych 2.1.0 + This version fixed [Bug #11988][ruby-core:72850] - * ext/psych/lib/psych/visitors/to_ruby.rb: support objects that are - marshalable, but inherit from basic object. - Thanks Sean Griffin <sean@thoughtbot.com> +Fri Jun 24 13:12:41 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto + * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: + Update rubygems 2.6.5 and 2.6.6. + Release note of 2.6.5: https://github.com/rubygems/rubygems/commit/656f5d94dc888d78d0d00f3598a4fa37391aac80 + Release note of 2.6.6: https://github.com/rubygems/rubygems/commit/ccb9c3300c063f5b5656669972d24a10ef8afbf5 - * test/psych/test_marshalable.rb: test for fix +Fri Jun 24 09:17:15 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Dec 2 06:32:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * common.mk (lib/unicode_normalize/tables.rb): should not depend + on Unicode data files unless ALWAYS_UPDATE_UNICODE=yes, to get + rid of downloading Unicode data unnecessary. [ruby-dev:49681] - * parse.y (ripper_flush_string_content): preserve the dispatched - results at tSTRING_CONTENT. [ruby-dev:48714] [Bug #10437] + * common.mk (enc/unicode/casefold.h): update Unicode files in a + sub-make, not to let the header depend on the files always. - * parse.y (regexp_contents): check in ripper only if the whole - content is a single regexp without interpolation. - [ruby-dev:48714] [Bug #10437] + * enc/unicode/case-folding.rb: if gperf is not usable, assume the + existing file is OK. -Tue Dec 2 06:30:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 21 19:44:54 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * re.c (rb_reg_region_copy): new function to try with GC if copy - failed and return the error. + * test/ruby/enc/test_regex_casefold.rb: Add Windows-1251, KOI8-R, and + KOI8-U to encodings; definitely removed EUC-JP. -Tue Dec 2 04:43:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 21 19:32:23 2016 Mark St.Godard <markstgodard@gmail.com> - * re.c (CHECK_REGION_COPIED): onig_region_copy() can fail when - memory exhausted but returns nothing, so check by if allocated. + * lib/webrick/httprequest.rb (setup_forwarded_info): Use the first + value in X-Forwarded-Proto, if header contains multiple comma + separated values. Some middlewares may add these values to the + list, not replacing. [Fix GH-1386] -Tue Dec 2 02:53:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 21 17:17:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * parse.y (magic_comment_encoding): enable in ripper, since the - encoding is necessary to parse non-default encoding scripts. + * test/ruby/test_io.rb: Skip test_readpartial_with_not_empty_buffer, + test_read_buffer_error, test_read_unlocktmp_ensure, + test_readpartial_unlocktmp_ensure, and + test_sysread_unlocktmp_ensure on cygwin, + because these tests repeatedly hang. This makes test_io.rb + complete in finite time on cygwin. -Tue Dec 2 02:30:25 2014 NARUSE, Yui <naruse@ruby-lang.org> + * ChangeLog: Fix test_in.rb -> test_io.rb (two instances). - * lib/uri/generic.rb (URI::Generic.build): - use hostname= to detect and wrap IPv6 hosts. - Build is accepting URI components and users may not expect - that a host component needs to be wrapped with square brackets - since it's not providing a URI. - Note: initialize with arg_check => true does not wrap IPv6 hosts. - by Joe Rafaniello <jrafanie@redhat.com> - https://github.com/ruby/ruby/pull/765 fix GH-765 +Tue Jun 21 16:38:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/uri/test_generic.rb: Add more tests + * string.c (rb_str_casemap): do not put code with side effects + inside RSTRING_PTR() macro which evaluates the argument multiple + times. -Mon Dec 1 20:01:12 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Tue Jun 21 16:13:45 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ext/win32ole/win32ole.c: use typed data for WIN32OLE. - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_event.c: ditto. + * string.c (rb_str_casemap): fix memory leak. -Mon Dec 1 17:20:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 21 16:12:21 2016 NARUSE, Yui <naruse@ruby-lang.org> - * win32/Makefile.sub (verconf.h): so depends on verconf.mk, which - is rebuilt by setup.mak. + * string.c (rb_str_casemap): int is too small for string size. -Mon Dec 1 11:05:46 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Tue Jun 21 15:42:22 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * proc.c: fix grammar by @BenMorganIO [fix GH-764][ci skip] + * test/ruby/test_io.rb: Skip test_read_buffer_error on cygwin, + because this test repeatedly hangs. -Mon Dec 1 10:49:53 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Tue Jun 21 15:35:14 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * man/rake.1: Update latest man content by @aledovsky - [fix GH-771][ci skip] + * LEGAL: Added filenames and copyrights for some files in + enc/trans/JIS. -Mon Dec 1 10:42:31 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Tue Jun 21 00:56:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * doc/syntax/refinements.rdoc: refinements are no longer experimental. - patch by @gaurish [fix GH-775][ci skip] + * win32/win32.c (get_special_folder): fix calling convention of + SHGetPathFromIDListEx, which should be WINAPI. pointed out by + @arton at http://twitter.com/arton/status/744884064277016576 -Sun Nov 30 20:05:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 21 00:22:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (regexp_contents): fix a typo. pointed out by wanabe. - [ruby-dev:48741] [Bug #10543] + * configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX): + include setjmpex.h only when using setjmpex() for RUBY_SETJMP. + the header of mingw32 overrides setjmp() by setjmpex(). -Sun Nov 30 18:55:32 2014 Tanaka Akira <akr@fsij.org> +Mon Jun 20 18:39:16 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): - Don't raise Interrupt. + * test/ruby/test_io.rb: Skip test_open_fifo_does_not_block_other_threads + on cygwin. Fifos seem to work okay in cygwin, but this test repeatedly + hangs. -Sun Nov 30 17:11:05 2014 Tanaka Akira <akr@fsij.org> +Mon Jun 20 13:35:06 2016 Shugo Maeda <shugo@ruby-lang.org> - * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use - assert_separately. + * vm.c (invoke_bmethod, invoke_block_from_c_0): revert r52104 + partially to avoid "self has wrong type to call super in this + context" errors. + [ruby-core:72724] [Bug #11954] -Sun Nov 30 00:02:52 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Jun 20 12:53:38 2016 Kazuki Yamaguchi <k@rhe.jp> - * ruby.c (process_options, ruby_script): transcode script name and - program name to locale encoding as well as argv. - [ruby-dev:48752] [Bug #10555] + * test/rubygems/test_gem_remote_fetcher.rb: OpenSSL::PKey::DH#priv_key= + is not defined when ext/openssl is built with OpenSSL 1.1.0. + https://github.com/rubygems/rubygems/pull/1648 + [ruby-core:75225] [Feature #12324] - * ruby.c (translit_char_bin): should not use code page dependent - CharNext on UTF-8 string. [ruby-dev:48752] [Bug #10555] +Sun Jun 19 21:25:43 2016 Kazuki Yamaguchi <k@rhe.jp> -Sat Nov 29 16:53:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_ocsp.c: Add OCSP::SingleResponse that represents an + OCSP SingleResponse structure. Also add two new methods #responses + and #find_response to OCSP::BasicResponse. A BasicResponse has one or + more SingleResponse. We have OCSP::BasicResponse#status that returns + them as an array of arrays, each containing the content of a + SingleResponse, but this is not useful. When validating an OCSP + response, we need to look into the each SingleResponse and check their + validity but it is not simple. For example, when validating for a + certificate 'cert', the code would be like: - * ruby.c (ruby_set_argv): convert argv from UTF-8. + # certid_target is an OpenSSL::OCSP::CertificateId for cert + basic = res.basic + result = basic.status.any? do |ary| + ary[0].cmp(certid_target) && + ary[4] <= Time.now && (!ary[5] || Time.now <= ary[5]) + end - * win32/win32.c (rb_w32_sysinit, cmdglob, w32_cmdvector): convert - wide char command line to UTF-8 argv, and glob in UTF-8 so that - metacharacters would match multibyte characters. - [ruby-dev:48752] [Bug #10555] + Adding OCSP::SingleResponse at the same time allows exposing + OCSP_check_validity(). With this, the code above can be rewritten as: -Sat Nov 29 10:49:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + basic = res.basic + single = basic.find_response(certid_target) + result = single.check_validity - * win32/win32.c (win32_direct_conv, rb_w32_readdir): convert UTF-8 - and filesystem code page by using Win32 API directly. + * test/openssl/test_ocsp.rb: Test this. -Sat Nov 29 09:37:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 19 18:40:19 2016 Kazuki Yamaguchi <k@rhe.jp> - * error.c (syserr_initialize): simplify message building and get - rid of potential invalid byte sequence. + * ext/openssl/ossl_ocsp.c (ossl_ocspbres_add_status): Allow specifying + the times (thisUpdate, nextUpdate and revocationTime) with Time + objects. Currently they accepts only relative seconds from the current + time. This is inconvenience, especially for revocationTime. When + Integer is passed, they are still treated as relative times. Since the + type check is currently done with rb_Integer(), this is a slightly + incompatible change. Hope no one passes a relative time as String or + Time object... + Also, allow passing nil as nextUpdate. It is optional. -Sat Nov 29 06:09:44 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * ext/openssl/ruby_missing.h: Define RB_INTEGER_TYPE_P() if not defined. + openssl gem will be released before Ruby 2.4.0. - * eval_error.c (error_print): respect the encoding of the message. +Sun Jun 19 18:39:38 2016 Kazuki Yamaguchi <k@rhe.jp> - * io.c (rb_write_error_str): use rb_w32_write_console() on Windows - if stderr is a tty. + * ext/openssl/ossl_ocsp.c: Implement OCSP::{CertificateId,Request, + BasicResponse,Response}#initialize_copy. + [ruby-core:75504] [Bug #12381] -Fri Nov 28 05:10:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/openssl/test_ocsp.rb: Test them. - * configure.in (--with-setup): add option to select ext/Setup file. +Sun Jun 19 18:29:50 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri Nov 28 05:02:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_pkey_dh.c, ext/openssl/ossl_pkey_dsa.c, + ext/openssl/ossl_pkey_ec.c, ext/openssl/ossl_pkey_rsa.c: Implement + initialize_copy method for OpenSSL::PKey::*. + [ruby-core:75504] [Bug #12381] - * dmyenc.c (Init_enc): separate from dmyext.c for statically - linked extension excluding encoding libraries. + * test/openssl/test_pkey_dh.rb, test/openssl/test_pkey_dsa.rb, + test/openssl/test_pkey_ec.rb, test/openssl/test_pkey_rsa.rb: Test they + actually copy the OpenSSL objects, and modifications to cloned object + don't affect the original object. -Thu Nov 27 21:58:30 2014 Tanaka Akira <akr@fsij.org> +Sun Jun 19 16:55:16 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * common.mk (miniprelude.c): It does not depend on prelude.rb now. + * test/ruby/test_dir_m17n.rb: Skip tests with non-UTF-8 encodings + on cygwin. Cygwin can use the Unicode PUA (private use area) to store + bytes from non-UTF-8 filenames (see + https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-specialchars), + but we are not supporting this. [Bug #12443] -Thu Nov 27 21:49:49 2014 Tanaka Akira <akr@fsij.org> +Sun Jun 19 15:01:18 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * tool/update-deps: List up files built always in the source directory - and source files built always in the build directory. + * localeinit.c: Fix filesystem encoding for cygwin to UTF-8 (see + https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-unusual) -Thu Nov 27 21:24:55 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> +Sun Jun 19 14:31:07 2016 Kazuki Yamaguchi <k@rhe.jp> - * NEWS: add obsolete callcc. + * ext/openssl/ossl_pkey.h, ext/openssl/ossl_pkey_dh.c, + ext/openssl/ossl_pkey_dsa.c, ext/openssl/ossl_pkey_rsa.c: A few days + ago, OpenSSL changed {DH,DSA,RSA}_get0_*() to take const BIGNUM **. + https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=fd809cfdbd6e32b6b67b68c59f6d55fbed7a9327 + [ruby-core:75225] [Feature #12324] -Thu Nov 27 19:59:49 2014 Koichi Sasada <ko1@atdot.net> +Sun Jun 19 11:19:43 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * compile.c (iseq_compile_each): remove duplicated line event. - [Bug #10449] + * variable.c (rb_path_to_class): consider the string length + instead of a terminator. - * test/ruby/test_settracefunc.rb: add and fix tests. + * variable.c (rb_path_to_class): search the constant at once + instead of checking if defined and then getting it. -Thu Nov 27 19:04:50 2014 Koichi Sasada <ko1@atdot.net> +Sat Jun 18 14:01:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_args.c: fix backtrace location for keyword related exceptions. + * test/rubygems/test_gem_installer.rb: Fixed broken test with extension + build. https://github.com/rubygems/rubygems/pull/1645 - For example, the following program - def foo(k1: 1); end # line 1 - foo(k2: 2) # line 2 - causes "unknown keyword: k2 (ArgumentError)". +Sat Jun 18 13:59:54 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - Before this patch, the backtrace location is only line 2. - However, error should be located at line 1 (over line 2 in - stack trace). This patch fix this problem. + * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems + HEAD(2c6d256). It contains to update vendored Molinillo to 0.5.0. + https://github.com/rubygems/rubygems/pull/1638 - * class.c (rb_keyword_error_new): separate exception creation logic - from rb_keyword_error(), to use in vm_args.c. +Sat Jun 18 10:13:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_insnhelper.c (rb_arg_error_new): rename to rb_arity_error_new(). + * common.mk (build-ext), ext/extmk.rb: use variable EXTENCS + different than ENCOBJS, to get rid of circular dependency. + build libencs when linking encodings statically. + [ruby-core:75618] [Bug #12401] - * vm_args.c (argument_arity_error): rename to argument_arity_error(). +Sat Jun 18 08:52:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_args.c (argument_kw_error): added to fix backtrace. + * ext/stringio/stringio.c (strio_getline): fix pointer index + overflow. reported by Guido Vranken <guido AT guidovranken.nl>. - * test/ruby/test_keyword.rb: add tests. +Thu Jun 16 16:35:35 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Nov 27 17:31:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * class.c (Init_class_hierarchy): prevent rb_cObject which is the + class tree root, from GC. [ruby-dev:49666] [Bug #12492] - * common.mk (prelude.c): no longer depends on miniruby, since not - depending on rbconfig.rb. +Thu Jun 16 12:17:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Nov 27 17:12:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c (tr_trans): adjust buffer size by processed and rest + lengths, instead of doubling repeatedly. - * common.mk (miniprelude.c): miniruby needs no preludes. +Thu Jun 16 11:15:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Nov 27 17:10:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c (tr_trans): consider terminator length and fix heap + overflow. reported by Guido Vranken <guido AT guidovranken.nl>. - * template/prelude.c.tmpl: no code if no prelude code is given. +Thu Jun 16 00:02:32 2016 Kazuki Yamaguchi <k@rhe.jp> -Thu Nov 27 13:11:00 2014 Koichi Sasada <ko1@atdot.net> + * ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify, ossl_ocspbres_verify): + Use ossl_clear_error() so that they don't print warnings to stderr and + leak errors in the OpenSSL error queue. Also, check the return value + of OCSP_*_verify() correctly. They can return -1 on verification + failure. - * gc.c (objspace_malloc_increase): enable lazy sweep on GC by malloc() - (malloc_increase) to make GC incrementally. +Wed Jun 15 19:52:23 2016 Kazuki Yamaguchi <k@rhe.jp> - This change can increase memory consumption. Report us if you find - any problem. + * ext/openssl/ossl_ocsp.c (ossl_ocspreq_sign, ossl_ocspbres_sign): Allow + specifying hash algorithm used in signing. They are hard coded to use + SHA-1. + Based on a patch provided by Tim Shirley <tidoublemy@gmail.com>. + [ruby-core:70915] [Feature #11552] [GH ruby/openssl#28] -Thu Nov 27 12:46:38 2014 Tanaka Akira <akr@fsij.org> + * test/openssl/test_ocsp.rb: Test sign-verify works. - * time.c (time_s_mkutc): [DOC] Time.utc's 10 arguments form - doesn't examine wday, yday, isdst and tz. - (time_s_mktime): [DOC] Time.mktime's 10 arguments form - doesn't examine wday, yday and tz. - Suggested by naruse. +Wed Jun 15 01:46:16 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Nov 27 11:45:33 2014 Eric Wong <e@80x24.org> + * numeric.c: [DOC] fix rdoc directive, and an example of negative + value. [ruby-core:76025] [Bug #12487] - * iseq.c (iseq_data_to_ary): add missing GC guard +Wed Jun 15 01:44:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Nov 27 10:51:59 2014 Koichi Sasada <ko1@atdot.net> + * tool/mkconfig.rb: provide Unicode Version information as + RbConfig::CONFIG['UNICODE_VERSION']. + [ruby-core:75845] [Feature #12460] - * vm_core.h: add rb_thread_t::local_storage_recursive_hash - to speed up Thread#[:__recursive_key__] access. - [Bug #10511] +Wed Jun 15 00:01:18 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - * thread.c (threadptr_local_aref): add fast path for - :__recursive_data__. + * test/ruby/enc/test_case_comprehensive.rb + (TestComprehensiveCaseFold::read_data): use \A and \z instead of + ^ and $ in regexp. - * thread.c (threadptr_recursive_hash, threadptr_recursive_hash_set): - add special accessor for recursive hash. +Tue Jun 14 23:43:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * cont.c: store/restore local_storage_recursive_hash. + * include/ruby/backward.h (rb_cFixnum, rb_cBignum): remove the + backward compatibility macros, to fail incompatible extension + libraries early. [Bug #12427] - * vm.c: init and mark local_storage_recursive_hash. +Tue Jun 14 22:22:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_trace.c (rb_threadptr_exec_event_hooks_orig): clear and restore - local_storage_recursive_hash directly. + * strftime.c (rb_strftime_with_timespec): limit the result string + size by the format length, to get rid of unlimited memory use. -Thu Nov 27 07:11:00 2014 Eric Wong <e@80x24.org> +Tue Jun 14 22:11:11 2016 Kazuki Yamaguchi <k@rhe.jp> - * compile.c (iseq_calc_param_size): hoist out of iseq_set_arguments + * ext/openssl/ossl_ocsp.c (ossl_ocspcid_get_issuer_name_hash, + ossl_ocspcid_get_issuer_key_hash, ossl_ocspcid_get_hash_algorithm): + Add accessor methods OCSP::CertificateId#issuer_name_hash, + #issuer_key_hash, #hash_algorithm. + Based on a patch provided by Paul Kehrer <paul.l.kehrer@gmail.com>. + [ruby-core:48062] [Feature #7181] -Wed Nov 26 22:28:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/openssl/test_ocsp.rb: Test these new methods. - * include/ruby/ruby.h (rb_get_kwargs, rb_extract_keywords): export - keyword argument functions. +Tue Jun 14 22:07:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Nov 26 21:18:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/date/date_strftime.c (date_strftime_with_tmx): reject too + large precision to get rid of buffer overflow. + reported by Guido Vranken <guido AT guidovranken.nl>. - * test/inlinetest.rb: removed unused test helper. +Tue Jun 14 21:40:42 2016 Kazuki Yamaguchi <k@rhe.jp> -Wed Nov 26 20:47:28 2014 Masaya Tarui <tarui@ruby-lang.org> + * ext/openssl/ossl_ocsp.c (ossl_ocspbres_to_der, ossl_ocspcid_to_der): + Implement #to_der methods for OCSP::BasicResponse and + OCSP::CertificateId. - * ext/continuation/continuation.c (Init_continuation): obsolete callcc. - first step of [Feature #10548]. + (ossl_ocspreq_initialize, ossl_ocspres_initialize): Use GetOCSP*() + instead of raw DATA_PTR(). -Wed Nov 26 19:57:54 2014 Koichi Sasada <ko1@atdot.net> + (ossl_ocspbres_initialize, ossl_ocspcid_initialize): Allow + initializing from DER string. - * test/ruby/test_gc.rb (test_latest_gc_info): do test separately - to avoid mysterious behavior. + (Init_ossl_ocsp): Define new #to_der methods. -Wed Nov 26 19:54:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/openssl/test_ocsp.rb: Test these changes. Also add missing tests + for OCSP::{Response,Request}#to_der. - * win32/win32.c (constat_reset): do nothing on non-standard - console emulators. [ruby-core:66471] [Bug #10546] +Tue Jun 14 21:35:00 2016 Kazuki Yamaguchi <k@rhe.jp> -Wed Nov 26 19:44:13 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/openssl_missing.h (DH_set0_pqg, RSA_set0_key): + DH_set0_pqg() allows 'q' to be NULL. Fix a typo in RSA_set0_key(). + Fixes r55285. [ruby-core:75225] [Feature #12324] - * lib/tsort.rb: Returns an enumerator if no block is given. - [ruby-core:66270] [Feature #10508] Proposed by Andrey Savchenko. +Mon Jun 14 10:19:00 2016 Kenta Murata <mrkn@mrkn.jp> -Wed Nov 26 17:25:45 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * NEWS: describe Integer#digits. - * parse.y (f_label, f_kw, formal_argument_gen): ignore invalid - formal argument in keyword argument definition. - [ruby-dev:48742] [Bug #10545] +Mon Jun 13 21:09:40 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Nov 26 15:32:06 2014 Koichi Sasada <ko1@atdot.net> + * thread.c (debug_deadlock_check): show thread lock dependency and + backtrace [Feature #8214] [ruby-dev:47217] - * compile.c (iseq_set_sequence): use "nop" insn instead of - "jump to next insn". - https://bugs.ruby-lang.org/issues/8543#change-50085 + * thread.c (thread_status_name): show "sleep_forever" instead of + "sleep" if called from inspect. -Wed Nov 26 11:01:35 2014 Eric Wong <e@80x24.org> +Mon Jun 13 20:50:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * iseq.c (iseq_s_compile_file): close IO when done + * parse.y (reg_named_capture_assign_iter): remove named capture + conflict warnings. it is just annoying rather than useful. + [ruby-core:75416] [Bug #12359] -Wed Nov 26 06:06:23 2014 Tanaka Akira <akr@fsij.org> +Mon Jun 13 20:04:00 2016 Kenta Murata <mrkn@mrkn.jp> - * common.mk: encdb.h and transdb.h depends on $(PREP). - So prebuild files for them in tarball are useless. + * numeric.c (rb_int_digits, rb_fix_digits, rb_int_digits_bigbase): + Add Integer#digits to extract columns in place-value notation + [Feature #12447] [ruby-core:75799] -Wed Nov 26 02:08:44 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/test_integer.rb: Add tests for the above change. - * tool/make-snapshot: Don't generate enc/trans/newline.c in tarball. + * test/ruby/test_bignum.rb: ditto. -Wed Nov 26 00:41:44 2014 Tanaka Akira <akr@fsij.org> +Mon Jun 13 20:34:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * common.mk (prereq): Don't depends on prelude.c and golf_prelude.c. - Since they depend on $(PREP) which is miniruby, they are rebuilt - after miniruby is built, even if tarball contains them. + * include/ruby/ruby.h (RUBY_INTEGER_UNIFICATION): macro to tell if + Integer is integrated. [ruby-core:75718][Bug #12427] -Wed Nov 26 00:20:48 2014 Tanaka Akira <akr@fsij.org> + * include/ruby/backward.h, internal.h (rb_cFixnum, rb_cBignum): + fallback to rb_cInteger. - * template/prelude.c.tmpl: Don't expand RbConfig::Config[...]. - It is not used now. + * bignum.c, numeric.c, ext/json/generator/generator.{c,h}: use the + macro. - * common.mk: prelude.c and golf_prelude.c doesn't depend on rbconfig. +Mon Jun 13 16:58:53 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Nov 25 17:07:06 2014 Koichi Sasada <ko1@atdot.net> + * test/ruby/enc/test_case_comprehensive.rb: Add tests for full Unicode + swapcase. - * NEWS: add an "Implementation changes" section. +Sun Jun 12 14:48:00 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Nov 25 16:09:28 2014 Eric Hodel <drbrain@segment7.net> + * test/ruby/enc/test_case_comprehensive.rb: Add tests for ASCII-only + swapcase; store calculated values in hashes. - * lib/net/http.rb: Do not attempt SSL session resumption when the - session is expired. [Bug #10533] +Sun Jun 12 14:05:45 2016 Kazuki Yamaguchi <k@rhe.jp> -Tue Nov 25 15:59:46 2014 Eric Hodel <drbrain@segment7.net> + * ext/openssl/ossl_cipher.c (ossl_cipher_get_auth_tag, + ossl_cipher_set_auth_tag): Check if the cipher flags retrieved by + EVP_CIPHER_CTX_flags() includes EVP_CIPH_FLAG_AEAD_CIPHER to see if + the cipher supports AEAD. AES-GCM was the only supported in OpenSSL + 1.0.1. - * lib/rake: Update to rake 10.4.0 - * test/rake: ditto. - * NEWS: ditto. + (Init_ossl_cipher): Fix doc; OpenSSL::Cipher::AES.new(128, :GCM) can't + work. - * test/lib/minitest/unit.rb: Add compatibility shim for minitest 5. - This only provides minitest 5 unit test naming compatibility. + * ext/openssl/openssl_missing.h: Define EVP_CTRL_AEAD_{GET,SET}_TAG if + missing. They are added in OpenSSL 1.1.0, and have the same value as + EVP_CTRL_GCM_{GET,SET}_TAG and EVP_CTRL_CCM_{GET,SET}_TAG. -Tue Nov 25 15:26:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 12 13:47:42 2016 Kazuki Yamaguchi <k@rhe.jp> - * tool/vcs.rb (get_revisions): use Time.new instead of Time.mktime - which does not accept UTC offset, and offset manually for older - versions than 1.9. + * test/openssl/test_engine.rb (test_openssl_engine_builtin, + test_openssl_engine_by_id_string): Skip test if 'openssl' engine is + already loaded. And test the number increased by Engine.load{_by_id,}, + not the total count of loaded engines. Previously, we called + OpenSSL::Engine.cleanup every time running a test case, but we no + longer can do it. + [ruby-core:75225] [Feature #12324] -Tue Nov 25 12:14:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 12 09:24:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * process.c (Init_process): initialize static IDs before constant - definitions. [ruby-core:66445] + * file.c (append_fspath): normalize directory name to be appended + on OS X. [ruby-core:75957] [Ruby trunk Bug#12483] + https://github.com/rails/rails/issues/25303#issuecomment-224834804 -Tue Nov 25 10:32:23 2014 Eric Wong <e@80x24.org> +Sat Jun 11 23:07:32 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * compile.c (iseq_build_callinfo_from_hash): hoist out - (iseq_build_from_ary_body): shorten callinfo case + * lib/forwardable.rb (_delegator_method): get rid of a warning which + causes test failures introduced at r55376. -Mon Nov 24 23:03:21 2014 Kouhei Sutou <kou@cozmixng.org> +Sat Jun 11 18:37:58 2016 Marcus Stollsteimer <sto.mar@web.de> - * gems/bundled_gems: Update to test-unit 3.0.7. + * ext/json/lib/*.rb: Removed some comments. Because these are unnecessary + class description. [ci skip][Bug #12255][ruby-core:74835] -Mon Nov 24 12:44:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Jun 11 15:19:38 2016 takiy33 <takiy33@users.noreply.github.com> - * process.c (check_exec_redirect_fd, check_exec_redirect), - (rb_execarg_addopt): get rid of inadvertent ID pindown. + * lib/net/smtp.rb: [DOC] Remove dead link on documentation for + Japanese of SMTP. [Fix GH-1380] -Mon Nov 24 02:03:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Jun 11 15:02:45 2016 Grant Hutchins <github@nertzy.com> - * string.c (rb_str_setter): preserve encoding of global variable - name in error message. + * string.c (rb_str_oct): [DOC] fix typo, hornored -> honored. + [Fix GH-1379] -Mon Nov 24 02:03:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Jun 11 14:04:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * iseq.c (rb_insn_operand_intern): preserve encoding of method - name in CALL_INFO at disassembling. + * ext/objspace/objspace_dump.c: generate valid JSON for dump_all. -Mon Nov 24 02:02:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Jun 11 13:52:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * io.c (must_respond_to): preserve encodings of variable name and - class name in warning message. + * lib/forwardable.rb (_delegator_method): remove __send__ call if + possible, so that more optimizations will be enabled. -Sun Nov 23 10:46:23 2014 Eric Wong <e@80x24.org> +Sat Jun 11 11:24:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * internal.h (struct rb_execarg): 160 => 144 bytes on x86-64 - * ruby.c (struct load_file_arg): 48 => 40 bytes on x86-64 - * vm_args.c (struct args_info): ditto + * enc/iso_8859.h (SHARP_s): name frequently used codepoint. -Sun Nov 23 07:46:54 2014 Andy Maloney <asmaloney@gmail.com> +Sat Jun 11 09:58:45 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * io.c (rb_io_sysread): Remove redundant assignment of 'n'. - [Fix GH-767] + * enc/iso_8859_1.c: Revert to older version of code. -Sat Nov 22 09:48:33 2014 Tanaka Akira <akr@fsij.org> +Sat Jun 11 09:46:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * tool/make-snapshot: Specify PWD macro for make. - PWD environment variable may not exist. + * enc/iso_8859_1.c: Implement non-ASCII case mapping. -Fri Nov 21 11:58:58 2014 Aaron Patterson <aaron@tenderlovemaking.com> + * test/ruby/enc/test_case_comprehensive.rb: Tests for above. - * lib/resolv.rb: fall back if canonicalization fails. - Thanks Vit Ondruch for the patch! [ruby-core:65836] + * string.c: Add iso-8859-1 to supported encodings. - * test/resolv/test_dns.rb: test for patch +Sat Jun 11 09:31:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Nov 22 01:11:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/forwardable.rb (_delegator_method): leave the backtrace + untouched during accessor. forwardable.rb does not appear in + the backtrace during delegated method because of tail-call + optimization. - * object.c (rb_mod_const_get, rb_mod_const_defined): ditto. +Sat Jun 11 01:38:31 2016 Naohisa Goto <ngotogenome@gmail.com> - * variable.c (rb_const_missing, rb_mod_const_missing): call - const_missing without new ID to get rid of inadvertent ID - creation. + * include/ruby/defines.h (GCC_VERSION_SINCE): Fix logic error by + adding parentheses. Fix failures of TestMkmf::TestConvertible + with GCC 3.4.3 on Solaris 10. [Bug #12479] [ruby-dev:49660] -Fri Nov 21 19:32:57 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Jun 10 21:54:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir. + * lib/forwardable.rb (Forwardable._delegator_method): extract + method generator and deal with non-module objects. + [ruby-dev:49656] [Bug #12478] - * common.mk (ext/ripper/ripper.c): use $(PWD) for Unix, - $(MAKEDIR) for Windows. +Fri Jun 10 17:35:11 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Fri Nov 21 18:12:37 2014 Tanaka Akira <akr@fsij.org> + * string.c: Special-case :ascii option in rb_str_capitalize_bang and + rb_str_swapcase_bang. - * tool/update-deps: Refactored. +Fri Jun 10 17:12:24 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Fri Nov 21 14:25:40 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * string.c: Special-case :ascii option in rb_str_upcase_bang (retry). - * win32/Makefile.sub (top_srcdir): added because lacking this macro - causes build error at r48526. +Fri Jun 10 14:48:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Nov 21 12:00:58 2014 Tanaka Akira <akr@fsij.org> + * hash.c (get_env_cstr): ensure NUL-terminated. + [ruby-dev:49655] [Bug #12475] - * tool/update-deps (in_makefile): Use FILES_NEED_VPATH and - FILES_CONFUSING. + * string.c (rb_str_fill_terminator): return the pointer to the + NUL-terminated content. - * ext/objspace/extconf.rb: Add VPATH for id.h +Thu Jun 9 21:42:00 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri Nov 21 09:10:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_asn1.c (asn1integer_to_num): Use + ASN1_ENUMERATED_to_BN() to convert an ASN1_ENUMERATED to a BN. + Starting from OpenSSL 1.1.0, ASN1_INTEGER_to_BN() rejects + non-ASN1_INTEGER objects. The format of INTEGER and ENUMERATED are + almost identical so they behaved in the same way in OpenSSL <= 1.0.2. + [ruby-core:75225] [Feature #12324] - * common.mk (ext/ripper/ripper.c): fix dependencies for the case - to make ripper.y and id.h under the build directory. + * test/openssl/test_asn1.rb (test_decode_enumerated): Test that it + works. -Fri Nov 21 08:42:21 2014 NARUSE, Yui <naruse@ruby-lang.org> +Thu Jun 9 21:10:04 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - * common.mk (ext/ripper/ripper.c): id.h in VPATH may exist in the build + * tool/ifchange: fix timestamp error when target without directory. - * common.mk (ext/ripper/ripper.c): $(RM) was not defined. - -Fri Nov 21 00:36:09 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * ext/openssl/lib/openssl/x509.rb - (OpenSSL::X509::Name::RFC2253DN::StringChar): get rid of a false - positive assertion in ripper's test. - -Fri Nov 21 00:29:51 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * lib/net/imap.rb (Net::IMAP::ResponseParser::BEG_REGEXP): no need to - use embed string. - -Fri Nov 21 00:19:17 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * lib/uri/mailto.rb (URI::MailTo::EMAIL_REGEXP): should escape `#`. - -Thu Nov 20 23:17:11 2014 Tanaka Akira <akr@fsij.org> - - * tool/update-deps: Insert all dependencies found by compiler. - -Thu Nov 20 15:51:01 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * ext/nkf/depend (nkf.o): add nkf.c as dependency. - bsdmake tries to make nkf.o with nkf-utf8/nkf.c without this. - -Thu Nov 20 08:54:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (struct parser_params): reduce size by reordering - members and an unused member. - -Thu Nov 20 02:44:27 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Vector#independent? and associated class method - patch by gogo tanaka [#10451] - -Thu Nov 20 02:32:34 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Add Vector#angle_with - Patch by Egunov Dmitriy [#10442] - -Thu Nov 20 02:10:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (ripper_flush_string_content, parser_parse_string): - preserve parsed string content. [ruby-dev:48714] [Bug #10437] - - * parse.y (ripper_new_yylval): abstract function to create ripper - wrapper, and make it able to hold another object. - -Thu Nov 20 01:00:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (reg_named_capture_assign_gen): use predefined ID - instead of rb_intern. - -Thu Nov 20 00:54:57 2014 Tanaka Akira <akr@fsij.org> - - * internal.h (ruby_init_setproctitle): Declare here. - -Thu Nov 20 00:26:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (parser_here_document): append byte sequence directly to - the delayed content instead of creating an intermediate string - object. - -Wed Nov 19 21:11:01 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * common.mk (ext/json/parser/parser.c): don't touch parse.c, - ruby repo is a downstream. - -Wed Nov 19 20:38:11 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * common.mk (ext/ripper/ripper.c): use $(PWD) to get - <build-directory>/ext/ripper. - -Wed Nov 19 18:12:17 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * tool/downloader.rb (RubyGems.download): Don't download gem if the - version is already downloaded. A gem file is versioned and - it must be identical if the version is the same. - -Wed Nov 19 17:59:25 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * common.mk (ext/ripper/ripper.c): pass build directory as VPATH. - - * ext/ripper/depend (.y.c): use VPATH for y.tab.c. - -Wed Nov 19 10:07:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * template/prelude.c.tmpl (Prelude#translate): strip VPATH prefix - from prelude names, so that srcdir differences do not make the - generated code different. - -Wed Nov 19 07:45:11 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * win32/win32.c (rb_w32_write): should set the error of - GetOverlappedResult()'s, not WriteFile()'s (it's always - ERROR_IO_PENDING, of course). - -Tue Nov 18 14:16:47 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_record): add information for debug print. - -Wed Nov 19 04:49:07 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * debug.c (set_debug_option): need the declaration. - - * debug.c (set_debug_option): use the same macro with the implementation - at win32/win32.c. - -Wed Nov 19 04:16:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (symbol_list): fix the node type of literal symbol list - with no interpolation. [ruby-core:66343] - -Wed Nov 19 00:26:15 2014 Tanaka Akira <akr@fsij.org> +Thu Jun 9 19:46:22 2016 Kazuki Yamaguchi <k@rhe.jp> - * tool/update-deps: Sort dependencies. + * ext/openssl/ossl_ssl.c: Add define guards for OPENSSL_NO_EC. + SSL_CTX_set_ecdh_auto() is defined even when ECDH is disabled in + OpenSSL's configuration. This fixes r55214. -Wed Nov 19 00:24:18 2014 Tanaka Akira <akr@fsij.org> + * test/openssl/test_pair.rb (test_ecdh_curves): Skip if the OpenSSL does + not support ECDH. - * enc/encdb.c: Include internal.h. + * test/openssl/utils.rb (start_server): Ignore error in + SSLContext#ecdh_curves=. -Tue Nov 18 23:23:45 2014 Tanaka Akira <akr@fsij.org> +Thu Jun 9 18:12:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * internal.h: Gather declarations in non-header files. + * Makefile.in (un-runnable): fail with proper error message. + [ruby-core:75905] [Bug #12472] -Tue Nov 18 23:45:52 2014 Tanaka Akira <akr@fsij.org> +Thu Jun 9 15:32:17 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * debug.c (SET_WHEN): Don't declare debug variables here. - ruby_initial_gc_stress_ptr is changed int* to VALUE* at r41406. + * common.mk (RBCONFIG): use ifchange tool to see if the content is + changed and update the timestamp file. - * internal.h (ruby_initial_gc_stress_ptr): Declared. - (ruby_enable_coredump): Ditto. + * tool/mkconfig.rb: remove ifchange features. -Tue Nov 18 18:06:43 2014 Tanaka Akira <akr@fsij.org> + * tool/ifchange: make target directory if it does not exist with + its parent directories. - * include/ruby/io.h (FMODE_WSPLIT): Removed. The write() system call - is not required to split. It was useful to avoid whole process - blocking in Ruby 1.8 but not useful since write() is invoked without - GVL. - (FMODE_WSPLIT_INITIALIZED): Ditto. + * win32/ifchange.bat: drop support for command.com used on old + systems. - * io.c (wsplit_p): Removed. - (io_writable_length): Removed. - (rb_fcntl): Don't update the removed flags. +Thu Jun 9 15:03:35 2016 Kazuki Yamaguchi <k@rhe.jp> -Tue Nov 18 03:23:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new(). + OpenSSL_add_all_digests() and SSL_library_init() are deprecated and + converted to macros in OpenSSL 1.1.0. + [ruby-core:75225] [Feature #12324] - * object.c (check_setter_id): show the original argument instead - of nil on TypeError. +Wed Jun 8 23:09:51 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Tue Nov 18 03:20:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c (rb_str_ascii_casemap): fix compile error. - * symbol.h (is_{local,global,instance,attrset,const,class,junk}_sym): - fix ID type names. +Wed Jun 8 22:22:24 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Nov 17 20:17:59 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * string.c: Revert previous commit (possibility of endless loop). - * ext/win32ole/win32ole_event.c: use typed data. +Wed Jun 8 21:57:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Nov 17 12:54:56 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * string.c: Special-case :ascii option in rb_str_upcase_bang. - * lib/rubygems/*, test/rubygems/*: Update to RubyGems 2.4.4 - master (2f6e42e). +Wed Jun 8 21:28:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Nov 17 06:13:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c: New static function rb_str_ascii_casemap; special-casing + :ascii option in rb_str_upcase_bang and rb_str_downcase_bang. - * proc.c (proc_binding): use the original iseq on a binding from - proc from method object to get the location. + * regenc.c: Fix a bug (wrong use of unnecessary slack at end of string). -Sun Nov 16 19:38:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * regenc.h -> include/ruby/oniguruma.h: Move declaration of + onigenc_ascii_only_case_map so that it is visible in string.c. - * vm_eval.c (rb_current_receiver): new function to return the - receiver in the current control frame. [Feature #10195] - -Sun Nov 16 19:11:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/timeout.rb (Timeout::ExitException#exception): rescue - UncaughtThrowError which is specific for throw, instead of - ArgumentError. - -Sun Nov 16 18:22:18 2014 Eric Wong <e@80x24.org> - - * tool/update-deps: warning to disable ccache - -Sun Nov 16 13:11:35 2014 Tanaka Akira <akr@fsij.org> - - * common.mk (CCAN_LIST_INCLUDES): Unused variable removed. - (ENCODING_H_INCLUDES): Ditto. - (PROBES_H_INCLUDES): Ditto. - (VM_CORE_H_INCLUDES): Ditto. - -Sun Nov 16 11:07:25 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_io.rb (test_readpartial_locktmp): - remove unnecessary begin/end - -Sun Nov 16 00:45:23 2014 Tanaka Akira <akr@fsij.org> - - * common.mk: Specify dependencies for generated C sources. - -Sat Nov 15 23:10:45 2014 Tanaka Akira <akr@fsij.org> - - * common.mk: No need to declare dependencies which - will be detected by inference rules. - -Sat Nov 15 20:34:23 2014 Tanaka Akira <akr@fsij.org> - - * internal.h: Include ruby.h and ruby/encoding.h to be - includable without prior inclusion. - -Sat Nov 15 20:46:44 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb - (REXMLTests::TestDocument::EntityExpansionLimitTest): - Group tests by general entity and parameter entity. - -Sat Nov 15 20:43:31 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb - (REXMLTests::TestDocument::EntityExpansionLimitTest): Define - test XML in each test method because (1) each XML in used only - one test and (2) related data and code should be close. - -Sat Nov 15 20:39:06 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb - (REXMLTests::TestDocument::EntityExpansionLimitTest): Use - one test method for one test. - -Sat Nov 15 20:16:59 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb - (REXMLTests::TestDocument::EntityExpansionLimitTest): Use - setup and teardown instead of ensure in test. - -Sat Nov 15 20:11:34 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb (REXMLTests::TestDocument): Group - entity expansion limit related tests. - -Sat Nov 15 20:09:00 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb (REXMLTests::TestDocument::BomTest): - Fix wrong parent class. It doesn't need inherit tests in - TestDocument class. - -Sat Nov 15 19:48:59 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * lib/mkmf.rb (depend_rules): support comments during a line. - - * lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency - file contains path. - -Sat Nov 15 19:25:46 2014 Tanaka Akira <akr@fsij.org> - - * common.mk: Remove comments in Dependency lines. - Notified by usa. - - * enc/depend: Ditto. - - * ext/**/depend: Ditto. - -Sat Nov 15 16:28:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_eval.c (rb_throw_obj): throw UncaughtThrowError instead of - ArgumentError. [Feature #10480] - -Sat Nov 15 14:13:38 2014 Tanaka Akira <akr@fsij.org> - - * tool/update-deps: Extend to fix dependencies. - - * common.mk: Dependencies updated by tool/update-deps. - - * enc/depend: Ditto. - - * ext/**/depend: Ditto. - -Fri Nov 14 17:36:48 2014 Tanaka Akira <akr@fsij.org> - - * tool/update-deps: Support GNU Make 4.0. - -Fri Nov 14 16:59:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * gc.c (default_proc_for_compat_func): check arguments number and - type, and get rid of reentering this default proc. - -Fri Nov 14 16:33:06 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_stat_internal): support compatible layer for - GC.stat(symbol) type access. - -Fri Nov 14 16:19:08 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_stat_internal): add compatible layer. - From Ruby 2.2, keys of GC.stat are changed [Feature #9924]. - To provide compatible layer, GC.stat add a default_proc - (if default_proc of given Hash object is not set). - - At first use of this compatible layer of interpreter process, - show a warning message like that: - program: GC.stat[:total_allocated_object] - warning message: "warning: GC.stat keys were changed from Ruby - 2.1. In this case, you refer to obsolete `total_allocated_object' - (new key is `total_allocated_objects'). - Please check <https://bugs.ruby-lang.org/issues/9924> - for more information." - - Please correct my English message :) - - * hash.c (rb_hash_set_default_proc): export (in internal). +Wed Jun 8 20:33:44 2016 Naohisa Goto <ngotogenome@gmail.com> + * include/ruby/intern.h: Remove excess semicolons in PUREFUNC(). + Fix failure of TestMkmf::TestConvertible on Solaris with + Oracle Solaris Studio 12. [ruby-dev:49651] [Bug #12470] * internal.h: ditto. -Fri Nov 14 10:41:25 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: guard by #if/#endif with GC_ENABLE_INCREMENTAL_MARK - to hide unused codes. - - * gc.c: similar to GC_ENABLE_LAZY_SWEEP. - -Fri Nov 14 10:23:35 2014 Eric Wong <e@80x24.org> - - * vm_eval.c (rb_eval_cmd): use pre-defined idCall - -Fri Nov 14 09:25:44 2014 Eric Wong <e@80x24.org> - - * vm_eval.c (rb_yield_splat): add missing GC guard - [Bug #10509] - -Fri Nov 14 08:12:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * gc.c: fix build error caused by implicit conversion with clang. - -Fri Nov 14 06:54:06 2014 Eric Wong <e@80x24.org> - - * insns.def (opt_succ): remove Time#succ optimization - [Feature #10501] - -Fri Nov 14 05:29:46 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: refactoring. +Wed Jun 8 16:03:09 2016 Shugo Maeda <shugo@ruby-lang.org> - * gc.c: use GC_ENABLE_INCREMENTAL_MARK instead of USE_RINCGC. + * lib/net/smtp.rb (getok, get_response): raise an ArgumentError when + CR or LF is included in a line, because they are not allowed in + RFC5321. Thanks, Jeremy Daer. - * gc.c (gc_start): check FORCE_MAJOR_GC. +Tue Jun 7 21:27:25 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri Nov 14 04:51:18 2014 Koichi Sasada <ko1@atdot.net> + * test/rubygems/*_{cert,cert_32}.pem: Regenerate test certificates for + OpenSSL 1.1.0. This is already in upstream. + https://github.com/rubygems/rubygems/commit/9be5c53939440a61c4bba73cfffbeb5cfadf72be + [ruby-core:75225] [Feature #12324] - * gc.c: Tuning RincGC parameters. +Tue Jun 7 21:27:17 2016 Kazuki Yamaguchi <k@rhe.jp> - Before this patch, gc_marks_step() marks (white -> grey) fixed - number objects. However, this strategy does not fit practical - cases, for example too slow to make progress. + * test/open-uri/test_ssl.rb: Regenerate test certificates. The test CA + certificate was incorrectly generated. A CA certificate must have the + basic constraints extension with cA bit set to TRUE. OpenSSL <= 1.0.2 + allowed the error when the certificate is in the trusted store but + OpenSSL 1.1.0 no longer does. + [ruby-core:75225] [Feature #12324] - This patch changes this strategy how many objects the - gc_marks_step() should handle. +Tue Jun 7 21:20:38 2016 Kazuki Yamaguchi <k@rhe.jp> - We can estimate how many times gc_marks_step() is called during - this major marking (== C) with the free slot number in pooled - pages. We also can estimate the living object number (== L) - using last marked_slots value. We can solve this problem (how - many objects should be process in gc_marks_step()) by L/C. + * test/openssl/test_x509name.rb: Don't register OID for 'emailAddress' + and 'serialNumber'. A recent change in OpenSSL made OBJ_create() + reject an already existing OID. They were needed to run tests with + OpenSSL 0.9.6 which is now unsupported. + https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=52832e470f5fe8c222249ae5b539aeb3c74cdb25 + [ruby-core:75225] [Feature #12324] - * gc.c (rb_objspace_t): add rb_objspace_t::rincgc::pooled_slots and - step_slots. + * test/openssl/test_ssl_session.rb (test_server_session): Duplicate + SSL::Session before re-adding to the session store. OpenSSL 1.1.0 + starts rejecting SSL_SESSION once removed by SSL_CTX_remove_session(). + https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=7c2d4fee2547650102cd16d23f8125b76112ae75 -Fri Nov 14 01:26:47 2014 Shugo Maeda <shugo@ruby-lang.org> + * test/openssl/test_pkey_ec.rb (setup): Remove X25519 from @keys. X25519 + is new in OpenSSL 1.1.0 but this is for key agreement and not for + signing. - * lib/net/imap.rb (search_response): parse MODSEQ in SEARCH - responses properly. [ruby-core:64203] [Bug #10112] + * test/openssl/test_pair.rb, test/openssl/test_ssl.rb, + test/openssl/utils.rb: Set security level to 0 when using aNULL cipher + suites. -Fri Nov 14 01:03:17 2014 Tanaka Akira <akr@fsij.org> + * test/openssl/utils.rb: Use 1024 bits DSA key for client certificates. - * test/lib/envutil.rb: Moved from test/ruby/. + * test/openssl/test_engine.rb: Run each test in separate process. + We can no longer cleanup engines explicitly as ENGINE_cleanup() was + removed. + https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743 - * test/lib/find_executable.rb: Ditto. + * ext/openssl/ossl_engine.c (ossl_engine_s_cleanup): Add a note to the + RDoc for Engine.cleanup. - * test/lib/memory_status.rb: Ditto. + * ext/openssl/lib/openssl/digest.rb: Don't define constants for DSS, + DSS1 and SHA(-0) when using with OpenSSL 1.1.0. They are removed. - * test/lib/test/unit.rb: require envutil. + * test/openssl/test_digest.rb, test/openssl/test_pkey_dsa.rb, + test/openssl/test_pkey_dsa.rb, test/openssl/test_ssl.rb, + test/openssl/test_x509cert.rb, test/openssl/test_x509req.rb: Don't + test unsupported hash functions. - * test/: Don't require envutil in test files. +Tue Jun 7 17:49:52 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Nov 13 21:59:58 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + * test/ruby/enc/test_case_comprehensive: Change test for encodings + without any non-ASCII case conversions from ASCII-only test + to full test. - * lib/rexml/document.rb: add REXML::Document#document. - reported by Tomas Hoger <thoger@redhat.com> and patched by nahi. +Tue Jun 7 17:18:39 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Nov 13 21:51:56 2014 Tanaka Akira <akr@fsij.org> + * string.c (rb_str_upcase_bang, rb_str_capitalize_bang, + rb_str_swapcase_bang): Switch to use primitive. - * test/monitor/test_monitor.rb: Use assert_join_threads. +Tue Jun 7 16:44:16 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Nov 13 21:45:13 2014 Tanaka Akira <akr@fsij.org> + * string.c (rb_str_downcase_bang): Switch to use primitive except if + conversion can be done ASCII-only. - * test/openssl: Don't specify port number. +Tue Jun 7 16:13:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Nov 13 21:22:35 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/enc/test_case_comprehensive: Add regression tests for + current ASCII-only case conversion. - * test/openssl/ssl_server.rb: Unused file removed. - It is not used since r16111, Ruby 1.9.1. +Tue Jun 7 15:28:38 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Nov 13 18:50:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_comprehensive: Fix method name + (generate_casefold_tests -> generate_case_mapping_tests). - * eval.c (rb_ensure): remove obsolete prot_tag comment. patch by - Jack Danger at [ruby-core:66238]. [misc #10502] +Tue Jun 7 15:05:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Nov 13 18:10:38 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * regenc.h/c: Rename onigenc_not_support_case_map to + onigenc_ascii_only_case_map. - * vm.c (rb_vm_make_proc_lambda): similar to rb_vm_make_proc() with - is_lambda argument. + * regenc.h: Add definition of onigenc_single_byte_ascii_only_case_map. -Thu Nov 13 12:11:18 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * enc/iso_8859_X.c, windows_125X.c, ascii.c, us-ascii.c, koi8_x.c: + Replace onigenc_not_support_case_map by + onigenc_single_byte_ascii_only_case_map. - * win32/win32.c (rb_w32_fstat{,i64}): speed up. adjusting - timestamps in this function is to get rid of the side effect of - ENV["TZ"]. then, if ENV["TZ"] is not set, no need to adjust. - this change makes File#stat about 60% faster. + * enc/big5.c, cp949.c, emacs_mule.c, euc_X.c, gbX.c, shift_jis.c, + windows_31j.c: Replace onigenc_not_support_case_map by + onigenc_ascii_only_case_map. -Thu Nov 13 11:56:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jun 7 14:57:09 2016 Kazuki Yamaguchi <k@rhe.jp> - * st.c: include "internal.h" for STATIC_ASSERT. + * ext/openssl/extconf.rb: Check for SSL_CTX_set_min_proto_version() + macro added in OpenSSL 1.1.0. Version-specific methods, such as + TLSv1_method(), are deprecated in OpenSSL 1.1.0. We need to use + version-flexible methods (TLS_*method() or SSLv23_*method()) and + disable other protocol versions as necessary. + [ruby-core:75225] [Feature #12324] -Thu Nov 13 03:56:38 2014 Eric Wong <e@80x24.org> + * ext/openssl/ossl_ssl.c: Use SSL_CTX_set_{min,max}_proto_version() to + fix the protocol version. - * gc.c (struct heap_page): trivial packing - 304 => 296 bytes on x86-64 +Tue Jun 7 12:55:34 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Nov 12 22:50:12 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * regenc.c (onigenc_not_support_case_map): Move to end of file; + (onigenc_single_byte_ascii_only_case_map): Add new function. - * gems/bundled_gems: Update to test-unit 3.0.6 and minitest 5.4.3. +Tue Jun 7 09:26:37 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Nov 12 22:30:52 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * regenc.c (onigenc_not_support_case_map): Rewrite to work correctly + in ASCII range. - * lib/rubygems/*: Update to RubyGems 2.4.3 master (7b1f684). +Mon Jun 6 23:00:00 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Wed Nov 12 00:26:37 2014 Tanaka Akira <akr@fsij.org> + * appveyor.yml: Update libressl version to 2.3.5. - * test/ruby/test_object.rb: Specify an exception class for rescue clause. +Mon Jun 6 18:37:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/dbm/test_dbm.rb: Ditto. + * vm_insnhelper.c (vm_throw_start): check if the iseq is symbol + proc, class definition should not be a symbol proc. + [ruby-core:75856] [Bug #12462] - * test/gdbm/test_gdbm.rb: Ditto. +Mon Jun 6 18:36:34 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * test/sdbm/test_sdbm.rb: Ditto. + * string.c: Added UTF-16BE/LE and UTF-32BE/LE to supported encodings + for Unicode case mapping. -Tue Nov 11 23:43:51 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/enc/test_case_comprehensive.rb: Tests for above + functionality; fixed an encoding issue in assertion error message. - * test/fileutils/test_fileutils.rb: Use assert_join_threads. +Mon Jun 6 17:29:35 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Nov 11 22:51:14 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/enc/test_case_comprehensive.rb: Speed up testing for small + encodings by preselecting codepoints. - * test/resolv/test_dns.rb: Use assert_join_threads. +Mon Jun 6 17:10:50 2016 Kazuki Yamaguchi <k@rhe.jp> -Tue Nov 11 22:33:08 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_cipher.c (ossl_cipher_free): Use EVP_CIPHER_CTX_free() + to free EVP_CIPHER_CTX allocated by EVP_CIPHER_CTX_new(). + [ruby-core:75225] [Feature #12324] - * test/net/pop/test_pop.rb: Use assert_join_threads. +Mon Jun 6 13:37:08 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Nov 11 22:07:20 2014 Tanaka Akira <akr@fsij.org> + * string.c Change rb_str_casemap to use encoding primitive + case_map instead of directly calling onigenc_unicode_case_map. - * test/net/http/test_https_proxy.rb: Use assert_join_threads. +Mon Jun 6 13:16:46 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Nov 11 18:09:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_mapping.rb: + Remove :lithuanian guard for Unicode case mapping. - * template/prelude.c.tmpl: move from tool/compile_prelude.rb and - expand by generic_erb.rb. +Mon Jun 6 10:39:56 2016 Kazuki Yamaguchi <k@rhe.jp> -Tue Nov 11 13:01:31 2014 NARUSE, Yui <naruse@ruby-lang.org> + * ext/openssl/openssl_missing.h: Include ruby/config.h. r55285 added + some inline functions but VC does not recognize 'inline' keyword. - * lib/rubygems/commands/contents_command.rb (files_in_default_gem): - remove useless sort. show_files will sort the result and - another branch, files_in_gem, doesn't sort. - it should be removed for consistency. +Mon Jun 6 09:25:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/rubygems/test_gem_commands_contents_command.rb - (test_execute_default_gem): adjust the sort algorithm with - Gem::Commands::ContentsCommand#show_files, which sort items - as array of [prefix, basename] not strings. + * thread.c (thread_start_func_2): report raised exception if + report_on_exception flag is set. [Feature #6647] -Tue Nov 11 10:37:09 2014 Koichi Sasada <ko1@atdot.net> +Mon Jun 6 01:36:24 2016 Kazuki Yamaguchi <k@rhe.jp> - * string.c (sym_equal): use rb_obj_equal(). - rb_obj_equal() is specially optimized in - opt_eq_func()@vm_insnhelper.c. + * ext/openssl/extconf.rb: Check existence of SSL_is_server(). This + function was introduced in OpenSSL 1.0.2. + [ruby-core:75225] [Feature #12324] - This fix is made from this discussion: - https://www.omniref.com/ruby/2.1.4/symbols/Symbol/%3D%3D#line=8361. + * ext/openssl/openssl_missing.h: Implement SSL_is_server() if missing. -Tue Nov 11 09:38:55 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/openssl/ossl_ssl.c (ssl_info_cb): Use SSL_is_server() to see if + the SSL is server. The state machine in OpenSSL was rewritten and + SSL_get_state() no longer returns SSL_ST_ACCEPT. - * lib/rdoc/known_classes.rb: reverted regression changes of - rdoc known class. + (ossl_ssl_cipher_to_ary, ossl_sslctx_session_get_cb): Add some + `const`s to suppress warning. -Tue Nov 11 00:21:50 2014 Tanaka Akira <akr@fsij.org> - - * test/net/imap/test_imap.rb: Don't ignore exceptions on server - threads. - -Mon Nov 10 23:34:13 2014 Tanaka Akira <akr@fsij.org> - - * test/net/ftp/test_ftp.rb (create_ftp_server): Don't ignore - exceptions on server thread. - Delete read_timeout method call to fix NoMethodError. - -Mon Nov 10 20:20:53 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * win32/win32.c (rb_w32_read): retry with reduced length if cannot to - write any data but no error occurs. - -Mon Nov 10 20:04:16 2014 Tanaka Akira <akr@fsij.org> - - * lib/webrick/server.rb: Setup shutdown pipe in listen method. - -Mon Nov 10 19:37:09 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * win32/win32.c, include/win32/win32.h (rb_w32_set_nonblock): new - function to support nonblock-mode of pipes. - - * win32/win32.c (rb_w32_read): nonblock-mode pipe returns ERROR_NO_DATA - if there is no data, but also returns it if remote-end is closed. - - * win32/win32.c (rb_w32_write): if cannot to write any data, it may be - blocking. - - * io.c (rb_io_set_nonblock): use rb_w32_set_nonblock for Windows. - - * ext/io/nonblock/nonblock.c (rb_io_nonblock_set): use ruby's API when - setting nonblock-mode. - - * test/ruby/test_io.rb: test nonblock pipes on Windows. - -Mon Nov 10 17:24:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/etc/etc.c (etc_getlogin): set login name encoding properly. - [ruby-core:66163] [Bug #10493] - -Mon Nov 10 16:20:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rubygems/*.rb: Update to RubyGems master(3e36528). - -Mon Nov 10 16:09:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (rb_f_kill): [DOC] mention known signal list. - [ruby-core:66162] [Bug #10492] - -Mon Nov 10 14:17:58 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rdoc/*.rb: Update to RDoc 4.2.0.alpha(579a11c) - -Mon Nov 10 12:44:39 2014 Tanaka Akira <akr@fsij.org> - - * lib/webrick/server.rb: Less instance variables. - -Mon Nov 10 12:19:43 2014 Tanaka Akira <akr@fsij.org> - - * lib/webrick/server.rb (shutdown): Use close() on @shutdown_pipe_w to - notify readability on the read side of the pipe. - write_nonblock() is not usable for pipe on Windows. - (cleanup_shutdown_pipe): Rescue IOError for @shutdown_pipe_w.close. - -Mon Nov 10 07:31:59 2014 Tanaka Akira <akr@fsij.org> - - * lib/webrick/server.rb (initialize): Initialize shutdown pipe here - to avoid race condition. - (cleanup_shutdown_pipe): New private method. - (cleanup_listener): Extracted from shutdown method. - Call this method from start method to avoid race condition. - -Mon Nov 10 05:57:53 2014 Tanaka Akira <akr@fsij.org> - - * test/webrick/webrick.cgi: Don't use debug mode. - - * test/webrick/webrick_long_filename.cgi: Ditto. - -Sun Nov 9 23:25:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_eval.c (vm_call_super): allow bound proc method to call super - method. - - * vm_insnhelper.c (vm_yield_with_cfunc): push defined class and - bound proc method entry to the control frame. - -Sun Nov 9 22:46:13 2014 Tanaka Akira <akr@fsij.org> - - * test/open-uri: Test server log in server thread. - - * test/webrick: Ditto. - -Sun Nov 9 22:28:34 2014 Tanaka Akira <akr@fsij.org> - - * lib/webrick/httpstatus.rb: require webrick/accesslog for AccessLog. - -Sun Nov 9 21:03:59 2014 Tanaka Akira <akr@fsij.org> - - * test/webrick: Fix the argument order of assert_equal. - -Sun Nov 9 20:29:01 2014 Tanaka Akira <akr@fsij.org> - - * test/webrick: Store log in an array. - - * test/net/http: Ditto. - - * test/open-uri: Ditto. - -Sun Nov 9 18:35:36 2014 Tanaka Akira <akr@fsij.org> - - * test/xmlrpc: Refine log test. - -Sun Nov 9 18:33:33 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize/normalize.rb: Replaced if-else by - case in self.normalized? in parallel to r48309. - -Sun Nov 9 18:07:00 2014 Tanaka Akira <akr@fsij.org> - - * test/xmlrpc: Use assert_join_threads. - -Sun Nov 9 14:06:13 2014 Tanaka Akira <akr@fsij.org> - - * test/xmlrpc: Test webrick error log is empty. - -Sun Nov 9 13:47:02 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (is_incremental_marking): use #if/#else because - rb_objspace_t::flags::during_incremental_marking is not defined - when GC_ENABLE_INCREMENTAL_MARK is 0. - - * gc.c (will_be_incremental_marking, is_full_marking): similar fix. - -Sun Nov 9 12:16:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/securerandom.rb (SecureRandom.gen_random): separate - implementation details and select at the load time. - -Sun Nov 9 12:09:38 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/win32/lib/win32/registry.rb (Win32::Registry::API#Enum{Value,Key): - ditto. +Mon Jun 6 01:18:10 2016 Kazuki Yamaguchi <k@rhe.jp> -Sun Nov 9 11:48:40 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_asn1.c (decode_bool): Do the same thing as + d2i_ASN1_BOOLEAN() does by ourselves. This function is removed in + OpenSSL 1.1.0. + [ruby-core:75225] [Feature #12324] - * test/net/http: Examine webrick log. +Mon Jun 6 00:34:16 2016 Kazuki Yamaguchi <k@rhe.jp> -Sun Nov 9 11:45:19 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/openssl/extconf.rb: Check existence of accessor functions that + don't exist in OpenSSL 0.9.8. OpenSSL 1.1.0 made most of its + structures opaque and requires use of these accessor functions. + [ruby-core:75225] [Feature #12324] - * gems/bundled_gems: upgraded to test-unit 3.0.5. + * ext/openssl/openssl_missing.[ch]: Implement them if missing. -Sun Nov 9 11:40:50 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl*.c: Use these accessor functions. - * defs/known_errors.def: More errors for FreeBSD. + * test/openssl/test_hmac.rb: Add missing test for HMAC#reset. -Sun Nov 9 11:25:11 2014 Kazuki Tsujimoto <kazuki@callcc.net> +Mon Jun 6 00:00:13 2016 Kazuki Yamaguchi <k@rhe.jp> - * gems/bundled_gems: upgraded to power_assert 0.2.0. + * ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and + {RSA,DSA,EC_KEY,DH}_get0_*() functions. + OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide + setter methods for each parameter of each PKey type, for example + PKey::RSA#e=, but this is no longer possible because the new API + RSA_set0_key() requires the 'n' at the same time. This commit adds + deprecation warning to them and adds PKey::*#set_* methods as direct + wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be + rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'. + [ruby-core:75225] [Feature #12324] -Sun Nov 9 10:31:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement + RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}. + Emit a warning with rb_warning() when old setter methods are used. - * lib/securerandom.rb: set the script encoding to make a string - literal in SecureRandom::Kernel32.last_error_message single byte - encoding so msg[] works in bytes, since FormatMessage() returns - the size in TCHARs, not in characters. + * test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb, + test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH + object that are used in tmp_dh_callback. Generating a new key pair + every time should be fine - actually the private exponent is ignored + in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set. + https://www.openssl.org/news/secadv/20160128.txt -Sun Nov 9 09:50:22 2014 Tanaka Akira <akr@fsij.org> +Sun Jun 5 22:06:00 2016 Kenta Murata <mrkn@mrkn.jp> - * test/webrick: Refine log tests. + * configure.in: Fix the timing to detect the appropriate C++ compiler + in OS X. -Sun Nov 9 08:58:05 2014 Tanaka Akira <akr@fsij.org> +Sun Jun 5 21:42:24 2016 Kazuki Yamaguchi <k@rhe.jp> - * defs/known_errors.def (EHWPOISON): New errno symbol. - It is defined by glibc-2.16. + * ext/openssl/extconf.rb: Check absence of CRYPTO_lock() to see if the + OpenSSL has the new threading API. In OpenSSL <= 1.0.2, an application + had to set locking callbacks to use OpenSSL in a multi-threaded + environment. OpenSSL 1.1.0 now finds pthreads or Windows threads so we + don't need to do something special. + [ruby-core:75225] [Feature #12324] -Sun Nov 9 05:00:23 2014 NAKAMURA Usaku <usa@ruby-lang.org> + Also check existence of *_up_ref(). Some structures in OpenSSL have + a reference counter. We used to increment it with CRYPTO_add() which + is a part of the old API. - * lib/securerandom.rb (initialize): call the special method for Win32 - before checking `/dev/urandom` because we know windows doesn't have it. + * ext/openssl/openssl_missing.h: Implement *_up_ref() if missing. -Sun Nov 9 04:01:46 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * ext/openssl/ossl.c: Don't set locking callbacks if unneeded. - * lib/securerandom.rb (SecureRandom::AdvApi32): split from `initialize`. - thanks @zzak to remember it. + * ext/openssl/ossl_pkey.c, ext/openssl/ossl_ssl.c, + ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c, + ext/openssl/ossl_x509store.c: Use *_up_ref() instead of CRYPTO_add(). -Sun Nov 9 02:05:33 2014 Tanaka Akira <akr@fsij.org> +Sun Jun 5 21:38:13 2016 Kazuki Yamaguchi <k@rhe.jp> - * test/net/http/utils.rb: Don't connect to spawned server - before actual test. + * ext/openssl/extconf.rb: Check if RAND_pseudo_bytes() is usable. It is + marked as deprecated in OpenSSL 1.1.0. + [ruby-core:75225] [Feature #12324] -Sun Nov 9 01:51:50 2014 Benoit Daloze <eregontp@gmail.com> + * ext/openssl/ossl_rand.c: Disable Random.pseudo_bytes if + RAND_pseudo_bytes() is unavailable. - * object.c (Module#const_defined?): [DOC] Revise the documentation. - Patch by Xavier Noria. - [Fixes GH-754] https://github.com/ruby/ruby/pull/754 + * test/openssl/test_random.rb: Don't test Random.pseudo_bytes if not + defined. -Sun Nov 9 00:37:44 2014 Tanaka Akira <akr@fsij.org> +Sun Jun 5 19:06:40 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * test/webrick: Examine log and use assert_join_threads. + * NEWS: Add news about Unicode-wide case mapping for + String/Symbol#upcase/downcase/swapcase/capitalize(!). -Fri Nov 7 00:00:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 5 15:24:33 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * template/unicode_norm_gen.tmpl: expand kompatible_table so that - recursive expansion is not needed at runtime. + * test/ruby/enc/test_case_comprehensive.rb: + Remove :lithuanian guard for Unicode case mapping. -Thu Nov 6 23:58:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 5 14:46:34 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * pack.c (pack_pack): escape unprintable characters and preserve - the encoding of warning message. + * string.c: Remove :lithuanian guard for Unicode case mapping. -Thu Nov 6 23:55:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Jun 4 10:54:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * string.c (sym_printable): QUOTE() should not raise an exception - even on invalid byte sequence. + * missing/crypt.h (struct crypt_data): remove unnecessary member + "initialized". -Thu Nov 6 21:44:36 2014 Tanaka Akira <akr@fsij.org> + * missing/crypt.c (des_setkey_r): nothing to be initialized in + crypt_data. - * test/test_unicode_normalize.rb: Rename TestNormalize to - TestUnicodeNormalize. - Define constants under TestUnicodeNormalize. + * configure.in (struct crypt_data): check for "initialized" in + struct crypt_data, which may be only in glibc, and isn't on AIX + at least. -Thu Nov 6 21:22:59 2014 Tanaka Akira <akr@fsij.org> +Sat Jun 4 10:38:39 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/open-uri/test_open-uri.rb: Check empty webrick log. + * win32/win32.c: unify MAX_PATH, _MAX_PATH, and MAXPATHLEN to + PATH_MAX, except for MAX_PATH in get_special_folder for an API + limit. -Thu Nov 6 19:27:34 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Jun 3 21:27:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * re.c (unescape_nonascii): cast -1 for the case char is unsigned char. - If char is signed char, for example gcc for ARM or ppc64, it caused - infinite loop. - http://kmuto.jp/build-ruby/arm/ruby-trunk/log/20141106T013005Z.fail.html.gz - http://rubyci.blob.core.windows.net/f19p8/ruby-trunk/log/20141106T090217Z.fail.html.gz + * ruby.c (process_options): rb_str_conv_enc() never set encoding + of the source string, but returns the string itself if the + conversion failed. then the instance variable does not need to + be set again. -Thu Nov 6 09:53:18 2014 Eric Wong <e@80x24.org> +Fri Jun 3 18:04:37 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * lib/uri/rfc2396_parser.rb (initialize): reduce bytecode size - 2088 => 1332 bytes on 32-bit x86 + * ruby.c (process_options): need to duplicate path before passing it to + rb_str_conv_enc() because the function might call rb_enc_associate() + internally. this fixes test failures on Windows introduced at r55260. -Thu Nov 6 08:49:49 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Fri Jun 3 17:44:25 2016 Reiner Herrmann <reiner@reiner-h.de> - * lib/unicode_normalize/normalize.rb: Comment clarification. + * lib/mkmf.rb (create_makefile): sort lists of source and object + files in generated Makefile, unless given by extconf.rb. + [Fix GH-1367] -Wed Nov 5 23:43:24 2014 Naohisa Goto <ngotogenome@gmail.com> +Thu Jun 2 21:18:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * compile.c (compile_data_alloc): add padding when strict alignment - is required for memory access. Currently, the padding is enabled - only when the CPU is 32-bit SPARC and the compiler is GCC. - [Bug #9681] [ruby-core:61715] + * win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if + available instead of old SHGetPathFromIDListW, to check the + buffer size. - * compile.c (STRICT_ALIGNMENT): defined if strict alignment is required +Thu Jun 2 17:05:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * compile.c (ALIGNMENT_SIZE, ALIGNMENT_SIZE_MASK, PADDING_SIZE_MAX): - new macros for alignment word size, bit mask, max size of padding. + * ruby.c (ruby_init_loadpath_safe): remove MAXPATHLEN restriction + for Windows 10. - * compile.c (calc_padding): new function to calculate padding size. +Thu Jun 2 16:51:35 2016 Koichi ITO <koic.ito@gmail.com> -Wed Nov 5 23:24:45 2014 Tanaka Akira <akr@fsij.org> + * misc/ruby-mode.el (ruby-here-doc-beg-re), + (ruby-here-doc-beg-match, ruby-parse-partial): Support for + `squiggly heredoc' syntax in ruby-mode. [Fix GH-1372] - * test/open-uri/test_open-uri.rb: Don't ignore webrick's log. +Thu Jun 2 10:24:48 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Nov 5 19:20:08 2014 Tanaka Akira <akr@fsij.org> + * string.c: Raise ArgumentError when invalid string is detected in + case mapping methods. - * lib/webrick/server.rb: Stop listener loop properly. - [ruby-core:66085] [Bug #10478] Fixed by Charles Nutter. + * enc/unicode.c: Check for invalid string and signal with negative + length value. -Wed Nov 5 17:20:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_mapping.rb: Add tests for above. - * include/ruby/intern.h (rb_disable_super, rb_enable_super): warn - as deprecated at build time, instead of ignoring silently or - warning at runtime only. + * test/ruby/test_m17n_comb.rb: Add a message to clarify test failure. -Wed Nov 5 16:55:52 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jun 1 21:41:05 2016 Kazuki Yamaguchi <k@rhe.jp> - * proc.c (rb_f_lambda): remove deprecated function, which has been - unavailable from extension libraries. + * ext/openssl/extconf.rb: Check existence of ASN1_TIME_adj(). The old + ASN1_TIME_set() is not Year 2038 ready on sizeof(time_t) == 4 + environment. This function was added in OpenSSL 1.0.0. + [ruby-core:45552] [Bug #6571] -Wed Nov 5 16:26:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_asn1.c (ossl_time_split): Added. Split the argument + (Time) into the number of days elapsed since the epoch and the + remainder seconds to conform to ASN1_TIME_adj(). + (obj_to_asn1utime, obj_to_asn1gtime): Use ossl_time_split() and + ASN1_*TIME_adj(). - * include/ruby/intern.h (rb_clear_cache): mark as deprecated, not - only warnings at runtime. + * ext/openssl/ossl_asn1.h: Add the function prototype for + ossl_time_split(). -Wed Nov 5 15:05:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_x509.[ch]: Add ossl_x509_time_adjust(). Similarly to + obj_to_asn1*time(), use X509_time_adj_ex() instead of X509_time_adj(). - * string.c (rb_str_{,l,r}strip_bang): rb_str_subseq() will not - NUL-terminate the result string, in the future, so it will not - be needed in other cases. + * ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c, + ext/openssl/ossl_x509revoked.c: Use ossl_x509_time_adjust(). -Wed Nov 5 14:11:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jun 1 15:58:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * common.mk (lib/unicode_normalize/tables.rb): do nothing unless - BASERUBY is available. MINIRUBY cannot load extension libraries, - so cannot update Unicode data. + * configure.in: revert r55237. replace crypt, not crypt_r, and + check if crypt is broken more. -Wed Nov 5 12:13:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * missing/crypt.c: move crypt_r.c - * string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by - copying necessary part only. + * string.c (rb_str_crypt): use crypt_r if provided by the system. - * string.c (rb_str_strip_bang, rb_str_strip): ditto. +Wed Jun 1 14:07:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Nov 5 12:13:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * missing/crypt_r.c (a64toi): initialize statically and fix out of + bounds access when salt is not 7bit clean. - * string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by - copying necessary part only. +Wed Jun 1 11:34:59 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * string.c (rb_str_strip_bang, rb_str_strip): ditto. + * win32/Makefile.sub (MISSING): fixed build error introduced at r55237. -Wed Nov 5 10:54:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jun 1 09:48:06 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): terminate - wchar strings with wchar 0. + * string.c (rb_str_crypt): use reentrant crypt_r. -Tue Nov 4 21:23:22 2014 NAKAMURA Usaku <usa@ruby-lang.org> +Wed Jun 1 09:37:26 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * ext/win32/lib/Win32API.rb: Fiddle::Importer is defined in - fiddle/import.rb and it's not loaded implicitly. + * missing/crypt.c (des_setkey): void function never returns any value. - * ext/win32/lib/Win32API.rb (Win32API#initialize): `import` is a string. +Wed Jun 1 09:16:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/win32/lib/Win32API.rb (Win32API#initialize): - Fiddle::Importer::CALL_TYPE_TO_ABI is private constant. + * crypt.h: separate header file from missing/crypt.c. -Tue Nov 4 21:20:07 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * missing/crypt.c (crypt_r, setkey_r, encrypt_r): add reentrant + versions. - * lib/securerandom.rb (SecureRandom.random_bytes): use fiddle directly - instead of using Win32API. +Wed Jun 1 02:25:38 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Nov 4 21:04:30 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * missing/crypt.c: fix size macros to use configured values + for platforms long is larger than 32bit. + [ruby-core:75792] [Bug #12446] - * test/rubygems/test_gem_request_set_lockfile.rb - (test_relative_path_from): driveletter support. +Tue May 31 17:28:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Nov 4 16:23:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/optparse.rb (OptionParser::Completion.candidate): get rid of + nil as key names. [ruby-core:75773] [Bug #12438] - * test/rubygems/test_gem_remote_fetcher.rb (RemoteFetcherCleanup): - close all pooled connections for each tests to fix leaked file - descriptors. + * lib/optparse.rb (OptionParser#make_switch): char class option + cannot be NoArgument, default to RequiredArgument. -Tue Nov 4 12:51:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue May 31 00:30:11 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * include/ruby/ruby.h (PRIsVALUE), vsnprintf.c (BSD_vfprintf): add - RUBY_PRI_VALUE_MARK to reduce danger of accidental conflict with - plain "%i". binary incompatible with extension libraries using - PRIsVALUE and built for 2.1 and earlier. [EXPERIMENTAL] + * ext/socket/raddrinfo.c (host_str, port_str): Use StringValueCStr + instead of (Safe)StringValue, to detect NUL byte in the string. -Tue Nov 4 12:33:44 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Mon May 30 22:02:01 2016 Kazuki Yamaguchi <k@rhe.jp> - * object.c: fix document of Kernel#String by @suzukaze - [fix GH-743][ci skip] + * ext/openssl/ossl_asn1.c (time_to_time_t): Use NUM2TIMET() instead of + NUM2LONG(). time_t may be larger than long. + [ruby-core:45552] [Bug #6571] -Tue Nov 4 12:21:45 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Mon May 30 21:15:37 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/csv.rb: added documentation for skip_blanks option by @decasia - [fix GH-744][ci skip] + * string.c: Document current behavior for other case mapping methods + on String. [ci skip] -Tue Nov 4 12:09:18 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Mon May 30 20:00:25 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/open3.rb: fix code formatting in documentation by @JoshCheek - [fix GH-747][ci skip] + * string.c: Document current situation for String#downcase. [ci skip] -Tue Nov 4 08:57:37 2014 Eric Wong <e@80x24.org> +Mon May 30 18:29:28 2016 Kazuki Yamaguchi <k@rhe.jp> - * encoding.c (enc_memsize): remove unnecessary function - [ruby-core:65304] + * ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): Enable the automatic + curve selection for ECDH by calling SSL_CTX_set_ecdh_auto(). With + this a TLS server automatically selects a curve which both the client + and the server support to use in ECDH. This changes the default + behavior but users can still disable ECDH by excluding 'ECDH' cipher + suites from the cipher list (with SSLContext#ciphers=). This commit + also deprecate #tmp_ecdh_callback=. It was added in Ruby 2.3.0. It + wraps SSL_CTX_set_tmp_ecdh_callback() which will be removed in OpenSSL + 1.1.0. Its callback receives two values 'is_export' and 'keylength' + but both are completely useless for determining a curve to use in + ECDH. The automatic curve selection was introduced to replace this. -Mon Nov 3 18:09:39 2014 Tanaka Akira <akr@fsij.org> + (ossl_sslctx_setup): Deprecate SSLContext#tmp_ecdh_callback=. Emit a + warning if this is in use. - * test/openssl/utils.rb: The default of :ignore_listener_error is - changed to false. + (ossl_sslctx_set_ecdh_curves): Add SSLContext#ecdh_curves=. Wrap + SSL_CTX_set1_curves_list(). If it is not available, this falls back + to SSL_CTX_set_tmp_ecdh(). -Mon Nov 3 14:42:37 2014 Koichi Sasada <ko1@atdot.net> + (Init_ossl_ssl): Define SSLContext#ecdh_curves=. - * iseq.c (iseq_free): resolve memory leak. + * ext/openssl/extconf.rb: Check the existence of EC_curve_nist2nid(), + SSL_CTX_set1_curves_list(), SSL_CTX_set_ecdh_auto() and + SSL_CTX_set_tmp_ecdh_callback(). -Mon Nov 3 13:49:18 2014 Koichi Sasada <ko1@atdot.net> - - * iseq.c (iseq_memsize): catch up recent changes. - -Mon Nov 3 13:38:28 2014 Koichi Sasada <ko1@atdot.net> - - * vm_core.h: change semantics of opt_num and opt_table. - `opt_num' was the number of optional parameters + 1. - `opt_table' has "opt_num" entries. - - Change them to: - `opt_num' is the number of optional parameters. - `opt_table' has "opt_num + 1" entries. - - This change simplify parameter fitting logics. - - * compile.c: catch up this change. - - * iseq.c: ditto. - - * proc.c: ditto. - - * vm_args.c: ditto. - -Mon Nov 3 11:47:44 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * NEWS: added period into Matrix section. [ci skip] - [misc #10446][ruby-core:65987] - -Mon Nov 3 09:43:30 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * vm_args.c: fixed build error with clang - -Mon Nov 3 09:32:46 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/rfc3986_parser.rb (URI::RFC3986_Parser::RFC3986_URI): - allow '[' and ']' for URI input (and escape). [Bug #10402] - - * lib/uri/generic.rb (URI#query=): escape '[', '\', and ']'. - -Mon Nov 3 07:49:34 2014 Koichi Sasada <ko1@atdot.net> - - * vm_core.h: change iseq parameter data structure. - https://bugs.ruby-lang.org/issues/10440#change-49694 - - * change terminology `arg' to `param'. - * move rb_iseq_t::arg_* to rb_iseq_t::param. - * move rb_iseq_t::arg_size to rb_iseq_t::param::size. - * move rb_iseq_t::argc to rb_iseq_t::param::lead_num. - * move rb_iseq_t::arg_opts to rb_iseq_t::param::opt_num. - * move rb_iseq_t::arg_rest to rb_iseq_t::param::rest_start. - * move rb_iseq_t::arg_post_num to rb_iseq_t::param::post_num. - * move rb_iseq_t::arg_post_start to rb_iseq_t::param::post_start. - * move rb_iseq_t::arg_block to rb_iseq_t::param::block_start. - * move rb_iseq_t::arg_keyword* to rb_iseq_t::param::keyword. - rb_iseq_t::param::keyword is allocated only when keyword - parameters are available. - * introduce rb_iseq_t::param::flags to represent parameter - availability. For example, rb_iseq_t::param::flags::has_kw - represents that this iseq has keyword parameters and - rb_iseq_t::param::keyword is allocated. - We don't need to compare with -1 to check availability. - * remove rb_iseq_t::arg_simple. - - * compile.c: catch up this change. - - * iseq.c: ditto. - - * proc.c: ditto. - - * vm.c, vm_args.c, vm_dump.c, vm_insnhelper.c: ditto. - - * iseq.c (iseq_data_to_ary): support keyword argument. - -Mon Nov 3 03:39:04 2014 Koichi Sasada <ko1@atdot.net> - - * test/ruby/test_method.rb: r48239 makes this test green. - -Mon Nov 03 03:02:38 2014 Koichi Sasada <ko1@atdot.net> - - * rewrite method/block parameter fitting logic to optimize - keyword arguments/parameters and a splat argument. - [Feature #10440] (Details are described in this ticket) - - Most of complex part is moved to vm_args.c. - - Now, ISeq#to_a does not catch up new instruction format. - - * vm_core.h: change iseq data structures. - - * introduce rb_call_info_kw_arg_t to represent keyword arguments. - * add rb_call_info_t::kw_arg. - * rename rb_iseq_t::arg_post_len to rb_iseq_t::arg_post_num. - * rename rb_iseq_t::arg_keywords to arg_keyword_num. - * rename rb_iseq_t::arg_keyword to rb_iseq_t::arg_keyword_bits. - to represent keyword bitmap parameter index. - This bitmap parameter shows that which keyword parameters are given - or not given (0 for given). - It is referred by `checkkeyword' instruction described bellow. - * rename rb_iseq_t::arg_keyword_check to rb_iseq_t::arg_keyword_rest - to represent keyword rest parameter index. - * add rb_iseq_t::arg_keyword_default_values to represent default - keyword values. - * rename VM_CALL_ARGS_SKIP_SETUP to VM_CALL_ARGS_SIMPLE - to represent - (ci->flag & (SPLAT|BLOCKARG)) && - ci->blockiseq == NULL && - ci->kw_arg == NULL. - - * vm_insnhelper.c, vm_args.c: rewrite with refactoring. - - * rewrite splat argument code. - * rewrite keyword arguments/parameters code. - * merge method and block parameter fitting code into one code base. - - * vm.c, vm_eval.c: catch up these changes. - - * compile.c (new_callinfo): callinfo requires kw_arg parameter. - - * compile.c (compile_array_): check the last argument Hash object or - not. If Hash object and all keys are Symbol literals, they are - compiled to keyword arguments. - - * insns.def (checkkeyword): add new instruction. - This instruction check the availability of corresponding keyword. - - For example, a method "def foo k1: 'v1'; end" is compiled to the - following instructions. - - 0000 checkkeyword 2, 0 # check k1 is given. - 0003 branchif 9 # if given, jump to address #9 - 0005 putstring "v1" - 0007 setlocal_OP__WC__0 3 # k1 = 'v1' - 0009 trace 8 - 0011 putnil - 0012 trace 16 - 0014 leave - - * insns.def (opt_send_simple): removed and add new instruction - "opt_send_without_block". - - * parse.y (new_args_tail_gen): reorder variables. - Before this patch, a method "def foo(k1: 1, kr1:, k2: 2, **krest, &b)" - has parameter variables "k1, kr1, k2, &b, internal_id, krest", - but this patch reorders to "kr1, k1, k2, internal_id, krest, &b". - (locate a block variable at last) - - * parse.y (vtable_pop): added. - This function remove latest `n' variables from vtable. - - * iseq.c: catch up iseq data changes. - - * proc.c: ditto. - - * class.c (keyword_error): export as rb_keyword_error(). - - * common.mk: depend vm_args.c for vm.o. - - * hash.c (rb_hash_has_key): export. - - * internal.h: ditto. - -Mon Nov 3 02:35:32 2014 Koichi Sasada <ko1@atdot.net> - - * sample/simple-bench.rb: added to measure performance of simple - lines. - -Mon Nov 3 02:33:43 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (obj_info): show T_STRING more details. - -Sun Nov 2 01:30:32 2014 Tanaka Akira <akr@fsij.org> - - * test/openssl/test_ssl.rb: Don't ignore errors on listener threads, - as much as possible. - - * test/openssl/test_ssl_session.rb: Ditto. - - * test/openssl/test_partial_record_read.rb: Ditto. - -Sat Nov 1 23:11:05 2014 Tanaka Akira <akr@fsij.org> - - * test/openssl/utils.rb (start_server): Don't close sockets before - threads finished. - -Sat Nov 1 22:06:24 2014 Tanaka Akira <akr@fsij.org> - - * test/openssl/test_ssl_session.rb (test_ctx_client_session_cb): Don't - ignore errors of SSL accept. - (test_ctx_server_session_cb): Ditto. - - * test/openssl/utils.rb (server_loop): Add ignore_ssl_accept_error - argument. - (start_server): Refine threads waits. - - * test/ruby/envutil.rb (assert_join_threads): Show a thread before - backtrace. - -Sat Nov 1 20:40:18 2014 Tanaka Akira <akr@fsij.org> - - * test/openssl/utils.rb (start_server, server_loop): Use a - pipe to stop server instead of shutdown/close a listening socket. - -Sat Nov 1 19:24:59 2014 Tanaka Akira <akr@fsij.org> - - * test/ruby/envutil.rb (assert_join_threads): New assertion to - join multiple threads without exceptions. - -Sat Nov 1 17:09:32 2014 Tanaka Akira <akr@fsij.org> - - * bignum.c (bary_mul_balance_with_mulfunc): Fix free work area - location. - [ruby-dev:48723] [Bug #10464] - [ruby-core:66044] [Bug #10465] - Reported by Kohji Nishihama. - -Sat Nov 1 15:45:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (parse_atmark): mere atmark and two atmarks without - succeeding identifiers are invalid as instance/class variable - names. - -Sat Nov 1 06:31:41 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_variant.c: use typed data. - -Fri Oct 31 13:55:28 2014 Aaron Patterson <aaron@tenderlovemaking.com> - - * ext/dl/*: remove DL as it is replaced by Fiddle. - [Feature #5458] Thanks to Jonan Scheffler <jonanscheffler@gmail.com> - for this patch - - * test/dl/*: ditto. - -Fri Oct 31 15:26:02 2014 Charles Oliver Nutter <headius@headius.com> - - * test/openssl/test_ssl.rb: Add certificate verification chain - test from JRuby community. - -Fri Oct 31 18:58:02 2014 Charles Oliver Nutter <headius@headius.com> - - * test/psych/test_emitter.rb: Fix line_width test...initial value - is impl-specific and attr assignment always returns LHS. - -Fri Oct 31 22:19:30 2014 Akinori MUSHA <knu@iDaemons.org> - - * ext/digest/lib/digest.rb (Digest()): This function should now be - thread-safe. If you have a problem with regard to on-demand - loading under a multi-threaded environment, preload "digest/*" - modules on boot or use this method instead of directly - referencing Digest::*. [Bug #9494] - cf. https://github.com/aws/aws-sdk-ruby/issues/525 - -Fri Oct 31 21:33:17 2014 Akinori MUSHA <knu@iDaemons.org> - - * test/digest/test_digest.rb: Drop #!. This no longer runs - stand-alone because it depends on ruby/envutil. - -Fri Oct 31 17:22:19 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * win32/setup.mak: $(APPEND) with some arguments insert a space before - the arguments, so it causes error if the arguments are expected to be - a macro definition. this fix resolve the build error introduced at - r48210. - -Fri Oct 31 16:47:35 2014 Akinori MUSHA <knu@iDaemons.org> - - * ext/syslog/lib/syslog/logger.rb (Syslog::Logger::VERSION): Bump - the VERSION to 2.1.0. [ruby-core:64483] [Bug #10159] - -Fri Oct 31 16:33:46 2014 Akinori MUSHA <knu@iDaemons.org> - - * lib/net/imap.rb (Net::IMAP#fetch): [DOC] Document that - Net::IMAP#fetch will return nil instead of an empty array. - -Fri Oct 31 12:54:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * common.mk (.unicode-tables.time): needs Unicode files always, - and should update after downloading these files. - [ruby-core:66026] [Bug #10461] - -Fri Oct 31 10:16:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * .travis.yml: reverted r48199, it's unrelated configuration. - -Fri Oct 31 09:58:14 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/test_unicode_normalize.rb: added unicode version number to - test data location. - -Fri Oct 31 09:56:41 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * .gitignore: ignored unicode data with version directories. - -Fri Oct 31 09:35:30 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * .travis.yml: tweak build scripts for unicode_normalize.rb. - -Thu Oct 30 18:47:04 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * common.mk: fix for the case ALWAYS_UPDATE_UNICODE=no - -Thu Oct 30 13:23:23 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * tool/downloader.rb: changed Unicode data download location - from latest Unicode version to Unicode 7.0.0. - -Thu Oct 30 11:16:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_insnhelper.c (vm_callee_setup_arg{_complex,}): try conversion - by to_ary for a lambda, as well as a proc. - [ruby-core:65887] [Bug #9605] - -Wed Oct 29 21:13:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (gettable_gen): warn circular argument reference, for - transition from 2.1 and earlier. [ruby-core:65990] [Bug #10314] - -Wed Oct 29 20:41:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (parser_params): remove unused member `cur_mid`. - this has been taken over by `in_def` since 1.6. - -Wed Oct 29 14:44:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * load.c (rb_f_load): path name needs to be transcoded to OS path - encoding. [ruby-list:49994] - -Wed Oct 29 11:48:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (__builtin_setjmp): disable with gcc/clang earlier - than 4.3 on Mac OS X. [ruby-core:65174] [Bug #10272] - -Wed Oct 29 11:43:43 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Generalize Vector#cross_product to arbitrary - dimensions - based on a patch by gogo tanaka [#10074] - -Wed Oct 29 11:43:11 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Add Matrix#adjucate - patch by gogo tanaka [#10056] - -Wed Oct 29 11:42:33 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Add aliases for Vector#cross & dot - patch by gogo tanaka [#10352] - -Wed Oct 29 10:00:18 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * gems/bundled_gems: Update latest version of bundled gems. - -Tue Oct 28 16:52:07 2014 Eric Wong <e@80x24.org> - - * signal.c (install_sighandler): remove rb_disable_interrupt and - rb_enable_interrupt calls - (init_sigchld): ditto - (Init_signal): disable and enable interrupt once around all - install_sighandler and init_sigchld to reduce syscalls at start - [Feature #9345] [ruby-core:59480] - -Tue Oct 28 16:22:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ruby.c (process_options, load_file_internal2): should not - require other files when dump option is given. - [ruby-dev:48712] [Bug #10435] - -Tue Oct 28 14:51:38 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * configure.in: remove apple-gcc4.2 from CC candidates. - -Mon Oct 27 20:13:37 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * lib/rexml/entity.rb: keep the entity size within the limitation. - reported by Willis Vandevanter <will@silentrobots.com> and - patched by nahi. - -Mon Oct 27 17:17:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * proc.c (method_proc): the receiver of binding from method should - be same as the receiver of the method. - [ruby-core:65917] [Bug #10432] - -Mon Oct 27 16:26:37 2014 Koichi Sasada <ko1@atdot.net> - - * test/ruby/test_super.rb: add a test to check block passing. - -Mon Oct 27 15:59:26 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: is_incremental_marking(), will_be_incremental_marking(): - use `&&' with GC_ENABLE_INCREMENTAL_MARK instead of using - #if/#else/#endif. - -Mon Oct 27 13:40:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * gc.c (gc_sweep_rest): sweep rest pages regardless of whether - lazy sweep is enabled or not. based on the patch by Masahiro - Ide at [ruby-dev:48706]. [Bug #10431] - -Mon Oct 27 11:18:32 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): - reduce garbage during forks - -Sun Oct 25 12:26:26 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * template/insns.inc.tmpl, insns_info.inc.tmpl, known_errors.inc.tmpl, - minsns.inc.tmpl: fixed path of generating script. - -Sun Oct 26 12:24:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/ripper/lib/ripper/sexp.rb (Ripper.sexp, Ripper.sexp_raw): - return nil on error. [ruby-dev:48678] [Bug #10405] - -Sun Oct 25 11:24:24 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * string.c: improved comment. - -Sun Oct 26 07:40:11 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c (ole_val2variant, ole_invoke): refactoring. - use ole_variant2variant to convert WIN32OLE_VARIANT object to - VARIANT object. - - * ext/win32ole/win32ole_variant.c: refactoring. add - ole_variant2variant. - * ext/win32ole/win32ole_variant.h: ditto. - -Sat Oct 25 22:28:17 2014 Tanaka Akira <akr@fsij.org> - - * io.c (io_binwrite_string): Test writev() failure. - -Sat Oct 25 20:19:19 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * test/test-unicode_normalize.rb: added test_us_ascii. - -Sat Oct 25 20:09:09 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize/normalize.rb: added US_ASCII - as trivially supported encoding (is always normalized, - and may appear mixed in with UTF-8 or other Unicode - encodings). - -Sat Oct 25 20:01:01 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * test/test-unicode_normalize.rb: added - test_raise_exception_for_non_unicode_encoding. - -Sat Oct 25 19:30:30 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * test/test-unicode_normalize.rb: removed unused function. - -Sat Oct 25 18:41:41 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * template/unicode_norm_gen.tmpl: Adjusted name of generating file. - -Fri Oct 24 22:49:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (parser_yylex): dispatch newline and space at fluent - interface, so that the following identifier does not include the - space. [ruby-dev:48684] [Bug #10411] - -Fri Oct 24 20:41:36 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - - * signal.c (check_reserved_signal_): fix write count since r47991. - -Thu Oct 23 21:42:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * hash.c (rb_hash_delete): now does not call the block given to - the current method. [ruby-core:65861] [Bug #10413] - -Thu Oct 23 19:13:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_method.c (rb_method_entry_make): warn redefinition only for - already defined methods, but not for undefined methods. - [ruby-dev:48691] [Bug #10421] - -Thu Oct 23 17:19:04 2014 Kouhei Sutou <kou@cozmixng.org> - - * lib/rexml/source.rb (REXML::IOSource#encoding_updated): Fix a - bug that can't parse XML correctly when - Encoding.default_internal is different with XML - encoding. REXML::Source converts XML encoding on read. So IO - should not convert XML encoding. - Based on patch by NAKAMURA Usaku. - [ruby-dev:48686] [Bug #10418] - - * test/rexml/test_encoding.rb - (REXMLTests::EncodingTester#test_parse_utf16_with_utf8_default_internal): - Add the for the above case. - -Thu Oct 23 16:29:02 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_encoding.rb - (REXMLTests::EncodingTester#test_parse_utf16): Use meaningful - test name. "ticket" in the old test name means the ticket in - REXML's issue tracker. The REXML's issue tracker was gone. So - "ticket" is meaningless. - - * test/rexml/data/ticket_110_utf16.xml: Rename to ... - * test/rexml/data/utf16.xml: ... this. - -Thu Oct 23 16:18:11 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_encoding.rb - (REXMLTests::EncodingTester#test_ticket_110): Fix expected and - actual order. - Patch by NAKAMURA Usaku. Thanks!!! - -Thu Oct 23 10:47:16 2014 Eric Wong <e@80x24.org> - - * insns.def (getlocal,setlocal): add comment to def/opt_operand.def - -Thu Oct 23 10:22:41 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): - use IO#wait_readable instead of timeout - -Thu Oct 23 10:22:24 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): - ensure exit! during fork failure - -Thu Oct 23 10:21:21 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * NEWS: Added String#unicode_normalize(|!|d?) [ci skip] - -Thu Oct 23 03:41:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * class.c (unknown_keyword_error): delete expected keywords - directly from raw table, so that the given block is not called. - [ruby-core:65837] [Bug #10413] - -Thu Oct 23 02:33:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * common.mk (update-unicode): invert dependency to run every times. - [ruby-core:65842] [Bug #10415] - - * common.mk (after-update): update files under source tree. - [ruby-core:65840] [Bug #10414] - -Wed Oct 22 22:38:59 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> - - * ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override - options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined. - this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424] - -Wed Oct 22 21:31:56 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * common.mk (prelude.c): add dependency to LIB_SRCS because - enc/prelude.rb requires lib/unicode_normalize.rb, and it's also - requires lib/unicode_normalize/tables.rb (=LIB_SRCS). - -Wed Oct 22 21:09:51 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * configure.in (nacl_cv_cpu_nick): fix typo in PNaCl. - (XCFLAGS) Add -isystem flag to pnacl and nacl-newlib - (CXX): added - - * nacl/GNUmakefile.in (CXX): Added - (PPROGRAM): Use clang++ instead of clang because libnacl_io - depends on c++ std lib. - -Wed Oct 22 21:07:32 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * common.mk (build-ext): avoid trying to build dynamic libraries - if configured --with-static-linked-ext. - -Wed Oct 22 20:33:33 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * common.mk: Fixed grammar in comment [ci skip] - -Wed Oct 22 19:18:18 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * tool/unicode_norm_gen.rb: Fixed escaping of backslash and - double quote ('\\\&' -> "\\\\\\\&"; double quoted string - is needed to make \& mean last match; double double - backslashes are needed because of two layers of escaping). - -Wed Oct 22 18:13:29 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/test-unicode_normalize.rb: as often said, ruby is sometimes built - at non-srcdir. - -Wed Oct 22 18:12:12 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * test/test-unicode_normalize.rb: Adjusted path for test - data file (now ../enc/unicode/data/NormalizationTest.txt). - -Wed Oct 22 18:07:07 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * test/test-unicode_normalize.rb: Removed explicit require, - changed method names, adjusted copyright. - -Wed Oct 22 18:00:00 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * test/test-unicode_normalize.rb: Importing from - https://github.com/duerst/eprun/blob/master/test/test_normalize.rb. - (removing trailing whitespace, fixing EOLs and adding EOL property) - -Wed Oct 22 08:21:09 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * nacl/pepper_main.c (Instance_DidCreate): mount devfs and rebind fd 0 - .. 2 so that stderr goes to the console of the browser. - -Wed Oct 22 03:47:43 2014 KOSAKI Motohiro <kosaki.motohiro@gmail.com> - - * ext/etc/etc.c (etc_nprocessors_affin): maximum "n" should be 16384. - -Wed Oct 22 03:37:00 2014 KOSAKI Motohiro <kosaki.motohiro@gmail.com> - - * ext/etc/etc.c (etc_nprocessors_affin): minor spell fix. - -Wed Oct 22 03:33:58 2014 KOSAKI Motohiro <kosaki.motohiro@gmail.com> - - * ext/etc/etc.c (etc_nprocessors_affin): optimize memory usage a - bit. Typical rubyist never use 8k cpus machine. - -Wed Oct 22 00:01:09 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * configure.in (XCFLAGS): Add include path for NaCl libraries. - (XLDFLAGS): ditto. - (NACL_LIB_PATH): new substitution - - * nacl/nacl-config.rb: support NACL_LIB_PATH - - * nacl/package.rb: ditto. - - * nacl/pepper_main.c: replace old implementations with nacl_io. - - * nacl/GNUmakefile.in: link nacl_io to pepper_ruby - - * ruby.c (rb_load_file): remove __attribute__((weak)) because the old - override hack was replaced with nacl_io. - - * file.c (rb_file_load_ok): ditto. - -Tue Oct 21 17:32:32 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * common.mk: Adding explicit creation of directory - enc/unicode/data because git doesn't handle empty - directories. [patch by Masahiro Ide, filed with r48073] - -Tue Oct 21 17:12:12 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize/tables.rb: Committing to make version - update easier and more predictable, and reducing compilation - time. - -Tue Oct 21 15:56:56 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize/normalize.rb: Added comment to point to - relevant portion of Unicode standard for Hangul (de)composition - identifiers and algorithm. - -Tue Oct 21 11:49:16 2014 Andreas Schwab <schwab@suse.de> - - * gc.c (mark_current_machine_context) [__mc68000__]: Update stack - marking. - (rb_gc_mark_machine_stack) [__mc68000__]: Also handle it here. - -Mon Oct 20 23:59:38 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * enc/prelude.rb: we sometimes run ruby without library path (especially - for test), so should permit to run ruby if unicode_normalize.rb is + * ext/openssl/openssl_missing.[ch]: Implement EC_curve_nist2nid() if missing. -Mon Oct 20 23:57:58 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * common.mk (lib/unicode_normalize/tables.rb): enable running (n)make - in non-srcdir. - -Mon Oct 20 23:58:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * tool/downloader.rb: add -a option to always download regardless - existing files. - -Mon Oct 20 23:18:18 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * lib/mkmf.rb: no need to convert path separator for COPY because it's - ruby -run cp and it can treat '/' on any platform. - -Mon Oct 20 19:54:54 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * config.mk: Added missing data files as targets for - prerequisite update_unicode. - -Mon Oct 20 19:06:06 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * test/openssl/test_pair.rb (test_ecdh_callback): Use + EnvUtil.suppress_warning to suppress deprecated warning. - * lib/unicode_normalize.rb: revert r48046. The s in sIndex - is not hungarian notation. The variable name sIndex is - directly taken from the relevant part of the Unicode - Standard, where it is written SIndex and stands for - 'syllable index'. See pp. 144/145 of - http://www.unicode.org/versions/Unicode7.0.0/ch03.pdf. + (test_ecdh_curves): Test that SSLContext#ecdh_curves= works. -Mon Oct 20 12:46:46 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * test/openssl/utils.rb (start_server): Use SSLContext#ecdh_curves=. - * lib/unicode_normalize.rb: removing unnecessary 'self'. +Mon May 30 16:28:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Oct 20 12:37:37 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * ext/socket/raddrinfo.c (host_str, port_str): use RSTRING_LEN + instead of strlen, since RSTRING_PTR StringValueCStr may not be + NUL-terminated when SHARABLE_MIDDLE_SUBSTRING=1. reported by + @tmtms, http://twitter.com/tmtms/status/736910516229005312 - * lib/unicode_normalize.rb: change method names - in commented-out code. Followup to r48027. +Mon May 30 16:20:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Oct 20 02:23:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c (str_fill_term): return new pointer reallocated by + filling terminator. - * variable.c (rb_ivar_get), vm_insnhelper.c (vm_getivar): improve - instance variable retrieval performance by checking ruby_verbose - before call of rb_warning and evaluation of its argument. - [ruby-core:65786] [Feature #10396] +Mon May 30 14:54:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Oct 19 23:31:29 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + * ext/stringio/stringio.c (enc_subseq): share the return value and + the buffer as possible. - * lib/unicode_normalize.rb: (unicode_normalize!): change method name. - catch up the method name change at r48014. [Feature #10084] +Mon May 30 14:50:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Oct 19 20:05:58 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * string.c (str_substr, rb_str_aref): refactor not to create + unnecessary empty string. - * ext/tk/lib/tkextlib/tile/treeview.rb: fix syntax error. + * string.c (str_byte_substr, str_byte_aref): ditto. -Sun Oct 19 18:39:39 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Mon May 30 00:09:37 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * enc/prelude.rb: Added automatic loading of - lib/unicode_normalize.rb. This makes sure that all - the methods that are available on String are - available without explicit require. + * ext/-test-/auto_ext.rb: fixed a heedless bug introduced at r55198. + this change will make RubyCI green. -Sun Oct 19 18:35:35 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Sun May 29 22:58:19 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/unicode_normalize/normalize.rb: Added a missing - file extension in require statement. + * regexec.c (ONIGENC_IS_MBC_ASCII_WORD): redefine optimized one. + WORD of Ruby's ascii compatible encoding is always [a-zA-Z0-9_]. -Sun Oct 19 18:13:13 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Sun May 29 22:44:19 2016 NARUSE, Yui <naruse@ruby-lang.org> - * common.mk: Added a rule to generate - lib/unicode_normalize/tables.rb. This rule still - needs to be integrated into the overall make process. + * regexec.c (match_at): make compilers optimize harder. -Sun Oct 19 17:53:53 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Sun May 29 12:08:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/unicode_normalize.rb: Changed to dynamic - loading of actual normalization code and tables. + * ext/-test-/auto_ext.rb (auto_ext): utility method to create + extension libraries for tests. -Sun Oct 19 17:37:37 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Sat May 28 20:40:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/unicode_normalize.rb: Small documentation fix. + * misc/ruby-additional.el (ruby-insert-heredoc-code-block): insert + here document code block for assert_separately mainly. -Sun Oct 19 17:26:26 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Sat May 28 20:34:19 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/unicode_normalize.rb: Added documentation. + * test/test_unicode_normalize.rb: Add test to check for availability of + Unicode data file; refactoring; fix an error with tests for destructive + method (unicode_normalize!). -Sun Oct 19 11:09:09 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Sat May 28 19:08:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * tool/unicode_norm_gen.rb, lib/unicode_normalize.rb: - File name change from lib/unicode_normalize/normalize_tables.rb - to lib/unicode_normalize/tables.rb. + * test/ruby/enc/test_case_comprehensive.rb: Add error messages to tests + for data file availability; refactoring. -Sun Oct 19 10:12:12 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Sat May 28 14:00:10 2016 Kazuki Yamaguchi <k@rhe.jp> - * lib/unicode_normalize.rb: Changing method names, see - https://bugs.ruby-lang.org/issues/10084#note-7 + * ext/openssl/lib/openssl/ssl.rb (SSLSocket): Move the implementation of + SSLSocket#initialize to C. Initialize the SSL (OpenSSL object) in it. + Currently this is delayed until ossl_ssl_setup(), which is called from + SSLSocket#accept or #connect. Say we call SSLSocket#hostname= with an + illegal value. We expect an exception to be raised in #hostname= but + actually we get it in the later SSLSocket#connect. Because the SSL is + not ready at #hostname=, the actual call of SSL_set_tlsext_host_name() + is also delayed. + This also fixes: [ruby-dev:49376] [Bug #11724] -Sun Oct 19 10:10:10 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize.rb: Changing module name. - -Sun Oct 19 10:08:08 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize.rb: Changing require statement, - adjusting copyright. - -Sun Oct 19 10:04:04 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize.rb: Importing from - https://github.com/duerst/eprun/blob/master/lib/string_normalize.rb. - (removing trailing whitespace, fixing EOLs and adding EOL property) - -Sun Oct 19 09:56:56 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * tool/unicode_norm_gen.rb: Changed module name. - -Sun Oct 19 09:48:48 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize/normalize.rb: Changed module name, - adjusted copyright. - -Sun Oct 19 09:38:38 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize/normalize.rb: Importing from - https://github.com/duerst/eprun/blob/master/lib/normalize.rb. - -Sat Oct 18 20:40:52 2014 Kazuki Tsujimoto <kazuki@callcc.net> - - * vm_core.h, proc.c, vm_backtrace.c, vm_trace.c: - remove rb_binding_new_with_cfp, and use rb_vm_make_binding instead. - -Sat Oct 18 20:38:48 2014 Kazuki Tsujimoto <kazuki@callcc.net> - - * vm_core.h, vm.c, proc.c: fix GC mark miss on bindings. - [ruby-dev:48616] [Bug #10368] - - * test/ruby/test_eval.rb: add a test code. - -Fri Oct 17 22:47:11 2014 Tanaka Akira <akr@fsij.org> - - * pack.c (pack_unpack): Add casts for char references for 'u'. - Fix line ending recognition algorithm. - -Fri Oct 17 21:49:52 2014 Tanaka Akira <akr@fsij.org> - - * pack.c (pack_unpack): Add casts for char references for 'b' and 'h'. - -Fri Oct 17 17:50:10 2014 Tanaka Akira <akr@fsij.org> - - * Avoid undefined behaviors found by gcc -fsanitize=undefined. - gcc (Debian 4.9.1-16) 4.9.1 - - * string.c (rb_str_sum): Avoid undefined behavior. - -Fri Oct 17 17:43:50 2014 Tanaka Akira <akr@fsij.org> - - * Avoid undefined behaviors found by gcc -fsanitize=undefined. - gcc (Debian 4.9.1-16) 4.9.1 - - * include/ruby/ruby.h (INT2FIX): Avoid undefined behavior. - - * node.h (nd_set_line): Ditto. - - * pack.c (encodes): Ditto. - (pack_unpack): Ditto. - - * regint.h (BIT_STATUS_AT): Ditto. - (BS_BIT): Ditto. - - * time.c (time_mdump): Ditto. - (time_mload): Ditto. - - * vm_core.h (VM_FRAME_MAGIC_MASK): Ditto. - - * vm_trace.c (recalc_add_ruby_vm_event_flags): Ditto. - -Fri Oct 17 15:06:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * re.c (unescape_nonascii): make dynamically compiled US-ASCII - regexps ASCII-8BIT encoding if binary (hexadecimal, control, - meta) escapes are contained, as well as literal regexps. - [ruby-dev:48626] [Bug #10382] - -Fri Oct 17 03:05:08 2014 Eric Wong <e@80x24.org> - - * test/-ext-/bug_reporter/test_bug_reporter.rb - (test_bug_reporter_add): revert r47972 - * test/ruby/test_rubyoptions.rb (test_segv_test): revert r47971 - [ruby-core:65764] - -Thu Oct 16 23:17:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (rb_sigaltstack_size): double default size to get rid - of heap corruption by alternate stack overflow in SEGV handler. - typically happened at fprintf() in control_frame_dump(). - -Thu Oct 16 22:43:12 2014 Tanaka Akira <akr@fsij.org> - - * vm_backtrace.c (id2str): Fix a variable name. - [ruby-dev:48642] [Bug #10389] - -Thu Oct 16 20:01:26 2014 Tanaka Akira <akr@fsij.org> - - * test/ruby/envutil.rb (assert_pattern_list): Show number of matched - patterns and characters. - -Thu Oct 16 16:26:09 2014 Eric Wong <e@80x24.org> - - * cont.c (fiber_store): fix WIN32 fibers - [ruby-core:65745] [ruby-core:65758] - -Thu Oct 16 15:05:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (parser_here_document): do not append already appended - and disposed code fragment. [ruby-dev:48647] [Bug #10392] - -Thu Oct 16 10:35:33 2014 Eric Wong <e@80x24.org> - - * test/-ext-/bug_reporter/test_bug_reporter.rb - (test_bug_reporter_add): fix race - -Thu Oct 16 10:09:02 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_rubyoptions.rb (test_segv_test): fix race - -Thu Oct 16 09:17:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * cont.c (rb_fiber_t): fix compile error caused by move to - vm_core.h at r47964. [Feature #10341] - -Thu Oct 16 08:58:11 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): - avoid killing wrong parent - -Thu Oct 16 08:40:04 2014 Eric Wong <e@80x24.org> - - * cont.c (fiber_store): restore references to next_fib (fix typo) - -Thu Oct 16 08:26:08 2014 Eric Wong <e@80x24.org> - - * cont.c (fiber_store): remove references to nextfib - fix build when FIBER_USE_NATIVE is 0 - -Thu Oct 16 06:51:35 2014 Knut Franke <Knut.Franke@gmx.de> - - * vm_core.h: declare rb_fiber_t typedef - (rb_thread_t): fiber and root_fiber become rb_fiber_t * (from VALUE) - * vm.c (rb_thread_mark): use rb_fiber_mark_self - * cont.c (rb_fiber_t): prev becomes rb_fiber_t * (from VALUE) - (cont_mark, cont_free): simplify conditions - (rb_fiber_mark_self): new function - (fiber_mark): use rb_fiber_mark_self - (cont_save_thread, cont_restore_thread): inline - (cont_restore_thread): simplify - (fiber_setcontext): simplify conditions - (rb_cont_call): remove dereference - (fiber_t_alloc): update for rb_fiber_t->prev type change - (rb_fiber_start): ditto - (fiber_current): extract from rb_fiber_current - (return_fiber): move, simplify type checks - (rb_fiber_current): use fiber_current - (fiber_store): simplify type checks - (fiber_switch): ditto, simplify call to fiber_setcontext, - use fiber_current - (rb_fiber_transfer): update for type changes - (rb_fiber_terminate): move, use fiber_switch - (rb_fiber_resume): update for type changes - (rb_fiber_reset_root_local_storage): ditto - (rb_fiber_yield): use rb_fiber_switch instead of rb_fiber_transfer - (rb_fiber_m_transfer): ditto - [ruby-core:65518] [Feature #10341] - -Thu Oct 16 06:25:29 2014 Knut Franke <Knut.Franke@gmx.de> - - * cont.c (rb_context_t): comment on saved_thread - (cont_save_thread): sparse copy - (cont_init): copy extra fields - (fiber_init): use current thread VM stack size - [ruby-core:65518] [Feature #10341] - -Thu Oct 16 06:13:09 2014 Knut Franke <Knut.Franke@gmx.de> - - * cont.c (cont_capture): remove unnecessary variable - [ruby-core:65518] [Feature #10341] - -Thu Oct 16 05:02:31 2014 Knut Franke <Knut.Franke@gmx.de> - - * cont.c (fiber_store, fiber_switch): simplify - [ruby-core:65518] [Feature #10341] - -Thu Oct 16 04:28:41 2014 Knut Franke <Knut.Franke@gmx.de> - - * cont.c (rb_fiber_t): remove prev_fiber/next_fiber - (fiber_link_join, fiber_link_remove): remove functions - (fiber_free, fiber_init, root_fiber_alloc): - remove references to removed fields and functions - [ruby-core:65518] [Feature #10341] - -Wed Oct 15 22:08:37 2014 Tanaka Akira <akr@fsij.org> - - * ext/etc/etc.c (etc_nprocessors_affin): Test CPU_ALLOC availability. - CentOS 5 don't have CPU_ALLOC(). - -Wed Oct 15 18:26:19 2014 KOSAKI Motohiro <kosaki.motohiro@gmail.com> - - * ext/etc/etc.c (etc_nprocessors_affinity): use sched_getaffinity - for getting precious number of available cpus. - - * ext/etc/etc.c (etc_nprocessors): use etc_nprocessors_affinity if - possible. - - [Feature #10267] etc-nprocessors-kosaki2.patch - -Wed Oct 15 17:53:28 2014 Tanaka Akira <akr@fsij.org> - - * test/ruby/envutil.rb (assert_pattern_list) Renamed from - assert_regexp_list. - Show multiline string in multi lines. - - * test/-ext-/bug_reporter/test_bug_reporter.rb: Use - assert_pattern_list. - -Wed Oct 15 12:26:58 2014 Tanaka Akira <akr@fsij.org> - - * test/ruby/envutil.rb (assert_regexp_list): New assertion method. - - * test/ruby/test_rubyoptions.rb: Use assert_regexp_list. - -Wed Oct 15 07:21:09 2014 Tanaka Akira <akr@fsij.org> - - * enum.c: min(n) drops elements bigger than the n-th maximum element. - (struct nmin_data): New field to record the n-th maximum element, limit - (nmin_filter): Update limit field. - (nmin_i): Drop too big elements. - (nmin_run): Initialize limit field. - -Wed Oct 15 07:00:14 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_optimization.rb (test_string_size): new test - -Wed Oct 15 06:51:13 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_optimization.rb (test_string_eq_neq): new test - (test_string_ltlt): ditto - -Wed Oct 15 06:50:29 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_optimization.rb (test_hash_aset_with): - assert assignment - -Wed Oct 15 04:56:27 2014 Zachary Scott <e@zzak.io> - - * gc.c (rb_obj_id): [DOC] Fix typo, clean up sentence, and wrap cols - -Wed Oct 15 04:53:30 2014 Zachary Scott <e@zzak.io> - - * error.c: [DOC] Fix case of type in exception message by @tricknotes - [Fixes GH-740] https://github.com/ruby/ruby/pull/740 - - * object.c: ditto - -Tue Oct 14 21:39:16 2014 Vit Ondruch <vondruch@redhat.com> - - * tool/rbinstall.rb (gem): Fix permissions of bundled gems - specification files. [ruby-core:65700] [Bug #10383] - -Tue Oct 14 19:15:31 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_record.c: use typed data. - -Tue Oct 14 16:23:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * symbol.c (global_symbols): make ids two-dimensional array of - strings and symbols, for write-barrier. - - * symbol.c (global_symbols): make IDs immortal always, instead - of treating dynamic symbols as IDs. - - * iseq.c, marshal.c, string.c: use rb_str_intern instead of - rb_str_dynamic_intern. - - * symbol.c (rb_str_intern): rename rb_str_dynamic_intern. - -Tue Oct 14 10:19:10 2014 Eric Wong <e@80x24.org> - - * test/ruby/test_optimization.rb (test_string_freeze): new test - (test_hash_aref_with): ditto - (test_hash_aset_with): ditto - -Tue Oct 14 01:27:54 2014 Tanaka Akira <akr@fsij.org> - - * enum.c (nmin_run): max(n) and max_by(n) returns an array in - descending order. - [ruby-core:65452] Suggested by David Grayson. - -Mon Oct 13 20:44:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * common.mk (update-gems): chdir to the target directory and then - add the tool directory to load paths, for older BASERUBY. - [Bug #10372][ruby-core:65630] - -Mon Oct 13 17:53:01 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/xmlrpc/parser.rb: added new parser class using libxml-ruby gem. - [Feature #9379][ruby-core:59633] - * lib/xmlrpc/config.rb: ditto. - -Mon Oct 13 16:32:56 2014 Tanaka Akira <akr@fsij.org> - - * lib/find.rb (Find.find): Call to_path for arguments to obtain - strings. - [ruby-core:63713] [Bug #10035] Reported by Herwin. - -Mon Oct 13 15:42:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * common.mk: use relative load path for bundled_gems directory. - [Bug #10372][ruby-core:65630] - -Mon Oct 13 08:44:06 2014 Zachary Scott <e@zzak.io> - - * README.EXT: [DOC] fix example missing typedef with patch by - @steveklabnik [Fixes GH-739] https://github.com/ruby/ruby/pull/739 - - * README.EXT.ja: ditto. - -Mon Oct 13 06:52:09 2014 Eric Wong <e@80x24.org> - - * array.c (ary_recycle_hash): add RB_GC_GUARD - (rb_ary_diff): remove volatile - [Bug #10369] - -Mon Oct 13 03:20:23 2014 Zachary Scott <e@zzak.io> - - * ext/date/date_core.c: [DOC] Clean up whitespace, examples, and typos - in date_core based on a patch by @vipulnsward [Fixes GH-724] - https://github.com/ruby/ruby/pull/724 - -Mon Oct 13 02:39:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (remove_duplicate_keys): should not simply eliminate all - value nodes, which may have side effects. - [ruby-core:65625] [Bug #10315] - -Sun Oct 12 10:39:16 2014 Zachary Scott <e@zzak.io> - - * vm.c: [DOC] fix typo by @yui-knk [Fixes GH-738] - https://github.com/ruby/ruby/pull/738 - -Sun Oct 12 09:24:15 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/test/unit.rb: Hide skips by default. - -Sun Oct 12 01:37:11 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * file.c: include sys/time.h only if HAVE_SYS_TIME_H - -Sat Oct 11 22:29:40 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * file.c (HAVE_UTIMENSAT): disabled for NativeClient. - Fixes build error. - -Sat Oct 11 22:11:58 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * ext/extmk.rb: generates the rule for extinit.$(OBJEXT). - extinit.$(OBJEXT) used to be generated by the builtin rule, thus - didn't accept custom $(CC) and caused linkage error for cross - compiling. - -Sat Oct 11 18:46:50 2014 Yuki Yugui Sonoda <yugui@yugui.jp> - - * include/ruby/intern.h (rb_fd_select): declare struct timeval, or the - struct gets local to the function in C99. - - * file.c (#include): add nacl/stat.h for PNaCl. - (utimes): added a declaration for PNaCl. - (stat_atimespec): stat::st_atimensec is long long but - timespec::tv_nsec is long in PNaCl. - (stat_mtimespec, stat_ctimespec): ditto. - (rb_group_member): disable getgroups unless HAVE_GETGROUPS. - (eaccess): unify the fallback to generic defined(USE_GETEUID). - - * io.c: include sys/time.h for struct timeval. - (rb_close_before_exec): nothing we can do if F_GETFD is not - available. - (ioctl): pnacl newlib actually doesn't have ioctl. - - * process.c (maxgroups): it is used iff - defined(_SC_NGROUPS_MAX) || defined(NGROUPS_MAX) but not - defined(HAVE_GETGROUPS) || defined(HAVE_SETGROUPS). - (obj2gid): fail unless the object is a Fixnum if getgrnam is not - available. - (disable_child_handler_fork_child): sigaction is not available in - PNaCl newlib. - - * configure.in (warnflags, strict_warnflags): avoid -ansi for strlcpy. - (rb_cv_gcc_atomic_builtins): also check - __atomic_or_etch because it is used in ruby_atomic.h. - (rb_cv_gcc_sync_builtins): ditto. - (HAVE_GETGRNAM): added. - -Sat Oct 11 15:32:08 2014 Eric Wong <e@80x24.org> - - * compile.c (iseq_build_from_ary_exception): move RB_GC_GUARD - (iseq_build_from_ary_body): use PRIsVALUE instead of RB_GC_GUARD - -Sat Oct 11 14:57:08 2014 Eric Wong <e@80x24.org> - - * string.c (rb_str_intern): remove unnecessary RB_GC_GUARD - -Sat Oct 11 13:47:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (remove_duplicate_keys): remove duplicate literal keys, - i.e., symbols and strings. [ruby-core:65368] [Bug #10315] - - * vm.c (kwmerge_i): override existing keys by new keys. - [ruby-core:65368] [Bug #10315] - - * parse.y (assocs): concatenate splatted literal hashes. the - former key has precedence even if duplicated literal keys - follow. [ruby-core:65368] [Bug #10315] + * ext/openssl/ossl_ssl.c (ossl_ssl_initialize): Added. Almost the same + as the Ruby version but this instantiate the SSL object at the same + time. -Sat Oct 11 12:27:03 2014 Yuki Yugui Sonoda <yugui@yugui.jp> + (ossl_ssl_setup): Adjust to the changes. Just set the underlying IO to + the SSL. - * configure.in (RUBY_NACL): automatically locate pnacl-clang. - (RUBY_PLATFORM): pnacl instead of le32-nacl. + (ssl_started): Added. Make use of SSL_get_fd(). This returns -1 if not + yet set by SSL_set_fd(). -Sat Oct 11 11:27:14 2014 Yuki Yugui Sonoda <yugui@yugui.jp> + (ossl_ssl_data_get_struct): Removed. Now GetSSL() checks that the SSL + exists. - * io.c: fix issues in the last two commits. don't disable cloexec for - platforms other than NativeClient. + (ossl_ssl_set_session): Don't call ossl_ssl_setup() here as now the + SSL is already instantiated in #initialize. - * ChangeLog: ditto. add entries for the last two commits. + (ossl_ssl_shutdown, ossl_start_ssl, ossl_ssl_read_internal, + ossl_ssl_write_internal, ossl_ssl_stop, ossl_ssl_get_cert, + ossl_ssl_get_peer_cert, ossl_ssl_get_peer_cert_chain, + ossl_ssl_get_version, ossl_ssl_get_cipher, ossl_ssl_get_state, + ossl_ssl_pending, ossl_ssl_session_reused, + ossl_ssl_get_verify_result, ossl_ssl_get_client_ca_list, + ossl_ssl_npn_protocol, ossl_ssl_alpn_protocol, ossl_ssl_tmp_key): Use + GetSSL() instead of ossl_ssl_data_get_struct(). Use ssl_started(). -Sat Oct 11 11:12:00 2014 Yuki Yugui Sonoda <yugui@yugui.jp> + (Init_ossl_ssl): Add method declarations of SSLSocket#{initialize, + hostname=}. - * signal.c (install_signalhandler, init_sigchld): allow failure because it - always fails with ENOSYS on NaCl. + * ext/openssl/ossl_ssl.h (GetSSL): Check that the SSL is not NULL. It + should not be NULL because we now set it in #initialize. -Sat Oct 11 11:11:53 2014 Yuki Yugui Sonoda <yugui@yugui.jp> + * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize): No need + to check if the SSL is NULL. - * configure.in (RUBY_NACL and others): merge patch from naclports. Supports PNaCl. +Sat May 28 10:47:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * dln.c: ditto. replace the old hacky dynamic loading over HTTP with nacl_io. + * gems/bundled_gems: Update latest releases, power_assert-0.3.0, + test-unit 3.1.9, minitest 5.9.0, did_you_mean 1.0.1 - * file.c: ditto. tentatively use access(2) instead of eaccess. - (rb_file_load_ok): weaken with attribute but not by postprocess. +Sat May 28 10:45:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + * addr2line.c: drop support for ATARI ST platform. It was + discontinued more than two decades ago. [fix GH-1350] Patch by + @cremno + * include/ruby/ruby.h: ditto. * io.c: ditto. - (socket.h): now NaCl has socket.h - (flock): disable here instead of nacl/ioctl.h - - * nacl/GNUmakefile.in: ditto. - (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY): - respect path to them if they are absolute. - This helps naclports to build ruby in their source tree. - (PROGRAM_NMF, .SUFFIXES): support .pnexe for PNaCl. - (ruby.o, file.o): move the hack to attributes in ruby.c and file.c - - * nacl/ioctl.h: ditto. removed. move the hack to io.c. - - * nacl/nacl-config.rb: ditto. support arm, pnacl and others. - - * nacl/pepper_main.c: ditto. support build in a naclports tree. - - * ruby.c (rb_load_file): ditto. weaken with attribute but not by postprocess. - -Sat Oct 11 09:32:00 2014 Zachary Scott <e@zzak.io> - - * ext/socket/unixsocket.c: [DOC] Fix example to render in HTML - properly, with a patch by @eval [Fixes GH-733] - https://github.com/ruby/ruby/pull/733 - -Sat Oct 11 04:14:41 2014 Kir Shatrov <shatrov@me.com> - - * lib/open-uri.rb (OpenURI::Options): add :open_timeout default - * (def OpenURI.open_http): check :open_timeout option - * (module OpenURI): rdoc for :open_timeout - * test/open-uri/test_open-uri.rb (test_open_timeout): new test - [Feature #10361] - -Fri Oct 10 11:27:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * include/ruby/io.h (rb_io_mode_flags, rb_io_modenum_flags): - deprecate old macros for compatibility for ruby 1.8 and older. - -Thu Oct 9 23:31:47 2014 Naohisa Goto <ngotogenome@gmail.com> - - * bignum.c (absint_numwords_generic): set an array element after - definition of a variable to fix compile error with older version - of fcc (Fujitsu C Compiler) 5.6 on Solaris 10 on Sparc. - [Bug #10350] [ruby-dev:48608] - -Thu Oct 9 16:15:26 2014 Eric Wong <e@80x24.org> - - * ext/-test-/st/foreach/extconf.rb: new file - * ext/-test-/st/foreach/foreach.c: ditto - * test/-ext-/st/test_foreach.rb: ditto - [Feature #10321] - -Thu Oct 9 12:40:28 2014 Eric Wong <e@80x24.org> - - * benchmark/bm_hash_aref_sym*.rb: force static symbols - -Thu Oct 9 12:38:28 2014 Eric Wong <e@80x24.org> - - * hash.c (rb_any_hash): remove unnecessary dsym check - -Thu Oct 9 07:20:30 2014 Rei Odaira <Rei.Odaira@gmail.com> - - * missing/setproctitle.c: Avoid invalidating argv[1], argv[2], - etc. until the first call to Process.setproctitle, because - the ps command of AIX refers to the argv array. - [Bug #10090] - -Thu Oct 9 00:53:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * dir.c (dir_s_aref): fix rdoc. `Dir.glob` allows an array but - `Dir[]` not. the former accepts an optional parameter `flags`, - while the latter accepts arbitrary number of arguments but no - `flags`. [ruby-core:65265] [Bug #10294] - -Wed Oct 8 21:44:10 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_variable.c: use typed data. - -Wed Oct 8 16:36:47 2014 gogo tanaka <mail@tanakakazuki.com> - - * test/ruby/test_syntax.rb: added syntax tests of underscore - arguments. [Feature #10340][ruby-core:65496] - -Wed Oct 8 07:42:39 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/generic.rb (URI#inspect): remove Object id. - URI is considered that it doesn't require id. - -Wed Oct 8 05:22:42 2014 Eric Wong <e@80x24.org> - - * ext/etc/etc.c (etc_systmpdir): set default tmplen correctly - Fixup r47826 - -Wed Oct 8 05:16:32 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Add @- and @+ for Matrix and Vector. - patch by gogo tanaka [#10068] [#10069] - -Wed Oct 8 04:58:48 2014 John Bachir <j@jjb.cc> - - * bootstraptest/test_io.rb (assert_finish): - normalize rescue for Timeout::Error - * lib/net/ftp.rb (Net#read_timeout): ditto for doc - * lib/resolv.rb (Resolv::ResolvTimeout): ditto for subclass - * lib/webrick/httprequest.rb (_read_data): ditto for rescue - * sample/timeout.rb (p timeout): ditto for call - * test/drb/drbtest.rb (test_06_timeout): ditto - * test/ruby/test_readpartial.rb (test_open_pipe): ditto - * test/thread/test_queue.rb (test_queue_thread_raise): ditto - * thread.c (rb_thread_s_handle_interrupt): ditto for doc - [ruby-core:65481] [misc #10339] - -Wed Oct 8 04:38:29 2014 Rei Odaira <Rei.Odaira@gmail.com> - - * test/ruby/test_process.rb (TestProcess#test_setsid): AIX - does not allow Process::getsid(pid) when pid is in a - different session. - -Wed Oct 8 04:33:04 2014 Rei Odaira <Rei.Odaira@gmail.com> - - * test/ruby/test_rubyoptions.rb (TestRubyOptions#test_encoding): - On AIX, locale_charmap is ISO-8859-1 with LANG=C. This means - the source encoding of stdin is ISO-8859-1, so "invalid - multibyte char" error does not occur. - -Wed Oct 8 04:30:29 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Add Matrix#laplace_expansion. - patch by gogo tanaka [#10073] - -Wed Oct 8 04:29:21 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Add Vector.basis. - Based on patch by gogo tanaka [#10072] - -Tue Oct 7 23:40:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (rb_f_kill): get rid of deadlock as unhandled and - discarded signals do not make interrupt_cond signaled. - based on the patch by Kazuki Tsujimoto at [ruby-dev:48606]. - [Bug #9820] - -Tue Oct 7 22:43:44 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_method.c: use typed data. - -Tue Oct 7 21:47:05 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_param.c: refactoring. - -Tue Oct 7 21:40:17 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_method.c: refactoring. add - olemethod_data_get_struct to wrap Data_Get_Struct. - * ext/win32ole/win32ole_method.h: ditto. - - * ext/win32ole/win32ole_param.c (oleparam_ole_param): - call olemethod_data_get_struct instead of Data_Get_Struct. - -Tue Oct 7 11:17:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/etc/etc.c (etc_systmpdir): try user temporary directory by - confstr() on Mac OS X. - c.f. http://www.opensource.apple.com/source/ruby/ruby-104/patches/ext_etc_etc.c.diff - -Tue Oct 7 10:48:17 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (struct stat.st_size): prefer off_t over int, long, - and so on. inspired by - http://www.opensource.apple.com/source/ruby/ruby-104/patches/config.h.ed - -Tue Oct 7 10:37:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (RUBY_UNIVERSAL_ARCH): fix missing quoting - brackets. incorporated from - http://www.opensource.apple.com/source/ruby/ruby-104/patches/configure.diff - -Mon Oct 6 23:34:42 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_param.c: use typed data. - -Mon Oct 6 22:37:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * symbol.h (struct RSymbol): move from internal.h. - -Mon Oct 6 21:43:03 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * error.c: update exception tree. [DOC] - reported by @hemge via twitter. - -Mon Oct 6 18:43:03 2014 Rei Odaira <Rei.Odaira@gmail.com> - - * configure.in: Fix typo. [Bug #9914] - -Mon Oct 6 16:23:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (rb_f_kill): should not ignore signal unless the - default handler is registered. [ruby-dev:48592] [Bug #9820] - -Mon Oct 6 16:07:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * test/ruby/test_string.rb (test_LSHIFT_neary_long_max): enable - only on platforms where string size range is smaller than memory - space. this test does not make sense but just wastes memory and - time on other platforms, as it is hardly possible that a string - size becomes neary LONG_MAX if long size equals pointer size. - [ruby-core:65410] [Bug #10325] - -Mon Oct 6 11:21:21 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * tool/unicode_norm_gen.rb: Adding/tweaking comments. - -Mon Oct 6 10:57:57 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * tool/unicode_norm_gen.rb: Adjusted directory paths. - -Mon Oct 6 10:27:27 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * tool/unicode_norm_gen.rb: Data generation script imported from - https://github.com/duerst/eprun/blob/master/lib/generate.rb - -Mon Oct 6 10:15:15 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * tool/downloader.rb: Adjust example in documentation for - Downloader.download. - -Mon Oct 6 10:07:07 2014 Martin Duerst <duerst@it.aoyama.ac.jp> - - * lib/unicode_normalize: New folder for Unicode normalization - functionality - -Sun Oct 5 11:04:13 2014 Luiz Angelo Daros de Luca <luizluca@gmail.com> - - * ext/digest/{md5,rmd160,sha1,sha2}/extconf.rb: configure OpenSSL - only if bundled libraries is not used, so that OpenSSL is not - linked unnecessarily. [ruby-core:65404] [Bug #10324] - -Sun Oct 5 10:39:11 2014 Luiz Angelo Daros de Luca <luizluca@gmail.com> - - * ext/digest/rmd160/extconf.rb: fix transform function name to - check. [ruby-core:65091] [Bug #10252] - -Sun Oct 5 05:46:00 2014 Eric Wong <e@80x24.org> - - * ext/zlib/zlib.c (zstream_mark, zstream_free): update signature - (gzfile_mark, gzfile_free): ditto - (zstream_memsize): new function for rb_data_type->dsize - (gzfile_memsize): ditto - (zstream_data_type, gzfile_data_type): new data types - (zstream_new): Data_Make_Struct => TypedData_Make_Struct - (gzfile_new): ditto - (get_zstream, get_gzfile): Data_Get_Struct => TypedData_Get_Struct - (rb_zstream_flush_next_in): ditto - (rb_zstream_flush_next_out): ditto - (rb_zstream_avail_out): ditto - (rb_zstream_avail_in): ditto - (rb_zstream_closed_p): ditto - (rb_deflate_initialize): ditto - (rb_deflate_init_copy): ditto - (rb_inflate_initialize): ditto - (gzfile_ensure_close): ditto - (rb_gzfile_closed_p): ditto - (rb_gzfile_path): ditto - (rb_gzwriter_initialize): ditto - (rb_gzreader_initialize): ditto - (rb_gzreader_unused): ditto - [ruby-core:65377] [Feature #10319] - -Sat Oct 4 16:24:41 2014 Rei Odaira <Rei.Odaira@gmail.com> - - * test/test_syslog.rb (TestSyslog#test_log): In AIX, each output - line of LOG_PERROR to stderr has an additional empty line appended, - so skip that line. - -Sat Oct 4 16:05:49 2014 Rei Odaira <Rei.Odaira@gmail.com> - - * test/socket/test_unix.rb (TestSocket_UNIXSocket#test_too_long_path): - sockaddr_un.sun_path in AIX is defined as char[1024], - so "a" * 300 is not too long. "a" * 3000 would be enough. - -Sat Oct 4 09:12:03 2014 Zachary Scott <e@zzak.io> - - * ext/win32ole/sample/example*.rb: Add wait input to quit for examples - with patch provided by @windwiny [Fixes GH-705] - https://github.com/ruby/ruby/pull/705 - -Sat Oct 4 09:08:18 2014 Zachary Scott <e@zzak.io> - - * ext/win32ole/win32ole.c: [DOC] Fix typo in :nodoc: reported by - @windwiny to [Fix GH-705] https://github.com/ruby/ruby/pull/705 - - * ext/pty/pty.c: ditto - -Sat Oct 4 08:59:45 2014 Zachary Scott <e@zzak.io> - - * ext/openssl/ossl_rand.c: [DOC] Add call signature for pseudo_bytes - and random_bytes, wrap lines at 80 chars, and remove useless - comments. - -Sat Oct 4 08:49:34 2014 Zachary Scott <e@zzak.io> - - * ext/openssl/ossl_rand.c: [DOC] Add rdoc for method descriptions - By @vipulnsward [Fixes GH-657] https://github.com/ruby/ruby/pull/657 -Sat Oct 4 08:23:48 2014 Zachary Scott <e@zzak.io> +Sat May 28 10:39:47 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/openssl/ossl_rand.c: Use rb_define_module_function instead of - macro. [Fixes GH-686] https://github.com/ruby/ruby/pull/686 + * test/ruby/enc/test_case_comprehensive.rb: Converted exception for + unavailable Unicode data files to failed assertion. -Sat Oct 4 06:04:56 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Sat May 28 10:26:18 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/win32ole/win32ole_method.c(olemethod_set_member): remove - redundant NULL check. - * ext/win32ole/win32ole_type.c(oletype_set_member): ditto. + * lib/cgi/util.rb: added missing quote. + [fix GH-1363][ci skip] Patch by @dwaller -Sat Oct 4 00:25:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri May 27 17:38:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * .travis.yml: removed needless preparation for gcc. + * variable.c (rb_local_constants_i): exclude hidden constants. + [ruby-core:75575] [Bug #12389] -Fri Oct 3 23:41:20 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri May 27 17:09:44 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * .travis.yml: enabled gcc build with osx on travis. + * transcode.c (str_transcode0): scrub in the given encoding when + the source encoding is given, not in the encoding of the + receiver. [ruby-core:75732] [Bug #12431] -Fri Oct 3 23:22:23 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com> +Fri May 27 15:07:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * template/fake.rb.in: fix make install failure due to MSYS path - with mingw on MSYS environment. - [ruby-core:64965] [Bug #10230] + * include/ruby/ruby.h (rb_scan_args): remove nul padding which + caused syntax error if fmt is not a string literal. -Fri Oct 3 21:02:32 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * include/ruby/ruby.h (rb_scan_args_verify): suppress array-bounds + warnings by old clang. - * test/ruby/test_io.rb (TestIO#test_advise): avoid to infinite loop. + * include/ruby/ruby.h (rb_scan_args0): make extractor macros + inline functions, which do not validate the format and are + unnecessary to be expanded. -Fri Oct 3 19:26:01 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri May 27 01:00:36 2016 NARUSE, Yui <naruse@ruby-lang.org> - * .travis.yml: enabled test results of linux. + * symbol.c (is_identchar): use ISDIGIT instead of rb_enc_isalnum. + Though rb_enc_isalnum is encoding aware function, its argument here + is *m, which is a single byte. Therefore ISDIGIT is faster. -Fri Oct 3 18:52:16 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * symbol.c (is_special_global_name): ditto. - * test/ruby/test_io.rb (TestIO#test_advise): added workaround of fadvise(2) - with tmpfs and old linux kernel. [ruby-core:65355][Bug #10313] + * symbol.c (rb_enc_symname_type): ditto. -Fri Oct 3 18:22:45 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri May 27 00:39:40 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * .travis.yml: Disabled to generate document on travis. - Reduce test running time. + * include/ruby/ruby.h (rb_scan_args): add nul padding here to + apply to all references. -Fri Oct 3 12:42:15 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + * include/ruby/ruby.h (rb_scan_args_verify): move length mismatch + check outside conditional operators. - * lib/matrix.rb: Add hstack & vstack methods. - Based on a patch by creasywuqiong. [Fix GH-344] +Thu May 26 14:21:10 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri Oct 3 12:37:48 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + * ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH + has 'p' (the prime) before calling DH_size(). We can create a DH with + no parameter but DH_size() does not check and dereferences NULL. + [ruby-core:75720] [Bug #12428] - * lib/matrix.rb: Fix Matrix.rows copy bug. - Patch by Arron Mabrey. [Fix GH-707] + * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_sign): Ditto. DSA_size() does + not check dsa->q. -Fri Oct 3 06:06:28 2014 Eric Wong <e@80x24.org> + * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt, + ossl_rsa_public_decrypt, ossl_rsa_private_encrypt, + ossl_rsa_private_decrypt): Ditto. RSA_size() does not check rsa->n. - * st.c (next_pow2): new function (from old bignum.c) - (new_size): use next_pow2 function +Thu May 26 14:13:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Oct 3 05:58:58 2014 Eric Wong <e@80x24.org> + * include/ruby/ruby.h (rb_scan_args_count): verify length with + counting variables together. - * vm_trace.c (rb_tp_t): pack 56 => 48 bytes on 64-bit +Thu May 26 09:45:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Oct 2 18:41:45 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * test/ruby/enc/test_case_comprehensive.rb: Add set of comprehensive + (across most Unicode characters; later across most character encodings) + tests for case mapping. - * ext/etc/etc.c (etc_nprocessors): Windows support. - see [Feature #10267] +Thu May 26 05:00:13 2016 Benoit Daloze <eregontp@gmail.com> -Thu Oct 2 12:21:52 2014 Tanaka Akira <akr@fsij.org> + * class.c (rb_define_class): Fix documentation. - * ext/etc/etc.c (etc_nprocessors): New method. - Accepted by matz at RubyKaigi 2014. - [ruby-core:65142] [Feature #10267] +Wed May 25 20:50:12 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu Oct 2 07:56:49 2014 Eric Wong <e@80x24.org> + * re.c (unescape_nonascii): scan hex up to only 3 characters. + [Bug #12420] [Bug #12423] - * iseq.c (rb_iseq_line_trace_each): explicit cast - Fix https://travis-ci.org/ruby/ruby/jobs/36814282 +Wed May 25 19:07:19 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Oct 2 05:40:05 2014 Eric Wong <e@80x24.org> + * enc/unicode.c: Handle DOTLESS_i by hand because it isn't involved in folding. - * ruby.h: set rb_event_flag_t to uint32_t - [ruby-core:65315] [misc #10249] +Wed May 25 18:30:53 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu Oct 2 05:32:17 2014 Eric Wong <e@80x24.org> + * regparse.c (fetch_token_in_cc): raise error if given octal escaped + character is too big. [Bug #12420] [Bug #12423] - * io.c (fptr_finalize): free memory before GC sweep - [ruby-core:65269] [Feature #10295] +Wed May 25 17:45:15 2016 Kazuki Yamaguchi <k@rhe.jp> -Thu Oct 2 05:27:24 2014 Eric Wong <e@80x24.org> + * ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support. - * marshal.c (w_class): check dump_arg->compat_tbl before lookup - (w_object): lazy init ->compat_tbl before insert - (obj_alloc_by_class): ditto - (clear_dump_arg): free only non-NULL ->compat_tbl - (clear_load_arg): ditto for ->compat_tbl - (marshal_dump): ->compat_tbl defaults to zero - (marshal_load): ditto for ->compat_tbl - (r_entry0): check l->compat_tbl before lookup - (r_fixup_compat): ditto - [ruby-core:65305] [Feature #10302] +Wed May 25 17:43:30 2016 Kazuki Yamaguchi <k@rhe.jp> -Wed Oct 1 21:14:34 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * ext/openssl/openssl_missing.h, ext/openssl/ossl.h: Remove + unnecessary 'extern "C"' blocks. We don't use C++ and these headers + are local to ext/openssl, so there is no need to enclose with it. - * ext/win32ole/win32ole_type.c: use typed data. +Wed May 25 17:42:58 2016 Kazuki Yamaguchi <k@rhe.jp> -Wed Oct 1 18:15:42 2014 Nolan Evans <nolane@gmail.com> + * ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is + unneeded because we can check the macro directly in source code, + just as we already do for OPENSSL_NO_* macros. - * compile.c: remove commented out code. + * ext/openssl/ossl.c: Replace occurrences of HAVE_OPENSSL_FIPS with + OPENSSL_FIPS. -Wed Oct 1 17:38:53 2014 Rei Odaira <Rei.Odaira@gmail.com> +Wed May 25 17:13:35 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/fileutils/test_fileutils.rb: AIX does not allow - a sticky bit on a regular file. + * class.c (rb_scan_args): merge code for n_trail. -Wed Oct 1 17:31:41 2014 Eric Hodel <drbrain@segment7.net> +Wed May 25 17:11:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * NEWS: Add RubyGems update. + * include/ruby/ruby.h (rb_scan_args_validate): move failed + condition to the terminal. [ruby-core:75714] [Bug #12426] -Wed Oct 1 17:28:58 2014 Eric Hodel <drbrain@segment7.net> +Wed May 25 13:13:37 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/rubygems: Update to RubyGems 2.4.2. - * test/rubygems: ditto. + * regcomp.c: remove condition for debug output because prelude + doesn't use regexp now. -Tue Sep 30 22:25:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed May 25 13:10:30 2016 NARUSE, Yui <naruse@ruby-lang.org> - * parse.y (parser_data_type): separate ripper data type for from - parser. + * regcomp.c (compile_length_tree): return error code immediately + if compile_length_tree raised error [Bug #12418] -Tue Sep 30 18:46:31 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Wed May 25 08:01:39 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/win32ole/win32ole_typelib.c: use typed data. + * enc/unicode.c: Fix flag error for switch from titlecase to lowercase. -Tue Sep 30 09:51:46 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * test/ruby/enc/test_case_mapping.rb: Tests for above error. - * common.mk: fixed broken reference of update-config_files task +Wed May 25 01:13:55 2016 Kazuki Yamaguchi <k@rhe.jp> -Mon Sep 29 22:54:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_pkey_ec.c (ec_key_new_from_group): Create a new + EC_KEY on given EC group. Extracted from ossl_ec_key_initialize(). + (ossl_ec_key_s_generate): Added. Create a new EC instance and + generate a random private and public key. + (ossl_ec_key_initialize): Use ec_key_new_from_group(). + (Init_ossl_ec): Define the new method EC.generate. This change is + for consistency with other PKey types. [ruby-core:45541] [Bug #6567] - * win32/file.c (append_wstr): set expanded length, not length of - appended string. fix "probable buffer overflow" bug. - [ruby-core:65317] [Bug #10304] + * test/openssl/test_pkey_ec.rb: Test that EC.generate works. - * string.c (str_make_independent_expand): drop NOFREE flag after - reallocation, static buffer is not pointed anymore. - [ruby-core:65317] [Bug #10304] +Wed May 25 00:37:16 2016 Kazuki Yamaguchi <k@rhe.jp> -Sun Sep 28 23:59:17 2014 Kazuki Tsujimoto <kazuki@callcc.net> + * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_generate_key): Fix up RDoc. + (Init_ossl_ec): Rename EC#generate_key to EC#generate_key!. Make the + old name an alias of #generate_key!. This change is for consistency + with other PKey types. [ruby-core:45541] [Bug #6567] - * gc.c (rb_gcdebug_print_obj_condition): use RVALUE_REMEMBERED - because GET_HEAP_REMEMBERSET_BITS is obsoleted. + * test/openssl/test_pkey_ec.rb: Use EC#generate_key! instead of + EC#generate_key. -Sun Sep 28 11:14:14 2014 Martin Duerst <duerst@it.aoyama.ac.jp> +Wed May 25 00:23:05 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * common.mk: Created new target update-unicode to download - some Unicode data files. + * include/ruby/ruby.h (rb_scan_args_set): check the arity after + adjusting argc for an option hash, for optimization in simpler + cases. -Fri Sep 26 15:03:19 2014 Masaki Matsushita <glass.saga@gmail.com> +Wed May 25 00:21:52 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/uri/rfc3986_parser.rb: raise URI::InvalidURIError when - uri doesn't respond to #to_str. [ruby-core:64453] [Bug #10150] + * configure.in (XCFLAGS): merge flags only for ruby itself from + ruby_cflags. - * test/uri/test_parser.rb: test for above. +Tue May 24 22:04:15 2016 Kazuki Yamaguchi <k@rhe.jp> -Sat Sep 27 10:31:48 2014 Kazuki Tsujimoto <kazuki@callcc.net> + * ext/openssl/ossl_cipher.c (ossl_cipher_set_key, ossl_cipher_set_iv): + Reject too long values as well as too short ones. Currently they + just truncate the input but this would hide bugs and lead to + unexpected encryption/decryption results. - * gems/bundled_gems: upgraded to power_assert 0.1.4. + * test/openssl/test_cipher.rb: Test that Cipher#key= and #iv= reject + Strings with invalid length. -Fri Sep 26 12:52:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue May 24 21:32:21 2016 Kazuki Yamaguchi <k@rhe.jp> - * ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO - should be writable any encoding strings, without conversion. - [ruby-core:65240] [Bug #10285] + * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): Use + ASN1_OCTET_STRING_set() instead of M_ASN1_OCTET_STRING_set(). Macros + prefixed by "M_" are discouraged to be used from outside OpenSSL + library[1]. + (ossl_x509ext_get_value): Likewise, use ASN1_STRING_print() instead + of M_ASN1_OCTET_STRING_print(). + [1] https://git.openssl.org/gitweb/?p=openssl.git;a=blob;f=CHANGES;h=bf61913d7b01212b4d8b2f3c13d71d645914f67c;hb=b6079a7835f61daa9fb2cbf9addfa86049523933#l878 -Fri Sep 26 05:21:01 2014 Eric Wong <e@80x24.org> + * ext/openssl/ossl.h: Include openssl/asn1.h instead of + openssl/asn1_mac.h. It just includes openssl/asn1.h and defines some + additional "M_" macros. - * object.c (rb_class_real): do not dereference 0 VALUE +Tue May 24 18:52:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/test_module.rb (test_inspect_segfault): - Test case and bug report by Thomas Stratmann. - [ruby-core:65214] [Bug #10282] + * include/ruby/ruby.h (rb_scan_args_verify): verify the format to + scan if no invalid chars and variable argument length matching, + at the compile time if possible. -Fri Sep 26 05:12:10 2014 Eric Wong <e@80x24.org> +Tue May 24 17:18:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * man/ruby.1: document stack size env variables - [Feature #10197] + * include/ruby/defines.h (ERRORFUNC, WARNINGFUNC): add fallback + definitions. -Thu Sep 25 19:37:34 2014 Eric Wong <e@80x24.org> +Tue May 24 16:37:43 2016 NARUSE, Yui <naruse@ruby-lang.org> - * io.c (free_io_buffer): new function for a common pattern - (clear_readconv): use free_io_buffer - (rb_io_fptr_finalize): ditto + * configure.in (ruby_cflags): separate from optflags [Bug #12409] + -fexcess-precision=standard and -fp-model precise are set to this now. -Thu Sep 25 07:51:07 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + * configure.in (cflags): use ruby_cflags. - * lib/matrix.rb: Fix docs. Patched by Ben Woodall. [GH-726] +Tue May 24 16:20:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Sep 24 19:04:04 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__ + attributes take a parenthesized string literal. - * enc/unicode/data: New directory for downloaded Unicode - data files. +Tue May 24 12:35:56 2016 URABE Shyouhei <shyouhei@ruby-lang.org> -Wed Sep 24 18:59:59 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * common.mk: sort lines, and add missing dependencies suggested + by tool/update-deps - * tool/downloader.rb: Adjusting example for - Downloader.download to implementation changes in r47693. +Mon May 23 21:33:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Sep 24 18:06:06 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * include/ruby/missing.h (isfinite): move from numeric.c. - * tool/downloader.rb: Removing unused method - Downloader.download_if_modified_since. - (if ever used, just replace with Downloader.download) +Mon May 23 21:09:06 2016 Kazuki Yamaguchi <k@rhe.jp> -Wed Sep 24 17:59:59 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * ext/openssl/ossl.c (Init_openssl): Avoid reference to unset global + variable. ossl_raise() may be called before dOSSL is set. Since + global variables default to 0 and the default value of dOSSL set in + Init_openssl() is also Qfalse, there is no real issue but confusing. + Patch by Bertram Scharpf <software@bertram-scharpf.de> + [ruby-core:58264] [Bug #9101] - * tool/downloader.rb: Fixing raise after return. +Mon May 23 20:32:16 2016 Kazuki Yamaguchi <k@rhe.jp> -Wed Sep 24 17:55:55 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * ext/openssl/ossl_asn1.c, ext/openssl/ossl_bn.c, + ext/openssl/ossl_cipher.c, ext/openssl/ossl_digest.c + ext/openssl/ossl_engine.c, ext/openssl/ossl_ns_spki.c + ext/openssl/ossl_pkcs12.c, ext/openssl/ossl_pkcs7.c + ext/openssl/ossl_pkey.c, ext/openssl/ossl_pkey_ec.c + ext/openssl/ossl_rand.c, ext/openssl/ossl_ssl.c + ext/openssl/ossl_x509attr.c, ext/openssl/ossl_x509cert.c + ext/openssl/ossl_x509ext.c, ext/openssl/ossl_x509store.c: Use + StringValueCStr() where NUL-terminated string is expected. - * tool/downloader.rb: Made Unicode data file location available - via :unicode Symbol. +Mon May 23 20:20:12 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Wed Sep 24 10:45:45 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on + cygwin. [Bug #12417][ruby-core:75691] - * tool/downloader.rb: Small fix to documentation comment. +Mon May 23 19:41:27 2016 Kazuki Yamaguchi <k@rhe.jp> -Tue Sep 23 22:00:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/ossl_rand.c (ossl_rand_egd, ossl_rand_egd_bytes): + RAND_egd{_bytes,}() return -1 on failure, not 0. + Patch by cremno phobia <cremno@mail.ru> + [ruby-core:63795] [Bug #10053] + (ossl_pseudo_bytes): Similar, RAND_pseudo_bytes() may return 0 or + -1 on failure. - * parse.y (parse_ident): just after a label, new expression should - start, cannot be a modifier. [ruby-core:65211] [Bug #10279] +Mon May 23 15:52:07 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Tue Sep 23 16:07:07 2014 Martin Duerst <duerst@it.aoyama.ac.jp> + * ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always + exist. fixed build error on Windows introduced at r55123. - * tool/downloader.rb: added Downloader.download_if_modified_since - to reduce downloads of large files that change only rarely. - [ruby-core:65164] [CommonRuby - Feature #10084] +Mon May 23 13:19:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Sep 23 11:55:09 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * include/ruby/ruby.h (rb_scan_args0): make compile error if the + format is wrong or does not match with the variable argument + length if possible. - * .travis.yml: added rubyspec into travis tasks and eliminate to stdout. +Mon May 23 12:47:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Sep 22 20:00:29 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * include/ruby/ruby.h (rb_scan_args0): raise fatal error if + variable argument length does not match, it is a bug in the code + which uses rb_scan_args, not a runtime error. - * test/win32ole/test_win32ole_variant.rb - (test_conversion_time2date_with_msec): test by using only - assert_in_delta to avoid to fail when converting Time object with - 999999999 nanoseconds into VT_DATE Variant. +Mon May 23 12:30:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Sep 22 19:49:12 2014 Zachary Scott <e@zzak.io> + * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider + non-finite float values not to raise FloatDomainError. + [ruby-core:75682] [Bug #12414] - * doc/syntax/methods.rdoc: [DOC] [] and []= methods by @process - [Fixes GH-662] https://github.com/ruby/ruby/pull/662 +Mon May 23 12:21:18 2016 NARUSE, Yui <naruse@ruby-lang.org> -Mon Sep 22 18:21:35 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * array.c (rb_ary_fill): suppress warnings: 'item' may be used + uninitialized in this function - * .travis.yml: Only osx build is enabled. linux builds is random failure - and test results of major linux is covered by rubyci. +Mon May 23 07:41:49 2016 Eric Wong <e@80x24.org> -Mon Sep 22 12:10:29 2014 Tanaka Akira <akr@fsij.org> + * dir.c (dir_close): update RDoc for 2.3 #close change + [ruby-core:75679] [Bug #12413] - * test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g. - [ruby-core:65058] [Bug #10245] Reported by Vit Ondruch. +Sun May 22 20:01:21 2016 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> -Mon Sep 22 09:28:43 2014 Eric Wong <e@80x24.org> + * lib/drb/timeridconv.rb: use finalizer trick instead of thread. - * ext/socket/ancdata.c ({send,recv}msg_args_struct): 24 => 16 bytes - * ext/socket/init.c (connect_arg): ditto - * ext/socket/raddrinfo.c (getnameinfo_arg): 56 => 48 bytes - (reductions only for 64-bit systems) + * test/drb/ut_timerholder.rb: ditto. -Mon Sep 22 02:04:25 2014 Tanaka Akira <akr@fsij.org> +Sun May 22 17:25:18 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/drb/drb.rb: Support graceful shutdown. - (DRbTCPSocket#initialize): Create a pipe for shutdown notification. - (DRbTCPSocket#close): Invoke close_shutdown_pipe. - (DRbTCPSocket#close_shutdown_pipe): New private method. - (DRbTCPSocket#accept): Use accept_or_shutdown. - (DRbTCPSocket#accept_or_shutdown): New private method which returns - nil on shutdown. - (DRbServer#stop_service): Use shutdown instead of Thread#kill. - (DRbServer#run): Break infinite loop when main_loop returns nil. - (DRbServer#main_loop): @protocol.accept may return nil. + * test/ruby/enc/test_case_options.rb: adjust test class name + to match file name - * lib/drb/ssl.rb: Follow above change. +Sun May 22 17:24:07 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/drb/unix.rb: Ditto. + * rename test/ruby/enc/test_casing_options.rb to test_case_options.rb + for consistency -Sun Sep 21 13:54:36 2014 Masaki Matsushita <glass.saga@gmail.com> +Sun May 22 17:06:55 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * time.c: raise exception when minutes of utc_offset is out of 00-59. - patch is from Kenichi Kamiya. - [ruby-dev:47539] [Bug #8679] + * transcode.c (enc_arg, str_transcode_enc_args, econv_args): + remove volatile, and add GC guards in callers. + [ruby-core:75664] [Bug #12411] - * test/ruby/test_time.rb: test for above. - patch is from Kenichi Kamiya. +Sun May 22 16:27:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Sep 21 19:04:08 2014 Narihiro Nakamura <authornari@gmail.com> + * ext/-test-/integer/core_ext.c: move testutil/integer.c. - * st.c (do_hash_bin): unused macro. + * test/lib/-test-/integer.rb: extract implementation details from + test/unit/assertions.rb. [Bug #12408] -Sun Sep 21 18:45:01 2014 Narihiro Nakamura <authornari@gmail.com> +Sun May 22 14:57:43 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * parse.y (parser_class_nest): unused variable after YARV - merged (r11439). + * include/ruby/oniguruma.h: Extend OnigEncodingTypeDefine to define a + new encoding primitive 'case_map' for case mapping -Sun Sep 21 18:14:03 2014 Narihiro Nakamura <authornari@gmail.com> + * enc/utf-8.c, utf_16be/le.c, utf_32be/le.c: + add onigenc_unicode_case_map as case_map primitive - * st.c (numberof): unused. internal.h has same macro. + * enc/ascii.c, big5.c, cp949.c, emacs_mule.c, euc_jp/kr/tw.c, gb18030.c, + gbk.c, iso_8859_1/2/3/4/5/6/7/8/9/10/11/13/14/15/16.c, koi8_r/u.c, + shift_jis.c, us_ascii.c, windows_1250/1251/1252.c: + add onigenc_not_support_case_map as case_map primitive - * node.c (F_CUSTOM2): unused. +Sun May 22 14:45:45 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sun Sep 21 14:11:23 2014 Tanaka Akira <akr@fsij.org> + * regenc.h/c: Define new function onigenc_not_support_case_map - * thread_pthread.c (native_set_thread_name): New function to - set thread name visible with ps command on GNU/Linux. - Ex. ps -o %c -L +Sun May 22 12:14:06 2016 NARUSE, Yui <naruse@ruby-lang.org> - * thread.c (thread_start_func_2): Call native_set_thread_name at - beginning. - (rb_thread_inspect_msg): Extract from rb_thread_inspect. + * include/ruby/ruby.h (rb_scan_args): use original rb_scan_args + when fmt is dynamic. -Sun Sep 21 12:49:11 2014 Eric Wong <e@80x24.org> +Sun May 22 11:41:12 2016 NARUSE, Yui <naruse@ruby-lang.org> - * iseq.c (rb_iseq_defined_string): trim redundant semi-colon + * class.c (rb_scan_args): moved to bottom of the file to make the + effect of `#undef rb_scan_args` the minimum. -Sun Sep 21 12:19:29 2014 Eric Wong <e@80x24.org> - - * file.c (rb_find_file_ext_safe): clear tmp buffer on failure - (rb_find_file_safe): ditto - -Sat Sep 20 04:42:18 2014 Masaki Matsushita <glass.saga@gmail.com> - - * lib/csv.rb: avoid unnecessary object allocations. - patch is from Andrew Vit. [ruby-core:63215] [Feature #9952] - -Sun Sep 21 12:10:18 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rexml/**/*.rb: removed commented-out code. - -Sat Sep 20 03:46:58 2014 Masaki Matsushita <glass.saga@gmail.com> - - * array.c: use rb_equal_opt() for performance improvement. - [ruby-core:64954] [Feature #10227] - -Sun Sep 21 11:16:56 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c (rbtime2vtdate, vtdate2rbtime): fix - the bug in conversion of milliseconds. [Bug #10258] - - * test/win32ole/test_win32ole_variant.rb - (test_conversion_dbl2date_with_msec, - test_conversion_time2date_with_msec): use assert_in_delta instead - of assert_equal to treat an acceptable error range. - -Sun Sep 21 11:03:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (ruby_signal): although "EINVAL from sigaction(2) is - not a bug", but even it is a failure. pointed at toRuby/guRuby - in RubyHiroba. - -Sat Sep 20 03:00:26 2014 Masaki Matsushita <glass.saga@gmail.com> - - * lib/tempfile.rb: define parameters appropriately and some - refactoring. - - * lib/tmpdir.rb: ditto. - -Sat Sep 20 23:58:21 2014 Tanaka Akira <akr@fsij.org> - - * enum.c (enum_chunk): Deprecate the state management. - (enum_slice_before): Ditto. - -Sat Sep 20 15:39:11 2014 Tanaka Akira <akr@fsij.org> - - * enum.c (enum_slice_when): New method: Enumerable#slice_when. - (slicewhen_i): New function. - (slicewhen_ii): New function. - - * enumerator.c (InitVM_Enumerator): New method: - Enumerator::Lazy#slice_when. - - [ruby-core:62499] [Feature #9826] - -Sat Sep 20 11:55:19 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * .travis.yml: added new configurations for osx on travis ci. - [fix GH-723] - * test/ruby/test_object.rb: tweaked to memory leak limit for osx build. - -Sat Sep 20 10:48:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (assoc): allow quoted ID as a key of a hash literal. - [ruby-core:34453] [Feature #4276] - -Sat Sep 20 10:23:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * compile.c (iseq_set_arguments): store local variable IDs in - temporary list as Symbols. previously these are stored as - Fixnums to prevent from GC, but IDs of dynamic symbols can - exceed Fixnum range and cause RangeError at inverting from - Fixnum. [ruby-dev:48564] [Bug #10266] - -Sat Sep 20 10:02:51 2014 Tanaka Akira <akr@fsij.org> - - * ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#pretty_print): - New method. - (OpenSSL::X509::Certificate#pretty_print): Ditto. - - * ext/openssl/lib/openssl/bn.rb (OpenSSL::BN#pretty_print): Ditto. - -Sat Sep 20 07:55:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_eval.c (eval_string_with_cref): fix super from eval with - scope. set klass in the current control frame to the class of - the receiver in the context to be evaluated, this class/module - must match the actual receiver to call super. - [ruby-core:65122] [Bug #10263] - -Fri Sep 19 20:06:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * symbol.c (rb_str_dynamic_intern): check if the stem ID of - attrset ID is already registered as a static ID. - [ruby-dev:48559] [Bug #10259] - -Fri Sep 19 15:48:09 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * win32/Makefile.sub (VCSUP): nothing to do if this worktree is not - under any VCS (it means that the worktree may be from the release - package). - -Fri Sep 19 10:47:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * test/ruby/test_math.rb (TestMath#assert_infinity): Float#finite? - returns true also for NaN, so use Float#infinite? instead. - [ruby-core:65117] [Feature #10261] - -Fri Sep 19 05:36:16 2014 Eric Wong <e@80x24.org> - - * NEWS: note --with-jemalloc option [ci skip] - -Thu Sep 18 16:26:27 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/rubygems/test_gem_commands_setup_command.rb: @ui uses StringIO - as its streams, and Encoding.default_external does not effect to - StringIOs already exist. so, we need to set external_encoding of - @ui.outs directly. this problem (test failure) does not appear in - the environments default_external is us-ascii or utf-8. - -Thu Sep 18 15:02:15 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/rubygems/test_gem_specification.rb: '/' is not always the root. - -Thu Sep 18 09:36:37 2014 Scott Francis <scott.francis@shopify.com> - - * vm_method.c (Init_Method): make global method cache size - configurable by environment variable - "RUBY_GLOBAL_METHOD_CACHE_SIZE" [Fix GH-719] - -Thu Sep 18 07:03:36 2014 Eric Wong <e@80x24.org> - - * test/-ext-/string/test_modify_expand.rb: increase limit - for {je,tc}malloc [Bug #10236] - -Thu Sep 18 06:41:18 2014 Eric Wong <e@80x24.org> - - * ext/zlib/zlib.c (struct gzfile): pack (288 => 272 bytes) on 64-bit - -Thu Sep 18 05:44:05 2014 Eric Wong <e@80x24.org> - - * ext/socket/init.c (rsock_connect): refactor for blocking - (wait_connectable): clear error before wait - [Bug #9356] - -Wed Sep 17 23:12:36 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/rfc3986_parser.rb: specify a regexp for :OPAQUE; generic.rb - assumes it is present, and will refuse all values otherwise. - by Matthew Draper <matthew@trebex.net> - https://github.com/ruby/ruby/pull/718 fix GH-718 - -Wed Sep 17 16:22:58 2014 Eric Wong <e@80x24.org> - - * ext/zlib/zlib.c (zlib_mem_alloc): check overflow - -Wed Sep 17 11:33:35 2014 Laurent Arnoud <laurent@spkdev.net> - - * test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof): - added test for long long [fix GH-716] - -Wed Sep 17 11:09:21 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * tool/rbinstall.rb: fixed invalid options with latest rubygems. - https://github.com/rubygems/rubygems/issues/1013 - -Tue Sep 16 19:19:00 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * benchmark/bm_app_aobench.rb: update outdated links to the - original program. [ruby-dev:48550] [Feature #10247] - -Tue Sep 16 01:06:40 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * reg*.c: Merge Onigmo 5.15.0 38a870960aa7370051a3544 - -Mon Sep 15 16:21:10 2014 Eric Wong <e@80x24.org> - - * io.c (struct io_advise_struct): 32 => 24 bytes on 64-bit - * io.c (struct io_internal_writev_struct): 24 => 16 bytes on 64-bit - * process.c (struct waitpid_arg): ditto - -Mon Sep 15 10:29:25 2014 Natalie Weizenbaum <nweiz@google.com> - - * ext/pathname/lib/pathname.rb (SAME_PATHS): - Pathname#relative_path_from uses String#casecmp to compare strings - on case-insensitive filesystem platforms (e.g., Windows). This can - return nil for strings with different encodings, and the code - previously assumed that it always returned a Fixnum. [Fix GH-713] - -Mon Sep 15 09:43:18 2014 Sho Hashimoto <sho.hsmt@gmail.com> - - * ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo, - SIZEOF_LONG_LON. [Fix GH-714] - -Mon Sep 15 08:13:40 2014 Matthew Draper <matthew@trebex.net> - - * sprintf.c (rb_str_format): rational 'f' format works for more - values. [fix GH-717] - -Sun Sep 14 16:57:27 2014 Eric Wong <e@80x24.org> - - * template/vm.inc.tmpl: "insns.c" => "insns.def" - * tool/instruction.rb: typo fix - -Sun Sep 14 12:29:52 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/test_tracer.rb: fixed testcase for rubygems update. - -Sun Sep 14 12:29:02 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rubygems: Update to RubyGems 2.4.1 master(713ab65) - Complete history at: - https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216 - - * test/rubygems: ditto. - -Sun Sep 14 11:03:24 2014 Aaron Patterson <aaron@tenderlovemaking.com> - - * ext/psych/lib/psych.rb: update version - * ext/psych/psych.gemspec: ditto - -Sun Sep 14 08:43:37 2014 Eric Wong <e@80x24.org> - - * ccan/container_of/container_of.h (container_of_or_null): added - [ccan 7ec5b8e06b2fd5fa98b1fcde1158c286d2d429d8] (David Gibson) - -Sun Sep 14 08:41:44 2014 Eric Wong <e@80x24.org> - - * ccan/list/list.h (list_del_init, list_node_init): new functions - for multiple list_del() calls - [ccan ec8654d94d3c5c47aa5f82698f7e8048c79765b1] (Rusty Russell) - -Sat Sep 13 22:19:26 2014 Bernard Potocki <bernard.potocki@imanel.org> - - * hash.c (rb_hash_aset): fix misleading example which may suggest - that Hash.store will return self instead of value - Hash#store - is returning value and update itself, as well as Hash#[]=. - [Fix GH-715] - -Sat Sep 13 15:16:31 2014 Eric Wong <e@80x24.org> - - * class.c: use ALLOC(rb_subclass_entry_t) - -Sat Sep 13 14:14:00 2014 Eric Wong <e@80x24.org> - - * process.c (free_exec_arg): remove - (memsize_exec_arg): ptr is never NULL - (exec_arg_data_type): use RUBY_TYPED_DEFAULT_FREE - - * variable.c (autoload_i_free): remove - (autoload_data_i_type): use RUBY_TYPED_DEFAULT_FREE - (autoload_memsize): ptr is never NULL - - * vm_backtrace.c (location_free): remove - (location_mark): ptr is never NULL - (location_data_type): use RUBY_TYPED_DEFAULT_FREE - (backtrace_mark): ditto - (backtrace_free): ditto - -Sat Sep 13 13:43:07 2014 Eric Wong <e@80x24.org> - - * doc/NEWS-2.0.0: fix typo for default RUBY_FIBER_MACHINE_STACK_SIZE - [ci skip] - -Sat Sep 13 11:16:58 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole_event.c(ev_advise, ole_event_free, - fev_s_allocate, fev_unadvise): avoid segmentation fault when COM - server freed before calling Unadvise from WIN32OLE_EVENT object. - * ext/win32ole/win32ole.c: ditto. - -Sat Sep 13 09:47:44 2014 Eric Wong <e@80x24.org> - - * man/ruby.1: use https for *.ruby-lang.org links - -Sat Sep 13 06:31:23 2014 Eric Wong <e@80x24.org> - - * vm.c (thread_alloc): remove needless volatile - -Sat Sep 13 06:13:55 2014 Eric Wong <e@80x24.org> - - * proc.c (proc_free): remove, use RUBY_TYPED_DEFAULT_FREE - (proc_mark, proc_memsize): remove needless branching - - * vm.c (env_free): remove, use RUBY_TYPED_DEFAULT_FREE - (env_mark, env_memsize): remove needless branching - -Sat Sep 13 05:52:15 2014 Eric Wong <e@80x24.org> - - * proc.c (rb_proc_alloc): inline and move to vm.c - (rb_proc_wrap): new wrapper function used by rb_proc_alloc - (proc_dup): simplify alloc + copy + wrap operation - [ruby-core:64994] - - * vm.c (rb_proc_alloc): new inline function - (rb_vm_make_proc): call rb_proc_alloc - - * vm_core.h: remove rb_proc_alloc, add rb_proc_wrap - - * benchmark/bm_vm2_newlambda.rb: short test to show difference - -Sat Sep 13 04:40:04 2014 Eric Wong <e@80x24.org> - - * process.c (Init_process): subclass Thread as Process::Waiter - (rb_detach_process): use Process::Waiter instead of singleton class - Thanks to headius and nobu. [Bug #10231] - - * test/ruby/test_process.rb (test_process_detach): new test - - * inits.c (rb_call_inits): call Init_Thread before Init_process to - ensure Process::Waiter may be a subclass of Thread - -Fri Sep 12 18:14:28 2014 Eric Wong <e@80x24.org> - - * vm.c (env_alloc): inline to avoid extra zeroing - tiny speedup [ruby-core:64980] - -Fri Sep 12 17:13:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_method.c (rb_method_entry_make, remove_method): ditto. - -Fri Sep 12 14:39:55 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * gems/bundled_gems: Upgraded to test-unit-3.0.1 and minitest-5.4.1 - -Fri Sep 12 06:55:40 2014 Eric Wong <e@80x24.org> - - * string.c (Init_frozen_strings): use st_init_table_with_size - -Fri Sep 12 06:15:37 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * string.c (sym_find): remove Symbol.find because we have Symbol GC now. - https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20140904Japan - If you still want this, request again on Redmine. [Feature #7854] - https://bugs.ruby-lang.org/issues/7854 - - * ext/-test-/symbol/init.c (sym_find): moved from string.c for tests. - -Fri Sep 12 04:24:03 2014 Eric Wong <e@80x24.org> - - * insns.def (once): define and use fake RUNNING_THREAD_ONCE_DONE - pointer to indicate is->once.running_thread is done. - - * vm_core.h (iseq_inline_storage_entry): remove done field, - allowing the union to be reduced from 24=>16 bytes on 64-bit - [Feature #10187] - -Thu Sep 11 20:10:00 2014 Koichi Sasada <ko1@atdot.net> - - * vm.c (rb_thread_mark): use rb_gc_mark_values() to mark VM stack. - -Thu Sep 11 19:50:57 2014 Koichi Sasada <ko1@atdot.net> - - * vm.c (rb_vm_register_special_exception): make new function to - make and register special exceptions. - - * vm.c (rb_vm_mark): do not need to mark special exceptions - because they are registered by rb_gc_register_mark_object(). - - * eval.c (Init_eval): use rb_vm_register_special_exception(). - - * gc.c (Init_GC): ditto. - - * proc.c (Init_Proc): ditto. - - * thread.c (Init_Thread): ditto. - -Thu Sep 11 19:32:30 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (rb_gc_mark_values): added. - This function is similar to rb_gc_mark_locations(), but not + * include/ruby/ruby.h (rb_scan_args): overwrite only if GCC and + optimized. Visual C++ 14 or later can compile it but make it conservative. - * internal.h: ditto. - - * vm.c (env_mark): use rb_gc_mark_values() because env values should - be Ruby VALUEs. - -Thu Sep 11 19:16:39 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_mark_ptr): rename to gc_mark_set. - - * gc.c (gc_mark): add gc_mark_ptr() to skip is_markable_object() - check. gc_mark_maybe() can use gc_mark_ptr() directly because - passed pointer is checked by is_pointer_to_heap(). - -Thu Sep 11 18:40:16 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * .gitignore: ignored temporary files and coverage results. - -Thu Sep 11 18:15:30 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * .gitignore: ignored only simplecov. - * coverage/README: Added coverage docs. - -Thu Sep 11 17:25:31 2014 Koichi Sasada <ko1@atdot.net> - - * include/ruby/ruby.h, gc.c: add new internal events - RUBY_INTERNAL_EVENT_GC_ENTER and - RUBY_INTERNAL_EVENT_GC_EXIT. - - When invoking GC process, GC_ENTER event is called. - When exiting from GC process, GC_EXIT event is called. - - Incremental GC (incremental marking and lazy sweep) can call - these events many times. - - For example (minor marking): - (1) GC_ENTER - - (2) GC_START (minor GC) - (minor marking) - - (3) GC_END_MARK - (start lazy sweep) - (4) GC_EXIT - (ruby process) - (5) GC_ENTER - (lazy sweep) - (6) GC_EXIT - (ruby process) - (... repeat (5), (6)) - (7) GC_ENTER - (finish lazy sweep) - - (8) GC_END_SWEEP - (9) GC_EXIT - - 2nd example (incremental major marking): - (1) GC_ENTER - - (2) GC_START (minor GC) - (start incremental marking) - (3) GC_EXIT - (ruby process) - (4) GC_ENTER - (incremental marking) - (5) GC_EXIT - (ruby process) - (... repeat (4), (5)) - (6) GC_ENTER - (finish incremental marking) - - (7) GC_END_MARK - (start lazy sweep) - (8) GC_EXIT - (ruby process) - (9) GC_ENTER - (lazy sweep) - (10) GC_EXIT - (ruby process) - (... repeat (9), (10)) - (11) GC_ENTER - (finish lazy marking) - - (12) GC_STOP_SWEEP - (13) GC_EXIT - - These internal events enable to measure GC pause time completely. - -Thu Sep 11 17:04:54 2014 Eric Wong <e@80x24.org> - - * lib/benchmark.rb: remove CLOCK_MONOTONIC_RAW support - Thanks to Vit Ondruch for reporting the issue on ARM. - [Bug #10202] - -Thu Sep 11 14:31:57 2014 Koichi Sasada <ko1@atdot.net> - - * include/ruby/ruby.h: freeze nil/true/false. - [Feature #8923] - - * gc.c (should_be_finalizable): check frozen after checkin FL_ABLE. - - * object.c (rb_obj_taint): check - OBJ_TAINTABLE(obj). - - * object.c (rb_obj_freeze): remove immediate_frozen_tbl - because all of immediate values are frozen. YAY! - - * object.c (rb_obj_frozen_p): ditto. - - * test/ruby/test_eval.rb: skip instance_variable_set for - frozen objects. - - * test/ruby/test_weakmap.rb: check ArgumentError instead of - RuntimeError. - -Thu Sep 11 10:03:16 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(21b241a) - -Wed Sep 10 17:52:25 2014 Koichi Sasada <ko1@atdot.net> - - * compile.c (rb_vm_addr2insn): rename to rb_vm_insn_addr2insn - to clear what address. - -Wed Sep 10 16:22:26 2014 Koichi Sasada <ko1@atdot.net> - - * test/ruby/test_gc.rb: fix condition. - -Wed Sep 10 15:29:46 2014 Eric Wong <e@80x24.org> - - * vm_core.h (rb_call_info_t): ci->flag becomes 32-bit unsigned int - ci->index becomes a 32-bit signed int (from signed long). - Reorder for better packing on 64-bit, giving an 8 byte reduction - from 104 to 96 bytes for each ci. - [Feature #10187] - - * compile.c (new_callinfo, setup_args, iseq_compile_each, - iseq_build_from_ary_body): adjust for type changes - - * vm_insnhelper.c (vm_getivar): ditto - -Wed Sep 10 15:07:35 2014 Eric Wong <e@80x24.org> - - * compile.c (rb_iseq_translate_threaded_code): - modify in-place w/o copy - (rb_vm_addr2insn): new function for debug - (rb_iseq_original_iseq): ditto - (iseq_set_sequence): assign iseq_encoded directly - [Feature #10185] - - * vm_core (rb_iseq_t): move original ->iseq to bottom - - * iseq.c (iseq_free, iseq_free): adjust for new layout - (rb_iseq_disasm): use original iseq for dump - (iseq_data_to_ary): ditto - (rb_iseq_line_trace_each): ditto - (rb_iseq_build_for_ruby2cext): use iseq_encoded directly - - * vm_dump.c (rb_vmdebug_debug_print_pre): use original iseq - -Wed Sep 10 15:00:11 2014 Eric Wong <e@80x24.org> - - * time.c (time_mark): remove NULL check - (time_memsize): ditto - (time_free): remove, use RUBY_TYPED_DEFAULT_FREE instead - [Feature #10219] - -Wed Sep 10 14:14:57 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * common.mk (encs enc trans libencs libenc libtrans): force to run - enk.mk because common.mk does not know the dependency, but enk.mk - knows. [ruby-dev:48530] [Bug #10220] - -Wed Sep 10 11:59:10 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_stat): update rdoc. - -Wed Sep 10 11:52:08 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_stat_internal): rename: - * malloc_increase -> malloc_increase_bytes - * malloc_limit -> malloc_increase_bytes_limit - * oldmalloc_increase -> oldmalloc_increase_bytes - * oldmalloc_limit -> oldmalloc_increase_bytes_limit - ref: [Feature #9924] - -Wed Sep 10 11:45:40 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_stat_internal): rename `heap_used' to `heap_allocated_pages'. - ref: [Feature #9924] - - * test/ruby/test_gc.rb: add constraints test for gc stat information. +Sat May 21 22:45:50 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Wed Sep 10 11:31:16 2014 Koichi Sasada <ko1@atdot.net> + * include/ruby/ruby.h (rb_scan_args): don't use ALWAYS_INLINE with + `inline`. if gcc needs this duplication, do in ALWAYS_INLINE macro. - * gc.c (gc_stat_internal): rename: - * remembered_shady_object -> remembered_wb_unprotected_objects - * remembered_shady_object_limit -> remembered_wb_unprotected_objects_limit - * old_object -> old_objects - * old_object_limit -> old_objects_limit - ref: [Feature #9924] +Sat May 21 21:11:56 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Sep 10 11:12:25 2014 Koichi Sasada <ko1@atdot.net> + * include/ruby/ruby.h (rb_scan_args): use __VA_ARGS__ instead of + va_arg to allow compilers optimize more aggressive. + https://gustedt.wordpress.com/2011/07/10/avoid-writing-va_arg-functions/ + rb_scan_args is now expected to be statically resolved. - * gc.c (gc_stat_internal): support: - * total_allocated_pages - * total_freed_pages - ref: [Feature #9924] +Sun May 22 02:41:52 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Sep 10 10:48:04 2014 Koichi Sasada <ko1@atdot.net> + * ext/zlib/zlib.c: remove hacky macro introduced at r30437. - * test/ruby/test_gc.rb: catch up last fix. + * ext/zlib/zlib.c (gzfile_make_header): cast as long (instead of int). -Wed Sep 10 10:36:08 2014 Koichi Sasada <ko1@atdot.net> + * ext/zlib/zlib.c (gzfile_make_footer): ditto. - * gc.c (objspace_total_slot): rename objspace_available_slots. +Sat May 21 21:07:18 2016 NARUSE, Yui <naruse@ruby-lang.org> - * gc.c (objspace_live_slot, objspace_free_slot): rename - ..._slot() to ..._slots(). + * configure.in (ALWAYS_INLINE): force compilers the function inlined. - * gc.c (objspace_free_slot): should subtract heap_pages_final_slots. +Sat May 21 16:16:03 2016 Kazuki Yamaguchi <k@rhe.jp> - * gc.c (gc_stat_internal): - * add `heap_available_slots' field - * rename heap_live_slot to heap_live_slots - * rename heap_free_slot to heap_free_slots - ref: [Feature #9924] + * ext/openssl/ossl_ssl.c (ossl_ssl_stop): Don't free the SSL struct + here. Since some methods such as SSLSocket#connect releases GVL, + there is a chance of use after free if we free the SSL from another + thread. SSLSocket#stop was documented as "prepares it for another + connection" so this is a slightly incompatible change. However when + this sentence was added (r30090, Add toplevel documentation for + OpenSSL, 2010-12-06), it didn't actually. The current behavior is + from r40304 (Correct shutdown behavior w.r.t GC., 2013-04-15). + [ruby-core:74978] [Bug #12292] -Wed Sep 10 07:22:53 2014 Koichi Sasada <ko1@atdot.net> + * ext/openssl/lib/openssl/ssl.rb (sysclose): Update doc. - * gc.c: refactoring for RGENGC_PROFILE > 0. + * test/openssl/test_ssl.rb: Test this. - * rename rb_objspace_t::profile::..._count - to rb_objspace_t::profile::total_..._count - * rename promote_infant_types to promote_types +Sat May 21 14:41:14 2016 Kazuki Yamaguchi <k@rhe.jp> - * gc.c (gc_remember_unprotected): count remembered shady objects here. + * ext/openssl/ossl.c: [DOC] Fix SSL client example. The variable name + was wrong. Patch by Andreas Tiefenthaler <at@an-ti.eu> (@pxlpnk). + [GH ruby/openssl#32] -Wed Sep 10 03:12:12 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> +Sat May 21 14:25:38 2016 Kazuki Yamaguchi <k@rhe.jp> - * gc.c (init_mark_stack): MEMZERO() receive type as 2nd argument instead - of size. - Coverity Scan found this bug. + * ext/openssl/ossl_pkey_ec.c: rename PKey::EC#private_key? and + #public_key? to #private? and #public? for consistency with other + PKey types. Old names remain as alias. [ruby-core:45541] [Bug #6567] -Tue Sep 9 21:55:39 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * test/openssl/test_pkey_ec.rb (test_check_key): check private? and + public? works correctly. - * ext/win32ole/sample/excel2.rb: remove some commented-out code. - rotate graph more slowly to see graph clearly. +Sat May 21 12:40:36 2016 Kazuki Yamaguchi <k@rhe.jp> -Tue Sep 9 19:52:33 2014 Koichi Sasada <ko1@atdot.net> + * ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial): + Remove impossible EOFError raise. Patch by Zach Anker + <zanker@squareup.com>. [GH ruby/openssl#23] - * gc.c: rename rb_objspace_t::marked_objects to marked_slots. +Sat May 21 11:18:42 2016 Evgeni Golov <evgeni@golov.de> - * gc.c (gc_marks_start): should be clear first. + * lib/ipaddr.rb: [DOC] fix documentation of IN6MASK to mention + IPv6. [Fix GH-1349] - * gc.c (gc_marks_start): remembered shady objects are also marked. +Sat May 21 11:12:53 2016 Dan Martinez <dfm@razorwind.org> - * gc.c (gc_stat_internal): add heap_marked_slots. + * io.c (Init_IO): [DOC] define dummy ARGF instead of ARGF.class to + re-enable the generation of ARGF documentation. [Fix GH-1358] -Tue Sep 9 18:58:48 2014 Koichi Sasada <ko1@atdot.net> +Sat May 21 11:07:29 2016 0x01f7 <souk.0x01f7@gmail.com> - * gc.c: rename - * total_allocated_object_num -> total_allocated_objects - * total_allocated_object_num_at_gc_start -> total_allocated_objects_at_gc_start - * total_freed_object_num -> total_freed_objects + * doc/syntax/methods.rdoc (Method Names): add proper closing tag. + [Fix GH-1356] - * gc.c (gc_stat_internal): - * rename total_allocated_object -> total_allocated_objects - * rename total_freed_object -> total_freed_objects +Sat May 21 09:26:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Sep 9 18:51:36 2014 Koichi Sasada <ko1@atdot.net> + * configure.in (RUBY_CHECK_SETJMP): fix missing macro definition + for the configured result. fix up r55021. - * gc.c (gc_stat_internal): fix symbol names - * heap_final_slot -> heap_final_slots - * heap_swept_slot -> heap_swept_slots +Sat May 21 00:36:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Sep 9 18:18:07 2014 Koichi Sasada <ko1@atdot.net> + * process.c (rb_execarg_commandline): build command line string + from argument vector in rb_execarg. + [ruby-core:75611] [Bug #12398] - * gc.c (rb_objspace_t::heap_pages): rename field names: - * used -> allocated_pages - * increment -> allocatable_pages - * length -> sorted_length - And remove unused `limit' field. +Fri May 20 23:25:42 2016 Kazuki Yamaguchi <k@rhe.jp> - * gc.c: rename macros: - * heap_pages_used -> heap_allocated_pages - * heap_pages_length -> heap_pages_sorted_length - * heap_pages_increment -> heap_allocatable_pages + * ext/openssl/ossl.c (ossl_pem_passwd_value): Added. Convert the + argument to String with StringValue() and validate the length is in + 4..PEM_BUFSIZE. PEM_BUFSIZE is a macro defined in OpenSSL headers. + (ossl_pem_passwd_cb): When reading/writing encrypted PEM format, we + used to pass the password to PEM_def_callback() directly but it was + problematic. It is not NUL character safe. And surprisingly, it + silently truncates the password to 1024 bytes. [GH ruby/openssl#51] - * gc.c (gc_stat_internal): fix symbol names - * heap_used -> heap_allocated_pages - * heap_eden_page_length -> heap_eden_pages - * heap_tomb_page_length -> heap_tomb_pages - * heap_increment -> heap_allocatable_pages - * heap_length -> heap_sorted_length + * ext/openssl/ossl.h: Add function prototype declaration of newly + added ossl_pem_passwd_value(). - ref: [Feature #9924] - https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing - Yellow color fields in this table are changed. + * ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): Use + ossl_pem_passwd_value() to validate the password String. - * test/ruby/test_gc.rb: catch up this change. - -Tue Sep 9 14:56:03 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: continue layout changing. - - newobj_of() also touch: - (4) increment total_allocated_object_num - (5) check hook_events - - And gather fields related to marking phase. - -Tue Sep 9 14:21:50 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: fix layout of rb_objspace_t to improve cache locality. - - newobj_of() accesses: - (1) rb_objspace_t::flags - (2) rb_objspace_t::eden_heap::freelist - (3) and rb_objspace_t::eden_heap::free_pages if freelist is NULL. - -Tue Sep 9 14:09:36 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: move rb_objspace_t::flags::gc_stressful after during_gc - to make accessing both parameters easy. - - * gc.c (heap_get_freeobj): add LIKELY() hint. - - * gc.c (heap_get_freeobj_from_next_freepage): ditto. - - * gc.c (newobj_of): check both parameters at once for exceptional - case. - -Tue Sep 9 13:51:32 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: add rb_objspace_t::flags::gc_stressful and - ruby_gc_stressful macro. - Rename objspace->gc_stress to objspace->gc_stress_mode. - - If objspace->gc_stress_mode is true (!nil and !false) then - ruby_gc_stressful becomes TRUE. - - ruby_gc_stressful will speedup newobj_of() slightly. - - * gc.c: initialize ruby_gc_stress(full|_mode) by gc_params.gc_stress - even if ENABLE_VM_OBJSPACE is false. - -Tue Sep 9 13:05:50 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: remove ruby_disable_gc_stress and add ruby_disable_gc - to speed-up newobj_of(). - - * gc.c (ready_to_gc): check ruby_disable_gc. - - * signal.c: use ruby_disable_gc. - -Tue Sep 9 12:11:41 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: rename gc_stat entries and check stat transition. - -Tue Sep 9 12:06:03 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_sweep_rest): remove wrong modification of during_gc flag. - -Tue Sep 9 11:39:41 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: pack boolean values into rb_objspace_t::flags with bit fields - to improve cache locality. - -Tue Sep 9 11:11:05 2014 Koichi Sasada <ko1@atdot.net> - - * test/ruby/test_object.rb: extend timeout. - -Tue Sep 9 09:02:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also - $CXXFLAGS, as they are often used by C++ compiler. - [ruby-core:54532] [Bug #8315] - -Tue Sep 9 07:03:22 2014 Eric Wong <e@80x24.org> - - * compile.c: remove needless SYM2ID <-> ID2SYM conversions - [misc #10207] + * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize, ossl_dsa_export): + ditto. -Tue Sep 9 05:48:42 2014 Eric Wong <e@80x24.org> + * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize, + ossl_ec_key_to_string): ditto. - * symbol.c (rb_intern_cstr_without_pindown): check dsymbol on return - This is not a complete fix for bug 10206, but seems to reduce - that crash and also looks correct. + * ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize, ossl_rsa_export): + ditto. -Tue Sep 9 04:36:24 2014 Eric Wong <e@80x24.org> + * test/openssl/test_pkey_{dsa,ec,rsa}.rb: test this. - * vm_core.h (rb_env_t): use flexible array - This reduces allocations and speeds up the lambda calculus - fizzbuzz (bm_app_lc_fizzbuzz.rb) benchmark [ruby-core:64858] - * proc.c (get_local_variable_ptr): deconst to adjust for flex array - * vm.c (env_mark, env_free, env_memsize): remove check for env->env - * vm.c (env_alloc): single allocation for flex array - * vm.c (vm_make_env_each): adjust env_alloc call +Fri May 20 23:45:53 2016 Naohisa Goto <ngotogenome@gmail.com> -Mon Sep 8 16:08:22 2014 Koichi Sasada <ko1@atdot.net> + * id_table.c (list_id_table_init): When unaligned word access is + prohibited and sizeof(VALUE) is 8 (64-bit machines), + capa should always be even number for 8-byte word alignment + of the values of a table. This code assumes that sizeof(ID) is 4, + sizeof(VALUE) is 8, and xmalloc() returns 8-byte aligned memory. + This fixes bus error on 64-bit SPARC Solaris 10. + [Bug #12406][ruby-dev:49631] - * benchmark/bm_app_lc_fizzbuzz.rb: should skip output on benchmark. +Fri May 20 22:30:09 2016 Naohisa Goto <ngotogenome@gmail.com> -Mon Sep 8 16:04:02 2014 Koichi Sasada <ko1@atdot.net> + * symbol.h (rb_id2sym): Use HAVE_BUILTIN___BUILTIN_CONSTANT_P - * benchmark/bm_app_lc_fizzbuzz.rb: `answer.to_a' does not return - a string, but an array. +Fri May 20 22:19:00 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Mon Sep 8 13:18:37 2014 Koichi Sasada <ko1@atdot.net> + * ext/date/date_core.c: [DOC] fix typos. + [fix GH-1360] patched by @soundasleep - * benchmark/bm_app_lc_fizzbuzz.rb: added. +Fri May 20 21:26:58 2016 Naohisa Goto <ngotogenome@gmail.com> - This program is described closely in "Understanding Computation" - chapter 6 by Tom Stuart. <http://computationbook.com/> + * include/ruby/defines.h (RB_GNUC_EXTENSION, RB_GNUC_EXTENSION_BLOCK): + macros for skipping __extension__ on non-GCC compilers. + * eval_error.c (warn_print): use RB_GNUC_EXTENSION_BLOCK instead of + __extension__ because __extension__ is a GNU extension. + Fix compile error on Solaris 10 with Oracle Solaris Studio 12.x. + [Bug #12397] [ruby-dev:49629]. + * internal.h (rb_fstring_cstr, rb_fstring_enc_cstr): ditto + * include/ruby/encoding.h (rb_enc_str_new, rb_enc_str_new_cstr): ditto + * include/ruby/intern.h (rb_str_new, rb_str_new_cstr, + rb_usascii_str_new, rb_utf8_str_new, rb_tainted_str_new_cstr, + rb_usascii_str_new_cstr, rb_utf8_str_new_cstr, + rb_external_str_new_cstr, rb_locale_str_new_cstr, + rb_str_buf_new_cstr, rb_str_cat_cstr, rb_exc_new_cstr): ditto - Japanese translation will be published soon. - <http://www.oreilly.co.jp/books/9784873116976/> +Fri May 20 21:17:13 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Sep 8 12:01:39 2014 Koichi Sasada <ko1@atdot.net> + * ext/win32ole/win32ole.c (fole_missing): make substring or dup to + share the content if possible. - * gc.c: add incremental GC algorithm. [Feature #10137] +Fri May 20 19:48:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - Please refer this ticket for details. + * internal.h (NEW_PARTIAL_MEMO_FOR): shrink buffer array not to + mark non-VALUE fields. fix check_rvalue_consistency abort with + RGENGC_CHECK_MODE=2. - This change also introduces the following changes. + * internal.h (NEW_CMP_OPT_MEMO): exclude struct cmp_opt_data from + the valid array range. - * Remove RGENGC_AGE2_PROMOTION and introduce object age (0 to 3). - Age can be count with FL_PROMOTE0 and FL_PROMOTE1 flags in - RBasic::flags (2 bit). Age == 3 objects become old objects. - * WB_PROTECTED flag in RBasic to WB_UNPROTECTED bitmap. - * LONG_LIVED bitmap to represent living objects while minor GCs - It specifies (1) Old objects and (2) remembered shady objects. - * Introduce rb_objspace_t::marked_objects which counts marked - objects in current marking phase. marking count is needed to - introduce incremental marking. - * rename mark related function and sweep related function to - gc_(marks|sweep)_(start|finish|step|rest|continue). - * rename rgengc_report() to gc_report(). - * Add obj_info() function to get cstr of object details. - * Add MEASURE_LINE() macro to measure execution time of specific line. - * and many small fixes. + * enum.c (slicewhen_i): exclude inverted too. - * include/ruby/ruby.h: add flag USE_RINCGC. - Now USE_RINCGC can be set only with USE_RGENGC. +Thu May 19 21:21:57 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - * include/ruby/ruby.h: introduce FL_PROMOTED0 and add FL_PROMOTED1 - to count object age. + * re.c (rb_reg_match_m_p): [DOC] fix return value in rdoc. - * include/ruby/ruby.h: rewrite write barriers for incremental marking. + * test/ruby/test_regexp.rb (TestRegexp#test_match_p): add some + tests from document. - * debug.c: catch up flag name changes. +Thu May 19 13:22:44 2016 Kazuki Yamaguchi <k@rhe.jp> - * internal.h: add rb_gc_writebarrier_remember() instead of - rb_gc_writebarrier_remember_promoted(). + * ext/openssl/ossl.c (Init_openssl): register an ex_data index for + X509_STORE and X509_STORE_CTX respectively. Since they don't share + the ex_data index registry, we can't use the same index. + (ossl_verify_cb): use the the correct index. - * array.c (ary_memcpy0): use rb_gc_writebarrier_remember(). + * ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto. - * array.c (rb_ary_modify): ditto. + * ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto. + (ossl_x509stctx_verify): ditto. - * hash.c (rb_hash_keys): ditto. + * ext/openssl/ossl.h (void ossl_clear_error): add extern declarations + of ossl_store_{ctx_,}ex_verify_cb_idx. - * hash.c (rb_hash_values): ditto. + * ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and + X509_STORE_get_ex_data. - * object.c (init_copy): use rb_copy_wb_protected_attribute() because - FL_WB_PROTECTED is moved from RBasic::flags. + * ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data, + X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros. - * test/objspace/test_objspace.rb: catch up ObjectSpace.dump() changes. +Thu May 19 13:11:35 2016 Kazuki Yamaguchi <k@rhe.jp> -Sun Sep 7 12:47:06 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): check that the + argument is an OpenSSL::ASN1::Data before converting to ASN1_TYPE. + This fixes SEGV on OpenSSL::X509::Attribute#value=(non-asn1-value). - * process.c: PTHREAD_CANCEL_DISABLE is not defined on Android. + * test/openssl/test_x509attr.rb: add tests for OpenSSL::X509::Attribute. -Sat Sep 6 20:59:06 2014 Tanaka Akira <akr@fsij.org> +Thu May 19 12:10:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * process.c (has_privilege): The gid zero is not a privilege. + * re.c (rb_reg_match_m_p): fix match against empty string. + rb_str_offset returns the end when the position exceeds the + length. fix the range parameter of onig_search. + [ruby-core:75604] [Bug #12394] -Sat Sep 6 20:19:16 2014 Tanaka Akira <akr@fsij.org> +Thu May 19 11:37:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * process.c (struct child_handler_disabler_state): cancelstate field - added. - (disable_child_handler_before_fork): Record cancelstate. - (disable_child_handler_fork_parent): Restore cancelstate. + * re.c (rb_reg_match_m_p): should return false if no match, as the + document says. [Feature #8110] -Sat Sep 6 19:27:10 2014 Tanaka Akira <akr@fsij.org> +Thu May 19 00:17:01 2016 NARUSE, Yui <naruse@ruby-lang.org> - * process.c (struct child_handler_disabler_state): Defined. + * re.c (reg_names_iter): specify capacify -Sat Sep 6 18:31:32 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed May 18 21:29:59 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * lib/rake.rb, lib/rake/*, test/rake/*: Update latest rake master(e47d023) + * thread.c (recursive_list_access): a object id may be a Bignum. so, + the list must be a objhash, instead of a identhash. + this fixes many test errors on mswin64 CI. -Sat Sep 6 16:38:08 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Wed May 18 19:33:54 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ext/win32ole/win32ole_variant.c (ole_val2variant_err, - ole_val2variantdata, Init_win32ole_variant): support VT_ERROR - variant with error code. add WIN32OLE_VARIANT::NoParam. - * test/win32ole/test_win32ole_variant.rb(test_c_noparam, - test_vt_error_noparam): ditto. - * ext/win32ole/win32ole.c: ditto. + * re.c (rb_reg_match_m_p): Introduce Regexp#match?, which returns + bool and doesn't save backref. -Sat Sep 6 11:08:52 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed May 18 16:52:03 2016 Kazuki Yamaguchi <k@rhe.jp> - * parse.y (arg_ambiguous_gen): fix warning message, "even" does - not mean the number of spaces here. state the place to put a - space and the operator. [ruby-core:64790] [Bug #10204] + * ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): pop errors + leaked by PKCS12_parse(). This is a bug in OpenSSL, which exists + in the versions before the version 1.0.0t, 1.0.1p, 1.0.2d. -Sat Sep 6 08:44:40 2014 Zachary Scott <e@zzak.io> +Wed May 18 16:04:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/rdoc/generator/template/darkfish/js/jquery.js: Backport - rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7 + * tool/downloader.rb (Downloader::RubyGems.download): verify gems + only if RubyGems is 2.4 or later. old RubyGems fails to verify + almost all of bundled gems. -Sat Sep 6 08:10:44 2014 Eric Wong <e@80x24.org> +Wed May 18 14:52:38 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/test_io.rb (test_readpartial_locktmp): use IO#nonblock= - Old fcntl invocation may drop necessary flags on some platforms. + * string.c (rb_str_modify_expand): check integer overflow. + [ruby-core:75592] [Bug #12390] -Sat Sep 6 07:46:51 2014 Eric Wong <e@80x24.org> +Wed May 18 13:11:44 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/ruby/test_io.rb (test_readpartial_locktmp): avoid EBADF - [ruby-core:64773] [ruby-core:64775] + * re.c (match_ary_subseq): get subseq of match array without creating + temporary array. -Sat Sep 6 01:34:31 2014 Tanaka Akira <akr@fsij.org> + * re.c (match_ary_aref): get element(s) of match array without creating + temporary array. - * process.c (rb_f_exec): Call before_exec_async_signal_safe and - after_exec_async_signal_safe around rb_exec_async_signal_safe. - (rb_exec_async_signal_safe): Don't call - before_exec_async_signal_safe and after_exec_async_signal_safe. - (rb_exec_without_timer_thread): Call before_exec and - after_exec. - (disable_child_handler_fork_child): Make SIGPIPE handler SIG_DFL. + * re.c (match_aref): Use match_ary_subseq with handling irregulars. -Sat Sep 6 00:49:41 2014 Tanaka Akira <akr@fsij.org> + * re.c (match_values_at): Use match_ary_aref. - * signal.c (ruby_signal): Don't set SA_SIGINFO for SIG_IGN and - SIG_DFL. +Wed May 18 13:03:07 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri Sep 5 21:45:33 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_x509cert.c (ossl_x509_verify): X509_verify() + family may put errors on 0 return (0 means verification failure). + Clear OpenSSL error queue before return to Ruby. Since the queue is + thread global, remaining errors in the queue can cause an unexpected + error in the next OpenSSL operation. [ruby-core:48284] [Bug #7215] - * process.c (disable_child_handler_before_fork): New function. - (disable_child_handler_fork_parent): Ditto. - (disable_child_handler_fork_child): Ditto. - (retry_fork_async_signal_safe): Call above functions to disable - signal handlers in child process. + * ext/openssl/ossl_x509crl.c (ossl_x509crl_verify): ditto. -Fri Sep 5 21:02:54 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_x509req.c (ossl_x509req_verify): ditto. - * process.c (handle_fork_error): Make try_gc_p argument volatile to - suppress "clobbered" warning. + * ext/openssl/ossl_x509store.c (ossl_x509stctx_verify): ditto. -Fri Sep 5 20:48:06 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_pkey_dh.c (dh_generate): clear the OpenSSL error + queue before re-raising exception. - * process.c (handle_fork_error): Don't need state_p argument. + * ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto. -Fri Sep 5 20:35:52 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto. - * process.c (has_privilege): Fix a return value. + * ext/openssl/ossl_ssl.c (ossl_start_ssl): ditto. -Fri Sep 5 19:00:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * test/openssl: check that OpenSSL.errors is empty every time after + running a test case. - * lib/shellwords.rb: proofreading documentation. - [Bug #10155][ruby-core:64471] +Wed May 18 12:07:42 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri Sep 5 18:34:33 2014 Laurent Arnoud <laurent@spkdev.net> + * ext/openssl/ossl.c (ossl_clear_error): Extracted from + ossl_make_error(). This prints errors in the OpenSSL error queue if + OpenSSL.debug is true, and clears the queue. + (ossl_make_error): use ossl_clear_error(). - * test/csv/test_row.rb: Added some missing tests in CSV. - [fix GH-710] - * test/csv/test_table.rb: ditto. + * ext/openssl/ossl.h: add prototype declaration of ossl_make_error(). + (OSSL_BIO_reset) use ossl_clear_error() to clear the queue. Clearing + silently makes debugging difficult. -Fri Sep 5 12:57:52 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_engine.c (ossl_engine_s_by_id): ditto. - * process.c (has_privilege): Refine uid/gid check. + * ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto. -Fri Sep 5 12:40:55 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): ditto. - * configure.in: Check sys/id.h, getuidx and getgidx for AIX. + * ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto. - * process.c (getresuid): Defined for AIX. - (getresgid): Ditto - AIX don't have getresuid/getresgid but getuidx/getgidx. + * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto. + (ossl_ec_group_initialize): ditto. -Fri Sep 5 12:28:21 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): ditto. - * process.c (has_privilege): Fix assignments. +Wed May 18 11:53:49 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri Sep 5 11:10:13 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): Validate the + arguments before passing to EC_POINT(s)_mul(). Add description of this + method. [ruby-core:65152] [Bug #10268] - * lib/rdoc/generator/pot/po.rb: fixed broken tests for trailing whitespace. - * test/rdoc/test_rdoc_generator_pot.rb: ditto. - * test/rdoc/test_rdoc_generator_pot_po.rb: ditto. + * test/openssl/test_pkey_ec.rb (test_ec_point_mul): Test that + OpenSSL::PKey::EC::Point#mul works. -Fri Sep 5 10:41:07 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed May 18 11:19:59 2016 Kazuki Yamaguchi <k@rhe.jp> - * test/rdoc/test_rdoc_rdoc.rb (TestRDocRDoc#test_parse_file_encoding): - typofix. + * ext/openssl/ossl_bn.c (try_convert_to_bnptr): Extracted from + GetBNPtr(). This doesn't raise exception but returns NULL on error. + (GetBNPtr): Raise TypeError if conversion fails. + (ossl_bn_eq): Implement BN#==. + (ossl_bn_eql): #eql? should not raise TypeError even if the argument + is not compatible with BN. + (ossl_bn_hash): Implement BN#hash. -Fri Sep 5 10:39:14 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/openssl/ossl_bn.c (Init_ossl_bn): Define #== and #hash. - * lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(313287) + * test/openssl/test_bn.rb: Test BN#eql?, #== and #hash -Fri Sep 5 06:04:22 2014 Eric Wong <e@80x24.org> +Wed May 18 10:17:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm.c: remove unused USE_THREAD_RECYCLE [misc #10198] + * include/ruby/ruby.h (RB_INTEGER_TYPE_P): new macro and + underlying inline function to check if the object is an + Integer (Fixnum or Bignum). -Fri Sep 5 00:29:08 2014 Tanaka Akira <akr@fsij.org> +Wed May 18 09:52:00 2016 Kenta Murata <mrkn@mrkn.jp> - * configure.in (dirfd): Check function. + * enum.c (enum_sum, hash_sum, hash_sum_i, enum_sum_i, sum_iter): + Optimize for hashes when each method isn't redefined. - * dir.c (dir_fileno): New method. - [ruby-dev:48265] [Feature #9880] +Wed May 18 09:14:00 2016 Kenta Murata <mrkn@mrkn.jp> -Thu Sep 4 23:39:52 2014 Tanaka Akira <akr@fsij.org> + * enum.c (enum_sum, int_range_sum): Extract int_range_sum from + enum_sum. - * process.c (has_privilege): New function. - (retry_fork_async_signal_safe): Don't use vfork() for privileged - process. +Wed May 18 03:16:06 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in (getresuid): Check function. - (getresgid): Ditto. + * re.c (match_values_at): fix regression at r55036. + MatchData#values_at accepts Range. -Thu Sep 4 20:22:14 2014 Laurent Arnoud <laurent@spkdev.net> +Wed May 18 02:02:58 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/pathname/test_pathname.rb: added testcase for Pathname#mountpoint?. - [fix GH-709] + * re.c (match_aref): remove useless condition and call rb_fix2int. + rb_reg_nth_match handles negative index. -Thu Sep 4 20:09:21 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed May 18 01:57:43 2016 NARUSE, Yui <naruse@ruby-lang.org> - * symbian/*: removed Symbian support. - [Feature #10199][ruby-core:64725] - * dln.c: ditto. - * include/ruby/defines.h: ditto. - * thread_pthread.c: ditto. - * vm.c: ditto. + * re.c (match_values_at): MatchData#values_at supports named captures + [Feature #9179] -Thu Sep 4 17:44:40 2014 Koichi Sasada <ko1@atdot.net> + * re.c (namev_to_backref_number): separated. - * dir.c (glob_helper): use #ifdef instead of #if. - gcc's -Wundef option shows warning for undefined macro. +Wed May 18 00:05:00 2016 Kenta Murata <mrkn@mrkn.jp> - * numeric.c (flo_is_finite_p): ditto. + * enum.c (enum_sum): Optimize for a range from int to int. - * vm_dump.c (rb_vmdebug_thread_dump_state): ditto. + * test/ruby/test_enum.rb (test_range_sum): Move from test_range.rb, + and add assertions for some conditions. - * vm_core.h: define VM_DEBUG_VERIFY_METHOD_CACHE to 0. + * test/ruby/test_enum.rb (test_hash_sum): Move from test_hash.rb. -Thu Sep 4 03:57:46 2014 Eric Wong <e@80x24.org> + * test/ruby/test_hash.rb, test/ruby/test_range.rb: Remove test_sum. - * man/ruby.1: spelling fix ("bellow" => "below") [ci-skip] +Tue May 17 23:08:00 2016 Kenta Murata <mrkn@mrkn.jp> -Thu Sep 4 03:52:16 2014 Eric Wong <e@80x24.org> + * enum.c (enum_sum): [DOC] Write documentation. - * man/ruby.1: add trailing slash to URLs [ci-skip] +Tue May 17 22:53:00 2016 Kenta Murata <mrkn@mrkn.jp> -Wed Sep 3 19:10:28 2014 Tanaka Akira <akr@fsij.org> + * enum.c (enum_sum): Implement Enumerable#sum. - * process.c (before_fork_ruby): Renamed from before_fork. - (after_fork_ruby): Renamed from after_fork. + * test/ruby/test_enum.rb (test_sum): Test sum for Enumerable. -Wed Sep 3 18:56:05 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/test_hash.rb (test_sum): Test sum for Hash. - * process.c (forked_child): Removed. + * test/ruby/test_range.rb (test_sum): Test sum for Range. -Wed Sep 3 16:56:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue May 17 22:11:41 2016 Tanaka Akira <akr@fsij.org> - * object.c (rb_obj_copy_ivar): allocate no memory for empty - instance variables. [ruby-core:64700] [Bug #10191] + * object.c, numeric.c, enum.c, ext/-test-/bignum/mul.c, + lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rexml/xpath_parser.rb, + lib/rubygems/specification.rb, lib/uri/generic.rb, + bootstraptest/test_eval.rb, basictest/test.rb, + test/-ext-/bignum/test_big2str.rb, test/-ext-/bignum/test_div.rb, + test/-ext-/bignum/test_mul.rb, test/-ext-/bignum/test_str2big.rb, + test/csv/test_data_converters.rb, test/date/test_date.rb, + test/json/test_json_generate.rb, test/minitest/test_minitest_mock.rb, + test/openssl/test_cipher.rb, test/rexml/test_jaxen.rb, + test/ruby/test_array.rb, test/ruby/test_basicinstructions.rb, + test/ruby/test_bignum.rb, test/ruby/test_case.rb, + test/ruby/test_class.rb, test/ruby/test_complex.rb, + test/ruby/test_enum.rb, test/ruby/test_eval.rb, + test/ruby/test_iseq.rb, test/ruby/test_literal.rb, + test/ruby/test_math.rb, test/ruby/test_module.rb, + test/ruby/test_numeric.rb, test/ruby/test_range.rb, + test/ruby/test_rational.rb, test/ruby/test_refinement.rb, + test/ruby/test_rubyvm.rb, test/ruby/test_struct.rb, + test/ruby/test_variable.rb, test/rubygems/test_gem_specification.rb, + test/thread/test_queue.rb: Use Integer instead of Fixnum and Bignum. -Wed Sep 3 12:05:17 2014 Tanaka Akira <akr@fsij.org> +Tue May 17 15:26:10 2016 Tanaka Akira <akr@fsij.org> - * process.c (retry_fork_async_signal_safe): Use vfork() if available. - vfork() is still faster than fork() especially when the parent - process uses big memory. + * [Feature #12005] Unify Fixnum and Bignum into Integer - ruby -rbenchmark -e 'a = "a" * 1_000_000_000; puts Benchmark.measure { system("true") }' - fork: 0.000000 0.010000 0.010000 ( 0.014968) - vfork: 0.000000 0.000000 0.000000 ( 0.000912) - on Debian sid. + * include/ruby/ruby.h (rb_class_of): Return rb_cInteger for fixnums. -Wed Sep 3 11:33:08 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * insns.def (INTEGER_REDEFINED_OP_FLAG): Unified from + FIXNUM_REDEFINED_OP_FLAG and BIGNUM_REDEFINED_OP_FLAG. - * test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak): - added timeout into testcase for low performance environment. - [Bug #9984][ruby-core:63367] + * vm_core.h: Ditto. -Wed Sep 3 07:50:15 2014 Tanaka Akira <akr@fsij.org> + * vm_insnhelper.c (opt_eq_func): Use INTEGER_REDEFINED_OP_FLAG instead + of FIXNUM_REDEFINED_OP_FLAG. - * configure.in: Use AC_FUNC_FORK. + * vm.c (vm_redefinition_check_flag): Use rb_cInteger instead of + rb_cFixnum and rb_cBignum. + (C): Use Integer instead of Fixnum and Bignum. - * io.c: Use HAVE_WORKING_FORK instead of HAVE_FORK. + * numeric.c (fix_succ): Removed. + (Init_Numeric): Define Fixnum as Integer. - * process.c: Ditto. + * bignum.c (bignew): Use rb_cInteger instead of rb_cBignum. + (rb_int_coerce): replaced from rb_big_coerce and return fixnums + as-is. + (Init_Bignum): Define Bignum as Integer. + Don't define ===. -Wed Sep 3 00:12:44 2014 Tanaka Akira <akr@fsij.org> + * error.c (builtin_class_name): Return "Integer" for fixnums. - * process.c (retry_fork_async_signal_safe): Don't return on in child - process. + * sprintf.c (ruby__sfvextra): Use rb_cInteger instead of rb_cFixnum. -Tue Sep 2 23:47:35 2014 Tanaka Akira <akr@fsij.org> + * ext/-test-/testutil: New directory to test. + Currently it provides utilities for fixnum and bignum. - * process.c (retry_fork_async_signal_safe): Specialized version of - retry_fork respect to rb_fork_async_signal_safe. - (retry_fork_ruby): Specialized version of retry_fork respect to - rb_fork_ruby. - (rb_fork_ruby): Removed. + * ext/json/generator/generator.c: Define mInteger_to_json. -Tue Sep 2 23:26:26 2014 Tanaka Akira <akr@fsij.org> + * lib/mathn.rb (Fixnum#/): Redefinition removed. - * process.c (send_child_error): Simplified. - (recv_child_error): Ditto. +Tue May 17 11:58:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Sep 2 22:56:25 2014 Tanaka Akira <akr@fsij.org> + * configure.in (RUBY_CHECK_BUILTIN_SETJMP): declare t as NORETURN + to suppress warnings by -Wsuggest-attribute=noreturn. + [ruby-core:75510] [Bug #12383] - * process.c (rb_fork_async_signal_safe): Inline rb_fork_internal. - (rb_fork_ruby): Ditto. - (rb_fork_internal): Removed. - (chfunc_protect): Removed. +Tue May 17 10:40:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Sep 2 22:43:52 2014 Tanaka Akira <akr@fsij.org> + * configure.in (RUBY_CHECK_SETJMP): needs the header and proper + arguments for builtin setjmp functions. - * test/ruby/test_io.rb (test_new_with_block): Set autoclose to avoid - EBADF. +Mon May 16 20:00:30 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Sep 2 22:01:51 2014 Kouhei Sutou <kou@cozmixng.org> + * enc/unicode.h: Additional uses of ONIG_CASE_MAPPING compilation switch - * Makefile.in (update-coverage): Remove a never executed line. +Mon May 16 19:46:33 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Sep 2 19:48:26 2014 Tanaka Akira <akr@fsij.org> + * include/ruby/oniguruma.h: Introducing ONIG_CASE_MAPPING compilation + switch - * process.c (handle_fork_error): Extracted from retry_fork. + * include/ruby/oniguruma.h, enc/unicode.h: Using ONIG_CASE_MAPPING + compilation switch -Tue Sep 2 17:02:53 2014 Vit Ondruch <v.ondruch@tiscali.cz> +Mon May 16 19:29:31 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * tool/rbinstall.rb: fixed error of local installation. - [Bug #10192][ruby-core:64702] + * gems/bundled_gems: Update xmlrpc-0.1.1. xmlrpc-0.1.0 didn't allow + to install on 2.4.0dev. -Tue Sep 2 16:58:03 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Mon May 16 13:28:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/runner.rb: reporting test coverage for test-all with COVERAGE env. - [Feature #10189][ruby-core:64681][fix GH-708] - * Makefile.in: added task for coverage report. - * common.mk: added definition of forked simplecov url. - * .gitignore: ignored coverage directory. + * configure.in (FUNC_STDCALL, FUNC_CDECL, FUNC_FASTCALL): set + macro names explicitly to the old names, which are accidentally + changed at r54985, for backward compatibilities. + fiddle also depends on these names to fallback to ANSI names. + [ruby-core:75494] [Bug #12377] -Mon Sep 1 20:11:02 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Mon May 16 11:39:02 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/win32ole/win32ole.c (rbtime2vtdate): try to convert millisecond - of Time object to millisecond of VT_DATE VARIANT. - * test/win32ole/test_win32ole_variant.rb - (test_conversion_time2date_with_msec): ditto. + * lib/xmlrpc.rb, lib/xmlrpc/*, test/xmlrpc: XMLRPC is bundled gem + on Ruby 2.4. It is extracted to https://github.com/ruby/xmlrpc + [Feature #12160][ruby-core:74239] + * gems/bundled_gems: ditto. -Sun Aug 31 16:58:49 2014 Tanaka Akira <akr@fsij.org> +Mon May 16 06:06:21 2016 Eric Wong <e@80x24.org> - * lib/benchmark.rb: Fix a syntax error. + * proc.c: fix RDoc of Proc#===/call/yield/[] + [Bug #12332] -Sun Aug 31 08:46:44 2014 Eric Wong <e@80x24.org> +Sun May 15 20:55:31 2016 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> - * ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE - [Bug #10101] + * lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342] - * test/zlib/test_zlib.rb (test_rewind): test each_byte + * test/drb/ut_timerholder.rb: ditto. -Sat Aug 30 19:22:47 2014 Eric Wong <e@80x24.org> +Sun May 15 16:15:25 2016 NARUSE, Yui <naruse@ruby-lang.org> - * symbol.c (rb_sym2id): do not return garbage object + * array.c (rb_ary_entry): extract rb_ary_elt to organize if-conditions + and check whether is embedded at once. -Sat Aug 30 06:39:48 2014 Aaron Patterson <aaron@tenderlovemaking.com> +Sun May 15 10:57:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and - loading. Fixes GH #85. Thanks @brentdax for the patch! - * test/psych/test_exception.rb: test for fix + * vm_insnhelper.c (vm_get_ev_const): warn deprecated constant even + in the class context. [ruby-core:75505] [Bug #12382] -Sat Aug 30 06:23:40 2014 Aaron Patterson <aaron@tenderlovemaking.com> +Sun May 15 03:13:01 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that - look like integers but have a newline. Fixes GH #189 - * test/psych/test_string.rb: test for fix + * iseq.h (struct iseq_compile_data): use struct rb_id_table + instead of st_table. -Sat Aug 30 06:10:39 2014 Aaron Patterson <aaron@tenderlovemaking.com> + * iseq.c (prepare_iseq_build): don't allocate ivar_cache_table + until it has at least one element. - * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash - should merge the hash in to the parent. - * test/psych/test_merge_keys.rb: test for change. Fixes GH #202 + * iseq.c (compile_data_free): free ivar_cache_table only if it + is allocated. -Sat Aug 30 06:00:26 2014 Aaron Patterson <aaron@tenderlovemaking.com> + * compile.c (get_ivar_ic_value): allocate if the table is not + allocated yet. - * ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings - should not be treated as merge keys. - * ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys - containing "<<" should roundtrip. - * test/psych/test_merge_keys.rb: test for change. Fixes GH #203 +Sat May 14 09:04:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Aug 29 17:56:44 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * lib/mkmf.rb (pkg_config): use xsystem consistently to set up + library path environment variable as well as latter pkg-config + calls. [ruby-dev:49619] [Bug #12379] - * test/net/imap/test_imap_response_parser.rb: removed needless code. +Sat May 14 00:16:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Aug 29 17:36:58 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * random.c (make_seed_value): append leading-zero-guard and get + rid of making a local copy of the seed. - * test/rinda/test_rinda.rb: removed useless assignment variables. - * test/rss/rss-assertions.rb: ditto. - * test/rss/test_maker_itunes.rb: ditto. +Fri May 13 08:46:42 2016 cremno <cremno@mail.ru> -Fri Aug 29 16:18:26 2014 Eric Wong <e@80x24.org> + * NEWS: drop FreeBSD < 4 support. [Fix GH-1339] + The most recent version affected by this is 3.5 and was released + in 2000. + https://www.freebsd.org/releases/3.5R/announce.html + https://en.wikipedia.org/wiki/History_of_FreeBSD#Version_history - * string.c: revert part of r47311, add rb_vm_fstring_table(), - remove vm_core.h dependency. [ruby-core:64627] +Fri May 13 03:12:09 2016 NARUSE, Yui <naruse@ruby-lang.org> -Fri Aug 29 15:17:13 2014 Eric Wong <e@80x24.org> + * include/ruby/defines.h (GCC_VERSION_SINCE): moved from internal.h. - * string.c: remove static frozen_strings - * string.c (Init_frozen_strings): new function - * string.c (rb_fstring): remove check for frozen strings, - use per-VM table - * string.c (rb_str_free): use per-VM table - * string.c (Init_String): use per-VM table - * vm_core.h (rb_vm_t): add frozen_strings table - * internal.h (Init_frozen_strings): new function prototype - * eval.c (ruby_setup): call Init_frozen_strings - [Feature #10182] +Fri May 13 03:11:20 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Aug 27 23:10:24 2014 Masaki Matsushita <glass.saga@gmail.com> + * configure.in (__builtin_constant_p): check. - * lib/tempfile.rb: remove "require 'thread'". its features are no - longer used. + * internal.h: Use HAVE_BUILTIN___BUILTIN_CONSTANT_P -Wed Aug 27 21:19:40 2014 gogo tanaka <mail@tanakakazuki.com> +Fri May 13 03:10:39 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/drb/acl.rb: Removed meaningless #to_s methods in interpolation. - [Feature #10174][ruby-core:64584] - * lib/erb.rb: ditto. - * lib/observer.rb: ditto. - * lib/rake/invocation_chain.rb: ditto. - * lib/rubygems/command_manager.rb: ditto. - * lib/rubygems/config_file.rb: ditto. - * lib/uri/common.rb: ditto. + * configure.in: use alternative keyword + to avoid macros conflicts with them. -Wed Aug 27 21:08:20 2014 gogo tanaka <mail@tanakakazuki.com> +Thu May 12 01:54:08 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/drb/drb.rb: use attr_reader instead of Module#attr. - [Feature #10172][ruby-core:64582] - * lib/irb/ruby-token.rb: ditto. - * lib/net/telnet.rb: ditto. - * lib/rdoc/ruby_token.rb: ditto. - * lib/thwait.rb: ditto. + * lib/mkmf.rb (try_func): get rid of conflict of declarations of + main(). checking local symbol reference does not make sense. -Wed Aug 27 19:52:33 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Thu May 12 00:18:19 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * ext/win32ole/win32ole.c (vtdate2rbtime): try to convert millisecond - of VT_DATE VARIANT to nsec of Time object. - * test/win32ole/test_win32ole_variant.rb - (test_conversion_dbl2date_with_msec): ditto. + * win32/Makefile.sub (HAVE_QSORT_S): use qsort_s only for Visual Studio + 2012 or later, because VS2010 seems to causes a SEGV in + test/ruby/test_enum.rb. -Wed Aug 27 09:57:29 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed May 11 23:59:47 2016 Masaya Tarui <tarui@ruby-lang.org> - * test/ruby/test_complex.rb: removed unreachable code. - * test/ruby/test_rational.rb: ditto. + * vm_insnhelper.c (vm_getivar): describe fast-path explicit + (compiler friendly). [Bug #12274]. -Wed Aug 27 07:59:17 2014 Eric Wong <e@80x24.org> +Wed May 11 21:30:07 2016 Masaya Tarui <tarui@ruby-lang.org> - * compile.c (iseq_set_sequence): check for multiplication overflow + * compile.c (iseq_compile_each): share InlineCache during same + instance variable accesses. Reducing memory consumption, + rising cache hit rate and rising branch prediction hit rate + are expected. A part of [Bug #12274]. -Tue Aug 26 22:07:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * iseq.h (struct iseq_compile_data): introduce instance + variable IC table for sharing. - * test/ruby/test_complex.rb: cherry-picked working assertions from r47251. - * test/ruby/test_rational.rb: cherry-picked working assertions from r47263. + * iseq.c (prepare_iseq_build, compile_data_free): + construct/destruct above table. -Tue Aug 26 21:07:56 2014 gogo tanaka <mail@tanakakazuki.com> +Wed May 11 17:18:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/mathn.rb (Fixnum#**, Bignum#**, Float#**, Rational#**): - remove as these are now built-in. [ruby-core:63973] [Bug #10086] + * util.c (ruby_qsort): use qsort_s if available, for Microsoft + Visual Studio 2005 (msvcr80.dll) and mingw. -Tue Aug 26 20:46:55 2014 Tanaka Akira <akr@fsij.org> +Wed May 11 10:33:26 2016 Marcus Stollsteimer <sto.mar@web.de> - * time.c (rb_time_unmagnify_to_float): Avoid double rounding. - Reported by Tsuyoshi Sawada. - https://bugs.ruby-lang.org/issues/10135#note-1 + * COPYING: Remove trailing-whitespaces. + [ci skip][fix GH-1348] -Tue Aug 26 17:12:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue May 10 21:05:45 2016 Benoit Daloze <eregontp@gmail.com> - * io.c (io_close): ignore only "closed stream" IOError and - NoMethodError, do not swallow other exceptions at the end of - block. [ruby-core:64463] [Bug #10153] + * insns.def (defineclass): Also raise an error when redeclaring the + superclass of a class as Object and it has another superclass. + [Bug #12367] [ruby-core:75446] -Tue Aug 26 13:46:33 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + * test/ruby/test_class.rb: test for above. - * template/fake.rb.in: fix failed to make install when @srcdir@ is - absolute path. +Tue May 10 14:57:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Aug 26 13:43:50 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * random.c (obj_random_bytes): base on bytes method instead of + rand method, not to call toplevel rand method. - * test/ruby/test_range.rb: added workaround for VERBOSE message. +Tue May 10 13:07:28 2016 NARUSE, Yui <naruse@ruby-lang.org> -Tue Aug 26 12:38:02 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * configure.in (-fexcess-precision=standard): before r54895 -std=c99 + is specified and it implied -fexcess-precision=standard. + Now with -std=gnu99, it should be explicitly specified. + https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html - * test/test_mathn.rb: added workaround for VERBOSE messages. +Mon May 9 10:51:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Aug 26 11:44:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * thread.c (rb_thread_atfork_internal): move th to an argument. - * lib/shell/process-controller.rb: removed commented-out code. + * thread.c (rb_thread_atfork): do not repeat GET_THREAD(). -Tue Aug 26 11:39:01 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Mon May 9 10:46:36 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/thwait.rb (ThreadsWait): removed needless constant. + * thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): do + nothing unless working fork is available. -Tue Aug 26 09:27:10 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * thread_sync.c (rb_mutex_abandon_all): define only if working + fork is available. - * lib/mathn.rb: mathn library is deprecated on ruby 2.2. - [Feature #10169][ruby-core:64553] + * thread_sync.c (rb_mutex_abandon_keeping_mutexes): ditto. -Tue Aug 26 09:25:03 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * thread_sync.c (rb_mutex_abandon_locking_mutex): ditto. - * lib/mathn.rb: removed commented-out code. + * thread_win32.c (gvl_init): never used. -Mon Aug 25 20:15:50 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Mon May 9 07:18:06 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * ext/win32ole/win32ole.c(fole_s_connect, fole_initialize): raise a - security error with the tainted string object. - * ext/win32ole/win32ole_event.c(ev_advise): ditto. - * test/win32ole/test_win32ole.rb(test_s_new_exc_svr_tainted, - test_s_new_exc_host_tainted): ditto. - * test/win32ole/test_win32ole_event.rb(test_s_new_exc_tainted): ditto. + * include/ruby/{defines,ruby}.h: need to define function attributes + alternatives in defines.h instead of ruby.h, because they are used + in oniguruma.h and the header used without including ruby.h at + encoding library sources. -Mon Aug 25 12:56:54 2014 Ivan Korunkov <ivankorunkov@ya.ru> +Mon May 9 06:30:12 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * lib/logger.rb (format_datetime): use "%6N" to show microsecond. - [Fix GH-704] + * include/ruby/ruby.h (CONSTFUNC, PUREFUNC): fixed build errors on + non-gcc build environments introduced at r54952. -Mon Aug 25 11:02:07 2014 Eric Wong <e@80x24.org> +Mon May 9 02:51:51 2016 NARUSE, Yui <naruse@ruby-lang.org> - * vm_core.h (rb_iseq_location_t): change first_lineno type to VALUE - * iseq.c (rb_iseq_build_for_ruby2cext): update based on argument + * gc.c (rb_gc_unprotect_logging): throw rb_memerror when it cannot + allocate memory. This is pointed out by Facebook's Infer. -Sun Aug 24 16:14:46 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * gc.c (gc_prof_setup_new_record): ditto. - * lib/e2mmap.rb: remove needless instance variables. - * lib/irb.rb: ditto. - * lib/irb/**/*.rb: ditto. - * lib/shell.rb: ditto. + * regparse.c (parse_regexp): ditto. -Sun Aug 24 12:44:26 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * util.c (MALLOC): use xmalloc and xfree like above. - * test/ruby/test_complex.rb: removed needless conditions. - * test/ruby/test_rational.rb: ditto. +Mon May 9 02:39:16 2016 NARUSE, Yui <naruse@ruby-lang.org> -Sun Aug 24 11:47:39 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * configure.in: check function attribute const and pure, + and define CONSTFUNC and PUREFUNC if available. + Note that I don't add those options as default because + it still shows many false-positive (it seems not to consider + longjmp). - * test/ruby/test_rational.rb: fixed indent. + * vm_eval.c (stack_check): get rb_thread_t* as an argument + to avoid duplicate call of GET_THREAD(). -Sun Aug 24 11:44:11 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Sun May 8 21:01:14 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/ruby/test_rational.rb: remove commented-out code. + * ext/openssl/extconf.rb: assume it doesn't have SSLv2 related + functions when OPENSSL_NO_SSL2 is defined. + Usually openssl's header and the library (libssl) have the same + set of functions, but on some environment the library has functions + whose headers doesn't declare. (openssl/opensslconf.h and libssl.so + aren't be synchronized) + To detect such case explicitly check feature macro and remove + related functions. -Sun Aug 24 11:09:29 2014 Eric Wong <e@80x24.org> +Sun May 8 18:51:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/benchmark.rb (measure): reduce allocations as in r47260 + * file.c (rb_home_dir_of): return the default home path if the + user name is the current user name, on platforms where struct + pwd is not supported. a temporary measure against + [Bug #12226]. -Sun Aug 24 10:35:54 2014 Pete Higgins <pete@peterhiggins.org> +Sun May 8 08:51:38 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/benchmark.rb (module Benchmark): define BENCHMARK_CLOCK - (realtime): use Process.clock_gettime(BENCHMARK_CLOCK) - Reduces allocations to improve performance [Feature #10165] + * configure.in: add -Wsuggest-attribute=format and suppress warnings. - * test/benchmark/test_benchmark.rb (test_realtime_output): new test +Sun May 8 08:31:03 2016 NARUSE, Yui <naruse@ruby-lang.org> -Fri Aug 22 20:23:54 2014 Koichi Sasada <ko1@atdot.net> + * configure.in: add -Wsuggest-attribute=noreturn and suppress warnings. - * string.c (rb_fstring): fix condition (easy to cause infinite loop!). +Sun May 8 08:19:16 2016 NARUSE, Yui <naruse@ruby-lang.org> -Fri Aug 22 20:07:43 2014 Koichi Sasada <ko1@atdot.net> + * configure.in: add -Werror=implicit-int to avoid missing type of + function declaration. - * string.c (rb_fstring, fstr_update_callback): simply delete garbage - key first. +Sat May 7 22:22:37 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - Garbage keys can be swept by lazy sweeping invoked by creating new - fstring. So that simply do: - (1) delete garbage key and return `fstr_update_callback' immediately - (2) try again `fstr_update_callback()' to create a new fstr. + * lib/webrick/ssl.rb: Accept string value for SSLCertName. It is used + to invoke ssl server with command line. + [fix GH-1329] Patch by @kerlin + * test/webrick/test_ssl_server.rb: Added test for GH-1329 - This bug can be cause memory corruption, reported by - http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20140821T220302Z.fail.html.gz +Sat May 7 21:55:12 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Fri Aug 22 19:30:39 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * test/webrick/test_ssl_server.rb: Added basic test for `webrick/ssl` - * test/ruby/test_complex.rb: removed commented-out code. +Sat May 7 16:22:13 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Aug 22 19:25:28 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * random.c (int_pair_to_real_inclusive): optimize to multiply + without Bignum. - * test/ruby/test_complex.rb: fixed broken tests. Math is not - compatible CMath now. +Sat May 7 07:58:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Aug 22 15:36:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * process.c (rb_exec_getargs): honor the expected argument types + over the conversion method. the basic language functionality + should be robust. [ruby-core:75388] [Bug #12355] - * common.mk (Doxyfile): revert r43888, not to require preinstalled - ruby. [ruby-core:64488] [Bug #10161] +Fri May 6 08:16:26 2016 David Silva <david.silva@digital.cabinet-office.gov.uk> -Fri Aug 22 12:32:15 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * enum.c (enum_find): [DOC] add more examples to the documentation + of Enumerable#detect, to show that it equals to Enumerable#find. + [Fix GH-1340] - * lib/shell.rb: removed commented-out code. - * lib/shell/builtin-command.rb: ditto. - * lib/shell/command-processor.rb: ditto. +Thu May 5 18:08:31 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Fri Aug 22 12:21:46 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * test/ruby/test_complexrational.rb: Remove duplicated raise. - * lib/complex.rb: removed deprecated library. - * lib/rational.rb: ditto. +Thu May 5 14:41:05 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Fri Aug 22 11:38:49 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * string.c (rb_str_sub): Fix a special match variable name. + [ci skip] - * lib/prettyprint.rb: removed PrettyPrint#first? - because it is obsoleted method since Ruby 1.8.2 +Thu May 5 12:22:17 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Aug 21 17:10:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * vm_eval.c (rb_eval_cmd, rb_catch_obj): use TH_JUMP_TAG with the + same rb_thread_t used for TH_PUSH_TAG, instead of JUMP_TAG with + the current thread global variable. - * win32/win32.c (constat_attr): manage reverse video internally - since Windows console window does not manage it. based on the - patch by white leaf in [ruby-dev:48483]. [Bug #10158] +Thu May 5 10:49:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Aug 21 14:45:41 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * random.c (fill_random_bytes_syscall): use arc4random_buf if + available. - * lib/e2mmap.rb: removed commented-out code. +Wed May 4 23:13:58 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Thu Aug 21 13:23:34 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (fix_plus): Remove rb_nucomp_add prototype + declaration. - * lib/rinda/ring.rb: split executable code into sample directory. - * sample/rinda-ring.rb: ditto. + * numeric.c (fix_mul): Remove rb_nucomp_mul prototype + declaration. -Thu Aug 21 13:21:45 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * internal.h (rb_nucomp_add, rb_nucomp_mul): add prototype + declarations. - * lib/drb/acl.rb: split executable code into sample directory. - * sample/drb/acl.rb: ditto. +Wed May 4 18:38:00 2016 Kazuki Tsujimoto <kazuki@callcc.net> -Thu Aug 21 12:55:35 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * lib/net/http/header.rb (Net::HTTPHeader#{each_header,each_name, + each_capitalized_name,each_value,each_capitalized}): Return + sized enumerators. - * .gitignore: ignored temporary file for Changelog. - http://mkosaki.blog46.fc2.com/blog-entry-1284.html + * test/net/http/test_httpheader.rb: add test for above. -Thu Aug 21 12:40:22 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed May 4 17:53:15 2016 Kazuki Tsujimoto <kazuki@callcc.net> - * lib/net/imap.rb: split executable code into sample directory. - * sample/net-imap.rb: ditto. + * lib/set.rb (Set#{delete_if,keep_if,collect!,reject!,select!,classify,divide}, + SortedSet#{delete_if,keep_if}): Return sized enumerators. -Thu Aug 21 12:23:56 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * test/test_set.rb: add test for above. - * lib/net/imap.rb: removed commented-out code. +Tue May 3 23:25:48 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Wed Aug 20 17:27:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c: [DOC] Update result of 123456789 ** -2. + [ruby-dev:49606] [Bug #12339] - * configure.in (RUBY_TRY_CFLAGS, RUBY_TRY_LDFLAGS), - (RUBY_CHECK_BUILTIN_SETJMP, RUBY_SETJMP_TYPE), - (RUBY_STACK_GROW_DIRECTION): quote defun names, for some - versions of autoconf possibly. [ruby-core:64473] [Bug #10156] +Tue May 3 23:13:16 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Tue Aug 19 22:28:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG + instead of duplicated undef RCOMPLEX_SET_REAL. - * sprintf.c (rb_str_format): fix condition to round. - [ruby-core:64454] [Bug #10151] +Tue May 3 22:55:07 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Tue Aug 19 22:22:45 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * complex.c (rb_complex_set_imag): Fix to properly set imag + of complex. - * enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and - registered signs. [ruby-core:64452] [Bug #10149] +Tue May 3 22:19:55 2016 NARUSE, Yui <naruse@ruby-lang.org> -Tue Aug 19 13:59:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * configure.in (warnflags): use -std=gnu99 instead of + -std=iso9899:1999. [Feature #12336] - * compar.c (rb_cmperr): preserve encodings of arguments in the - message. +Tue May 3 22:10:09 2016 NARUSE, Yui <naruse@ruby-lang.org> -Tue Aug 19 10:13:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c (count_utf8_lead_bytes_with_word): Use __builtin_popcount + only if it can use SSE 4.2 POPCNT whose latency is 3 cycle. - * ext/thread/thread.c (get_array): check instance variables are - initialized properly. [ruby-core:63826][Bug #10062] + * internal.h (rb_popcount64): use __builtin_popcountll because now + it is in fast path. -Mon Aug 18 17:06:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue May 3 14:19:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * sprintf.c (rb_str_format): support rational 'f' format. - [ruby-core:64382] [Bug #10136] + * parse.y (new_if_gen): set newline flag to NODE_IF to trace all + if/elsif statements. [ruby-core:67720] [Bug #10763] -Mon Aug 18 08:03:46 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Tue May 3 05:35:54 2016 Eric Wong <e@80x24.org> - * spec/default.mspec: use 2.2 definition. + * process.c (disable_child_handler_fork_child): + initialize handler for SIGPIPE for !POSIX_SIGNAL -Sun Aug 17 19:41:40 2014 Kazuki Tsujimoto <kazuki@callcc.net> +Mon May 2 23:03:42 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * gc.c (obj_memsize_of): don't calculate memsize of T_NODE - when called from check_gen_consistency. It fixes segmentation - fault on RGENGC_CHECK_MODE >= 1 introduced by r47188. + * win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new + truncate alternative which accepts UTF-8 path. -Sun Aug 17 17:08:12 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * file.c (truncate): use above function. + [Bug #12340] - * ext/win32ole/win32ole.c (ole_invoke): use RHASH_SIZE instead of - calling Hash#length method. +Mon May 2 20:59:21 2016 NARUSE, Yui <naruse@ruby-lang.org> -Sat Aug 16 19:32:06 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * re.c (str_coderange): to avoid function call when the string already + has coderange information. - * ext/win32ole/win32ole_event.c (evs_length): use RARRAY_LEN instead - of calling Array#length method. + * re.c (rb_reg_prepare_enc): add shortcut path when the regexp has + the same encoding of given string. -Sat Aug 16 10:20:17 2014 Eric Wong <e@80x24.org> + * re.c (rb_reg_prepare_re): avoid duplicated allocation of + onig_errmsg_buffer. - * time.c (time_timespec): fix tv_nsec overflow - [Bug #10144] -Fri Aug 15 20:34:17 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Mon May 2 12:34:52 2016 Tanaka Akira <akr@fsij.org> - * ext/win32ole/win32ole.c: separate WIN32OLE_EVENT src from - win32ole.c. - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_event.c: ditto. - * ext/win32ole/win32ole_event.h: ditto. - * ext/win32ole/depend: ditto. + * test/ruby/test_refinement.rb (test_inspect): Use Integer instead of + Fixnum. -Fri Aug 15 19:38:00 2014 Koichi Sasada <ko1@atdot.net> +Mon May 2 06:58:38 2016 Tanaka Akira <akr@fsij.org> - * iseq.c (rb_iseq_clone): Should not insert write barrier from - non-RVALUE data (to non-RVALUE data, of course). + * complex.c: Don't refer rb_cFixnum and rb_cBignum. + (k_fixnum_p): Use FIXNUM_P. + (k_bignum_p): Use RB_TYPE_P. - Ruby 2.1 also has a same problem. +Mon May 2 01:27:59 2016 Tanaka Akira <akr@fsij.org> -Fri Aug 15 19:34:33 2014 Koichi Sasada <ko1@atdot.net> + * test/ruby/test_numeric.rb (test_step): Use Integer::FIXNUM_MAX. - * string.c (setup_fake_str): fake strings should not set class by - RBASIC_SET_CLASS() because it insert write barriers to fake - (non-RVALUE) structure. +Mon May 2 01:15:01 2016 Tanaka Akira <akr@fsij.org> - It can cause unexpected behaviour. + * test/ruby/test_module.rb (test_name): Use Integer instead of Fixnum. - Ruby 2.1 also have a same problem (setup_fake_str() in parse.y). +Mon May 2 01:00:04 2016 Tanaka Akira <akr@fsij.org> - * symbol.c (setup_fake_str): ditto. + * test/lib/test/unit/assertions.rb (assert_fixnum): Defined. + (assert_bignum): Defined. -Fri Aug 15 19:27:25 2014 Koichi Sasada <ko1@atdot.net> + * test/ruby/test_bignum.rb: Use assert_bignum. - * array.c (rb_ary_tmp_new_fill): added. - This function creates internal use only array (which is completely - hided by ObjectSpace.each_object) with filling nil. + * test/ruby/test_integer_comb.rb: Use assert_fixnum and assert_bignum. - Otherwise, it can be includes strange VALUEs. + * test/ruby/test_optimization.rb: Ditto. - * internal.h: added. +Mon May 2 00:41:53 2016 Tanaka Akira <akr@fsij.org> - * node.h: use rb_ary_tmp_new_fill() for MEMO. + * vm_trace.c (recalc_remove_ruby_vm_event_flags): Add a cast to + avoid signed integer overflow. -Fri Aug 15 10:13:37 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Mon May 2 00:06:04 2016 Tanaka Akira <akr@fsij.org> - * lib/gserver.rb: removed unmaintained code. - [ruby-core:40313][Feature #5480] - * lib/xmlrpc/httpserver.rb: ditto. + * test/lib/envutil.rb: Define Integer::{FIXNUM_MIN,FIXNUM_MAX}. -Fri Aug 15 09:22:12 2014 Eric Wong <e@80x24.org> + * test/ruby/test_bignum.rb: Use Integer::{FIXNUM_MIN,FIXNUM_MAX}. - * vm_core.h (rb_thread_struct): reorder to pack - * cont.c (rb_context_struct, rb_fiber_struct): ditto - On x86-64, these changes reduces: - rb_thread_struct to 1000 bytes (from 1016) - rb_context_struct to 1288 bytes (from 1312) - rb_fiber_struct to 2272 bytes (from 2304) + * test/ruby/test_bignum.rb: Ditto. -Fri Aug 15 09:06:31 2014 Eric Wong <e@80x24.org> + * test/ruby/test_integer_comb.rb: Ditto. - * thread_pthread.h: define RB_NATIVETHREAD_LOCK_INIT and - RB_NATIVETHREAD_COND_INIT macros + * test/ruby/test_marshal.rb: Ditto. - * thread_pthread.c (native_mutex_lock, native_mutex_unlock, - native_mutex_trylock, native_mutex_initialize, - native_mutex_destroy, native_cond_wait): - use rb_nativethread_lock_t instead of pthread_mutex_t - [Feature #10134] + * test/ruby/test_optimization.rb: Ditto. - * thread_pthread.c (native_mutex_debug): make argument type-agnostic - to avoid later cast. +Sun May 1 23:59:59 2016 Kenta Murata <mrkn@mrkn.jp> - * thread_pthread.c (register_cached_thread_and_wait): - replace PTHREAD_COND_INITIALIZER with RB_NATIVETHREAD_COND_INIT, - use native_mutex_{lock,unlock} + * array.c (rb_ary_sum): fix for mathn - * thread_pthread.c (use_cached_thread): - use native_mutex_{lock,unlock} + * test/ruby/test_array.rb (test_sum): ditto. - * thread_pthread.c (native_sleep): - use rb_nativethread_lock_t to match th->interrupt_lock, - use native_mutex_{lock,unlock} +Sun May 1 23:51:54 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * thread_pthread.c (timer_thread_lock): use rb_nativethread_lock_t type + * test/lib/test/unit.rb (Options#non_options): fixed wrong regexp. + if both positives and negatives were specified, positives had to + be specified from the beginning. -Fri Aug 15 08:10:29 2014 Eric Wong <e@80x24.org> +Sun May 1 21:00:07 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * cont.c (cont_mark): fix typo in unused path [ci skip] + * win32/win32.c: drop Win2K support. -Fri Aug 15 06:00:56 2014 Eric Wong <e@80x24.org> +Sun May 1 20:39:47 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * vm.c (rb_thread_mark): update comment about marking `me' - [ruby-core:64340] [ruby-core:64341] + * cont.c, hash.c, random.c, win32/win32.c: cleanup some Win9x/ME/NT4 + support leftovers. + [fix GH-1328] patched by @cremno -Fri Aug 15 05:53:59 2014 Eric Wong <e@80x24.org> +Sun May 1 07:30:44 2016 NARUSE, Yui <naruse@ruby-lang.org> - * README.EXT: preliminary documentation for RB_GC_GUARD - [Bug #10100] [ruby-core:60741] + * string.c (search_nonascii): use nlz on big endian environments. -Thu Aug 14 00:26:19 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (nlz_intptr): defined. - * ext/win32ole/win32ole.c: separate WIN32OLE_RECORD src from - win32ole.c - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_record.c: ditto. - * ext/win32ole/win32ole_record.h: ditto. - * ext/win32ole/depend: ditto. +Sun May 1 00:03:30 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Aug 13 21:41:04 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * configure.in (__builtin_ctz): check. - * ext/win32ole/win32ole.c: separate WIN32OLE_VARIANT src from - win32ole.c. - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_variant.c: ditto. - * ext/win32ole/win32ole_variant.c: ditto. - * ext/win32ole/depend: ditto. + * configure.in (__builtin_ctzll): check. -Wed Aug 13 20:09:37 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (rb_popcount32): defined for ntz_int32. + it can use __builtin_popcount but this function is not used on + GCC environment because it uses __builtin_ctz. + When another function uses this, using __builtin_popcount + should be re-considered. - * ext/win32ole/win32ole.c: remove unused variable. + * internal.h (rb_popcount64): ditto. -Wed Aug 13 19:31:27 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (ntz_int32): defined for ntz_intptr. - * ext/win32ole/win32ole.c (ole_search_handler_method, rescue_callback, - folerecord_inspect): use PRIsVALUE in rb_sprintf. + * internal.h (ntz_int64): defined for ntz_intptr. - * ext/win32ole/win32ole_param.c (foleparam_inspect): ditto. + * internal.h (ntz_intptr): defined as ntz for uintptr_t. - * ext/win32ole/win32ole_variable.c (folevariable_inspect): use - PRIsVALUE in rb_sprintf, use rb_inspect. + * string.c (search_nonascii): unroll and use ntz. -Wed Aug 13 11:54:41 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Sat Apr 30 21:54:13 2016 Tanaka Akira <akr@fsij.org> - * lib/irb/completion.rb: reverted r47163. - because another case can't be show completion target. + * numeric.c (Init_Numeric): Gather Fixnum method definitions. -Wed Aug 13 11:17:00 2014 Shimpei Makimoto <github@makimoto.org> +Sat Apr 30 21:28:14 2016 Tanaka Akira <akr@fsij.org> - * lib/irb.rb: Prevent irb from crashing when exception with - nil backtrace is raised. - [fix GH-434][ruby-core:58078][Bug #9063] - * test/irb/test_raise_no_backtrace_exception.rb: ditto. + * numeric.c (rb_int_div): Define Integer#/. -Wed Aug 13 11:08:55 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * bignum.c (rb_big_div): Don't define Bignum#/. - * lib/irb/completion.rb: fixed broken completion list with - String including spaces. Contributed from @dunric. [fix GH-465] + * lib/mathn.rb (Integer#/): Replace Integer#/ instead of Bignum#/. -Wed Aug 13 00:07:01 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Sat Apr 30 21:11:08 2016 Tanaka Akira <akr@fsij.org> - * ext/win32ole/win32ole.c: separate WIN32OLE_PARAM src from win32ole.c - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_param.c: ditto. - * ext/win32ole/win32ole_param.h: ditto. - * ext/win32ole/depend: ditto. + * numeric.c (rb_int_plus): Define Integer#+. -Tue Aug 12 23:17:47 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * bignum.c (rb_big_plus): Don't define Bignum#+. - * ext/win32ole/win32ole.c: refactoring. move some methods - into win32ole_type.c / win32ole_method.c - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_method.c: ditto. - * ext/win32ole/win32ole_method.h: ditto. - * ext/win32ole/win32ole_type.h: ditto. - * ext/win32ole/win32ole_type.h: ditto. +Sat Apr 30 21:01:20 2016 Tanaka Akira <akr@fsij.org> -Tue Aug 12 22:59:48 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * numeric.c (rb_int_minus): Define Integer#-. - * ext/win32ole/win32ole.c: refactoring. move - ole_typelib_from_itypeinfo into win32ole_typelib.c. - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_typelib.h: ditto. - * ext/win32ole/win32ole_typelib.h: ditto. + * bignum.c (rb_big_minus): Don't define Bignum#-. -Tue Aug 12 21:49:40 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Sat Apr 30 20:53:33 2016 Tanaka Akira <akr@fsij.org> - * ext/win32ole/win32ole.c (ole_create_dcom): use the converted - result if the argument can be converted to a string, to get rid - of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127] + * numeric.c (rb_int_mul): Define Integer#*. -Tue Aug 12 14:22:58 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * bignum.c (rb_big_mul): Don't define Bignum#*. - * configure.in: ignored working directory same as prefix value. - [ruby-core:54999] [Bug #8409] +Sat Apr 30 20:30:44 2016 Tanaka Akira <akr@fsij.org> -Tue Aug 12 13:34:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (rb_int_modulo): Define Integer#%. - * lib/fileutils.rb: enable to remove with non-owner directory. - [ruby-dev:45976] [Bug #6756] - * test/fileutils/test_fileutils.rb: add testcase for #6756. + * bignum.c (rb_big_modulo): Don't define Bignum#%. -Tue Aug 12 12:57:28 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Sat Apr 30 20:17:08 2016 Tanaka Akira <akr@fsij.org> - * vm_exec.c: improve performance in ppc64 arch. - [ruby-core:63437] [Feature #9997] + * numeric.c (int_equal): Define Integer#==. -Tue Aug 12 12:14:52 2014 Akira Matsuda <ronnie@dio.jp> + * bignum.c (rb_big_eq): Don't define Bignum#==. - * lib/fileutils.rb: fix typo. - [ruby-dev:47831] [Bug #9180] +Sat Apr 30 19:41:15 2016 Tanaka Akira <akr@fsij.org> -Tue Aug 12 10:10:42 2014 Eric Wong <e@80x24.org> + * numeric.c (int_gt): Define Integer#>. - * vm_method.c (release_method_definition): use rb_free_method_entry + * bignum.c (rb_big_gt): Don't define Bignum#>. + Renamed from big_gt. -Tue Aug 12 06:16:09 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (rb_big_gt): Declared. - * ext/win32ole/win32ole.c: separate WIN32OLE_METHOD src from - win32ole.c. - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_method.c: ditto. - * ext/win32ole/win32ole_method.h: ditto. - * ext/win32ole/depend: ditto. +Sat Apr 30 19:24:40 2016 Tanaka Akira <akr@fsij.org> -Mon Aug 11 22:19:15 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * numeric.c (int_ge): Define Integer#>=. - * ext/win32ole/win32ole_variable.c (folevariable_inspect): refactoring. + * bignum.c (rb_big_ge): Don't define Bignum#>=. + Renamed from big_ge. -Mon Aug 11 20:47:27 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (rb_big_ge): Declared. - * ext/win32ole/win32ole.c: separate WIN32OLE_VARIABLE src from - win32ole.c - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_variable.c: ditto. - * ext/win32ole/win32ole_variable.h: ditto. - * ext/win32ole/depend: ditto. +Sat Apr 30 19:20:40 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Mon Aug 11 16:17:21 2014 Tony Miller <mcfiredrill@gmail.com> + * doc/standard_library.rdoc: Remove obsoleted classes and modules. - * dir.c (rb_dir_exists_p): [DOC] Document that Dir.exists? is - deprecated. [ruby-core:64135] [Bug #10102] +Sat Apr 30 19:09:23 2016 Tanaka Akira <akr@fsij.org> -Mon Aug 11 11:26:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (int_lt): Define Integer#<. - * lib/tempfile.rb: start rdoc parsing inside singleton class - definition to include the document there. - [ruby-core:64157] [Bug #10105] + * bignum.c (rb_big_lt): Don't define Bignum#<. + Renamed from big_lt. -Sun Aug 10 12:22:43 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (rb_big_lt): Declared. - * ext/win32ole/win32ole_type.c: refactoring. +Sat Apr 30 18:44:05 2016 Tanaka Akira <akr@fsij.org> -Sun Aug 10 10:34:00 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (int_le): Define Integer#<=. - * lib/cgi/session/pstore.rb: separated sample code. - * lib/open3.rb: ditto. + * bignum.c (rb_big_le): Don't define Bignum#<=. + Renamed from big_le. -Sun Aug 10 10:03:24 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * internal.h (rb_big_le): Declared. - * lib/irb/ext/multi-irb.rb: removed commented-out code. +Sat Apr 30 18:11:44 2016 Tanaka Akira <akr@fsij.org> -Sat Aug 9 11:02:07 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * bignum.c (Init_Bignum): Define Integer::GMP_VERSION. - * lib/irb.rb: removed commented-out code. - * lib/irb/**/*.rb: ditto. +Sat Apr 30 16:58:18 2016 Tanaka Akira <akr@fsij.org> -Sat Aug 9 10:35:30 2014 Laurent Arnoud <laurent@spkdev.net> + * numeric.c (int_remainder): Define Integer#remainder. - * lib/cmath.rb: fixed indent. [fix GH-696] - * lib/drb/ssl.rb: ditto. - * lib/irb/**/*.rb: ditto. + * bignum.c (rb_big_remainder): Don't define Bignum#remainder. -Sat Aug 9 10:28:03 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * internal.h (rb_big_remainder): Declared. - * test/minitest/test_minitest_unit.rb: removed obsoleted condition - for Ruby 1.8. - * test/ruby/test_time_tz.rb: ditto. +Sat Apr 30 15:29:24 2016 Tanaka Akira <akr@fsij.org> -Sat Aug 9 10:18:00 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (rb_int_uminus): {Fixnum,Bignum}#-@ is unified into + Integer. - * test/cgi/test_cgi_core.rb: removed obsoleted condition for Ruby 1.8. - * test/cgi/test_cgi_header.rb: ditto. - * test/cgi/test_cgi_multipart.rb: ditto. - * test/cgi/test_cgi_tag_helper.rb: ditto. + * bignum.c (rb_big_uminus): Don't define Bignum#-@. -Sat Aug 9 00:34:37 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Sat Apr 30 14:42:20 2016 Tanaka Akira <akr@fsij.org> - * ext/win32ole/win32ole.c: separate WIN32OLE_TYPE src from win32ole.c. - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_type.c: ditto. - * ext/win32ole/win32ole_type.h: ditto. - * ext/win32ole/depend: ditto. + * numeric.c (rb_int_idiv): {Fixnum,Bignum}#div is unified into + Integer. -Fri Aug 8 01:53:37 2014 Masaki Matsushita <glass.saga@gmail.com> + * bignum.c (rb_big_idiv): Don't define Bignum#div. - * lib/securerandom.rb: use OpenSSL::BN for performance improvement. +Sat Apr 30 14:25:55 2016 Tanaka Akira <akr@fsij.org> - * benchmark/bm_securerandom.rb: benchmark script. + * numeric.c (rb_int_modulo): {Fixnum,Bignum}#modulo is unified into + Integer. -Fri Aug 8 17:19:57 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * bignum.c (rb_big_modulo): Don't define Bignum#modulo. - * lib/open-uri.rb: remove needless condition for old ruby version. - * test/open-uri/test_open-uri.rb: ditto. +Sat Apr 30 14:04:30 2016 Tanaka Akira <akr@fsij.org> -Fri Aug 8 16:40:59 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (int_divmod): {Fixnum,Bignum}#divmod is unified into + Integer. - * lib/irb/init.rb: removed unreachable code. + * bignum.c (rb_big_divmod): Don't define Bignum#divmod. -Fri Aug 8 16:34:22 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Sat Apr 30 13:20:00 2016 Tanaka Akira <akr@fsij.org> - * lib/drb/drb.rb: removed unreachable code. + * numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into + Integer. -Fri Aug 8 14:33:49 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * bignum.c (rb_big_fdiv): Don't define Bignum#fdiv. - * lib/webrick/httpproxy.rb: remove needless condition - for old ruby version. +Sat Apr 30 12:25:43 2016 Tanaka Akira <akr@fsij.org> -Fri Aug 8 01:07:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (rb_int_pow): {Fixnum,Bignum}#** is unified into + Integer. - * parse.y (parser_yylex): fix invalid char in eval, should raise - an syntax error too, as well as directly coded. - [ruby-core:64243] [Bug #10117] + * bignum.c (rb_big_pow): Don't define Bignum#**. -Thu Aug 7 23:25:29 2014 Masaki Matsushita <glass.saga@gmail.com> +Sat Apr 30 12:28:59 2016 Tanaka Akira <akr@fsij.org> - * lib/open3.rb: avoid unnecessary write if stdin_data is empty. + * bignum.c (rb_big_comp): Renamed from rb_big_neg. -Thu Aug 7 21:42:49 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * numeric.c (fix_comp): Renamed from fix_rev. - * ext/win32ole/win32ole_typelib.c (foletypelib_version): return - version string. +Sat Apr 30 12:25:43 2016 Tanaka Akira <akr@fsij.org> - * test/win32ole/test_win32ole_typelib.rb (test_version): ditto. + * numeric.c (int_comp): {Fixnum,Bignum}#~ is unified into + Integer. -Thu Aug 7 15:13:13 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * bignum.c (rb_big_neg): Don't define Bignum#~. - * lib/cgi.rb: remove needless condition for old ruby version. + * internal.h (rb_big_neg): Declared. -Thu Aug 7 06:04:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Apr 30 12:07:42 2016 Tanaka Akira <akr@fsij.org> - * parse.y (parser_yyerror): preserve source code encoding in - syntax error messages. [ruby-core:64228] [Bug #10114] + * numeric.c (int_and): {Fixnum,Bignum}#& is unified into + Integer. -Wed Aug 6 20:56:02 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * bignum.c (rb_big_and): Don't define Bignum#&. - * ext/win32ole/win32ole.c: separate src of WIN32OLE_TYPELIB from - win32ole.c +Sat Apr 30 11:56:15 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_typelib.c: ditto. - * ext/win32ole/win32ole_typelib.h: ditto. - * ext/win32ole/depend: ditto. + * ext/thread: removed dummy extension library. thread_sync.c + provides "thread.rb" already. -Wed Aug 6 20:44:07 2014 Akinori MUSHA <knu@iDaemons.org> +Sat Apr 30 11:53:48 2016 Tanaka Akira <akr@fsij.org> - * enum.c (enum_one): [DOC] Move enum.one? documentation before the - relevant method. Submitted by @vipulnsward. [Fixes GH-687] - https://github.com/ruby/ruby/pull/687 + * numeric.c (int_or): {Fixnum,Bignum}#| is unified into + Integer. -Wed Aug 6 20:25:47 2014 Akinori MUSHA <knu@iDaemons.org> + * bignum.c (rb_big_or): Don't define Bignum#|. - * lib/set.rb (Set#replace): Check if an object given is enumerable - before clearing self. Reported by yui-knk. [GH-675] - https://github.com/ruby/ruby/pull/675 +Sat Apr 30 11:18:47 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Wed Aug 6 20:07:26 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * vm_trace.c: Fix typos. [ci skip] - * ext/win32ole/win32ole.c (olerecord_ivar_set): remove rb_str_subseq. +Sat Apr 30 10:09:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Aug 6 19:09:27 2014 Akinori MUSHA <knu@iDaemons.org> + * ext/pty/pty.c (establishShell): honor USER environment variable + and login name over uid, one uid can be shared by some login + names. - * lib/set.rb (Set): Implement Set#clone by splitting - initialize_copy into initialize_dup and initialize_clone. - Submitted by yui-knk. [Fixes GH-661] - https://github.com/ruby/ruby/pull/661 +Fri Apr 29 22:40:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Aug 6 18:42:58 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * doc/maintainers.rdoc (ext/io/nonblock): still maintained, as + well as ext/io/wait, which is the origin. - * ext/win32ole/win32ole.c: separate src of WIN32OLERuntimeError - from win32ole.c. +Fri Apr 29 21:18:12 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * ext/win32ole/win32ole.h: ditto - * ext/win32ole/depend: ditto. - * ext/win32ole/win32ole_error.c: ditto. - * ext/win32ole/win32ole_error.h: ditto. + * doc/maintainers.rdoc (ext/win32): of course, it's still maintained. -Wed Aug 6 04:33:58 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Apr 29 21:03:10 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead - of parser to handle IPv6 address. [Bug #9129] + * gems/bundled_gems: Update latest gems, test-unit-3.1.8 and rake-11.1.2. -Wed Aug 6 04:16:05 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Apr 29 20:43:02 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * lib/net/http/requests.rb (Net::HTTP::Options::RESPONSE_HAS_BODY): - OPTIONS requests may have response bodies. [Feature #8429] - http://tools.ietf.org/html/rfc7231#section-4.3.7 + * doc/maintainers.rdoc: Update latest maintainers list on Ruby 2.4 -Wed Aug 6 03:18:04 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Apr 29 19:52:45 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * lib/net/http/generic_request.rb (Net::HTTP::GenericRequest#exec): - handle req['host'] in update_uri. + * doc/maintainers.rdoc: Removed deprecated entries. These are already deleted. - * lib/net/http/generic_request.rb - (Net::HTTP::GenericRequest#update_uri): - use req['host'] if it is explicitly set. Even if URI is given, - it is already used for the initial value of req['host']. - Therefore overwritten value should be respected. [Bug #10054] +Fri Apr 29 19:48:45 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Wed Aug 6 03:17:34 2014 NARUSE, Yui <naruse@ruby-lang.org> + * doc/maintainers.rdoc: Removed Ruby 1.8 entries. It's not necessary to + Ruby 2.4 or later. - * lib/net/http/generic_request.rb - (Net::HTTP::GenericRequest#update_uri): - handle scheme, host, and port to reflect connection to @uri. +Thu Apr 28 17:03:17 2016 Nicholas Maccharoli <nmaccharoli@gmail.com> - * lib/net/http.rb (Net::HTTP#begin_transport): move trivial handling - to Net::HTTP::GenericRequest#update_uri. + * hash.c (rb_hash_update_{block,func}_callback): dry up hash + update callback code. [Fix GH-1338] +Thu Apr 28 16:52:05 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Aug 6 02:16:43 2014 NARUSE, Yui <naruse@ruby-lang.org> + * re.c (rb_reg_prepare_enc): use rb_enc_asciicompat(enc) instead of + rb_enc_str_asciicompat_p(str) to avoid useless rb_enc_get(str) call. - * lib/net/http/generic_request.rb - (Net::HTTP::GenericRequest#initialize): - optimize object allocation. +Thu Apr 28 16:33:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Aug 6 01:16:47 2014 NARUSE, Yui <naruse@ruby-lang.org> + * lib/optparse.rb: [DOC] fix example code. base on the code by + Semyon Gaivoronskiy in [ruby-core:75224]. [Bug #12323] - * lib/uri/generic.rb (URI::Generic#path_query): remove a private method. +Thu Apr 28 09:33:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Wed Aug 6 01:15:47 2014 NARUSE, Yui <naruse@ruby-lang.org> + * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.4. + Please see entries of 2.6.4 on + https://github.com/rubygems/rubygems/blob/master/History.txt - * lib/uri/generic.rb (URI::Generic#normalize!): use String#empty? +Thu Apr 28 04:49:07 2016 Rei Odaira <Rei.Odaira@gmail.com> - * lib/uri/generic.rb (URI::Generic#path_query): optimized. + * configure.in (rb_cv_lgamma_r_pm0): check if lgamma_r(+0.0) + returns positive infinity, in addition to lgamma_r(-0.0). + AIX returns an incorrect result of negative infinity. - * lib/uri/generic.rb (URI::Generic#to_s): optimized. + * math.c (ruby_lgamma_r): handle +0.0, in addition to -0.0. -Wed Aug 6 00:15:10 2014 NARUSE, Yui <naruse@ruby-lang.org> +Thu Apr 28 01:11:14 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/uri/http.rb (URI::HTTP#request_uri): optimized. - decrease object allocation, and ensure always create at least one new - object for return value. + * time.c: define _DEFAULT_SOURCE because glibc 2.20 deprecates + _BSD_SOURCE. + https://sourceware.org/glibc/wiki/Release/2.20 -Wed Aug 6 03:41:21 2014 Aaron Patterson <aaron@tenderlovemaking.com> +Thu Apr 28 00:27:55 2016 Tanaka Akira <akr@fsij.org> - * ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for - hashes emitted by Syck. Github #198 - * test/psych/test_hash.rb: test for change. + * numeric.c (int_xor): {Fixnum,Bignum}#^ is unified into + Integer. -Tue Aug 5 19:27:59 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * bignum.c (rb_big_xor): Don't define Bignum#^. - * ext/win32ole/win32ole.c (ole_invoke): skip VariantClear when - argument is VT_RECORD variant. +Wed Apr 27 20:53:59 2016 Tanaka Akira <akr@fsij.org> -Tue Aug 5 15:52:51 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into + Integer. - * gems/bundled_gems: Upgrade to test-unit-3.0.0 and minitest-5.4.0. + * bignum.c (rb_big_aref): Don't define Bignum#<<. -Mon Aug 4 21:50:09 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (rb_big_aref): Declared. - * test/win32ole/test_win32ole_record.rb: add for WIN32OLE_RECORD - test(need .NET Framework 3.5 to run test). +Wed Apr 27 16:10:35 2016 NARUSE, Yui <naruse@ruby-lang.org> -Mon Aug 4 19:49:34 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * tool/instruction.rb: fix to follow current implementation. - * ext/win32ole/win32ole.c (ole_invoke): call rb_hash_foreach instead - of rb_block_call. +Wed Apr 27 15:47:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/win32ole/win32ole.c: add comment for rdoc of WIN32OLE_VARIANT - class. + * ext/stringio/stringio.c (strio_s_new): warn if a block is given, + as well as IO.new. -Mon Aug 4 09:12:47 2014 Eric Wong <e@80x24.org> +Wed Apr 27 14:29:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * variable.c: cleanup to use rb_const_lookup - [Feature #10107] + * error.c (ruby_only_for_internal_use): raise fatal error when + deprecated function only for internal use is called, not just a + warning. - * vm_insnhelper.c: ditto +Tue Apr 26 23:42:30 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Sun Aug 3 10:55:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * tool/redmine-backporter.rb (rel): should not raise exceptions even if + the user input is wrong. only reports the error and continue process. - * include/ruby/encoding.h (rb_check_symbol_cstr): ditto. +Tue Apr 26 23:35:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Aug 3 10:43:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ruby.c (process_options): convert -e script to the encoding + given by a command line option on Windows. assume it is the + expected encoding. [ruby-dev:49461] [Bug #11900] - * vm_insnhelper.c (vm_call_method): unusable super class should cause - method missing when BasicObject is refined but not been using. - [ruby-core:64166] [Bug #10106] +Tue Apr 26 21:11:02 2016 Tanaka Akira <akr@fsij.org> -Sat Aug 2 23:47:45 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * numeric.c (rb_int_lshift): {Fixnum,Bignum}#<< is unified into + Integer. - * ext/win32ole/win32ole.c: separate WIN32OLE::VARIANT src file - from win32ole.c - * ext/win32ole/win32ole.h: ditto. - * ext/win32ole/win32ole_variant_m.c: ditto. - * ext/win32ole/win32ole_variant_m.h: ditto. - * ext/win32ole/depend: ditto. - * ext/.document: ditto. + * bignum.c (rb_big_lshift): Don't define Bignum#<<. -Sat Aug 2 14:34:58 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Tue Apr 26 20:59:40 2016 Tanaka Akira <akr@fsij.org> - * ext/win32ole/win32ole.c: add comments for rdoc. + * numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into + Integer. -Sat Aug 2 10:26:57 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * bignum.c (rb_big_rshift): Don't define Bignum#>>. - * object.c (rb_obj_itself): new method Object#itself. based on the - patch by Rafael Franca in [ruby-core:64156]. - [EXPERIMENTAL] this method may be renamed due to compatibilities. - [ruby-core:44704] [Feature #6373] +Tue Apr 26 20:46:16 2016 Tanaka Akira <akr@fsij.org> -Fri Aug 1 22:30:40 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * numeric.c (int_size): {Fixnum,Bignum}#size is unified into Integer. - * ext/win32ole/win32ole.c (folerecord_initialize): accept - only 2 arguments. The 2nd argument should be WIN32OLE object or - WIN32OLE_RECORD object. + * bignum.c (rb_big_size_m): Don't define Bignum#size. -Fri Aug 1 20:17:33 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (rb_big_size_m): Declared. - * ext/win32ole/win32ole.c (ole_variant2val): call - folerecord_s_allocate instead of WIN32OLE_RECORD.new. +Tue Apr 26 20:09:08 2016 Tanaka Akira <akr@fsij.org> -Fri Aug 1 18:39:57 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (rb_int_bit_length): {Fixnum,Bignum}#bit_length is + unified into Integer. - * test/date/test_date.rb: remove commented-out code. - * test/date/test_date_arith.rb: ditto. - * test/date/test_date_attr.rb: ditto. - * test/date/test_date_parse.rb: ditto. + * bignum.c (rb_big_bit_length): Don't define Bignum#bit_length. -Fri Aug 1 16:35:32 2014 Evan Miller <evan@squareup.com> + * internal.h (rb_big_bit_length): Declared. - * numeric.c (flodivmod): all results are NaN if divisor is NaN. - [fix GH-692] +Tue Apr 26 19:56:16 2016 Tanaka Akira <akr@fsij.org> -Thu Aug 01 07:28:12 2014 Kenta Murata <mrkn@mrkn.jp> + * numeric.c (int_abs): Integer#{abs,magnitude} moved from + Fixnum and Bignum. - * ext/bigdecimal/bigdecimal.c: [DOC] Add description of - `BigDecimal.new` exceptions. Patched by @joker1007 and - @prathamesh-sonpatki [Fixes GH-690] - https://github.com/ruby/ruby/pull/690 + * bignum.c (rb_big_abs): Don't define Bignum#{abs,magnitude}. -Thu Jul 31 22:20:12 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * internal.h (rb_big_abs): Declared. - * ext/win32ole/win32ole.c: add WIN32OLE_RECORD#inspect. +Mon Apr 25 14:39:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Jul 31 20:35:32 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * ext/rbconfig/sizeof/extconf.rb: just check the existence of each + types, to reduce configuration time, especially cross-compiling. - * ext/win32ole/win32ole.c: add - WIN32OLE_RECORD#ole_instance_variable_set and - WIN32OLE_RECORD#ole_instance_variable_get + * template/sizes.c.tmpl: calculate sizes of checked types at + compilation time. -Wed Jul 30 23:28:10 2014 Kazuki Tsujimoto <kazuki@callcc.net> +Mon Apr 25 11:27:27 2016 Marcus Stollsteimer <sto.mar@web.de> - * sprintf.c (rb_str_format): like r47006, get rid of - function calls in RSTRING_PTR(). + * doc/extension.rdoc: Improvements to english grammars. + [Bug #12246][ruby-core:74792][ci skip] -Wed Jul 30 22:10:29 2014 Kazuki Tsujimoto <kazuki@callcc.net> +Mon Apr 25 11:17:50 2016 Marcus Stollsteimer <sto.mar@web.de> - * process.c (rlimit_resource_type, rlimit_resource_value): - get rid of inadvertent dynamic symbol pin-down. + * encoding.c: Fix return value of `Encoding::ISO8859_1.name` + [Bug #12313][ruby-core:75147][ci skip] + * ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new` - * re.c (match_backref_number): ditto. +Sun Apr 24 23:29:16 2016 Rei Odaira <Rei.Odaira@gmail.com> - * signal.c (esignal_init, rb_f_kill, trap_signm): ditto. + * configure.in: add missing -lm for AIX. - * transcode.c (econv_opts): ditto. +Sun Apr 24 18:33:58 2016 Kazuki Tsujimoto <kazuki@callcc.net> - * vm_trace.c (symbol2event_flag): ditto. + * vm_insnhelper.c (INLINE): disable r54738 if __NO_INLINE__ is defined. + It caused "undefined reference to `vm_getivar'". -Wed Jul 30 21:29:39 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Sun Apr 24 09:32:12 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> - * ext/win32ole/win32ole.c (ole_invoke): pass WIN32OLE_RECORD variant - by reference when invoke OLE methods at first. + * test/ruby/test_array.rb: Add test cases for Array#sum with + non-numeric objects. - * ext/win32ole/win32ole.c (olerecord_set_ivar): release - IRecordInfo interface before setting another IRecordInfo interface. +Sun Apr 24 04:21:27 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Jul 30 13:17:35 2014 Koichi Sasada <ko1@atdot.net> + * vm_insnhelper.c (INLINE): define as `inline` when it is optimized. + define as `static inline` when it is not optimized to keep + the symbol generated. - * gc.c: remove unused macros. + * vm_insnhelper.c (vm_getivar): use `INLINE` to force inline + so that a compiler inlines it into vm_getinstancevariable + and optimizes out is_attr and related branches. -Tue Jul 29 22:21:37 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * vm_insnhelper.c (vm_getivar): use `inline` to recommend inline. + Without this vm1_ivar_set is degraded. - * ext/win32ole/win32ole.c (hash2olerec): ignore WIN32OLE_RECORD - instance variable if the variable is nil. + benchmark results: + minimum results in each 5 measurements. + Execution time (sec) + name ruby 2.4.0dev (2016-04-23 trunk 54727) [x86_64-linux] ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux] built-ruby + loop_whileloop 0.641 0.642 0.646 + vm1_ivar* 1.002 0.999 0.831 + vm1_ivar_set* 0.369 1.106 0.362 -Tue Jul 29 19:43:27 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23 + trunk 54727) [x86_64-linux]' (greater is better) + name ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux] + built-ruby + loop_whileloop + 0.998 0.991 + vm1_ivar* + 1.003 1.205 + vm1_ivar_set* + 0.334 1.018 - * ext/win32ole/win32ole.c (folerecord_method_missing): refactoring. - divide functionality of folerecord_method_missing into - olerecord_ivar_set and olerecord_ivar_get. +Sat Apr 23 18:01:21 2016 NARUSE, Yui <naruse@ruby-lang.org> -Mon Jul 28 20:20:08 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * vm_insnhelper.c (vm_getivar): specify inline instead of static inline. + vm_getivar is called by vm_call_ivar and vm_getinstancevariable. + At least with GCC 4.8 and 5.3 on Linux, they are inlining it into + vm_call_ivar but not vm_getinstancevariable. + By `inline`, they correctly inline it and gains performance. - * ext/win32ole/win23ole.c (folerecord_method_missing): support - setter of member of WIN32OLE_RECORD object. + Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23 + trunk 54727) [x86_64-linux]' (greater is better) + name built-ruby + loop_whileloop 1.001 + vm1_ivar* 1.189 + vm1_ivar_set* 1.024 -Mon Jul 28 06:37:19 2014 Zachary Scott <e@zzak.io> + Note the `inline`'s meaning is different between old GCC + and C99. Old GCC's inline means C99's extern inline. + https://gcc.gnu.org/onlinedocs/gcc/Inline.html + Since Ruby specify -std=iso9899:1999, it works like C99. - * vm_eval.c: [DOC] Fix rdoc formatting of patch from [Bug #9551] +Sat Apr 23 16:11:39 2016 NARUSE, Yui <naruse@ruby-lang.org> -Mon Jul 28 06:34:43 2014 Zachary Scott <e@zzak.io> + * include/ruby/ruby.h (rb_mul_size_overflow): use UNLIKELY + by user side to improve generality. - * vm_eval.c: [DOC] [Bug #9551] Improve clarity of Kernel::catch - documentation, patch by Jesse Sielaff. +Sat Apr 23 16:10:02 2016 NARUSE, Yui <naruse@ruby-lang.org> -Mon Jul 28 06:24:54 2014 Zachary Scott <e@zzak.io> + * include/ruby/ruby.h (RB_LIKELY): use prefix in ruby.h. - * lib/uri/common.rb: [DOC] [Bug #9563] Recommend using URI.escape - before parsing a uri to avoid invalid characters. Reported by - Evgeniy Serykh. + * intern.h (LIKELY): define with RB_LIKELY. -Mon Jul 28 05:55:56 2014 Zachary Scott <e@zzak.io> +Sat Apr 23 13:27:25 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> - * time.c: [DOC] Clarify %Y in strftime, which can accept any digits - and will output at least 4 digits as the year. Reported by Yury - Trofimenko [Bug #10049] + * NEWS: Add descriptions for Time#to_time updates. + [Bug #12271] - * lib/time.rb: ditto +Sat Apr 23 13:21:24 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Mon Jul 28 05:32:06 2014 Zachary Scott <e@zzak.io> + * NEWS: Add descriptions for DateTime#to_time updates. + [Bug #12189] - * lib/uri/common.rb: [DOC] [Bug #10075] Clarify how URI.join arguments - are handled by RFC3986, originally reported by John Feminella. +Sat Apr 23 11:21:27 2016 Marcus Stollsteimer <sto.mar@web.de> -Mon Jul 28 05:21:41 2014 Zachary Scott <e@zzak.io> + * ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime + documentation to RDoc from Markdown. + [ruby-core:75136] [Bug #12311] - * file.c: [DOC] Clarify how File.file? handles symbolic links. Also - cleaned up the rdoc style for this method, more to follow. - Originally reported by Michael Renner [Bug #10067] +Sat Apr 23 09:03:35 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Jul 28 05:12:22 2014 Zachary Scott <e@zzak.io> + * ruby.c: cygwin does not use w32_cmdvector, command line can be + other than UTF-8. [ruby-dev:49519] [Bug #12184] - * time.c: [DOC] Remove dead link and old bug report, which hasn't been - reproduced in a few years. Reported by Federico Builes [Bug #10071] +Sat Apr 23 01:00:03 2016 Rei Odaira <Rei.Odaira@gmail.com> -Mon Jul 28 04:39:58 2014 Zachary Scott <e@zzak.io> + * configure.in: don't use the system-provided round(3) on AIX. + In AIX, round(0.49999999999999994) returns 1.0. + Use round() in numeric.c instead. - * ext/zlib/zlib.c: [DOC] Remove default value of Zlib constants, as - they may change in the implementation without notice. Patched by - @robin850 [Fixes GH-682] https://github.com/ruby/ruby/pull/682 +Fri Apr 22 21:00:44 2016 Tanaka Akira <akr@fsij.org> -Mon Jul 28 04:35:35 2014 Zachary Scott <e@zzak.io> + * test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed + to avoid test failures due to the tzdata change. + https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95 + Found by naruse. - * ext/openssl/ossl_hmac.c: Fix NO_HMAC warning [Fixes GH-665] - Patched by @vipulnsward https://github.com/ruby/ruby/pull/665 +Fri Apr 22 20:18:40 2016 NARUSE, Yui <naruse@ruby-lang.org> -Sun Jul 27 19:49:36 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * include/ruby/ruby.h (rb_mul_size_overflow): added to handle + mul overflow efficiently. - * lib/cgi/core.rb: remove unused variables. - * lib/erb.rb: ditto. - * lib/mkmf.rb: ditto. - * lib/net/http/response.rb: ditto. - * lib/optparse/version.rb: ditto. - * lib/prime.rb: ditto. - * lib/racc/parser.rb: ditto. - * lib/rexml/document.rb: ditto. - * lib/rexml/dtd/dtd.rb: ditto. - * lib/rexml/element.rb: ditto. - * lib/rexml/functions.rb: ditto. - * lib/rexml/parsers/xpathparser.rb: ditto. + * include/ruby/ruby.h (rb_alloc_tmp_buffer2): use rb_mul_size_overflow + and avoid division where it can define DSIZE_T. -Sun Jul 27 05:11:21 2014 Zachary Scott <e@zzak.io> + * gc.c (xmalloc2_size): moved from ruby.h and use rb_mul_size_overflow. - * lib/irb.rb: [DOC] PROMPT_I cannot be nil, patch by @hgillane - Fixes documenting-ruby/ruby#37 - https://github.com/documenting-ruby/ruby/pull/37 +Fri Apr 22 20:34:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Jul 27 02:41:50 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * time.c (time_asctime): [DOC] add ctime example, not only + asctime. [ruby-core:75126] [Bug #12310] - * lib/shell/command-processor.rb: remove unused variable. - * lib/shell/system-command.rb: ditto. - * lib/tmpdir.rb: ditto. - * lib/uri/generic.rb: ditto. +Fri Apr 22 18:44:32 2016 NARUSE, Yui <naruse@ruby-lang.org> -Sun Jul 27 02:08:31 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * variable.c: use uint32_t instead of long to avoid confusion about + the type of ivtbl->numiv. - * lib/weakref.rb: split executable code into sample directory. - * sample/weakref.rb: ditto. +Fri Apr 22 15:09:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Jul 27 02:06:55 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * eval_jump.c (exec_end_procs_chain): restore previous error info + for each end procs. [ruby-core:75038] [Bug #12302] - * lib/delegate.rb: split executable code into sample directory. - * sample/delegate.rb: ditto. +Fri Apr 22 15:04:56 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Sun Jul 27 01:46:34 2014 Zachary Scott <e@zzak.io> + * tool/redmine-backporter.rb: the fullpath of merger.rb is too long to + copy&paste on Windows. show shorter name instead on the platform. + I'm sure that the user of this command on Windows is only me. - * proc.c (method_super_method): [DOC] Method#super_method +Fri Apr 22 14:52:04 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Sun Jul 27 01:22:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * tool/merger.rb: remove temporary file. - * proc.c (method_super_method): new method Method#super_method, - which returns a method object of the method to be called by - `super` in the receiver method object. - [ruby-core:62202] [Feature #9781] +Fri Apr 22 11:27:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Sat Jul 26 17:22:14 2014 URABE Shyouhei <shyouhei@ruby-lang.org> + * lib/net/http.rb: Improve documentation for SSL requests via GET method. + [fix GH-1325][ci skip] Patch by @jsyeo - * ext/objspace/objspace_dump.c (dump_append): avoid fflush. +Fri Apr 22 10:51:13 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - because dump_append_string_value() iterates over each chars, - fflush()-ing here effectively issues system calls on every single - bytes exist in a ruby process. + * lib/webrick/ssl.rb: Support to add SSLCiphers option. + [fix GH-1321] Patch by @rhadoo -Sat Jul 26 16:55:18 2014 Eric Wong <e@80x24.org> +Fri Apr 22 10:43:19 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * iseq.h (struct iseq_compile_data_storage): reduce overhead - to 16 bytes (from 32) on 64-bit + * file.c, win32/file.c: Removed obsoleted safe level checks. + [fix GH-1327] Patch by @cremno -Sat Jul 26 16:28:06 2014 Eric Wong <e@80x24.org> +Fri Apr 22 10:01:48 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_core.h (struct rb_iseq_struct): reduce to 280 bytes - (from 288 bytes) on 64-bit + * benchmark/bm_so_meteor_contest.rb: fix a typo. + [fix GH-1330][ci skip] Patch by @sachin21 -Sat Jul 26 06:44:43 2014 Eric Wong <e@80x24.org> +Fri Apr 22 04:57:01 2016 NARUSE, Yui <naruse@ruby-lang.org> - * parse.y (struct parse_params): shrink to 320 to 304 bytes on 64-bit + * gc.c (rb_alloc_tmp_buffer_with_count): added like xmalloc2 to + avoid duplicated check of size. -Sat Jul 26 05:58:35 2014 Eric Wong <e@80x24.org> + * gc.c (ruby_xmalloc2): added to keep separate layers. - * include/ruby/ruby.h (ZALLOC, ZALLOC_N): implement - (Data_Make_Struct, TypedData_Make_Struct): - ZALLOC replaces ALLOC+memset - [ruby-core:63951][Feature #10082] - * compile.c (iseq_seq_sequence): ZALLOC_N replaces ALLOC_N+MEMZERO - * cont.c (fiber_t_alloc): ZALLOC replaces ALLOC+MEMZERO - * io.c (rb_io_reopen): ditto - * iseq.c (prepare_iseq_build): ditto - * parse.y (new_args_tail_gen, parser_new, ripper_s_allocate): ditto - * re.c (match_alloc): ditto - * variable.c (rb_const_set): ditto - * ext/socket/raddrinfo.c (get_addrinfo): ditto - * ext/strscan/strscan.c (strscan_s_allocate): ditto - * gc.c (rb_objspace_alloc): calloc replaces malloc+MEMZERO + * include/ruby/ruby.h (rb_alloc_tmp_buffer2): added to check + the size more statically. -Sat Jul 26 05:54:54 2014 Eric Wong <e@80x24.org> +Fri Apr 22 04:54:40 2016 NARUSE, Yui <naruse@ruby-lang.org> - * symbol.c (dsymbol_check): remove unneeded semi-colon + * include/ruby/ruby.h (LIKELY): moved from internal.h. -Fri Jul 25 14:07:27 2014 Koichi Sasada <ko1@atdot.net> + * include/ruby/ruby.h (UNLIKELY): ditto. - * gc.c: change objspace::rgengc::parent_object_is_old (boolean) - to objspace::rgengc::parent_object (VALUE). - Use Qfalse or RVALUE pointer instead of FALSE and TRUE. +Thu Apr 21 01:44:19 2016 NARUSE, Yui <naruse@ruby-lang.org> - * gc.c (gc_marks_body): should clear parent_object just before - gc_mark_roots() because there are no parents objects - for root objects. + * gc.c (objspace_malloc_prepare): remove size check because it is + used by objspace_xmalloc and objspace_xcalloc. + objspace_xmalloc introduces its own check in this commit. + objspace_xcalloc checks with xmalloc2_size (ruby_xmalloc2_size). -Fri Jul 25 13:45:39 2014 Koichi Sasada <ko1@atdot.net> + * gc.c (objspace_xmalloc0): common xmalloc function. - * gc.c (rb_gc_writebarrier_remember_promoted): should remember only - OLD objects on RGENGC_AGE2_PROMOTION. + * gc.c (objspace_xmalloc): introduce its own size check. -Fri Jul 25 13:42:02 2014 Koichi Sasada <ko1@atdot.net> + * gc.c (objspace_xmalloc2): separated from ruby_xmalloc2 to clarify + the layer who has the responsibility to check the size. - * gc.c (gc_mark_stacked_objects): fix error message. + * gc.c (objspace_xrealloc): remove duplicated size check. -Fri Jul 25 13:18:00 2014 Will Farrington <wfarrington@digitalocean.com> + * gc.c (ruby_xmalloc2): use objspace_xmalloc2. - * ext/socket/socket.c (sock_gethostname): Use NI_MAXHOST to support - hostnames longer than 64 characters if the system supports it. - [fixes GH-683] + * include/ruby/ruby.h (ruby_xmalloc2_size): follow the size limit + as SSIZE_MAX. Note that ISO C says size_t is unsigned integer. -Fri Jul 25 12:21:11 2014 Santiago Pastorino <santiago@wyeworks.com> +Thu Apr 21 12:14:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * compile.c (defined_expr): make the condition if the receiver - is explicit or implicit cleaner. [fix GH-681] + * configure.in: check if succeeded in creating config.h. -Fri Jul 25 03:53:52 2014 Eric Hodel <drbrain@segment7.net> + * tool/ifchange: ignore failures when TEST_COLORS unmatched. just + use the default value if expected name is not contained in it. + [ruby-core:75046] [Bug #12303] - * doc/keywords.rdoc: [DOC] Describe each keyword. +Wed Apr 20 17:33:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Jul 24 22:40:24 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * ext/cgi/escape/escape.c (cgiesc_unescape): define unescape + method instead of _unescape, and should pass the optional + argument to the super method. - * ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_RECORD#initialize + * lib/cgi/util.rb (CGI::Util#_unescape): remove intermediate method. - * ext/win32ole/win32ole.c (ole_val2variant): convert WIN32OLE_RECORD - object to VT_RECORD variant. - -Thu Jul 24 20:10:59 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: fix major GC flags. - * add GPR_FLAG_MAJOR_BY_FORCE, which indicates - major GC by METHOD, CAPI and so on (see GC_BY). - * remove GPR_FLAG_MAJOR_BY_RESCAN because not used. - * remove GPR_FLAG_MAJOR_BY_STRESS, use FORCE instead. - - * test/ruby/test_gc.rb: catch up. - -Thu Jul 24 15:55:02 2014 Naohisa Goto <ngotogenome@gmail.com> - - * include/ruby/io.h (struct rb_io_buffer_t): PACKED_STRUCT should not - be used for platform-specific optimization. PACKED_STRUCT_UNALIGNED - should be used. [ruby-core:63988] [Bug #10088] - -Thu Jul 24 04:42:13 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/benchmark.rb: split executable code into sample directory. - * sample/benchmark.rb: ditto. - -Thu Jul 24 04:36:49 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/tempfile.rb: split executable code into sample directory. - * sample/tempfile.rb: ditto. - -Thu Jul 24 04:29:36 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/pstore.rb: split executable code into sample directory. - * sample/pstore.rb: ditto. - -Wed Jul 23 23:50:11 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * include/ruby/defines.h, siphash.c, st.c (UNALIGNED_WORD_ACCESS): - add PowerPC64 too, which is capable to access unaligned words. - patched by Gustavo Frederico Temple Pedrosa in [ruby-core:63937]. - [Feature #10081] - - * regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): ditto. - -Wed Jul 23 04:04:38 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/drb/extserv.rb: remove duplicate code with sample directory. - contributed from @vipulnsward. [fix GH-679] - -Tue Jul 22 12:56:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * string.c (rb_str_count): fix wrong single-byte optimization. - 7bit ascii can be a trailing byte in Shift_JIS. - [ruby-dev:48442] [Bug #10078] - -Tue Jul 22 01:48:38 2014 Eric Wong <e@80x24.org> - - * include/ruby/io.h (rb_io_buffer_t): fix packing on gcc - r46892 caused packing to be a no-op on gcc (4.7.2-5, Debian) - [Bug #10079][ruby-core:63912] - -Mon Jul 21 15:55:42 2014 fuji70 <fujifuji70@gmail.com> +Wed Apr 20 15:52:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/optparse.rb (getopts): print default values and descriptions - in the help message. [fix GH-676] + * error.c (syntax_error_initialize): move the default message, + "compile error", from parse.y. the default parameter should + belong to the class definition. -Sun Jul 20 14:26:27 2014 Eric Wong <e@80x24.org> + * parse.y (yycompile0): use the default parameter. - * vm_core.h (rb_proc_t): reduce to 64 bytes from 72 on 64-bit +Wed Apr 20 10:25:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Jul 20 13:50:34 2014 Eric Wong <e@80x24.org> + * compile.c (append_compile_error): use rb_syntax_error_append. - * transcode.c (rb_econv_t): reduce to 184 bytes from 200 on 64-bit + * error.c (rb_syntax_error_append): append messages into a + SyntaxError exception instance. -Sun Jul 20 12:44:23 2014 Eric Wong <e@80x24.org> + * parse.y (yycompile0): make new SyntaxError instance in main + mode, otherwise error_buffer should be a SyntaxError if error + has occurred. - * include/ruby/io.h (rb_io_buffer_t): pack structure - Reduces rb_io_t from 200 to 192 bytes, allowing rb_io_t to - occupy one less cache line. - [Feature #10050] +Tue Apr 19 17:42:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Jul 20 12:41:53 2014 Eric Wong <e@80x24.org> + * error.c (err_vcatf): rename, and separate appending message from + creating a string buffer. - * include/ruby/io.h (rb_io_t): shrink to 200 bytes from 216 on 64-bit - This puts us within 8 bytes of being three cache lines instead of - four lines on x86-64. This breaks the ABI. - [Feature #10050] + * error.c (rb_syntax_error_append): merge rb_error_vsprintf and + rb_compile_err_append. -Sun Jul 20 12:36:46 2014 Eric Wong <e@80x24.org> + * parse.y (parser_compile_error): use rb_syntax_error_append. - * include/ruby/oniguruma.h (struct re_pattern_buffer): shrink to 448 - bytes from 464 bytes on 64-bit. This breaks the ABI. - [Feature #10034] +Tue Apr 19 13:46:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Jul 20 01:06:06 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * compile.c (append_compile_error, compile_bug): pass iseq and get + error info and file from it, not by the thread error info. - * ext/openssl/ossl.c: use encryptor instead of encrypter in doc. - contributed from @vipulnsward. [fix GH-663] + * error.c (rb_report_bug_valist): take va_list instead of variadic + arguments, and just report the bug but not abort. -Sun Jul 20 00:32:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Apr 19 13:18:12 2016 Naotoshi Seo <sonots@gmail.com> - * io.c (rb_io_initialize): [DOC] fix rdoc of append mode. it does - not move the pointer at open. [ruby-core:63747] [Bug #10039] + * lib/time.rb: revert r54167 because it would break + backward compatibilities, and it is documented that + Time.parse does not take into account time zone + abbreations other than ones described in RFC 822 -Sat Jul 19 12:40:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Apr 19 13:12:03 2016 Naotoshi Seo <sonots@gmail.com> - * compile.c (iseq_compile_each): allow to access private attribute - reader in op_assign. [ruby-core:63817] [Bug #10060] + * ChangeLog: Fix dates of previous commits -Sat Jul 19 11:56:36 2014 Grey Baker <greysteil@gmail.com> +Tue Apr 19 12:45:03 2016 Naotoshi Seo <sonots@gmail.com> - * lib/time.rb (Time#apply_offset): Guards against a `nil` return - value from `Time.month_days` when offsetting date. Out of range - values are then caught when `Time.utc` is called (as usual). + * ChangeLog: Add descriptions for logger updates + * NEWS: Add descriptions for logger updates - Previously a `nil` return value from `Time.month_days` would - have the `<` operator called on it, and raise `NoMethodError`. - [fix GH-667] +Tue Apr 19 12:45:02 2016 Naotoshi Seo <sonots@gmail.com> - * lib/rdoc/parser/changelog.rb (RDoc#parse_entries): fix dirty hack. + * lib/logger.rb: Add shift_period_suffix option -Sat Jul 19 06:19:01 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Tue Apr 19 12:45:01 2016 Naotoshi Seo <sonots@gmail.com> - * ext/win32ole/win32ole.c: refactoring. + * lib/logger.rb: Allow specifying logger parameters in constructor + such as level, progname, datetime_format, formatter. -Fri Jul 18 22:34:41 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> +Mon Apr 18 16:07:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/win32ole/win32ole.c (folevariant_initialize): WIN32OLE_VARIANT - does not support VT_RECORD. VT_RECORD should be supported in - WIN32OLE_RECORD. + * compile.c (iseq_peephole_optimize): should not replace the + current target INSN, not to follow the replaced dangling link in + the caller. [ruby-core:74993] [Bug #11816] - * test/win32ole/test_win32ole_variant.rb (test_s_new_vt_record_exc): - ditto. - -Fri Jul 18 19:54:03 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c (folevariant_initialize): remove unnecessary - code. - -Fri Jul 18 19:11:03 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix/eigenvalue_decomposition: Style fix - Patch by Gogo Tanaka [#10058] - -Fri Jul 18 19:03:53 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * lib/matrix.rb: Avoid using `and`. - Patch by gogo tanaka [#10058] - -Fri Jul 18 17:41:54 2014 GoGo tanaka <qlli.illb@gmail.com> - - * test/matrix/test_matrix.rb: Add tests for Matrix class. - [Feature #10057][ruby-core:63809] - -Fri Jul 18 10:14:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/fileutils.rb: added missing options of FileUtils.touch by @Domon. - [fix GH-669] - -Thu Jul 17 19:57:27 2014 Herwin <herwin@quarantainenet.nl> - - * ext/thread/thread.c (rb_szqueue_push): add optional parameter, - non_block defaulted to false. [ruby-core:63794] [Feature #10052] - -Wed Jul 16 23:01:43 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c (ole_variant2val): support array of - VT_RECORD variant. - -Wed Jul 16 20:21:49 2014 Naohisa Goto <ngotogenome@gmail.com> - - * vm_core.h (struct rb_iseq_struct): stack_max is changed to int - because all calculations related to stack_max in compile.c - (iseq_set_sequence) and vm_insnhelper.c (vm_push_frame) are - conducted by using int. This partly reverts r23945. - * vm_insnhelper.c (vm_push_frame): ditto. This reverts r42401. - -Wed Jul 16 19:55:32 2014 Naohisa Goto <ngotogenome@gmail.com> - - * vm_core.h (struct rb_iseq_struct): temporal workaround of [Bug 10037]. - Add padding on big-endian 64-bit architecture (e.g. sparc64). - -Wed Jul 16 19:32:23 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c (fole_record_method_missing): call - rb_hash_fetch instead of rb_hash_aref. - -Wed Jul 16 18:08:47 2014 Koichi Sasada <ko1@atdot.net> - - * iseq.c (rb_iseq_defined_string): use rb_gc_mark_object() instead of - marking from vm_mark(). - - * vm.c (rb_vm_mark): ditto. - -Wed Jul 16 18:03:50 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_mark_roots): call rb_vm_mark directly. - - * vm.c: remove mark function for RubyVM object because - RubyVM object marked manually. - -Wed Jul 16 12:25:39 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09. - this includes Support for Unicode 7.0 [Bug #9092]. - -Tue Jul 15 23:59:27 2014 Jared Jennings <jared.jennings.ctr@us.af.mil> - - * ext/digest: make built-in digest function implementations - indicate success or failure of init and final functions. - [ruby-core:61614] [Bug #9659] - - * ext/digest/digest.c: expect digest init and finish functions to - indicate success or failure; raise exception on failure. - [ruby-core:61614] [Bug #9659] - -Tue Jul 15 20:31:40 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c: modify document for WIN32OLE_RECORD. - -Tue Jul 15 12:42:23 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * defs/default_gems: change version definition file of rake. - -Tue Jul 15 12:00:03 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rake.rb, lib/rake/*.rb: Upgrade to rake-10.3.2 - [fix GH-668] - * test/rake/*.rb: ditto. - -Mon Jul 14 19:14:51 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c: modify WIN32OLE class document and - add comment for constants of WIN32OLE. - -Mon Jul 14 16:38:45 2014 Eric Wong <e@80x24.org> - - * vm_core.h (struct rb_iseq_struct): reduce to 288 bytes - on x86-64 (from 296 bytes) - -Mon Jul 14 16:07:25 2014 Eric Wong <e@80x24.org> - - * iseq.h (struct iseq_catch_table_entry): shrink to 32 bytes - on x86-64 (from 48 bytes) - -Mon Jul 14 16:04:41 2014 Eric Wong <e@80x24.org> - - * iseq.h (struct iseq_catch_table): new flexible array struct - (iseq_catch_table_bytes): allocated size function - * vm_core.h (struct rb_iseq_struct): update catch_table member - This reduces the struct from 304 to 296 bytes on x86-64. - * compile.c (iseq_set_exception_table): update for struct changes - * iseq.c (iseq_free): ditto - * iseq.c (iseq_memsize): ditto - * iseq.c (rb_iseq_disasm): ditto - * iseq.c (iseq_data_to_ary): ditto - * iseq.c (rb_iseq_build_for_ruby2cext): ditto (untested) - * vm.c (vm_exec): ditto - * vm_core.h (struct rb_iseq_struct): ditto - * vm_insnhelper.c (vm_throw): ditto - -Sun Jul 13 17:49:52 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * ext/openssl/ossl_cipher.c: Fix call to ciphers class method and - spell out `encryption` by @vipulnsward [fix GH-664] - -Sun Jul 13 17:31:51 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * ext/gdbm/gdbm.c: fix wrong arguments in GetDBM2 macro. - * ext/sdbm/init.c: ditto. - -Sun Jul 13 17:25:50 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * ext/dbm/dbm.c: fix wrong arguments in GetDBM2 macro by @v2e4lisp. - [fix GH-655] - -Sun Jul 13 16:44:56 2014 Eric Wong <e@80x24.org> - - * vm_core.h (struct rb_call_info_struct): improve packing - This reduces the struct from 112 to 104 bytes on x86-64. - -Sun Jul 13 15:53:25 2014 Eric Wong <e@80x24.org> - - * vm_core.h (struct rb_iseq_struct): stack_max is uint32_t - This reduces the struct from 312 to 304 bytes on x86-64. - -Sun Jul 13 10:56:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (rb_cv_broken_backtrace): exit with failure - normally, no needs to abort. [ruby-core:63678] [Bug #10008] - -Sat Jul 12 15:10:22 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> - - * ext/win32ole/win32ole.c (fole_record_method_missing): correct - fields Hash key. - -Sat Jul 12 04:17:40 2014 KOSAKI Motohiro <kosaki.motohiro@gmail.com> - - * lib/net/smtp.rb (Net::SMTP#data): enable buffering while - 'data' send for optimizing Net::SMTP#send_message. - [ruby-dev:48329] [misc #9981] - patch by Masahiro Tomita. - -Sat Jul 12 01:13:45 2014 Naohisa Goto <ngotogenome@gmail.com> +Mon Apr 18 12:56:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/envutil.rb (assert_no_memory_leak): On Solaris 9 or later, - if possible, execute child ruby with environment variables - LD_PRELOAD=libumem.so UMEM_OPTIONS="backend=mmap". With these - variables, freed memory is immediately returned to the OS. - [Bug #10020] [ruby-dev:48391] + * numeric.c (flo_truncate): add an optional parameter, digits, as + well as Float#round. [Feature #12245] -Fri Jul 11 20:49:10 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * numeric.c (int_truncate): add an optional parameter, digits, as + well as Integer#round. [Feature #12245] - * ext/win32ole/win32ole.c: add WIN32OLE_RECORD class to support - VT_RECORD OLE variables. +Sun Apr 17 04:18:56 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> -Fri Jul 11 17:15:08 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * tool/redmine-backporter.rb: revisions are strings. - * lib/abbrev.rb: remove executable. +Sat Apr 16 14:26:49 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Fri Jul 11 16:45:39 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/date/date_core.c : remove not used f_getlocal macro. + After r54553 f_getlocal macro is not used. - * lib/fileutils.rb: handle ENOENT error with symlink targeted to - non-exists file. [ruby-dev:45933] [Bug #6716] +Sat Apr 16 14:15:24 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Fri Jul 11 15:59:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/date/date_core.c : remove not used f_utc6 macro. + After r54169 f_utc6 macro is not used. - * array.c: Clarify documentation for Array#insert. - [ruby-core:62934] [Bug #9901] +Sat Apr 16 10:00:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Jul 11 15:39:36 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * struct.c (struct_make_members_list, rb_struct_s_def): member + names should be unique. [ruby-core:74971] [Bug #12291] - * io.c: Improve Documentation by @dapplebeforedawn. - [fix GH-658] [ruby-core:63579] [Bug #10012] + * struct.c (struct_make_members_list): extract making member name + list from char* va_list, with creating symbols without + intermediate IDs. -Fri Jul 11 14:19:14 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> +Sat Apr 16 01:33:27 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> - * lib/matrix.rb: Fix sign for cross_product [#9499] + * tool/redmine-backporter.rb: sort revisions. -Fri Jul 11 11:11:50 2014 Koichi Sasada <ko1@atdot.net> +Sat Apr 16 01:16:02 2016 Tanaka Akira <akr@fsij.org> - * benchmark/prepare_so_k_nucleotide.rb: use require_relative. + * array.c (rb_ary_sum): Don't yield same element twice. + Found by nagachika. - * benchmark/prepare_so_reverse_complement.rb: ditto. +Sat Apr 16 01:03:32 2016 Tanaka Akira <akr@fsij.org> -Fri Jul 11 10:09:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * array.c (rb_ary_sum): Fix SEGV by [1/2r, 1].sum. - * pack.c (encodes): fix buffer overrun by tail_lf. Thanks to - Mamoru Tasaka and Tomas Hoger. [ruby-core:63604] [Bug #10019] +Fri Apr 15 23:52:00 2016 Kenta Murata <mrkn@mrkn.jp> -Thu Jul 10 23:51:36 2014 Naohisa Goto <ngotogenome@gmail.com> + * rational.c (rb_rational_plus): rename from rb_rational_add + to be aligned with rb_fix_plus. - * hash.c (ruby_setenv): Fix TestEnv#test_aset failure on Solaris 9. - When name contains '=', ruby_setenv raises Errno::EINVAL. - That is the same behavior as Solaris 10. - NULL check for malloc return value is also added. - -Thu Jul 10 15:02:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_insnhelper.c (vm_callee_setup_keyword_arg): adjust VM stack - pointer to get rid of overwriting splat arguments by arguments - for `to_hash` conversion. [ruby-core:63593] [Bug #10016] - -Thu Jul 10 01:09:57 2014 Koichi Sasada <ko1@atdot.net> - - * symbol.c: remove rb_gc_mark_symbols(). - - fstrings referred by static symbols and pinned dynamic symbols - are registered by rb_gc_register_mark_object(). - - fstrings referred by dynamic symbols (not pinned symbols) - are referred from global_symbols.dsymbol_fstr_hash (Hash object). - - Note that fstrings referred from dynamic symbols must live logger - than symbol objects themselves because rb_gc_free_dsymbol() uses - fstrings to remove from symbol tables. - This is why we can not mark fstrings from dynamic symbols. - - This technique reduces root objects for GC marking. - - * gc.c (gc_mark_roots): ditto. + * array.c (rb_ary_sum): ditto. * internal.h: ditto. -Thu Jul 10 00:24:18 2014 Naohisa Goto <ngotogenome@gmail.com> - - * common.mk (DTRACE_DEPENDENT_OBJS): fix build failure on Solaris - introduced in r46768. Object files containing dtrace probes should - be listed in DTRACE_DEPENDENT_OBJS. - -Wed Jul 9 17:07:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * symbol.c, symbol.h: Symbol class implementation and internals, - split from parse.y. - -Wed Jul 9 14:45:39 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y: change Symbol <-> ID relationship to avoid - exposing IDs from collectable symbols. - [Bug #10014] - - Now, rb_check_id() returns 0 if corresponding symbol is - pinned dynamic symbol. - - There is remaining intern_cstr_without_pindown(), it can return - IDs from collectable symbols. We must be careful to use it - (only used in parse.y). I think it should be removed if - it does not have impact for performance. - - * parse.y: - add: - * STATIC_SYM2ID() - * STATIC_ID2SYM() - rename: - * rb_pin_dynamic_symbol() -> dsymbol_pindown() - - * internal.h: - remove: - * rb_check_id_without_pindown() - * rb_sym2id_without_pindown() - add: - * rb_check_symbol() - * rb_check_symbol_cstr() - - * load.c: use rb_check_id() or rb_check_id_cstr(). - - * object.c: ditto. - - * struct.c: ditto. - - * thread.c: ditto. - - * vm_method.c: ditto. - - * string.c (sym_find): use only rb_check_symbol(). - - * sprintf.c (rb_str_format): use rb_check_symbol_cstr(). - -Wed Jul 9 12:21:55 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y (symbols_i): delete garbage symbols for Symbol.all_symbols. - -Wed Jul 9 05:49:08 2014 Eric Wong <e@80x24.org> - - * thread_pthread.h (struct rb_global_vm_lock_struct): - do not expose pthread type for lock - -Wed Jul 9 05:41:40 2014 Eric Wong <e@80x24.org> - - * thread_pthread.h: remove unneeded semaphore.h include - -Wed Jul 9 00:12:28 2014 Keiju Ishitsuka <keiju@ishitsuka.com> - - * lib/irb/ruby-lex.rb: fix counting indent in identify_string_dvar. - -Tue Jul 8 16:58:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * test/ruby/memory_status.rb (Memory::PSCMD): use ps command which - outputs expected result. [ruby-dev:48370] [Bug #10010] - -Tue Jul 8 14:45:17 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y (dsymbol_alloc): set global_symbols.minor_marked to 0. - - * parse.y (dsymbol_check): set RSYMBOL(sym)->fstr to 0 - because we should not touch fstr after that. - - * parse.y (rb_gc_free_dsymbol): skip deleting str and sym - from tables if fstr == 0. - -Mon Jul 7 14:31:52 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y: remove global_symbols::pinned_dsym - (and ::pinned_dsym_minor_marked). - - Mark pinned dsymbols by rb_gc_register_mark_object() because - they are immortal. - - * parse.y (rb_gc_free_dsymbol): rename parameter name `ptr' to `sym'. - -Mon Jul 7 12:45:51 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: revert miss-commit. - -Mon Jul 7 12:40:59 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y: need to use updated (re-created) symbols. - -Mon Jul 7 11:02:55 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * tool/mkconfig.rb: remove not to require rbconfig/obsolete.rb. - - * lib/rbconfig/obsolete.rb: removed. - -Mon Jul 7 10:52:03 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y: do not use rb_gc_resurrect(), but create a new dynamic - symbol for garbage dynamic symbol. - - * common.mk: use gc.h by parse.y. - -Mon Jul 7 02:18:42 2014 Koichi Sasada <ko1@atdot.net> - - * string.c (fstr_update_callback): do not use rb_gc_resurrect() - any more. - - Make new frozen string and replace with garbage frozen string. - - * common.mk: use gc.h from string.c. - -Mon Jul 7 00:36:13 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: rename is_dying_object() to is_garbage_object(). - - * gc.h: rb_objspace_garbage_object_p() as an exported function. - -Sun Jul 6 21:30:35 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (is_dying_object): fix missed condition. - - * gc.c (is_live_object): move frequent path first. - -Sun Jul 6 21:00:11 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: rename is_dead_object() to is_dying_object(). - This function is not opposite against is_live_object() - because is_dying_object() does *not* check object type. - - * gc.c (is_dying_object): change condition. - - * gc.c (is_live_object): use T_NONE instead of 0. - - * gc.c (rb_objspace_dying_object_p): added. - -Sun Jul 6 13:37:27 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (rb_gc_register_mark_object): change data structure. - From single array, to array of arrays. Each array only has 1024 - entries. - - * vm.c (Init_vm_objects): change default capa from 1 to 128. - -Sat Jul 5 05:05:53 2014 Vipul A M <vipulnsward@gmail.com> - - * lib/irb/locale.rb (IRB::Locale#modifier): fix wrong attr_reader - `modifieer` => `modifier` from irb locale. [fix GH-656] - -Fri Jul 4 20:45:26 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y: rename symbols::sym_id to symbols::str_id. - This table is not {Symbol => ID} table, but - {String => ID} table. - - * parse.y (lookup_sym_id): also rename lookup_sym_id() to - lookup_str_id() because key is not Symbol, but String. - -Fri Jul 4 18:42:04 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y (must_be_dynamic_symbol): fix missed-condition. - -Fri Jul 4 18:38:11 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y (rb_pin_dynamic_symbol): should be `static' function. - -Fri Jul 4 18:03:35 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y (must_be_dynamic_symbol): refactoring. - * add `inline'. - * use UNLIKELY(). - * check only DYNAMIC_SYM_P(), otherwise it is a bug. - * lookup_id_str() is not needed in second condition. - -Fri Jul 4 11:53:56 2014 Koichi Sasada <ko1@atdot.net> - - * parse.y: remove unused code - surrounded by `#if ENABLE_SELECTOR_NAMESPACE' - -Fri Jul 4 10:08:24 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/rubygems/test_gem_package.rb: avoid tempfile leaks using Tempfile#close! - * test/rubygems/test_gem_request_set.rb: ditto. - * test/rubygems/test_gem_request_set_gem_dependency_api.rb: ditto. - -Fri Jul 4 04:42:05 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/net/http/response.rb (Net::Inflater#inflate_adapter): - prevent automatic encoding conversion. - -Fri Jul 4 04:39:52 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/net/http/response.rb (Net::HTTPResponse.each_response_header): - raise first exception even if inflate_body_io.finish raises error. - when begin block raises error, finish usually raises error too. - -Fri Jul 4 02:56:04 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/generic.rb (URI::Generic#query=): remove validation, just - escape. [Feature #2542] - - * lib/uri/generic.rb (URI::Generic#fragment=): ditto. - - * lib/uri/generic.rb (URI::Generic#check_query): removed. - - * lib/uri/generic.rb (URI::Generic#set_query): ditto. - - * lib/uri/generic.rb (URI::Generic#check_fragment): ditto. - - * lib/uri/generic.rb (URI::Generic#set_fragment): ditto. - -Thu Jul 3 12:40:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (--with-static-linked-ext): fix for extensions to - be linked statically. - - * Makefile.in, common.mk: use ENCSTATIC for enc directory. - - * ext/extmk.rb: supply dependencies of statically linked extension - libraries. - -Wed Jul 2 15:45:49 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_heap_lazy_sweep): simplify logic. - - * gc.c (gc_page_sweep): return TRUE if empty slots are available. - -Wed Jul 2 09:48:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * logger.rb: removed unmaintained code. - [Feature #9860][ruby-core:62724] - * test/logger/test_application.rb: ditto. - -Wed Jul 2 03:20:00 2014 Charlie Somerville <charliesome@ruby-lang.org> - - * node.c (dump_node): handle nd_value == (NODE *)-1 to mean this - keyword argument is required - -Wed Jul 2 02:57:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm.c (rb_vm_env_local_variables): returns array of local - variable name symbols in the environment by envval. - - * proc.c (bind_local_variables): use rb_vm_env_local_variables. - -Wed Jul 2 02:23:52 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * proc.c (bind_receiver): new method to return the bound receiver - of the binding object. [ruby-dev:47613] [Feature #8779] - -Wed Jul 2 02:14:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * proc.c (bind_local_variables): update env from envval for each - iterations. [ruby-dev:48351] [Bug #10001] - -Tue Jul 1 23:46:34 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * NEWS: [DOC] mention about Binding#local_variables, introduced at - r44392 (see [Feature #8773]). - -Tue Jul 1 23:30:51 2014 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> - - * numeric.c (num_step_scan_args): table argument of rb_get_kwargs() is - array of IDs, not Symbols. [ruby-dev:48353] [Bug #9811] - -Tue Jul 1 16:18:22 2014 Akinori MUSHA <knu@iDaemons.org> - - * ext/digest/lib/digest/hmac.rb, test/digest/test_digest_hmac.rb: - Digest::HMAC is finally removed as previously noticed. - [fix GH-648] - -Tue Jul 1 11:13:43 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * ext/date/lib/date/format.rb: removed empty file by @vipulnsward. - * ext/date/lib/date.rb: removed needless require. - [fix GH-647] - -Mon Jun 30 16:42:52 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_stat_internal): return size_t value instead of VALUE - and remove `out' parameter. - - * gc.c: add braces for `if' statements. - - * gc.c (gc_stat_internal): fix comment. - -Mon Jun 30 15:07:34 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: support `USE_RGENGC == 0'. - - * test/ruby/test_gc.rb: ditto. - -Mon Jun 30 11:36:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * file.c: [DOC] document File.join returns a string. - Contributed by @dapplebeforedawn. [fix GH-646] - -Sat Jun 28 22:57:01 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * ext/pathname/pathname.c (path_birthtime): Windows support. - see [Feature #9857] [ruby-dev:48339] - -Sat Jun 28 22:44:16 2014 Tanaka Akira <akr@fsij.org> - - * ext/pathname/pathname.c (path_birthtime): New method, - Pathname#birthtime. - Proposed by Kazuhiro NISHIYAMA. [ruby-dev:48232] [Feature #9857] - -Sat Jun 28 20:29:03 2014 Simon Baird <simon.baird@gmail.com> - - * ext/bigdecimal/lib/bigdecimal/math.rb (BigMath#PI): change error - message about zero or negative precision for clarity and - consistency with other methods. [GH-644] - -Sat Jun 28 15:32:57 2014 Tanaka Akira <akr@fsij.org> - - * lib/webrick/utils.rb (create_listeners): Close socket objects. - -Sat Jun 28 13:58:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * eval.c (setup_exception): should not overwrite SystemStackError - backtrace if set already. [ruby-core:63377] [Feature #6216] - - * eval.c (setup_exception): get rid of method calls before raising - stack overflow, not to cause stack overflow again. - - * defs/id.def: add IDs for backtraces. - -Sat Jun 28 04:08:22 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/mailto.rb: update to latest specs, RFC 6068 and HTML5. - - * lib/uri/mailto.rb (HEADER_PATTERN): removed. - - * lib/uri/mailto.rb (HEADER_REGEXP): use RFC 6068 hfields. - - * lib/uri/mailto.rb (EMAIL_REGEXP): use HTML5 email regexp. - - * lib/uri/mailto.rb (URI::MailTo.build): support multiple to addresses. - - * lib/uri/mailto.rb (URI::MailTo#initialize): Support multiple to - addresses. Don't check with regexp, only split. - - * lib/uri/mailto.rb (URI::MailTo#check_to): verify by matching - URI path-rootless and HTML5 email regexp with unescaped one. - - * lib/uri/mailto.rb (URI::MailTo#check_headers): verify only by - HEADER_REGEXP. - - * lib/uri/mailto.rb (URI::MailTo#set_headers): don't check by - HEADER_REGEXP, only split it. - -Sat Jun 28 00:35:10 2014 Lauri Tirkkonen <lotheac@iki.fi> - - * tool/mkconfig.rb: fix empty RbConfig::CONFIG["prefix"] when - configured --with-rubyarchprefix, remove prefix from rubyarchdir - after expansion for the case it does not start with '$(prefix)'. - [fix GH-643] - -Fri Jun 27 15:20:12 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase. - because it's effected by removing minitest from stdlib. - -Fri Jun 27 12:29:37 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/rubygems/specification.rb: fixed broken condition caused - by removing YAML::ENGINE. - * lib/rubygems/package/old.rb: ditto. - -Fri Jun 27 05:33:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * hash.c (env_shift): fix memory leak on Windows, free environment - strings block always. [ruby-dev:48332] [Bug #9983] - -Fri Jun 27 03:41:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * sprintf.c (GETASTER): should not use the numbered argument to be - formatted, raise ArgumentError instead. - [ruby-dev:48330] [Bug #9982] - -Thu Jun 26 18:18:28 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/with_different_ofs.rb: move into test library directory. - * test/csv/base.rb: fix require path for with_different_ofs.rb. - * test/digest/test_digest_extend.rb: ditto. - -Thu Jun 26 18:06:50 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/profile_test_all.rb: move into test library directory. - * test/runner.rb: fix require path for profile_test_all.rb. - -Thu Jun 26 17:57:57 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/webrick/httpproxy.rb: remove useless assigned variables. - * lib/webrick/httpservlet/cgihandler.rb: ditto. - * lib/webrick/httpservlet/erbhandler.rb: ditto. - * lib/webrick/server.rb: ditto. - -Thu Jun 26 08:28:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * hash.c (env_select): fix memory leak and crash on Windows, make - keys array first instead of iterating on environ directly. - [ruby-dev:48325] [Bug #9978] - -Thu Jun 26 02:45:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * eval_error.c (error_print): put a newline after an anonymous - exception class name. - -Wed Jun 25 22:31:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * hash.c (ruby_setenv): fix memory leak on Windows, free - environment strings block after check for the size. - [ruby-dev:48323] [Bug #9977] - -Wed Jun 25 15:44:12 2014 Eric Wong <e@80x24.org> - - * ccan/container_of/container_of.h (container_off_var): - avoid warning with -Wcast-qual - [ccan ba5ad771af4aa9e085498de6c3c665c52694460f (Rusty Russell)] - -Wed Jun 25 10:19:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * hash.c (env_aset, env_has_key, env_assoc, env_has_value), - (env_rassoc, env_key): prohibit tainted strings if $SAFE is - non-zero. [Bug #9976] - -Tue Jun 24 14:46:17 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/gserver.rb: remove redundant use of to_s in interpolation. - * lib/logger.rb: ditto. - * lib/optparse.rb: ditto. - * lib/rbconfig/obsolete.rb: ditto. - * lib/resolv.rb: ditto. - * lib/webrick/httpresponse.rb: ditto. - -Tue Jun 24 10:50:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * hash.c (env_path_str_new): make PATH environment variable - string, to be frozen. - -Tue Jun 24 10:40:52 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * tool/make-snapshot: download bundle gems when package making. - [Feature #9852][ruby-core:62676] - * gems/bundled_gems: listed bundled gems for Ruby 2.2. - -Tue Jun 24 10:20:35 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * tool/downloader.rb: make Downloader class to general download utility. - It can be used without config.guess and config.sub. - * tool/get-config_files: ditto. - * tool/make-snapshot: ditto. - -Tue Jun 24 06:17:52 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * eval.c (setup_exception): "mesg == sysstack_error" and - sysstack_error_p(mesg) are duplicated. - r46502 seems to want to use latter. - -Tue Jun 24 06:15:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/tk/tcltklib.c: fix format specifiers for VALUE and - Tcl_Interp*. [ruby-core:63283] [Bug #9972] - -Tue Jun 24 05:40:41 2014 KOSAKI Motohiro <kosaki.motohiro@gmail.com> - - * nacl/nacl-config.rb: Use File.exist? instead of executable? - for irt_core. Recent nacl_sdk has non-executable irt_core. - Patch by Shinichiro Hamaji. - [Fixes GH-529] https://github.com/ruby/ruby/pull/529 - -Mon Jun 23 18:44:45 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * tool/config_files.rb: rename class ConfigFiles to Downloader. - * tool/get-config_files: ditto. - * tool/make-snapshot: ditto. - -Mon Jun 23 18:03:13 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * tool/rbinstall.rb: support to install bundle gems. - -Mon Jun 23 17:33:11 2014 Akinori MUSHA <knu@iDaemons.org> - - * lib/net/imap.rb (Net::IMAP#fetch): [DOC] Describe how a range in - +set+ is interpreted, and mention -1 which can be used for '*'. - -Mon Jun 23 16:22:50 2014 URABE Shyouhei <shyouhei@ruby-lang.org> - - * include/ruby/ruby.h (struct RHash): no longer. [Feature #9889] - - * include/ruby/ruby.h (RHASH): ditto. - - * include/ruby/ruby.h (RHASH_ITER_LEV): deprecated. Will be deleted later. - - * include/ruby/ruby.h (RHASH_IFNONE): ditto. - - * internal.h (struct RHash): moved here. - - * internal.h (RHASH): ditto. - - * hash.c (rb_hash_iter_lev): do not use this. - - * hash.c (rb_hash_ifnone): ditto. - -Mon Jun 23 13:30:11 2014 URABE Shyouhei <shyouhei@ruby-lang.org> - - * include/ruby/ruby.h (struct RComplex): no longer. [Feature #9888] - - * include/ruby/ruby.h (RCOMPLEX): ditto. - - * include/ruby/ruby.h (RCOMPLEX_SET_REAL): deprecated. Will be deleted later. - - * include/ruby/ruby.h (RCOMPLEX_SET_IMAG): ditto. - - * internal.h (struct RFloat): moved here. - - * internal.h (RCOMPLEX): ditto. - - * complex.c (rb_complex_set_real): do not use this. - - * complex.c (rb_complex_set_imag): ditto. - -Mon Jun 23 13:10:15 2014 URABE Shyouhei <shyouhei@ruby-lang.org> - - * include/ruby/ruby.h (struct RFloat): no longer. [Feature #9863] - - * include/ruby/ruby.h (RFLOAT): ditto. - - * internal.h (struct RFloat): moved here. - - * internal.h (RFLOAT): ditto. - -Mon Jun 23 12:01:42 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/generic.rb (check_port): allow strings for port= as - described in rdoc. - - * lib/uri/rfc3986_parser.rb (regexp): implementation detail of above. - -Mon Jun 23 11:35:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * eval.c (setup_exception): set backtrace in system stack error - other than the pre-allocated sysstack_error. [Feature #6216] - - * proc.c (Init_Proc): freeze the pre-allocated sysstack_error. - - * vm_insnhelper.c (vm_stackoverflow): raise new instance for each - times without calling any methods to keep the backtrace with no - further stack overflow. - - * object.c (rb_obj_copy_ivar): extract function to copy instance - variables only for T_OBJECT from init_copy. - -Mon Jun 23 11:11:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (check_stack_overflow): drop the last tag too close to - the fault page, to get rid of stack overflow deadlock. - [Bug #9971] - -Sun Jun 22 09:11:15 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/generic.rb: remove registry. - 'registry' is not used and RFC3986 doesn't use it. - -Sun Jun 22 09:10:09 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/rfc3986_parser.rb: raise exception when given a URI string - has non ASCII in order to keep the regexp compiled for US-ASCII. - -Sun Jun 22 09:05:42 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/common.rb (URI::REGEXP): move to lib/uri/rfc2396_parser.rb. - - * lib/uri/common.rb (URI::Parser): ditto. - - * lib/uri/common.rb (URI.split): use RFC3986_Parser. [Feature #2542] - - * lib/uri/common.rb (URI.parse): ditto. - - * lib/uri/common.rb (URI.join): ditto. - - * lib/uri/common.rb (URI.extract): deprecated. - - * lib/uri/common.rb (URI.regexp): ditto. - - * lib/uri/rfc2396_parser.rb: added. - - * lib/uri/rfc3986_parser.rb: added. - -Sun Jun 22 09:04:50 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/mailto.rb (initialize): as previous commit, fix arg_check - -Sun Jun 22 09:01:47 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * lib/uri/ftp.rb (initialize): argument checking flag is arg_check, - but arg[-1] is fragment. - - * lib/uri/ftp.rb (initialize): explicitly specify arguments. - -Sat Jun 21 12:50:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION - with 3-digit. libffi 3.1 returns just 2-digit. - [ruby-core:62920] [Bug #9897] - -Sat Jun 21 07:06:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * encoding.c (enc_find): [DOC] never accepted a symbol. - [ruby-dev:48308] [Bug #9966] - -Fri Jun 20 17:15:43 2014 Koichi Sasada <ko1@atdot.net> - - * test/lib/tracepointchecker.rb: add to check TracePoint healthiness. - - * test/runner.rb: use it. - -Fri Jun 20 07:26:44 2014 Koichi Sasada <ko1@atdot.net> - - * test/ruby/test_settracefunc.rb: rewrite tests with - assert_consistent_call_return(). - - assert_consistent_call_return() is also modified to check - consistency. - -Fri Jun 20 07:07:28 2014 Koichi Sasada <ko1@atdot.net> - - * compile.c (rb_iseq_compile_node): put start label of block after - trace (b_call). - [Bug #9964] - - * test/ruby/test_settracefunc.rb: add a test. - - added assert_consistent_call_return() method check call/return - consistency. - -Fri Jun 20 05:26:27 2014 Koichi Sasada <ko1@atdot.net> - - * vm_eval.c (rb_catch_protect): fix same problem of [Bug #9961]. - - * vm_eval.c (rb_iterate): ditto. - -Thu Jun 19 21:41:30 2014 Koichi Sasada <ko1@atdot.net> - - * vm.c (rb_vm_rewind_cfp): add new function to rewind specified cfp - with invoking RUBY_EVENT_C_RETURN. - [Bug #9961] - - * vm_core.h: ditto. - - * eval.c (rb_protect): use it. - - * eval.c (rb_rescue2): ditto. - - * vm_eval.c (rb_iterate): ditto. - - * test/ruby/test_settracefunc.rb: add a test. - - * vm_core.h (rb_vm_rewind_cfp): add the prototype declaration. - -Thu Jun 19 19:47:21 2014 Koichi Sasada <ko1@atdot.net> - - * vm.c (invoke_block_from_c): move call/return event timing for - bmethod. It can invoke inconsistent call event if this call raises - argument error. - [Bug #9959] - - * vm_insnhelper.c (vm_call_bmethod_body): ditto. - - * test/ruby/test_settracefunc.rb: add a test. - -Thu Jun 19 18:14:47 2014 Koichi Sasada <ko1@atdot.net> - - * vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or - rescue clause. - - * vm.c (vm_exec): use VM_FRAME_MAGIC_RESCUE on at rescue/ensure. - - * test/ruby/test_settracefunc.rb: should not invoke b_return at rescue - clause. - [Bug #9957] - - * vm_dump.c (control_frame_dump): check VM_FRAME_MAGIC_RESCUE. - - * vm_dump.c (vm_stack_dump_each): ditto. - -Thu Jun 19 13:39:11 2014 Arne Brasseur <arne@arnebrasseur.net> - - * proc.c (rb_method_curry): Implement Method#curry, which delegates - to to_proc.curry. [ruby-core:62212] [Feature #9783] - -Tue Jun 17 16:41:49 2014 Shugo Maeda <shugo@ruby-lang.org> - - * lib/net/ftp.rb (gets, readline): read lines without LF properly. - [ruby-core:63205] [Bug #9949] - - * test/net/ftp/test_buffered_socket.rb: related test. - -Tue Jun 17 12:35:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * eval.c (extract_raise_opts): pass unknown options to the - exception, so that exception class can receive a hash argument. - [ruby-core:63203] [Feature #8257] - -Tue Jun 17 12:24:57 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (obj_memsize_of): memsize_of(T_ZOMBIE) returns 0, not a rb_bug. - ObjectSpace.count_objects_size() uses memsize_of(T_ZOMBIE). - - This bug introduced at r46348. - -Mon Jun 16 19:00:11 2014 Koichi Sasada <ko1@atdot.net> - - * test/runner.rb: failure message should be passed as an argument. - -Mon Jun 16 18:42:57 2014 Koichi Sasada <ko1@atdot.net> - - * test/runner.rb: capture TracePoint stat before setup and compare - it after teardown. - -Mon Jun 16 14:33:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * process.c (open): use UTF-8 version function to support - non-ascii path properly. [ruby-core:63185] [Bug #9946] - -Sat Jun 14 10:54:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * array.c (rcombinate0): remove recursion, by looping with indexes - stored in `p`. - - * array.c (rpermute0): remove recursion, by looping with indexes - stored in `p`. - - * array.c (permute0): remove recursion, by looping with indexes - stored in `p`. [ruby-core:63103] [Bug #9932] - -Sat Jun 14 10:52:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * string.c (rb_str_resize): update capa only when buffer get - reallocated. - http://d.hatena.ne.jp/nagachika/20140613/ruby_trunk_changes_46413_46420#r46413 - -Sat Jun 14 08:28:59 2014 Zachary Scott <e@zzak.io> - - * man/rake.1: [DOC] Update links for Rake, patch by @hsbt [Bug #9904] - [Fixes GH-628] https://github.com/ruby/ruby/pull/628 - -Fri Jun 13 17:58:58 2014 Koichi Sasada <ko1@atdot.net> - - * vm_trace.c: add new method TracePoint.stat to debug - TracePoint mechanism. - - Ruby users should not use this method. So I don't note this method - in the NEWS file. - - * test/runner.rb: detect zombie active TracePoints with - TracePoint.stat. - -Fri Jun 13 17:46:31 2014 Koichi Sasada <ko1@atdot.net> - - * vm_trace.c: clear and restore recursive checking thread local data - to avoid unexpected throw from TracePoint. - [Bug #9940] - - * test/ruby/test_settracefunc.rb: add a test. - - * thread.c: added - * rb_threadptr_reset_recursive_data(rb_thread_t *th); - * rb_threadptr_restore_recursive_data(rb_thread_t *th, VALUE old); - - * vm_core.h: ditto. - -Fri Jun 13 17:33:14 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * array.c (rb_ary_combination): iterate on a shared copy, and use - array of indexes instead of array of chosen objects. - [ruby-core:63149] [Bug #9939] - - * array.c (yield_indexed_values): extract from permute0(), - rpermute0(), and rcombinate0(). - -Fri Jun 13 13:42:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * array.c (rb_ary_permutation): `p` is the array of size `r`, as - commented at permute0(). since `n >= r` here, buffer overflow - never happened, just reduce unnecessary allocation though. - -Thu Jun 12 20:32:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * string.c (rb_str_resize): should consider the capacity instead - of the old length, as pointed out by nagachika. - -Thu Jun 12 18:31:01 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/net/http/responses.rb: added Net::HTTPPermanentRedirect(308) - Contributed by @yorkie [fix GH-638] - -Thu Jun 12 13:27:38 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * string.c (rb_str_freeze): shrink the buffer before freezing, as - pointed out by Eric Wong at [ruby-core:63119]. - -Thu Jun 12 13:09:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * file.c (expand_path): shrink expanded path which no longer needs - rooms to append. [ruby-core:63114] [Bug #9934] - -Wed Jun 11 17:37:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (rb_cv_scalar_pthread_t): pthread_t is not required - to be a scalar type. - - * thread.c (fill_thread_id_string, thread_id_str): dump pthread_t - in hexadecimal form if it is not a scalar type, assume it can be - represented in a pointer form otherwise. based on the patch by - Rei Odaira at [ruby-core:62867]. [ruby-core:62857] [Bug #9884] - - * thread_pthread.c (Init_native_thread, thread_start_func_1), - (native_thread_create): set thread_id_str if needed. - - * vm_core.h (rb_thread_t): add thread_id_string if needed. - -Wed Jun 11 01:53:22 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: invoke GC before memory allocation (xmalloc/xrealloc) - when GC.stress = true. - [Bug #9859] - - * test/ruby/test_gc.rb: add a test. - -Tue Jun 10 13:20:14 2014 Takeyuki FUJIOKA <xibbar@ruby-lang.org> - - * lib/cgi/core.rb: Provide a mechanism to specify the - max_multipart_length of multipart data. - [Feature #8370] patch by Leif Eriksen <leif.eriksen.au@gmail.com> - -Tue Jun 10 10:57:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/csv.rb (CSV#<<): honor explicitly given encoding. based on - the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at - [ruby-core:62113]. [Bug #9766] - -Mon Jun 9 20:40:48 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: change full GC timing to keep lower memory usage. - - Extend heap only at - (1) after major GC - or - (2) after several (two times, at current) minor GC - - Details in https://bugs.ruby-lang.org/issues/9607#note-9 - [Bug #9607] - -Mon Jun 9 16:01:41 2014 Masahiro Ide <imasahiro9@gmail.com> - - * gc.c (gcdebug_sentinel): fix typo, "sentinel" not "sential". - [fix GH-634] - -Mon Jun 9 00:04:25 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (posix_fadvise): disable use of posix_fadvise - itself on 32-bit AIX. [ruby-core:62968] [Bug #9914] - -Sun Jun 8 23:28:00 2014 <kanemoto@ruby-lang.org> - - * io.c (rb_io_advise): AIX currently does not support a 32-bit call to - posix_fadvise() if _LARGE_FILES is defined. Patch by Rei Odaira. - [ruby-core:62968] [Bug #9914] - -Sun Jun 8 04:52:40 2014 Jun Hiroe <Jun.Hiroe@gmail.com> - - * string.c (rb_str_slice_bang): [DOC] update return value against - a fixnum, which has changed because of M17N. [fix GH-631] - -Sat Jun 7 22:13:42 2014 Benoit Daloze <eregontp@gmail.com> - - * numeric.c (do_coerce): Add a warning when an exception is raised - or an invalid value is returned in #coerce called by - numeric comparison operators and the exception - thrown by the caller has no information on the failure. - In the next release such exception should not be rescued or - should be the cause of the caller exception. nil is accepted - as the "no possible coercion" return value. See #7688. - - * test/ruby/test_numeric.rb: Add corresponding test. - -Sat Jun 7 18:15:33 2014 Benoit Daloze <eregontp@gmail.com> - - * numeric.c (bit_coerce): remove constant parameter `err' - (always TRUE) of bit_coerce(). - -Sat Jun 7 16:01:57 2014 Yutaka Kanemoto <kanemoto@ruby-lang.org> - - * cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size - for later use. Patch by Rei Odaira. [ruby-core:62945] [Bug #9905] - -Sat Jun 7 12:51:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * io.c (read_all): truncate the buffer before appending read data, - instead of truncating before reading. - [ruby-core:55951] [Bug #8625] - -Sat Jun 7 12:28:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/digest/digest.c (rb_digest_instance_equal): no need to call - `to_s` twice. [Bug #9913] - -Sat Jun 7 11:35:01 2014 Tanaka Akira <akr@fsij.org> - - * object.c (rb_mod_initialize_clone): Override Kernel#initialize_clone - to avoid an exception on Class.new.freeze.clone.to_s. - Reported by Andrew Grimm. [ruby-core:41858] [Bug #5828] - -Sat Jun 7 06:03:11 2014 Benoit Daloze <eregontp@gmail.com> - - * ext/digest/digest.c (rb_digest_instance_equal): - fix #== for non-string arguments. [ruby-core:62967] [Bug #9913] - - * test/digest/test_digest.rb: add test for above. - -Fri Jun 6 22:19:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * compile.c (private_recv_p): check by node type, instead of a - magic number. - - * node.h (NODE_PRIVATE_RECV), parse.y (attrset_gen): remove - -Fri Jun 6 17:07:08 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * compile.c (iseq_compile_each), parse.y (new_attr_op_assign_gen): - allow op assign to a private attribute. - [ruby-core:62949] [Bug #9907] - -Fri Jun 6 13:39:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * io.c (io_setstrbuf, io_read): should not shorten the given buffer until - read succeeds. [ruby-core:55951] [Bug #8625] - -Fri Jun 6 07:41:41 2014 Aaron Patterson <aaron@tenderlovemaking.com> - - * ext/psych/lib/psych/visitors/yaml_tree.rb: dump empty symbols with a - tag so that they can be parsed on input. [Bug #9873] [ruby-core:62825] - * test/psych/test_symbol.rb: test for change - -Thu Jun 5 16:08:39 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_page_sweep): refactoring. - - * gc.c (gc_page_sweep): should not set, but add final_slots into - sweep_page->final_slots. - -Thu Jun 5 14:36:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (jemalloc): check for the header regardless drop-in - libjemalloc is found, for `malloc_conf` declaration. - - * version.c (ruby_show_version): show `malloc_conf` if set. - [Feature #9113] - - * configure.in (with-jemalloc): also check for header, for ABIs - which JEMALLOC_MANGLE is needed, i.e., Mach-O and PE-COFF - platforms. [ruby-core:62939] [Feature #9113] - - * include/ruby/missing.h: include alternative malloc header to - replace memory management functions. - - * dln.c, io.c, parse.y, st.c: undef malloc family before - re-definition to suppress warnings. - -Thu Jun 5 12:52:18 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * man/ruby.1: remove rubyforge entry. - -Thu Jun 5 12:45:32 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * misc/README: use github link instead of rubyforge. - -Thu Jun 5 10:03:29 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (obj_free): check also FL_PROMOTED bit by RVALUE_OLD_P(). - -Thu Jun 5 03:45:28 2014 Eric Wong <e@80x24.org> - - * configure.in: add --with-jemalloc option - [ruby-core:62912] - -Wed Jun 4 22:28:14 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: introduce RZombie to manage zombie objects. - Rewrite finalizing logics with this type. - - * gc.c (gc_verify_internal_consistency): verify zombie (finalizing) - objects count. - -Wed Jun 4 22:09:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * re.c (match_aref, rb_reg_regsub): consider encoding of captured - names, encoding-incompatible should not match. - [ruby-dev:48278] [Bug #9903] - -Wed Jun 4 21:23:52 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * re.c (match_aref): should not ignore name after NUL byte. - [ruby-dev:48275] [Bug #9902] - -Wed Jun 4 04:08:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm.c (core_hash_merge_kwd): should return the result hash, which - may be converted from and differ from the given argument. - [ruby-core:62921] [Bug #9898] - -Tue Jun 3 23:32:34 2014 Tanaka Akira <akr@fsij.org> - - * ruby.c (load_file_internal2): Extracted from load_file_internal. - (load_file_internal): Invoke load_file_internal2 using rb_protect. - Close an opened FD if load_file_internal2 raises an exception. - -Tue Jun 3 19:11:45 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (rb_objspace_free): should not rest_sweep() here. - Some data structures are already freed. - -Tue Jun 3 18:43:51 2014 Koichi Sasada <ko1@atdot.net> - - * test/ruby/test_gc.rb: allocate more objects to invoke GC by newobj. - GC allows extending pages depends on heap_increment. - -Tue Jun 3 18:01:27 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (rb_gc_call_finalizer_at_exit): add - gc_verify_internal_consistency() when RGENGC_CHECK_MODE >= 2. - -Tue Jun 3 17:54:21 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: change the counting method for young objects. - clear counter at the beginning of every GC and - count promoted (infant->young) objects. - - Some promotions (infant->young) are transition of promoting to old - objects. We should not count such promotions. - - With this technique, we don't need to check young objects - at obj_free(). - -Tue Jun 3 16:38:19 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: add verifying counters code in gc_verify_internal_consistency(). - gc_verify_internal_consistency() counts all - - live objects - - young objects (if age2 promotion) - - old objects - in all pages and compares with objspace managing counters. - - * gc.c (gc_after_sweep): do gc_verify_internal_consistency() - when RGENGC_CHECK_MODE >= 2. - -Tue Jun 3 13:14:04 2014 Shugo Maeda <shugo@ruby-lang.org> - - * lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body - type as "MIXED" followed immediately by params - [ruby-core:62864] [Bug #9885] - Patch by @rayners (David Raynes). [Fixes GH-622] - https://github.com/ruby/ruby/pull/622 - -Tue Jun 3 13:18:24 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (objspace_live_slot): live slot count should not include final - slot (contains T_ZOMBIE) count. - -Tue Jun 3 13:03:21 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (obj_free): fix spacing. - -Tue Jun 3 12:59:32 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (check_gen_consistency): fix error message. - -Tue Jun 3 12:40:23 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c: count old/young objects more correctly. - - * gc.c (RVALUE_DEMOTE_FROM_OLD): decrement old object count. - - * gc.c (RVALUE_DEMOTE_FROM_YOUNG): decrement young object count. - - * gc.c (rb_gc_resurrect): increment old object count. - - * gc.c (gc_marks_body): should not add old object count. - This code is completely my misunderstanding. +Fri Apr 15 23:42:00 2016 Kenta Murata <mrkn@mrkn.jp> - * gc.c (rb_gc_force_recycle): decrement young or old object count - correctly. + * rational.c (rb_rational_add): rename from nurat_add. -Tue Jun 3 12:26:47 2014 Koichi Sasada <ko1@atdot.net> + * array.c (rb_ary_sum): use rb_rational_add directly. - * test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit - correctly for fiddle/import unavailable environments. + * test/ruby/test_array.rb (test_sum): add assertions for an array of + Rational values. -Tue Jun 3 09:45:13 2014 NAKAMURA Usaku <usa@ruby-lang.org> +Fri Apr 15 22:31:00 2016 Kenta Murata <mrkn@mrkn.jp> - * test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result): - shouldn't use same server for respective tests, because the 1st - test sometimes kills the server main loop silently. - [Bug #9881] [ruby-dev:48266] + * array.c (rb_ary_sum): apply the precision compensated algorithm + for an array in which Rational and Float values are mixed. -Tue Jun 3 01:34:59 2014 Zachary Scott <e@zzak.io> + * test/ruby/test_array.rb (test_sum): add assertions for the above + change. - * README.EXT: [DOC] Add rb_call_super when subclassing from @robin850 - [Fixes GH-623] https://github.com/ruby/ruby/pull/623 +Fri Apr 15 22:30:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Jun 2 17:14:49 2014 Koichi Sasada <ko1@atdot.net> + * thread.c (rb_thread_setname): defer setting native thread name + set in initialize until the native thread is created. + [ruby-core:74963] [Bug #12290] - * vm.c (ruby_vm_destruct): remove useless call of - rb_gc_force_recycle(). +Fri Apr 15 20:27:16 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - At this line, a VM object is already freed - (is changed to T_NONE) by rb_gc_call_finalizer_at_exit(). + * lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined. -Mon Jun 2 15:50:24 2014 Koichi Sasada <ko1@atdot.net> +Fri Apr 15 15:38:58 2016 NARUSE, Yui <naruse@ruby-lang.org> - * eval.c (rb_using_refinement): add write-barriers for - cref->nd_refinements. + * common.mk (benchmark): order options for built-ruby and compare-ruby. -Mon Jun 2 12:26:08 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri Apr 15 14:14:00 2016 Kenta Murata <mrkn@mrkn.jp> - * CONTRIBUTING.md: added contributing guide for github. [fix GH-625] + * test/ruby/test_array.rb (test_sum): add assertions for Rational and + Complex numbers. -Mon Jun 2 07:30:33 2014 Tanaka Akira <akr@fsij.org> +Fri Apr 15 10:07:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/envutil.rb (default_warning): New method. + * ext/io/console/console.c (console_key_pressed_p): raise the same + exception, "unknown virtual key code", for names with nul chars. + though console_win32_vk() considers the length and can deal with + nul chars, rb_sprintf() raised at PRIsVALUE previously, so quote + it if it is unprintable. - * test/ruby/test_autoload.rb: Use EnvUtil.default_warning. +Fri Apr 15 09:02:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Jun 2 07:05:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/io/console/console.c (rb_sym2str): fallback definition for + older ruby. [ruby-core:74953] [Bug #12284] - * include/ruby/encoding.h: constify `rb_encoding` arguments. +Thu Apr 14 21:46:36 2016 Tanaka Akira <akr@fsij.org> - * include/ruby/oniguruma.h: constify `OnigEncoding` arguments. + * array.c (rb_ary_sum): Support the optional argument, init, and + block. -Sun Jun 1 12:05:10 2014 Tanaka Akira <akr@fsij.org> +Thu Apr 14 19:02:41 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/drb: Wrap tests definitions by DRbTests module. This makes - several tests (ACLEntryTest, TestBug4409, etc.) easier to understand - that they are tests for DRb. + * lib/irb/ext/save-history.rb: suppress warning: method redefined; + discarding old save_history=. -Sun Jun 1 11:36:25 2014 Tanaka Akira <akr@fsij.org> +Thu Apr 14 14:58:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/rinda/ring.rb (RingFinger#make_socket): Close the socket on - exception. + * ext/tk/tkutil/tkutil.c (tk_hash_kv): the third argument can be + nil not only an Array. reported by @windwiny at + https://github.com/ruby/ruby/commit/cdaa94e#commitcomment-17096618 -Sun Jun 1 06:55:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Apr 14 14:28:55 2016 cremno phobia <cremno@mail.ru> - * parse.y (intern_str): dynamic attrset ID is registered by - `rb_id_attrset()` already, so no further registration is needed. - [ruby-core:62861] + * cont.c (fiber_initialize_machine_stack_context): fix wrong + _MSC_VER check, should be decimal but not hexadecimal. + [ruby-core:74936] [Bug #12279] -Sun Jun 1 04:52:47 2014 Zachary Scott <e@zzak.io> +Wed Apr 13 22:51:38 2016 Tanaka Akira <akr@fsij.org> - * lib/English.rb: [DOC] $LOADED_FEATURES moved to load.c [Fixes GH-620] - Patch submitted by @leafac in https://github.com/ruby/ruby/pull/620 - * doc/globals.rdoc: Added $LOADED_FEATURES to list + * array.c (rb_ary_sum): Array#sum is implemented. + Kahan's compensated summation algorithm for precise sum of float + numbers is moved from ary_inject_op in enum.c. -Sat May 31 22:30:14 2014 Tanaka Akira <akr@fsij.org> + * enum.c (ary_inject_op): Don't specialize for float numbers. - * test/lib/leakchecker.rb: Leak checker extracted from - test/lib/minitest/unit.rb. + [ruby-core:74569] [Feature #12217] proposed by mrkn. -Sat May 31 21:15:43 2014 URABE Shyouhei <shyouhei@ruby-lang.org> +Wed Apr 13 15:56:35 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * thread.c (rb_thread_atfork_internal): My compiler complains - about this variable being used before initialized. I looked at - the code and expanded the macro and turned out it was actually - USED for pointer arithmetic, not dereferenced. So this was - never a serious bug. But is annoying indeed to see warnings - every time. I added `=0` and all went healthy. + * numeric.c (flo_ceil): add an optional parameter, digits, as + well as Float#round. [Feature #12245] - * configure.in: Also, I found that the problematic macro expansion - only happens when we lack __typeof__ C extension, which shall - not be the case of my compiler. I added AC_C_TYPEOF to kick ass. + * numeric.c (flo_floor): add an optional parameter, digits, as + well as Float#round. [Feature #12245] -Sat May 31 16:32:50 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (int_ceil): add an optional parameter, digits, as + well as Integer#round. [Feature #12245] - * lib/ipaddr.rb: extracted inline tests into test dir. - * test/test_ipaddr.rb: ditto. + * numeric.c (int_floor): add an optional parameter, digits, as + well as Integer#round. [Feature #12245] -Sat May 31 16:29:21 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed Apr 13 14:47:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/digest/lib/digest/hmac.rb: extracted inline tests into test dir. - * test/digest/test_digest_hmac.rb: ditto. + * file.c (Init_File): add alias File.empty? to File.zero?. + [Feature #9969] -Sat May 31 16:02:03 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed Apr 13 14:36:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/test_syslog.rb: remove executable. + * parse.y (assign_in_cond): allow multiple assignment in + conditional expression. [Feature #10617] -Sat May 31 08:58:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Apr 13 14:11:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * enc/unicode.c (init_case_fold_table): no longer need to - initialize tables at runtime. + * bignum.c (rb_big_size): add wrapper function of BIGSIZE and + rename the method function with _m suffix. - * enc/unicode/case-folding.rb (lookup_hash): make perfect hash to - lookup case unfolding table 3. + * numeric.c (int_round_zero_p): extracted from rb_int_round. + optimize for Bignum, and convert VALUE returned by Numeric#size + to long. - * enc/unicode/case-folding.rb (lookup_hash): make perfect hash to - lookup case unfolding table 2. +Wed Apr 13 12:00:08 2016 Koichi Sasada <ko1@atdot.net> - * enc/unicode/case-folding.rb (lookup_hash): make perfect hash to - lookup case unfolding table 1. + * test/ruby/test_basicinstructions.rb: add a test to check access + instance variables on special const objects. - * enc/unicode/case-folding.rb (lookup_hash): make perfect hash to - lookup case folding table. + All of such objects are frozen, so that we can not set instance + variables for them. But we can read instance variables and return + default value (nil). - * enc/unicode/case-folding.rb (print_table): merge non-locale and - locale tables, and reduce initializing loops. +Tue Apr 12 20:40:35 2016 Kaneko Yuichiro <spiketeika@gmail.com> - * enc/unicode/case-folding.rb (CaseFolding): modularize, and add - --output-file option. + * ext/date/date_core.c (time_to_time): should preserve timezone + info. [ruby-core:74889] [Bug #12271] - * enc/unicode/case-folding.rb: script to convert CaseFolding.txt, - translated from CaseFolding.py. +Tue Apr 12 11:51:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat May 31 08:31:41 2014 Tanaka Akira <akr@fsij.org> + * compile.c (new_label_body): initialize bit fields, since + compile_data_alloc does not clear the memory. [Bug #12082] - * test/lib/minitest/unit.rb: Check Tempfile leaks for each test method - again. +Mon Apr 11 20:18:43 2016 Koichi Sasada <ko1@atdot.net> -Sat May 31 03:50:50 2014 Zachary Scott <e@zzak.io> + * vm_backtrace.c (frame2klass): filter only for imemo_ment. + T_IMEMO/imemo_iseq can be passed here. - * lib/delegate.rb: [DOC] Document raise in Delegator class - Patch by @lucasmazza. [Fixes GH-621] - https://github.com/ruby/ruby/pull/621 +Mon Apr 11 17:43:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri May 30 21:23:26 2014 Tanaka Akira <akr@fsij.org> + * compile.c (iseq_optimize): disable tail call optimization in + rescued, rescue, and ensure blocks. + [ruby-core:73871] [Bug #12082] - * lib/webrick/server.rb: Use a pipe to detect server shutdown. - shutdown() or close() for listening socket is not a reliable. - Actually, both doesn't work (doesn't wake up select()) on - DragonFly BSD 3.6.2. +Mon Apr 11 06:54:39 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/webrick/utils.rb: :ShutdownSocketWithoutClose is not required - now to immediate server shutdown detection. - This fixes fd leaks. + * file.c (apply2files): apply to a VALUE vector instead of a + temporary array. - * test/net/http/utils.rb: Ditto. +Sun Apr 10 20:54:16 2016 Joe Swatosh <joe.swatosh@gmail.com> -Fri May 30 20:58:37 2014 Tanaka Akira <akr@fsij.org> + * ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix + API names. [ruby-core:74863] [Bug #12264] - * test/lib/minitest/unit.rb (check_fd_leak): Sort the inspected - objects list for a FD. +Sun Apr 10 17:47:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri May 30 18:06:55 2014 Tanaka Akira <akr@fsij.org> + * file.c (rb_realpath_internal): no argument conversions since + this internal function does not need to_path and encoding + conversions, not to be affected by the default internal + encoding. - * test/lib/minitest/unit.rb (check_fd_leak): Try GC to delete leaked - FDs. +Sat Apr 9 10:03:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri May 30 12:05:59 2014 NARUSE, Yui <naruse@ruby-lang.org> + * load.c (rb_f_load): raise with the original path name before + encoding conversion. - * test/lib/test/unit/parallel.rb (_run_suite): orig_stdout may be nil - though I don't know the reason. +Sat Apr 9 02:05:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri May 30 11:33:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * bignum.c (rb_cstr_parse_inum): [EXPERIMENTAL] new function to + parse integer in C-string with length. the name and the + arguments may be changed in the future. - * string.c (rb_str_substr): need to reset code range for shared - string too, not only copied string. - [ruby-core:62842] [Bug #9882] - -Fri May 30 10:22:21 2014 Mark Lorenz <mlorenz@covermymeds.com> - - * lib/erb.rb (result): [DOC] no longer accepts a Proc, as - Kernel.eval does not. [fix GH-619] - -Fri May 30 07:25:46 2014 Tanaka Akira <akr@fsij.org> - - * ext/-test-/dir: Dir#fileno implemented. - - * test/lib/minitest/unit.rb (find_fds): Don't return the fd used to - scan /proc/$$/fd. - -Fri May 30 04:48:00 2014 Eric Wong <e@80x24.org> - - * parse.y (rb_gc_mark_parser): remove, empty since r8758 - * internal.h: ditto, not usable from extensions since 2.0.0 - * gc.c (gc_mark_roots): remove checkpoint for parser - -Thu May 29 23:27:50 2014 Rei Odaira <Rei.Odaira@gmail.com> - - * signal.c (ruby_signal): should return either `old.sa_sigaction` - or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in - `old.sa_flags`, because they may not be a union. - [ruby-core:62836] [Bug #9878] - -Thu May 29 23:11:20 2014 Tanaka Akira <akr@fsij.org> - - * io.c (pipe_open): Close pipes when rb_execarg_fixup() raises - an exception. - (rb_execarg_fixup_v): New function. - -Thu May 29 22:18:57 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb (capture_subprocess_io): Close fds. - -Thu May 29 19:47:08 2014 Tanaka Akira <akr@fsij.org> - - * io.c (rb_io_s_pipe): Close pipes if io_encoding_set() raises an - exception. - (io_encoding_set_v): New function. - -Thu May 29 19:42:49 2014 Tanaka Akira <akr@fsij.org> - - * lib/csv.rb (CSV.open): Close the opened file when an exception - occur. - -Thu May 29 19:31:10 2014 Tanaka Akira <akr@fsij.org> - - * ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket - if any exception occur. - -Thu May 29 05:05:29 2014 Eric Wong <e@80x24.org> - - * include/ruby/ruby.h: Hide Symbol internals. - (struct RSymbol): moved to internal.h - (RSYMBOL): ditto - -Thu May 29 00:28:56 2014 Tanaka Akira <akr@fsij.org> - - * ext/socket/unixsocket.c (rsock_init_unixsock): Open a socket - after path length check. - This fixes a fd leak by TestSocket_UNIXSocket#test_too_long_path. - -Wed May 28 23:04:35 2014 Tanaka Akira <akr@fsij.org> - - * test/ruby/test_io.rb (test_flush_in_finalizer1): Use - ObjectSpace.each_object to close files. - GC.start is not reliable. - -Wed May 28 19:00:31 2014 Tanaka Akira <akr@fsij.org> - - * lib/net/imap.rb (Net::IMAP#initialize): Close the opened socket when - any exception occur. - This fixes a fd leak by IMAPTest#test_imaps_post_connection_check - which start_tls_session() raises an exception. - -Wed May 28 18:06:13 2014 Tanaka Akira <akr@fsij.org> - - * ext/openssl/ossl_ssl.c (ossl_ssl_close): Fix sync_close to work - when SSL is not started. - This fix the fd leak by test_https_proxy_authentication in - test/net/http/test_https_proxy.rb. - -Wed May 28 10:29:28 2014 Eric Wong <e@80x24.org> - - * vm.c (rb_vm_living_threads_foreach): remove function - [ruby-core:62745] - * thread.c (terminate_i): remove - * thread.c (terminate_all): implement (inlines old terminate_i) - * thread.c (rb_thread_terminate_all): use terminate_all - * thread.c (rb_thread_fd_close_i): remove - * thread.c (rb_thread_fd_close): iterate inline - * thread.c (thread_list_i): remove - * thread.c (rb_thread_list): iterate inline - * thread.c (rb_thread_atfork_internal): iterate inline - * thread.c (terminate_atfork_i): update types to remove casts - * thread.c (terminate_atfork_before_exec_i): ditto - * thread.c (struct thgroup_list_params): remove definition - * thread.c (thgroup_list_i): remove - * thread.c (thgroup_list): iterate inline - * thread.c (check_deadlock_i): remove - * thread.c (debug_deadlock_check): implement (inlines check_deadlock_i) - * thread.c (debug_i): remove - * thread.c (rb_check_deadlock): iterate inline - * vm.c (vm_mark_each_thread_func): remove - * vm.c (rb_vm_mark): iterate inline - * vm_core.h (rb_vm_living_threads_remove): remove - * vm_trace.c (clear_trace_func_i): remove - * vm_trace.c (rb_clear_trace_func): iterate inline - -Wed May 28 09:30:51 2014 Eric Wong <e@80x24.org> - - * signal.c (signal_exec): ignore immediate cmd for SIG_IGN - * signal.c (trap_handler): set cmd to true for SIG_IGN - * signal.c (trap): handle nil and true values for oldcmd - [Bug #9835] - -Wed May 28 01:02:54 2014 Tanaka Akira <akr@fsij.org> - - * lib/tempfile.rb (Tempfile#inspect): Show "(closed)" if the tempfile - is closed. - -Wed May 28 00:38:09 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Use Tempfile#close! instead of - Tempfile#unlink to close file descriptors. - - * test/openssl/test_config.rb: Ditto. - - * test/ruby/test_io.rb: Ditto. - -Wed May 28 00:06:18 2014 Tanaka Akira <akr@fsij.org> - - * lib/net/ftp.rb (transfercmd): Close TCP server socket even if an - exception occur. - -Tue May 27 23:50:07 2014 Tanaka Akira <akr@fsij.org> - - * lib/cgi/core.rb: Use Tempfile#close! instead of Tempfile#unlink - to close file descriptors. - -Tue May 27 23:06:46 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (parser_number_literal_suffix): refine error message for - extra dot and digits. - -Tue May 27 22:44:20 2014 Tanaka Akira <akr@fsij.org> - - * test/rexml: Avoid fd leaks. - -Tue May 27 22:24:25 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb: Indent. - -Tue May 27 22:15:29 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_document.rb: Wrap by REXMLTests module. - -Tue May 27 22:11:10 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_encoding_2.rb: Remove a needless file. - -Tue May 27 22:10:30 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_contrib.rb: Indent. - -Tue May 27 21:28:16 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * ext/socket/ifaddr.c (ifaddr_inspect_flags): support IFF_SIMPLEX. - -Tue May 27 21:03:03 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/: Use REXMLTests as wrapping module for REXML tests. - I avoid using the same module for library in test because - it provides "include REXML" environment in test. Normally, - users don't use REXML on "include REXML" environment. So I - don't want to write tests on "include REXML" environment. - -Tue May 27 20:59:37 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_comment.rb: Remove needless REXML module wrapping. - -Tue May 27 20:56:49 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/openssl/test_pkcs7.rb: Fix inverted expected and actual values. - -Tue May 27 20:26:06 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/ruby/test_io.rb (test_flush_in_finalizer1): some opened fds are - remain before GC, so unlink the tempfile is failed. - -Tue May 27 19:07:26 2014 Tanaka Akira <akr@fsij.org> - - * io.c (rb_io_autoclose_p): Don't raise on frozen IO. - - * test/lib/minitest/unit.rb: IO#autoclose? may raise IOError. - -Tue May 27 19:01:49 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/openssl/test_pair.rb: Modify TestSSL#test_read_and_write - to handle partial sysreads. [Bug #7398][ruby-core:49563] - * test/openssl/test_ssl.rb: ditto. - -Tue May 27 18:46:23 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/openssl/test_pkcs7.rb: Add tests for PKCS7#type= and add_data. - [Feature #7399][ruby-core:49565] - -Tue May 27 17:45:09 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/openssl/test_hmac.rb (test_binary_update): Added Test for - HMAC signing with UTF-8 String. [Bug #7512][ruby-core:50559] - -Tue May 27 17:10:14 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/runner.rb: fixed randomly test failure. - [Bug #6573][ruby-core:45563] - -Tue May 27 16:58:12 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/test_timeout.rb (test_timeout): inverted test condition. - [Bug #8523] - -Tue May 27 12:24:22 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Show leaked file descriptors. - -Tue May 27 11:12:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * io.c (rb_io_fileno, rb_io_inspect): non-modification does not - error on frozen IO. [ruby-dev:48241] [Bug #9865] - -Tue May 27 00:00:21 2014 yui-knk <spiketeika@gmail.com> - - * insns.def (defineclass): fix typo in the instruction comment. - [fix GH-618] - -Mon May 26 16:33:15 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/ruby/test_file.rb: skip the test of atime on Windows, because - Windows delays updating atime about 1 hour. - see more details: - http://msdn.microsoft.com/en-us/library/windows/desktop/ms724290%28v=vs.85%29.aspx - -Mon May 26 12:25:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/optionparser.rb, lib/optparse.rb (OptParse): aliases. - [ruby-core:62751] [Feature #9864] - -Mon May 26 07:59:34 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Show Finished threads line-by-line. - -Mon May 26 01:39:02 2014 Zachary Scott <e@zzak.io> - - * lib/csv.rb: Reject nil as data source for CSV.new, patch by @Peeja. - [Fixes GH-580] https://github.com/ruby/ruby/pull/580 - -Mon May 26 01:07:51 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Show leaked threads and tempfiles - line-by-line. - -Sun May 25 23:02:06 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb (MiniTest::Assertions#diff): Remove - tempfiles. - -Sun May 25 22:42:27 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Check tempfile leak for each test class. - -Sun May 25 20:31:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (ac_cv_func_{getcontext,setcontext}): do not - disable ucontext.h entirely, but disable use of functions only. - `ucontext_t` is necessary in the signal handler now. - -Sun May 25 20:00:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (check_stack_overflow): revert part of r46100, the - previous condition was correct, and fix compilation error on - other architecture linux. [ruby-core:62746] [Bug #9862] - -Sun May 25 17:09:13 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Less ObjectSpace.each_object(Tempfile) - invocation. - -Sun May 25 16:54:06 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Use Thread.list instead of - ObjectSpace.each_object(Thread). - -Sun May 25 15:53:54 2014 Tanaka Akira <akr@fsij.org> - - * lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed - threads. - -Sun May 25 15:26:17 2014 Tanaka Akira <akr@fsij.org> - - * lib/webrick/utils.rb: Override the inspect method of the thread - used in WEBrick::Utils::TimeoutHandler. - -Sun May 25 14:22:30 2014 Tanaka Akira <akr@fsij.org> - - * test/openssl: Join threads. - -Sun May 25 12:46:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * error.c (rb_bug_context): new function to report bug with - context. - - * vm_dump.c (rb_vm_bugreport): accepts `ucontext_t` argument to - dump machine registers. based on [GH-584]. - - * signal.c (sigbus, sigsegv): dump machine registers if available. - -Sun May 25 12:32:42 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Sort leaked threads and tempfiles. - -Sun May 25 12:15:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * signal.c (check_stack_overflow): fix condition to use ucontext - register, mcontext_t dereference, and its member names, on Mac - OS X. - -Sun May 25 11:58:26 2014 Zachary Scott <e@zzak.io> - - * enumerator.c: [DOC] Fix example to show Enumerator#peek behavior - Patch by Erik Hollembeak [Bug #9814] - -Sun May 25 11:56:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vsnprintf.c (BSD_vfprintf): fix string width when precision is - given. as the result of `memchr` is NULL or its offset from the - start cannot exceed the size, the comparison was always false. - [ruby-core:62737] [Bug #9861] - -Sun May 25 11:32:42 2014 Zachary Scott <e@zzak.io> - - * lib/yaml.rb: Remove Psych::EngineManager [Bug #8344] - * test/psych/*: ditto. - -Sun May 25 10:34:15 2014 Zachary Scott <e@zzak.io> - - * doc/regexp.rdoc: [DOC] Clarify whitespace matching by @allolex - [Fixes GH-606] https://github.com/ruby/ruby/pull/606 - -Sun May 25 10:19:34 2014 Zachary Scott <e@zzak.io> - - * enum.c: [DOC] Use #find in example to clarify alias by @rachellogie - Patch submitted via documenting-ruby/ruby#34 - -Sun May 25 10:16:43 2014 Zachary Scott <e@zzak.io> - - * cont.c: [DOC] Fix rdoc in example for Fiber#transfer by @majjoha - Patch submitted via documenting-ruby/ruby#33 - -Sun May 25 10:01:11 2014 Zachary Scott <e@zzak.io> - - * lib/irb.rb: [DOC] Fixed syntax error in example by @jasdeepsingh. - Patch submitted via documenting-ruby/ruby#32 - -Sun May 25 09:58:02 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/fileutils/test_fileutils.rb (test_chown_R): Add tests for - chown_R. [Feature #9383][ruby-core:59641] - -Sun May 25 09:57:09 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/fileutils/test_fileutils.rb: Added recursively chown tests. - [Feature #9303][ruby-core:59325] - -Sun May 25 09:41:56 2014 Zachary Scott <e@zzak.io> - - * class.c: [DOC] Fixed grammar and examples of instance_methods. - By @alex-frost via documenting-ruby/ruby#31 - -Sun May 25 09:40:44 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb: Show leaked threads and tempfiles. - -Sun May 25 08:54:38 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/openssl/test_partial_record_read.rb: Testing read_nonblock on - a partial TLS record results in IO::WaitReadable by @mohamedhafez. - [fix GH-547] - -Sun May 25 08:43:16 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * lib/logger.rb: refactored to include Logger::Period. - -Sun May 25 06:50:19 2014 Zachary Scott <e@zzak.io> - - * vm_eval.c: [DOC] Improve instance_eval description when given a - block or String arguments. By @nathanl via documenting-ruby/ruby#28 - -Sun May 25 06:29:39 2014 Zachary Scott <e@zzak.io> - - * array.c: [DOC] Clarify default argument for Array.new. - By @Elffers [Fixes GH-610] - -Sat May 24 22:37:20 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * array.c: [DOC] Add more documents to shuffle! and shuffle. - Contributed by @JuanitoFatas [ci skip][fix GH-612] - -Sat May 24 22:28:55 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/lib/minitest/.document: removed unused configuration. - -Sat May 24 19:08:47 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/spec.rb: Unused file removed. - - * test/lib/minitest/autorun.rb: Don't require minitest/spec. - - * test/lib/minitest/benchmark.rb: Ditto. - -Sat May 24 18:45:30 2014 Tanaka Akira <akr@fsij.org> - - * test/benchmark/test_benchmark.rb: Use test/unit. - -Sat May 24 16:20:59 2014 Eric Wong <e@80x24.org> - - * process.c (proc_getgroups, proc_setgroups): use ALLOCV_N - [Bug #9856] - -Sat May 24 15:49:39 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/unit.rb (parallelize_me!): Removed. - This fixes the line-by-line structure of the test result in verbose - mode. [ruby-core:54905] - - * test/lib/minitest/parallel_each.rb: Removed. - - * test/minitest/test_minitest_mock.rb: Don't call parallelize_me!. - - * test/minitest/test_minitest_spec.rb: Ditto. - - * test/minitest/test_minitest_unit.rb: Ditto. - Tests for parallel feature removed. - -Sat May 24 15:29:10 2014 Tanaka Akira <akr@fsij.org> - - * test/lib/minitest/hell.rb: Unused file removed. - - * test/lib/minitest/pride.rb: Ditto. + * bignum.c (rb_str_to_inum): preserve encoding of the argument in + error messages, and no longer needs to copy non-terminated + strings. -Sat May 24 15:05:32 2014 yui-knk <spiketeika@gmail.com> + * bignum.c (rb_str2big_{poweroftwo,normal,karatsuba,gmp}): ditto. - * enumerator.c (yielder_yield_push): Insert a break after the - method return value. [fix GH-617] +Thu Apr 7 19:04:03 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat May 24 14:59:12 2014 Tanaka Akira <akr@fsij.org> + * doc/regexp.rdoc (comments): [DOC] terminators cannot appear in + comments. [ruby-core:74838] [Bug #12256] - * test/lib/minitest: Remove comments not appropriate now. +Thu Apr 7 11:24:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/minitest: Ditto. + * ext/tk/tkutil/tkutil.c (cbsubst_initialize): fix out-of-bound + access when no arguments given. `p Tk::Event.new` crashed. -Sat May 24 14:02:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri Apr 1 01:26:00 2016 Benoit Daloze <eregontp@gmail.com> - * NEWS: added minitest changes. + * ext/coverage/coverage.c: Fully reset coverage to not persist global state. + It was returning old file coverages as empty arrays to the user. + [ruby-core:74596] [Bug #12220] -Sat May 24 13:42:46 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * ext/coverage/coverage.c (rb_coverages): remove unused static state. - * test/lib/test/unit/test-unit.gemspec: removed needless gemspec file. + * thread.c: Moved and renamed coverage_clear_result_i to reset_coverage_i. -Sat May 24 09:39:06 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * test/coverage/test_coverage.rb: improve precision of tests. - * defs/default_gems: removed minitest entry. +Wed Apr 6 22:41:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat May 24 06:17:33 2014 Ryan Davis <ryand-ruby@zenspider.com> + * configure.in (rb_cv_lgamma_r_m0): fix the condition for + lgamma_r(-0.0). [Bug #12249] - * lib/minitest: minitest 4.7.5 removed. Need to support proper - gem packaging / installation before minitest 5 can be added. +Wed Apr 6 17:38:42 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Sat May 24 05:54:06 2014 Tanaka Akira <akr@fsij.org> + * tool/downloader.rb (RubyGems.download): follow the change of the + rubygems ssl_certs directory tree introduced by previous commit. - * ext/socket/mkconstants.rb: More constants +Wed Apr 6 15:00:27 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Sat May 24 00:25:34 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.3. + Please see entries of 2.6.3 on + https://github.com/rubygems/rubygems/blob/master/History.txt - * NEWS: add information of incompatibility about Prime.prime? - * lib/prime.rb: fix docs. +Wed Apr 6 14:13:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri May 23 21:36:28 2014 Josh Goebel <dreamer3@gmail.com> + * configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0) + returns negative infinity. [Bug #12249] - * net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing - for messages not ending with a new-line. - [ruby-core:61441] [Bug #9627] [fix GH-616] + * math.c (ruby_lgamma_r): define by the configured result. -Fri May 23 03:48:08 2014 Eric Wong <e@80x24.org> +Wed Apr 6 10:56:15 2016 Anton Davydov <antondavydov.o@gmail.com> - * gc.c (rb_free_m_tbl): mark function as static + * lib/logger.rb (Logger#level=): remove unnecessary local + variable. - * method.h (rb_free_m_tbl): remove prototype + * lib/logger.rb (Logger#initialize, Logger#reopen): [DOC] mention + the default values. cherrypicked from [GH-1319]. -Thu May 22 22:58:27 2014 Tanaka Akira <akr@fsij.org> +Wed Apr 6 10:17:53 2016 cremno phobia <cremno@mail.ru> - * ext/socket/mkconstants.rb: More TCP option constants. - Describe Linux and glibc versions. + * math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows, + since msvcrt does not provide it. -Thu May 22 20:38:10 2014 NARUSE, Yui <naruse@ruby-lang.org> + * missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0). + [ruby-core:74823] [Bug #12249] - * file.c (stat_birthtime): add birthtime support [Feature #9647] +Wed Apr 6 01:22:55 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * file.c (rb_stat_birthtime): add File::Stat.birthtime + * math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong. + cf. [Bug #12249] - * file.c (rb_file_s_birthtime): add File.birthtime +Wed Apr 6 00:53:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * file.c (rb_file_birthtime): add File#birthtime + * math.c (ruby_lgamma_r): fix lgamma(-0.0) on mingw and OSX. - * configure.in: check struct stat.st_birthtimespec. + * math.c (ruby_tgamma): fix tgamma(-0.0) on mingw. + [ruby-core:74817] [Bug #12249] -Thu May 22 19:38:14 2014 NARUSE, Yui <naruse@ruby-lang.org> +Tue Apr 5 14:50:28 2016 NARUSE, Yui <naruse@ruby-lang.org> - * file.c: remove IO::Statfs because of reject. [Feature #9772] + * ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo. + [Bug #12202] [ruby-core:74802] -Thu May 22 14:02:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Apr 5 00:06:44 2016 Aeris <aeris@imirhil.fr> - * enc/jis/props.kwd: constify character property tables of JIS - based encodings by perfect hash. + * ext/openssl/ossl_ssl.c (ossl_ssl_tmp_key): Access to ephemeral + TLS session key in case of forward secrecy cipher. Only + available since OpenSSL 1.0.2. [Fix GH-1318] - * enc/euc_jp.c, enc/shift_jis.c: use character property functions. + * ext/openssl/extconf.rb: Check for SSL_get_server_tmp_key. -Wed May 21 12:21:10 2014 Tanaka Akira <akr@fsij.org> +Mon Apr 4 23:37:05 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/socket/option.c: Fix compilation error on Android. - Bionic doesn't define TCP state constants. + * vm_core.h (rb_vm_struct): make at_exit a single linked list but + not RArray, not to mark the registered functions by the write + barrier. based on the patches by Evan Phoenix. + [ruby-core:73908] [Bug #12095] -Wed May 21 11:42:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Apr 4 17:43:45 2016 Koichi Sasada <ko1@atdot.net> - * configure.in: workaround for Info.plist to get rid of `dsymutil` - crash by wrong files in parent directories. - [ruby-core:62594] [Bug #9840] + * gc.c: change default value of + RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO 0.3 -> 0.2 + RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO 0.8 -> 0.65 -Tue May 20 20:57:34 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + These values are same as Ruby 2.0.0. - * test/ruby/test_dir.rb (test_glob): added testcase of double - slash path. + This change cause GC counts. + However, generational GC reduced each (minor) GC time and + increase memory locality. So that not so big impact on my + benchmarking results. + (surprisingly, this fix speed up programs on some cases) -Tue May 20 04:58:54 2014 Tanaka Akira <akr@fsij.org> + You can change these values by environment variables + if you feel wrong. - * ext/socket/extconf.rb: Don't check fields of struct tcp_info if the - structure is not available. +Mon Apr 4 17:36:52 2016 Koichi Sasada <ko1@atdot.net> -Mon May 19 23:13:33 2014 Tanaka Akira <akr@fsij.org> + * gc.c (get_envparam_double): take an upper_bound. - * ext/socket/option.c (inspect_tcp_info): Permit longer data. (glibc - 2.7 adds tcpi_rcv_rtt, tcpi_rcv_space and tcpi_total_retrans to - struct tcp_info.) + And also take an accept_zero flag which allow to accept zero + even if lower_bound is set. -Mon May 19 20:49:07 2014 Tanaka Akira <akr@fsij.org> + * gc.c (ruby_gc_set_params): fix parameters. - * ext/socket/option.c (inspect_tcp_info): New function to inspect - struct tcp_info. - (sockopt_inspect): Use inspect_tcp_info. + RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO set 0.9 as *lower_bound*, so that + it should be upper_bound. + Set RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO as lower bound. - * ext/socket/extconf.rb: Check tcp_info related things. + Also set lower/upper bound of RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO to + RUBY_GC_HEAP_FREE_SLOTS_MIN/MAX_RATIO. - * ext/socket/rubysocket.h: Include netinet/tcp_fsm.h if available. +Mon Apr 4 16:41:32 2016 Koichi Sasada <ko1@atdot.net> -Mon May 19 19:36:39 2014 Tanaka Akira <akr@fsij.org> + * vm.c (Init_VM): should pass tokens. - * test/dbm/test_dbm.rb: Use Etc.uname. +Sun Apr 3 09:34:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/gdbm/test_gdbm.rb: Ditto. + * numeric.c (flodivmod): round division if it is a finite number + and module is required. -Mon May 19 16:54:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (dbl2ival): do not round here. - * ext/etc/etc.c (etc_uname): add support for Windows using - GetVersionExW(), GetSystemInfo(), and GetComputerNameExW() with - `ComputerNameDnsHostname`. [Feature #9842] + * numeric.c (flo_ceil): use dbl2ival. -Mon May 19 16:29:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (flo_round): round explicitly. - * string.c (rb_pat_search): advance by byte offset but not by char - offset. [ruby-core:62669] [Bug #9849] +Sat Apr 2 15:24:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon May 19 14:06:18 2014 Shota Fukumori <her@sorah.jp> + * include/ruby/intern.h (rb_check_arity): returns argc. - * bin/testrb: Removed. Forgot to remove in r45971. - [Feature #9711] [ruby-core:62620] +Fri Apr 1 20:58:33 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sun May 18 16:42:08 2014 Tanaka Akira <akr@fsij.org> + * enc/unicode/case-folding.rb, casefold.h: Data generation to implement + swapcase functionality for titlecase characters. Swapcase isn't defined + by Unicode, because the purpose/usage of swapcase is unclear anyway. + The implementation follows a proposal from Nobu, swapping the case of + each component of a titlecase character individually. + This means that the titlecase characters have to be decomposed. - * test/ruby/test_m17n_comb.rb (test_str_crypt): Use Etc.confstr to - detect the glibc version. - libc.so is not an executable on Debian GNU/kFreeBSD 7.0 (wheezy). + * enc/unicode.c: Code using the above data. -Sun May 18 12:15:54 2014 Jonathan Mukai-Heidt <johnnymukai@gmail.com> + * test/ruby/enc/test_case_mapping.rb: Tests for the above. - * io.c (argf_each_line, argf_inplace_mode_set): [DOC] Update ARGF - documentation examples. `ARGF.lines` has been deprecated in - favor of `ARGF.each_line`. [Fixes GH-615] +Fri Apr 1 14:55:28 2016 Kazuki Yamaguchi <k@rhe.jp> -Sun May 18 11:59:25 2014 Tanaka Akira <akr@fsij.org> + * configure.in (AC_CONFIG_FILES): $srcdir/.git can be a file pointing + the real git_dir, such as when the git working tree is a "linked + working tree" (a working tree created by git-worktree). So use + git-rev-parse --git-dir to check if $srcdir is the top-level of a git + repository, not just checking if the $srcdir/.git directory does exist + or not. [ruby-core:74759] [Bug #12239] - * missing/nextafter.c: Include ruby/missing.h. + * tool/change_maker.rb: use tool/vcs.rb to detect VCS. This used to have + its own VCS detection code, while we have tool/vcs.rb. -Sun May 18 11:09:28 2014 Tanaka Akira <akr@fsij.org> + * tool/vcs.rb (detect): remove code duplication - * win32/Makefile.sub: Add nextafter.obj to MISSING. +Fri Apr 1 04:50:44 2016 Eric Wong <e@80x24.org> -Sun May 18 10:46:04 2014 Tanaka Akira <akr@fsij.org> + * ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): + enable SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER by default + [Bug #12126] - * ext/etc/etc.c: Etc.sysconf, Etc.confstr and IO#pathconf implemented. +Fri Apr 1 01:13:55 2016 Benoit Daloze <eregontp@gmail.com> - * ext/etc/extconf.rb: Check sysconf(), confstr() and fpathconf(). + * thread.c (update_coverage): Do not track coverage in loaded files + after Coverage.result. Avoids out-of-bounds access. [Bug #12237] - * ext/etc/mkconstants.rb: New file. + * ext/coverage/coverage.c (coverage_clear_result_i): document. - [ruby-core:62600] [Feature #9842] +Thu Mar 31 19:16:16 2016 Koichi Sasada <ko1@atdot.net> -Sun May 18 09:58:17 2014 Tanaka Akira <akr@fsij.org> + * gc.c: need to set initial value of GC_HEAP_FREE_SLOTS_GOAL_RATIO. - * ext/etc/etc.c: Etc.uname method implemented. +Thu Mar 31 17:50:27 2016 Koichi Sasada <ko1@atdot.net> - * ext/etc/extconf.rb: Check uname() function. + * gc.c: change additional allocation policy. - [ruby-core:62139] [Feature #9770] + Introduce new environment variable + RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO (goal_ratio) to calculate the + ratio of additional memory. -Sun May 18 09:16:33 2014 Tanaka Akira <akr@fsij.org> + Before this change, we add pages with the following formula + (when free_slots < total_pages * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO): + next_pages = total_pages * RUBY_GC_HEAP_GROWTH_FACTOR - * configure.in: Check nextafter() availability. + This addition can allocate too much. - * include/ruby/missing.h (nextafter): New optional declaration. + With this change, we increase pages to satisfy the following formula: + next_free_slots = next_total_slots * goal_ratio + where + next_free_slots = free_slots + adding_slots + next_total_slots = total_slots + adding_slots. - * missing/nextafter.c: New file. + If you want to prepare many free slots, increase this ratio. - * numeric.c: Float#next_float and Float#prev_float implemented. + If this variable is 0, then simply multiply + RUBY_GC_HEAP_GROWTH_FACTOR. - [ruby-core:62562] [Feature #9834] + * gc.c (get_envparam_double): enable to accept 0. -Sun May 18 09:02:17 2014 Tanaka Akira <akr@fsij.org> +Thu Mar 31 17:48:25 2016 Koichi Sasada <ko1@atdot.net> - * enum.c: Enumerable#slice_after implemented. + * gc.c (gc_marks_finish): fix syntax error. - * enumerator.c: Enumerator::Lazy#slice_after implemented. +Thu Mar 31 16:49:36 2016 Koichi Sasada <ko1@atdot.net> - Requested by Tsuyoshi Sawada. [ruby-core:58123] [Feature #9071] + * gc.c: simplify allocate/free detecting logic at the end of marking. -Sun May 18 08:22:25 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + Before this change, heap_pages_min_slots are calculated at the + beginning sweeping phase. And this value is used at the end of + *next* marking phase. - * io.c (io_setstrbuf): always check if the buffer is modifiable. - [ruby-core:62643] [Bug #9847] + To simplify it, we use this value at the end of this marking phase. + It means that we don't need to store this value as global state. -Sun May 18 01:21:23 2014 Tanaka Akira <akr@fsij.org> + Also heap_pages_max_slots is calculated at the begging of sweeping + phase and used at the end of sweeping phase. + To simplify this logic, we introduced new global value + heap_pages_freeable_pages it means extra pages count we can free. + gc_sweep_step() checks this value and moves empty pages to tomb_heap + not more than this value. - * include/ruby/ruby.h: Hide Rational internal. - (RRational): Moved to internal.h - (RRATIONAL): Ditto. - (RRATIONAL_SET_NUM): Moved to rational.c. - (RRATIONAL_SET_DEN): Ditto. + Because of this fix, heap_pages_swept_slots is no longer needed. - * rational.c (rb_rational_num): New function. - (rb_rational_den): Ditto. + * gc.c (rb_objspace_t::heap_pages): restruct the objspace global + status. - * include/ruby/intern.h (rb_rational_num): Declared. - (rb_rational_den): Ditto. + remove the following fields + * swept_slots (and heap_pages_swept_slots) + * min_free_slots (and heap_pages_min_free_slots) + * max_free_slots (and heap_pages_max_free_slots) + And add the following filed. + * freeable_pages (and heap_pages_freeable_pages) - * ext/bigdecimal/bigdecimal.c: Follow the above change. + * gc.c (heap_pages_free_unused_pages): unlink tomb heap pages + because tomb heap should have only freeable pages. - * ext/date/date_core.c: Ditto. + * gc.c (heap_extend_pages): add parameters for future extension. - [ruby-core:60665] [Feature #9513] +Thu Mar 31 16:43:02 2016 Koichi Sasada <ko1@atdot.net> -Sat May 17 17:04:32 2014 Shota Fukumori <her@sorah.jp> + * gc.c: add GC parameters to configure the following values: + * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO: + allocate additional pages when free slots is lower than + the value (total_slots * (this ratio)). + * RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO: + allow to free pages when free slots is greater than + the value (total_slots * (this ratio)). - * NEWS: Add news about removal of lib/test/**/*.rb. + Before this change, these values are hard coded. -Sat May 17 16:57:33 2014 Shota Fukumori <her@sorah.jp> + * gc.c (ruby_gc_params_t): ditto. - * lib/test: Removed because ruby's test cases now independent to - lib/test by r45970. [Feature #9711] [ruby-core:62620] + * gc.c (ruby_gc_set_params): ditto. - I'm still considering about the future of lib/minitest, lib/test. - (bundling gems?) +Thu Mar 31 15:59:17 2016 Koichi Sasada <ko1@atdot.net> -Sat May 17 15:06:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * gc.c (gc_verify_heap_page): check the number of zombies. - * test/runner.rb: remove dependency test-unit and minitest - from stdlib when running with test-all. - [Feature #9711][ruby-core:61890] - * test/testunit/*.rb: ditto. - * test/lib: ditto. + * gc.c (gc_verify_heap_pages): check also tomb heap. -Sat May 17 11:02:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Mar 31 15:48:18 2016 Koichi Sasada <ko1@atdot.net> - * dir.c (glob_helper): try match PLAIN as well as ALPHA, which are - separated by previous commits. [ruby-core:61552] [Bug #9648] + * gc.c (gc_page_sweep): return free slots count. - * dir.c (glob_make_pattern): set PLAIN for non-magical path to - skip parts which not need to glob. - [ruby-core:61552] [Bug #9648] + * gc.c (gc_sweep_step): use returned free slots count. - * dir.c (has_magic): return ALPHA at alphabetical name regardless - FNM_CASEFOLD flag. + * gc.c (gc_sweep_step): change variable name `next' + to `next_sweep_page'. - * dir.c (glob_helper): fix conditions for ALPHA. - [ruby-core:61552] [Bug #9648] +Thu Mar 31 11:33:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat May 17 01:49:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/date/date_core.c (d_lite_strftime, dt_lite_strftime): [DOC] + fix indent not to be a big sole verbatim. - * dir.c (glob_helper): reduce matching at non-magical path on - Windows. +Thu Mar 31 11:18:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat May 17 01:49:23 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc + of DateTime. [ruby-core:74729] [Bug #12233] - * dir.c (glob_pattern_type): separate names with alphabet but no - magical from plain. +Thu Mar 31 03:41:02 2016 NARUSE, Yui <naruse@ruby-lang.org> - * dir.c (glob_helper): match plain names as-is to treat super-root - same as the root. [ruby-core:61552] [Bug #9648] + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde. + fix indent. -Fri May 16 17:38:22 2014 Koichi Sasada <ko1@atdot.net> +Wed Mar 30 16:33:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * gc.c (gc_marks, gc_marks_body): increase the counter of young objects - at the major GC because AGE2Promotion changes all old objects into - young objects at major GC. + * extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors. + Renamed files, wrong method names or argument types; the example + GetDBM macro is now updated to the current version of the actual + code. patch by Marcus Stollsteimer in [ruby-core:74690]. + [Bug #12228] -Fri May 16 17:26:24 2014 Koichi Sasada <ko1@atdot.net> +Wed Mar 30 09:46:01 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * gc.c (gc_before_sweep): heap_pages_swept_slots should contains - heap_pages_increment. + * lib/open-uri.rb: Use `userinfo` for authenticated proxy. + [fix GH-1148] Patch by @SokichiFujita + * test/open-uri/test_open-uri.rb: ditto. + [fix GH-1309] Patch by @jdamick - For example, GC by exceeding malloc_limit can remain - heap_pages_increment. +Wed Mar 30 01:56:06 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu May 15 21:18:43 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com> + * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. + patched by Anton Sivakov [Bug #12201] [Bug #12202] - * configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'. - [ruby-core:62095] [Bug #8358] +Wed Mar 30 01:54:30 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu May 15 21:04:06 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com> + * tool/redmine-backporter.rb: add given revision to current changesets + on associating the revision to the related ticket. - * lib/test/unit/parallel.rb: fix test-all parallel failure if a test - is skipped after raise. - DL::TestFunc#test_sinf is skipped after raise on mingw ruby. - But it causes Marshal.load failure due to undefined class/module - DL::DLError when doing test-all parallel and test-all doesn't - complete. We create new MiniTest::Skip object to avoid Marshal.load - failure. - [ruby-core:62133] [Bug #9767] +Wed Mar 30 01:53:17 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/testunit/test_parallel.rb (TestParallel): add a test. + * tool/merger.rb: update revision.h before merge. - * test/testunit/tests_for_parallel/ptest_forth.rb: ditto. +Tue Mar 29 19:33:54 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu May 15 18:57:23 2014 Koichi Sasada <ko1@atdot.net> + * addr2line.c: define toupper for its use. fix r54391. - * gc.c (garbage_collect_body): move gc_heap_prepare_minimum_pages() - from gc_sweep(). +Tue Mar 29 19:23:46 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu May 15 18:51:25 2014 Koichi Sasada <ko1@atdot.net> + * include/ruby/ruby.h (rb_isupper, rb_islower, rb_isalpha, rb_isdigit, + rb_isalnum, rb_isxdigit, rb_isblank, rb_isspace, rb_isblank, + rb_iscntrl, rb_isprint, rb_ispunct, rb_isgraph, + rb_tolower, rb_toupper): use inline function to avoid function call. - * gc.c (heap_extend_pages): calculate next growing heap size. + * include/ruby/ruby.h (rb_isascii): use inline function to clarify + the logic. - * gc.c (heap_set_increment): accept addition pages instead of - minimum pages. +Tue Mar 29 18:56:55 2016 NARUSE, Yui <naruse@ruby-lang.org> - * gc.c (gc_after_sweep): use heap_etend_pages(). + * tool/redmine-backporter.rb (backport): show merger.rb's path. - * gc.c (gc_heap_prepare_minimum_pages): add only 1 page. + * tool/redmine-backporter.rb (show): show current issue again if no + ticket number is given. - * gc.c (heap_ready_to_gc): add only 1 page. + * tool/redmine-backporter.rb (rel): show error message if current + bugs.ruby-lang.org doesn't support the API. -Thu May 15 18:42:49 2014 Koichi Sasada <ko1@atdot.net> +Tue Mar 29 18:54:34 2016 NARUSE, Yui <naruse@ruby-lang.org> - * gc.c: introduce macros to remove magic number. + * tool/merger.rb: support to backport header as backport identifier. + Now you can specify by 'merge revision(s) 49254: [Backport #10738]'. - GC_HEAP_FREE_SLOTS_MIN_RATIO = 0.3: guarantee minimum empty slots - ratio after sweep. - GC_HEAP_FREE_SLOTS_MAX_RATIO = 0.8: allow to free pages 0.2 (= 1-0.8) - of current existing slots. +Tue Mar 29 16:53:44 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu May 15 17:32:51 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com> + * enc/unicode/case-folding.rb, casefold.h: Tweaked handling of 6 + special cases in CaseUnfold_11_Table. - * thread_win32.c (rb_w32_stack_overflow_handler): use Structured - Exception Handling by AddVectoredExceptionHandler() for machine - stack overflow on mingw. - This would be equivalent to the handling using __try and __except - on mswin introduced by r43748. + * enc/unicode.c: Adjustments for above. -Wed May 14 19:31:03 2014 Koichi Sasada <ko1@atdot.net> + * test/ruby/enc/test_case_mapping.rb: Tests for the above: Some tests in + test_titlecase activated; test_greek added. A test in test_cherokee fixed. - * ext/openssl/depend: remove dependency from internal headers. - [Feature #9612] +Tue Mar 29 13:31:00 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/openssl/ossl.c (ossl_fips_mode_set): ditto. + * enc/unicode.c: Cleaned up some comments. - * ext/coverage/depend: ditto. +Tue Mar 29 13:24:56 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * include/ruby/thread_native.h: added. + * enc/unicode/case-folding.rb, casefold.h: Removing data for idempotent + titlecasing. - This header file only provides wrapper functions to control - native threads. These wrapper functions are used by MRI - implementation. + * enc/unicode.c: Adjust code to data removal. - * vm_core.h: use include/ruby/thread_native.h. +Tue Mar 29 12:45:18 2016 Laurent Arnoud <laurent@spkdev.net> - * thread.c: ditto. + * lib/webrick/httpresponse.rb: Move error_body to method. It allow to + override the body more easily. [fix GH-1307] + * test/webrick/test_httpresponse.rb: ditto. - * thread_pthread.h: ditto. +Tue Mar 29 06:40:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * thread_win32.h: ditto. - - * thread_native.h: removed. + * error.c (rb_compile_err_append): rb_thread_t::base_block is no + longer used. -Wed May 14 18:03:28 2014 Koichi Sasada <ko1@atdot.net> + * iseq.c (rb_iseq_compile_with_option): ditto, no protection is + needed. - * gc.c: enable RGENGC_AGE2_PROMOTION. +Tue Mar 29 06:39:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed May 14 18:02:30 2014 Koichi Sasada <ko1@atdot.net> + * parse.y (struct parser_params): move parse_in_eval flag from + rb_thread_t. - * gc.c (rgengc_rememberset_mark): promote remembered object earlier. + * parse.y (rb_parser_set_context): set parsing context, not only + mild error flag. -Mon May 12 23:57:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * iseq.c (rb_iseq_compile_with_option): the parser now refers no + thread local states to be restored. - * configure.in (rb_cv_atan2_inf_c99): check whether runtime atan2 - handles Inf as C99. [ruby-core:62536] [Bug #9831] + * vm_eval.c (eval_string_with_cref): ditto. -Mon May 12 20:33:01 2014 Tanaka Akira <akr@fsij.org> +Mon Mar 28 21:24:02 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - * configure.in: Invoke AC_REPLACE_FUNCS for each function. + * numeric.c (int_pos_p): fix typos. -Mon May 12 19:52:11 2014 Koichi Sasada <ko1@atdot.net> +Mon Mar 28 14:54:49 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c: count young object correctly and show it in GC.stat - on RGENGC_AGE2_PROMOTION. + * enc/unicode.c: Refactoring in preparation for data reduction for + titlecase. - * gc.c (RVALUE_PROMOTE_YOUNG): decrement young object count on - YOUNG->OLD. +Mon Mar 28 14:36:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c (obj_free): decrement young object count when young object - freed. + * enc/unicode.c: Minor refactoring for I WITH DOT ABOVE. - * gc.c (gc_marks): should not clear young object count. +Mon Mar 28 14:26:24 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c (gc_stat_internal): GC.stat :young_object information. + * enc/unicode.c: Removed code now covered by data from table. -Mon May 12 01:30:59 2014 Tanaka Akira <akr@fsij.org> +Mon Mar 28 11:49:21 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/socket/ifaddr.c (IS_IFADDRS): Unused macro removed. + * enc/unicode.c: Adding comments. [ci skip] - * ext/strscan/strscan.c (BUFSIZE): Ditto. +Mon Mar 28 11:30:23 2016 Shinichi Maeshima <netwillnet@gmail.com> - * ext/zlib/zlib.c (OBJ_IS_FREED): Ditto. + * lib/rubygems.rb: Fix `Gem.find_spec_for_exe` picks oldest gem. + https://github.com/travis-ci/travis-ci/issues/5798 + https://github.com/rubygems/rubygems/pull/1566 + * test/rubygems/test_gem.rb: ditto. -Sun May 11 22:27:18 2014 Tanaka Akira <akr@fsij.org> +Mon Mar 28 11:26:31 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * compile.c (BUFSIZE): Unused macro removed. + * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.2. + Please see entries of 2.6.2 on + https://github.com/rubygems/rubygems/blob/master/History.txt - * vm.c (BUFSIZE): Ditto. +Mon Mar 28 11:02:31 2016 Hiroshi Shirosaki <h.shirosaki@gmail.com> - * pack.c (INT64toNUM): Ditto. - (UINT64toNUM): Ditto. - (BYTEWIDTH): Ditto. + * lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path. + https://github.com/rubygems/rubygems/pull/1554 + [Bug #12193][ruby-core:74431] - * time.c (lshift): Ditto. - (UINT64toNUM): Ditto. - (id_lshift): Unused variable removed. +Mon Mar 28 08:19:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun May 11 21:23:27 2014 Tanaka Akira <akr@fsij.org> + * sprintf.c (rb_str_format): refactor floating point format of + Rational by using generic Integer functions. - * pack.c (swaps): Unused macro removed. - (swapi): Ditto. - (swapl): Ditto. - (swapll): Ditto. + * sprintf.c (rb_str_format): fix buffer overflow, length must be + greater than precision. reported by William Bowling <will AT + wbowling.info>. -Sun May 11 08:02:49 2014 Eric Wong <e@80x24.org> +Sun Mar 27 12:13:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_core.h (rb_vm_t): list_head and counter for living_threads - (rb_thread_t): vmlt_node for living_threads linkage - (rb_vm_living_threads_init): new function wrapper - (rb_vm_living_threads_insert): ditto - (rb_vm_living_threads_remove): ditto - * vm.c (rb_vm_living_threads_foreach): new function wrapper - * thread.c (terminate_i, thread_start_func_2, thread_create_core, - thread_fd_close_i, thread_fd_close): update to use new APIs - * vm.c (vm_mark_each_thread_func, rb_vm_mark, ruby_vm_destruct, - vm_memsize, vm_init2, Init_VM): ditto - * vm_trace.c (clear_trace_func_i, rb_clear_trace_func): ditto - * benchmark/bm_vm_thread_close.rb: added to show improvement - * ccan/build_assert/build_assert.h: added as a dependency of list.h - * ccan/check_type/check_type.h: ditto - * ccan/container_of/container_of.h: ditto - * ccan/licenses/BSD-MIT: ditto - * ccan/licenses/CC0: ditto - * ccan/str/str.h: ditto (stripped of unused macros) - * ccan/list/list.h: ditto - * common.mk: add CCAN_LIST_INCLUDES - [ruby-core:61871][Feature #9632 (part 1)] + * sprintf.c (rb_str_format): convert Rational to floating point + format by using generic Integer functions, not by methods which + can be overwritten. -Sun May 11 01:10:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Mar 26 10:55:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * signal.c (rb_f_kill): directly enqueue an ignored signal to self, - except for SIGSEGV and SIGBUS. [ruby-dev:48203] [Bug #9820] + * numeric.c (rb_int2str): conversion function to String for + generic Integer. -Sat May 10 22:37:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (rb_int_round): rounding function for generic + Integers. - * dir.c (push_glob): match in UTF-8 on Mac OS X. - [ruby-dev:48213] [Bug #9825] + * numeric.c (rb_int_{uminus,plus,minus,mul,idiv,modulo}): basic + arithmetic functions for generic Integers. -Sat May 10 13:32:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (FIXNUM_{POSITIVE,NEGATIVE,ZERO}_P): predict macros + only for Fixnum. - * thread.c (thread_start_func_2): stop if forked in a sub-thread, - the thread has become the main thread. - [ruby-core:62070] [Bug #9751] +Sat Mar 26 06:34:24 2016 NARUSE, Yui <naruse@ruby-lang.org> -Sat May 10 09:32:19 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * localeinit.c (rb_locale_charmap_index): fix prototype. + patched by Andreas Schwab [Bug #12218] - * man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773] +Fri Mar 25 16:40:48 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat May 10 08:47:36 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/enc/test_case_mapping.rb: Additional tests title case; + some not yet activated. - * signal.c (trap): Return "SYSTEM_DEFAULT" if SIG_DFL is set. +Fri Mar 25 13:38:11 2016 Kazuki Yamaguchi <k@rhe.jp> -Fri May 9 14:27:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb + function rather than OPENSSL_NPN_NEGOTIATED macro. it exists + even if it is disabled by OpenSSL configuration. + [ruby-core:74384] [Bug #12182] - * configure.in (RUBY_SETJMP_TYPE): check for setjmp type after - CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be - affected. [ruby-core:62469] [Bug #9818] + * ext/openssl/ossl_ssl.c: update #ifdef(s) as above. -Fri May 9 03:59:06 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + * test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled. - * lib/delegate.rb: Fix example of using delegator. - patched from Andrey Koleshko. [Fixes GH-505] +Fri Mar 25 11:08:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri May 9 03:42:43 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + * lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example, + missing mandatory arguments. [ruby-core:74540] [Bug #12215] - * lib/shell.rb: add documentation in lib/shell.rb - patched from reprah. [Fixes GH-516] +Fri Mar 25 01:50:58 2016 NARUSE, Yui <naruse@ruby-lang.org> -Fri May 9 03:28:04 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + * thread_pthread.c (reserve_stack): fix reserving position where + the stack growing bottom to top. [Bug #12118] - * lib/fileutils.rb: show fileutils require at top. - patched from Richard Schneeman. [Fixes GH-604] +Fri Mar 25 01:10:42 2016 Sebastian Schuberth <sschuberth@gmail.com> -Fri May 9 03:07:09 2014 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + * lib/mkmf.rb (find_executable0): On Windows, it is actually valid + to surround individual PATH directory entries with double + quotes. Remove these before joining the path as otherwise the + literal quotes would become part of the path, resulting in the + executable not to be found. [Fix GH-1305] - * lib/prime.rb (Prime#prime?): negative numbers can't be primes - by definition. reported by Ivan Kataitsev. [Bug #7395] - * test/test_prime.rb: add test. +Thu Mar 24 22:38:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu May 8 14:34:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * strftime.c (FMT, FMTV): remove recursive-assignments to get rid + of undefined behavior. [ruby-core:74532] [Bug #12213] - * class.c (rb_mod_init_copy): always clear instance variable, - constant and method tables first, regardless the source tables. - [ruby-dev:48182] [Bug #9813] +Thu Mar 24 17:44:02 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu May 8 10:53:14 2014 NARUSE, Yui <naruse@ruby-lang.org> + * strftime.c (FMT_PADDING): extract format for padding. - * configure.in: OpenBSD needs to include sys/param.h before include - sys/mount.h. [ruby-dev:48167] + * strftime.c (FMT_PRECISION): extract precision formula. -Thu May 8 10:17:04 2014 Karsten Sperling <karsten@sperling.co.nz> + * strftime.c (FMTV): append formatted string to expand the result. - * lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): stop - handling requests on shutdown, even if the socket is readable - and IO.select() returns true. [Fixes GH-607] +Thu Mar 24 14:20:21 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/webrick/server.rb (WEBrick::GenericServer#start): IO.select() - raises ENOTSOCK on shutdown on Windows. + * strftime.c (STRFTIME): deal with case conversion flags for + recursive formats. -Wed May 7 21:45:00 2014 Tanaka Akira <akr@fsij.org> +Thu Mar 24 12:43:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept): - Consider Socket#accept as well as TCPServer#accept. - Reported by Sam Stelfox. [ruby-core:62064] [Bug #9750] + * ext/date/date_core.c (dt_lite_iso8601): strftimev() always + returns a String, so append them directly. -Wed May 7 17:24:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/date/date_core.c (d_lite_jisx0301, iso8601_timediv), + (dt_lite_jisx0301): format by the format string in local buffer + to prevent intermediate strings from GC. - * numeric.c (num_step_scan_args): check keyword arguments and fail - if they conflict with positional arguments. - [ruby-dev:48177] [Bug #9811] + * ext/date/date_core.c (mk_inspect_raw, mk_inspect): inspect by + "%+"PRIsVALUE, to prevent intermediate strings from GC. -Wed May 7 12:06:14 2014 Koichi Sasada <ko1@atdot.net> +Thu Mar 24 11:43:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * benchmark/driver.rb: remove debug output and output results into - specified file. + * strftime.c (rb_strftime_with_timespec): remove unnecessary + check, as `s` equals to `endp` when recursed STRFTIME resized + the capacity same as the size. -Wed May 7 11:55:40 2014 Koichi Sasada <ko1@atdot.net> +Wed Mar 23 21:48:00 2016 Kenta Murata <mrkn@mrkn.jp> - * benchmark/driver.rb: add '--rawdata-output=[FILE] option to output - raw results into FILE. + * enum.c (ary_inject_op): put subtract operation out of if-clause. -Wed May 7 11:25:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Mar 23 21:38:00 2016 Kenta Murata <mrkn@mrkn.jp> - * vm_eval.c (rb_f_local_variables): exclude variables hidden by - shadowing. [ruby-core:60501] [Bug #9486] + * enum.c (ary_inject_op): Use Kahan's compensated summation algorithm + for summing up float values. - * vm.c (collect_local_variables_in_iseq): ditto. +Wed Mar 23 20:56:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue May 6 23:29:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * strftime.c (rb_strftime_with_timespec): append formatted results + to the given string with expanding, and also deal with NUL chars. - * parse.y (new_bv_gen): no duplicated names, if already added in - shadowing_lvar(). + * strftime.c (rb_strftime, rb_strftime_timespec): return formatted + string, not the length put in the given buffer. - * parse.y (local_tbl_gen): remove local variables duplicated with - arguments. - [ruby-core:60501] [Bug #9486] + * time.c (rb_strftime_alloc): no longer needs to retry with + reallocating buffers. -Tue May 6 18:48:50 2014 Tanaka Akira <akr@fsij.org> + * time.c (time_strftime): no longer needs to split by NUL chars. - * lib/time.rb (Time.make_time): Adjust the time zone of "now". +Wed Mar 23 14:23:54 2016 NARUSE, Yui <naruse@ruby-lang.org> -Tue May 6 18:33:12 2014 Tadayoshi Funaba <tadf@dotrb.org> + * lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in + expand_name. (display_name rescues NotFoundError by itself, + the original logic looks buggy...) - * io.c (io_{read,write}_nonblock): use rb_get_kwargs instead of - rb_hash_aref. +Wed Mar 23 11:44:53 2016 cremno <cremno@mail.ru> -Tue May 6 18:03:05 2014 Tanaka Akira <akr@fsij.org> + * marshal.c (r_long): cast to `signed char`, which is used + already, instead of SIGN_EXTEND_CHAR. - * lib/time.rb (Time.make_time): Argument validation code moved from - Time.parse and Time.strptime. + * parse.y: SIGN_EXTEND_CHAR is no longer used. [Fix GH-1302] -Tue May 6 17:27:06 2014 Tanaka Akira <akr@fsij.org> +Wed Mar 23 11:38:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/time.rb (Time.parse): [DOC] Fix an example in the documentation - to use EST. - Reported by Marcus Stollsteimer. - [ruby-core:60778] [Bug #9521] and [ruby-core:61718] [Bug #9682] + * cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL_PARAM): + * add missing parentheses and remove double quotes. + * rename to get rid of recursive references. + * as --excludes-dir option is for a path name, its argument + should be converted. + [ruby-dev:49526] [Bug #12199] -Tue May 6 04:31:48 2014 Tadayoshi Funaba <tadf@dotrb.org> +Wed Mar 23 10:39:38 2016 Koichi ITO <koic.ito@gmail.com> - * file.c (rb_f_test): removed meaningless "case 'a'". + * variable.c: Added documentation about order of `Module#constants` + [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301] -Tue May 6 01:28:14 2014 Tanaka Akira <akr@fsij.org> +Tue Mar 22 21:08:30 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/open-uri.rb (OpenURI.open_uri): Call StringIO#close only if - the StringIO object is not closed yet. - Reported by Jordi Massaguer Pla. [ruby-core:42538] [Bug #6010] + * include/ruby/oniguruma.h: Additional flag for characters that are titlecase. -Tue May 6 01:08:01 2014 Koichi Sasada <ko1@atdot.net> + * enc/unicode/case-folding.rb, casefold.h: Using above flag in data. - * benchmark/driver.rb: define File::NULL if not defined and /dev/null - is available to run benchmark driver on ruby 1.9.2. + * enc/unicode.c: Marking capitalized character as unmodified if it is + already titlecase. -Mon May 5 23:53:24 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/enc/test_case_mapping.rb: Tests for above functionality. - * ext/socket/mkconstants.rb: Add IP_TRANSPARENT. - IP_TRANSPARENT is provieded since glibc-2.12. - Reported by Eliezer Croitoru. [ruby-core:50372] [Bug #7476] +Tue Mar 22 14:18:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon May 5 22:29:47 2014 Tanaka Akira <akr@fsij.org> + * parse.y (lambda_body, parser_yylex): warn mismatched indentation + of lambda block. - * process.c (check_exec_redirect): Open the file in write mode for - redirect from [:out, :err]. - Proposed and implemented by Yusuke Endoh. - [ruby-dev:41430] [Feature #3348] +Tue Mar 22 11:36:49 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Mon May 5 21:52:35 2014 Tanaka Akira <akr@fsij.org> + * time.c (wmul): wrong condition. + fixed many test failures on 32bit and LLP64 platforms. - * ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all - separators File::SEPARATOR from File::ALT_SEPARATOR. - Reported by Daniel Rikowski. - Fixed by Nobuyoshi Nakada. [Bug #9618] +Tue Mar 22 10:31:34 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * ext/pathname/lib/pathname.rb (cleanpath_conservative): ditto. + * time.c (wdiv, wmod): wdivmod0() assumes the 3rd and the 4th arguments + are valid pointers. + maybe checking them in wdivmod0() is better manner, but I guess that + passing real dummy pointers may be faster than checking and branching + in wdivmod0(). + this commit fixes SEGV on 32bit and LLP64 platforms. -Mon May 5 21:48:04 2014 Tanaka Akira <akr@fsij.org> +Tue Mar 22 10:24:04 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * ext/pathname/lib/pathname.rb (Pathname#/): Aliased to Pathname#+. - Suggested by Alexey Muranov. [ruby-core:61432] [Feature #9625] + * time.c (divmodv): void function never returns any value. -Mon May 5 17:26:09 2014 Tadayoshi Funaba <tadf@dotrb.org> +Tue Mar 22 10:11:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * math.c (rb_math_sqrt): omitted exporting an unused function, - anyway. - * internal.h: follows the above change. + * test/lib/test/unit.rb (Test::Unit::StatusLine#failed): print + failed messages only if replacing mode, otherwise defer them + until the end, to get rid of interleaving failures with progress + messages. refix r54195. -Mon May 5 11:44:03 2014 Tanaka Akira <akr@fsij.org> +Tue Mar 22 03:45:03 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/time.rb (Time.strptime): Raise ArgumentError if Date._strptime - doesn't extract date information. - Reported by tadayoshi funaba. [ruby-core:62349] + * time.c (MUL_OVERFLOW_FIXWV_P): defined for FIXWV. -Mon May 5 01:12:27 2014 Tadayoshi Funaba <tadf@dotrb.org> + * time.c (wmul): use MUL_OVERFLOW_FIXWV_P and only switch. - * ext/date/date_core.c (rt_rewrite_frags): a new feature (not a - bug fix) of strptime. applies offset even if the given date is - not local time (%s and %Q). This is an exceptional feature and - I do NOT recommend to use this at all. Thank you git community. + * time.c (wmul): use mul which has Fixnum optimization. -Sun May 4 20:51:32 2014 Tanaka Akira <akr@fsij.org> + * time.c (rb_time_magnify): If WIDEVALUE_IS_WIDER, wmul() has the same + optimized logic, else mul() has also the similar logic for Fixnum. - * lib/time.rb (Time.force_zone!): Use usual local time if it has - expected offset from UTC. + * time.c (rb_time_unmagnify): almost ditto. -Sun May 4 17:58:12 2014 Tanaka Akira <akr@fsij.org> +Tue Mar 22 03:10:09 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/time.rb (Time.force_zone!): New private method. - (Time.make_time): Use Time.force_zone!. - (Time.strptime): Ditto. - (Time.rfc2822): Ditto. - (Time.xmlschema): Ditto. + * time.c (divmodv): add the case both arguments are Fixnum. - * lib/rss/rss.rb (Time.w3cdtf): Use Time.force_zone!. + * time.c (wquo): use quo which has Fixnum optimization. -Sun May 4 10:22:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * time.c (wdivmod0): added for WIDEVALUE_IS_WIDER. - * math.c (math_atan2): return values like as expected by C99 if - both two arguments are infinity. based on the patch by cremno - phobia <cremno AT mail.ru> in [ruby-core:62310]. [Feature #9799] + * time.c (wdivmod): use wdivmod0 and divmodv. + divmodv has Fixnum optimization. -Sun May 4 03:46:42 2014 Tanaka Akira <akr@fsij.org> + * time.c (wdiv): use wdivmod0 and div to avoid the use of divmodv which + calls id_quo whose return value is array. - * lib/time.rb (Time.httpdate): Always return a UTC Time object. + * time.c (wmod): use wdivmod0 and mod to avoid the use of divmodv which + calls id_quo whose return value is array. -Sun May 4 03:26:39 2014 Tanaka Akira <akr@fsij.org> +Mon Mar 21 22:32:50 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/time.rb (Time.make_time): Refactored. + * internal.h (rb_fix_divmod_fix): like r54213, use FIX2NUM only if + x == FIXNUM_MIN && y == -1. This must be a rare case and it is + expected compiler to handle well. -Sun May 4 02:53:17 2014 Tanaka Akira <akr@fsij.org> +Mon Mar 21 22:15:11 2016 NARUSE, Yui <naruse@ruby-lang.org> - * lib/time.rb (Time.rfc2822): Fix year completion. - Produce fixed-offset time object if appropriate. - (Time.xmlschema): Produce fixed-offset time object if appropriate. + * time.c (mod): Add Fixnum case. -Sat May 3 23:52:20 2014 Tanaka Akira <akr@fsij.org> + * time.c (quo): c can be Fixnum except a == FIXNUM_MIN && b == -1. + Such case can be optimized out because quo()'s argument is constant. - * lib/time.rb (make_time): Produce fixed-offset time object if - appropriate. - (Time.strptime): Use d[:zone] instead of d[:offset]. +Mon Mar 21 22:09:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/rss/rss.rb (Time.w3cdtf): Produce fixed-offset time object if - appropriate. + * internal.h (rb_fix_mul_fix): multiply converted values, not + object VALUEs. -Sat May 3 20:21:38 2014 Tanaka Akira <akr@fsij.org> +Mon Mar 21 20:18:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/time.rb (Time.strptime): Use d[:offset] if d[:seconds] is not - given. - Reported by tadayoshi funaba. [ruby-core:62322] + * common.mk (TEST_EXCLUDES, EXCLUDE_TESTFRAMEWORK): use full spell + long option. -Sat May 3 04:04:16 2014 Eric Wong <e@80x24.org> + * cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL): suppress path name + conversions by msys2. [ruby-dev:49525] [Bug #12199] - * complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END - [Bug #9608] - * rational.c (read_digits): ditto +Mon Mar 21 19:09:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat May 3 00:06:30 2014 Naohisa Goto <ngotogenome@gmail.com> + * string.c (enc_succ_alnum_char): try to skip an invalid character + gap between GREEK CAPITAL RHO and SIGMA. + [ruby-core:74478] [Bug #12204] - * file.c (HAVE_STRUCT_STATVFS_F_BASETYPE): File::Statfs#fstypename - is supported on AIX, HP-UX, and Solaris, by using the value of - struct statvfs.f_basetype. +Mon Mar 21 18:55:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in (HAVE_STRUCT_STATVFS_F_BASETYPE): check struct - statvfs.f_basetype which is available on AIX, HP-UX, and Solaris. + * node.c (rb_gc_mark_node): NODE_MATCH2 can have nd_args, u3, + since r54100. -Fri May 2 21:04:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Mar 20 21:17:13 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * parse.y (next_id): no reason to set ID_STATIC_SYM here, as ID - returned by rb_intern3 can be a dynamic symbol and the static - symbol flag is set otherwise. [Bug #9787] + * internal.h (rb_int128t2big): declare only when HAVE_INT128_T. + fixed a compile error with VC++ introduced at r54203. -Fri May 2 11:32:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Mar 20 20:10:14 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/ruby/test_io.rb (test_seek, test_seek_symwhence): defer - File::Statfs#type call which may not be implemented, to mitigate - errors on platforms where SEEK_DATA is available but f_type in - struct statfs is not. [ruby-dev:48154] [Bug #9789] + * internal.h (DLONG): defined if long is 32bit (and LONG_LONG is 64bit; + but LONG_LONG is always defined as 64bit), or there's int128_t. -Fri May 2 10:37:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * internal.h (DL2NUM): defined if DLONG is defined. - * parse.y (rb_id_attrset): turn dynamically interned Symbol into - an ID, since rb_str_dynamic_intern returns a Symbol but not an - ID. [ruby-core:62226] [Bug #9787] + * internal.h (rb_fix_mul_fix): defined for `Fixnum * Fixnum`. -Thu May 1 22:19:34 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + * insns.def (opt_mul): use rb_fix_mul_fix(). - * file.c: Change AND condition to nested condition. + * numeric.c (fix_mul): ditto. -Thu May 1 00:36:26 2014 Naohisa Goto <ngotogenome@gmail.com> + * time.c (mul): ditto. - * file.c (FSTATFS): check availability of struct statfs and - struct statvfs in addition to fstatfs(2) and fstatvfs(2). - This fixes error in Solaris. [Bug #9788] [ruby-dev:48145] +Sun Mar 20 18:53:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Apr 30 19:46:23 2014 Narihiro Nakamura <authornari@gmail.com> + * numeric.c (fix_gt, fix_ge, fix_lt, fix_le): optimize comparisons + Fixnum against Bignum by rb_big_cmp in inversed order without + new Bignum instance. - * gc.c (gc_after_sweep): suppress unnecessary expanding heap. - Tomb heap pages are freed pages here, so expanding heap is - not required. +Sun Mar 20 18:44:52 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Apr 30 17:58:40 2014 Koichi Sasada <ko1@atdot.net> + * time.c (add): remove FIXABLE() which is in LONG2NUM(). - * vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record - it is bmethod frame. + * time.c (sub): ditto. - * vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame - is VM_FRAME_FLAG_BMETHOD. - [Bug #9759] + * time.c (mul): ditto. - * test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func. +Sun Mar 20 04:46:02 2016 NARUSE, Yui <naruse@ruby-lang.org> - * vm_core.h: rename rb_thread_t::passed_me to - rb_thread_t::passed_bmethod_me to clarify the usage. + * bignum.c (rb_big_cmp): reduce the code. - * vm_insnhelper.c (vm_call_bmethod_body): use renamed member. + * bignum.c (rb_big_eq): If normalized bignum is still bignum, + it must be larger than fixnum. -Wed Apr 30 17:06:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Mar 20 00:58:00 2016 Kenta Murata <mrkn@mrkn.jp> - * parse.y (rb_id_attrset): pin down dynamic symbol only. it is - possible that attrset ID can be registered as a static symbol - after the corresponding attrget ID has been registered as a - dynamic, and then the latter may be collected. - [ruby-core:62226] [Bug #9787] + * include/ruby/intern.h (rb_big_odd_p, rb_big_even_p): move to + internal.h so that they are exported only for ruby itself. -Tue Apr 29 14:17:57 2014 Tanaka Akira <akr@fsij.org> + * internal.h (rb_big_odd_p, rb_big_even_p): ditto. - * lib/tmpdir.rb: Rescue LoadError on etc.so for miniruby. - Revert r45707, r45711, r45717. +Sat Mar 19 21:56:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Apr 29 12:50:02 2014 Tanaka Akira <akr@fsij.org> + * test/lib/test/unit.rb (Test::Unit::StatusLine#failed): defer + failed messages until the end in verbose mode, to get rid of + interleaving failures with progress messages. - * lib/fileutils.rb: Don't need to define fu_get_gid and fu_get_gid in - rescue LoadError on 'etc'. +Sat Mar 19 21:53:35 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Apr 29 10:21:38 2014 Kazuki Tsujimoto <kazuki@callcc.net> + * numeric.c (fix_cmp): invert the result as the comparison is + inverted. - * parse.y (symbols_i): like r45492, call rb_gc_resurrect(). +Sat Mar 19 18:32:00 2016 Kenta Murata <mrkn@mrkn.jp> -Tue Apr 29 04:29:05 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + * numeric.c (int_to_f): raise NotImplementedError when a receiver + class is unknown. - * file.c (HAVE_STRUCT_STATFS_T_F_FSTYPENAME): Add new macro for - statfs_t. - * file.c (HAVE_STRUCT_STATFS_T_F_TYPE): ditto. + * test/-ext-/integer/test_my_integer.rb (test_my_integer_to_f): modify + a test for the above change. - * file.c (rb_io_statfs): check FSTATFS macro only instead of - HAVE_FSTATFS and HAVE_FSTATVFS. +Sat Mar 19 18:21:00 2016 Kenta Murata <mrkn@mrkn.jp> - * file.c (statfs_type): use new macro. - * file.c (statfs_fstypename): ditto. - * file.c (statfs_inspect): ditto. + * bignum.c (Bignum#<=>): remove it because they are unified with + Integer#<=>. -Tue Apr 29 00:20:26 2014 Rajarshi Das <rajarshid@cybage.com> + * numeric.c (Integer#<=>, Fixnum#<=>): move <=> method from Fixnum to + Integer. - * bootstraptest/test_literal.rb: fix typo of "dynamic". [ci skip] + * numeric.c (int_cmp): add this method for Integer#<=>. - * regexp.rdoc: fix typo of "organized". [ci skip] + * test/-ext-/integer/test_my_integer.rb (test_my_integer_cmp): add a + test to examine Integer#<=> for unknown subclasses. - * lib/session.rb: fix typo of "recognized". [ci skip] +Sat Mar 19 14:46:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Apr 28 21:40:27 2014 NARUSE, Yui <naruse@ruby-lang.org> + * iseq.c (rb_iseq_compile_with_option): make the parser in mild + error. - * configure.in (HAVE_STRUCT_STATFS_F_TYPE): check struct statfs.f_type - to support OpenBSD. + * load.c (rb_load_internal0): ditto. - * file.c (statfs_type): use above macro to switch. + * parse.y (yycompile0): return the error message within the error + to be raised. [Feature #11951] - * file.c (statfs_inspect): ditto. + * parse.y (parser_compile_error): accumulate error messages in the + error_buffer. -Mon Apr 28 18:06:08 2014 NARUSE, Yui <naruse@ruby-lang.org> +Sat Mar 19 03:57:13 2016 NARUSE, Yui <naruse@ruby-lang.org> - * configure.in: check struct statvfs and struct statvfs.f_fstypename. + * time.c (LOCALTIME): organize #ifdefs. - * configure.in: on NetBSD fstatfs is obsoleted. + * time.c (GMTIME): define only ifndef HAVE_STRUCT_TM_TM_GMTOFF. - * file.c: support NetBSD for File::Statfs. +Sat Mar 19 03:53:31 2016 NARUSE, Yui <naruse@ruby-lang.org> -Mon Apr 28 17:42:42 2014 Narihiro Nakamura <authornari@gmail.com> + * configure.in (rb_cv_member_struct_tm_tm_gmtoff): For Linux (glibc) + define _BSD_SOURCE for time.h to define struct tm.tm_gmtoff. - * gc.c: This argument must be a pointer. + * time.c: define _BSD_SOURCE at the top. -Mon Apr 28 17:40:15 2014 Narihiro Nakamura <authornari@gmail.com> +Sat Mar 19 03:00:50 2016 Rei Odaira <Rei.Odaira@gmail.com> - * gc.c: Fix typos. These are undefined variables. + * test/-ext-/time/test_new.rb (test_timespec_new): change a gmtoff + test to a better one that does not depend on whether the current + time is in summer time or not. -Sun Apr 27 19:39:42 2014 Tadayoshi Funaba <tadf@dotrb.org> +Fri Mar 19 00:00:00 2016 Kenta Murata <mrkn@mrkn.jp> - * ext/date/date_strptime.c (date__strptime_internal): do not - overwrite century. + * bignum.c (rb_big_to_f, Bignum#to_f): removed them because they are + unified with int_to_f and Integer#to_f. -Sat Apr 26 11:50:08 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * numeric.c (int_to_f): treat Bignum values directly. - * test/ruby/test_enum.rb (test_flat_map): Added test for flat_map. - Contribute from @igaiga. [fix GH-598] +Fri Mar 18 23:41:00 2016 Kenta Murata <mrkn@mrkn.jp> -Sat Apr 26 10:55:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (int_to_f, fix_to_f): rename fix_to_f to int_to_f, and add + treatment for subclasses which don't have definitions of to_f method. - * compile.c (compile_array_): make copy a first hash not to modify - the argument itself. keyword splat should be non-destructive. - [ruby-core:62161] [Bug #9776] + * numeric.c (Integer#to_f, Fixnum#to_f): move to_f method from Fixnum + to Integer. -Sat Apr 26 08:05:36 2014 Tanaka Akira <akr@fsij.org> + * ext/-test-/integer/my_integer.c: define helper class for testing + to_f method for a subclass of Integer. - * test/ruby/test_process.rb (test_rlimit_nofile): Don't limit - RLIMIT_NOFILE too small. - This fix sporadic "[ASYNC BUG] thread_timer: select" on GNU/Linux. + * ext/-test-/integer/extconf.rb: ditto. -Fri Apr 25 22:54:34 2014 Naohisa Goto <ngotogenome@gmail.com> + * ext/-test-/integer/init.c: ditto. - * lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to - ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the - directory is not an empty directory, rmdir() shall fail and set - errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST. - [Bug #9571] [ruby-dev:48017] + * test/-ext-/integer/test_my_integer.rb: examine to_f method for a + subclass of Integer. -Fri Apr 25 19:16:30 2014 Tanaka Akira <akr@fsij.org> +Fri Mar 18 22:32:00 2016 Kenta Murata <mrkn@mrkn.jp> - * lib/webrick/utils.rb: Don't rescue LoadError for 'etc' extension. + * include/ruby/intern.h (rb_big_hash): Move to internal.h. -Fri Apr 25 14:55:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * internal.h: ditto. - * configure.in (rb_cv_func___builtin_unreachable): try with an - external variable not only by a warning, which might not be - shown due to the optimization. [ruby-core:61647] [Bug #9665] +Fri Mar 18 22:10:00 2016 Kenta Murata <mrkn@mrkn.jp> -Fri Apr 25 13:11:49 2014 NARUSE, Yui <naruse@ruby-lang.org> + * bignum.c (Bignum#eql?): remove its definition because it is unified + with Numeric#eql?. - * configure.in: NetBSD's ksh, used by configure, needs escapes. + * numeric.c (num_eql): treat Bignum values directly. -Fri Apr 25 12:51:08 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Mar 18 21:57:00 2016 Kenta Murata <mrkn@mrkn.jp> - * configure.in: correct pthread_setname_np's prototype on NetBSD. - [Bug #9586] + * bignum.c (rb_big_to_s, Bignum#to_s): remove its definition because + it is unified with Integer#to_s. -Thu Apr 24 23:17:25 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * numeric.c (int_to_s): treat Bignum values directly. - * lib/fileutils.rb (fu_get_uid, fu_get_gid): Etc.getpwnam/getgrnam may - returns nil. +Fri Mar 18 21:30:00 2016 Kenta Murata <mrkn@mrkn.jp> - * lib/webrick/utils.rb (su): ditto. + * numeric.c (int_to_s): Move from fix_to_s. -Thu Apr 24 22:55:22 2014 Tanaka Akira <akr@fsij.org> + * numeric.c (Integer#to_s): Move from Fixnum#to_s. - * bootstraptest/test_io.rb: Add etc.so to $" before require 'tmpdir'. +Fri Mar 18 16:22:24 2016 Victor Nawothnig <Victor.Nawothnig@gmail.com> -Thu Apr 24 21:09:55 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + * parse.y (parse_numvar): NTH_REF must be less than a half of + INT_MAX, as it is left-shifted to be ORed with back-ref flag. + [ruby-core:74444] [Bug#12192] [Fix GH-1296] - * man/ruby.1: fix broken link. +Fri Mar 18 12:25:30 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Apr 24 20:53:02 2014 Tanaka Akira <akr@fsij.org> + * gc.c (tick): fix missing close parenthesis. [Fix GH-1291] - * lib/tmpdir.rb: Don't need to rescue LoadError for etc.so. +Fri Mar 18 10:24:12 2016 Naotoshi Seo <sonots@gmail.com> -Thu Apr 24 17:39:53 2014 NARUSE, Yui <naruse@ruby-lang.org> + * ext/date/date_core.c (datetime_to_time): preserve timezone info + [Bug #12189] [Fix GH-1295] - * file.c (statfs_inspect): suppress warnings. - assume those values won't be larger than LONG_LONG_MAX. +Fri Mar 18 10:17:00 2016 Kenta Murata <mrkn@mrkn.jp> -Thu Apr 24 11:53:28 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * bignum.c (rb_big_hash): make it public function to be available in + other source files, and remove documentation comment for Bignum#hash. - * ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value - other than Symbol is an undefined behavior. fix up r31699. - [ruby-core:62142] [Bug #9771] + * bignum.c (Bignum#hash): remove its definition because it is unified + with Object#hash. -Thu Apr 24 11:21:37 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * include/ruby/intern.h (rb_big_hash): add a prototype declaration. - * parse.y (rb_sym2id, rb_sym2id_without_pindown): return 0 for - non-symbol values, for the time being. + * hash.c (any_hash): treat Bignum values directly. -Thu Apr 24 05:50:13 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Mar 18 02:35:12 2016 Naotoshi Seo <sonots@gmail.com> - * parse.y (dsym_node_gen): like r45492, call rb_gc_resurrect(). + * lib/time.rb (parse, strptime): Fix Time.parse/strptime does not + have compatibility with DateTime.parse/strptime in terms of parsing + timezone [Bug #12190] [Fix GH-1297] -Wed Apr 23 20:36:22 2014 Tanaka Akira <akr@fsij.org> +Fri Mar 18 02:17:00 2016 Kenta Murata <mrkn@mrkn.jp> - * ext/etc/extconf.rb: Build ext/etc unconditionally. + * numeric.c (fix_zero_p, fix_even_p, fix_odd_p): remove needless + functions. -Wed Apr 23 14:10:50 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Mar 18 02:15:00 2016 Kenta Murata <mrkn@mrkn.jp> - * file.c (statfs_fsid): remove statfs.f_fsid because it doesn't return - meaningful value portably. http://togetter.com/li/658517 + * numeric.c (int_even_p): treat Fixnum and Bignum values directly. -Wed Apr 23 11:03:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Mar 18 02:07:00 2016 Kenta Murata <mrkn@mrkn.jp> - * ext/stringio/stringio.c (strio_write): use rb_str_append to - reuse coderange bits other than ASCII-8BIT, and keep - taintedness. [ruby-dev:48118] [Bug #9769] + * bignum.c (Bignum#even?, Bignum#odd?): remove definitions + because they are unified with Integer#even? and Integer#odd?. -Wed Apr 23 00:43:00 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * numeric.c (Fixnum#zero?, Fixnum#even?, Fixnum#odd?): remove + definitions because they are unified with Numeric#zero?, + Integer#even?, and Integer#odd?. - * win32/win32.c, include/ruby/win32.h (ustatfs): implementation of - statfs(2) clone. [EXPERIMENTAL] + * numeric.c (num_zero_p, int_odd_p): treat Fixnum and + Bignum values directly. - * file.c (rb_io_statfs): use above function. + * test/ruby/test_integer.rb (test_odd_p_even_p): remove meaningless + test case. - * configure.in, win32/Makefile.sub (struct statfs): available. +Fri Mar 18 01:51:00 2016 Kenta Murata <mrkn@mrkn.jp> -Tue Apr 22 23:56:24 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * bignum.c (rb_big_even_p, rb_big_odd_p): make them public functions + to be available in other source files. - * file.c (rb_io_stafs): use statfs(2) if fstatfs(2) is unavailable. + * include/ruby/intern.h (rb_big_even_p, rb_big_odd_p): add prototype + declarations. - * configure.in (fstatfs): check it. +Fri Mar 18 00:25:56 2016 Tanaka Akira <akr@fsij.org> -Tue Apr 22 22:15:51 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * enum.c (ary_inject_op): Implement the specialized code for sum of + float numbers. - * file.c (rb_io_statfs): need to define even if the system doesn't have - fstatfs(2). +Fri Mar 18 00:15:05 2016 Yusuke Endoh <mame@ruby-lang.org> - * test/ruby/test_file.rb (TestFile#test_statfs): skip if IO#stafs is not - implemented. + * numeric.c (num_step): use rb_equal for zero check. rb_num_coerce_cmp + created an object which caused extra overhead. -Tue Apr 22 19:32:48 2014 NARUSE, Yui <naruse@ruby-lang.org> +Thu Mar 17 22:21:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * file.c: newly added a class File::Statfs. (experimental) + * include/ruby/ruby.h (RB_GC_GUARD_PTR): remove intermediate + macro, and expand for each RB_GC_GUARD. [Fix GH-1293] -Tue Apr 22 08:22:33 2014 Koichi Sasada <ko1@atdot.net> +Thu Mar 17 22:08:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * gc.c (objspace_malloc_increase): don't cause GC by malloc_increase - when memop type is MEMOP_TYPE_REALLOC. + * compile.c (iseq_specialized_instruction): move specialization + for opt_newarray_max/min from translation phase. - GC at realloc is not well maintained. - We need a time to make it safe. - [ruby-dev:48117] +Thu Mar 17 21:52:09 2016 Yusuke Endoh <mame@ruby-lang.org> -Tue Apr 22 06:54:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * array.c, enum.c: make rdoc format consistent. - * gc.c (objspace_malloc_increase): run full mark if 0x04 bit is - set in ruby_gc_stress. [ruby-core:62103] [Feature #9761] +Thu Mar 17 21:47:57 2016 Yusuke Endoh <mame@ruby-lang.org> - * gc.c (objspace_malloc_increase): run GC after realloc not only - malloc and calloc by GC.stress. [ruby-core:62103] [Feature #9761] + * NEWS: add Array#max, #min, and the optimization. [Feature #12172] -Mon Apr 21 19:12:20 2014 NARUSE, Yui <naruse@ruby-lang.org> +Thu Mar 17 21:45:02 2016 Yusuke Endoh <mame@ruby-lang.org> - * string.c (rb_str_coderange_scan_restartable): coderange is always - ENC_CODERANGE_VALID if the string is ASCII-8BIT and already has a non - ASCII character. + * compile.c (NODE_CALL): add optimization shortcut for Array#max/min. + Now `[x, y].max` is optimized so that a temporal array object is not + created in some condition. [Feature #12172] -Mon Apr 21 19:02:44 2014 NARUSE, Yui <naruse@ruby-lang.org> + * insns.def (opt_newarray_max, opt_newarray_min): added. - * string.c (coderange_scan): remove useless condition `p < e` after - search_nonascii. +Thu Mar 17 21:35:52 2016 Yusuke Endoh <mame@ruby-lang.org> - * string.c (rb_str_coderange_scan_restartable): ditto. + * array.c (rb_ary_max, rb_ary_min): implement Array#max and min with + arguments. replace super call with rb_nmin_run. -Mon Apr 21 18:55:21 2014 NARUSE, Yui <naruse@ruby-lang.org> + * enum.c (nmin_run): exported (as rb_nmin_run). - * ext/-test-/string/coderange.c: add Bug::String.new#coderange_scan - to explicitly scan coderange. + * internal.h: added a prototype for rb_nmin_run. -Mon Apr 21 18:19:35 2014 NARUSE, Yui <naruse@ruby-lang.org> +Thu Mar 17 21:24:52 2016 Yusuke Endoh <mame@ruby-lang.org> - * string.c (coderange_scan): remove unused logic. + * array.c (rb_ary_max, rb_ary_min): implement a block by itself instead + of delegating Enumerable#max/min. - * string.c (rb_str_coderange_scan_restartable): ditto. +Thu Mar 17 21:09:34 2016 Yusuke Endoh <mame@ruby-lang.org> -Mon Apr 21 14:11:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added. + [Feature #12172] - * ext/stringio/stringio.c (strio_putc): fix for non-ascii - encoding, like as IO#putc. [ruby-dev:48114] [Bug #9765] + * internal.h (OPTIMIZED_CMP): moved from enum.c so that array.c can + use it. -Sun Apr 20 12:57:15 2014 Masaya Tarui <tarui@ruby-lang.org> + * test/ruby/test_array.rb (test_max, test_min): tests for Array#max + and Array#min. - * st.c (st_foreach_check): change start point of search at check - from top to current. [ruby-dev:48047] [Bug #9646] + * test/ruby/test_enum.rb (test_max, test_min): revised a bit to test + Enumerable#max and #min explicitly. -Sun Apr 20 08:41:33 2014 Andrew DeMaria <ademariad@gmail.com> +Thu Mar 17 21:02:42 2016 Yusuke Endoh <mame@ruby-lang.org> - * lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer - user specified `$LIBPATH` than `$DEFLIBPATH`. [ruby-core:62100] - [ruby-trunk - Bug #9760] + * internal.c: struct cmp_opt_data added for refactoring out a data + structure for CMP_OPTIMIZABLE -Sun Apr 20 06:01:18 2014 Eric Wong <e@80x24.org> + * array.c (struct ary_sort_data): use struct cmp_opt_data. - * gc.c (rb_gc_writebarrier): drop special case for big hash/array - [Bug #9518] + * enum.c (struct min_t, max_t, min_max_t): use struct cmp_opt_data. -Sat Apr 19 15:38:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Mar 17 20:55:21 2016 Tanaka Akira <akr@fsij.org> - * parse.y (primary): flush cmdarg flags inside left-paren in a - command argument, to allow parenthesed do-block as an argument - without arguments parentheses. [ruby-core:61950] [Bug #9726] + * enum.c (ary_inject_op): Extracted from enum_inject. -Sat Apr 19 10:07:24 2014 Tanaka Akira <akr@fsij.org> +Thu Mar 17 18:39:04 2016 Tanaka Akira <akr@fsij.org> - * internal.h (struct RBignum): Use size_t for len. + * enum.c (enum_inject): Implement the specialized code for sum of + integers including Bignums. - * include/ruby/intern.h (rb_big_new): Use size_t instead of long to - specify the size of bignum. - (rb_big_resize): Ditto. + * internal.h (rb_fix_plus): Declared to be usable from enum_inject. - * bignum.c: Follow above changes. + * numeric.c (rb_fix_plus): Defined. - * rational.c: Follow above changes. +Thu Mar 17 17:20:28 2016 Anton Davydov <antondavydov.o@gmail.com> - * marshal.c: Follow above changes. + * thread_sync.c: [DOC] Update documentation for Queue class + description. [Fix GH-1292] -Sat Apr 19 00:32:07 2014 Tanaka Akira <akr@fsij.org> +Thu Mar 17 17:14:51 2016 Dinar Valeev <dvaleev@suse.com> - * numeric.c (rb_num2long): Returns a long. - (rb_num2ulong): Returns a unsigned long. + * gc.c (tick): Use __builtin_ppc_get_timebase for POWER arch. + [Fix GH-1291] - * bignum.c (rb_big2long): Returns a long. - (rb_big2ulong): Returns a unsigned long. +Thu Mar 17 11:51:48 2016 NARUSE, Yui <naruse@ruby-lang.org> - * include/ruby/intern.h: Follow above changes. + * lib/securerandom.rb (gen_random): to avoid blocking on Windows. + On Windows OpenSSL RAND_bytes (underlying implementation is + RAND_poll in crypto/rand/rand_win.c) may be blocked at + NetStatisticsGet. + https://wiki.openssl.org/index.php/Random_Numbers#Windows_Issues + Instead of this, use Random.raw_seed directly (whose implementation + CryptGenRandom is one of the source of + entropy of RAND_poll on Windows). + https://wiki.openssl.org/index.php/Random_Numbers + Note: CryptGenRandom function is PRNG and doesn't check its entropy, + so it won't block. [Bug #12139] + https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379942.aspx + https://tools.ietf.org/html/rfc4086#section-7.1.3 + https://eprint.iacr.org/2007/419.pdf + http://www.cs.huji.ac.il/~dolev/pubs/thesis/msc-thesis-leo.pdf - * include/ruby/ruby.h: Follow above changes. - (rb_num2long_inline): No need to cast. - (rb_num2ulong_inline): Ditto. +Thu Mar 17 12:09:00 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Apr 19 00:17:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * enc/unicode.c: Fixed two macro definitions. + * test/ruby/enc/test_case_mapping.rb: Test cases that detected + the above bugs. - * string.c (SHARABLE_SUBSTRING_P): predicate if substring can be - shared with the original string. true if just at the end of the - original string, for the time being. all substring will be able to - be shared in the future. +Thu Mar 17 11:36:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Apr 18 21:48:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/socket/option.c (inspect_tcpi_msec): more accurate condition + for TCPI msec member inspection function. + [ruby-core:74388] [Bug #12185] - * string.c (rb_str_new_frozen): consider the shared string at - middle. +Thu Mar 17 08:13:43 2016 Rei Odaira <Rei.Odaira@gmail.com> - * string.c (rb_str_subseq, rb_str_substr, str_byte_substr): share - middle of a string. + * test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values + are the same only when both or neither of the Time objects are in + summer time (daylight-saving time). -Fri Apr 18 15:40:05 2014 NARUSE, Yui <naruse@ruby-lang.org> +Thu Mar 17 07:17:36 2016 Eric Hodel <drbrain@segment7.net> - * string.c: use uintptr_t instead of VALUE because they are not ruby + * marshal.c (r_object0): raise ArgumentError when linking to undefined object. -Fri Apr 18 14:51:42 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * string.c: check str_strlen's argument, and add comment or - use NULL if simply it uses str's enc. - -Fri Apr 18 14:32:40 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * string.c (str_strlen): use enc_strlen if the coderange is known. - -Fri Apr 18 14:21:21 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * string.c (enc_strlen): move UTF-8 optimization from str_strlen to - enc_strlen. - -Fri Apr 18 08:50:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (rb_cv_getcwd_malloc): check if getcwd allocates - buffer if NULL is given [ruby-core:62072] [Bug #9752] - -Thu Apr 17 16:28:10 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * prelude.rb: [DOC] Update Thread::exclusive docs by @stevenharman. - -Thu Apr 17 10:03:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/fileutils.rb (FileUtils#copy_entry): update rdoc about - preserve option and permissions, following r31123. - [ruby-core:62065] [Bug #9748] - -Wed Apr 16 23:47:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * enum.c (dont_recycle_block_arg): fix condition to recycle block - argument. lambda with rest can get internal array directly. - [ruby-core:62060] [Bug #9749] - -Wed Apr 16 09:51:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal() - finalizes only a copy of the digest context, the context must be - cleaned up after initialization by EVP_MD_CTX_cleanup() or a - memory leak will occur. [ruby-core:62038] [Bug #9743] - -Tue Apr 15 19:36:42 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * include/ruby/win32.h (rb_w32_cmdvector): removed. - - * win32/win32.c (rb_w32_sysinit): use WCHAR version of GetCommandLine() - internally. - - * win32/win32.c (w32_cmdvector): renamed from rb_w32_cmdvector. use - WCHAR* instead of char* internally. - - these changes are expected to not changing the behavior yet. - -Tue Apr 15 19:26:05 2014 Tanaka Akira <akr@fsij.org> - - * ext/extmk.rb: Re-generate extmk.mk and dummy makefiles only if - really required. - This fixes a problem to run multiple test-all concurrently as: - make test-all & make test-all & make test-all & ... - -Tue Apr 15 12:49:53 2014 Sam Rawlins <sam.rawlins@gmail.com> - - * enum.c (enum_each_slice, enum_each_cons): make more efficient by - allocating less and recycling block argument arrays if possible. - [Fixes GH-596] - -Mon Apr 14 18:44:45 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * addr2line.c (fill_lines): get base addrs in fill_lines to use it - with dladdr_fbases introduced at r45563. - it didn't get before if the executable is not pie. - -Mon Apr 14 18:05:48 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * addr2line.c (main_exe_path): support FreeBSD. - At least sh, csh, tcsh, bash, and zsh sets realpath of the main - executable for dladdr, but gdb doesn't. - -Mon Apr 14 17:20:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * proc.c (umethod_bind): use the ancestor iclass instead of new - iclass to get rid of infinite recursion, if the defined module - is already included. [ruby-core:62014] [Bug #9721] - -Sun Apr 13 12:46:58 2014 Tanaka Akira <akr@fsij.org> - - * bignum.c (SIZEOF_BDIGIT): Renamed from SIZEOF_BDIGITS. - - * internal.h: Ditto. - - * marshal.c: Ditto. - - * rational.c: Ditto. - -Sun Apr 13 10:18:09 2014 Tanaka Akira <akr@fsij.org> - - * common.mk: Unused target, $(MKMAIN_CMD), removed. - - * Makefile.in (MKMAIN_CMD): Unused macro removed. - - * win32/Makefile.sub (MKMAIN_CMD): Ditto. - -Sat Apr 12 22:11:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * string.c (sym_to_proc), proc.c (rb_block_clear_env_self): clear - caller's self which is useless, so that it can get collected. - [Fixes GH-592] - -Sat Apr 12 09:26:48 2014 Eric Hodel <drbrain@segment7.net> - - * ext/openssl/ossl_ocsp.c: [DOC] Document OpenSSL::OCSP. - -Fri Apr 11 18:52:38 2014 Koichi Sasada <ko1@atdot.net> - - * array.c (ARY_SET): added. - - ARY_SET() is same functionality of RARRAY_ASET(), but - it has an assertion (`ary' doesn't have shared array). - -Fri Apr 11 16:54:26 2014 Koichi Sasada <ko1@atdot.net> - - * array.c: make shared arrays WB-protected objects. - - Shared arrays were WB-unprotected object because - sharing array can modify shared array's buffer - if it occupied shared array. - - [sharing array (ary)] -> [shared array (shared)] -> <buff> - | A - +---------------------------------------+ - write `buff' with WB(ary, &buff[i], obj) - -> if `ary' and `shared' are old, then only `ary' - will be remembered. - -> traverse from `ary'. But `shared' is old, so - that written `obj' is not marked. - - It cause WB miss so that shared arrays were WB-unprotected. - (WB-unprotected objects are marked everytime if it is living) - - This patch insert WB() for `shared' if it is needed. - -Fri Apr 11 15:05:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * proc.c (rb_method_call_with_block, umethod_bind): call with - IClass including the module for a module instance method. - [ruby-core:61936] [Bug #9721] - - * vm_insnhelper.c (vm_search_super_method): allow bound - UnboundMethod case. - -Fri Apr 11 12:02:30 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * addr2line.c (rb_dump_backtrace_with_lines): set base address - which is retrieved from dladdr to dladdr_fbases, to skip already - parsed objects. - -Fri Apr 11 12:44:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * array.c (ary_reject): may be turned into a shared array during - the given block. [ruby-dev:48101] [Bug #9727] - -Thu Apr 10 23:41:21 2014 Akinori MUSHA <knu@iDaemons.org> - - * lib/net/ftp.rb (Net::FTP#login): [DOC] The default password for - anonymous login was changed to "anonymous@" in r25313. - -Thu Apr 10 19:22:58 2014 Koichi Sasada <ko1@atdot.net> - - * test/ruby/test_array.rb: remove useless `assert'. - -Thu Apr 10 19:11:11 2014 Koichi Sasada <ko1@atdot.net> - - * array.c (rb_ary_modify): remember shared array owner if a shared - array owner is promoted and a shared array is not promoted. - - Now, shared array is WB-unprotected so that shared arrays are not - promoted. All objects referred from shared array should be marked - correctly. - - [ruby-core:61919] [ruby-trunk - Bug #9718] - - * test/ruby/test_array.rb: add a test for above. - -Thu Apr 10 18:57:12 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (gc_verify_internal_consistency): move lines and enable - allrefs_dump() on RGENGC_CHECK_MODE >= 4. - -Thu Apr 10 15:01:06 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * addr2line.c (append_obj): clear allocated memory. - - * addr2line.c (rb_dump_backtrace_with_lines): free `base_addrs'. - -Thu Apr 10 14:40:18 2014 Koichi Sasada <ko1@atdot.net> +Thu Mar 17 00:45:00 2016 Kenta Murata <mrkn@mrkn.jp> - * gc.c (rb_gc_writebarrier_unprotect_promoted): disable to dump debug - message when RGENGC_CHECK_MODE == 0. + * test/ruby/test_bignum.rb: Make sure to use Bignum values in the tests. -Thu Apr 10 08:13:47 2014 Tanaka Akira <akr@fsij.org> +Wed Mar 16 23:10:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * signal.c (check_stack_overflow): Don't use ucontext_t if ucontext.h - is not available. - Fixes build on Android (x86). + * defs/keywords (alias, undef): symbol literals are allowed. -Wed Apr 9 23:22:44 2014 Tanaka Akira <akr@fsij.org> + * parse.y (parse_percent): should parse symbol literals for alias + and undef. [ruby-dev:47681] [Bug #8851] - * gc.c (mark_current_machine_context): Call SET_STACK_END. - This reverts a hunk of r40703 by ko1. - This fixes [ruby-dev:48098] [Bug #9717]. +Wed Mar 16 21:39:39 2016 NARUSE, Yui <naruse@ruby-lang.org> -Wed Apr 9 21:02:04 2014 Tanaka Akira <akr@fsij.org> + * enc/trans/JIS: update Unicode's notice. [Bug #11844] - * process.c (OBJ2UID1): Defined even if getpwnam_r is not usable. - (OBJ2GID1): Defined even if getgrnam_r is not usable. - This fixes compilation error on Android. +Wed Mar 16 20:03:35 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Apr 9 15:16:59 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * proc.c (proc_binding): proc from symbol can not make a binding. + [ruby-core:74100] [Bug #12137] - * encoding.c (rb_enc_default_internal): fix rdoc. `__FILE__` is - in filesystem encoding but not `default_internal`. - [ruby-core:61894] [Bug #9713] +Wed Mar 16 18:42:45 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Apr 9 14:43:00 2014 Koichi Sasada <ko1@atdot.net> + * test/ruby/enc/test_case_mapping.rb: Fixed and activated a test for Cherokee. - * test/ruby/test_gc.rb: more long timeout. - This test failed under RGENGC_CHECK_MODE >= 2. +Wed Mar 16 17:58:56 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Apr 9 13:07:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_mapping.rb: Fixed a logical error. - * configure.in: get rid of __builtin_setjmp/__builtin_longjmp on - x64-mingw, which causes SEGV with callcc. - [ruby-core:61887] [Bug #9710] +Wed Mar 16 17:57:34 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Apr 9 12:44:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/enc/test_case_mapping.rb: Adding tests for Cherokee. + One test not yet working. + (with Kimihito Matsui) - * string.c (str_buf_cat): should round up the capacity by 4KiB, - but not number of rooms. [ruby-core:61886] [Bug #9709] +Wed Mar 16 15:44:05 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Apr 8 22:55:32 2014 Akinori MUSHA <knu@iDaemons.org> + * test/ruby/enc/test_case_mapping.rb: Adding tests for actual Unicode + case mapping. Fixing some aliasing issues. + (with Kimihito Matsui) - * lib/mkmf.rb (MakeMakefile#dir_config): [DOC] Improve - documentation. +Tue Mar 15 21:38:28 2016 Tanaka Akira <akr@fsij.org> -Tue Apr 8 22:31:44 2014 Koichi Sasada <ko1@atdot.net> + * enum.c (enum_inject): Consider redefinition of Fixnum#+. + [ruby-dev:49510] [Bug#12178] Reported by usa. - * gc.c: rename `RGENGC_THREEGEN' to `RGENGC_AGE2_PROMOTION'. +Tue Mar 15 20:32:57 2016 Tanaka Akira <akr@fsij.org> - * gc.c (rgengc_rememberset_mark): don't promote, but remain in - remember set for infant objects. + * enum.c (enum_inject): Implement the specialized code for :+ operator + for Fixnums. - * gc.c (RVALUE_PROMOTE_INFANT, RVALUE_PROMOTE_YOUNG): count numbers - in these functions. +Tue Mar 15 20:21:01 2016 Tanaka Akira <akr@fsij.org> -Mon Apr 7 21:11:49 2014 Tanaka Akira <akr@fsij.org> + * enum.c (enum_inject): Implement the specialized code for self is an + array and a symbol operator is given. - * ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM. - Reported by Saravana kumar. [ruby-core:61820] [Bug #9697] - Fixed by Heesob Park. [ruby-core:61868] +Tue Mar 15 16:29:51 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Apr 7 07:20:23 2014 NARUSE, Yui <naruse@ruby-lang.org> + * enc/unicode.c: Eliminating common code. + (with Kimihito Matsui) - * lib/xmlrpc/client.rb (do_rpc): don't check body length. - If HTTP content-encoding is used, the length may be different. - [Bug #8182] [ruby-core:53811] +Tue Mar 15 16:17:09 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Apr 7 02:39:48 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + * enc/unicode.c: Expansion of some code repetition in preparation for + elimination of common code pieces. + (with Kimihito Matsui) - * lib/matrix.rb: Add Matrix#cofactor [fix GH-568] - Add first_minor [fix GH-568] - Handle empty diagonal matrix case [fix GH-576] - Patches by gogotanaka +Tue Mar 15 13:49:23 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sun Apr 6 08:52:50 2014 Bugra Barin <bugrabarin@hotmail.com> + * enc/unicode.c: Additional macros and code to use mapping data in + CaseMappingSpecials array. + (with Kimihito Matsui) - * dln.c (dln_load): use wchar version to load a library in - non-ascii path on Windows. based on the patch by Bugra Barin - <bugrabarin AT hotmail.com> in [ruby-core:61845]. [Bug #9699] +Tue Mar 15 13:41:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Apr 5 19:36:33 2014 Tadayoshi Funaba <tadf@dotrb.org> + * internal.h (rb_gc_mark_global_tbl): should be private, + but was accidentally exported. - * ext/date/date_core.c (d_lite_cmp): should compare with #<. +Tue Mar 15 12:51:06 2016 Marcus Stollsteimer <sto.mar@web.de> -Sat Apr 5 00:31:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * doc/extension.ja.rdoc: Fix RDoc markup in doc/extension*.rdoc. + [ci skip][Bug #12143][ruby-core:74143] + * doc/extension.rdoc: ditto. - * ext/readline/extconf.rb (rl_hook_func_t): check pointer type. - [ruby-dev:48089] [Bug #9702] +Tue Mar 15 09:56:41 2016 Ian Lunderskov <ian.lunderskov@gmail.com> -Fri Apr 4 07:13:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * time.c: Minor typo in Time#dst? documentation. + [ci skip][fix GH-1290] - * configure.in (ac_cv_func___builtin_setjmp): should not skip - flags restoration in RUBY_WERROR_FLAG by `break`. - [ruby-dev:48086] [Bug #9698] +Tue Mar 15 04:36:41 2016 Charles Oliver Nutter <headius@headius.com> -Wed Apr 2 21:50:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/test_rubyoptions.rb (test_disable): add tests for + --disable-gems and --disable-did_you_mean. - * configure.in (ac_cv_func___builtin_setjmp): __builtin_longjmp() - in Apple LLVM 5.1 (LLVM 3.4svn) uses `void**`, not `jmp_buf`. - [Bug #9692] +Tue Mar 15 03:35:04 2016 Eric Hodel <drbrain@segment7.net> -Wed Apr 2 20:57:15 2014 Koichi Sasada <ko1@atdot.net> + * marshal.c (r_object0): Fix Marshal crash for corrupt extended object. - * gc.c, gc.h (rb_objspace_each_objects_without_setup): - Add a new (hidden) C-API to iterate objspace snapshot. +Tue Mar 15 01:22:27 2016 Charles Oliver Nutter <headius@headius.com> - This API is not safe to call any C-APIs in a given callback - function. Be careful to use this C-API. + * test/ruby/test_rubyoptions.rb: make version matching support + JRuby's version output. -Wed Apr 2 17:43:17 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Mar 14 19:05:39 2016 NARUSE, Yui <naruse@ruby-lang.org> - * configure.in (ac_cv_func___builtin_setjmp): gcc 4.9 disallows a - variable as the second argument of __builtin_longjmp(). - [ruby-core:61800] [Bug #9692] + * bignum.c (big2str_2bdigits): reduce div instruction. -Wed Apr 2 15:12:18 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Mon Mar 14 18:39:53 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * common.mk: Use redmine-2.x url for DeveloperHowto wiki. - [ruby-core:60657] [Bug #9511] + * include/ruby/oniguruma.h, enc/unicode.c: Adjusting flag assignments + and macros to work with unified CaseMappingSpecials array. + (with Kimihito Matsui) -Wed Apr 2 11:46:29 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> +Mon Mar 14 16:53:37 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/pathname/lib/pathname.rb (Pathname#join): Fix error with - empty args. Reported by ko1 via IRC. + * compile.c (compile_named_capture_assign): optimize named capture + assignments, by replacing repeating global variable accesses + with `dup`, and by returning the matched result instead of + re-getting it from the MatchData. - * test/pathname/test_pathname.rb (TestPathname#test_join): Add the - test for above case. + * parse.y (reg_named_capture_assign_gen): build just assignment + nodes for the optimization. -Tue Apr 1 11:39:57 2014 James Edward Gray II <james@graysoftinc.com> +Mon Mar 14 16:02:59 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/csv.rb: Symbol HeaderConverter: strip leading/trailing space. - Reported by Skye Shaw - [Fixes GH-575] + * file.c (ruby_is_fd_loadable): now return -1 if loadable but + may block. -Tue Apr 1 11:34:04 2014 James Edward Gray II <james@graysoftinc.com> + * ruby.c (open_load_file): wait to read by the result of + ruby_is_fd_loadable, without fstat. - * lib/csv.rb: Don't attempt to convert nil headers. - Reported by Skye Shaw +Mon Mar 14 13:38:38 2016 NARUSE, Yui <naruse@ruby-lang.org> -Tue Apr 1 17:29:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * numeric.c (fix2str): improve r54092 like rb_int2big(). - * tool/config_files.rb (ConfigFiles.download): show failed URI. - [ruby-core:61792] [Bug #9690] +Mon Mar 14 10:02:23 2016 Eric Wong <e@80x24.org> -Tue Apr 1 12:06:49 2014 NARUSE, Yui <naruse@ruby-lang.org> + * ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe + [ruby-core:73803] [Bug #12069] - * addr2line.c (rb_dump_backtrace_with_lines): don't depend hard coded - symbol '_start'. +Sun Mar 13 09:43:23 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * addr2line.c (fill_lines): instead of above, get a dynamic symbol - in the main executable and use it to know the base address. + * include/ruby/win32.h (O_SHARE_DELETE): change to fit Fixnum + limit. [ruby-core:74285] [Bug #12171] - * addr2line.c (follow_debuglink0): use obj_info_t instead of - line_info_t to handle object related data. +Sun Mar 13 09:15:45 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * addr2line.c (main_exe_path): defined for Linux. + * numeric.c (rb_fix2str): fix edge case, accidentally generated + wrong Fixnum from LONG_MIN. -Tue Apr 1 08:58:39 2014 Kazuki Tsujimoto <kazuki@callcc.net> +Sat Mar 12 09:50:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (rb_str_dynamic_intern): set mark bit if dynamic symbol - is before sweeping. + * vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+" + cannot enclose non-identifier characters. + a patch by Sebastian S in [ruby-core:74278]. [Bug#12170] -Tue Apr 1 07:37:00 2014 NARUSE, Yui <naruse@ruby-lang.org> +Sat Mar 12 02:44:48 2016 Tanaka Akira <akr@fsij.org> - * addr2line.c (fill_lines): use dynsym, which is used for dynamic - linking and always exists, if there's no symtab. + * test/lib/test/unit.rb: describe !/REGEXP/ in the help message. -Tue Apr 1 07:27:15 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Mar 11 17:03:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_dump.c (rb_print_backtrace): current implementation - uses dladdr to get the path of objects. + * test/lib/test/unit.rb (Options#non_options): make regexp name + options prefixed with "!" negative filters. -Mon Mar 31 23:57:45 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * common.mk (TEST_EXCLUDES): use negative filter to exclude memory + leak tests. -x option excludes test files, not test methods. - * ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`. - [ruby-core:61756] [Bug #9578] +Fri Mar 11 16:11:27 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Mar 31 17:23:50 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * enc/unicode/case-folding.rb, casefold.h: Streamlining approach to + case mapping data not available from case folding by unifying all + three cases (special title, special upper, special lower). + * enc/unicode.c: Adjust macro names for above (macros are currently inactive). + (with Kimihito Matsui) - * test/ruby/memory_status.rb: require envutil before accessing EnvUtil - module. reported by ko1 via twitter. +Thu Mar 10 17:34:16 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Mar 31 10:28:01 2014 Eric Wong <e@80x24.org> + * iseq.c (prepare_iseq_build): enable coverage by coverage_enabled + option, not by parse_in_eval flag in the thread context. - * st.c (st_init_table_with_size): update comment - [Feature #9425] + * iseq.h (rb_compile_option_struct): add coverage_enabled flag. -Sun Mar 30 23:39:26 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * parse.y (yycompile0): set coverage_enabled flag if coverage + array is made. - * win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal): - reset inherit flag of socket to avoid unintentional inheritance of - socket. note that the return value of SetHandleInformation() is not - verified intentionally because old Windows may return an error. - [Bug #9688] [ruby-core:61754] +Thu Mar 10 15:19:54 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Mar 29 13:04:22 2014 Koichi Sasada <ko1@atdot.net> + * node.c (dump_option): nd_compile_option is a hidden hash object, + cannot call inspect on it. - * gc.c (gc_before_sweep): cap `malloc_limit' to - gc_params.malloc_limit_max. It can grow and grow with such case: - `loop{"a" * (1024 ** 2)}' - [Bug #9687] +Thu Mar 10 09:49:54 2016 Rei Odaira <Rei.Odaira@gmail.com> - This issue is pointed by Tim Robertson. - http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/ + * test/socket/test_socket.rb (test_udp_recvmsg_truncation): + AIX does not set the MSG_TRUNC flag for a message partially read + by recvmsg(2) with the MSG_PEEK flag set. -Fri Mar 28 19:32:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Mar 9 16:48:45 2016 Koichi Sasada <ko1@atdot.net> - * struct.c (not_a_member): extract name error and use same error - messages. based on the patch by Marcus Stollsteimer <sto.mar AT - web.de> at [ruby-core:61721]. [Bug #9684] + * benchmark/driver.rb: fix my last commit (syntax error). -Fri Mar 28 09:21:54 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed Mar 9 16:41:44 2016 Koichi Sasada <ko1@atdot.net> - * ext/psych/psych.gemspec: update gemspec for psych-2.0.5 + * benchmark/driver.rb: fix output messages. -Fri Mar 28 09:11:06 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * benchmark/memory_wrapper.rb: use respond_to? because + member? does not work well. - * ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to - libyaml-0.1.6 for CVE-2014-2525. - * ext/psych/yaml/config.h: ditto. - * ext/psych/yaml/scanner.c: ditto. - * ext/psych/yaml/yaml_private.h: ditto. +Wed Mar 9 16:20:25 2016 Koichi Sasada <ko1@atdot.net> -Thu Mar 27 18:58:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * benchmark/driver.rb: support memory usage benchmark. + use `--measure-target=[target]'. + Now, we can use the following targets: + * real (default): real time which returns process time in sec. + * peak: peak memory usage (physical memory) in bytes. + * size: last memory usage (physical memory) in bytes. - * re.c (match_regexp): set regexp for MatchData from string. + * benchmark/memory_wrapper.rb: ditto. - * re.c (rb_backref_set_string): create MatchData from string and - set backref. +Wed Mar 9 15:04:22 2016 Koichi Sasada <ko1@atdot.net> - * string.c (rb_pat_search, rb_str_sub, rb_str_sub_bang, str_gsub), - (scan_once, rb_str_scan, rb_str_partition): use rb_str_index - instead of rb_reg_search() when pattern is a String. based on - the patch by Sam Rawlins <sam.rawlins@gmail.com> [Fixes GH-579] + * benchmark/bm_vm3_gc_old_full.rb: add GC.start benchmark. -Thu Mar 27 11:58:55 2014 NARUSE, Yui <naruse@ruby-lang.org> + * benchmark/bm_vm3_gc_old_immediate.rb: ditto. - * addr2line.c (fill_lines): check shdr[i].sh_type because even if - .symtab section exists, the section's type can be SHT_NOBITS and - actual data doesn't exist in the file. - revert r45441. + * benchmark/bm_vm3_gc_old_lazy.rb: ditto. -Wed Mar 26 14:57:35 2014 NAKAMURA Usaku <usa@ruby-lang.org> +Wed Mar 9 14:59:11 2016 Koichi Sasada <ko1@atdot.net> - * parse.y: inline must be static (for mswin). - fixed build error introduced at r45426. + * benchmark/driver.rb: exit benchmarking if a benchmark process + receives signals. -Wed Mar 26 14:33:00 2014 Narihiro Nakamura <authornari@gmail.com> +Wed Mar 9 13:22:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * internal.h (USE_SYMBOL_GC): enable Symbol GC by default (USE_SYMBOL_GC == 1). + * test/lib/memory_status.rb: make Memory::Status independent of + MiniTest::Skip. -Tue Mar 25 22:57:11 2014 Narihiro Nakamura <authornari@gmail.com> + * test/lib/test/unit/assertions.rb (assert_no_memory_leak): skip + if Memory::Status is not available. - * parse.y: support Symbol GC. [ruby-trunk Feature #9634] - See this ticket about Symbol GC. +Wed Mar 9 09:19:55 2016 Rei Odaira <Rei.Odaira@gmail.com> - * include/ruby/ruby.h: - Declare few functions. - * rb_sym2id: almost same as old SYM2ID but support dynamic symbols. - * rb_id2sym: almost same as old ID2SYM but support dynamic symbols. - * rb_sym2str: almost same as `rb_id2str(SYM2ID(sym))` but not - pin down a dynamic symbol. - Declare a new struct. - * struct RSymbol: represents a dynamic symbol as object in - Ruby's heaps. - Add few macros. - * STATIC_SYM_P: check a static symbol. - * DYNAMIC_SYM_P: check a dynamic symbol. - * RSYMBOL: cast to RSymbol + * test/io/wait/test_io_wait.rb (test_wait_readwrite_timeout): + select(2) in AIX returns "readable" for the write-side fd + of a pipe, so it is not possible to use a pipe to test + the read-write timeout of IO#wait on AIX. - * gc.c: declare RSymbol. support T_SYMBOL. +Wed Mar 9 03:35:22 2016 Charles Oliver Nutter <headius@headius.com> - * internal.h: Declare few functions. - * rb_gc_free_dsymbol: free up a dynamic symbol. GC call this - function at a sweep phase. - * rb_str_dynamic_intern: convert a string to a dynamic symbol. - * rb_check_id_without_pindown: not pinning function. - * rb_sym2id_without_pindown: ditto. - * rb_check_id_cstr_without_pindown: ditto. + * test/ruby/test_require.rb (test_require_with_loaded_features_pop): + Only remove PATH so threads don't accidentally double-pop. - * string.c (Init_String): String#intern and String#to_sym use - rb_str_dynamic_intern. +Wed Mar 9 00:29:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * template/id.h.tmpl: use LSB of ID as a flag for determining a - static symbol, so we shift left other ruby_id_types. + * vm_method.c (rb_alias): the original name should be properly + available method_added method, set the name before calling the + hook. - * string.c: use rb_sym2str instead `rb_id2str(SYM2ID(sym))` to - avoid pinning. +Wed Mar 9 00:07:03 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * load.c: use xx_without_pindown function at creating temporary ID - to avoid pinning. + * lib/logger.rb (Logger::LogDevice#initialize): define using + keyword arguments. - * object.c: ditto. +Tue Mar 8 23:37:07 2016 Charles Oliver Nutter <headius@headius.com> - * sprintf.c: ditto. + * test/ruby/test_array.rb: split out the test for no stack error + on large input for test_permutation, test_repeated_permutation, + and test_repeated_combination, and make them all timeout:30. - * struct.c: ditto. +Tue Mar 8 17:20:21 2016 NARUSE, Yui <naruse@ruby-lang.org> - * thread.c: ditto. + * intern.h (rb_divmod): assume compilers `/` and `%` comply C99 + and reduce branching. If a compiler doesn't comply, add #ifdefs. - * variable.c: ditto. + * intern.h (rb_div): added for Ruby's behavior. - * vm_method.c: ditto. + * intern.h (rb_mod): added for Ruby's behavior. -Wed Mar 26 13:25:54 2014 NARUSE, Yui <naruse@ruby-lang.org> + * insns.def (opt_div): use rb_div. - * addr2line.c (fill_lines): loop reverse order not to overwrite - the basis of base addresses comparison. + * insns.def (opt_mod): use rb_mod. - * addr2line.c: use uintptr_t instead of intptr_t for pointers. + * numeric.c (fixdivmod): removed. - * addr2line.c (rb_dump_backtrace_with_lines): don't use syms. + * numeric.c (fix_divide): use rb_div. - * vm_dump.c (rb_print_backtrace): ditto. + * numeric.c (fix_mod): use rb_mod. - * addr2line.h: ditto. + * numeric.c (fix_divmod): use rb_divmod. -Wed Mar 26 11:20:50 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Mar 8 17:53:09 2016 NARUSE, Yui <naruse@ruby-lang.org> - * marshal.c (w_object): internal objects are not dumpable. - [ruby-core:61677] [Bug #9674] + * insns.def (opt_mod): show its method name on ZeroDivisionError. + [Bug #12158] - * ext/thread/thread.c (undumpable): ConditionVariable and Queue - are not dumpable. [ruby-core:61677] [Bug #9674] +Tue Mar 8 17:33:38 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Wed Mar 26 10:36:39 2014 NARUSE, Yui <naruse@ruby-lang.org> + * win32/win32.c (rb_w32_write_console): now no need to check + ERROR_CALL_NOT_IMPLEMENTED because it is for old Win9X. - * addr2line.c (follow_debuglink): show message if it closes opened - (and maybe used) elf binary. +Tue Mar 8 16:54:29 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Wed Mar 26 10:34:25 2014 NARUSE, Yui <naruse@ruby-lang.org> + * win32/win32.c (rb_w32_write_console): stop the VT100 emulation if the + console supports it natively. - * addr2line.c (fill_line): pass and use offset instead of - curobj_baseaddr. +Tue Mar 8 08:13:01 2016 Rei Odaira <Rei.Odaira@gmail.com> -Wed Mar 26 09:07:48 2014 Yutaka Kanemoto <kanemoto@ruby-lang.org> + * test/net/imap/test_imap.rb (test_idle_timeout): Because of the + timeout specified in "imap.idle(0.2)", there is no guarantee that + the server thread has done all the work before the client thread + performs the assertions. It depends on the thread scheduling. + Add checks to avoid false positives (on AIX, particularly). - * configure.in: add --disable-pie. [Feature #9673] +Tue Mar 8 00:42:22 2016 NAKAMURA Usaku <usa@ruby-lang.org> -Wed Mar 26 08:47:04 2014 NARUSE, Yui <naruse@ruby-lang.org> + * ruby.c (warn_cr_in_shebang): meaningless check on DOSISH platforms. + fixed a test failure introduced at r53998. - * addr2line.c (fill_lines): don't run fill_lines multiple times. +Tue Mar 8 00:27:53 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> -Wed Mar 26 08:45:00 2014 Sam Rawlins <sam.rawlins@gmail.com> + * ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo. + [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda. - * internal.h: add prototype for rb_reg_search0 - * re.c: rename rb_reg_search to rb_reg_search0, add set_backref_str - argument to allow callers to indicate that they don't require the - backref string to be allocated. +Tue Mar 8 00:25:08 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> - * string.c: don't allocate backref str if replacement string is provided + * ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo. + [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda. - [GH-578] [Bug #9676] [ruby-core:61682] -Wed Mar 26 08:29:43 2014 mo khan <mo@mokhan.ca> +Tue Mar 8 00:21:58 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> - * lib/rubygems.rb: fix spelling of Jim Weirich. [Fixes GH-577] + * ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo. + [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda. -Wed Mar 26 01:55:45 2014 NARUSE, Yui <naruse@ruby-lang.org> - * addr2line.c (rb_dump_backtrace_with_lines): a function to get must - be a function in the main executable, whose absolute path is not - available by dladdr, and ruby get it by /proc/self/exe on Linux. +Tue Mar 8 00:11:47 2016 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> -Wed Mar 26 01:34:50 2014 NARUSE, Yui <naruse@ruby-lang.org> + * ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505] + [Bug #11886] The patch provided by Akira Matsuda. - * addr2line.c (fill_lines): skip if path is NULL. + * ext/tk/sample/*.rb: ditto. -Tue Mar 25 23:57:17 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Mar 7 13:32:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (parser_yylex): only a newline after label should be - significant. [ruby-core:61658] [Bug #9669] + * class.c (rb_define_class, rb_define_class_id_under): raise + ArgumentError if super is 0, deprecated behavior which has been + warned long time. -Tue Mar 25 23:32:25 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> +Mon Mar 7 13:28:30 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/pathname/lib/pathname.rb (Pathname#join): remove unnecessary - unshift. + * internal.h: move function declarations for class internals from + include/ruby/intern.h. - * test/pathname/test_pathname.rb (TestPathname#test_join): add tests. +Mon Mar 7 10:58:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Mar 25 16:47:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/win32ole/win32ole_event.c (rescue_callback): use + rb_write_error_str instead of rb_write_error, to respect + the encoding and prevent the message from GC. - * parse.y (lex_state_e, parser_params, f_arglist, parser_yylex): - separate EXPR_LABELARG from EXPR_BEG and let newline significant, - so that required keyword argument can place at the end of - argument list without parentheses. [ruby-core:61658] [Bug #9669] + * internal.h (rb_write_error_str): export. -Mon Mar 24 22:19:56 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Mar 7 01:38:41 2016 Rei Odaira <Rei.Odaira@gmail.com> - * parse.y (ripper_initialize): filename can not be modified. + * test/ruby/test_process.rb (test_execopts_gid): Skip a test + that is known to fail on AIX. AIX allows setgid to + a supplementary group, but Ruby does not allow the "-e" + option when setgid'ed, so the test does not work as intended. -Mon Mar 24 15:19:47 2014 NARUSE, Yui <naruse@ruby-lang.org> +Sun Mar 6 22:43:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * addr2line.c (rb_dump_backtrace_with_lines): fetch path of the - executable from /proc/self/exe on Linux. + * io.c (rb_obj_display): [DOC] fix output of Array, as Array#to_s + is same as Array#inspect since 1.9. -Mon Mar 24 14:14:37 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Sat Mar 5 09:50:58 2016 Rei Odaira <Rei.Odaira@gmail.com> - * gc.c: Fix up default GC params by @csfrancis [fix GH-556] + * test/socket/test_addrinfo.rb (test_ipv6_address_predicates): + IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken + on AIX, so skip related tests. -Mon Mar 24 13:13:36 2014 NARUSE, Yui <naruse@ruby-lang.org> +Sat Mar 5 09:17:54 2016 Rei Odaira <Rei.Odaira@gmail.com> - * addr2line.c (parse_debug_line_cu): explicitly specify signed char - because DWARF's line_Base is signed char and char maybe unsigned. - patched by Rei Odaira. [ruby-dev:48068] [Bug #9654] - -Sun Mar 23 11:03:50 2014 Kohei Suzuki <eagletmt@gmail.com> - - * vm_method.c (rb_method_entry_get_without_cache): me->klass is 0 - for a method aliased in a module. [ruby-core:61636] [Bug #9663] - -Sun Mar 23 08:12:27 2014 Eric Wong <e@80x24.org> - - * st.c (hash_pos): use bitwise AND to avoid slow modulo op - (new_size): power-of-two sizes for hash_pos change - (st_numhash): adjust for common keys due to lack of prime modulo - [Feature #9425] - * hash.c (rb_any_hash): right shift for symbols - * benchmark/bm_hash_aref_miss.rb: added to show improvement - * benchmark/bm_hash_aref_sym_long.rb: ditto - * benchmark/bm_hash_aref_str.rb: ditto - * benchmark/bm_hash_aref_sym.rb: ditto - * benchmark/bm_hash_ident_num.rb: added to prevent regression - * benchmark/bm_hash_ident_obj.rb: ditto - * benchmark/bm_hash_ident_str.rb: ditto - * benchmark/bm_hash_ident_sym.rb: ditto - -Sat Mar 22 22:56:45 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * addr2line.c (fill_lines): compare the file names of object in which - symbols exist. [Bug #9654] [ruby-dev:48058] - -Sat Mar 22 06:46:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/cgi/util.rb (escape_html, unescape_html): make synonyms - aliases instead of wrapper methods. - - * lib/cgi/util.rb (escape_element, unescape_element): ditto. - [Fixes GH-573] - -Fri Mar 21 21:57:34 2014 Akinori MUSHA <knu@iDaemons.org> - - * configure.in: Fix a build problem with clang and --with-opt-dir. - If ruby is configured with --with-opt-dir=dir when using clang - as compiler, a warning `clang: warning: argument unused during - compilation: '-I dir'` is emitted almost every time clang - compiles a file. Unfortunately, RUBY_CHECK_PRINTF_PREFIX takes - any output from the compiler as fatal error, and the check thus - fails due to the warning. This is an attempt to fix the problem - by adding a flag -Qunused-arguments to CFLAGS locally in the - function to suppress the warning. [ruby-dev:48062] [Bug #9658] - [Fixes GH-571] https://github.com/ruby/ruby/pull/571 - -Fri Mar 21 16:31:56 2014 Zachary Scott <e@zzak.io> - - * gc.c: [DOC] Fix call-seq for GC.start by @jasonrclark [Fixes GH-572] - https://github.com/ruby/ruby/pull/572 - -Thu Mar 20 11:37:28 2014 James Edward Gray II <james@graysoftinc.com> - - * lib/csv.rb: Fixed a broken regular expression that was causing - CSV to miss escaping some special meaning characters when used - in parsing. - Reported by David Unric - [ruby-core:54986] [Bug #8405] - -Thu Mar 20 16:53:07 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (objspace_malloc_increase): should not invoke - garbage_collect_with_gvl() here on non-ruby threads. - - Should just ignore the malloc_increase. - - This issue is pointed by Eric Wong [ruby-core:61519]. - -Thu Mar 20 13:05:16 2014 Koichi Sasada <ko1@atdot.net> - - * struct.c (rb_struct_alloc): use RARRAY_CONST_PTR() instead of - RARRAY_PTR(). - -Thu Mar 20 12:59:39 2014 Koichi Sasada <ko1@atdot.net> - - * include/ruby/intern.h (rb_obj_call_init, rb_class_new_instance): - constify a parameter (VALUE *). - I believe this incompatibility doesn't break any code. - However, if you have trouble, please tell us. - - * eval.c, object.c: ditto. - -Thu Mar 20 12:31:26 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_method.c (rb_method_entry_get_without_cache): get rid of - infinite recursion at aliases in a subclass and a superclass. - return actually defined class for other than singleton class. - [ruby-core:60431] [Bug #9475] - -Wed Mar 19 17:13:06 2014 Eric Wong <e@80x24.org> - - * time.c (time_mload): freeze and preserve marshal-loaded time zone - * test/ruby/test_time.rb: add test for GC on loaded object - [Bug #9652] - -Tue Mar 18 23:20:12 2014 Shota Fukumori <her@sorah.jp> - - * vm_eval.c (eval_string_with_cref): Unify to use NIL_P. - -Tue Mar 18 22:03:41 2014 Shota Fukumori <her@sorah.jp> - - * vm_eval.c (eval_string_with_cref): Use file path even if scope is - given. Related to [ruby-core:56099] [Bug #8662] and r42103. - -Mon Mar 17 13:17:47 2014 Koichi Sasada <ko1@atdot.net> - - * enumerator.c (enumerator_block_call): use RARRAY_CONST_PTR() - instead of RARRAY_PTR(). - - * io.c (rb_io_s_popen): ditto. - - * numeric.c (num_step_size): ditto. - - * vm_eval.c (rb_apply): ditto. - - * vm_eval.c (rb_eval_cmd): ditto. - -Mon Mar 17 10:11:59 2014 Eric Wong <e@80x24.org> - - * variable.c (rb_const_set): delete existing entry on redefinition - [Bug #9645] - * test/ruby/test_const.rb (test_redefinition): test for leak - -Sun Mar 16 21:33:01 2014 Zachary Scott <e@zzak.io> - - * lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521] - Based on patch by @stomar - -Sun Mar 16 13:21:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (DLDFLAGS): insert a space between option and its - argument for non-GCC compilers. [ruby-core:61429] [Bug #9624] - -Sun Mar 16 08:05:06 2014 Eric Wong <e@80x24.org> - - * gc.c (objspace_xcalloc): fix GC accounting - -Sun Mar 16 06:33:35 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * addr2line.c (fill_lines): return address is just after calling - address. Therefore noreturn function with tail call's return - address may be in another function. - -Sun Mar 16 05:51:55 2014 Zachary Scott <e@zzak.io> - - * lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543] - -Sat Mar 15 18:54:03 2014 Kazuki Tsujimoto <kazuki@callcc.net> - - * ext/.document: remove refinement from documentable directories. - -Sat Mar 15 11:02:58 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * configure.in (DLDFLAGS): check for each options to control - symbol resolution. [ruby-core:61429] [Bug #9624] - -Sat Mar 15 07:02:35 2014 Eric Wong <e@80x24.org> - - * st.c (st_update): remove unnecessary assignment - -Fri Mar 14 14:58:38 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * addr2line.c (fill_lines): fetch symbol names from ELF binary's - symbol table if it is built with cc -g and not stripped. - Now ruby can show static symbols on Linux though glibc's - backtrace_symbols(3) don't show them. - - * addr2line.c (rb_dump_backtrace_with_lines): use dladdr(3) to - detect what object file declares the symbol because - dl_iterate_phdr can't detect the main executable file - and codes on the stack. - NOTE: signal trampolines sometimes on the user stack. (FreeBSD) - - * addr2line.c (rb_dump_backtrace_with_lines): stop showing - backtrace if the function's name is main. - NOTE: FreeBSD's backtrace (libexecinfo) shows _start and - an additional address. Why it doesn't remove them on dladdr phase - is, dladdr may fail to detect the main function but detect - as _start function. Therefore it must be after scanning - the symbol table and getting correct name. - - -Fri Mar 14 12:07:46 2014 Zachary Scott <e@zzak.io> - - * doc/syntax/literals.rdoc: [DOC] Single quote strings allows escape - of backslash as well, patch by @idupree [Fixes GH-553] - https://github.com/ruby/ruby/pull/553 - -Fri Mar 14 01:18:24 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm.c (invoke_block_from_c): add splattable argument. - - * vm.c (vm_invoke_proc): disallow to splat when directly invoked. - - * vm_insnhelper.c (vm_callee_setup_arg_complex, vm_callee_setup_arg): - relax arity check of yielded lambda. [ruby-core:61340] [Bug #9605] - - * test/ruby/test_yield.rb (TestRubyYieldGen#emu_bind_params): no - longer raise ArgumentError when splatting to lambda. - -Thu Mar 13 23:51:02 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * ext/-test-/win32/dln/libdlntest.c (dlntest_ordinal): no need to - specify export in the source file because .def file do it. - get rid of warning on linking. - -Wed Mar 12 11:19:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * vm_insnhelper.c (vm_callee_setup_arg): disable fastpath if splat - argument, since argc may differ for each calls. - [ruby-core:61422] [Bug #9622] - - * vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an - inline function. - -Wed Mar 12 07:26:05 2014 Eric Wong <e@80x24.org> - - * insns.def (opt_regexpmatch2): respect redefined match op - Thanks to Sam Rawlins for the fix. - * test/ruby/test_string.rb: test based on Tsuyoshi Sawada's report - [Bug #9581] - -Tue Mar 11 22:31:25 2014 Kazuki Tsujimoto <kazuki@callcc.net> - - * ext/.document: add objspace/objspace_dump.c to document file. - -Tue Mar 11 22:22:38 2014 Kazuki Tsujimoto <kazuki@callcc.net> - - * test/objspace/test_objspace.rb (TestObjSpace#test_dump_uninitialized_file): - remove dependency on json library. - -Tue Mar 11 10:55:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * README.EXT{,.ja} (Appendix B): update contents of `ruby_options` - and replace `ruby_run` with `ruby_run_node`. based on the patch - by Kaneko Yuichiro at [ruby-dev:48030] [Bug #9619]. - -Tue Mar 11 06:54:00 2014 Scott Francis <scott.francis@shopify.com> - - * ext/objspace/objspace_dump.c: Check fptr before trying to dump RFILE - object fd. [GH-562] - - * test/objspace/test_objspace.rb: add test - -Tue Mar 11 02:04:36 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * vm_dump.c (rb_vm_bugreport): show vm maps on FreeBSD. - - * vm_dump.c (procstat_vm): copied from FreeBSD. - http://svnweb.freebsd.org/base/head/usr.bin/procstat/procstat_vm.c?revision=261780 - -Mon Mar 10 12:14:26 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * configure.in: always check dladdr(1). - - * addr2line.c (fill_lines): show the line number in C backtrace if - ruby is built without --enable-shared (PIE) on Linux. - patch is originally by Shinichiro Hamaji - https://twitter.com/shinh/status/441957774264504321 - NOTE: ld doesn't insert __executable_start for PIE. - dladdr(3)'s argument must be a function pointer. - -Mon Mar 10 10:51:17 2014 ksss <co000ri@gmail.com> - - * test/ruby/test_enumerator.rb (test_iterators): fix test for hash - iterators. [Fixes GH-558] - -Sun Mar 9 14:14:49 2014 Eric Wong <e@80x24.org> - - * class.c (rb_class_subclass_add): use xmalloc - * class.c (rb_module_add_to_subclasses_list): ditto - * class.c (rb_class_remove_from_super_subclasses): use xfree - * class.c (rb_class_remove_from_module_subclasses): ditto - [Bug #9616] - -Sun Mar 9 13:51:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/fiddle/function.c (function_call): fix memory leak when an - exception occurs at argument conversion or the function call. - -Sun Mar 9 06:42:40 2014 Eric Wong <e@80x24.org> - - * variable.c (struct global_variable): shrink by 8 bytes on 64-bit - -Sat Mar 8 17:42:51 2014 Eric Wong <e@80x24.org> - - * vm.c (add_opt_method): cleanup to use rb_method_entry_at - -Sat Mar 8 13:46:40 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free), - ext/fiddle/handle.c (fiddle_handle_free), - ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak. - based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599]. - -Sat Mar 8 13:30:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * process.c (obj2uid, obj2gid): now getpwnam_r() and getgrnam_r() - may need larger buffers than sysconf values, so retry with - expanding the buffer when ERANGE is returned. - [ruby-core:61325] [Bug #9600] - -Fri Mar 7 19:29:13 2014 Eric Wong <e@80x24.org> - - * vm_eval.c (vm_call0_body): use RARRAY_CONST_PTR - (check_funcall_exec): ditto - [ruby-core:61360] - -Fri Mar 7 19:14:11 2014 Eric Wong <e@80x24.org> - - * vm_eval.c (vm_call0_body): fix RB_GC_GUARD location - (check_funcall_exec): ditto - [Bug #9609] - -Fri Mar 7 14:48:17 2014 Narihiro Nakamura <authornari@gmail.com> - - * parse.y (ENC_SINGLE): Unused macro removed. - -Fri Mar 7 12:06:19 2014 Martin Bosslet <Martin.Bosslet@gmail.com> - - * test/openssl/test_ssl.rb: Reuse TLS default options from - OpenSSL::SSL::SSLContext::DEFAULT_PARAMS. - -Thu Mar 6 15:15:24 2014 Zachary Scott <e@zzak.io> - - * doc/syntax/assignment.rdoc: [DOC] Fix assignment directions - By @idupree [Fixes GH-555] https://github.com/ruby/ruby/pull/555 - -Thu Mar 6 15:07:18 2014 Zachary Scott <e@zzak.io> - - * doc/syntax/methods.rdoc: [DOC] Fix example for block arguments - By @idupree [Fixes GH-554] https://github.com/ruby/ruby/pull/554 - -Thu Mar 6 10:33:31 2014 Martin Bosslet <Martin.Bosslet@gmail.com> - - * lib/openssl/ssl.rb: Explicitly whitelist the default - SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable - compression by default. - Reported by Jeff Hodges. - [ruby-core:59829] [Bug #9424] - -Wed Mar 5 15:56:18 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * parse.y (f_arg_asgn): define optional arguments as argument - variables in the rhs default expressions. - [ruby-core:61299] [Bug #9593] - -Wed Mar 5 11:58:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/openssl/ossl.c (ossl_make_error): check NULL for unknown - error reasons with old OpenSSL, and insert a colon iff formatted - message is not empty. - -Wed Mar 5 00:42:00 2014 Kazuki Tsujimoto <kazuki@callcc.net> - - * ext/pathname/lib/pathname.rb (Pathname#find): add "ignore_error" - keyword argument defaulted to true as well as Find#find. - -Tue Mar 4 23:00:18 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/ruby/test_eval.rb (TestEval#make_test_binding): renamed. - it's not test method. - -Tue Mar 4 20:50:59 2014 Masaya Tarui <tarui@ruby-lang.org> - - * st.c (st_foreach): fix type of hash. not st_data_t but st_index_t. - -Tue Mar 4 19:41:40 2014 Tanaka Akira <akr@fsij.org> - - * Makefile.in: ".DEFAULT" target removed because it is not for - specifying default target. - -Tue Mar 4 00:25:35 2014 Kazuki Tsujimoto <kazuki@callcc.net> - - * lib/find.rb (Find#find): should pass ignore_error option to enumerators. - -Mon Mar 3 13:27:35 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/test_find.rb (TestFind#test_unsearchable_dir): ruby cannot make - directory unreachable by owner on Windows. - -Mon Mar 3 08:10:04 2014 Eric Wong <e@80x24.org> - - * vm_method.c (rb_method_entry_get_without_cache): disable GMC - writing if GMC is disabled. - [ruby-core:61218] - -Mon Mar 3 07:47:17 2014 Eric Wong <e@80x24.org> - - * README.EXT: wrap GetDBM with do/while(0) - * README.EXT.ja: ditto - * ext/dbm/dbm.c: ditto, likewise for GetDBM2 - * ext/gdbm/gdbm.c: ditto - * ext/sdbm/init.c: ditto - [ruby-core:61217] - -Mon Mar 3 07:17:31 2014 Zachary Scott <e@zzak.io> - - * NEWS: [DOC] Update doc regarding filesystem load when flushing IO - -Mon Mar 3 04:37:50 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * io.c (rb_io_fsync): need to fsync even if on Windows. fixed mistake - of r45254 and r45256. - -Mon Mar 3 04:21:34 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/win32ole: get rid of warnings (unused variable). - -Mon Mar 3 02:53:53 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * io.c (rb_io_flush_raw): [EXPERIMENTAL] remove force syncing for Win32 - to speed up IO. this may break some tests, and they'll be fixed - later. - [ruby-core:58570] [Bug #9153] - -Mon Mar 3 00:17:43 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * test/ruby/test_backtrace.rb: get rid of warnings. unused variable, - shadowing. - -Sun Mar 2 11:15:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/find.rb (Find#find): add "ignore_error" keyword argument - defaulted to true. [ruby-core:51025] [Feature #7596] - -Sun Mar 2 11:13:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/readline/extconf.rb (rl_hook_func_t): define as Function for - very old readline versions. [ruby-core:61209] [Bug #9578] - -Sun Mar 2 10:47:58 2014 Eric Wong <e@80x24.org> - - * load.c (ruby_init_ext): make idempotent to suppress warnings - -Sat Mar 1 19:51:42 2014 Tanaka Akira <akr@fsij.org> - - * lib/open3.rb (Open3.capture3): Ignore Errno::EPIPE for writing - stdin_data. - (Open3.capture2): Ditto. - (Open3.capture2e): Ditto. - -Sat Mar 1 19:06:47 2014 Eric Wong <e@80x24.org> - - * gc.c (ruby_gc_set_params): simplify condition - -Sat Mar 1 16:18:40 2014 Tanaka Akira <akr@fsij.org> - - * ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead - of Function to support readline-6.3. (rl_hook_func_t is available - since readline-4.2.) - Reported by Dmitry Medvinsky. [ruby-core:61141] [Bug #9578] - -Sat Mar 1 16:05:58 2014 Eric Wong <e@80x24.org> - - * gc.c (ruby_gc_set_params): fix building without RGenGC - -Sat Mar 1 11:08:00 2014 Aaron Patterson <aaron@tenderlovemaking.com> - - * ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding - objects. - - * ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding - objects. - - * test/psych/test_encoding.rb: add test - - * ext/psych/lib/psych.rb: add version - -Sat Mar 1 10:52:34 2014 Zachary Scott <e@zzak.io> - - * README.EXT.ja: [DOC] Fix typo "macro macro" @utenmiki [Fixes GH-551] - https://github.com/ruby/ruby/pull/551 - -Fri Feb 28 11:16:55 2014 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - - * numeric.c: Fix Numeric#step with 0 unit [Bug #9575] - -Thu Feb 27 17:59:01 2014 Zachary Scott <e@zzak.io> - - * lib/optparse.rb: [DOC] Add example of generating help with optparse. - Patch by @joelmccracken documenting-ruby/ruby#19 - https://github.com/documenting-ruby/ruby/pull/19 - -Thu Feb 27 12:10:09 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * numeric.c (ruby_num_interval_step_size): check signs and get rid - of implementation dependent behavior of negative division. - [ruby-core:61106] [Bug #9570] - -Thu Feb 27 03:55:45 2014 Zachary Scott <e@zzak.io> - - * thread.c: [DOC] Typo in comment for _FORTIFY_SOURCE [Fixes GH-548] - Patch by @qnet-herwin https://github.com/ruby/ruby/pull/548 - -Wed Feb 26 18:43:43 2014 Koichi Sasada <ko1@atdot.net> - - * gc.c (heap_pages_free_unused_pages): check tomb page availability - at first. - And return immediately if we don't touch sorted list any more. - -Wed Feb 26 14:10:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * eval.c (setup_exception): preserve exception class name encoding - in debug mode messages. - - * eval.c (setup_exception): preserve errinfo across calling #to_s - method on the exception. [ruby-core:61091] [Bug #9568] - -Wed Feb 26 01:29:27 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * string.c (sym_find): Add Symbol.find(str), which returns whether given - string is defined as symbol or not. [Feature #7854] - -Tue Feb 25 22:52:02 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - - * ext/dl/dl.c (rb_dl_realloc): use NUM2SIZET instead of NUM2INT. - - * ext/fiddle/fiddle.c (rb_fiddle_realloc): ditto. - -Tue Feb 25 22:49:30 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - - * ext/dl/dl.c (rb_dl_malloc): use NUM2SIZET instead of NUM2INT. - Coverity Scan found this bug. - - * ext/fiddle/fiddle.c (rb_fiddle_malloc): ditto. - -Tue Feb 25 12:06:13 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * win32/Makefile.sub: define PACKED_STRUCT. - -Mon Feb 24 21:41:56 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * README.md, README.ja.md: removed (wrong) mode setting for emacs. - -Mon Feb 24 20:05:41 2014 Eric Wong <e@80x24.org> - - * configure.in: define PACKED_STRUCT_UNALIGNED for x86* - * timev.h (struct vtm): use PACKED_STRUCT_UNALIGNED - * time.c (struct time_object): ditto - [Bug #9558] non-x86 cannot safely access unaligned addresses - -Mon Feb 24 18:10:02 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/fiddle/test_function.rb: remove unused variables. - * test/fileutils/test_fileutils.rb: ditto. - * test/io/console/test_io_console.rb: ditto. - -Mon Feb 24 12:37:51 2014 Eric Wong <e@80x24.org> - - * configure.in: use -Wno-packed-bitfield-compat for GCC 4.4+ - use __attribute__((packed)) if available - * timev.h: shrink and pack struct vtm - * time.c: pack struct time_object and adjust/introduce helpers - [ruby-core:60794] - -Sun Feb 23 17:55:50 2014 Kouhei Sutou <kou@cozmixng.org> - - * lib/rexml/xmltokens.rb: Add missing non ASCII valid characters - to element name characters. Now, REXML name tokens exactly - match "[5] Name" in the XML spec and "[4] NCName" in the - Namespaces in XML spec. See comment about the details. - [Bug #9539] [ruby-core:60901] - Reported by Mario Barcala. Thanks!!! - - * test/rexml/xpath/test_node.rb: Add tests for the above case. - -Sun Feb 23 12:18:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * ext/socket/raddrinfo.c (inet_pton): use rb_w32_inet_pton, instead of - inet_pton directly, which is unavailable on older version Windows. - - * include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a - wrapper function for inet_pton minimum supported client is - Vista, as well as inet_ntop. - -Sun Feb 23 11:33:25 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> - - * test/net/imap/test_imap.rb: remove unused variables. - * test/net/imap/test_imap_response_parser.rb: ditto. - * test/net/pop/test_pop.rb: ditto. - -Sun Feb 23 02:19:51 2014 Tanaka Akira <akr@fsij.org> - - * lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which - security.mac.portacl.port_high is changed. - See mac_portacl(4) for details. - Reported by Jakub Szafranski. [ruby-core:60917] [Bug #9544] - -Sat Feb 22 23:17:01 2014 Kouhei Sutou <kou@cozmixng.org> - - * lib/rexml/xpath_parser.rb: Fix indent. - -Sat Feb 22 23:15:35 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/xpath/test_attribute.rb: Simplify. - -Sat Feb 22 20:28:47 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * tool/redmine-backporter.rb: more friendly. - -Sat Feb 22 20:24:43 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/test_xpath*.rb: Move to ... - * test/rexml/xpath/*.rb: ... here. - -Sat Feb 22 20:04:41 2014 Kouhei Sutou <kou@cozmixng.org> - - * test/rexml/listener.rb: Untabify. - -Sat Feb 22 19:07:31 2014 NAKAMURA Usaku <usa@ruby-lang.org> - - * ext/io/console/console.c (console_dev): need read access for conout$ - because some functions need it. [Bug#9554] - -Sat Feb 22 18:40:58 2014 Eric Wong <e@80x24.org> - - * .gitignore: ignore benchmark files - -Sat Feb 22 01:22:24 2014 Yusuke Endoh <mame@tsg.ne.jp> - - * bignum.c (bary_mul_precheck): fix a copy-paste error. - Coverity Scan found this bug. - -Sat Feb 22 00:58:51 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> - - * ext/socket/raddrinfo.c (rb_getaddrinfo): second argument of - MEMZERO is type. Coverity Scan found this bug. - -Fri Feb 21 23:47:24 2014 Shugo Maeda <shugo@ruby-lang.org> - - * ext/socket/init.c (wait_connectable): break if the socket is - writable to avoid infinite loops on FreeBSD and other platforms - which conforms to SUSv3. This problem cannot be reproduced with - loopback interfaces, so it's hard to write test code. - rsock_connect() and wait_connectable() are overly complicated, so - they should be refactored, but I commit this fix as a workaround - for the release of Ruby 1.9.3 scheduled on Feb 24. - [ruby-core:60940] [Bug #9547] - -Fri Feb 21 23:03:39 2014 NARUSE, Yui <naruse@ruby-lang.org> - - * tool/redmine-backporter.rb: added to handle redmine tickets. - -Fri Feb 21 20:42:01 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * class.c (rb_mod_init_copy): do nothing if copying self. - [ruby-dev:47989] [Bug #9535] - - * hash.c (rb_hash_initialize_copy): ditto. - -Fri Feb 21 16:45:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * lib/logger.rb (next_rotate_time, previous_period_end): consider - DST change. - - * lib/logger.rb (Logger::LogDevice#check_shift_log): compare the - current time with the time for the next rotation to fix rotation - miss when date changed between the comparison and log writing. - based on the patch by megayu <yuhg2310 AT gmail.com>. - [Fixes GH-539] + * test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast): + The fifth argument to getsockopt(2) should be modified to + indicate the actual size of the value on return, + but not in AIX. This is a know bug. Skip related tests. + * test/rinda/test_rinda.rb (test_ring_server_ipv4_multicast): + ditto. + * test/rinda/test_rinda.rb (test_make_socket_unicast): ditto. + * test/socket/test_basicsocket.rb (test_getsockopt): ditto. + * test/socket/test_sockopt.rb (test_bool): ditto. -Fri Feb 21 10:39:33 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Sat Mar 5 07:36:27 2016 Rei Odaira <Rei.Odaira@gmail.com> - * test/monitor/test_monitor.rb: remove unused variables. - * test/resolv/test_dns.rb: ditto. - * test/rexml/test_functions.rb: ditto. - * test/rss/test_setup_maker_itunes.rb: ditto. + * test/-ext-/float/test_nextafter.rb: In AIX, + nextafter(+0.0,-0.0)=+0.0, and nextafter(-0.0,+0.0)=-0.0, + but they should return -0.0 and +0.0, respectively. This is + a known bug in nextafter(3) on AIX, so skip related tests. -Fri Feb 21 09:48:56 2014 Eric Wong <e@80x24.org> +Sat Mar 5 07:14:10 2016 Rei Odaira <Rei.Odaira@gmail.com> - * ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error - (bsock_recvmsg_internal): ditto - * test/socket/test_unix.rb: test above for infinite loop + * test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine): + Skip two tests on AIX because zconf.h in zlib does not correctly + recognize _LARGE_FILES in AIX. The problem was already reported + to zlib, and skip these tests until it is fixed. -Fri Feb 21 08:27:19 2014 Eric Wong <e@80x24.org> +Sat Mar 5 03:07:40 2016 Rei Odaira <Rei.Odaira@gmail.com> - * include/ruby/ruby.h (RB_GC_GUARD): - use rb_gc_guarded_ptr_val on non-GCC/MSC - * gc.c (rb_gc_guarded_ptr_val): rename and adjust argument. - RB_GC_GUARD should be robust enough for any compiler. - [ruby-core:60816] [Bug #7805] + * thread_pthread.c (getstack): __pi_stacksize returned by + pthread_getthrds_np() is wrong on AIX. Use + __pi_stackend - __pi_stackaddr instead. -Thu Feb 20 22:21:26 2014 Tanaka Akira <akr@fsij.org> +Fri Mar 4 19:19:42 2016 Koichi Sasada <ko1@atdot.net> - * ext/socket/raddrinfo.c (numeric_getaddrinfo): Use xcalloc. - Suggested by Eric Wong. - https://bugs.ruby-lang.org/issues/9525#note-14 + * gc.c: use 2 bits with unsigned int for rb_objspace::flags::mode + because it always returns 0 to 2 (non-negative value). -Thu Feb 20 11:21:13 2014 Masaki Matsushita <glass.saga@gmail.com> +Fri Mar 4 18:42:08 2016 Koichi Sasada <ko1@atdot.net> - * hash.c (rb_hash_flatten): fix behavior of flatten(-1). - [ruby-dev:47988] [Bug #9533] + * gc.c: rename "enum gc_stat" to "enum gc_mode" + because there is a same name (no related) function gc_stat(). - * test/ruby/test_array.rb: test for above. + Also gc_stat_* are renamed to gc_mode_*, + gc_stat_transition() to gc_mode_transition(), + rb_objspace::flags::stat is renamed to rb_objspace::flags::mode. -Wed Feb 19 18:57:02 2014 Tanaka Akira <akr@fsij.org> + Change rb_objspace::flags::mode from 2 bits to 3 bits because VC++ + returns negative enum value with 2 bits. - * ext/socket: Bypass getaddrinfo() if node and serv are numeric. - Reporeted by Naotoshi Seo. [ruby-core:60801] [Bug #9525] + * gc.c (gc_mode): add a macro to access rb_objspace::flags::mode + with verification code (verification is enabled only on + RGENGC_CHECK_MODE > 0). - * ext/socket/extconf.rb: Detect struct sockaddr_in6.sin6_len. + * gc.c (gc_mode_set): same macro for setter. - * ext/socket/sockport.h (SET_SIN6_LEN): New macro. - (INIT_SOCKADDR_IN6): Ditto. +Fri Mar 4 09:28:18 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/socket/rubysocket.h (struct rb_addrinfo): Add - allocated_by_malloc field. + * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.1. + Please see entries of 2.6.0 and 2.6.1 on + https://github.com/rubygems/rubygems/blob/master/History.txt + [fix GH-1270] Patch by @segiddins - * ext/socket/raddrinfo.c (numeric_getaddrinfo): New function. - (rb_getaddrinfo): Call numeric_getaddrinfo at first. - (rb_freeaddrinfo): Free struct addrinfo properly when it is - allocated by numeric_getaddrinfo. +Thu Mar 3 14:09:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Feb 19 18:31:48 2014 Tanaka Akira <akr@fsij.org> + * lib/ostruct.rb (modifiable?, new_ostruct_member!, table!): + rename methods for internal use with suffixes and make private, + [ruby-core:71069] [Bug #11587] - * ext/socket: Wrap struct addrinfo by struct rb_addrinfo. +Wed Mar 2 16:28:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Wed Feb 19 17:47:01 2014 Tanaka Akira <akr@fsij.org> + * vm_eval.c (method_missing): call by found method entry and get + rid of searching the same method entry twice. - * ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory. + * vm_eval.c (vm_call0_body): calling method_missing method is + method_missing(). -Wed Feb 19 11:39:41 2014 NARUSE, Yui <naruse@ruby-lang.org> +Wed Mar 2 15:13:33 2016 herwinw <herwin@quarantainenet.nl> - * configure.in: it must see rb_cv_broken_memmem not rb_cv_func_memmem. + * lib/xmlrpc.rb: Removed broken parser named XMLScanStreamParser. + It's not works with current Ruby version. + [fix GH-1271][ruby-core:59588][Bug #9369] + * lib/xmlrpc/config.rb: ditto. + * lib/xmlrpc/parser.rb: ditto. -Tue Feb 18 23:18:41 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Wed Mar 2 15:08:33 2016 herwinw <herwin@quarantainenet.nl> - * test/socket/test_socket.rb: unix socket is required by test case. + * lib/xmlrpc.rb: Removed broken parser named XMLTreeParser. + Required gem of its parser didn't compile on newer Ruby versions. + [fix GH-1271][ruby-core:59590][Bug #9370] + * lib/xmlrpc/config.rb: ditto. + * lib/xmlrpc/parser.rb: ditto. -Tue Feb 18 20:48:38 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Tue Mar 1 11:25:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/socket/test_addrinfo.rb: remove unused variables. - * test/socket/test_nonblock.rb: ditto. - * test/socket/test_socket.rb: ditto. - * test/socket/test_unix.rb: ditto. - * test/testunit/test_parallel.rb: ditto. - * test/webrick/test_filehandler.rb: ditto. - * test/xmlrpc/test_features.rb: ditto. - * test/zlib/test_zlib.rb: ditto. + * lib/fileutils.rb: use keyword arguments instead of option + hashes. -Tue Feb 18 14:27:18 2014 Shota Fukumori <her@sorah.jp> +Mon Feb 29 16:50:20 2016 hanachin <hanachin@gmail.com> - * lib/test/unit.rb: Requires minitest < 5.0.0 if Gem is available. + * array.c (rb_ary_push_m): [DOC] Remove trailing comma from + Array#push example, as other Array examples doesn't put trailing + comma. [Fix GH-1279] -Tue Feb 18 14:24:07 2014 Shota Fukumori <her@sorah.jp> +Mon Feb 29 16:31:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/test/unit/test-unit.gemspec: Add minitest < 5.0.0 dependency + * common.mk, tool/mkconfig.rb: set cross_compiling option from + Makefile, but not from rbconfig.rb, which is just going to be + created by this command. - * tool/rbinstall.rb: Add empty implementations for `add_dependency`, - `add_runtime_dependency`, `add_development_dependency` for - Gem::Specification. +Sun Feb 28 23:13:49 2016 C.J. Collier <cjcollier@linuxfoundation.org> -Tue Feb 18 12:06:39 2014 Tanaka Akira <akr@fsij.org> + * configure.in: Add summary to end of configure output. + [Fix GH-1275] - * configure.in (FILE_COUNT): Removed. (win32.c defines it in itself.) - (FILE_READPTR): Ditto. +Sun Feb 28 20:23:36 2016 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> -Tue Feb 18 09:35:44 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * lib/drb/drb.rb (error_print): Add verbose failure messages and + avoid infamous DRb::DRbConnError. [Feature #12101] - * test/test/psych/test_string.rb: remove unused variables. - * test/test/psych/test_yaml.rb: ditto. +Sun Feb 28 13:40:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Feb 17 21:31:31 2014 Koichi Sasada <ko1@atdot.net> + * error.c (nometh_err_initialize): add private_call? parameter. - * test/ruby/test_gc.rb: ignore warning messages for running with -w - option such as chkbuild. + * error.c (nometh_err_private_call_p): add private_call? method, + to tell if the exception raised in private form FCALL or VCALL. + [Feature #12043] -Mon Feb 17 20:00:27 2014 Tanaka Akira <akr@fsij.org> + * vm_eval.c (make_no_method_exception): append private_call? + argument. - * internal.h: Move BDIGIT and related definitions from - include/ruby/defines.h. + * vm_insnhelper.c (ci_missing_reason): copy FCALL flag. -Mon Feb 17 17:41:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Feb 28 10:19:47 2016 Ryan T. Hosford <tad.hosford@gmail.com> - * marshal.c (marshal_dump, marshal_load): do not recycle wrapper - objects, to prevent from segfault with continuation. - [ruby-dev:47970] [Bug #9523] + * array.c (rb_ary_and): clarify that set intersection returns the + unique elements common to both arrays. -Mon Feb 17 15:43:59 2014 Zachary Scott <e@zzak.io> + * array.c (rb_ary_or): clarify that union preserves the order from + the given arrays. - * doc/keywords.rdoc: [DOC] Add keywords doc by documenting-ruby/ruby#29 - https://github.com/documenting-ruby/ruby/pull/29 +Sat Feb 27 17:05:29 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Mon Feb 17 12:31:31 2014 Koichi Sasada <ko1@atdot.net> + * enc/unicode/case-folding.rb, casefold.h: Reducing size of TitleCase + table by eliminating duplicates. + (with Kimihito Matsui) - * gc.c (get_envparam_double): fix a warning message. +Fri Feb 26 14:40:48 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Feb 17 12:09:52 2014 Koichi Sasada <ko1@atdot.net> + * numeric.c (num_step_scan_args): comparison String with Numeric + should raise TypeError. it is an invalid type, but not a + mismatch the number of arguments. [ruby-core:62430] [Bug #9810] - * gc.c: introduce new environment variable - "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC - frequency. +Fri Feb 26 14:39:39 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - Do full GC when the number of old objects is more than R * N - where R is this factor and - N is the number of old objects just after last full GC. + * doc/extension.rdoc, doc/extension.ja.rdoc: add editor local + variables, with commenting out by :enddoc: directives which are + just ignored unless code object mode. [Bug #12111] - * test/ruby/test_gc.rb: add a test. +Fri Feb 26 12:25:56 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Mon Feb 17 11:28:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * doc/extension.ja.rdoc: removed rendering error caused by editor specific + configuration on http://docs.ruby-lang.org/en/trunk/extension_rdoc.html . + [Bug #12111][ruby-core:73990] - * test/test_pty.rb: ignore warnings to unused variables. +Fri Feb 26 11:21:41 2016 herwinw <herwin@quarantainenet.nl> -Mon Feb 17 11:27:36 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + * lib/xmlrpc.rb: Removed references to NQXML. It's obsoleted parser. + [fix GH-1245][ruby-core:59593][Feature #9371] + * lib/xmlrpc/config.rb: ditto. + * lib/xmlrpc/parser.rb: ditto. - * test/test_find.rb: remove unused variables. +Fri Feb 26 11:10:19 2016 Rick Salevsky <rsalevsky@suse.com> -Sun Feb 17 02:12:00 2014 Kenta Murata <mrkn@mrkn.jp> + * lib/tmpdir.rb: Unify to coding-style for method definition. + [fix GH-1252] - * ext/bigdecimal/bigdecimal.c (BigDecimal_initialize): Insert GC guard. +Fri Feb 26 11:02:04 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): ditto. + * README.md: update markdown syntax for anchor tag. + [fix GH-1265] Patch by @lukBarros -Sun Feb 16 15:53:36 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri Feb 26 10:52:29 2016 Alex Boyd <alex@opengroove.org> - * test/test_securerandom.rb: File.exists? is deprecated. use File.exist? + * lib/irb.rb: avoid to needless truncation when using back_trace_limit option. + [fix GH-1205][ruby-core:72773][Bug #11969] -Sun Feb 16 15:05:00 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Fri Feb 26 08:11:58 2016 Aaron Patterson <tenderlove@ruby-lang.org> - * test/pathname/test_pathname.rb: File.exists? is deprecated. use File.exist? + * gem_prelude.rb: Reduce system calls by activating the `did_you_mean` + gem before requiring the gem. Activating the gem puts the gem on + the load path, where simply requiring the file will search every gem + that's installed until it can find a gem that contains the + `did_you_mean` file. -Sun Feb 16 15:00:28 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> +Thu Feb 25 19:04:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * test/net/ftp/test_ftp.rb: remove unused variables. - * test/logger/test_logger.rb: ditto. + * enc/unicode/case-folding.rb: Adding possibility for debugging output + for TitleCase table in casefold.h. + (with Kimihito Matsui) -Sun Feb 16 14:52:46 2014 Eric Wong <e@80x24.org> +Wed Feb 24 22:31:13 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * dir.c (dir_s_glob): RB_GC_GUARD instead of volatile + * include/ruby/oniguruma.h: Rearranging flag assignments and making + space for titlecase indices; adding additional macros to add or + extract titlecase index; adding comments for better documentation. + * enc/unicode.c: Moving some macros to include/ruby/oniguruma.h; + activating use of titlecase indices. + (with Kimihito Matsui) -Sun Feb 16 14:33:52 2014 Tanaka Akira <akr@fsij.org> +Wed Feb 24 21:03:04 2016 Tanaka Akira <akr@fsij.org> - * include/ruby/ruby.h (RBIGNUM_SIGN): Defined for compatibility. - (RBIGNUM_POSITIVE_P): Ditto. - (RBIGNUM_NEGATIVE_P): Ditto. + * random.c (limited_rand): Add a specialized path for when the limit fits + in 32 bit. -Sun Feb 16 12:46:47 2014 Eric Wong <e@80x24.org> +Tue Feb 23 21:52:24 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * io.c (rb_f_backquote): trade volatile for manual recycle - rb_gc_force_recycle ensures object is visible until recycle + * enc/unicode/case-folding.rb, casefold.h: Outputting actual titlecase + data (new table, with indices from other tables). + * enc/unicode.c: Ignoring titlecase data indices for the moment. + (with Kimihito Matsui) -Sun Feb 16 11:55:14 2014 Eric Wong <e@80x24.org> +Tue Feb 23 15:21:14 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * marshal.c (marshal_dump): use rb_gc_force_recycle for GC-safety - (marshal_load): ditto - [ruby-core:60730] [Bug #7805] + * enc/unicode/case-folding.rb, casefold.h: Reading casing data from + SpecialCasing.txt. + (with Kimihito Matsui) -Sun Feb 16 08:11:23 2014 Zachary Scott <e@zzak.io> +Mon Feb 22 18:33:55 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * README.EXT.ja: [DOC] Fix typo by @utenmiki [Fixes GH-534] - https://github.com/ruby/ruby/pull/534 + * enc/unicode/case-folding.rb, casefold.h: Adding flag for title-case, + not yet operational. + (with Kimihito Matsui) -Sun Feb 16 07:48:20 2014 Tanaka Akira <akr@fsij.org> +Mon Feb 22 18:17:03 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/bigdecimal/bigdecimal.c (BIGNUM_ZERO_P): Unused macro removed. + * enc/unicode/case-folding.rb, casefold.h: Fixed bug that avoided inclusion + of compatibility characters in upper-/lower-case mappings. + (with Kimihito Matsui) -Sun Feb 16 06:12:23 2014 Tanaka Akira <akr@fsij.org> +Sun Feb 21 13:57:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * internal.h: Rename macro names: RBIGNUM_FOO to BIGNUM_FOO. - (BIGNUM_EMBED_LEN_NUMBITS): Renamed from RBIGNUM_EMBED_LEN_NUMBITS. - (BIGNUM_EMBED_LEN_MAX): Renamed from RBIGNUM_EMBED_LEN_MAX. - (BIGNUM_SIGN_BIT): Renamed from RBIGNUM_SIGN_BIT. - (BIGNUM_SIGN): Renamed from RBIGNUM_SIGN. - (BIGNUM_SET_SIGN): Renamed from RBIGNUM_SET_SIGN. - (BIGNUM_POSITIVE_P): Renamed from RBIGNUM_POSITIVE_P. - (BIGNUM_NEGATIVE_P): Renamed from RBIGNUM_NEGATIVE_P. - (BIGNUM_EMBED_FLAG): Renamed from RBIGNUM_EMBED_FLAG. - (BIGNUM_EMBED_LEN_MASK): Renamed from RBIGNUM_EMBED_LEN_MASK. - (BIGNUM_EMBED_LEN_SHIFT): Renamed from RBIGNUM_EMBED_LEN_SHIFT. - (BIGNUM_LEN): Renamed from RBIGNUM_LEN. - (RBIGNUM_DIGITS): Renamed from RBIGNUM_DIGITS. - (BIGNUM_LENINT): Renamed from RBIGNUM_LENINT. + * cgi/escape/escape.c: Optimize CGI.unescape performance by C ext + for ASCII-compatible encodings. [Fix GH-1250] - * bignum.c: Follow the above change. +Sun Feb 21 13:56:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * gc.c: Ditto. + * cgi/escape/escape.c: Optimize CGI.unescapeHTML performance by C + ext for ASCII-compatible encodings. [Fix GH-1242] - * marshal.c: Ditto. +Sat Feb 20 15:38:16 2016 Eric Wong <e@80x24.org> - * math.c: Ditto. + * doc/extension.rdoc: update paths for defs/ directory - * numeric.c: Ditto. +Sat Feb 20 14:44:15 2016 Lucas Buchala <lucasbuchala@gmail.com> - * random.c: Ditto. + * vm_eval.c (rb_mod_module_eval): [DOC] Fix documentation + signature for Module#module_eval. [Fix GH-1258] - * rational.c: Ditto. +Sat Feb 20 14:40:44 2016 Adam O'Connor <northband@gmail.com> - * sprintf.c: Ditto. + * README.md: a few grammatical changes to the main Ruby README.md. + [Fix GH-1259] - * ext/-test-/bignum/bigzero.c: Ditto. +Sat Feb 20 13:04:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/-test-/bignum/intpack.c: Ditto. + * dir.c (push_pattern, push_glob): deal with read paths as UTF-8 + to stat later, on Windows as well as OS X. + [ruby-core:73868] [Bug #12081] - * ext/bigdecimal/bigdecimal.c: Ditto. +Sat Feb 20 01:53:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Feb 15 20:48:49 2014 Tanaka Akira <akr@fsij.org> + * object.c (rb_mod_const_get): make error message at uninterned + string consistent with symbols. [ruby-dev:49498] [Bug #12089] - * configure.in (FILE_READEND): Don't detect it because it is not used. +Fri Feb 19 23:37:52 2016 Masahiro Tomita <tommy@tmtm.org> -Sat Feb 15 13:22:28 2014 Eric Wong <e@80x24.org> + * lib/find.rb (Find#find): raise with the given path name if it + does not exist. [ruby-dev:49497] [Bug #12087] - * probes_helper.h (RUBY_DTRACE_HOOK): correct type for _id +Fri Feb 19 12:44:57 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Feb 15 11:47:47 2014 Tanaka Akira <akr@fsij.org> + * enc/unicode.c: Activated use of case mapping data in CaseUnfold_11 array. + (with Kimihito Matsui) - * bignum.c (rb_big_cmp): Avoid bignum allocation for comparison - between bignum and fixnum. +Fri Feb 19 11:08:32 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Feb 15 10:55:12 2014 Hiroshi Shirosaki <h.shirosaki@gmail.com> + * ext/extmk.rb: add cygwin case, nothing excluded. + [ruby-core:73806] [Bug#12071] - * ext/-test-/win32/fd_setsize/depend: fix wrong dependencies. - [ruby-dev:47253] +Thu Feb 18 21:32:15 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Sat Feb 15 00:38:54 2014 Tanaka Akira <akr@fsij.org> + * man/irb.1: fix output in EXAMPLES. - * enum.c: Enumerable#{min,min_by,max,max_by} extended to take an - optional argument. - (nmin_cmp): New function. - (nmin_block_cmp): Ditto - (nmin_filter): Ditto. - (nmin_i): Ditto. - (nmin_run): Ditto. - (enum_min): Call nmin_run if the optional argument is given. - (nmin_max): Ditto. - (nmin_min_by): Ditto. - (nmin_max_by): Ditto. +Thu Feb 18 21:05:47 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * range.c: Range#{min,max} extended to take an optional argument. - (range_min): Call range_first if the optional argument is given. - (range_max): Call rb_call_super if the optional argument is given. + * string.c (sym_match_m): delegate to String#match but not + String#=~. [ruby-core:72864] [Bug #11991] - [ruby-core:57111] [Feature #8887] +Thu Feb 18 14:15:38 2016 Shota Fukumori <her@sorah.jp> -Sat Feb 15 00:27:46 2014 Tanaka Akira <akr@fsij.org> + * re.c: Add MatchData#named_captures + [Feature #11999] [ruby-core:72897] - * include/ruby/ruby.h, - internal.h, - ext/-test-/bignum/bigzero.c: Hide a Bignum definition. - [ruby-core:42891] [Feature #6083] + * test/ruby/test_regexp.rb(test_match_data_named_captures): Test for above. -Sat Feb 15 00:13:14 2014 Tanaka Akira <akr@fsij.org> + * NEWS: News about MatchData#named_captures. - * include/ruby/intern.h, - include/ruby/io.h, - include/ruby/ruby.h, - include/ruby/win32.h, - include/ruby/backward/rubysig.h, - bignum.c, - gc.c, - io.c, - process.c, - safe.c, - struct.c, - thread.c, - ext/socket/rubysocket.h, - ext/-test-/old_thread_select: Remove deprecated definitions - [ruby-core:60581] [Feature #9502] +Wed Feb 17 21:41:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Fri Feb 14 18:38:46 2014 Eric Wong <e@80x24.org> + * defs/id.def (predefined): add idLASTLINE and idBACKREF for $_ + and $~ respectively. - * string.c (rb_str_format_m): trade volatile for RB_GC_GUARD - RB_GC_GUARD meaning is clear and has better code generation. - [ruby-core:60688] + * parse.y: use idLASTLINE and idBACKREF instead of rb_intern. -Thu Feb 13 23:30:30 2014 Shugo Maeda <shugo@ruby-lang.org> +Wed Feb 17 20:23:38 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm_insnhelper.c (vm_call_method): should check ci->me->flag of - a refining method in case the method is private. - [ruby-core:60111] [Bug #9452] + * string.c (rb_str_init): fix segfault and memory leak, consider + wide char encoding terminator. - * vm_method.c (make_method_entry_refined): set me->flag of a refined - method entry to NOEX_PUBLIC in case the original method is private - and it is refined as a public method. The original flag is stored - in me->def->body.orig_me, so it's OK to make a refined method - entry public. [ruby-core:60111] [Bug #9452] +Wed Feb 17 12:14:59 2016 NARUSE, Yui <naruse@ruby-lang.org> - * test/ruby/test_refinement.rb: related tests. + * string.c (rb_str_init): introduce String.new(capacity: size) + [Feature #12024] -Thu Feb 13 18:38:15 2014 Eric Wong <e@80x24.org> +Tue Feb 16 19:10:08 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * re.c (rb_reg_raise): remove volatile - Unnecessary since r41597 + * enc/unicode/case-folding.rb, casefold.h: Used only first element + (rather than all) of target in CaseUnfold_11 array. + (with Kimihito Matsui) -Thu Feb 13 18:28:51 2014 Eric Wong <e@80x24.org> +Tue Feb 16 18:24:38 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * re.c (rb_reg_regcomp): remove volatile - Unnecessary since r13261 + * numeric.c (compare_with_zero): fix variable name, rb_cmperr + requires VALUEs but not an ID. -Thu Feb 13 16:54:32 2014 Zachary Scott <e@zzak.io> +Tue Feb 16 17:34:18 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/ruby/test_array.rb: Ensure flatten! is used for test_flatten - Patch by @ksss [Fixes GH-530] https://github.com/ruby/ruby/pull/530 + * dir.c (rb_dir_s_empty_p): add Dir.empty? method, which tells the + argument is the name of an empty directory. [Feature #10121] -Thu Feb 13 15:43:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Feb 16 09:51:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (IDSET_ATTRSET_FOR_INTERN): fix off-by-one bug. + * tool/rbinstall.rb (without_destdir): just strip a drive letter + which is prepended by with_destdir. + pointed out by @DavidEGrayson. + https://github.com/ruby/ruby/commit/0e5f9ae#commitcomment-16101763 - * parse.y (rb_enc_symname_type): junk ID succeeded by '=' is also - attrset ID. [ruby-core:60668] [Bug #8756] +Tue Feb 16 04:42:13 2016 NARUSE, Yui <naruse@ruby-lang.org> -Thu Feb 13 11:06:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * insns.def (opt_plus): simply use LONG2NUM() instead of wrongly + complex overflow case. - * configure.in: check if pthread_setname_np is available. + * insns.def (opt_sub): ditto. - * thread_pthread.c: pthread_setname_np is not available on old - Darwins. [ruby-core:60524] [Bug #9492] +Tue Feb 16 02:49:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Feb 13 00:56:59 2014 Masaki Matsushita <glass.saga@gmail.com> + * tool/rbinstall.rb (without_destdir): compare with the destdir + after stripping a drive letter, on dosish platforms. + pointed out by @DavidEGrayson. + https://github.com/ruby/ruby/commit/d0cf23b#commitcomment-16100407 - * configure.in: revert r44922. I should have used AC_CHECK_FUNCS() - to just define a symbol if the function is available. +Mon Feb 15 15:44:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Feb 13 00:20:58 2014 Masaki Matsushita <glass.saga@gmail.com> + * parse.y (parse_ident): allow keyword arguments just after a + method where the same name local variable is defined. + [ruby-core:73816] [Bug#12073] - * configure.in: use AC_CHECK_FUNC instead of AC_CHECK_FUNCS - if available. +Mon Feb 15 14:43:28 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Feb 13 00:15:10 2014 Masaki Matsushita <glass.saga@gmail.com> + * enc/unicode/case-folding.rb: Added debugging option + (with Kimihito Matsui) - * configure.in: fix to undefine HAVE_MEMMEM correctly if it is broken. +Sun Feb 14 17:31:50 2016 Lars Kanis <lars@greiz-reinsdorf.de> -Tue Feb 11 23:54:40 2014 Tanaka Akira <akr@fsij.org> + * lib/mkmf.rb (with_{cpp,c,ld}flags): copy caller strings not to + be modified, in append_{cpp,c,ld}flags respectively. + [Fix GH-1246] - * bignum.c (rb_big_cmp): Specialize a comparison to zero. +Sun Feb 14 16:18:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/bigdecimal/bigdecimal.c (is_negative): Use rb_big_cmp instead of - RBIGNUM_NEGATIVE_P. - (BigMath_s_log): Ditto. + * eval.c (setup_exception): set the cause only if it is explicitly + given or not set yet. [Bug #12068] -Tue Feb 11 22:59:10 2014 Tanaka Akira <akr@fsij.org> +Sat Feb 13 21:44:58 2016 Tanaka Akira <akr@fsij.org> - * ext/openssl/ossl_bn.c (ossl_bn_initialize): Use rb_integer_pack. - Fix SEGV by OpenSSL::BN.new(1 << (2**34)). + * hash.c (rb_hash_invert): [DOC] more examples. -Tue Feb 11 17:00:38 2014 Zachary Scott <e@zzak.io> +Sat Feb 13 17:30:49 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/tk/README.tcltklib: [DOC] Fix typo by @xta [Fixes GH-532] + * lib/uri/generic.rb (URI::Generic#find_proxy): support CIDR in + no_proxy. [ruby-core:73769] [Feature#12062] -Sun Feb 9 13:59:29 2014 Tanaka Akira <akr@fsij.org> +Sat Feb 13 17:11:58 2016 Fabian Wiesel <fabian.wiesel@sap.com> - * configure.in: Fix compilation error. - https://bugs.ruby-lang.org/issues/8358#note-16 + * lib/uri/generic.rb (find_proxy): exclude white-spaces and allow + for a leading dot in the domain name in no_proxy. + [ruby-core:54542] [Feature #8317] -Sun Feb 9 05:20:24 2014 NARUSE, Yui <naruse@ruby-lang.org> +Fri Feb 12 12:20:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in (rb_cv_gnu_qsort_r): use compile error "conflicting - types for 'qsort_r'" instead of AC_RUN_IFELSE. + * error.c (name_err_initialize, nometh_err_initialize): [DOC] fix + argument positions. optional parameters except for the message + are placed at the last. -Sun Feb 9 04:07:34 2014 Zachary Scott <e@zzak.io> +Fri Feb 12 11:49:49 2016 Anthony Dmitriyev <antstorm@gmail.com> - * lib/yaml.rb: [DOC] Add links to syck and psych on github [Bug #9501] - Based on a patch by Giorgos Tsiftsis + * net/ftp.rb: add NullSocket#closed? to fix closing not opened + connection. [Fix GH-1232] -Sun Feb 9 02:13:53 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Feb 12 11:17:38 2016 Bogdan <bogdanvlviv@gmail.com> - * include/ruby/ruby.h (OBJ_TAINTABLE, OBJ_TAINT, OBJ_INFECT), - marshal.c (r_entry0): all Numerics never be tainted now. - [ruby-core:57346] [Bug #8945] + * re.c (rb_reg_initialize_m): [DOC] fix missing right bracket. + [Fix GH-1243] -Sat Feb 8 23:40:35 2014 Vit Ondruch <vondruch@redhat.com> +Thu Feb 11 14:57:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in: add quoting brackets and append wildcard for the - rest after target_cpu, to properly detect platform for SSE2 - instructions. [ruby-core:60576] [Bug #8358] + * configure.in (RUBY_CHECK_SIZEOF, RUBY_DEFINT): fix for types + which are conditionally available depending on architectures + when universal binary, e.g., __int128. -Sat Feb 8 21:44:07 2014 Masaki Matsushita <glass.saga@gmail.com> +Thu Feb 11 06:26:18 2016 NARUSE, Yui <naruse@ruby-lang.org> - * configure.in: check qsort_r(3) and whether it is GNU version. - BSD version has different prototype. + * configure.in (RUBY_DEFINT): use Parameter Expansion. - * util.h: use qsort_r() as ruby_qsort() if it is GNU version. +Thu Feb 11 05:33:24 2016 NARUSE, Yui <naruse@ruby-lang.org> - * util.c: define ruby_qsort() if needed. + * configure.in (int128_t): don't check HAVE_XXX (for example + HAVE___INT128) because RUBY_CHECK_SIZEOF() don't define it for + config.h and use of $ac_cv_sizeof___int128 alternates the check. + (and don't need to define because users shouldn't know that) -Sat Feb 8 16:34:36 2014 Tanaka Akira <akr@fsij.org> +Wed Feb 10 12:03:41 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#get_labels): - Make it iterative. + * configure.in (ARFLAGS): check if deterministic mode flag is + effective, which is on by default on Ubuntu. -Sat Feb 8 15:54:12 2014 Koichi Sasada <ko1@atdot.net> +Tue Feb 9 16:36:23 2016 Naotoshi Seo <sonots@gmail.com> - * gc.c, gc.h (rb_objspace_marked_object_p): added. - This function *ONLY* works just after marking phase, - before any sweeping. - This function is highly depending current GC implementation - and can be removed future version. + * lib/logger.rb: Remove block from Logger.add as it's not needed + patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054] -Sat Feb 8 15:41:37 2014 Tanaka Akira <akr@fsij.org> +Tue Feb 9 14:32:23 2016 Zachary Scott <zzak@ruby-lang.org> - * lib/resolv.rb: Don't set CLOEXEC flag explicitly. (Ruby set it by - default.) + * ext/zlib/zlib.c: Document mtime header behavior with patch by @schneems + Fixes [GH-1129]: https://github.com/ruby/ruby/pull/1129 -Sat Feb 8 15:27:02 2014 Tanaka Akira <akr@fsij.org> +Tue Feb 9 13:52:49 2016 Zachary Scott <zzak@ruby-lang.org> - * lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): Raise - DecodeError if no data before the limit. - Reported by Will Bryant. [ruby-core:60557] [Bug #9498] + * re.c: Remove deprecated kcode argument from Regexp.new and compile + patch provided by Dylan Pulliam [Bug #11495] -Sat Feb 8 15:11:21 2014 Tanaka Akira <akr@fsij.org> +Mon Feb 8 21:26:19 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * io.c (SMALLBUF): Unused macro removed. + * enc/unicode/case-folding.rb, enc/unicode/casefold.h: Flags for + upper/lower conversion added (titlecase and SpecialCasing still missing) + (with Kimihito Matsui) -Fri Feb 7 23:37:49 2014 Tanaka Akira <akr@fsij.org> +Mon Feb 8 20:43:57 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on - socket creation. - Reported by Bjoern Rennhak. [ruby-core:60442] [Bug #9477] + * string.c, enc/unicode.c: Disassociating ONIGENC_CASE_FOLD flag from + ONIGENC_CASE_DOWNCASE. + (with Kimihito Matsui) -Fri Feb 7 21:58:48 2014 Zachary Scott <e@zzak.io> +Mon Feb 8 13:00:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/open-uri.rb: [DOC] use lower case version of core classes, same - as commit r44878, based on patch by Jonathan Jackson [Bug #9483] + * enc/unicode.c: Shortened macros for enc/unicode/casefold.h to + single-letter; use flags in casefold.h for logic. -Fri Feb 7 21:54:53 2014 Zachary Scott <e@zzak.io> + * enc/unicode/case-folding.rb: Added flag for case folding. + Changed parameter passing. - * ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core - classes when referring to return value, since we aren't directly - talking about the class. Patch by Jonathan Jackson [Bug #9483] + * enc/unicode/casefold.h: New flags added. + (with Kimihito Matsui) -Fri Feb 7 05:28:38 2014 Eric Wong <e@80x24.org> +Mon Feb 8 10:30:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * constant.h: reduce rb_const_entry_t size on 64-bit - Patch by Adam Avilla [ruby-core:60542] [Feature #9496] + * ruby.c (feature_option): raise a runtime error if ambiguous + feature name is given, in the future. [Bug #12050] -Thu Feb 6 15:27:46 2014 Koichi Sasada <ko1@atdot.net> +Mon Feb 8 09:43:57 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c (get_envparam_int): correct warning messages. + * common.mk: Removed enc/unicode/casefold.h from automatic build because + some CI systems don't have gperf. Creation of enc/unicode/casefold.h + is now possible with make unicode-up. This is intended as a temporary measure. - * gc.c (get_envparam_double): ditto. +Sun Feb 7 22:10:08 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Feb 6 15:17:30 2014 Koichi Sasada <ko1@atdot.net> + * common.mk: Added two more precondition files for enc/unicode/casefold.h - * gc.c (get_envparam_int): don't accept a value equals to lowerbound - (changed by last commit) because "" or "foo" (not a number) strings - are parsed as 0. They should be rejected. + * enc/unicode.c: Added shortening macros for enc/unicode/casefold.h - * gc.c (get_envparam_double): ditto. + * enc/unicode/case-folding.rb: Fixed file encoding for CaseFolding.txt + to ASCII-8BIT (should fix some ci errors). Clarified usage. Created + class MapItem. Partially implemented class CaseMapping. + (with Kimihito Matsui) -Thu Feb 6 09:00:35 2014 Koichi Sasada <ko1@atdot.net> +Sun Feb 7 14:12:32 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c (ruby_gc_set_params): if RUBY_GC_OLDMALLOC_LIMIT is provided, - then set objspace->rgengc.oldmalloc_increase_limit. - Without this fix, the env variable RUBY_GC_OLDMALLOC_LIMIT - does not work. + * enc/unicode/case-folding.rb: Fixing parameter passing. + (with Kimihito Matsui) - * gc.c (get_envparam_int): accept a value equals to lowerbound. +Sun Feb 7 11:44:03 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c (get_envparam_double): ditto. + * enc/unicode/case-folding.rb: New classes CaseMapping/CaseMappingDummy + to pass as parameters; not yet implemented or used. + (with Kimihito Matsui) -Thu Feb 6 08:23:28 2014 Eric Wong <e@80x24.org> +Sun Feb 7 11:16:00 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/thread/thread.c (rb_szqueue_max_set): use correct queue and - limit wakeups. [Bug #9343][ruby-core:60517] - * test/thread/test_queue.rb (test_sized_queue_assign_max): - test for bug + * common.mk: using new option in recipe for enc/unicode/casefold.h -Thu Feb 6 07:18:01 2014 Eric Hodel <drbrain@segment7.net> + * enc/unicode/case-folding.rb: Correctly specify argument to new option. + (with Kimihito Matsui) - * lib/rubygems: Update to RubyGems 2.2.2. Complete history at: +Sun Feb 7 10:43:27 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.2.2+%2F+2014-02-05 + (this commit message applies to the previous commit) + * common.mk: explicit recipe for enc/unicode/casefold.h - * test/rubygems: ditto. + * enc/unicode/case-folding.rb: Adding -m option to prepare for using + multiple data files. + (with Kimihito Matsui) -Wed Feb 5 20:56:32 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat Feb 6 22:30:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * marshal.c (to_be_skipped_id): ignore anonymous attributes. + * lib/cgi/util.rb (escapeHTML, unescapeHTML): consider + ASCII-incompatible encodings. [Fix GH-1239] - * pack.c (Init_pack): use anonymous ID so that associated objects - do not appear in the packed result. +Sat Feb 6 15:18:28 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * parse.y (rb_make_internal_id): return an anonymous ID for - internal use. + * test/ruby/enc/test_regex_casefold.rb: Added data-based testing for + String#downcase :fold. -Wed Feb 5 14:41:56 2014 Koichi Sasada <ko1@atdot.net> + * enc/unicode.c: Fixed a range error (lowest non-ASCII character affected + by case operations is U+00B5, MICRO SIGN) - * vsnprintf.c: remove duplicated def of `UNINITIALIZED_VAR()'. + * test/ruby/enc/test_case_mapping.rb: Explicit test for case folding of + MICRO SIGN to Greek mu. + (with Kimihito Matsui) -Wed Feb 5 14:40:16 2014 Koichi Sasada <ko1@atdot.net> +Sat Feb 6 14:51:23 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/objspace/objspace_dump.c (dump_object): use STR_SHARED_P() - instead of removed STR_NOCAPA_P() macro. + * test/ruby/enc/test_regex_casefold.rb: Tests for three case folding + primitives (mbc_case_fold, get_case_fold_codes_by_str, + apply_all_case_fold) in the various encodings. Currently only known + good encodings are tested to avoid test failures. For bug hunting, + start by adding more encodings with + generate_test_casefold encoding + (with Kimihito Matsui) -Wed Feb 5 13:51:33 2014 Koichi Sasada <ko1@atdot.net> +Sat Feb 6 14:37:16 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * internal.h, vm_core.h: move LIKELY/UNLIKELY/UNINITIALIZED_VAR() - macros from vm_core.h to internal.h. + * enc/unicode.c, test/ruby/enc/test_case_mapping.rb: Implemented :fold + option for String#downcase by using case folding data from + regular expression engine, and added a few simple tests. + (with Kimihito Matsui) - * string.c: remove dependency to "vm_core.h". +Fri Feb 5 20:08:59 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * common.mk: ditto. + * test/ruby/enc/test_case_mapping.rb: added tests for :ascii option. + (with Kimihito Matsui) -Wed Feb 5 13:29:01 2014 Koichi Sasada <ko1@atdot.net> +Fri Feb 5 12:22:20 2016 NARUSE, Yui <naruse@ruby-lang.org> - * string.c (rb_str_free): use FL_TEST(str, STR_SHARED) directly - because str is not embed. + * insns.def (opt_mult): Use int128_t for overflow detection. - * string.c (str_replace): remove `FL_SET(str, STR_SHARED)' line - because STR_SET_SHARED() set STR_SHARED. + * bignum.c (rb_uint128t2big): added for opt_mult. -Wed Feb 5 13:18:08 2014 Koichi Sasada <ko1@atdot.net> + * bignum.c (rb_uint128t2big): added for rb_uint128t2big.. - * internal.h: remove macros STR_NOCAPA and STR_NOCAPA_P(). + * configure.in: define int128_t, uint128_t and related MACROs. + Initially introduced by r41379 but reverted by r50749. - * string.c (rb_str_resize): remove `STR_SET_NOEMBED(str)' because - str_make_independent_expand() set NOEMBED flag. +Thu Feb 4 21:05:17 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * string.c (rb_str_resize): remove `STR_NOCAPA_P(str)' check because - `str' is independent (not shared). + * enc/unicode.c: Activated :ascii flag for ASCII-only case conversion + (with Kimihito Matsui) -Wed Feb 5 12:54:25 2014 Koichi Sasada <ko1@atdot.net> +Thu Feb 4 17:38:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * string.c: refactoring, especially about string flags. + * re.c (reg_set_source): make source string frozen without + copying. - * string.c (STR_UNSET_NOCAPA): removed. - Use FL_UNSET() with STR_SHARED. + * re.c (rb_reg_initialize_m): refactor initialization with + encoding. - * string.c (rb_str_capacity): check STR_SHARED directly - because it is not a embed string. +Thu Feb 4 15:35:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * string.c (rb_str_modify_expand): ditto. + * string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to + make fstring with encoding. - * string.c (rb_str_shared_replace): use STR_SET_SHARED(). +Thu Feb 4 14:42:29 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * string.c (str_make_independent_expand): remove STR_UNSET_NOCAPA() - because `str' is not shared string. + * common.mk: Added Unicode data file SpecialCasing.txt to be additionally + downloaded (with Kimihito Matsui) -Wed Feb 5 12:11:04 2014 Koichi Sasada <ko1@atdot.net> +Thu Feb 4 12:39:08 2016 joker1007 <kakyoin.hierophant@gmail.com> - * string.c (RESIZE_CAPA): should not resize shared string. + * cgi/escape/escape.c: Optimize CGI.escape performance by C ext + for ASCII-compatible encodings. [Fix GH-1238] -Wed Feb 5 11:46:42 2014 Koichi Sasada <ko1@atdot.net> +Thu Feb 4 11:53:56 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * gc.c (gc_mark_children): STR_ASSOC is no longer available. - Reported by @nagachika. - http://d.hatena.ne.jp/nagachika/20140204 + * common.mk: Introduce two variables (UNICODE_DATA_DIR and + UNICODE_SRC_DATA_DIR) to eliminate repetitions. -Wed Feb 5 11:27:22 2014 Koichi Sasada <ko1@atdot.net> +Wed Feb 3 12:13:20 2016 NARUSE, Yui <naruse@ruby-lang.org> - * string.c (rb_str_new_frozen): refactoring code. - * Move code from str_new_frozen_with_klass() (and remove it) - * `aux.shared' should not be 0 for STR_SHARED strings. + * string.c (str_new_frozen): if the given string is embeddedable + but not embedded, embed a new copied string. [Bug #11946] -Wed Feb 5 04:23:41 2014 Aaron Patterson <aaron@tenderlovemaking.com> +Wed Feb 3 08:25:38 2016 boshan <boshan@subsplash.com> - * ext/psych/lib/psych.rb: New release of psych. - * ext/psych/psych.gemspec: ditto + * ext/openssl/ossl_pkey.c (Init_ossl_pkey): [DOC] Fix typo + "encrypted" to "decrypted". [Fix GH-1235] -Wed Feb 5 04:16:41 2014 Aaron Patterson <aaron@tenderlovemaking.com> +Wed Feb 3 08:21:32 2016 Seiei Miyagi <hanachin@gmail.com> - * ext/psych/yaml/emitter.c: merge libyaml 0.1.5 - * ext/psych/yaml/loader.c: ditto - * ext/psych/yaml/parser.c: ditto - * ext/psych/yaml/reader.c: ditto - * ext/psych/yaml/scanner.c: ditto - * ext/psych/yaml/writer.c: ditto - * ext/psych/yaml/yaml_private.h: ditto + * ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): Fix + Ripper.lex error in dedenting squiggly heredoc. heredoc tree is + also an array of Elem in the outer tree. [Fix GH-1234] -Tue Feb 4 19:10:29 2014 Koichi Sasada <ko1@atdot.net> +Wed Feb 3 02:33:39 2016 NARUSE, Yui <naruse@ruby-lang.org> - * string.c: use long allocator names instead of numbered - allocator names. - * rb_str_new2 -> rb_str_new_cstr - * rb_str_new4 -> rb_str_new_frozen - * rb_str_new5 -> rb_str_new_with_class - * str_new3 -> str_new_shared - * str_new4 -> str_new_frozen_with_klass + * re.c (rb_reg_prepare_enc): use already compiled US-ASCII regexp + if given string is ASCII only. + 121.2s to 113.9s on my x86_64-freebsd10.2 Intel Core i5 661 -Tue Feb 4 17:20:03 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Feb 2 13:02:03 2016 NARUSE, Yui <naruse@ruby-lang.org> - * dir.c (glob_helper): return the filename with actual cases on - the filesystem if it is case-insensitive. [ruby-core:42469] - [Feature #5994] + * re.c: Introduce RREGEXP_PTR. + patch by dbussink. + partially merge https://github.com/ruby/ruby/pull/497 -Tue Feb 4 16:16:58 2014 Koichi Sasada <ko1@atdot.net> + * include/ruby/ruby.h: ditto. - * string.c: use STR_SHARED instead of ELTS_SHARED. - (same value, but more clear meaning) + * gc.c: ditto. -Tue Feb 4 16:09:14 2014 Koichi Sasada <ko1@atdot.net> + * ext/strscan/strscan.c: ditto. - * string.c: remove STR_ASSOC related code. - By r44804, string objects can not have STR_ASSOC flag. + * parse.y: ditto. - * internal.h: ditto. + * string.c: ditto. - * ext/objspace/objspace_dump.c (dump_object): ditto. +Tue Feb 2 09:08:27 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Tue Feb 4 14:07:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/rubygems/specification.rb: `coding` is effective only first + line except shebang. - * pack.c (str_associate, str_associated): keep associated objects - in an instance variables, instead of in the internal structure. + * lib/rubygems/package.rb, lib/rubygems/package/*: ditto. - * string.c (rb_str_associate, rb_str_associated): deprecate. +Mon Feb 1 21:41:58 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Tue Feb 4 12:55:31 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2. + It supports to enable frozen string literal and add `--norc` option for + disable to `.gemrc` configuration. + See 2.5.2 release notes for other fixes and enhancements. + https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3 - * string.c (rb_str_modify_expand): enable capacity and disable - association with packed objects when setting capa, so that - pack("p") string fails to unpack properly after modified. +Sun Jan 31 12:33:13 2016 Dan Kreiger <dan@dankreiger.com> -Tue Feb 4 12:45:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/drb/ut_large.rb (multiply, avg, median): add additional + math operations to DRbLarge. [Fix GH-1086] - * dir.c (glob_make_pattern): all alphabets are magic characters on - case-insensitive filesystems. [ruby-core:42469] [Feature #5994] +Sun Jan 31 12:19:15 2016 Kuniaki IGARASHI <igaiga@gmail.com> -Tue Feb 4 09:47:57 2014 Eric Hodel <drbrain@segment7.net> + * test/ruby/test_file_exhaustive.rb (test_lstat): Add lacking test + for File#lstat. [Fix GH-1231] - * lib/rubygems: Update to RubyGems 2.2.2 prerelease to check fixes to - CI. - * test/rubygems: ditto. +Sun Jan 31 12:15:33 2016 Prayag Verma <prayag.verma@gmail.com> -Mon Feb 3 12:04:47 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + * doc/standard_library.rdoc: fix typo [Fix GH-1230] + Spelling mistakes - + outputing > outputting + publich > publish - * error.c: [DOC] Exception#cause may return nil. [ci skip] +Sat Jan 30 15:18:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Feb 2 05:48:42 2014 Eric Wong <e@80x24.org> + * vm_eval.c (rb_check_funcall_with_hook): also should call the + given hook before returning Qundef when overridden respond_to? + method returned false. [ruby-core:73556] [Bug #12030] - * io.c (rb_io_syswrite): add RB_GC_GUARD - [Bug #9472][ruby-core:60407] +Fri Jan 29 17:40:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Feb 1 15:09:16 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> + * win32/file.c (rb_readlink): drop garbage after the substitute + name, as rb_w32_read_reparse_point returns the expected buffer + size but "\??\" prefix is dropped from the result. - * ext/win32ole/win32ole.c (ole_typedesc2val): add VT_RECORD case. + * win32/win32.c (w32_readlink): ditto, including NUL-terminator. -Sat Feb 1 06:38:51 2014 Zachary Scott <e@zzak.io> +Fri Jan 29 17:07:27 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * lib/drb/drb.rb: [DOC] Add note about start_service for each process - Based on a patch by @rosenfeld [Fixes GH-514] [ci skip] - https://github.com/ruby/ruby/pull/514 + * win32/win32.c (fileattr_to_unixmode, rb_w32_reparse_symlink_p): volume + mount point should be treated as directory, not symlink. + [ruby-core:72483] [Bug #11874] -Sat Feb 1 06:30:20 2014 Zachary Scott <e@zzak.io> + * win32/win32.c (rb_w32_read_reparse_point): check the reparse point is + a volume mount point or not. - * error.c: [DOC] Document Exception#cause by @jasonrclark [ci skip] - [Fixes GH-519] https://github.com/ruby/ruby/pull/519 + * win32/file.c (rb_readlink): follow above change (but this pass won't + be used). -Sat Feb 1 06:10:49 2014 Zachary Scott <e@zzak.io> +Fri Jan 29 16:17:07 2016 Lucas Buchala <lucasbuchala@gmail.com> - * lib/securerandom.rb: [DOC] Add note on require for examples - Based on a patch by @schneems [Fixes GH-518] [ci skip] - https://github.com/ruby/ruby/pull/518 + * enum.c (enum_take_while, enum_drop_while): rename block + parameter to obj, since they are generic objects. [Fix GH-1226] -Sat Feb 1 06:04:56 2014 Zachary Scott <e@zzak.io> +Fri Jan 29 14:15:26 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * numeric.c: [DOC] Fix typo in example for #step [ci skip] - Patch by @ksss [Fixes GH-522] https://github.com/ruby/ruby/pull/522 + * lib/erb.rb (ERB::Compiler#detect_magic_comment): allow + frozen-string-literal in comment as well as encoding. -Fri Jan 31 17:01:47 2014 Eric Wong <e@80x24.org> + * lib/erb.rb (ERB#def_method): insert def line just before the + first non-comment and non-empty line, not to leave duplicated + and stale magic comments. - * ext/socket/init.c (rsock_socket0): split out SOCK_CLOEXEC version - * ext/socket/socket.c (rsock_socketpair0): ditto - [ruby-core:60377] +Fri Jan 29 11:13:33 2016 Jeremy Evans <code@jeremyevans.net> -Fri Jan 31 03:48:40 2014 Eric Wong <e@80x24.org> + * lib/erb.rb (ERB#set_eoutvar): explicitly make mutable string as + a buffer to make ERB work with --enable-frozen-string-literal. + [ruby-core:73561] [Bug #12031] - * benchmark/driver: avoid large alloc in driver process - [ruby-core:59869] [Bug #9430] +Fri Jan 29 10:44:56 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Thu Jan 30 14:45:49 2014 Shugo Maeda <shugo@ruby-lang.org> + * lib/net/http/header.rb: Warn nil variable on HTTP Header. + It caused to NoMethodError. [fix GH-952][fix GH-641] Patch by @teosz + * test/net/http/test_httpheader.rb: Added test for nil HTTP Header. - * configure.in: use $@ instead of $(.TARGET) because .TARGET is not - supported by GNU make. +Thu Jan 28 17:31:43 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Jan 30 08:26:21 2014 Yusuke Endoh <mame@tsg.ne.jp> + * ext/socket/socket.c (sock_gethostname): support unlimited size + hostname. - * ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value. - [ruby-core:57599] [Bug #8978]. +Wed Jan 27 21:03:45 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Wed Jan 29 20:08:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/-ext-/string/test_capacity.rb: Added missing library. - * io.c (nogvl_copy_stream_sendfile): check socket on other than - linux, as sendfile(2) on non-socket fd works only on linux. - [Feature #9427] +Wed Jan 27 18:53:40 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Jan 29 18:09:48 2014 Eric Wong <e@80x24.org> + * enc/unicode.c: Fixed bit mask in macro OnigCodePointCount - * io.c (nogvl_copy_stream_sendfile): remove socket check - [ruby-core:59856][Feature #9427] +Wed Jan 27 17:54:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Jan 29 04:29:54 2014 Aaron Patterson <aaron@tenderlovemaking.com> + * enc/unicode.c: Protect code point count by macro, in order to + be able to use the remaining bits for flags. + (with Kimihito Matsui) - * ext/openssl/ossl_ssl.c: pass read_nonblock options to underlying IO - when SSL session has not been started. +Wed Jan 27 16:34:35 2016 boshan <boshan@subsplash.com> - * test/openssl/test_ssl.rb: test for change. + * lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter + `basename` is optional and defaulted to an empty string since + [GH-523]. [Fix GH-1225] -Wed Jan 29 03:49:36 2014 Aaron Patterson <aaron@tenderlovemaking.com> +Wed Jan 27 16:25:54 2016 Koichi ITO <koic.ito@gmail.com> - * ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value. - [ruby-core:57599] [Bug #8978]. Thanks mame! + * array.c (rb_ary_dig): [DOC] fix the exception class to be raised + when intermediate object does not have dig method. TypeError + will be raised now. [Fix GH-1224] -Wed Jan 29 03:36:42 2014 Eric Wong <e@80x24.org> +Tue Jan 26 19:36:15 2016 Aggelos Avgerinos <evaggelos.avgerinos@gmail.com> - * doc/contributing.rdoc: allow/encourage other git hosts - [ruby-core:59807][misc #9421] + * array.c (permute0, rpermute0): [DOC] Substitute indexes -> + indices in documentation for consistency. [Fix GH-1222] -Tue Jan 28 23:36:01 2014 Tanaka Akira <akr@fsij.org> +Tue Jan 26 15:21:37 2016 Eric Wong <e@80x24.org> - * ext/socket: Avoid redundant fcntl/fstat syscalls for cloexec - sockets. - Patch by Eric Wong. [ruby-core:59429] [Feature #9330] + * compile.c (caller_location): use rb_fstring_cstr for "<compiled>" + (it is converted to fstring anyways inside rb_iseq_new_with_opt) + * iseq.c (iseqw_s_compile): ditto + * iseq.c (rb_iseq_new_main): use rb_fstring_cstr for "<main>" + * vm.c (Init_VM): ditto, share with with above + * iseq.c (iseqw_s_compile_file): rb_fstring before rb_io_t->pathv + share "<main>" with above + * vm.c (rb_binding_add_dynavars): fstring "<temp>" immediately -Tue Jan 28 20:51:07 2014 Tanaka Akira <akr@fsij.org> +Tue Jan 26 15:14:01 2016 Kazuki Yamaguchi <k@rhe.jp> - * process.c (READ_FROM_CHILD): Apply the last hunk of - 0001-process.c-avoid-EINTR-from-Process.spawn.patch written by - Eric Wong in [Bug #8770]. + * compile.c (iseq_peephole_optimize): don't apply tailcall + optimization to send/invokesuper instructions with blockiseq. + This is a follow-up to the changes in r51903; blockiseq is now + the third operand of send/invokesuper instructions. + [ruby-core:73413] [Bug #12018] -Tue Jan 28 16:31:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jan 26 14:26:46 2016 Eric Wong <e@80x24.org> - * thread_pthread.c (ruby_init_stack, ruby_stack_overflowed_p): - place get_stack above others to get stack boundary information. - [ruby-core:60113] [Bug #9454] + * signal.c (sig_list): use fstring for hash key + * test/ruby/test_signal.rb (test_signal_list_dedupe_keys): added -Tue Jan 28 15:27:36 2014 NARUSE, Yui <naruse@ruby-lang.org> +Tue Jan 26 13:08:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * thread_pthread.c: rlimit is only available on Linux. - At least r44712 breaks FreeBSD. - [ruby-core:60113] [Bug #9454] + * signal.c (rb_f_kill): should immediately deliver reserved + signals SIGILL and SIGFPE, not only SIGSEGV and SIGBUS. -Tue Jan 28 15:17:59 2014 Zachary Scott <e@zzak.io> +Tue Jan 26 07:57:28 2016 Joseph Tibbertsma <josephtibbertsma@gmail.com> - * lib/set.rb: [DOC] Add examples for Set#intersect? and Set#disjoint? - Patch by xavier nayrac [Bug #9331] [ci skip] + * gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name. + [Fix GH-1221] -Tue Jan 28 15:12:22 2014 Zachary Scott <e@zzak.io> +Mon Jan 25 17:26:54 2016 Eric Wong <e@80x24.org> - * ext/zlib/zlib.c (rb_zlib_adler32): [DOC] Add example for adler32 - Patch by Vajrasky Kok [Bug #9307] [ci skip] + * ruby_assert.h (RUBY_ASSERT_WHEN): fix reference to macro name + * vm_core.h: include ruby_assert.h before using + [ruby-core:73371] -Tue Jan 28 08:56:00 2014 Charlie Somerville <charliesome@ruby-lang.org> +Mon Jan 25 15:55:30 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block - as hash key when loading serialized instruction sequences from arrays. - [Bug #9455] [ruby-core:60146] + * symbol.c (sym_check_asciionly): more informative error message + with the encoding name and the inspected content. + [ruby-core:73398] [Feature #12016] -Mon Jan 27 21:52:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Jan 25 09:38:26 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * thread_pthread.c: get current main thread stack size, which may - be expanded than allocated size at initialization, by rlimit(). - [ruby-core:60113] [Bug #9454] + * test/ruby/test_string.rb: added testcase for next!, succ and succ! + [fix GH-1213] Patch by @K0mAtoru -Sat Jan 25 22:17:02 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> +Mon Jan 25 09:32:25 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * README.ja.md, README.md: update the controller address of - mailing lists. + * lib/webrick/httpservlet/filehandler.rb: fix documentation for namespace. + [fix GH-1219][ci skip] Patch by @leafac -Sat Jan 25 14:50:42 2014 Eric Wong <normalperson@yhbt.net> +Sun Jan 24 19:34:23 2016 Eric Wong <e@80x24.org> - * process.c (send_child_error): retry write on EINTR to fix - occasional Errno::EINTR from Process.spawn. + * vm_insnhelper.c (vm_check_if_namespace): tiny size reduction - * process.c (recv_child_error): retry read on EINTR to fix - occasional Errno::EINTR from Process.spawn. +Sun Jan 24 18:12:36 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Jan 25 14:21:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * common.mk: Simplifying Unicode data file download logic to make + it more reliable (including additional fix not in r53633) [Bug #12007] - * compile.c (iseq_compile_each): result of assignment should be - its rhs instead of returned value from a method. - [ruby-core:60071] [Bug #9448] +Sun Jan 24 16:54:11 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Jan 25 11:16:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * ext/io/wait/wait.c (io_wait_readwrite): [EXPERIMENTAL] allow to + wait for multiple modes, readable and writable, at once. the + arguments may change in the future. [Feature #12013] - * class.c (rb_extract_keywords): treat nil keyword_hash same as 0, - for the case rb_scan_args returns nil if no keyword hash. +Sat Jan 23 22:30:59 2016 K0mA <mctj1218@gmail.com> -Fri Jan 24 15:13:20 2014 Zachary Scott <e@zzak.io> + * test/ruby/test_array.rb (test_keep_if): Add test for + Array#keep_if separate from Array#select! [Fix GH-1218] - * lib/racc/rdoc/grammar.en.rdoc: [DOC] Correct grammar and typos - Patch by Giorgos Tsiftsis [Bug #9429] [ci skip] +Sat Jan 23 20:54:26 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Thu Jan 23 20:20:17 2014 Koichi Sasada <ko1@atdot.net> + * common.mk: revert r53633. It broke rubyci and travis. + https://travis-ci.org/ruby/ruby/builds/104259623 - * test/ruby/envutil.rb: try to wait a bit (0.1sec) when ruby process - exits by signals because some SEGV tests fail because of not enough - error output. +Sat Jan 23 20:10:29 2016 Shugo Maeda <shugo@ruby-lang.org> -Thu Jan 23 20:06:27 2014 Koichi Sasada <ko1@atdot.net> + * range.c (range_eqq): revert r51585 because rb_call_super() is + called in range_include() and thus r51585 doesn't work when the + receiver Range object consists of non linear objects such as Date + objects. + [ruby-core:72908] [Bug #12003] - * test/ruby/test_settracefunc.rb: check the target thread. +Sat Jan 23 18:37:37 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Jan 23 19:59:16 2014 Koichi Sasada <ko1@atdot.net> + * ChangeLog: Fixing wrong time on previous commit, and adding + previous commit message to svn [ci skip] - * test/ruby/test_settracefunc.rb: check the target thread. +Sat Jan 23 18:30:30 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Jan 23 14:26:44 2014 Zachary Scott <e@zzak.io> + * common.mk: Simplifying Unicode data file download logic to make + it more reliable [Bug #12007] - * lib/fileutils.rb: [DOC] Fix typo in options_of() example [Bug #9392] - Patch by Giorgos Tsiftsis +Sat Jan 23 16:29:42 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Jan 23 13:56:16 2014 Zachary Scott <e@zzak.io> + * tool/downloader.rb: Fixed a logical error, improved documentation - * README -> README.md: [DOC] Format README with Markdown [Bug #9255] - * README.ja -> README.ja.md: ditto +Sat Jan 23 11:42:43 2016 Peter Suschlik <ps@neopoly.de> -Wed Jan 22 15:59:39 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * README.md: Use SVG Travis badge over PNG for better quality and + device support. [Fix GH-1214] [Fix GH-1216] - * ext/thread/thread.c (Init_thread): ConditionVariable and Queue - are not able to copy. [ruby-core:59961] [Bug #9440] +Sat Jan 23 11:29:16 2016 Pascal Betz <pascal.betz@simplificator.com> -Tue Jan 21 20:14:55 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/csv.rb: Update documentation of CSV header converter for + r45498, [GH-575]. [Fix GH-1215] - * thread_pthread.c (rb_thread_create_timer_thread): fix for platforms - where PTHREAD_STACK_MIN is a dynamic value and not a compile-time - constant. [ruby-dev:47911] [Bug #9436] +Fri Jan 22 17:36:46 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Jan 21 17:55:09 2014 Zachary Scott <e@zzak.io> + * vm_core.h (VM_ASSERT): use RUBY_ASSERT instead of rb_bug. - * lib/uri/common.rb: [DOC] Use static w3.org uri [ci skip] - Patch by @ykzts [Fix GH-484] https://github.com/ruby/ruby/pull/484 + * error.c (rb_assert_failure): assertion with stack dump. -Tue Jan 21 16:43:22 2014 Zachary Scott <e@zzak.io> + * ruby_assert.h (RUBY_ASSERT): new header for the assertion. - * enum.c: [DOC] Add simple example of Enumerable#zip [ci skip] - Patch by @nruth on documenting-ruby/ruby#22 - https://github.com/documenting-ruby/ruby/pull/22 +Fri Jan 22 00:25:57 2016 NARUSE, Yui <naruse@ruby-lang.org> -Tue Jan 21 16:26:44 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * regparse.c (fetch_name_with_level): allow non word characters + at the first character. [Feature #11949] - * thread_pthread.c (rb_thread_create_timer_thread): expand timer - thread stack size to get rid of segfault on FreeBSD/powerpc64. - based on the patch by Steve Wills at [ruby-core:59923]. - [ruby-core:56590] [Bug #8783] + * regparse.c (fetch_name): ditto. -Tue Jan 21 04:31:23 2014 Tanaka Akira <akr@fsij.org> +Thu Jan 21 17:34:01 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ext/socket/option.c: Use "int" for IP_MULTICAST_LOOP and - IP_MULTICAST_TTL on Mac OS X and Windows. + * marshal.c (r_object0): honor Marshal.load post proc + value for TYPE_LINK. by Hiroshi Nakamura <nahi@ruby-lang.org> + https://github.com/ruby/ruby/pull/1204 fix GH-1204 -Tue Jan 21 00:39:15 2014 Tanaka Akira <akr@fsij.org> +Thu Jan 21 16:37:50 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ext/socket/option.c: Use "byte" as default argument for - IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket option to follow - the original multicast implementation. + * Makefile.in (update-rubyspec): fix r53208 like r53451. -Mon Jan 20 20:20:27 2014 Tanaka Akira <akr@fsij.org> +Wed Jan 20 20:58:25 2016 NAKAMURA Usaku <usa@ruby-lang.org> - * ext/socket/option.c: Use preprocessor macros to avoid repeated - conditionals. + * common.mk, Makefile.in: update-config_files is only for Unix + platforms. -Mon Jan 20 13:55:03 2014 Zachary Scott <e@zzak.io> +Wed Jan 20 17:13:39 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/rubygems/version.rb: [DOC] Use gender-neutral pronouns [ci skip] - * lib/rubygems/security.rb: ditto + * tool/extlibs.rb: add --cache option to change cache directory. -Sun Jan 19 06:38:48 2014 Benoit Daloze <eregontp@gmail.com> +Tue Jan 19 17:03:40 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * compar.c (cmp_equal): warn for this release and still rescue - standard exceptions for a nicer transition. See #7688. - Partly reverts r44502. + * common.mk: Added Unicode data file CaseFolding.txt to be additionally + downloaded (with Kimihito Matsui) - * test/ruby/test_comparable.rb: adapt assertion to match new behavior. +Tue Jan 19 10:09:58 2016 Sho Hashimoto <sho-h@ruby-lang.org> -Sun Jan 19 06:27:18 2014 Benoit Daloze <eregontp@gmail.com> + * lib/shell.rb (Shell.debug_output_exclusive_unlock): remove + because Mutex#exclusive_unlock was already deleted. [fix GH-1185] - * test/ruby/test_comparable.rb: specify behavior for the different - kind of exceptions rescued (or not) by Comparable#==. +Tue Jan 19 09:38:27 2016 Nick Cox <nick@nickcox.me> -Sat Jan 18 23:12:19 2014 Tanaka Akira <akr@fsij.org> + * vm_method.c: fix grammar in respond_to? warning. + [fix GH-1047] - * ext/socket: Avoid unnecessary ppoll/select on Linux. - Patch by Eric Wong. [ruby-core:57950] [Bug #9039] +Mon Jan 18 14:37:07 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Jan 18 22:57:44 2014 Tanaka Akira <akr@fsij.org> + * parse.y (parser_here_document): an escaped newline is not an + actual newline, and the rest part should not be dedented. + [ruby-core:72855] [Bug #11989] - * lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated - string. - Patch by Ryan Brunner. [ruby-core:58220] [Bug #9093] +Mon Jan 18 12:04:34 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Sat Jan 18 22:35:15 2014 Tanaka Akira <akr@fsij.org> + * test/ruby/test_string.rb: Added extra testcase for test_rstrip_bang + and test_lstrip_bang. [fix GH-1178] Patch by @Matrixbirds - * io.c (rb_update_max_fd): Return immediately if the given fd is small - enough. +Mon Jan 18 11:47:27 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Sat Jan 18 22:25:53 2014 Tanaka Akira <akr@fsij.org> + * string.c: fix a typo. [fix GH-1202][ci skip] Patch by @sunboshan - * io.c: Test O_CLOEXEC only once. - Patch by Eric Wong. [ruby-core:59419] [Feature #9328] +Sun Jan 17 21:15:30 2016 NARUSE, Yui <naruse@ruby-lang.org> -Sat Jan 18 21:24:49 2014 Tanaka Akira <akr@fsij.org> + * configure.in: improve ICC (Intel C Compiler) support. - * ext/socket/option.c: IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket - option takes a byte on OpenBSD. - Fixed by Jeremy Evans. [ruby-core:59496] [Bug #9350] + * configure.in (CXX): The name of icc's c++ compiler is `icpc`. -Sat Jan 18 21:19:04 2014 Tanaka Akira <akr@fsij.org> + * configure.in (warnings): Add `-diag-disable=2259` to suppress + noisy warnings: "non-pointer conversion from "..." to "..." may + lose significant bits". - * lib/open-uri.rb: Make proxy disabling working again. - Fixed by Christophe Philemotte. [ruby-core:59650] [Bug #9385] + * configure.in (optflags): Add `-fp-model precise` like -fno-fast-math. -Fri Jan 17 20:05:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/mkmf.rb: icc supports -Werror=division-by-zero + and -Werror=deprecated-declarations, but doesn't support + -Wdivision-by-zero and -Wdeprecated-declarations. - * lib/delegate.rb (Delegator): keep source information methods - which start and end with '__'. [ruby-core:59718] [Bug #9403] +Sun Jan 17 20:40:10 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Fri Jan 17 17:58:04 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * string.c: Any kind of option is now taking the new code path for + upcase/downcase/capitalize/swapcase. :lithuanian can be used for + testing if no specific option is desired. + * test/ruby/enc/test_case_mapping.rb: Adjusted to above. + (with Kimihito Matsui) - * eval.c (rb_mod_s_constants): return its own constants for other - than Module itself. [ruby-core:59763] [Bug #9413] +Sun Jan 17 20:10:10 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Tue Jan 16 00:17:00 2014 Kenta Murata <mrkn@mrkn.jp> + * enc/unicode.c: Fixed a logical error and some comments. + * test/ruby/enc/test_case_mapping.rb: Made tests more general. + (with Kimihito Matsui) - * ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.5. +Sun Jan 17 17:41:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Wed Jan 15 20:30:31 2014 Masaki Matsushita <glass.saga@gmail.com> + * enc/unicode.c: Removed artificial expansion for Turkic, + added hand-coded support for Turkic, fixed logic for swapcase. + * string.c: Made use of new case mapping code possible from upcase, + capitalize, and swapcase (with :lithuanian as a guard). + * test/ruby/enc/test_case_mapping.rb: Adjusted for above. + (with Kimihito Matsui) - * io.c (io_binwrite): use writev(2) to avoid double write if available. +Sun Jan 17 15:30:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in: check writev(2) + * ext/socket/option.c (sockopt_bool): relax boolean size to be one + too not only sizeof(int). Winsock getsockopt() returns a single + byte as a boolean socket option. [ruby-core:72730] [Bug #11958] -Wed Jan 15 14:04:33 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 17 14:43:01 2016 Kuniaki IGARASHI <igaiga@gmail.com> - * string.c (get_encoding): respect BOM on pseudo encodings. - [ruby-dev:47895] [Bug #9415] + * test/ruby/test_env.rb: [Fix GH-1201] + * Extract test code for ENV#keep_if from ENV#select_bang + * Add a test case for ENV#select_bang,keep_if -Wed Jan 15 14:03:47 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 17 14:42:25 2016 Kuniaki IGARASHI <igaiga@gmail.com> - * string.c (get_actual_encoding): get actual encoding according to - the BOM if exists. + * test/ruby/test_env.rb: [Fix GH-1201] + * Extract test code for ENV#delete_if from ENV#reject_bang + * Add a test case for ENV#reject_bang,delete_if - * string.c (rb_str_inspect): use according encoding, instead of - pseudo encodings, UTF-{16,32}. [ruby-core:59757] [Bug #8940] +Sun Jan 17 14:40:22 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Jan 14 21:07:22 2014 Masaki Matsushita <glass.saga@gmail.com> + * ext/socket/option.c (check_size): extract a macro to check + binary data size, with a consistent message. - * ext/thread/thread.c (rb_szqueue_clear): notify SZQUEUE_WAITERS - on SizedQueue#clear. [ruby-core:59462] [Bug #9342] + * ext/socket/option.c (sockopt_byte): fix error message, + sizeof(int) differs from sizeof(unsigned char) in general. - * test/thread/test_queue.rb: add test. the patch is from - Justin Collins. +Sat Jan 16 21:16:21 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Jan 14 15:58:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * parse.y (xstring): reset heredoc indent after dedenting, + so that following string literal would not be dedented. + [ruby-core:72857] [Bug #11990] - * ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap - depending on PRIsVALUE for 1.9. [Backport #9406] +Sat Jan 16 17:24:24 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * ext/bigdecimal/bigdecimal.c (DECIMAL_SIZE_OF_BITS): fallback - definition for 2.1 or older. [ruby-core:59750] [Backport #9406] + * enc/unicode.c: Artificial mapping to test buffer expansion code. + * string.c: Fixed buffer expansion logic. + * test/ruby/enc/test_case_mapping.rb: Tests for above. + (with Kimihito Matsui) -Tue Jan 14 11:28:44 2014 Yuki Yugui Sonoda <yugui@google.com> +Sat Jan 16 16:47:14 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_exec.c (cfp): Fixes a SEGV issue in r44554. - r11 can be broken by subroutine and sometimes causes SEGV at - runtime. Use r13 instead. + * ext/openssl/lib/openssl/pkey.rb: Added 2048 bit DH parameter. + * test/openssl/test_pkey_dh.rb: ditto. -Tue Jan 14 02:20:00 2014 Kenta Murata <mrkn@mrkn.jp> +Sat Jan 16 10:51:19 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Add an additional - digit for the quotient to be compatible with bigdecimal 1.2.1 and - the former. [ruby-core:59365] [#9316] [#9305] + * enc/unicode.c: fix implicit conversion error with clang. fixup r53548. + * string.c: ditto. - * test/bigdecimal/test_bigdecimal.rb: tests for the above change. +Sat Jan 16 10:31:00 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.4. + * common.mk: test-sample was changed to test-basic. + [Feature #11982][ruby-core:72823] + * basictest/runner.rb: ditto. rename from tool/rubytest.rb. + * basictest/test.rb: ditto. rename from sample/test.rb. + * defs/gmake.mk: picked from r53540 + * sample/test.rb: backward compatibility for chkbuild. -Mon Jan 13 14:55:31 2014 Zachary Scott <e@zzak.io> +Sat Jan 16 10:23:23 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA - Since RAA has been deprecated, and the SSL package has been replaced - with net/https this statement is entirely false and should be - deleted. [Bug #9152] + * string.c, enc/unicode.c: New code path as a preparation for Unicode-wide + case mapping. The code path is currently guarded by the :lithuanian + option to avoid accidental problems in daily use. + * test/ruby/enc/test_case_mapping.rb: Test for above. + * string.c: function 'check_case_options': fixed logical errors + (with Kimihito Matsui) -Mon Jan 13 14:47:07 2014 Zachary Scott <e@zzak.io> +Fri Jan 15 20:20:20 2016 Naohisa Goto <ngotogenome@gmail.com> - * lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis - Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394] - * lib/open-uri.rb: ditto + * regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): The value of + UNALIGNED_WORD_ACCESS should be used to determine whether + unaligned word access is allowed or not. After this commit, + ./configure CPPFLAGS="-DUNALIGNED_WORD_ACCESS=0" disables + unaligned word access even on platforms that support the feature. -Mon Jan 13 14:25:55 2014 Zachary Scott <e@zzak.io> +Fri Jan 15 16:12:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243] + * parse.y (string1): reset heredoc indent for each string literal + so that concatenated string would not be dedented. + [ruby-core:72857] [Bug #11990] -Mon Jan 13 12:03:00 2014 Charlie Somerville <charliesome@ruby-lang.org> +Thu Jan 14 20:01:00 2016 NARUSE, Yui <naruse@ruby-lang.org> - * ext/thread/thread.c (rb_szqueue_push): check GET_SZQUEUE_WAITERS - instead of GET_QUEUE_WAITERS to prevent deadlock. Patch by Eric Wong. - [Bug #9302] [ruby-core:59324] + * lib/uri/generic.rb (URI::Generic#to_s): change encoding to + UTF-8 as Ruby 2.2/ by Koichi ITO <koic.ito@gmail.com> + https://github.com/ruby/ruby/pull/1188 fix GH-1188 - * test/thread/test_queue.rb: add test +Thu Jan 14 17:36:16 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Jan 12 16:41:10 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * variable.c (rb_f_global_variables): add matched back references + only, as well as defined? operator. - * iseq.c (iseq_load): keep type_map to get rid of memory leak. - based on a patch by Eric Wong at [ruby-core:59699]. [Bug #9399] +Thu Jan 14 16:12:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Jan 12 09:21:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * sprintf.c (rb_str_format): format exact number more exactly. - * include/ruby/util.h (DECIMAL_SIZE_OF_BITS): a preprocessor - constant macro to approximate decimal representation size of n-bits - integer. +Thu Jan 14 15:08:43 2016 Tony Arcieri <bascule@gmail.com> - * iseq.c (register_label): use DECIMAL_SIZE_OF_BITS for better - approximation. + * Remove 512-bit DH group. It's affected by LogJam Attack. + https://weakdh.org/ + [fix GH-1196][Bug #11968][ruby-core:72766] - * ext/bigdecimal/bigdecimal.c (BigMath_s_log): ditto. +Thu Jan 14 11:44:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * common.mk (iseq.o), ext/bigdecimal/depend (bigdecimal.o): add - dependency to ruby/util.h for DECIMAL_SIZE_OF_BITS. + * variable.c (rb_f_global_variables): add $1..$9 only if $~ is + set. fix the condition removed at r14014. -Fri Jan 10 16:27:20 2014 Yuki Yugui Sonoda <yugui@google.com> +Wed Jan 13 17:21:45 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_exec.c (cfp): Avoid generating invalid binary for - NativeClient. - r15 on x86_64 is reserved by NativeClient. So r15 to cfp used to - generate invalid binary under some combinations of compiler - optimization flags. + * .travis.yml: removed commented-out code. -Fri Jan 10 18:01:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Jan 13 17:14:54 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * vm_insnhelper.c (vm_search_super_method): allow bound method from a - module, yet another method transplanting. + * .travis.yml: removed osx code. follow up with r53517 -Fri Jan 10 13:34:04 2014 Aman Gupta <ruby@tmm1.net> +Wed Jan 13 16:56:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * insns.def (opt_aref_with): new instruction to optimize Hash#[], - removing any allocation overhead when used with a string literal - key. Patch by normalperson (Eric Wong). [ruby-core:59640] [Bug #9382] - * insns.def (opt_aset_with): new instruction to optimize Hash#[]= - * compile.c (iseq_compile_each): compiler shortcuts for new - instructions - * hash.c (static VALUE rb_hash_compare_by_id_p): fix documentation for - Hash#compare_by_identity to reflect frozen string sharing - * test/ruby/test_hash.rb (class TestHash): test for new behavior + * iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically + generated iseq by eval from GC. [ruby-core:72620] [Bug #11928] -Fri Jan 10 06:23:21 2014 Benoit Daloze <eregontp@gmail.com> +Wed Jan 13 03:42:58 2016 Eric Wong <e@80x24.org> - * range.c (Range#size): [DOC] improve description and add examples. - Patch by @skade. [Fixes GH-501] + * class.c (Init_class_hierarchy): resolve name for rb_cObject ASAP + * object.c (rb_mod_const_set): move name resolution to rb_const_set + * variable.c (rb_const_set): do class resolution here + [ruby-core:72807] [Bug #11977] -Fri Jan 10 00:47:52 2014 Josef Stribny <strzibny@gmail.com> +Wed Jan 13 00:37:12 2016 Satoshi Ohmori <sachin21dev@gmail.com> - * ext/tk/extconf.rb: fix to pass arrays instead of strings to - libpathflag. patch at [ruby-core:59665]. [Bug #9386] + * man/ruby.1: fix double word typo. [Fix GH-1194] -Thu Jan 9 20:49:22 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Jan 12 21:01:09 2016 Benoit Daloze <eregontp@gmail.com> - * configure.in: -mstackrealign is necessary for -msse2 working. - [ruby-core:54716] [Bug #8349] + * common.mk: update URL and name for the Ruby spec suite. - * configure.in: use SSE2 instructions to drop unexpected precisions on - other than mingw. [ruby-core:59472] [Bug #8358] +Tue Jan 12 19:52:19 2016 sorah (Shota Fukumori) <her@sorah.jp> -Thu Jan 9 20:31:10 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * lib/forwardable.rb: Convert given accessors to String. - * hash.c (rb_objid_hash): should return `long'. brushup r44534. + r53381 changed to accept only Symbol or String for accessors, but + there are several rubygems that pass classes (e.g. Array, + Hash, ...) as accessors. Prior r53381, it was accepted because Class#to_s + returns its class name. After r53381 given accessors are checked + with define_method, but it accepts only Symbol or String, otherwise + raises TypeError. - * object.c (rb_obj_hash): follow above change. + def_delegator Foo, :some_method -Thu Jan 9 19:12:37 2014 Koichi Sasada <ko1@atdot.net> + This change is to revert unexpected incompatibility. But this behavior + may change in the future. - * vm.c (rb_vm_pop_cfunc_frame): added. It cares c_return event. - The patch base by drkaes (Stefan Kaes). - [Bug #9321] +Mon Jan 12 18:41:41 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * variable.c (rb_mod_const_missing): use rb_vm_pop_cfunc_frame() - instead of rb_frame_pop(). + * string.c: made a variable name more grammatically correct - * vm_eval.c (raise_method_missing): ditto. +Mon Jan 12 18:34:34 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * vm_eval.c (rb_iterate): ditto. + * string.c: minor grammar fix [ci skip] - * internal.h (rb_vm_pop_cfunc_frame): add decl. +Mon Jan 12 16:09:09 2016 Martin Duerst <duerst@it.aoyama.ac.jp> - * test/ruby/test_settracefunc.rb: add tests. - provided by drkaes (Stefan Kaes). + * test/ruby/enc/test_casing_options.rb: Tests for option + parsing/checking for upcase/downcase/capitalize/swapcase + (see r53503; with Kimihito Matsui) - * vm.c, eval.c, include/ruby/intern.h (rb_frame_pop): - move definition of rb_frame_pop() and deprecate it. - It doesn't care about `return' events. +Mon Jan 12 16:03:03 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Jan 9 17:40:28 2014 NAKAMURA Usaku <usa@ruby-lang.org> + * string.c: Added option parsing/checking for upcase/downcase/ + capitalize/swapcase (with Kimihito Matsui) - * hash.c (rb_any_hash): should treat the return value of rb_objid_hash() - as `long', because ruby assumes the hash value of the object id of - an object is `long'. - this fixes test failures on mswin64 introduced at r44525. +Mon Jan 11 21:28:28 2016 Martin Duerst <duerst@it.aoyama.ac.jp> -Thu Jan 9 09:55:20 2014 Aaron Patterson <aaron@tenderlovemaking.com> + * include/ruby/oniguruma.h: Added flags needed for upcase/downcase + Unicode addition (with Kimihito Matsui) - * ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with - quotes should not have changed. [ruby-core:59316] [Bug #9300] +Mon Jan 11 09:50:24 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/psych/lib/psych.rb: fixed missing require. + * configure.in: check if the API version number is consistent with + the program version number. - * test/psych/test_string.rb: test +Sun Jan 10 20:57:25 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Thu Jan 9 09:51:00 2014 Aaron Patterson <aaron@tenderlovemaking.com> + * compile.c (compile_massign_lhs): when index ends with splat, + append rhs value to it like POSTARG, since VM_CALL_ARGS_SPLAT + splats the last argument only. [ruby-core:72777] [Bug #11970] - * ext/psych/lib/psych/visitors/to_ruby.rb: anonymous structs - should be able to roundtrip. Thanks @splattael! +Sun Jan 10 15:45:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * test/psych/test_object_references.rb: test for change + * include/ruby/missing.h (explicit_bzero_by_memset_s): remove + inline implementation by memset_s, which needs a macro before + including headers and can cause problems in extension libraries + by the order of the macro and headers. -Wed Jan 8 22:53:16 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 10 13:41:36 2016 Eric Wong <e@80x24.org> - * vm_insnhelper.c (vm_search_super_method): when super called in a - bound UnboundMethod generated from a module, no superclass is - found since the current defined class is the module, then call - method_missing in that case. [ruby-core:59619] [Bug #9377] + * io.c (rb_deferr): remove long obsolete global -Wed Jan 8 15:55:21 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 10 09:14:42 2016 Eric Wong <e@80x24.org> - * hash.c (rb_objid_hash): return hash value from object ID with a - salt, extract from rb_any_hash(). + * ext/psych/lib/psych/visitors/yaml_tree.rb (visit_String): + eliminate chomp + * lib/net/http.rb (connect): eliminate delete + * lib/net/http/header.rb (basic_encode): ditto + * lib/net/imap.rb (authenticate): eliminate gsub + (self.encode_utf7): shorten delete arg + * lib/net/smtp.rb (base64_encode): eliminate gsub + * lib/open-uri.rb (OpenURI.open_http): eliminate delete + * lib/rss/rss.rb: ditto + * lib/securerandom.rb (base64): ditto + (urlsafe_base64): eliminate delete! + * lib/webrick/httpauth/digestauth.rb (split_param_value): + eliminate chop + * lib/webrick/httpproxy.rb (do_CONNECT): eliminate delete + (setup_upstream_proxy_authentication): ditto + [ruby-core:72666] [Feature #11938] - * object.c (rb_obj_hash): return same value as rb_any_hash(). - fix r44125. [ruby-core:59638] [Bug #9381] +Sat Jan 9 23:19:14 2016 Kuniaki IGARASHI <igaiga@gmail.com> -Wed Jan 8 13:12:41 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/ruby/test_hash.rb (test_try_convert): Add test for + Hash.try_convert. [Fix GH-1190] - * lib/timeout.rb (Timeout::ExitException.catch): pass arguments - for new instance. +Sat Jan 9 23:15:25 2016 Jon Moss <maclover7@users.noreply.github.com> - * lib/timeout.rb (Timeout::ExitException#exception): fallback to - Timeout::Error if couldn't throw. [ruby-dev:47872] [Bug #9380] + * ext/openssl/ossl.c: Add missing variables to documentation + examples. [Fix GH-1189] - * lib/timeout.rb (Timeout#timeout): initialize ExitException with - message for the fallback case. +Sat Jan 9 18:25:57 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Tue Jan 7 12:43:06 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * symbol.h (is_attrset_id): ASET is an attrset ID. fix + unexpected safe call instead of an ordinary ASET. - * lib/timeout.rb (Timeout#timeout): should not rescue ordinarily - raised ExitException, which should not be thrown. +Sat Jan 9 10:44:33 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/timeout.rb (Timeout::ExitException.catch): set @thread only if - it ought to be caught. + * configure.in, win32/setup.mak: extract RUBY_PROGRAM_VERSION from + RUBY_VERSION in version.h instead of RUBY_API_VERSION numbers in + include/ruby/version.h, and cut it into version numbers. - * lib/timeout.rb (Timeout#timeout): when a custom exception is given, - no instance is needed to be caught, so defer creating new instance - until it is raised. [ruby-core:59511] [Bug #9354] +Sat Jan 9 07:13:33 2016 Koichi Sasada <ko1@atdot.net> -Tue Jan 7 10:16:02 2014 Eric Hodel <drbrain@segment7.net> + * gc.c: rename PAGE_* to HEAP_PAGE_* because PAGE_SIZE is used + in Mac OS X. - * lib/rubygems: Update to RubyGems master 21e409d / RubyGems 2.2.1. + * test/ruby/test_gc.rb: catch up this fix. - See http://rubygems.rubyforge.org/rubygems-update/History_txt.html - for a list of bug fixes. +Sat Jan 9 05:45:40 2016 Koichi Sasada <ko1@atdot.net> - * test/rubygems: ditto. + * gc.c: PAGE_BITMAP_PLANES (the number of bitmap) is 4, not 3. -Tue Jan 7 10:10:46 2014 Eric Wong <e@80x24.org> +Sat Jan 9 05:42:57 2016 Koichi Sasada <ko1@atdot.net> - * ext/json/generator/depend: add build dependencies for json extension - [Bug #9374] [ruby-core:59609] - * ext/json/parser/depend: ditto + * gc.c: rename constant names HEAP_* to PAGE_*. -Tue Jan 7 04:35:46 2014 Aman Gupta <ruby@tmm1.net> + Keys of GC::INTERNAL_CONSTANTS are also renamed. - * array.c (ary_add_hash): Fix consistency issue between Array#uniq and - Array#uniq! [Bug #9340] [ruby-core:59457] - * test/ruby/test_array.rb (class TestArray): regression test for above. + * test/ruby/test_gc.rb: catch up this fix. -Mon Jan 6 21:28:48 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> +Fri Jan 8 22:30:06 2016 Akinori MUSHA <knu@iDaemons.org> - * .gitignore: ignore *-fake.rb generated even when CROSS_COMPILING = no - since r42862. + * doc/regexp.rdoc: [DOC] Elaborate on the \G anchor. [ci skip] -Sun Jan 5 20:14:14 2014 Benoit Daloze <eregontp@gmail.com> +Fri Jan 8 19:49:27 2016 Koichi Sasada <ko1@atdot.net> - * compar.c (cmp_equal): remove error hiding in Comparable#==. - Comparable#== no longer rescues exceptions silently. - This was the cause of quite a couple bugs. See #7688. [EXPERIMENTAL] + * gc.c: remove heap_page::body. Instead of this field, + heap_page::start field works well. - * test/ruby/test_comparable.rb: adapt assertion to match new behavior. +Fri Jan 8 19:31:52 2016 Koichi Sasada <ko1@atdot.net> - * lib/rdoc/method_attr.rb: fix bugs discovered by this change. + * gc.c: rename rb_heap_t::page_length to rb_heap_t::total_pages. - * test/rdoc/test_rdoc_normal_class.rb: fix bugs in tests. + `page_length' is not clear (we may understand with length of + a page). -Sat Jan 4 22:44:00 2014 Charlie Somerville <charliesome@ruby-lang.org> +Fri Jan 8 17:07:14 2016 Koichi Sasada <ko1@atdot.net> - * struct.c (rb_struct_set): return assigned value from setter method - rather than struct object. [Bug #9353] [ruby-core:59509] + * gc.c: remove heap_page::heap. This field is only used to recognize + whether a page is in a tomb or not. Instead of this field, + heap_page::flags::in_tomb (1 bit field) is added. - * test/ruby/test_struct.rb (test_setter_method_returns_value): add test + Also type of heap_page::(total|free|final)_slots are changed from + int to short. 2B is enough for them. -Sat Jan 4 21:44:31 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> +Fri Jan 8 09:33:59 2016 Shugo Maeda <shugo@ruby-lang.org> - * test/ruby/test_gc.rb (TestGc#test_latest_gc_info): use - GC.stat(:key) instead of GC.stat. + * iseq.c (rb_iseq_compile_with_option): move variable initialization + code to avoid maybe-uninitialized warnings by gcc 4.8. -Sat Jan 4 19:15:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jan 8 00:03:22 2016 Shugo Maeda <shugo@ruby-lang.org> - * ext/socket/socket.c (rsock_syserr_fail_host_port): use format flags, - '+' to inspect, ' ' to quote unprintables. + * enum.c (enum_min, enum_max): do the same optimization as r53454. - * ext/socket/socket.c (rsock_syserr_fail_path): ditto. +Thu Jan 7 22:32:21 2016 Kenta Murata <mrkn@mrkn.jp> - * ext/socket/socket.c (rsock_syserr_fail_raddrinfo): ditto. + * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P + and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++. + [ruby-core:72736] [Bug #11962] - * ext/socket/socket.c (rsock_syserr_fail_host_port): add errno - argument version and use rb_syserr_fail_str() instead of - rb_sys_fail_str() with restoring errno. +Thu Jan 7 22:02:21 2016 Shugo Maeda <shugo@ruby-lang.org> - * ext/socket/socket.c (rsock_syserr_fail_path): ditto, and - rb_syserr_fail(). + * enum.c (enum_minmax): optimize object comparison in + Enumerable#minmax. - * ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto, use - rsock_syserr_fail_raddrinfo(). +Thu Jan 7 14:49:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto. + * thread.c (rb_thread_pending_interrupt_p): no pending interrupt + before initialization. - * ext/socket/socket.c (setup_domain_and_type): ditto. + * thread.c (thread_raise_m, rb_thread_kill): uninitialized thread + cannot interrupt. [ruby-core:72732] [Bug #11959] -Sat Jan 4 17:18:58 2014 Kazuki Tsujimoto <kazuki@callcc.net> +Thu Jan 7 11:34:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * vm.c (RubyVM::OPTS): get rid of a garbage character. + * include/ruby/backward.h (ruby_show_copyright_to_die): for source + code backward compatibility. -Sat Jan 4 10:17:54 2014 Eric Hodel <drbrain@segment7.net> + * ruby.c (process_options): return Qtrue to exit the process + successfully. - * lib/rinda/ring.rb (Rinda::RingFinger#make_socket): Use - ipv4_multicast_ttl option for portability. + * version.c (ruby_show_copyright): no longer exit. -Sat Jan 4 10:15:47 2014 Eric Hodel <drbrain@segment7.net> +Wed Jan 6 17:22:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * lib/rinda/ring.rb (Rinda::RingFinger#make_socket): Use - ipv4_multicast_loop option for portability. Patch by Jeremy Evans. - [ruby-trunk - Bug #9351] + * lib/optparse.rb (OptionParser#order!): add `into` optional + keyword argument to store the results. [Feature #11191] -Fri Jan 3 19:09:00 2014 Eric Wong <normalperson@yhbt.net> +Tue Jan 5 21:44:37 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * ext/socket/socket.c (rsock_sys_fail_host_port): save and restore errno - before calling rb_sys_fail_str to prevent [BUG] errno == 0. - Patch by Eric Wong. [ruby-core:59498] [Bug #9352] + * ChangeLog: fix wrong class name. - * ext/socket/socket.c (rsock_sys_fail_path): ditto - * ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto - * ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto - * ext/socket/socket.c (rsock_sys_fail_raddrinfo_or_sockaddr): ditto +Tue Jan 5 21:43:50 2016 Kuniaki IGARASHI <igaiga@gmail.com> -Fri Jan 3 10:43:57 2014 Aman Gupta <ruby@tmm1.net> + * test/ruby/test_string.rb(test_chr): added test for String#chr + [fix GH-1179] - * test/net/imap/cacert.pem: generate new CA cert, since the last one - expired. [Bug #9341] [ruby-core:59459] - * test/net/imap/server.crt: new server cert signed with updated CA. - * test/net/imap/Makefile: add `make regen_certs` to automate this - process. +Tue Jan 5 21:32:26 2016 Kuniaki IGARASHI <igaiga@gmail.com> -Fri Jan 3 00:09:54 2014 Benoit Daloze <eregontp@gmail.com> + * test/ruby/test_numeric.rb (test_nonzero_p): added test for Numeric#nonzero? + [fix GH-1187] - * ext/bigdecimal: update class method call style from :: to . - in documentation and usage. +Tue Jan 5 11:47:23 2016 Damir Gaynetdinov <damir.gaynetdinov@gmail.com> - * ext/bigdecimal/lib/bigdecimal/math.rb: [DOC] fix examples values. - Computations were made using ruby 2.0.0p247 to ensure - no effect of the recent BigDecimal bug. + * doc/marshal.rdoc: Clarify object references example, that the + reference is same object. [Fix GH-1156] - * ext/bigdecimal/sample/nlsolve.rb: fix indent. +Tue Jan 5 05:06:51 2016 Eric Wong <e@80x24.org> -Thu Jan 2 16:07:21 2014 Masaki Matsushita <glass.saga@gmail.com> + * ext/stringio/stringio.c (strio_binmode): implement to set encoding + * test/stringio/test_stringio.rb (test_binmode): new test + [ruby-core:72699] [Bug #11945] - * io.c (io_fwrite): freeze converted str. +Mon Jan 4 15:44:37 2016 Sho Hashimoto <sho-h@ruby-lang.org> -Thu Jan 2 04:15:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + * variable.c (rb_mod_deprecate_constant): [DOC] added + documentation for Module#deprecate_constant. [ci skip] - * eval.c (rb_longjmp): remove an extra modifier from the forward - declaration to match the actual definition. [ruby-core:59451] - [Bug #9338] +Mon Jan 4 15:36:38 2016 Sho Hashimoto <sho-h@ruby-lang.org> -Thu Jan 2 01:23:30 2014 Masaki Matsushita <glass.saga@gmail.com> + * thread_sync.c: [DOC] remove SizedQueue#close argument. + [ci skip] - * vm_eval.c (method_missing): use ALLOCV_N() instead of - ALLOCA_N() and rb_ary_tmp_new(). +Mon Jan 4 10:14:24 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> -Thu Jan 2 00:53:16 2014 Masaki Matsushita <glass.saga@gmail.com> + * test/coverage/test_coverage.rb: ignored test when enabled to coverage. + It lead to crash with `make test-all`. - * array.c (rb_ary_zip): use ALLOCV_N() instead of ALLOCA_N(). +Mon Jan 4 08:10:44 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> -Thu Jan 2 00:04:29 2014 Masaki Matsushita <glass.saga@gmail.com> + * insns.def (opt_case_dispatch): Move a comment to the + appropriate position. + [ci skip] - * hash.c (rb_hash_keys): make rb_hash_keys() static. - it is no longer used from array.c since r43969. - the patch is from normalperson (Eric Wong). - [ruby-core:59449] [Feature #9336] +Sun Jan 3 23:55:13 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * internal.h: remove definition of rb_hash_keys(). + * lib/rubygems/security.rb (DIGEST_ALGORITHM, KEY_ALGORITHM): + should check same name as the used constants. + [ruby-core:72674] [Bug #11940] -Wed Jan 1 18:19:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 3 19:22:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after - LIBPATHFLAG and RPATHFLAG are set. [ruby-dev:47868] [Bug #9317] + * aclocal.m4: add fallback file for non-aclocal environments. + [ruby-core:72683] [Bug #11942] -Wed Jan 1 11:12:29 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 3 13:56:49 2016 Yuichiro Kaneko <yui-knk@ruby-lang.org> - * configure.in: use SSE2 instructions for drop unexpected - precisions. [ruby-core:54738] [Bug #8358] + * eval_error.c (rb_print_undef): Use `rb_method_visibility_t` + instead of `int`. + * eval_intern.h (rb_print_undef): ditto + * proc.c (mnew_internal): ditto + * vm_method.c (rb_export_method): ditto + [Misc #11649] [ruby-core:71311] [fix GH-1078] -Tue Dec 31 23:49:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 3 12:12:09 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * eval.c (rb_f_raise): add cause: optional keyword argument. - [ruby-core:58610] [Feature #8257] [EXPERIMENTAL] + * acinclude.m4: rename aclocal.m4, which should be generated by + aclocal. [ruby-core:72675] [Bug #11941] -Tue Dec 31 21:44:17 2013 Akio Tajima <artonx@yahoo.co.jp> +Sat Jan 2 21:07:55 2016 Eric Wong <e@80x24.org> - * win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c - Fixed [Bug #9333]. + * thread_sync.c (queue_do_pop): avoid cast with Qfalse + (rb_szqueue_push): ditto, use queue_sleep wrapper -Tue Dec 31 21:02:27 2013 Masaki Matsushita <glass.saga@gmail.com> +Sat Jan 2 16:16:14 2016 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> - * io.c (io_fwrite): allocate frozen str only when str is not converted. + * lib/erb.rb: Allow ERB subclass to add token easily. + [Feature #11936] -Tue Dec 31 15:44:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/erb/test_erb.rb: ditto. - * lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions - backward compatibility. [ruby-core:59426] [Bug #9329] +Sat Jan 2 14:44:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Mon Dec 30 23:33:07 2013 Ayumu AIZAWA <ayumu.aizawa@gmail.com> + * parse.y (regexp): set_yylval_num sets u1, should use nd_tag + instead of nd_state. [ruby-core:72638] [Bug #11932] - * variable.c: [DOC] adding extra example in docs. - patched by Steve Klabnik. [Bug #9210] +Sat Jan 2 02:27:22 2016 Marc-Andre Lafortune <ruby-core@marc-andre.ca> -Mon Dec 30 18:34:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/ostruct.rb: Fix case of frozen object with initializer. + Bug revealed by RubySpec [ruby-core:72639] - * encoding.c (must_encindex, rb_enc_from_index, rb_obj_encoding): mask - encoding index and ignore dummy flags. [ruby-core:59354] [Bug #9314] +Fri Jan 1 22:01:52 2016 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> -Mon Dec 30 16:11:52 2013 WATANABE Hirofumi <eban@ruby-lang.org> + * NEWS: mention CSV's liberal_parsing option. - * tool/make-snapshot: needs CXXFLAGS. [ruby-core:59393][Bug #9320] +Fri Jan 1 19:38:23 2016 okkez <okkez000@gmail.com> -Sun Dec 29 18:36:54 2013 Shota Fukumori <her@sorah.jp> + * doc/NEWS-2.3.0: fix double words typo. + [ci skip][fix GH-1183] - * lib/mkmf.rb (configuration): Make CXXFLAGS customizable. - Patch by Kohei Suzuki (eagletmt). [Fixes GH-492] +Fri Jan 1 15:28:56 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Dec 29 12:11:11 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * compile.c (remove_unreachable_chunk): decrease count of + call_info in removed instructions. fix up r53402. - * proc.c (mnew_from_me): keep iclass as-is, to make inheritance - chain consistent. [ruby-core:59358] [Bug #9315] +Fri Jan 1 12:05:53 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * proc.c (method_owner): return the original defined_class from - prepended iclass, instead. + * compile.c (remove_unreachable_chunk): remove unreferred label + to optimize away unreachable chunk. -Sun Dec 29 08:47:24 2013 Lucas Allan Amorim <lucas.allan@gmail.com> +Fri Jan 1 11:42:57 2016 James Edward Gray II <james@graysoftinc.com> - * test/ruby/test_sprintf.rb (test_hash): Added tests for sprintf - with a hash as parameter. [Fixes GH-491] + * lib/csv.rb (CSV): Add a liberal_parsing option. + Patch by Braden Anderson. [#11839] + * test/csv/test_features.rb: test liberal_parsing -Sun Dec 29 07:27:51 2013 Benoit Daloze <eregontp@gmail.com> +Fri Jan 1 10:27:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * compar.c (cmp_eq_recursive): Fix the return value, the value for - failed #<=> should be nil. It was raising a NoMethodError for - the test case TestComparable#test_no_cmp (undefined method `>' - for false:FalseClass). Yet one more reason for #7688. + * tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir + not includedir, the latter is outside the ruby installation. + [ruby-core:72496] [Bug #11881] -Sat Dec 28 22:21:59 2013 Benoit Daloze <eregontp@gmail.com> +Fri Jan 1 08:53:02 2016 Yuki Kurihara <co000ri@gmail.com> - * object.c (Kernel#<=>) surround Comparable operators with <code> tags. - The #== method was hidden in ri/rdoc's output and was highlighting - the line instead. + * test/ruby/test_lazy_enumerator.rb (test_take_bad_arg): Add test + code in case of Enumerator::Lazy#take called with negative number. + [ruby-dev:49467] [Bug #11933] -Sat Dec 28 17:24:00 2013 DV Suresh <e@dvsuresh.me> +Fri Jan 1 05:06:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * benchmark/bm_so_meteor_contest.rb: [DOC] Fix a few typos - * ext/fiddle/lib/fiddle/import.rb: ditto - * ext/psych/lib/psych.rb: ditto - * ext/psych/lib/psych/nodes/sequence.rb: ditto - * ext/tk/lib/multi-tk.rb: ditto - * ext/tk/lib/tcltk.rb: ditto + * parse.y (parser_here_document): update indent for each line in + indented here document with single-quotes. + [ruby-core:72479] [Bug #11871] -Sat Dec 28 00:42:37 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Jan 1 03:26:44 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to - isolate command argument state from outer scope. - [ruby-core:59342] [Bug #9308] + * lib/ostruct.rb (freeze): define deferred accessors before + freezing to get rid of an error when just reading frozen + OpenStruct. -Fri Dec 27 13:25:03 2013 NAKAMURA Usaku <usa@ruby-lang.org> +Thu Dec 31 14:36:45 2015 Marc-Andre Lafortune <ruby-core@marc-andre.ca> - * win32/{setup.mak,Makefile.sub}: update fake.rb like - template/fake.rb.in. + * lib/ostruct.rb: Fix new_ostruct_member to correctly avoid + redefinition [#11901] -Thu Dec 26 16:10:41 2013 NAKAMURA Usaku <usa@ruby-lang.org> +Thu Dec 31 02:45:12 2015 NARUSE, Yui <naruse@ruby-lang.org> - * win32/Makefile.sub (fake.rb): should depend on version.h because - if RUBY_VERSION is updated, fake.rb need to say the new version - to avoid install error in rbconfig.rb. + * test/ruby/test_module.rb (test_classpath): r53376 may change + the order of m.constants. + `make TESTS='-v ruby/test_class.rb ruby/test_module.rb' test-all` + may fail after that. + http://rubyci.s3.amazonaws.com/tk2-243-31075/ruby-trunk/log/20151230T164202Z.log.html.gz -Thu Dec 26 14:25:03 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Thu Dec 31 02:20:00 2015 Benoit Daloze <eregontp@gmail.com> - * hash.c (HASH_REJECT_COPY_EXTRA_STATES): turn off the old - behavior, copying extra states by accident. + * common.mk (help): Fix typo. -Thu Dec 26 10:49:14 2013 Yukihiro Matsumoto <matz@ruby-lang.org> +Wed Dec 30 20:53:09 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * version.h (RUBY_VERSION): 2.2.0 development has started. + * lib/net/http/responses.rb: Added new response class for 451 status code. + * lib/net/http.rb: documentation for HTTPUnavailableForLegalReasons -Thu Dec 26 10:27:53 2013 NAKAMURA Usaku <usa@ruby-lang.org> +Wed Dec 30 20:45:45 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0 - explicit tagging. + * lib/webrick/httpstatus.rb: Added HTTP 451 Status Code. + [fix GH-1167] Patch by @MuhammetDilmac + https://tools.ietf.org/html/draft-tbray-http-legally-restricted-status-00 -Thu Dec 26 06:35:25 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> +Wed Dec 30 20:25:52 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * proc.c: Having any mandatory keyword argument increases min arity - [#9299] + * doc/syntax/calling_methods.rdoc: fix old operator for safe navigation + operator. [ci skip][fix GH-1182] Patch by @dougo -Thu Dec 26 06:27:08 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> +Wed Dec 30 16:43:23 2015 Kuniaki IGARASHI <igaiga@gmail.com> - * proc.c: Having optional keyword arguments makes maximum arity +1, - not unlimited [#8072] + * test/ruby/test_string.rb (test_ord): Add test for String#ord. + [Fix GH-1181] -Thu Dec 26 01:09:57 2013 NAKAMURA Usaku <usa@ruby-lang.org> +Wed Dec 30 11:28:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - * tool/release.sh: make symbolic links. + * lib/forwardable.rb (def_instance_delegator): adjust backtrace of + method body by tail call optimization. adjusting the delegated + target is still done by deleting backtrace. -Thu Dec 26 00:45:33 2013 NAKAMURA Usaku <usa@ruby-lang.org> + * lib/forwardable.rb (def_single_delegator): ditto. - * tool/make-snapshot: support new version scheme. +Wed Dec 30 11:18:42 2015 Elliot Winkler <elliot.winkler@gmail.com> -Wed Dec 25 22:44:14 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * lib/forwardable.rb (def_instance_delegator) fix delegating to + 'args' and 'block', clashing with local variables in generated + methods. [ruby-core:72579] [Bug #11916] - * compile.c (iseq_set_arguments): set arg_keyword_check from - nd_cflag, which is set by parser. internal ID is used for - unnamed keyword rest argument, which should be separated from no - keyword check. + * lib/forwardable.rb (def_single_delegator): ditto. - * iseq.c (rb_iseq_parameters): if no keyword check, keyword rest is - present. +Wed Dec 30 09:58:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - * parse.y (new_args_tail_gen): set keywords check to nd_cflag, which - equals to that keyword rest is not present. + * object.c (rb_class_inherited_p): search the corresponding + ancestor to prepended module from prepending class itself. + [ruby-core:72493] [Bug #11878] -Wed Dec 25 22:32:19 2013 Zachary Scott <e@zzak.io> +Wed Dec 30 09:20:00 2015 Yuki Kurihara <co000ri@gmail.com> - * lib/abbrev.rb: [DOC] rdoc format patch by Giorgos Tsiftsis [Bug #9146] + * test/stringio/test_io.rb (test_flag): add assertion for error when + text and binary mode are mixed. + [ruby-dev:49465] [Feature #11921] -Wed Dec 25 20:30:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Dec 30 08:43:59 2015 Yuki Kurihara <co000ri@gmail.com> - * iseq.c (rb_iseq_parameters): push argument type symbol only for - unnamed rest keywords argument. + * test/stringio/test_stringio.rb (test_initialize): add test for + StringIO#initialize. [ruby-core:72585] [Feature #11920] -Wed Dec 25 20:28:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Dec 30 05:19:24 2015 Eric Wong <e@80x24.org> - * proc.c (rb_iseq_min_max_arity): maximum argument is unlimited if - having rest keywords argument. [ruby-core:53298] [Bug #8072] + * class.c (struct clone_const_arg): adjust for id_table + (clone_const): ditto + (clone_const_i): ditto + (rb_mod_init_copy): ditto + (rb_singleton_class_clone_and_attach): ditto + (rb_include_class_new): ditto + (include_modules_at): ditto + * constant.h (rb_free_const_table): ditto + * gc.c (free_const_entry_i): ditto + (rb_free_const_table): ditto + (obj_memsize_of): ditto + (mark_const_entry_i): ditto + (mark_const_tbl): ditto + * internal.h (struct rb_classext_struct): ditto + * object.c (rb_mod_const_set): resolve class name on assignment + * variable.c (const_update): replace with const_tbl_update + (const_tbl_update): new function + (fc_i): adjust for id_table + (find_class_path): ditto + (autoload_const_set): st_update => const_tbl_update + (rb_const_remove): adjust for id_table + (sv_i): ditto + (rb_local_constants_i): ditto + (rb_local_constants): ditto + (rb_mod_const_at): ditto + (rb_mod_const_set): ditto + (rb_const_lookup): ditto + [ruby-core:72112] [Feature #11614] -Wed Dec 25 18:29:22 2013 Koichi Sasada <ko1@atdot.net> +Wed Dec 30 04:10:13 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> - * vm_insnhelper.c (argument_error): insert dummy frame to make - a backtrace object intead of modify backtrace string array. - [Bug #9295] + * thread_pthread.c (rb_thread_create_timer_thread): destroy attr even + if pthread_create() failed. - * test/ruby/test_backtrace.rb: add a test for this patch. - fix test to compare a result of Exception#backtrace with - a result of Exception#backtrace_locations. +Wed Dec 30 02:55:09 2015 Eric Wong <e@80x24.org> -Wed Dec 25 13:00:54 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * thread_pthread.c (setup_communication_pipe): delay setting owner + (rb_thread_create_timer_thread): until thread creation succeeds + [ruby-core:72590] [Bug #11922] - * configure.in: let mingw do something black-magic, and check if - _gmtime64_s() is available actually. +Tue Dec 29 19:12:46 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - * win32/win32.c (gmtime_s, localtime_s): use _gmtime64_s() and - _localtime64_s() if available, not depending on very confusing - mingw variants macros. based on the patch by phasis68 (Heesob - Park) at [ruby-core:58764]. [ruby-core:58391] [Bug #9119] + * ruby.c (proc_options): -W command line option should be able to + override -w in RUBYOPT environment variable. -Wed Dec 25 12:33:41 2013 Yusuke Endoh <mame@tsg.ne.jp> +Tue Dec 29 17:54:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - * sample/trick2013/: added the award-winning entries of TRICK 2013. - See https://github.com/tric/trick2013 for the contest outline. - (Matz has approved the attachment.) + * eval.c (ignored_block): warn if a block is given to `using`, + which is probably for `Module.new`. -Wed Dec 25 10:42:02 2013 Yamashita Yuu <yamashita@geishatokyo.com> +Tue Dec 29 12:48:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> - * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant - `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined. The - `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest - snapshot of OpenSSL 1.0.1. [Fixes GH-488] + * lib/ostruct.rb (OpenStruct): make respond_to? working on + just-allocated objects for workaround of Psych. + [ruby-core:72501] [Bug #11884] -Wed Dec 25 01:03:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Dec 29 10:35:00 2015 Kenta Murata <mrkn@mrkn.jp> - * proc.c (bind_local_variables): allowing binding to list its - local variables. patch by Jack Danger Canty <jackdanger AT - squareup.com> at [ruby-core:56543]. [Feature #8773] + * test/mkmf/test_have_func.rb (test_have_func): + Add assertion to examine the existence of HAVE_RUBY_INIT. -Tue Dec 24 23:20:38 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * test/mkmf/test_have_func.rb (test_not_have_func): + Add assertion to examine the absence of HAVE_RUBY_INIT. - * test/fileutils/fileasserts.rb (assert_ownership_user): new - assertion for user ownership. +Tue Dec 29 06:50:42 2015 Eric Wong <e@80x24.org> - * test/fileutils/test_fileutils.rb (test_chown_error), - (test_chown_without_permission, test_chown_with_root): - based on the patch by vajrasky (Vajrasky Kok) at - [ruby-core:59298]. [Feature #9292] + * thread_sync.c: static classes -Tue Dec 24 16:28:05 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Tue Dec 29 05:30:30 2015 Eric Wong <e@80x24.org> - * proc.c (rb_mod_define_method): consider visibility only if self - in the caller is same as the receiver, otherwise make public as - well as old behavior. [ruby-core:57747] [Bug #9005] - [ruby-core:58497] [Bug #9141] + * lib/resolv.rb (Resolv::IPv6.create): avoid modifying frozen + * test/resolv/test_dns.rb (test_ipv6_create): test for above + [Bug #11910] [ruby-core:72559] - * vm.c (rb_vm_cref_in_context): return ruby level cref if self is - same. +Mon Dec 28 14:55:57 2015 Kuniaki IGARASHI <igaiga@gmail.com> -Tue Dec 24 14:13:14 2013 Koichi Sasada <ko1@atdot.net> + * test/ruby/test_string.rb (TestString#test_rstrip_bang): Add test + for String#rstrip!. [Fix GH-1176] - * README.EXT: add a refer to URL. +Mon Dec 28 09:18:53 2015 Kuniaki IGARASHI <igaiga@gmail.com> -Tue Dec 24 13:48:45 2013 Koichi Sasada <ko1@atdot.net> + * test/ruby/test_string.rb (TestString#test_lstrip_bang): Add test + for String#lstrip!. [Fix GH-1176] - * README.EXT: add a document about RGenGC. - Reviewed by havenwood. - [misc #8962] +Sun Dec 27 23:32:26 2015 Masaki Suketa <masaki.suketa@nifty.ne.jp> - * README.EXT.ja: ditto. + * ext/win32ole/win32ole.c (ole_variant2val): refactoring. -Tue Dec 24 12:11:43 2013 Koichi Sasada <ko1@atdot.net> +Sun Dec 27 21:14:42 2015 NAKAMURA Usaku <usa@ruby-lang.org> - * include/ruby/ruby.h (RARRAY_ASET): try to avoid compiler warning. - [Bug #9287] + * process.c (rb_execarg_parent_start1): need to convert the encoding to + ospath's one. -Tue Dec 24 05:04:56 2013 NAKAMURA Usaku <usa@ruby-lang.org> +Sun Dec 27 20:54:22 2015 NAKAMURA Usaku <usa@ruby-lang.org> - * test/fileutils/test_fileutils.rb (setup): should not call - Process.groups for Windows. get rid of many errors introduced by - r44364. + * process.c: use rb_w32_uchdir() instead of plain chdir() on Windows. + reported by naruse via twitter. -Mon Dec 23 18:37:16 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * process.c (rb_execarg_addopt): need to convert the encoding to + ospath's one. - * test/fileutils/fileasserts.rb (assert_ownership_group): new - assertion for group ownership. +Sun Dec 27 20:00:31 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * test/fileutils/test_fileutils.rb (test_chown{,_verbose,_noop}): - based on the patch by vajrasky (Vajrasky Kok) at - [ruby-core:59281]. [Feature #9286] + * enc/x_emoji.h: fix dead-link. -Mon Dec 23 15:53:45 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Dec 27 19:55:55 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> - * hash.c (HAS_EXTRA_STATES): warn extra states only when something - differ. [ruby-core:59254] [Bug #9275] + * doc/NEWS-2.3.0: fix a typo. -Mon Dec 23 12:42:13 2013 Marc-Andre Lafortune <ruby-core@marc-andre.ca> +Sun Dec 27 18:08:15 2015 Kuniaki IGARASHI <igaiga@gmail.com> - * array.c: Have to_h raise on elements that are not key-value pairs - [#9239] + * string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): [DOC] Fix + ruby-doc comments for String#rstrip! and lstrip!. It looks like + dropped bang. [Fix GH-1175] - * enum.c: ditto +Sun Dec 27 15:14:20 2015 Eric Wong <e@80x24.org> -Mon Dec 23 05:01:55 2013 Zachary Scott <e@zzak.io> + * io.c (io_getpartial): remove unused kwarg from template + * test/ruby/test_io.rb (test_readpartial_bad_args): new + [Bug #11885] - * doc/syntax/methods.rdoc: [DOC] Added example for underscore - conventions in method names. Also added doc to clarify encoding - character set support for Ruby programs and elaborated on defining - predicate and bang methods. Based on a patch by @gaurish - [Fixes GH-477] https://github.com/ruby/ruby/pull/477 +Sun Dec 27 11:50:53 2015 Kuniaki IGARASHI <igaiga@gmail.com> -Mon Dec 23 03:18:09 2013 Zachary Scott <e@zzak.io> + * test/ruby/test_string.rb (test_rstrip, test_lstrip): Add tests + for String#lstrip and rstrip. The test cases are used from + string.c ruby-doc comments. [Fix GH-1174] - * doc/ChangeLog-1.9.3: [DOC] Fix typos by @dvsuresh - [Fixes GH-485] https://github.com/ruby/ruby/pull/485 - * ext/openssl/ossl_config.c: ditto - * lib/rss/utils.rb, lib/time.rb: ditto - * test/ruby/envutil.rb: ditto +Sun Dec 27 11:47:46 2015 Kuniaki IGARASHI <igaiga@gmail.com> -Sun Dec 22 23:56:56 2013 Zachary Scott <e@zzak.io> + * test/ruby/test_string.rb (test_insert): Add test for + String#insert. The test cases are written in string.c + comments as a reference. [Fix GH-1173] - * lib/{rake,rdoc,rss}/*, test/rexml/test_listener.rb: [DOC] Fix typos - by @dvsuresh [Fixes GH-486] https://github.com/ruby/ruby/pull/486 +Sun Dec 27 11:03:33 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Dec 22 11:08:47 2013 Eric Hodel <drbrain@segment7.net> + * parse.y (show_bitstack): trace stack_type value if yydebug. - * test/rubygems/test_gem_ext_builder.rb: Fix warning due to ambiguous - expression. +Sun Dec 27 10:03:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Dec 22 11:05:53 2013 Eric Hodel <drbrain@segment7.net> + * enc/depend (enc, trans): fix version dependency, shared object + files depend on the RUBY_SO_NAME value for runtime link. - * lib/rubygems/commands/install_command.rb: Restore gem install - --ignore-dependencies for remote gems - * test/rubygems/test_gem_commands_install_command.rb: Test for the - above. +Sun Dec 27 09:47:20 2015 Masaki Suketa <masaki.suketa@nifty.ne.jp> -Sun Dec 22 10:23:40 2013 Eric Hodel <drbrain@segment7.net> + * ext/win32ole/win32ole.c (ole_vstr2wc, ole_variant2val): fix blank + string conversion. + [Bug #11880] + Thanks Akio Tajima for the patch! - * lib/rdoc.rb: Set RDoc to release version. +Sun Dec 27 09:34:53 2015 craft4coder <yooobuntu@163.com> -Sun Dec 22 10:19:07 2013 Eric Hodel <drbrain@segment7.net> + * doc/extension.rdoc: [DOC] `nul` should be uppercase. + change 'nul' => 'NUL'. [Fix GH-1172] - * lib/rubygems.rb: Set RubyGems to release version. +Sat Dec 26 18:29:01 2015 Kouhei Sutou <kou@cozmixng.org> -Sun Dec 22 10:16:08 2013 Eric Hodel <drbrain@segment7.net> + * lib/xmlrpc/client.rb: Support SSL options in async methods of + XMLRPC::Client. + [Bug #11489] + Reported by Aleksandar Kostadinov. Thanks!!! - * lib/rubygems.rb (module Gem): Fix comment for - Gem::load_path_insert_index. +Sat Dec 26 11:26:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sun Dec 22 04:07:55 2013 Koichi Sasada <ko1@atdot.net> + * miniinit.c (Init_enc): add some common aliases of built-in + encodings. [ruby-core:72481] [Bug #11872] - * gc.c (ruby_gc_set_params): don't show obsolete warnings for - RUBY_FREE_MIN/RUBY_HEAP_MIN_SLOTS if - RUBY_GC_HEAP_FREE_SLOTS/RUBY_GC_HEAP_INIT_SLOTS are given. - [Bug #9276] +Fri Dec 25 22:43:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> -Sat Dec 21 13:00:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + * configure.in: extract RUBY_RELEASE_DAY at generating Makefile. - * file.c: remove unnecessary the source path from EEXIST error - messages and show the destination path only. [ruby-core:59202] - [Feature #9263] + * version.h (RUBY_RELEASE_DATE): construct from RUBY_RELEASE_YEAR, + RUBY_RELEASE_MONTH, and RUBY_RELEASE_DAY. -Sat Dec 21 12:37:19 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Dec 25 21:33:06 2015 Yukihiro Matsumoto <matz@ruby-lang.org> - * lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not - consider encodings in hosts file. [ruby-core:59239] [Bug #9273] + * version.h (RUBY_VERSION): 2.4.0 development has started. - * lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto. +Fri Dec 25 14:12:12 2015 Martin Duerst <duerst@it.aoyama.ac.jp> -Sat Dec 21 05:43:27 2013 NAKAMURA Usaku <usa@ruby-lang.org> + * doc/ChangeLog-2.3.0, ext/tk/lib/tkextlib/SUPPORT_STATUS, + include/ruby/version.h: minor grammar fixes [ci skip] - * tool/make-snapshot: replace RUBY_PATCHLEVEL_STR in version.h to - show users that this ruby is a preview/rc version. +Fri Dec 25 08:23:22 2015 Tadashi Saito <tad.a.digger@gmail.com> -Sat Dec 21 05:03:49 2013 NAKAMURA Usaku <usa@ruby-lang.org> + * compile.c, cont.c, doc, man: fix common misspelling. + [ruby-core:72466] [Bug #11870] - * win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly - install win32.h. - [ruby-core:58801][Bug #9199] reported by arton. +For the changes before 2.3.0, see doc/ChangeLog-2.3.0 +For the changes before 2.2.0, see doc/ChangeLog-2.2.0 For the changes before 2.1.0, see doc/ChangeLog-2.1.0 For the changes before 2.0.0, see doc/ChangeLog-2.0.0 For the changes before 1.9.3, see doc/ChangeLog-1.9.3 diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb index b97a08d928..35a8e75876 100644 --- a/KNOWNBUGS.rb +++ b/KNOWNBUGS.rb @@ -1,5 +1,7 @@ # -# This test file concludes tests which point out known bugs. +# IMPORTANT: Always keep the first 7 lines (comments), +# even if this file is otherwise empty. +# +# This test file includes tests which point out known bugs. # So all tests will cause failure. # - @@ -90,6 +90,74 @@ http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/ When this software is partly used or it is distributed with Ruby, this of Ruby follows the license of Ruby. +enc/trans/GB/GB12345%UCS.src: +enc/trans/GB/UCS%GB12345.src: + + Copyright (c) 1991-1994 Unicode, Inc. All Rights reserved. + + This file is provided as-is by Unicode, Inc. (The Unicode Consortium). + No claims are made as to fitness for any particular purpose. No + warranties of any kind are expressed or implied. The recipient + agrees to determine applicability of information provided. If this + file has been provided on magnetic media by Unicode, Inc., the sole + remedy for any claim will be exchange of defective media within 90 + days of receipt. + + Recipient is granted the right to make copies in any form for + internal distribution and to freely use the information supplied + in the creation of products supporting Unicode. Unicode, Inc. + specifically excludes the right to re-distribute this file directly + to third parties or other organizations whether for profit or not. + + +enc/trans/GB/GB2312%UCS.src: +enc/trans/GB/UCS%GB2312.src: + + Copyright (c) 1991-1999 Unicode, Inc. All Rights reserved. + + This file is provided as-is by Unicode, Inc. (The Unicode Consortium). + No claims are made as to fitness for any particular purpose. No + warranties of any kind are expressed or implied. The recipient + agrees to determine applicability of information provided. If this + file has been provided on optical media by Unicode, Inc., the sole + remedy for any claim will be exchange of defective media within 90 + days of receipt. + + Unicode, Inc. hereby grants the right to freely use the information + supplied in this file in the creation of products supporting the + Unicode Standard, and to make copies of this file in any form for + internal or external distribution as long as this notice remains + attached. + +enc/trans/JIS/JISX0201-KANA%UCS.src: +enc/trans/JIS/JISX0208@1990%UCS.src: +enc/trans/JIS/JISX0212%UCS.src: +enc/trans/JIS/UCS%JISX0201-KANA.src: +enc/trans/JIS/UCS%JISX0208@1990.src: +enc/trans/JIS/UCS%JISX0212.src: + + © 2015 Unicode®, Inc. + For terms of use, see http://www.unicode.org/terms_of_use.html + +enc/trans/JIS/JISX0213-1%UCS@BMP.src: +enc/trans/JIS/JISX0213-1%UCS@SIP.src: +enc/trans/JIS/JISX0213-2%UCS@BMP.src: +enc/trans/JIS/JISX0213-2%UCS@SIP.src: + + Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved. + Copyright (C) 2001 I'O, All Rights Reserved. + Copyright (C) 2006 Project X0213, All Rights Reserved. + You can use, modify, distribute this table freely. + +enc/trans/JIS/UCS@BMP%JISX0213-1.src: +enc/trans/JIS/UCS@BMP%JISX0213-2.src: +enc/trans/JIS/UCS@SIP%JISX0213-1.src: +enc/trans/JIS/UCS@SIP%JISX0213-2.src: + + Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved. + Copyright (C) 2001 I'O, All Rights Reserved. + You can use, modify, distribute this table freely. + configure: This file is free software. @@ -264,31 +332,33 @@ random.c vm_dump.c:procstat_vm - * Copyright (c) 2007 Robert N. M. Watson - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $ + This file is under the new-style BSD license. + + Copyright (c) 2007 Robert N. M. Watson + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $ vsnprintf.c: @@ -330,7 +400,10 @@ vsnprintf.c: From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change paragraph 3 above is now null and void. -st.[ch]: +st.c: +strftime.c: +include/ruby/st.h: +missing/acosh.c: missing/alloca.c: missing/dup2.c: missing/erf.c: @@ -342,10 +415,14 @@ missing/lgamma_r.c: missing/memcmp.c: missing/memmove.c: missing/strchr.c: +missing/strerror.c: missing/strstr.c: missing/strtol.c: missing/tgamma.c: +ext/date/date_strftime.c: ext/digest/sha1/sha1.[ch]: +ext/sdbm/_sdbm.c: +ext/sdbm/sdbm.h: These files are all under public domain. @@ -421,32 +498,21 @@ missing/setproctitle.c missing/strlcat.c missing/strlcpy.c - These files are under the new-style BSD license. + These files are under an ISC-style license. - Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> - All rights reserved. + Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com> - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. missing/langinfo.c @@ -527,6 +593,28 @@ ext/digest/sha2/sha2.[ch]: OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +ext/json/generator/generator.c: + + Copyright 2001-2004 Unicode, Inc. + + Disclaimer + + This source code is provided as is by Unicode, Inc. No claims are + made as to fitness for any particular purpose. No warranties of any + kind are expressed or implied. The recipient agrees to determine + applicability of information provided. If this file has been + purchased on magnetic or optical media from Unicode, Inc., the + sole remedy for any claim will be exchange of defective media + within 90 days of receipt. + + Limitations on Rights to Redistribute This Code + + Unicode, Inc. hereby grants the right to freely use the information + supplied in this file in the creation of products supporting the + Unicode Standard, and to make copies of this file in any form + for internal or external distribution as long as this notice + remains attached. + ext/nkf/nkf-utf8/config.h: ext/nkf/nkf-utf8/nkf.c: ext/nkf/nkf-utf8/utf8tbl.c: @@ -590,3 +678,9 @@ ext/win32ole/win32ole.c: 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. + +lib/rdoc/generator/template/darkfish/css/fonts.css: + + This file is licensed under the SIL Open Font License. + + http://scripts.sil.org/OFL diff --git a/Makefile.in b/Makefile.in index 7da2488b46..9c8748aa4d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -22,6 +22,8 @@ LD = @LD@ YACC = bison PURIFY = AUTOCONF = autoconf +ACLOCAL = aclocal +CONFIGURE = @CONFIGURE@ @SET_MAKE@ MKFILES = @MAKEFILES@ BASERUBY = @BASERUBY@ @@ -51,7 +53,7 @@ DOCTARGETS = @RDOCTARGET@ @CAPITARGET@ EXTOUT = @EXTOUT@ arch_hdrdir = $(EXTOUT)/include/$(arch) -VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing +VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing empty = CC_VERSION = @CC_VERSION@ @@ -65,7 +67,6 @@ optflags = @optflags@ debugflags = @debugflags@ warnflags = @warnflags@ @strict_warnflags@ cppflags = @cppflags@ -INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) XCFLAGS = @XCFLAGS@ CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ @@ -113,12 +114,14 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ XRUBY_LIBDIR = @XRUBY_LIBDIR@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ +BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ #### End of system configuration section. #### MAJOR= @MAJOR@ MINOR= @MINOR@ TEENY= @TEENY@ +RUBY_PROGRAM_VERSION = @RUBY_PROGRAM_VERSION@ LIBRUBY_A = @LIBRUBY_A@ LIBRUBY_SO = @LIBRUBY_SO@ @@ -161,7 +164,7 @@ RMDIRS = @RMDIRS@ RMALL = @RMALL@ NM = @NM@ AR = @AR@ -ARFLAGS = rcu +ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ AS = @AS@ ASFLAGS = @ASFLAGS@ $(INCFLAGS) @@ -185,7 +188,7 @@ SYMBOL_PREFIX = @SYMBOL_PREFIX@ INSTALLED_LIST= .installed.list -NEWLINE_C = newline.c +NEWLINE_C = enc/trans/newline.c MINIPRELUDE_C = miniprelude.c PRELUDE_C = prelude.c RBCONFIG = .rbconfig.time @@ -215,7 +218,7 @@ all: miniruby$(EXEEXT): @-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi $(ECHO) linking $@ - $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@ $(PROGRAM): @$(RM) $@ @@ -239,19 +242,27 @@ $(LIBRUBY_SO): @-$(PRE_LIBRUBY_UPDATE) $(ECHO) linking shared-library $@ $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@ - -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@ + -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \ + -L '$(SYMBOL_PREFIX)*_threadptr_*' $@ $(Q) $(POSTLINK) @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link rescue nil; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true -$(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in - @./config.status --file=$@:$(srcdir)/template/fake.rb.in - @chmod +x $@ ruby_pc = @ruby_pc@ $(ruby_pc): @./config.status --file=$@:$(srcdir)/template/ruby.pc.in +ruby-runner.h: template/ruby-runner.h.in + @./config.status --file=$@:$(srcdir)/template/$(@F).in + +ruby-runner$(EXEEXT): ruby-runner.c ruby-runner.h + $(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $< + +$(RBCONFIG): $(PREP) + +rbconfig.rb: $(RBCONFIG) + install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \ $(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE) $(ECHO) installing cross-compiling stuff @@ -287,18 +298,23 @@ uncommon.mk: $(srcdir)/common.mk sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@ .PHONY: reconfig -reconfig-args = $(srcdir)/configure $(configure_args) +reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args) config.status-args = ./config.status --recheck -reconfig-exec-0 = exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3` +reconfig-exec-0 = test -t 1 && { CONFIGURE_TTY=yes; export CONFIGURE_TTY; }; exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-` reconfig-exec-1 = set -x; "$$@" -reconfig config.status: $(srcdir)/configure $(srcdir)/enc/Makefile.in \ +reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \ $(srcdir)/include/ruby/version.h @PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \ set $(SHELL) $($@-args); $(reconfig-exec-$(V)) -$(srcdir)/configure: $(srcdir)/configure.in - $(CHDIR) $(srcdir) && exec $(AUTOCONF) +$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4 + $(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F) + +$(srcdir)/aclocal.m4: + $(CHDIR) $(srcdir) && \ + type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \ + touch $(@F) incs: id.h all-incs: probes.h @@ -317,31 +333,14 @@ lex.c: defs/keywords $(CP) $(srcdir)/lex.c.blt $@; \ else \ [ $(Q) ] && echo generating $@ || set -x; \ - gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \ + gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \ + | sed 's/(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \ + > $@.tmp && \ $(MV) $@.tmp $@ && \ $(CP) $? $(srcdir)/defs/lex.c.src && \ $(CP) $@ $(srcdir)/lex.c.blt; \ fi -NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p - -enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd - $(MAKEDIRS) $(@D) - @set +e; \ - if cmp -s $(?:.kwd=.src) $?; then \ - set -x; \ - $(CP) $(?:.kwd=.h.blt) $@; \ - else \ - trap '$(RM) $@-1.h $@-2.h' 0 && \ - set -x; \ - sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \ - sed '/^#ifdef USE_UNICODE_PROPERTIES/d;/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-2.h && \ - diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \ - $(MV) $@.tmp $@ && \ - $(CP) $? $(?:.kwd=.src) && \ - $(CP) $@ $(?:.kwd=.h.blt); \ - fi - JIS_PROPS_OPTIONS = -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property enc/jis/props.h: enc/jis/props.kwd @@ -377,12 +376,12 @@ enc/jis/props.h: enc/jis/props.kwd .d.h: @$(ECHO) translating probes $< $(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $< - $(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@ + $(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/RUBY_PROBES_H/' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@ $(Q) $(RM) $@.tmp .dmyh.h: - @$(ECHO) copying dummy $(DEST_FILE) - $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE) + @$(ECHO) making dummy $(DEST_FILE) + $(Q)echo '#include "$(*F).dmyh"' > $@ probes.stamp: $(DTRACE_REBUILD_OBJS) $(Q) if test -f $@ -o -f probes.$(OBJEXT); then \ @@ -392,7 +391,7 @@ probes.stamp: $(DTRACE_REBUILD_OBJS) fi $(Q) touch $@ -probes.@OBJEXT@: $(srcdir)/probes.d probes.stamp +probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp) @$(ECHO) processing probes in object files $(Q) $(RM) $@ $(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS) @@ -418,7 +417,7 @@ clean-ext distclean-ext realclean-ext:: @cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \ test "$$#" = 0 && set .; \ set dummy `\ - find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \ + find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$::' | sort; \ `; shift; \ cd ..; \ for dir do \ @@ -440,7 +439,7 @@ clean-extout: clean-enc distclean-enc realclean-enc: @test -f "$(ENC_MK)" || exit 0; \ echo $(@:-enc=ing) encodings; \ - exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=) + exec $(MAKE) $(MAKE_ENC) $(@:-enc=) ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(ECHO) compiling $@ @@ -448,47 +447,87 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP) -up:: +update-src:: @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) -after-update:: update-config_files common-srcs +update-download:: update-config_files + +after-update:: common-srcs update-mspec: @$(CHDIR) $(srcdir); \ if [ -d spec/mspec ]; then \ - cd spec/mspec; \ echo updating mspec ...; \ + $(Q1:0=:) set -x; \ + cd spec/mspec && \ exec git pull; \ else \ echo retrieving mspec ...; \ + $(Q1:0=:) set -x; \ exec git clone $(MSPEC_GIT_URL) spec/mspec; \ fi + $(Q)cd $(srcdir)/spec/mspec && exec git --no-pager log -1 --oneline update-rubyspec: update-mspec @$(CHDIR) $(srcdir); \ if [ -d spec/rubyspec ]; then \ - cd spec/rubyspec; \ echo updating rubyspec ...; \ + $(Q1:0=:) set -x; \ + cd spec/rubyspec && \ exec git pull; \ else \ echo retrieving rubyspec ...; \ + $(Q1:0=:) set -x; \ exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \ fi + $(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline test-rubyspec-precheck: @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi -update-coverage: +update-doclie: + @$(CHDIR) $(srcdir); \ + if [ -d coverage/doclie ]; then \ + echo updating doclie ...; \ + $(Q1:0=:) set -x; \ + cd coverage/doclie && \ + git fetch && \ + exec git checkout $(DOCLIE_GIT_REF); \ + else \ + echo retrieving doclie ...; \ + $(Q1:0=:) set -x; \ + exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \ + fi + +update-simplecov-html: + @$(CHDIR) $(srcdir); \ + if [ -d coverage/simplecov-html ]; then \ + echo updating simplecov-html ...; \ + $(Q1:0=:) set -x; \ + cd coverage/simplecov-html && \ + git fetch && \ + exec git checkout $(SIMPLECOV_HTML_GIT_REF); \ + else \ + echo retrieving simplecov-html ...; \ + exec git clone --branch $(SIMPLECOV_HTML_GIT_REF) $(SIMPLECOV_HTML_GIT_URL) coverage/simplecov-html; \ + fi + +update-simplecov: @$(CHDIR) $(srcdir); \ if [ -d coverage/simplecov ]; then \ - cd coverage/simplecov; \ echo updating simplecov ...; \ - exec git pull; \ + $(Q1:0=:) set -x; \ + cd coverage/simplecov && \ + git fetch && \ + exec git checkout $(SIMPLECOV_GIT_REF); \ else \ echo retrieving simplecov ...; \ - exec git clone $(SIMPLECOV_GIT_URL) coverage/simplecov; \ + $(Q1:0=:) set -x; \ + exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \ fi +update-coverage: update-simplecov update-simplecov-html update-doclie + INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ vmtc.inc vm.inc @@ -504,3 +543,7 @@ loadpath: verconf.h @$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \ sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \ -e '/^ /!d;s/ *"\\0"$$//;s/" *"//g' + +un-runnable: + $(ECHO) cannot make runnable, configure with --enable-load-relative. + $(Q) exit 1 @@ -1,356 +1,211 @@ # -*- rdoc -*- -= NEWS for Ruby 2.2.0 += NEWS for Ruby 2.4.0 This document is a list of user visible feature changes made between releases except for bug fixes. Note that each entry is kept so brief that no reason behind or reference information is supplied with. For a full list of changes -with all sufficient information, see the ChangeLog file. +with all sufficient information, see the ChangeLog file or Redmine +(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>) -== Changes since the 2.1.0 release +== Changes since the 2.3.0 release === Language changes -* nil/true/false - * nil/true/false objects are frozen. [Feature #8923] +* Multiple assignment in conditional expression is now allowed. + [Feature #10617] -* Hash literal - * Symbol key followed by a colon can be quoted. [Feature #4276] +=== Core classes updates (outstanding ones only) -* default argument - fixed a very longstanding bug that an optional argument was not - accessible in its default value expression. [Bug #9593] +* Array -=== Core classes updates (outstanding ones only) + * Array#max and Array#min. [Feature #12172] + This may cause a tiny incompatibility: if you redefine + Enumerable#max and call max to an Array, your redefinition will be + now ignored. You should also redefine Array#max. + + * Array#sum [Feature #12217] + This is different from Enumerable#sum in that Array#sum doesn't depend on + the definition of each method. -* Binding - * New methods: - * Binding#local_variables - * Binding#receiver +* Comparable + + * Comparable#clamp. [Feature #10594] * Dir - * New methods: - * Dir#fileno + + * Dir.empty?. [Feature #10121] * Enumerable - * New methods: - * Enumerable#slice_after - * Enumerable#slice_when - * Extended methods: - * min, min_by, max and max_by supports optional argument to return - multiple elements. -* Float - * New methods: - * Float#next_float - * Float#prev_float + * Enumerable#sum [Feature #12217] + * Enumerable#uniq [Feature #11090] + +* Enumerator::Lazy + + * Enumerator::Lazy#uniq [Feature #11090] * File - * New methods: - * File.birthtime - * File#birthtime -* File::Stat - * New methods: - * File::Stat#birthtime + * File.empty?. [Feature #9969] -* GC - * GC.latest_gc_info returns :state to represent current GC status. - * Improvements - * Introduce incremental marking for major GC. [Feature #10137] +* Float -* IO - * Improvements - * IO#nonblock_read and IO#nonblock_write for pipes on Windows are supported. + * Float#ceil, Float#floor, and Float#truncate now take an optional + digits, as well as Float#round. [Feature #12245] + +* Hash + + * Hash#transform_values and Hash#transform_values! [Feature #12512] + +* Integer + + * Integer#ceil, Integer#floor, and Integer#truncate now take an optional + digits, as well as Integer#round. [Feature #12245] + + * Fixnum and Bignum are unified into Integer [Feature #12005] + + * Integer#digits for extracting columns of place-value notation [Feature #12447] * Kernel - * New methods: - * Kernel#itself - * Improvements - * Kernel#throw raises UncaughtThrowError, subclass of ArgumentError when - there is no corresponding catch block, instead of ArgumentError. -* Process - * Extended method: - * Process execution methods such as Process.spawn opens the file in write - mode for redirect from [:out, :err]. + * Kernel#clone now takes an optional keyword argument, freeze flag. + [Feature #12300] + +* MatchData + + * MatchData#named_captures [Feature #11999] + * MatchData#values_at supports named captures [Feature #9179] + +* Regexp + + * Regexp#match? [Feature #8110] + This returns bool and doesn't save backref. + +* Regexp/String: Updated Unicode version from 8.0.0 to 9.0.0 [Feature #12513] + +* RubyVM::Env + + * RubyVM::Env was removed. * String - * New methods: - * String#unicode_normalize - * String#unicode_normalize! - * String#unicode_normalized? + + * String#upcase, String#downcase, String#capitalize, String#swapcase and + their bang variants work for all of Unicode, and are no longer limited + to ASCII. Supported encodings are UTF-8, UTF-16BE/LE, UTF-32BE/LE, and + ISO-8859-1~16. Variations are available with options. See the documentation + of String#downcase for details. [Feature #10085] + + * String.new(capacity: size) [Feature #12024] * Symbol - * Improvements - * Most symbols which are returned by String#to_sym and - String#intern are GC-able. -* Method - * New methods: - * Method#curry([arity]) returns a curried Proc. - * Method#super_method returns a Method of superclass, which would be called - when super is used. + * Symbol#match now returns MatchData. [Bug #11991] -=== Core classes compatibility issues (excluding feature bug fixes) + * Symbol#upcase, Symbol#downcase, Symbol#capitalize, and Symbol#swapcase now + work for all of Unicode. See the documentation of String#downcase + for details. [Feature #10085] -* Enumerable - * Enumerable#slice_before's state management deprecated. - * Enumerable#chunk's state management deprecated. - -* GC - * incompatible changes: - * Rename GC.stat entries. [Feature #9924] - See https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing - -* IO - * incompatible changes: - * When flushing file IO with IO#flush, you cannot assume that the metadata - of the file is updated immediately. On some platforms (especially - Windows), it is delayed until the filesystem load is decreased. - Use IO#fsync if you want to guarantee updating metadata. - -* Math - * incompatible changes: - * Math.log now raises Math::DomainError instead of returning NaN if the - base is less than 0, and returns NaN instead of -infinity if both of - two arguments are 0. - * Math.atan2 now returns values like as expected by C99 if both two - arguments are infinity. - -* Proc - * incompatible changes: - * ArgumentError is no longer raised when lambda Proc is passed as a - block, and the number of yielded arguments does not match the formal - arguments of the lambda, if just an array is yielded and its length - matches. - -* Process - * Process execution methods such as Process.spawn opens the file in write - mode for redirect from [:out, :err]. - Before Ruby 2.2, it was opened in read mode. +* Thread -=== Stdlib updates (outstanding ones only) + * Thread#report_on_exception and Thread.report_on_exception + [Feature #6647] -* Continuation - * callcc is obsolete. use Fiber instead. - -* Digest - - * Digest() should now be thread-safe. If you have a problem with - regard to on-demand loading under a multi-threaded environment, - preload "digest/*" modules on boot or use this method instead of - directly referencing Digest::*. - * Digest::HMAC has been removed just as previously noticed. - -* DL - * DL has been removed from stdlib. Please use Fiddle instead! - -* Etc - * New methods: - * Etc.uname - * Etc.sysconf - * Etc.confstr - * IO#pathconf - * Etc.nprocessors - -* Find, Pathname - * Extended methods: - * find method accepts "ignore_error" keyword argument. - -* Matrix - * New methods: - * Matrix#first_minor(row, column) returns the submatrix obtained - by deleting the specified row and column. - * Matrix#cofactor(row, column) returns the (row, column) cofactor - which is obtained by multiplying the first minor by (-1)**(row + column). - * Matrix#adjugate returns the adjugate of the matrix. - * hstack and vstack are new instance and class methods to stack matrices - horizontally and vertically. - * Matrix#laplace_expansion(row_or_column: num) returns the laplace_expansion - along the +num+ -th row or column. - * Vector.basis(size:, index:) returns the specified basis vector. - * Unary - and + added for Vector and Matrix. - * Vector#cross_product generalized to arbitrary dimensions. - * Vector#dot and #cross are aliases for #inner_product and #cross_product. - * Vector#angle_with returns the angle with its argument - * New instance and class method independent? to test linear independence. - -* Pathname - * Pathname#/ is aliased to Pathname#+. - * New methods: - * Pathname#birthtime - -* Rake - * Updated to Rake 10.4.0. For full release notes see: - - http://docs.seattlerb.org/rake/History_rdoc.html#label-10.4.0 - -* RubyGems - * Updated to RubyGems 2.4.2. For full release notes see: - - http://docs.seattlerb.org/rubygems/History_txt.html#label-2.4.2+%2F+2014-10-01 - -* TSort - * TSort.tsort_each, TSort.each_strongly_connected_component and - TSort.each_strongly_connected_component_from returns an enumerator if - no block given. - -* XMLRPC - * Added new parser class named LibXMLStreamParser. +=== Stdlib updates (outstanding ones only) -=== Stdlib compatibility issues (excluding feature bug fixes) +* CSV -* lib/mathn.rb - * Show deprecated warning [Feature #10169] + * Add a liberal_parsing option. [Feature #11839] -* ext/date/lib/date/format.rb - * Removed because it's empty file. +* Logger -* Digest - * Digest::HMAC has finally ceased to exist. Use OpenSSL::HMAC or an external gem instead. + * Allow specifying logger parameters in constructor such + as level, progname, datetime_format, formatter. [Feature #12224] + * Add shift_period_suffix option. [Feature #10772] + +* OpenSSL + + * OpenSSL is extracted as a gem and the upstream has been migrated to + https://github.com/ruby/openssl. OpenSSL still remains as a default gem. + Refer to its History.md for the full release note. [Feature #9612] + +* optparse + + * Add an into option. [Feature #11191] + +=== Compatibility issues (excluding feature bug fixes) + +* Array#sum and Enumerable#sum are implemented. [Feature #12217] + Ruby itself has no compatibility problem because Ruby didn't have sum method + for arrays before Ruby 2.4. + However many third party gems, activesupport, facets, simple_stats, etc, + defines sum method. These implementations are mostly compatible but + there are subtle differences. + Ruby's sum method should be mostly compatible but it is impossible to + be perfectly compatible with all of them. + +* Fixnum and Bignum are unified into Integer [Feature #12005] + Fixnum class and Bignum class is removed. + Integer class is changed from abstract class to concrete class. + For example, 0 is an instance of Integer: 0.class returns Integer. + The constants Fixnum and Bignum is bound to Integer. + So obj.kind_of?(Fixnum) works as obj.kind_of?(Integer). + At C-level, Fixnum object and Bignum object should be distinguished by + FIXNUM_P(obj) and RB_TYPE_P(obj, T_BIGNUM). + RUBY_INTEGER_UNIFICATION can be used to detect this feature. + ruby-2.4.0-preview1 (temporally) removes rb_cFixnum and rb_cBignum + to check the effect of incompatibility. + (rb_cFixnum and rb_cBignum may be defined as rb_cInteger later if + compilation failure of extension library is too big problem.) + +* String/Symbol#upcase/downcase/swapcase/capitalize(!) now work for all of + Unicode, not only for ASCII. [Feature #10085] + No change is needed if the data is in ASCII anyway or if the limitation + to ASCII was only tolerated while waiting for a more extensive implementation. + A change (using the :ascii option) is needed in cases where Unicode data + is processed, but the operation has to be limited to ASCII only. + A good example of this are internationalized domain names. -* time.rb - * Time.parse, Time.strptime, Time.rfc2822, Time.xmlschema may produce - fixed-offset Time objects. - It is happen when usual localtime doesn't preserve the offset from UTC. - * Time.httpdate produces always UTC Time object. - * Time.strptime raises ArgumentError when no date information. +=== Stdlib compatibility issues (excluding feature bug fixes) -* lib/rational.rb - * Removed because it is deprecated from 2009. +* DateTime -* lib/complex.rb - * Removed because it is deprecated from 2009. + * DateTime#to_time now preserves timezone. [Bug #12189] -* lib/prettyprint.rb - * Removed PrettyPrint#first? +* Time -* lib/minitest/*.rb - * Removed because it conflicts to minitest 5. [Feature #9711] + * Time#to_time now preserves timezone. [Bug #12271] -* lib/test/**/*.rb - * Removed because it conflicts to minitest 5, and it was just an wrapper - of minitest 4. [Feature #9711] +* thread -* lib/uri - * support RFC 3986. [Feature #2542] + * the extension library is removed. Till 2.0 it was a pure ruby script + "thread.rb", which has precedence over "thread.so", and has been provided + in $LOADED_FEATURES since 2.1. -* GServer - * GServer is extracted to gserver gem. It's unmaintain code. +* Tk + * Tk is removed from stdlib. [Feature #8539] + https://github.com/ruby/tk is the new upstream. -* Logger - * Logger::Application is extracted to logger-application gem. It's unmaintain code. +=== C API updates -* ObjectSpace (after requiring "objspace") - * ObjectSpace.memsize_of(obj) returns a size includes sizeof(RVALUE). - [Bug #8984] +* ruby_show_version() will no longer exits the process, if + RUBY_SHOW_COPYRIGHT_TO_DIE is set to 0. This will be the default in + the future. -* Prime - * incompatible changes: - * Prime.prime? now returns false for negative numbers. This method - should not be used to know the number is composite or not. [Bug #7395] +=== Supported platform changes -* Psych - * Removed Psych::EngineManager [Bug #8344] +* FreeBSD < 4 is no longer supported -=== Built-in global variables compatibility issues +=== Implementation improvements -=== C API updates +* In some condition, `[x, y].max` and `[x, y].min` are optimized + so that a temporal array is not created. The concrete condition is + an implementation detail: currently, the array literal must have no + splat, must have at least one expression but literal, the length must + be <= 0x100, and Array#max and min must not be redefined. It will work + in most casual and real-life use case where it is written with intent + to `Math.max(x, y)`. -* Deprecated APIs removed. [Feature #9502] - - Check_SafeStr -> SafeStringValue - rb_check_safe_str -> SafeStringValue - rb_quad_pack -> rb_integer_pack - rb_quad_unpack -> rb_integer_unpack - rb_read_check : access struct FILE internal. no replacement. - rb_struct_iv_get : internal function. no replacement. - struct rb_blocking_region_buffer : internal type. no replacement. - rb_thread_blocking_region_begin -> rb_thread_call_without_gvl family - rb_thread_blocking_region_end -> rb_thread_call_without_gvl family - TRAP_BEG -> rb_thread_call_without_gvl family - TRAP_END -> rb_thread_call_without_gvl family - rb_thread_select -> rb_thread_fd_select - struct rb_exec_arg : internal type. no replacement. - rb_exec : internal function. no replacement. - rb_exec_arg_addopt : internal function. no replacement. - rb_exec_arg_fixup : internal function. no replacement. - rb_exec_arg_init : internal function. no replacement. - rb_exec_err : internal function. no replacement. - rb_fork : internal function. no replacement. - rb_fork_err : internal function. no replacement. - rb_proc_exec_n : internal function. no replacement. - rb_run_exec_options : internal function. no replacement. - rb_run_exec_options_err : internal function. no replacement. - rb_thread_blocking_region -> rb_thread_call_without_gvl family - rb_thread_polling -> rb_thread_wait_for - rb_big2str0 : internal function. no replacement. - rb_big2ulong_pack -> rb_integer_pack - rb_gc_set_params : internal function. no replacement. - rb_io_mode_flags -> rb_io_modestr_fmode - rb_io_modenum_flags -> rb_io_oflags_fmode - -* struct RBignum is hidden. [Feature #6083] - Use rb_integer_pack and rb_integer_unpack instead. - -* struct RRational is hidden. [Feature #9513] - Use rb_rational_num and rb_rational_den instead. - -* rb_big_new and rb_big_resize takes a size_t instead of long. - -* rb_num2long returns a long instead of SIGNED_VALUE. - -* rb_num2ulong returns an unsigned long instead of VALUE. - -* st hash table uses power-of-two sizes for speed [Feature #9425]. - Lookups are 10-25% faster if using appropriate hash functions. - However, weaknesses in hash distribution can no longer be masked - by prime number-sized tables, so extensions may need to tweak - hash functions to ensure good distribution. - -* rb_sym2str() added. This is almost same as `rb_id2str(SYM2ID(sym))` - but not pinning a dynamic symbol. - -* rb_str_cat_cstr() added. This is same as `rb_str_cat2()`. - -* `rb_str_substr()` and `rb_str_subseq()` will share middle of a string, - but not only the end of a string, in the future. Therefore, result - strings may not be NUL-terminated, `StringValueCStr()` is needed - calling to obtain a NUL-terminated C string. - -* rb_tracepoint_new() supports new internal events accessible only from C: - * RUBY_INTERNAL_EVENT_GC_ENTER - * RUBY_INTERNAL_EVENT_GC_EXIT - r47528 - -* rb_hash_delete() now does not call the block given to the current method. - -* rb_extract_keywords() and rb_get_kwargs() exported. See README.EXT - for details. - -=== Build system updates - -* jemalloc is optionally supported via `./configure --with-jemalloc` - jemalloc may be suitable when system malloc is slow or prone - to fragmentation. [Feature #9113] - -=== Implementation changes - -* GC - * Most symbols which are returned by String#to_sym and - String#intern are GC-able [Feature #9634] - * Introduce incremental marking for major GC. [Feature #10137] - * Enable lazy sweep on GC caused by malloc(). - -* VM - * Use frozen string literals for Hash#[] and Hash#[]= - * Fast keyword arguments passing [Feature #10440] - * Allow to receive huge splatted array by a rest argument - [Feature #10440] - -* Process - * Process creation methods, such as spawn(), uses vfork() system call. - vfork() is faster than fork() when the parent process uses huge memory. +* Thread deadlock detection now shows their backtrace and dependency. [Feature #8214] diff --git a/README.EXT b/README.EXT index f24029c826..48b8d964c4 100644 --- a/README.EXT +++ b/README.EXT @@ -1,1730 +1 @@ -# README.EXT - -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995 - -This document explains how to make extension libraries for Ruby. - -= 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. - -Data in Ruby are represented by the C type `VALUE'. Each VALUE data -has its data-type. - -To retrieve C data from a VALUE, you need to: - -1. Identify the VALUE's data type -2. Convert the VALUE into C data - -Converting to the wrong data type may cause serious problems. - -== Data-Types - -The Ruby interpreter has the following data types: - -T_NIL :: nil -T_OBJECT :: ordinary object -T_CLASS :: class -T_MODULE :: module -T_FLOAT :: floating point number -T_STRING :: string -T_REGEXP :: regular expression -T_ARRAY :: array -T_HASH :: associative array -T_STRUCT :: (Ruby) structure -T_BIGNUM :: multi precision integer -T_FIXNUM :: Fixnum(31bit or 63bit integer) -T_COMPLEX :: complex number -T_RATIONAL :: rational number -T_FILE :: IO -T_TRUE :: true -T_FALSE :: false -T_DATA :: data -T_SYMBOL :: symbol - -In addition, there are several other types used internally: - -T_ICLASS :: included module -T_MATCH :: MatchData object -T_UNDEF :: undefined -T_NODE :: syntax tree node -T_ZOMBIE :: object awaiting finalization - -Most of the types are represented by C structures. - -== Check Data Type of the VALUE - -The macro TYPE() defined in ruby.h shows the data type of the VALUE. -TYPE() returns the constant number T_XXXX described above. To handle -data types, your code will look something like this: - - switch (TYPE(obj)) { - case T_FIXNUM: - /* process Fixnum */ - break; - case T_STRING: - /* process String */ - break; - case T_ARRAY: - /* process Array */ - break; - default: - /* raise exception */ - rb_raise(rb_eTypeError, "not valid value"); - break; - } - -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. - -There are also faster check macros for fixnums and nil. - - FIXNUM_P(obj) - NIL_P(obj) - -== Convert VALUE into C Data - -The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true -respectively. They are singletons for the data type. -The equivalent C constants are: Qnil, Qfalse, Qtrue. -Note that Qfalse is false in C also (i.e. 0), but not Qnil. - -The T_FIXNUM data is a 31bit or 63bit length fixed integer. -This size is depend on the size of long: if long is 32bit then -T_FIXNUM is 31bit, if long is 64bit then T_FIXNUM is 63bit. -T_FIXNUM can be converted to a C integer by using the -FIX2INT() macro or FIX2LONG(). Though you have to check that the -data is really FIXNUM before using them, they are faster. FIX2LONG() -never raises exceptions, but FIX2INT() raises RangeError if the -result is bigger or smaller than the size of int. -There are also NUM2INT() and NUM2LONG() which converts any Ruby -numbers into C integers. These macros includes a type check, -so an exception will be raised if the conversion failed. NUM2DBL() -can be used to retrieve the double float value in the same way. - -You can use the macros -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. - -You can also use the macro named StringValueCStr(). This is just -like StringValuePtr(), but always add nul character at the end of -the result. If the result contains nul character, this macro causes -the ArgumentError exception. -StringValuePtr() doesn't guarantee the existence of a nul at the end -of the result, and the result may contain nul. - -Other data types have corresponding C structures, e.g. struct RArray -for T_ARRAY etc. The VALUE of the type which has the corresponding -structure can be cast to retrieve the pointer to the struct. The -casting macro will be of the form RXXXX for each data type; for -instance, RARRAY(obj). See "ruby.h". However, we do not recommend -to access RXXXX data directly because these data structure is complex. -Use corresponding rb_xxx() functions to access internal struct. -For example, to access an entry of array, use rb_ary_entry(ary, offset) -and rb_ary_store(ary, offset, obj). - -There are some accessing macros for structure members, for example -`RSTRING_LEN(str)' to get the size of the Ruby String object. The -allocated region can be accessed by `RSTRING_PTR(str)'. - -Notice: Do not change the value of the structure directly, unless you -are responsible for the result. This ends up being the cause of -interesting bugs. - -== Convert C Data into VALUE - -To convert C data to Ruby values: - -FIXNUM :: - - left shift 1 bit, and turn on LSB. - -Other pointer values:: - - cast to VALUE. - -You can determine whether a VALUE is pointer or not by checking its LSB. - -Notice Ruby does not allow arbitrary pointer values to be a VALUE. They -should be pointers to the structures which Ruby knows about. The known -structures are defined in <ruby.h>. - -To convert C numbers to Ruby values, use these macros. - -INT2FIX() :: for integers within 31bits. -INT2NUM() :: for arbitrary sized integer. - -INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM -range, but is a bit slower. - -== Manipulating Ruby Data - -As I already mentioned, it is not recommended to modify an object's -internal structure. To manipulate objects, use the functions supplied -by the Ruby interpreter. Some (not all) of the useful functions are -listed below: - -=== String Functions - -rb_str_new(const char *ptr, long len) :: - - Creates a new Ruby string. - -rb_str_new2(const char *ptr) :: -rb_str_new_cstr(const char *ptr) :: - - Creates a new Ruby string from a C string. This is equivalent to - rb_str_new(ptr, strlen(ptr)). - -rb_str_new_literal(const char *ptr) :: - - Creates a new Ruby string from a C string literal. - -rb_tainted_str_new(const char *ptr, long len) :: - - Creates a new tainted Ruby string. Strings from external data - sources should be tainted. - -rb_tainted_str_new2(const char *ptr) :: -rb_tainted_str_new_cstr(const char *ptr) :: - - Creates a new tainted Ruby string from a C string. - -rb_sprintf(const char *format, ...) :: -rb_vsprintf(const char *format, va_list ap) :: - - Creates a new Ruby string with printf(3) format. - - Note: In the format string, "%"PRIsVALUE can be used for Object#to_s - (or Object#inspect if '+' flag is set) output (and related argument - must be a VALUE). Since it conflicts with "%i", for integers in - format strings, use "%d". - -rb_str_cat(VALUE str, const char *ptr, long len) :: - - Appends len bytes of data from ptr to the Ruby string. - -rb_str_cat2(VALUE str, const char* ptr) :: -rb_str_cat_cstr(VALUE str, const char* ptr) :: - - Appends C string ptr to Ruby string str. This function is - equivalent to rb_str_cat(str, ptr, strlen(ptr)). - -rb_str_catf(VALUE str, const char* format, ...) :: -rb_str_vcatf(VALUE str, const char* format, va_list ap) :: - - Appends C string format and successive arguments to Ruby string - str according to a printf-like format. These functions are - equivalent to rb_str_cat2(str, rb_sprintf(format, ...)) and - rb_str_cat2(str, rb_vsprintf(format, ap)), respectively. - -rb_enc_str_new(const char *ptr, long len, rb_encoding *enc) :: -rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) :: - - Creates a new Ruby string with the specified encoding. - -rb_enc_str_new_literal(const char *ptr) :: - - Creates a new Ruby string from a C string literal with the specified - encoding. - -rb_usascii_str_new(const char *ptr, long len) :: -rb_usascii_str_new_cstr(const char *ptr) :: - - Creates a new Ruby string with encoding US-ASCII. - -rb_usascii_str_new_literal(const char *ptr) :: - - Creates a new Ruby string from a C string literal with encoding - US-ASCII. - -rb_utf8_str_new(const char *ptr, long len) :: -rb_utf8_str_new_cstr(const char *ptr) :: - - Creates a new Ruby string with encoding UTF-8. - -rb_utf8_str_new_literal(const char *ptr) :: - - Creates a new Ruby string from a C string literal with encoding - UTF-8. - -rb_str_resize(VALUE str, long len) :: - - Resizes Ruby string to len bytes. If str is not modifiable, this - function raises an exception. The length of str must be set in - advance. If len is less than the old length the content beyond - len bytes is discarded, else if len is greater than the old length - the content beyond the old length bytes will not be preserved but - will be garbage. Note that RSTRING_PTR(str) may change by calling - this function. - -rb_str_set_len(VALUE str, long len) :: - - Sets the length of Ruby string. If str is not modifiable, this - function raises an exception. This function preserves the content - upto len bytes, regardless RSTRING_LEN(str). len must not exceed - the capacity of str. - -=== Array Functions - -rb_ary_new() :: - - Creates an array with no elements. - -rb_ary_new2(long len) :: -rb_ary_new_capa(long len) :: - - Creates an array with no elements, allocating internal buffer - for len elements. - -rb_ary_new3(long n, ...) :: -rb_ary_new_from_args(long n, ...) :: - - Creates an n-element array from the arguments. - -rb_ary_new4(long n, VALUE *elts) :: -rb_ary_new_from_values(long n, VALUE *elts) :: - - Creates an n-element array from a C array. - -rb_ary_to_ary(VALUE obj) :: - - Converts the object into an array. - Equivalent to Object#to_ary. - -There are many functions to operate an array. They may dump core if other -types are given. - -rb_ary_aref(argc, VALUE *argv, VALUE ary) :: - - Equivalent to Array#[]. - -rb_ary_entry(VALUE ary, long offset) :: - - ary[offset] - -rb_ary_store(VALUE ary, long offset, VALUE obj) :: - - ary[offset] = obj - -rb_ary_subseq(VALUE ary, long beg, long len) :: - - ary[beg, len] - -rb_ary_push(VALUE ary, VALUE val) :: -rb_ary_pop(VALUE ary) :: -rb_ary_shift(VALUE ary) :: -rb_ary_unshift(VALUE ary, VALUE val) :: - -rb_ary_cat(VALUE ary, const VALUE *ptr, long len) :: - - Appends len elements of objects from ptr to the array. - -= Extending Ruby with C - -== Adding New Features to Ruby - -You can add new features (classes, methods, etc.) to the Ruby -interpreter. Ruby provides APIs for defining the following things: - -* Classes, Modules -* Methods, Singleton Methods -* Constants - -=== Class and Module Definition - -To define a class or module, use the 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. - -To define nested classes or modules, use the functions below: - - VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super) - VALUE rb_define_module_under(VALUE outer, const char *name) - -=== Method and Singleton Method Definition - -To define methods or singleton methods, use these functions: - - void rb_define_method(VALUE klass, const char *name, - VALUE (*func)(), int argc) - - void rb_define_singleton_method(VALUE object, const char *name, - VALUE (*func)(), int argc) - -The `argc' represents the number of the arguments to the C function, -which must be less than 17. But I doubt you'll need that many. - -If `argc' is negative, it specifies the calling sequence, not number of -the arguments. - -If argc is -1, the function will be called as: - - 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 -will be called like: - - VALUE func(VALUE obj, VALUE args) - -where obj is the receiver, and args is the Ruby array containing -actual arguments. - -There are some more functions to define methods. One takes an ID -as the name of method to be defined. See also ID or Symbol below. - - void rb_define_method_id(VALUE klass, ID name, - VALUE (*func)(ANYARGS), int argc) - -There are two functions to define private/protected methods: - - void rb_define_private_method(VALUE klass, const char *name, - VALUE (*func)(), int argc) - void rb_define_protected_method(VALUE klass, const char *name, - VALUE (*func)(), int argc) - -At last, rb_define_module_function defines a module functions, -which are private AND singleton methods of the module. -For example, sqrt is the module function defined in Math module. -It can be called in the following way: - - Math.sqrt(4) - -or - - include Math - sqrt(4) - -To define module functions, use: - - void rb_define_module_function(VALUE module, const char *name, - VALUE (*func)(), int argc) - -In addition, function-like methods, which are private methods defined -in the 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, - - void rb_define_alias(VALUE module, const char* new, const char* old); - -To define a reader/writer for an attribute, - - void rb_define_attr(VALUE klass, const char *name, int read, int write) - -To define and undefine the `allocate' class method, - - void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass)); - void rb_undef_alloc_func(VALUE klass); - -func has to take the klass as the argument and return a newly -allocated instance. This instance should be as empty as possible, -without any expensive (including external) resources. - -If you are overriding an existing method of any ancestor of your class, -you may rely on: - - VALUE rb_call_super(int argc, const VALUE *argv) - -To achieve the receiver of the current scope (if no other way is -available), you can use: - - VALUE rb_current_receiver(void) - -=== Constant Definition - -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. - -== Use Ruby Features from C - -There are several ways to invoke Ruby's features from C code. - -=== Evaluate Ruby Programs in a String - -The easiest way to use Ruby's functionality from a C program is to -evaluate the string as Ruby program. This function will do the job: - - VALUE rb_eval_string(const char *str) - -Evaluation is done under the current context, thus current local variables -of the innermost method (which is defined by Ruby) can be accessed. - -Note that the evaluation can raise an exception. There is a safer -function: - - VALUE rb_eval_string_protect(const char *str, int *state) - -It returns nil when an error occur. Moreover, *state is zero if str was -successfully evaluated, or nonzero otherwise. - -=== 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: - - :Identifier - -or - - :"any kind of string" - -You can get the ID value from a string within C code by using - - rb_intern(const char *name) - rb_intern_str(VALUE name) - -You can retrieve ID from Ruby object (Symbol or String) given as an -argument by using - - rb_to_id(VALUE symbol) - rb_check_id(volatile VALUE *name) - rb_check_id_cstr(const char *name, long len, rb_encoding *enc) - -These functions try to convert the argument to a String if it was not -a Symbol nor a String. The second function stores the converted -result into *name, and returns 0 if the string is not a known symbol. -After this function returned a non-zero value, *name is always a -Symbol or a String, otherwise it is a String if the result is 0. -The third function takes NUL-terminated C string, not Ruby VALUE. - -You can retrieve Symbol from Ruby object (Symbol or String) given as -an argument by using - - rb_to_symbol(VALUE name) - rb_check_symbol(volatile VALUE *namep) - rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc) - -These functions are similar to above functions except that these -return a Symbol instead of an ID. - -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) - -=== 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. - -=== Accessing the Variables and Constants - -You can access class variables and instance variables using access -functions. Also, global variables can be shared between both -environments. There's no way to access Ruby's local variables. - -The functions to access/modify instance variables are below: - - VALUE rb_ivar_get(VALUE obj, ID id) - VALUE rb_ivar_set(VALUE obj, ID id, VALUE val) - -id must be the symbol, which can be retrieved by rb_intern(). - -To access the constants of the class/module: - - VALUE rb_const_get(VALUE obj, ID id) - -See also Constant Definition above. - -= Information Sharing Between Ruby and C - -=== Ruby Constants That C Can Be Accessed From C - -As stated in section 1.3, -the following Ruby constants can be referred from C. - - Qtrue - Qfalse - -Boolean values. Qfalse is false in C also (i.e. 0). - - Qnil - -Ruby nil in C scope. - -== Global Variables Shared Between C and Ruby - -Information can be shared between the two environments using shared global -variables. To define them, you can use functions listed below: - - 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 -through Ruby's global variable named `name'. - -You can define read-only (from Ruby, of course) variables using the -function below. - - void rb_define_readonly_variable(const char *name, VALUE *var) - -You can defined hooked variables. The accessor functions (getter and -setter) are called on access to the hooked variables. - - void rb_define_hooked_variable(const char *name, VALUE *var, - VALUE (*getter)(), void (*setter)()) - -If you need to supply either setter or getter, just supply 0 for the -hook you don't need. If both hooks are 0, rb_define_hooked_variable() -works just like rb_define_variable(). - -The prototypes of the getter and setter functions are as follows: - - VALUE (*getter)(ID id, VALUE *var); - void (*setter)(VALUE val, ID id, VALUE *var); - - -Also you can define a Ruby global variable without a corresponding C -variable. The value of the variable will be set/get only by hooks. - - void rb_define_virtual_variable(const char *name, - VALUE (*getter)(), void (*setter)()) - -The prototypes of the getter and setter functions are as follows: - - VALUE (*getter)(ID id); - void (*setter)(VALUE val, ID id); - - -== Encapsulate C Data into a Ruby Object - -To wrap and objectify a C pointer as a Ruby object (so called -DATA), use Data_Wrap_Struct(). - - Data_Wrap_Struct(klass, mark, free, sval) - -Data_Wrap_Struct() 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. - -These mark / free functions are invoked during GC execution. No -object allocations are allowed during it, so do not allocate ruby -objects inside them. - -You can allocate and wrap the structure in one step. - - Data_Make_Struct(klass, type, mark, free, sval) - -This macro returns an allocated Data object, wrapping the pointer to -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. - -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. - -See the example below for details. - -= Example - Creating dbm Extension - -OK, here's the example of making an extension library. This is the -extension to access DBMs. The full source is included in the ext/ -directory in the Ruby's source tree. - -== Make the Directory - - % mkdir ext/dbm - -Make a directory for the extension library under ext directory. - -== Design the Library - -You need to design the library features, before making it. - -== Write the C Code - -You need to write C code for your extension library. If your library -has only one source file, choosing ``LIBRARY.c'' as a file name is -preferred. On the other hand, in case your library has multiple source -files, avoid choosing ``LIBRARY.c'' for a file name. It may conflict -with an intermediate file ``LIBRARY.o'' on some platforms. -Note that some functions in mkmf library described below generate -a file ``conftest.c'' for checking with compilation. You shouldn't -choose ``conftest.c'' as a name of a source file. - -Ruby will execute the initializing function named ``Init_LIBRARY'' in -the library. For example, ``Init_dbm()'' will be executed when loading -the library. - -Here's the example of an initializing function. - - void - Init_dbm(void) - { - /* define DBM class */ - VALUE cDBM = rb_define_class("DBM", rb_cObject); - /* DBM includes Enumerable module */ - rb_include_module(cDBM, rb_mEnumerable); - - /* DBM has class method open(): arguments are received as C array */ - rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1); - - /* DBM instance method close(): no args */ - rb_define_method(cDBM, "close", fdbm_close, 0); - /* DBM instance method []: 1 argument */ - rb_define_method(cDBM, "[]", fdbm_fetch, 1); - - /* ... */ - - /* ID for a instance variable to store DBM data */ - id_dbm = rb_intern("dbm"); - } - -The dbm extension wraps the dbm struct in the C environment using -Data_Make_Struct. - - struct dbmdata { - int di_size; - DBM *di_dbm; - }; - - obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp); - -This code wraps the dbmdata structure into a Ruby object. We avoid -wrapping DBM* directly, because we want to cache size information. - -To retrieve the dbmdata structure from a Ruby object, we define the -following macro: - - #define GetDBM(obj, dbmp) do {\ - Data_Get_Struct(obj, struct dbmdata, dbmp);\ - if (dbmp->di_dbm == 0) closed_dbm();\ - } while (0) - -This sort of complicated macro does the retrieving and close checking 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: - - static VALUE - fdbm_delete(VALUE obj, VALUE keystr) - { - /* ... */ - } - -The first argument of the C function is the self, the rest are the -arguments to the method. - -Second, methods with an arbitrary number of arguments receive -arguments like this: - - static VALUE - fdbm_s_open(int argc, VALUE *argv, VALUE klass) - { - /* ... */ - if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) { - mode = 0666; /* default value */ - } - /* ... */ - } - -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. The third argument is a string that specifies how to -capture method arguments and assign them to the following VALUE -references. - - -The following is an example of a method that takes arguments by Ruby's -array: - - static VALUE - thread_initialize(VALUE thread, VALUE args) - { - /* ... */ - } - -The first argument is the receiver, the second one is the Ruby array -which contains the arguments to the method. - -*Notice*: GC should know about global variables which refer to Ruby's objects, -but are not exported to the Ruby world. You need to protect them by - - void rb_global_variable(VALUE *var) - -== Prepare extconf.rb - -If the file named extconf.rb exists, it will be executed to generate -Makefile. - -extconf.rb is the file for checking compilation conditions etc. You -need to put - - require 'mkmf' - -at the top of the file. You can use the functions below to check -various conditions. - - have_macro(macro[, headers[, opt]]): check whether macro is defined - have_library(lib[, func[, headers[, opt]]]): check whether library containing function exists - find_library(lib[, func, *paths]): find library from paths - have_func(func[, headers[, opt]): check whether function exists - have_var(var[, headers[, opt]]): check whether variable exists - have_header(header[, preheaders[, opt]]): check whether header file exists - find_header(header, *paths): find header from paths - have_framework(fw): check whether framework exists (for MacOS X) - have_struct_member(type, member[, headers[, opt]]): check whether struct has member - have_type(type[, headers[, opt]]): check whether type exists - find_type(type, opt, *headers): check whether type exists in headers - have_const(const[, headers[, opt]]): check whether constant is defined - check_sizeof(type[, headers[, opts]]): check size of type - check_signedness(type[, headers[, opts]]): check signedness of type - convertible_int(type[, headers[, opts]]): find convertible integer type - find_executable(bin[, path]): find executable file path - create_header(header): generate configured header - create_makefile(target[, target_prefix]): generate Makefile - -See MakeMakefile for full documentation of these functions. - -The value of the variables below will affect the Makefile. - - $CFLAGS: included in CFLAGS make variable (such as -O) - $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D) - $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 -not be done. - -== Prepare Depend (Optional) - -If the file named depend exists, Makefile will include that file to -check dependencies. You can make this file by invoking - - % gcc -MM *.c > depend - -It's harmless. Prepare it. - -== Generate Makefile - -Try generating the Makefile by: - - ruby extconf.rb - -If the library should be installed under vendor_ruby directory -instead of site_ruby directory, use --vendor option as follows. - - ruby extconf.rb --vendor - -You don't need this step if you put the extension library under the ext -directory of the ruby source tree. In that case, compilation of the -interpreter will do this step for you. - -== Run make - -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. - -== Debug - -You may need to rb_debug the extension. Extensions can be linked -statically by adding the directory name in the ext/Setup file so that -you can inspect the extension with the debugger. - -== Done! Now You Have the Extension Library - -You can do anything you want with your library. The author of Ruby -will not claim any restrictions on your code depending on the Ruby API. -Feel free to use, modify, distribute or sell your program. - -= Appendix A. Ruby Source Files Overview - -== Ruby Language Core - -class.c :: classes and modules -error.c :: exception classes and exception mechanism -gc.c :: memory management -load.c :: library loading -object.c :: objects -variable.c :: variables and constants - -== Ruby Syntax Parser - -parse.y :: grammar definition -parse.c :: automatically generated from parse.y -keywords :: reserved keywords -lex.c :: automatically generated from keywords - -== Ruby Evaluator (a.k.a. YARV) - - compile.c - eval.c - eval_error.c - eval_jump.c - eval_safe.c - insns.def : definition of VM instructions - iseq.c : implementation of VM::ISeq - thread.c : thread management and context switching - thread_win32.c : thread implementation - thread_pthread.c : ditto - vm.c - vm_dump.c - vm_eval.c - vm_exec.c - vm_insnhelper.c - vm_method.c - - opt_insns_unif.def : instruction unification - opt_operand.def : definitions for optimization - - -> insn*.inc : automatically generated - -> opt*.inc : automatically generated - -> vm.inc : automatically generated - -== Regular Expression Engine (Oniguruma) - - regex.c - regcomp.c - regenc.c - regerror.c - regexec.c - regparse.c - regsyntax.c - -== Utility Functions - -debug.c :: debug symbols for C debugger -dln.c :: dynamic loading -st.c :: general purpose hash table -strftime.c :: formatting times -util.c :: misc utilities - -== Ruby Interpreter Implementation - - dmyext.c - dmydln.c - dmyencoding.c - id.c - inits.c - main.c - ruby.c - version.c - - gem_prelude.rb - prelude.rb - -== Class Library - -array.c :: Array -bignum.c :: Bignum -compar.c :: Comparable -complex.c :: Complex -cont.c :: Fiber, Continuation -dir.c :: Dir -enum.c :: Enumerable -enumerator.c :: Enumerator -file.c :: File -hash.c :: Hash -io.c :: IO -marshal.c :: Marshal -math.c :: Math -numeric.c :: Numeric, Integer, Fixnum, Float -pack.c :: Array#pack, String#unpack -proc.c :: Binding, Proc -process.c :: Process -random.c :: random number -range.c :: Range -rational.c :: Rational -re.c :: Regexp, MatchData -signal.c :: Signal -sprintf.c :: String#sprintf -string.c :: String -struct.c :: Struct -time.c :: Time - -defs/known_errors.def :: Errno::* exception classes --> known_errors.inc :: automatically generated - -== Multilingualization - -encoding.c :: Encoding -transcode.c :: Encoding::Converter -enc/*.c :: encoding classes -enc/trans/* :: codepoint mapping tables - -== goruby Interpreter Implementation - - goruby.c - golf_prelude.rb : goruby specific libraries. - -> golf_prelude.c : automatically generated - - -= Appendix B. Ruby Extension API Reference - -== Types - -VALUE :: - - The type for the Ruby object. Actual structures are defined in ruby.h, - such as struct RString, etc. To refer the values in structures, use - casting macros like RSTRING(obj). - -== Variables and Constants - -Qnil:: - nil object - -Qtrue:: - true object (default true value) - -Qfalse:: - false object - -== C Pointer Wrapping - -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. - -Data_Make_Struct(klass, type, mark, free, sval) :: - - This macro allocates memory using malloc(), assigns it to the variable - sval, and returns the DATA encapsulating the pointer to memory region. - -Data_Get_Struct(data, type, sval) :: - - This macro retrieves the pointer value from DATA, and assigns it to - the variable sval. - -== Checking Data Types - -TYPE(value) :: - - Internal type (T_NIL, T_FIXNUM, etc.) - -FIXNUM_P(value) :: - - Is +value+ a Fixnum? - -NIL_P(value) :: - - Is +value+ nil? - -void Check_Type(VALUE value, int type) :: - - Ensures +value+ is of the given internal +type+ or raises a TypeError - -SaveStringValue(value) :: - - Checks that +value+ is a String and is not tainted - -== Data Type Conversion - -FIX2INT(value), INT2FIX(i) :: - - Fixnum <-> integer - -FIX2LONG(value), LONG2FIX(l) :: - - Fixnum <-> long - -NUM2INT(value), INT2NUM(i) :: - - Numeric <-> integer - -NUM2UINT(value), UINT2NUM(ui) :: - - Numeric <-> unsigned integer - -NUM2LONG(value), LONG2NUM(l) :: - - Numeric <-> long - -NUM2ULONG(value), ULONG2NUM(ul) :: - - Numeric <-> unsigned long - -NUM2LL(value), LL2NUM(ll) :: - - Numeric <-> long long - -NUM2ULL(value), ULL2NUM(ull) :: - - Numeric <-> unsigned long long - -NUM2OFFT(value), OFFT2NUM(off) :: - - Numeric <-> off_t - -NUM2SIZET(value), SIZET2NUM(size) :: - - Numeric <-> size_t - -NUM2SSIZET(value), SSIZET2NUM(ssize) :: - - Numeric <-> ssize_t - -rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags) :: - - Numeric <-> Arbitrary size integer buffer - -NUM2DBL(value) :: - - Numeric -> double - -rb_float_new(f) :: - - double -> Float - -RSTRING_LEN(str) :: - - String -> length of String data in bytes - -RSTRING_PTR(str) :: - - String -> pointer to String data - Note that the result pointer may not be NUL-terminated - -StringValue(value) :: - - Object with #to_str -> String - -StringValuePtr(value) :: - - Object with #to_str -> pointer to String data - -StringValueCStr(value) :: - - Object with #to_str -> pointer to String data without NUL bytes - It is guaranteed that the result data is NUL-terminated - -rb_str_new2(s) :: - - char * -> String - -== Defining Class and Module - -VALUE rb_define_class(const char *name, VALUE super) :: - - Defines a new Ruby class as a 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 - namespace. - -VALUE rb_define_module(const char *name) :: - - Defines a new Ruby module. - -VALUE rb_define_module_under(VALUE module, const char *name) :: - - Defines a 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. - -void rb_extend_object(VALUE object, VALUE module) :: - - Extend the object with the module's attributes. - -== 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, - 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. - -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 - 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: - - VALUE getter(ID id) - void setter(VALUE val, ID id) - - 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 - - VALUE getter(ID id, VALUE *var) - - returning a 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. - -void rb_global_variable(VALUE *var) - - Tells GC to protect these variables. - -== Constant Definition - -void rb_define_const(VALUE klass, const char *name, VALUE val) :: - - 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 - - rb_define_const(cKernal, name, val) - -== Method Definition - -rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) :: - - Defines a method for the class. func is the function pointer. argc - is the number of arguments. if argc is -1, the function will receive - 3 arguments: argc, argv, and self. if argc is -2, the function will - receive 2 arguments, self and args, where args is a Ruby array of - the method arguments. - -rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) :: - - Defines a private method for the class. Arguments are same as - rb_define_method(). - -rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) :: - - Defines a singleton method. Arguments are same as rb_define_method(). - -rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) :: - - Retrieve argument from argc and argv to given VALUE references - according to the format string. The format can be described in ABNF - as follows: - - scan-arg-spec := param-arg-spec [option-hash-arg-spec] [block-arg-spec] - - param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / - pre-opt-post-arg-spec - pre-arg-spec := num-of-leading-mandatory-args [num-of-optional-args] - post-arg-spec := sym-for-variable-length-args - [num-of-trailing-mandatory-args] - pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args - num-of-trailing-mandatory-args - option-hash-arg-spec := sym-for-option-hash-arg - block-arg-spec := sym-for-block-arg - - num-of-leading-mandatory-args := DIGIT ; The number of leading - ; mandatory arguments - num-of-optional-args := DIGIT ; The number of optional - ; arguments - sym-for-variable-length-args := "*" ; Indicates that variable - ; length arguments are - ; captured as a ruby array - num-of-trailing-mandatory-args := DIGIT ; The number of trailing - ; mandatory arguments - sym-for-option-hash-arg := ":" ; Indicates that an option - ; hash is captured if the last - ; argument is a hash or can be - ; converted to a hash with - ; #to_hash. When the last - ; argument is nil, it is - ; captured if it is not - ; ambiguous to take it as - ; empty option hash; i.e. '*' - ; is not specified and - ; arguments are given more - ; than sufficient. - sym-for-block-arg := "&" ; Indicates that an iterator - ; block should be captured if - ; given - - For example, "12" means that the method requires at least one - argument, and at most receives three (1+2) arguments. So, the format - string must be followed by three variable references, which are to be - assigned to captured arguments. For omitted arguments, variables are - set to Qnil. NULL can be put in place of a variable reference, which - means the corresponding captured argument(s) should be just dropped. - - The number of given arguments, excluding an option hash or iterator - block, is returned. - -int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) - - Retrieves argument VALUEs bound to keywords, which directed by +table+ - into +values+. First +required+ number of IDs referred by +table+ are - mandatory, and succeeding +optional+ (- +optional+ - 1 if - +optional+ is negative) number of IDs are optional. If a - mandatory key is not contained in +keyword_hash+, raises "missing - keyword" +ArgumentError+. If an optional key is not present in - +keyword_hash+, the corresponding element in +values+ is not changed. - If +optional+ is negative, rest of +keyword_hash+ are stored in the - next to optional +values+ as a new Hash, otherwise raises "unknown - keyword" +ArgumentError+. - -VALUE rb_extract_keywords(VALUE *original_hash) - - Extracts pairs whose key is a symbol into a new hash from a hash - object referred by +original_hash+. If the original hash contains - non-symbol keys, then they are copied to another hash and the new hash - is stored through +original_hash+, else 0 is stored. - -== 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(). - Able to call even private/protected methods. - -VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) :: -VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) :: - - Invokes a method, passing arguments as an array of values. - Able to call even private/protected methods. - -VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) :: - - Invokes a method, passing arguments as an array of values. - Able to call only public methods. - -VALUE rb_eval_string(const char *str) :: - - Compiles and executes the string as a Ruby program. - -ID rb_intern(const char *name) :: - - Returns ID corresponding to the name. - -char *rb_id2name(ID id) :: - - Returns the name corresponding ID. - -char *rb_class2name(VALUE klass) :: - - Returns the name of the class. - -int rb_respond_to(VALUE object, ID id) :: - - Returns true if the object responds to the message specified by id. - -== Instance Variables - -VALUE rb_iv_get(VALUE obj, const char *name) :: - - Retrieve the value of the instance variable. If the name is not - prefixed by `@', that variable shall be inaccessible from Ruby. - -VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) :: - - Sets the value of the instance variable. - -== Control Structure - -VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2) :: - - Calls a method on the recv, with the method name specified by the - symbol mid, with argc arguments in argv, supplying func as the - block. When func is called as the block, it will receive the value - from yield as the first argument, and data2 as the second argument. - When yielded with multiple values (in C, rb_yield_values(), - rb_yield_values2() and rb_yield_splat()), data2 is packed as an Array, - whereas yielded values can be gotten via argc/argv of the third/fourth - arguments. - -[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2) :: - - Calls the function func1, supplying func2 as the block. func1 will be - called with the argument arg1. func2 receives the value from yield as - the first argument, arg2 as the second argument. - - When rb_iterate is used in 1.9, func1 has to call some Ruby-level method. - This function is obsolete since 1.9; use rb_block_call instead. - -VALUE rb_yield(VALUE val) :: - - Evaluates the block with value val. - -VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) :: - - Calls the function func1, with arg1 as the argument. If an exception - occurs during func1, it calls func2 with arg2 as the argument. The - return value of rb_rescue() is the return value from func1 if no - exception occurs, from func2 otherwise. - -VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) :: - - Calls the function func1 with arg1 as the argument, then calls func2 - with arg2 if execution terminated. The return value from - rb_ensure() is that of func1 when no exception occurred. - -VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) :: - - Calls the function func with arg as the argument. If no exception - occurred during func, it returns the result of func and *state is zero. - Otherwise, it returns Qnil and sets *state to nonzero. If state is - NULL, it is not set in both cases. - You have to clear the error info with rb_set_errinfo(Qnil) when - ignoring the caught exception. - -void rb_jump_tag(int state) :: - - Continues the exception caught by rb_protect() and rb_eval_string_protect(). - state must be the returned value from those functions. This function - never return to the caller. - -void rb_iter_break() :: - - Exits from the current innermost block. This function never return to - the caller. - -void rb_iter_break_value(VALUE value) :: - - Exits from the current innermost block with the value. The block will - return the given argument value. This function never return to the - caller. - -== Exceptions and Errors - -void rb_warn(const char *fmt, ...) :: - - Prints a warning message according to a printf-like format. - -void rb_warning(const char *fmt, ...) :: - - Prints a warning message according to a 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(). - -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. - -void rb_bug(const char *fmt, ...) :: - - 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. - -Note: In the format string, "%"PRIsVALUE can be used for Object#to_s -(or Object#inspect if '+' flag is set) output (and related argument -must be a VALUE). Since it conflicts with "%i", for integers in -format strings, use "%d". - -== Initialize and Start the Interpreter - -The embedding API functions are below (not needed for extension libraries): - -void ruby_init() :: - - Initializes the interpreter. - -void *ruby_options(int argc, char **argv) :: - - Process command line arguments for the interpreter. - And compiles the Ruby source to execute. - It returns an opaque pointer to the compiled source - or an internal special value. - -int ruby_run_node(void *n) :: - - Runs the given compiled source and exits this process. - It returns EXIT_SUCCESS if successfully runs the source. - Otherwise, it returns other value. - -void ruby_script(char *name) :: - - Specifies the name of the script ($0). - -== Hooks for the Interpreter Events - - void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, - VALUE data) - -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, VALUE data, - VALUE self, ID id, VALUE klass) - -The third argument `data' to rb_add_event_hook() is passed to the hook -function as the second argument, which was the pointer to the current -NODE in 1.8. See RB_EVENT_HOOKS_HAVE_CALLBACK_DATA below. - - int rb_remove_event_hook(rb_event_hook_func_t func) - -Removes the specified hook function. - -== Macros for Compatibility - -Some macros to check API compatibilities are available by default. - -NORETURN_STYLE_NEW :: - - Means that NORETURN macro is functional style instead of prefix. - -HAVE_RB_DEFINE_ALLOC_FUNC :: - - Means that function rb_define_alloc_func() is provided, that means the - allocation framework is used. This is same as the result of - have_func("rb_define_alloc_func", "ruby.h"). - -HAVE_RB_REG_NEW_STR :: - - Means that function rb_reg_new_str() is provided, that creates Regexp - object from String object. This is same as the result of - have_func("rb_reg_new_str", "ruby.h"). - -HAVE_RB_IO_T :: - - Means that type rb_io_t is provided. - -USE_SYMBOL_AS_METHOD_NAME :: - - Means that Symbols will be returned as method names, e.g., - Module#methods, #singleton_methods and so on. - -HAVE_RUBY_*_H :: - - Defined in ruby.h and means corresponding header is available. For - instance, when HAVE_RUBY_ST_H is defined you should use ruby/st.h not - mere st.h. - -RB_EVENT_HOOKS_HAVE_CALLBACK_DATA :: - - Means that rb_add_event_hook() takes the third argument `data', to be - passed to the given event hook function. - -= Appendix C. Functions available for use in extconf.rb - -See documentation for {mkmf}[rdoc-ref:MakeMakefile]. - -= Appendix D. Generational GC - -Ruby 2.1 introduced a generational garbage collector (called RGenGC). -RGenGC (mostly) keeps compatibility. - -Generally, the use of the technique called write barriers is required in -extension libraries for generational GC -(http://en.wikipedia.org/wiki/Garbage_collection_%28computer_science%29). -RGenGC works fine without write barriers in extension libraries. - -If your library adheres to the following tips, performance can -be further improved. Especially, the "Don't touch pointers directly" section is -important. - -== Incompatibility - -You can't write RBASIC(obj)->klass field directly because it is const -value now. - -Basically you should not write this field because MRI expects it to be -an immutable field, but if you want to do it in your extension you can -use the following functions: - -VALUE rb_obj_hide(VALUE obj) :: - - Clear RBasic::klass field. The object will be an internal object. - ObjectSpace::each_object can't find this object. - -VALUE rb_obj_reveal(VALUE obj, VALUE klass) :: - - Reset RBasic::klass to be klass. - We expect the `klass' is hidden class by rb_obj_hide(). - -== Write barriers - -RGenGC doesn't require write barriers to support generational GC. -However, caring about write barrier can improve the performance of -RGenGC. Please check the following tips. - -=== Don't touch pointers directly - -In MRI (include/ruby/ruby.h), some macros to acquire pointers to the -internal data structures are supported such as RARRAY_PTR(), -RSTRUCT_PTR() and so on. - -DO NOT USE THESE MACROS and instead use the corresponding C-APIs such as -rb_ary_aref(), rb_ary_store() and so on. - -=== Consider whether to insert write barriers - -You don't need to care about write barriers if you only use built-in -types. - -If you support T_DATA objects, you may consider using write barriers. - -Inserting write barriers into T_DATA objects only works with the -following type objects: (a) long-lived objects, (b) when a huge number -of objects are generated and (c) container-type objects that have -references to other objects. If your extension provides such a type of -T_DATA objects, consider inserting write barriers. - -(a): short-lived objects don't become old generation objects. -(b): only a few oldgen objects don't have performance impact. -(c): only a few references don't have performance impact. - -Inserting write barriers is a very difficult hack, it is easy to -introduce critical bugs. And inserting write barriers has several areas -of overhead. Basically we don't recommend you insert write barriers. -Please carefully consider the risks. - -=== Combine with built-in types - -Please consider utilizing built-in types. Most built-in types support -write barrier, so you can use them to avoid manually inserting write -barriers. - -For example, if your T_DATA has references to other objects, then you -can move these references to Array. A T_DATA object only has a reference -to an array object. Or you can also use a Struct object to gather a -T_DATA object (without any references) and an that Array contains -references. - -With use of such techniques, you don't need to insert write barriers -anymore. - -=== Insert write barriers - -[AGAIN] Inserting write barriers is a very difficult hack, and it is -easy to introduce critical bugs. And inserting write barriers has -several areas of overhead. Basically we don't recommend you insert write -barriers. Please carefully consider the risks. - -Before inserting write barriers, you need to know about RGenGC algorithm -(gc.c will help you). Macros and functions to insert write barriers are -available in in include/ruby/ruby.h. An example is available in iseq.c. - -For a complete guide for RGenGC and write barriers, please refer to -<https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RGenGC>. - -= Appendix E. RB_GC_GUARD to protect from premature GC - -C Ruby currently uses conservative garbage collection, thus VALUE -variables must remain visible on the stack or registers to ensure any -associated data remains usable. Optimizing C compilers are not designed -with conservative garbage collection in mind, so they may optimize away -the original VALUE even if the code depends on data associated with that -VALUE. - -The following example illustrates the use of RB_GC_GUARD to ensure -the contents of sptr remain valid while the second invocation of -rb_str_new_cstr is running. - - VALUE s, w; - const char *sptr; - - s = rb_str_new_cstr("hello world!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); - sptr = RSTRING_PTR(s); - w = rb_str_new_cstr(sptr + 6); /* Possible GC invocation */ - - RB_GC_GUARD(s); /* ensure s (and thus sptr) do not get GC-ed */ - -In the above example, RB_GC_GUARD must be placed _after_ the last use of -sptr. Placing RB_GC_GUARD before dereferencing sptr would be of no use. -RB_GC_GUARD is only effective on the VALUE data type, not converted C -data types. - -RB_GC_GUARD would not be necessary at all in the above example if -non-inlined function calls are made on the `s' VALUE after sptr is -dereferenced. Thus, in the above example, calling any un-inlined -function on `s' such as: - - rb_str_modify(s); - -Will ensure `s' stays on the stack or register to prevent a -GC invocation from prematurely freeing it. - -Using the RB_GC_GUARD macro is preferable to using the "volatile" -keyword in C. RB_GC_GUARD has the following advantages: - -1) the intent of the macro use is clear - -2) RB_GC_GUARD only affects its call site, "volatile" generates some - extra code every time the variable is used, hurting optimization. - -3) "volatile" implementations may be buggy/inconsistent in some - compilers and architectures. RB_GC_GUARD is customizable for broken - systems/compilers without those without negatively affecting other - systems. - -/* - * Local variables: - * fill-column: 70 - * end: - */ +Moved to doc/extension.rdoc diff --git a/README.EXT.ja b/README.EXT.ja index f4255ebb69..f884ecbb0e 100644 --- a/README.EXT.ja +++ b/README.EXT.ja @@ -1,1719 +1 @@ -# README.EXT.ja - -*- RDoc -*- created at: Mon Aug 7 16:45:54 JST 1995 - -Rubyã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã®ä½œã‚Šæ–¹ã‚’説明ã—ã¾ã™ï¼Ž - -= åŸºç¤ŽçŸ¥è˜ - -Cã®å¤‰æ•°ã«ã¯åž‹ãŒã‚り，データã«ã¯åž‹ãŒã‚ã‚Šã¾ã›ã‚“．ã§ã™ã‹ã‚‰ï¼ŒãŸ -ã¨ãˆã°ãƒã‚¤ãƒ³ã‚¿ã‚’intã®å¤‰æ•°ã«ä»£å…¥ã™ã‚‹ã¨ï¼Œãã®å€¤ã¯æ•´æ•°ã¨ã—ã¦å– -り扱ã‚ã‚Œã¾ã™ï¼Žé€†ã«Rubyã®å¤‰æ•°ã«ã¯åž‹ãŒãªã，データã«åž‹ãŒã‚ã‚Šã¾ -ã™ï¼Žã“ã®é•ã„ã®ãŸã‚，Cã¨Rubyã¯ç›¸äº’ã«å¤‰æ›ã—ãªã‘ã‚Œã°ï¼ŒãŠäº’ã„ã® -データをアクセスã§ãã¾ã›ã‚“． - -Rubyã®ãƒ‡ãƒ¼ã‚¿ã¯VALUEã¨ã„ã†Cã®åž‹ã§è¡¨ç¾ã•ã‚Œã¾ã™ï¼ŽVALUEåž‹ã®ãƒ‡ãƒ¼ -ã‚¿ã¯ãã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—を自分ã§çŸ¥ã£ã¦ã„ã¾ã™ï¼Žã“ã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—㨠-ã„ã†ã®ã¯ãƒ‡ãƒ¼ã‚¿(オブジェクト)ã®å®Ÿéš›ã®æ§‹é€ ã‚’æ„味ã—ã¦ã„ã¦ï¼ŒRuby -ã®ã‚¯ãƒ©ã‚¹ã¨ã¯ã¾ãŸé•ã£ãŸã‚‚ã®ã§ã™ï¼Ž - -VALUEã‹ã‚‰Cã«ã¨ã£ã¦æ„味ã®ã‚るデータをå–り出ã™ãŸã‚ã«ã¯ - -1. VALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—を知る -2. VALUEã‚’Cã®ãƒ‡ãƒ¼ã‚¿ã«å¤‰æ›ã™ã‚‹ - -ã®ä¸¡æ–¹ãŒå¿…è¦ã§ã™ï¼Ž(1)を忘れるã¨é–“é•ã£ãŸãƒ‡ãƒ¼ã‚¿ã®å¤‰æ›ãŒè¡Œã‚ã‚Œ -ã¦ï¼Œæœ€æ‚ªãƒ—ãƒã‚°ãƒ©ãƒ ãŒcore dumpã—ã¾ã™ï¼Ž - -== データタイプ - -Rubyã«ã¯ãƒ¦ãƒ¼ã‚¶ãŒä½¿ã†å¯èƒ½æ€§ã®ã‚る以下ã®ã‚¿ã‚¤ãƒ—ãŒã‚ã‚Šã¾ã™ï¼Ž - -T_NIL :: nil -T_OBJECT :: 通常ã®ã‚ªãƒ–ジェクト -T_CLASS :: クラス -T_MODULE :: モジュール -T_FLOAT :: 浮動å°æ•°ç‚¹æ•° -T_STRING :: æ–‡å—列 -T_REGEXP :: æ£è¦è¡¨ç¾ -T_ARRAY :: é…列 -T_HASH :: 連想é…列 -T_STRUCT :: (Rubyã®)æ§‹é€ ä½“ -T_BIGNUM :: 多å€é•·æ•´æ•° -T_FIXNUM :: Fixnum(31bitã¾ãŸã¯63bité•·æ•´æ•°) -T_COMPLEX :: è¤‡ç´ æ•° -T_RATIONAL :: 有ç†æ•° -T_FILE :: 入出力 -T_TRUE :: 真 -T_FALSE :: å½ -T_DATA :: データ -T_SYMBOL :: シンボル - -ãã®ä»–ã«å†…部ã§åˆ©ç”¨ã•ã‚Œã¦ã„る以下ã®ã‚¿ã‚¤ãƒ—ãŒã‚ã‚Šã¾ã™ï¼Ž - - T_ICLASS - T_MATCH - T_UNDEF - T_NODE - T_ZOMBIE - -ã»ã¨ã‚“ã©ã®ã‚¿ã‚¤ãƒ—ã¯Cã®æ§‹é€ 体ã§å®Ÿè£…ã•ã‚Œã¦ã„ã¾ã™ï¼Ž - -== VALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ - -ruby.hã§ã¯TYPE()ã¨ã„ã†ãƒžã‚¯ãƒãŒå®šç¾©ã•ã‚Œã¦ã„ã¦ï¼ŒVALUEã®ãƒ‡ãƒ¼ã‚¿ -タイプを知るã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼ŽTYPE()マクãƒã¯ä¸Šã§ç´¹ä»‹ã—ãŸT_XXXX -ã®å½¢å¼ã®å®šæ•°ã‚’è¿”ã—ã¾ã™ï¼ŽVALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã«å¿œã˜ã¦å‡¦ç†ã™ã‚‹ -å ´åˆã«ã¯ï¼ŒTYPE()ã®å€¤ã§åˆ†å²ã™ã‚‹ã“ã¨ã«ãªã‚Šã¾ã™ï¼Ž - - switch (TYPE(obj)) { - case T_FIXNUM: - /* FIXNUMã®å‡¦ç† */ - break; - case T_STRING: - /* æ–‡å—列ã®å‡¦ç† */ - break; - case T_ARRAY: - /* é…列ã®å‡¦ç† */ - break; - default: - /* 例外を発生ã•ã›ã‚‹ */ - rb_raise(rb_eTypeError, "not valid value"); - break; - } - -ãã‚Œã¨ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ï¼Œæ£ã—ããªã‘ã‚Œã°ä¾‹å¤–を発生㙠-る関数ãŒç”¨æ„ã•ã‚Œã¦ã„ã¾ã™ï¼Ž - - void Check_Type(VALUE value, int type) - -ã“ã®é–¢æ•°ã¯valueãŒtypeã§ç„¡ã‘ã‚Œã°ï¼Œä¾‹å¤–を発生ã•ã›ã¾ã™ï¼Žå¼•æ•°ã¨ -ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸVALUEã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ãŒæ£ã—ã„ã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ã™ -ã‚‹ãŸã‚ã«ã¯ï¼Œã“ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž - -FIXNUMã¨NILã«é–¢ã—ã¦ã¯ã‚ˆã‚Šé«˜é€Ÿãªåˆ¤åˆ¥ãƒžã‚¯ãƒãŒç”¨æ„ã•ã‚Œã¦ã„ã¾ã™ï¼Ž - - FIXNUM_P(obj) - NIL_P(obj) - -== VALUEã‚’Cã®ãƒ‡ãƒ¼ã‚¿ã«å¤‰æ›ã™ã‚‹ - -データタイプãŒT_NIL，T_FALSE，T_TRUEã§ã‚る時，データã¯ãれ㞠-ã‚Œnil，false，trueã§ã™ï¼Žã“ã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã®ã‚ªãƒ–ジェクトã¯ã²ã¨ -ã¤ãšã¤ã—ã‹å˜åœ¨ã—ã¾ã›ã‚“． - -データタイプãŒT_FIXNUMã®æ™‚，ã“ã‚Œã¯31bitã¾ãŸã¯63bitã®ã‚µã‚¤ã‚ºã‚’ -æŒã¤æ•´æ•°ã§ã™ï¼Žlongã®ã‚µã‚¤ã‚ºãŒ32bitã®ãƒ—ラットフォームã§ã‚れ㰠-31bitã«ï¼Œlongã®ã‚µã‚¤ã‚ºãŒ64bitã®ãƒ—ラットフォームã§ã‚ã‚Œã°63bit -ã«ãªã‚Šã¾ã™. FIXNUM ã‚’ C ã®æ•´æ•°ã«å¤‰æ›ã™ã‚‹ãŸã‚ã«ã¯ãƒžã‚¯ãƒ -「FIX2INT()ã€ã¾ãŸã¯ã€ŒFIX2LONG()ã€ã‚’使ã„ã¾ã™ï¼Žã“れらã®ãƒžã‚¯ãƒ -を使用ã™ã‚‹éš›ã«ã¯äº‹å‰ã«ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ãŒFIXNUMã§ã‚ã‚‹ã“ã¨ã‚’確èªã™ -ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ãŒï¼Œæ¯”較的高速ã«å¤‰æ›ã‚’è¡Œã†ã“ã¨ãŒã§ãã¾ã™ï¼Žã¾ -ãŸï¼Œã€ŒFIX2LONG()ã€ã¯ä¾‹å¤–を発生ã—ã¾ã›ã‚“ãŒï¼Œã€ŒFIX2INT()ã€ã¯å¤‰ -æ›çµæžœãŒintã®ã‚µã‚¤ã‚ºã«åŽã¾ã‚‰ãªã„å ´åˆã«ã¯ä¾‹å¤–を発生ã—ã¾ã™ï¼Ž -ãã‚Œã‹ã‚‰ï¼ŒFIXNUMã«é™ã‚‰ãšRubyã®ãƒ‡ãƒ¼ã‚¿ã‚’æ•´æ•°ã«å¤‰æ›ã™ã‚‹ -「NUM2INT()ã€ãŠã‚ˆã³ã€ŒNUM2LONG()ã€ã¨ã„ã†ãƒžã‚¯ãƒãŒã‚ã‚Šã¾ã™ï¼Žã“ -れらã®ãƒžã‚¯ãƒã¯ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã®ãƒã‚§ãƒƒã‚¯ç„¡ã—ã§ä½¿ãˆã¾ã™ -(æ•´æ•°ã«å¤‰æ›ã§ããªã„å ´åˆã«ã¯ä¾‹å¤–ãŒç™ºç”Ÿã™ã‚‹)．åŒæ§˜ã«ãƒã‚§ãƒƒã‚¯ç„¡ã— -ã§ä½¿ãˆã‚‹å¤‰æ›ãƒžã‚¯ãƒã¯doubleã‚’å–り出ã™ã€ŒNUM2DBL()ã€ãŒã‚ã‚Šã¾ã™ï¼Ž - -char* ã‚’å–り出ã™å ´åˆï¼Œ StringValue() 㨠StringValuePtr() -を使ã„ã¾ã™ï¼Ž -StringValue(var) 㯠var ㌠String -ã§ã‚ã‚Œã°ä½•ã‚‚ã›ãšï¼Œãã†ã§ãªã‘れ㰠var ã‚’ var.to_str() ã®çµæžœ -ã«ç½®ãæ›ãˆã‚‹ãƒžã‚¯ãƒï¼ŒStringValuePtr(var) ã¯åŒæ§˜ã« var ã‚’ -String ã«ç½®ãæ›ãˆã¦ã‹ã‚‰ var ã®ãƒã‚¤ãƒˆåˆ—表ç¾ã«å¯¾ã™ã‚‹ char* ã‚’ -è¿”ã™ãƒžã‚¯ãƒã§ã™ï¼Žvar ã®å†…容を直接置ãæ›ãˆã‚‹å‡¦ç†ãŒå…¥ã‚‹ã®ã§ï¼Œ -var 㯠lvalue ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Ž -ã¾ãŸï¼ŒStringValuePtr() ã«é¡žä¼¼ã—㟠StringValueCStr() ã¨ã„ã†ãƒž -クãƒã‚‚ã‚ã‚Šã¾ã™ï¼ŽStringValueCStr(var) 㯠var ã‚’ String ã«ç½®ã -æ›ãˆã¦ã‹ã‚‰ var ã®æ–‡å—列表ç¾ã«å¯¾ã™ã‚‹ char* ã‚’è¿”ã—ã¾ã™ï¼Žè¿”ã•ã‚Œ -ã‚‹æ–‡å—列ã®æœ«å°¾ã«ã¯ nul æ–‡å—ãŒä»˜åŠ ã•ã‚Œã¾ã™ï¼ŽãªãŠï¼Œé€”ä¸ã« nul -æ–‡å—ãŒå«ã¾ã‚Œã‚‹å ´åˆã¯ ArgumentError ãŒç™ºç”Ÿã—ã¾ã™ï¼Ž -一方，StringValuePtr() ã§ã¯ï¼Œæœ«å°¾ã« nul æ–‡å—ãŒã‚ã‚‹ä¿è¨¼ã¯ãªã， -途ä¸ã« nul æ–‡å—ãŒå«ã¾ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ã‚‚ã‚ã‚Šã¾ã™ï¼Ž - -ãれ以外ã®ãƒ‡ãƒ¼ã‚¿ã‚¿ã‚¤ãƒ—ã¯å¯¾å¿œã™ã‚‹Cã®æ§‹é€ 体ãŒã‚ã‚Šã¾ã™ï¼Žå¯¾å¿œã™ -ã‚‹æ§‹é€ ä½“ã®ã‚ã‚‹VALUEã¯ãã®ã¾ã¾ã‚ャスト(型変æ›)ã™ã‚Œã°æ§‹é€ 体㮠-ãƒã‚¤ãƒ³ã‚¿ã«å¤‰æ›ã§ãã¾ã™ï¼Ž - -æ§‹é€ ä½“ã¯ã€Œstruct RXxxxxã€ã¨ã„ã†åå‰ã§ruby.hã§å®šç¾©ã•ã‚Œã¦ã„ã¾ -ã™ï¼Žä¾‹ãˆã°æ–‡å—列ã¯ã€Œstruct RStringã€ã§ã™ï¼Žå®Ÿéš›ã«ä½¿ã†å¯èƒ½æ€§ãŒ -ã‚ã‚‹ã®ã¯æ–‡å—列ã¨é…列ãらã„ã ã¨æ€ã„ã¾ã™ï¼Ž - -ruby.hã§ã¯æ§‹é€ 体ã¸ã‚ャストã™ã‚‹ãƒžã‚¯ãƒã‚‚「RXXXXX()ã€(全部大文 -å—ã«ã—ãŸã‚‚ã®)ã¨ã„ã†åå‰ã§æä¾›ã•ã‚Œã¦ã„ã¾ã™(例: RSTRING())．㟠-ã ã—ã€æ§‹é€ 体ã¸ã®ç›´æŽ¥ã®ã‚¢ã‚¯ã‚»ã‚¹ã¯ã§ãã‚‹ã ã‘é¿ã‘，対応ã™ã‚‹ -rb_xxxx() ã¨ã„ã£ãŸé–¢æ•°ã‚’使ã†ã‚ˆã†ã«ã—ã¦ä¸‹ã•ã„．例ãˆã°ï¼Œé…列㮠-è¦ç´ ã¸ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹å ´åˆã¯ï¼Œrb_ary_entry(ary, offset)， -rb_ary_store(ary, offset, obj) を利用ã™ã‚‹ã‚ˆã†ã«ã—ã¦ä¸‹ã•ã„． - -æ§‹é€ ä½“ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã‚’å–り出ã™ãƒžã‚¯ãƒãŒæä¾›ã•ã‚Œã¦ã„ã¾ã™ï¼Žæ–‡å—列 -strã®é•·ã•ã‚’å¾—ã‚‹ãŸã‚ã«ã¯ã€ŒRSTRING_LEN(str)ã€ã¨ã—，文å—列strã‚’ -char*ã¨ã—ã¦å¾—ã‚‹ãŸã‚ã«ã¯ã€ŒRSTRING_PTR(str)ã€ã¨ã—ã¾ã™ï¼Ž - -Rubyã®æ§‹é€ 体を直接アクセスã™ã‚‹æ™‚ã«æ°—ã‚’ã¤ã‘ãªã‘ã‚Œã°ãªã‚‰ãªã„ã“ -ã¨ã¯ï¼Œé…列や文å—列ã®æ§‹é€ 体ã®ä¸èº«ã¯å‚ç…§ã™ã‚‹ã ã‘ã§ï¼Œç›´æŽ¥å¤‰æ›´ã— -ãªã„ã“ã¨ã§ã™ï¼Žç›´æŽ¥å¤‰æ›´ã—ãŸå ´åˆï¼Œã‚ªãƒ–ジェクトã®å†…容ã®æ•´åˆæ€§ãŒ -ã¨ã‚Œãªããªã£ã¦ï¼Œæ€ã‚ã¬ãƒã‚°ã®åŽŸå› ã«ãªã‚Šã¾ã™ï¼Ž - -== Cã®ãƒ‡ãƒ¼ã‚¿ã‚’VALUEã«å¤‰æ›ã™ã‚‹ - -VALUEã®å®Ÿéš›ã®æ§‹é€ 㯠- -FIXNUMã®å ´åˆ :: - - 1bit左シフトã—ã¦ï¼ŒLSBã‚’ç«‹ã¦ã‚‹ï¼Ž - -ãã®ä»–ã®ãƒã‚¤ãƒ³ã‚¿ã®å ´åˆ :: - - ãã®ã¾ã¾VALUEã«ã‚ャストã™ã‚‹ï¼Ž - -ã¨ãªã£ã¦ã„ã¾ã™ï¼Žã‚ˆã£ã¦ï¼ŒLSBã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚Œã°VALUEãŒFIXNUMã‹ã© -ã†ã‹ã‚ã‹ã‚‹ã‚ã‘ã§ã™(ãƒã‚¤ãƒ³ã‚¿ã®LSBãŒç«‹ã£ã¦ã„ãªã„ã“ã¨ã‚’仮定ã—㦠-ã„ã‚‹)． - -ã§ã™ã‹ã‚‰ï¼ŒFIXNUM以外ã®Rubyã®ã‚ªãƒ–ジェクトã®æ§‹é€ 体ã¯å˜ã«VALUE -ã«ã‚ャストã™ã‚‹ã ã‘ã§VALUEã«å¤‰æ›å‡ºæ¥ã¾ã™ï¼ŽãŸã ã—，任æ„ã®æ§‹é€ -体ãŒVALUEã«ã‚ャスト出æ¥ã‚‹ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“．ã‚ャストã™ã‚‹ã® -ã¯Rubyã®çŸ¥ã£ã¦ã„ã‚‹æ§‹é€ ä½“(ruby.hã§å®šç¾©ã•ã‚Œã¦ã„ã‚‹struct RXxxx -ã®ã‚‚ã®)ã ã‘ã§ã™ï¼Ž - -FIXNUMã«é–¢ã—ã¦ã¯å¤‰æ›ãƒžã‚¯ãƒã‚’経由ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼ŽCã®æ•´æ•° -ã‹ã‚‰VALUEã«å¤‰æ›ã™ã‚‹ãƒžã‚¯ãƒã¯ä»¥ä¸‹ã®ã‚‚ã®ãŒã‚ã‚Šã¾ã™ï¼Žå¿…è¦ã«å¿œã˜ -ã¦ä½¿ã„分ã‘ã¦ãã ã•ã„． - -INT2FIX() :: ã‚‚ã¨ã®æ•´æ•°ãŒ31bitã¾ãŸã¯63bit以内ã«åŽã¾ã‚‹è‡ªä¿¡ - ãŒã‚る時 -INT2NUM() :: ä»»æ„ã®æ•´æ•°ã‹ã‚‰VALUE㸠- -INT2NUM()ã¯æ•´æ•°ãŒFIXNUMã®ç¯„囲ã«åŽã¾ã‚‰ãªã„å ´åˆï¼ŒBignumã«å¤‰æ› -ã—ã¦ãã‚Œã¾ã™(ãŒï¼Œå°‘ã—é…ã„)． - -== Rubyã®ãƒ‡ãƒ¼ã‚¿ã‚’æ“作ã™ã‚‹ - -先程も述ã¹ãŸé€šã‚Šï¼ŒRubyã®æ§‹é€ 体をアクセスã™ã‚‹æ™‚ã«å†…容ã®æ›´æ–°ã‚’ -è¡Œã†ã“ã¨ã¯å‹§ã‚られã¾ã›ã‚“．ã§ï¼ŒRubyã®ãƒ‡ãƒ¼ã‚¿ã‚’æ“作ã™ã‚‹æ™‚ã«ã¯ -RubyãŒç”¨æ„ã—ã¦ã„る関数を用ã„ã¦ãã ã•ã„． - -ã“ã“ã§ã¯ã‚‚ã£ã¨ã‚‚使ã‚れるã§ã‚ã‚ã†æ–‡å—列ã¨é…列ã®ç”Ÿæˆ/æ“作を行 -ã†é–¢æ•°ã‚’ã‚ã’ã¾ã™(全部ã§ã¯ãªã„ã§ã™)． - -=== æ–‡å—列ã«å¯¾ã™ã‚‹é–¢æ•° - -rb_str_new(const char *ptr, long len) :: - - æ–°ã—ã„Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Ž - -rb_str_new2(const char *ptr) -rb_str_new_cstr(const char *ptr) - - Cã®æ–‡å—列ã‹ã‚‰Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Žã“ã®é–¢æ•°ã®æ©Ÿèƒ½ã¯ - rb_str_new(ptr, strlen(ptr))ã¨åŒç‰ã§ã‚る． - -rb_str_new_literal(const char *ptr) - - Cã®ãƒªãƒ†ãƒ©ãƒ«æ–‡å—列ã‹ã‚‰Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Ž - -rb_tainted_str_new(const char *ptr, long len) - - 汚染マークãŒä»˜åŠ ã•ã‚ŒãŸæ–°ã—ã„Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Žå¤–部 - ã‹ã‚‰ã®ãƒ‡ãƒ¼ã‚¿ã«åŸºã¥ãæ–‡å—列ã«ã¯æ±šæŸ“マークãŒä»˜åŠ ã•ã‚Œã‚‹ã¹ã - ã§ã‚る． - -rb_tainted_str_new2(const char *ptr) -rb_tainted_str_new_cstr(const char *ptr) - - Cã®æ–‡å—列ã‹ã‚‰æ±šæŸ“マークãŒä»˜åŠ ã•ã‚ŒãŸRubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Ž - -rb_sprintf(const char *format, ...) -rb_vsprintf(const char *format, va_list ap) - - Cã®æ–‡å—列formatã¨ç¶šã引数をprintf(3)ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã—ãŸãŒã£ã¦ - æ•´å½¢ã—，Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Ž - - 注æ„: "%"PRIsVALUEãŒObject#to_s('+'フラグãŒæŒ‡å®šã•ã‚Œã¦ã„ã‚‹ - ã¨ãã¯Object#inspect)を使ã£ãŸVALUEã®å‡ºåŠ›ã«åˆ©ç”¨ã§ãる．ã“ã‚Œ - ã¯"%i"ã¨è¡çªã™ã‚‹ãŸã‚，整数ã«ã¯"%d"を使用ã™ã‚‹ã“ã¨ï¼Ž - -rb_str_cat(VALUE str, const char *ptr, long len) - - Rubyã®æ–‡å—列strã«lenãƒã‚¤ãƒˆã®æ–‡å—列ptrã‚’è¿½åŠ ã™ã‚‹ï¼Ž - -rb_str_cat2(VALUE str, const char* ptr) -rb_str_cat_cstr(VALUE str, const char* ptr) - - Rubyã®æ–‡å—列strã«Cã®æ–‡å—列ptrã‚’è¿½åŠ ã™ã‚‹ï¼Žã“ã®é–¢æ•°ã®æ©Ÿèƒ½ã¯ - rb_str_cat(str, ptr, strlen(ptr))ã¨åŒç‰ã§ã‚る． - -rb_str_catf(VALUE str, const char* format, ...) -rb_str_vcatf(VALUE str, const char* format, va_list ap) - - Cã®æ–‡å—列formatã¨ç¶šã引数をprintf(3)ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã—ãŸãŒã£ã¦ - æ•´å½¢ã—，Rubyã®æ–‡å—列strã«è¿½åŠ ã™ã‚‹ï¼Žã“ã®é–¢æ•°ã®æ©Ÿèƒ½ã¯ï¼Œãã‚Œãžã‚Œ - rb_str_cat2(str, rb_sprintf(format, ...)) ã‚„ - rb_str_cat2(str, rb_vsprintf(format, ap)) ã¨åŒç‰ã§ã‚る． - -rb_enc_str_new(const char *ptr, long len, rb_encoding *enc) -rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) - - 指定ã•ã‚ŒãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã§Rubyã®æ–‡å—列を生æˆã™ã‚‹. - -rb_enc_str_new_literal(const char *ptr) - - Cã®ãƒªãƒ†ãƒ©ãƒ«æ–‡å—列ã‹ã‚‰æŒ‡å®šã•ã‚ŒãŸã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã§Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Ž - -rb_usascii_str_new(const char *ptr, long len) -rb_usascii_str_new_cstr(const char *ptr) - - エンコーディングãŒUS-ASCIIã®Rubyã®æ–‡å—列を生æˆã™ã‚‹. - -rb_usascii_str_new_literal(const char *ptr) - - Cã®ãƒªãƒ†ãƒ©ãƒ«æ–‡å—列ã‹ã‚‰ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ãŒUS-ASCIIã®Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Ž - -rb_utf8_str_new(const char *ptr, long len) -rb_utf8_str_new_cstr(const char *ptr) - - エンコーディングãŒUTF-8ã®Rubyã®æ–‡å—列を生æˆã™ã‚‹. - -rb_usascii_str_new_literal(const char *ptr) - - Cã®ãƒªãƒ†ãƒ©ãƒ«æ–‡å—列ã‹ã‚‰ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ãŒUTF-8ã®Rubyã®æ–‡å—列を生æˆã™ã‚‹ï¼Ž - -rb_str_resize(VALUE str, long len) - - Rubyã®æ–‡å—列ã®ã‚µã‚¤ã‚ºã‚’lenãƒã‚¤ãƒˆã«å¤‰æ›´ã™ã‚‹ï¼Žstrã®é•·ã•ã¯å‰ - 以ã¦ã‚»ãƒƒãƒˆã•ã‚Œã¦ã„ãªã‘ã‚Œã°ãªã‚‰ãªã„．lenãŒå…ƒã®é•·ã•ã‚ˆã‚Šã‚‚çŸ - ã„時ã¯ï¼Œlenãƒã‚¤ãƒˆã‚’越ãˆãŸéƒ¨åˆ†ã®å†…容ã¯æ¨ã¦ã‚‰ã‚Œã‚‹ï¼ŽlenãŒå…ƒ - ã®é•·ã•ã‚ˆã‚Šã‚‚é•·ã„時ã¯ï¼Œå…ƒã®é•·ã•ã‚’越ãˆãŸéƒ¨åˆ†ã®å†…容ã¯ä¿å˜ã• - ã‚Œãªã„ã§ã‚´ãƒŸã«ãªã‚‹ã ã‚ã†ï¼Žã“ã®é–¢æ•°ã®å‘¼ã³å‡ºã—ã«ã‚ˆã£ã¦ - RSTRING_PTR(str)ãŒå¤‰æ›´ã•ã‚Œã‚‹ã‹ã‚‚ã—ã‚Œãªã„ã“ã¨ã«æ³¨æ„． - -rb_str_set_len(VALUE str, long len) - - Rubyã®æ–‡å—列ã®ã‚µã‚¤ã‚ºã‚’lenãƒã‚¤ãƒˆã«ã‚»ãƒƒãƒˆã™ã‚‹ï¼ŽstrãŒå¤‰æ›´å¯ - 能ã§ãªã‘ã‚Œã°ä¾‹å¤–ãŒç™ºç”Ÿã™ã‚‹ï¼ŽRSTRING_LEN(str)ã¨ã¯ç„¡é–¢ä¿‚ã«ï¼Œ - lenãƒã‚¤ãƒˆã¾ã§ã®å†…容ã¯ä¿å˜ã•ã‚Œã‚‹ï¼Žlenã¯strã®å®¹é‡ã‚’越ãˆã¦ã„ - ã¦ã¯ãªã‚‰ãªã„． - - -== é…列ã«å¯¾ã™ã‚‹é–¢æ•° - -rb_ary_new() - - è¦ç´ ãŒ0ã®é…列を生æˆã™ã‚‹ï¼Ž - -rb_ary_new2(long len) -rb_ary_new_capa(long len) - - è¦ç´ ãŒ0ã®é…列を生æˆã™ã‚‹ï¼Žlenè¦ç´ 分ã®é ˜åŸŸã‚’ã‚らã‹ã˜ã‚割り - 当ã¦ã¦ãŠã． - -rb_ary_new3(long n, ...) -rb_ary_new_from_args(long n, ...) - - 引数ã§æŒ‡å®šã—ãŸnè¦ç´ ã‚’å«ã‚€é…列を生æˆã™ã‚‹ï¼Ž - -rb_ary_new4(long n, VALUE *elts) -rb_ary_new_from_values(long n, VALUE *elts) - - é…列ã§ä¸ŽãˆãŸnè¦ç´ ã®é…列を生æˆã™ã‚‹ï¼Ž - -rb_ary_to_ary(VALUE obj) - - オブジェクトをé…列ã«å¤‰æ›ã™ã‚‹. - Object#to_aryã¨åŒç‰ã§ã‚ã‚‹. - -ä»–ã«ã‚‚é…列をæ“作ã™ã‚‹é–¢æ•°ãŒå¤šæ•°ã‚ã‚‹. ã“れら㯠-引数aryã«é…列を渡ã•ãªã‘ã‚Œã°ãªã‚‰ãªã„. ã•ã‚‚ãªã„㨠-コアをåã. - -rb_ary_aref(argc, VALUE *argv, VALUE ary) - - Array#[]ã¨åŒç‰. - -rb_ary_entry(VALUE ary, long offset) - - ary[offset] - -rb_ary_store(VALUE ary, long offset, VALUE obj) :: - - ary[offset] = obj - -rb_ary_subseq(VALUE ary, long beg, long len) - - ary[beg, len] - -rb_ary_push(VALUE ary, VALUE val) -rb_ary_pop(VALUE ary) -rb_ary_shift(VALUE ary) -rb_ary_unshift(VALUE ary, VALUE val) - -rb_ary_cat(VALUE ary, const VALUE *ptr, long len) - - é…列aryã«ptrã‹ã‚‰len個ã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’è¿½åŠ ã™ã‚‹ï¼Ž - -= Rubyã®æ©Ÿèƒ½ã‚’使ㆠ- -原ç†çš„ã«Rubyã§æ›¸ã‘ã‚‹ã“ã¨ã¯Cã§ã‚‚書ã‘ã¾ã™ï¼ŽRubyãã®ã‚‚ã®ãŒCã§è¨˜ -è¿°ã•ã‚Œã¦ã„ã‚‹ã‚“ã§ã™ã‹ã‚‰ï¼Œå½“然ã¨ã„ãˆã°å½“然ãªã‚“ã§ã™ã‘ã©ï¼Žã“ã“㧠-ã¯Rubyã®æ‹¡å¼µã«ä½¿ã†ã“ã¨ãŒå¤šã„ã ã‚ã†ã¨äºˆæ¸¬ã•ã‚Œã‚‹æ©Ÿèƒ½ã‚’ä¸å¿ƒã«ç´¹ -介ã—ã¾ã™ï¼Ž - -== Rubyã«æ©Ÿèƒ½ã‚’è¿½åŠ ã™ã‚‹ - -Rubyã§æä¾›ã•ã‚Œã¦ã„る関数を使ãˆã°Rubyインタプリタã«æ–°ã—ã„機能 -ã‚’è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼ŽRubyã§ã¯ä»¥ä¸‹ã®æ©Ÿèƒ½ã‚’è¿½åŠ ã™ã‚‹é–¢æ•°ãŒ -æä¾›ã•ã‚Œã¦ã„ã¾ã™ï¼Ž - -* クラス，モジュール -* メソッド，特異メソッドãªã© -* 定数 - -ã§ã¯é †ã«ç´¹ä»‹ã—ã¾ã™ï¼Ž - -=== クラス/モジュール定義 - -クラスやモジュールを定義ã™ã‚‹ãŸã‚ã«ã¯ï¼Œä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž - - VALUE rb_define_class(const char *name, VALUE super) - VALUE rb_define_module(const char *name) - -ã“れらã®é–¢æ•°ã¯æ–°ã—ã定義ã•ã‚ŒãŸã‚¯ãƒ©ã‚¹ã‚„モジュールを返ã—ã¾ã™ï¼Ž -メソッドや定数ã®å®šç¾©ã«ã“れらã®å€¤ãŒå¿…è¦ãªã®ã§ï¼Œã»ã¨ã‚“ã©ã®å ´åˆ -ã¯æˆ»ã‚Šå€¤ã‚’変数ã«æ ¼ç´ã—ã¦ãŠãå¿…è¦ãŒã‚ã‚‹ã§ã—ょã†ï¼Ž - -クラスやモジュールを他ã®ã‚¯ãƒ©ã‚¹ã®å†…部ã«ãƒã‚¹ãƒˆã—ã¦å®šç¾©ã™ã‚‹æ™‚ã« -ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž - - VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super) - VALUE rb_define_module_under(VALUE outer, const char *name) - -=== メソッド/特異メソッド定義 - -メソッドや特異メソッドを定義ã™ã‚‹ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž - - void rb_define_method(VALUE klass, const char *name, - VALUE (*func)(), int argc) - - void rb_define_singleton_method(VALUE object, const char *name, - VALUE (*func)(), int argc) - - -念ã®ãŸã‚説明ã™ã‚‹ã¨ã€Œç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ã€ã¨ã¯ï¼Œãã®ç‰¹å®šã®ã‚ªãƒ–ジェク -トã«å¯¾ã—ã¦ã ã‘有効ãªãƒ¡ã‚½ãƒƒãƒ‰ã§ã™ï¼ŽRubyã§ã¯ã‚ˆãSmalltalkã«ãŠ -ã‘るクラスメソッドã¨ã—ã¦ï¼Œã‚¯ãƒ©ã‚¹ã«å¯¾ã™ã‚‹ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ãŒä½¿ã‚ã‚Œ -ã¾ã™ï¼Ž - -ã“れらã®é–¢æ•°ã® argcã¨ã„ã†å¼•æ•°ã¯Cã®é–¢æ•°ã¸æ¸¡ã•ã‚Œã‚‹å¼•æ•°ã®æ•°(㨠-å½¢å¼)を決ã‚ã¾ã™ï¼ŽargcãŒ0以上ã®æ™‚ã¯é–¢æ•°ã«å¼•ã渡ã™å¼•æ•°ã®æ•°ã‚’æ„ -味ã—ã¾ã™ï¼Ž16個以上ã®å¼•æ•°ã¯ä½¿ãˆã¾ã›ã‚“(ãŒï¼Œè¦ã‚Šã¾ã›ã‚“よã，ã -ã‚“ãªã«)．実際ã®é–¢æ•°ã«ã¯å…ˆé ã®å¼•æ•°ã¨ã—ã¦selfãŒä¸Žãˆã‚‰ã‚Œã¾ã™ã® -ã§ï¼ŒæŒ‡å®šã—ãŸæ•°ã‚ˆã‚Š1多ã„引数をæŒã¤ã“ã¨ã«ãªã‚Šã¾ã™ï¼Ž - -argcãŒè² ã®æ™‚ã¯å¼•æ•°ã®æ•°ã§ã¯ãªã，形å¼ã‚’指定ã—ãŸã“ã¨ã«ãªã‚Šã¾ã™ï¼Ž -argcãŒ-1ã®æ™‚ã¯å¼•æ•°ã‚’é…列ã«å…¥ã‚Œã¦æ¸¡ã•ã‚Œã¾ã™ï¼ŽargcãŒ-2ã®æ™‚ã¯å¼• -æ•°ã¯Rubyã®é…列ã¨ã—ã¦æ¸¡ã•ã‚Œã¾ã™ï¼Ž - -メソッドを定義ã™ã‚‹é–¢æ•°ã¯ã¾ã ã„ãã¤ã‹ã‚ã‚Šã¾ã™. ã²ã¨ã¤ã¯ãƒ¡ã‚½ãƒƒãƒ‰ -åã¨ã—ã¦IDã‚’å–ã‚Šã¾ã™. IDã«ã¤ã„ã¦ã¯2.2.2ã‚’å‚ç…§. - - void rb_define_method_id(VALUE klass, ID name, - VALUE (*func)(ANYARGS), int argc) - -private/protectedãªãƒ¡ã‚½ãƒƒãƒ‰ã‚’定義ã™ã‚‹ãµãŸã¤ã®é–¢æ•°ãŒã‚ã‚Šã¾ã™. - - void rb_define_private_method(VALUE klass, const char *name, - VALUE (*func)(), int argc) - void rb_define_protected_method(VALUE klass, const char *name, - VALUE (*func)(), int argc) - -privateメソッドã¨ã¯é–¢æ•°å½¢å¼ã§ã—ã‹å‘¼ã³å‡ºã™ã“ã¨ã®å‡ºæ¥ãªã„メソッ -ドã§ã™ï¼Ž - -最後ã«ï¼Œ rb_define_module関数ã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«é–¢æ•°ã‚’定義ã—ã¾ã™ï¼Ž -モジュール関数ã¨ã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚り，åŒæ™‚ã« -privateメソッドã§ã‚‚ã‚ã‚‹ã‚‚ã®ã§ã™ï¼Žä¾‹ã‚’ã‚ã’ã‚‹ã¨Mathモジュール -ã®sqrt()ãªã©ãŒã‚ã’られã¾ã™ï¼Žã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã¯ - - Math.sqrt(4) - -ã¨ã„ã†å½¢å¼ã§ã‚‚ - - include Math - sqrt(4) - -ã¨ã„ã†å½¢å¼ã§ã‚‚使ãˆã¾ã™ï¼Žãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«é–¢æ•°ã‚’定義ã™ã‚‹é–¢æ•°ã¯ä»¥ä¸‹ã® -通りã§ã™ï¼Ž - - void rb_define_module_function(VALUE module, const char *name, - VALUE (*func)(), int argc) - -関数的メソッド(Kernelモジュールã®private method)を定義ã™ã‚‹ãŸ -ã‚ã®é–¢æ•°ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼Ž - - void rb_define_global_function(const char *name, VALUE (*func)(), int argc) - - -メソッドã®åˆ¥åを定義ã™ã‚‹ãŸã‚ã®é–¢æ•°ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼Ž - - void rb_define_alias(VALUE module, const char* new, const char* old); - -属性ã®å–得・è¨å®šãƒ¡ã‚½ãƒƒãƒ‰ã‚’定義ã™ã‚‹ã«ã¯ - - void rb_define_attr(VALUE klass, const char *name, int read, int write) - -クラスメソッドallocateを定義ã—ãŸã‚Šå‰Šé™¤ã—ãŸã‚Šã™ã‚‹ãŸã‚ã®é–¢æ•°ã¯ -以下ã®é€šã‚Šã§ã™ï¼Ž - - void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass)); - void rb_undef_alloc_func(VALUE klass); - -funcã¯ã‚¯ãƒ©ã‚¹ã‚’引数ã¨ã—ã¦å—ã‘å–ã£ã¦ï¼Œæ–°ã—ã割り当ã¦ã‚‰ã‚ŒãŸã‚¤ãƒ³ -スタンスを返ã•ãªãã¦ã¯ãªã‚Šã¾ã›ã‚“．ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ï¼Œå¤–部リ -ソースãªã©ã‚’å«ã¾ãªã„，ã§ãã‚‹ã ã‘「空ã€ã®ã¾ã¾ã«ã—ã¦ãŠã„ãŸã»ã† -ãŒã‚ˆã„ã§ã—ょã†ï¼Ž - -継承ã—ãŸã‚¯ãƒ©ã‚¹ã«ã‚ã‚‹æ—¢å˜ã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ã—ã¦ã„る㪠-ら，オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ã•ã‚ŒãŸãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使 -ã„ã¾ã™ï¼Ž - - VALUE rb_call_super(int argc, const VALUE *argv) - -ç¾åœ¨ã®ã‚¹ã‚³ãƒ¼ãƒ—ã®ãƒ¬ã‚·ãƒ¼ãƒã¯(ä»–ã«æ–¹æ³•ãŒãªã‘ã‚Œã°)，以下ã®é–¢æ•°ã§ -å¾—ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼Ž - - VALUE rb_current_receiver(void) - -=== 定数定義 - -拡張ライブラリãŒå¿…è¦ãªå®šæ•°ã¯ã‚らã‹ã˜ã‚定義ã—ã¦ãŠã„ãŸæ–¹ãŒè‰¯ã„ -ã§ã—ょã†ï¼Žå®šæ•°ã‚’定義ã™ã‚‹é–¢æ•°ã¯äºŒã¤ã‚ã‚Šã¾ã™ï¼Ž - - void rb_define_const(VALUE klass, const char *name, VALUE val) - void rb_define_global_const(const char *name, VALUE val) - -å‰è€…ã¯ç‰¹å®šã®ã‚¯ãƒ©ã‚¹/モジュールã«å±žã™ã‚‹å®šæ•°ã‚’定義ã™ã‚‹ã‚‚ã®ï¼Œå¾Œ -者ã¯ã‚°ãƒãƒ¼ãƒãƒ«ãªå®šæ•°ã‚’定義ã™ã‚‹ã‚‚ã®ã§ã™ï¼Ž - -== Rubyã®æ©Ÿèƒ½ã‚’Cã‹ã‚‰å‘¼ã³å‡ºã™ - -æ—¢ã«ã€Ž1.5 Rubyã®ãƒ‡ãƒ¼ã‚¿ã‚’æ“作ã™ã‚‹ã€ã§ä¸€éƒ¨ç´¹ä»‹ã—ãŸã‚ˆã†ãªé–¢æ•°ã‚’ -使ãˆã°ï¼ŒRubyã®æ©Ÿèƒ½ã‚’実ç¾ã—ã¦ã„る関数を直接呼ã³å‡ºã™ã“ã¨ãŒå‡ºæ¥ -ã¾ã™ï¼Ž - -# ã“ã®ã‚ˆã†ãªé–¢æ•°ã®ä¸€è¦§è¡¨ã¯ã„ã¾ã®ã¨ã“ã‚ã‚ã‚Šã¾ã›ã‚“．ソースを見 -# ã‚‹ã—ã‹ãªã„ã§ã™ã． - -ãれ以外ã«ã‚‚Rubyã®æ©Ÿèƒ½ã‚’呼ã³å‡ºã™æ–¹æ³•ã¯ã„ãã¤ã‹ã‚ã‚Šã¾ã™ï¼Ž - -=== Rubyã®ãƒ—ãƒã‚°ãƒ©ãƒ ã‚’evalã™ã‚‹ - -Cã‹ã‚‰Rubyã®æ©Ÿèƒ½ã‚’呼ã³å‡ºã™ã‚‚ã£ã¨ã‚‚ç°¡å˜ãªæ–¹æ³•ã¨ã—ã¦ï¼Œæ–‡å—列㧠-与ãˆã‚‰ã‚ŒãŸRubyã®ãƒ—ãƒã‚°ãƒ©ãƒ を評価ã™ã‚‹ä»¥ä¸‹ã®é–¢æ•°ãŒã‚ã‚Šã¾ã™ï¼Ž - - VALUE rb_eval_string(const char *str) - -ã“ã®è©•ä¾¡ã¯ç¾åœ¨ã®ç’°å¢ƒã§è¡Œã‚ã‚Œã¾ã™ï¼Žã¤ã¾ã‚Šï¼Œç¾åœ¨ã®ãƒãƒ¼ã‚«ãƒ«å¤‰æ•° -ãªã©ã‚’å—ã‘継ãŽã¾ã™ï¼Ž - -評価ã¯ä¾‹å¤–を発生ã™ã‚‹ã‹ã‚‚ã—ã‚Œãªã„ã“ã¨ã«æ³¨æ„ã—ã¾ã—ょã†. より安全 -ãªé–¢æ•°ã‚‚ã‚ã‚Šã¾ã™. - - VALUE rb_eval_string_protect(const char *str, int *state) - -ã“ã®é–¢æ•°ã¯ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã™ã‚‹ã¨nilã‚’è¿”ã—ã¾ã™ï¼Žãã—ã¦ï¼ŒæˆåŠŸæ™‚ã«ã¯ -*stateã¯ã‚¼ãƒã«ï¼Œã•ã‚‚ãªãã°éžã‚¼ãƒã«ãªã‚Šã¾ã™ï¼Ž - -=== IDã¾ãŸã¯ã‚·ãƒ³ãƒœãƒ« - -Cã‹ã‚‰æ–‡å—列を経由ã›ãšã«Rubyã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™ã“ã¨ã‚‚ã§ãã¾ -ã™ï¼Žãã®å‰ã«ï¼ŒRubyインタプリタ内ã§ãƒ¡ã‚½ãƒƒãƒ‰ã‚„変数åを指定ã™ã‚‹ -時ã«ä½¿ã‚ã‚Œã¦ã„ã‚‹IDã«ã¤ã„ã¦èª¬æ˜Žã—ã¦ãŠãã¾ã—ょã†ï¼Ž - -IDã¨ã¯å¤‰æ•°å，メソッドåを表ã™æ•´æ•°ã§ã™ï¼ŽRubyã®ä¸ã§ã¯ - - :è˜åˆ¥å - -ã¾ãŸã¯ - - :"ä»»æ„ã®æ–‡å—列" - -ã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ï¼ŽCã‹ã‚‰ã“ã®æ•´æ•°ã‚’å¾—ã‚‹ãŸã‚ã«ã¯é–¢æ•° - - rb_intern(const char *name) - rb_intern_str(VALUE name) - -を使ã„ã¾ã™ï¼ŽRubyã‹ã‚‰å¼•æ•°ã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸã‚·ãƒ³ãƒœãƒ«(ã¾ãŸã¯æ–‡å— -列)ã‚’IDã«å¤‰æ›ã™ã‚‹ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž - - rb_to_id(VALUE symbol) - rb_check_id(volatile VALUE *name) - rb_check_id_cstr(const char *name, long len, rb_encoding *enc) - -ã‚‚ã—引数ãŒã‚·ãƒ³ãƒœãƒ«ã§ã‚‚æ–‡å—列ã§ã‚‚ãªã‘ã‚Œã°ï¼Œto_strメソッドã§æ–‡ -å—列ã«å¤‰æ›ã—よã†ã¨ã—ã¾ã™ï¼Žç¬¬äºŒã®é–¢æ•°ã¯ãã®å¤‰æ›çµæžœã‚’*nameã«ä¿ -å˜ã—,ãã®åå‰ãŒæ—¢çŸ¥ã®ã‚·ãƒ³ãƒœãƒ«ã§ãªã„å ´åˆã¯0ã‚’è¿”ã—ã¾ã™ï¼Žã“ã®é–¢ -æ•°ãŒ0以外を返ã—ãŸå ´åˆã¯*nameã¯å¸¸ã«ã‚·ãƒ³ãƒœãƒ«ã‹æ–‡å—列ã§ã‚り，0ã‚’ -è¿”ã—ãŸå ´åˆã¯å¸¸ã«æ–‡å—列ã§ã™ï¼Žç¬¬ä¸‰ã®é–¢æ•°ã¯Rubyã®æ–‡å—列ã§ã¯ãªã -NUL終端ã•ã‚ŒãŸCã®æ–‡å—列を使ã„ã¾ã™ï¼Ž - -Rubyã‹ã‚‰å¼•æ•°ã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸã‚·ãƒ³ãƒœãƒ«(ã¾ãŸã¯æ–‡å—列)をシンボル -ã«å¤‰æ›ã™ã‚‹ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž - - rb_to_symbol(VALUE name) - rb_check_symbol(volatile VALUE *namep) - rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc) - -ã“れらã®é–¢æ•°ã¯ï¼ŒIDã®ä»£ã‚ã‚Šã«ã‚·ãƒ³ãƒœãƒ«ã‚’è¿”ã™ã“ã¨ã‚’除ã‘ã°ä¸Šè¨˜ã® -関数ã¨åŒã˜ã§ã™ï¼Ž - -=== Cã‹ã‚‰Rubyã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™ - -Cã‹ã‚‰æ–‡å—列を経由ã›ãšã«Rubyã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™ãŸã‚ã«ã¯ä»¥ä¸‹ -ã®é–¢æ•°ã‚’使ã„ã¾ã™ï¼Ž - - VALUE rb_funcall(VALUE recv, ID mid, int argc, ...) - -ã“ã®é–¢æ•°ã¯ã‚ªãƒ–ジェクトrecvã®midã§æŒ‡å®šã•ã‚Œã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡º -ã—ã¾ã™ï¼Žãã®ä»–ã«å¼•æ•°ã®æŒ‡å®šã®ä»•æ–¹ãŒé•ã†ä»¥ä¸‹ã®é–¢æ•°ã‚‚ã‚ã‚Šã¾ã™ï¼Ž - - VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) - VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) - VALUE rb_apply(VALUE recv, ID mid, VALUE args) - -applyã«ã¯å¼•æ•°ã¨ã—ã¦Rubyã®é…列を与ãˆã¾ã™ï¼Ž - -=== 変数/定数をå‚ç…§/æ›´æ–°ã™ã‚‹ - -Cã‹ã‚‰é–¢æ•°ã‚’使ã£ã¦å‚照・更新ã§ãã‚‹ã®ã¯ï¼Œå®šæ•°ï¼Œã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰ -æ•°ã§ã™ï¼Žå¤§åŸŸå¤‰æ•°ã¯ä¸€éƒ¨ã®ã‚‚ã®ã¯Cã®å¤§åŸŸå¤‰æ•°ã¨ã—ã¦ã‚¢ã‚¯ã‚»ã‚¹ã§ã -ã¾ã™ï¼Žãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã‚’å‚ç…§ã™ã‚‹æ–¹æ³•ã¯å…¬é–‹ã—ã¦ã„ã¾ã›ã‚“． - -オブジェクトã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã‚’å‚照・更新ã™ã‚‹é–¢æ•°ã¯ä»¥ä¸‹ã®é€š -ã‚Šã§ã™ï¼Ž - - VALUE rb_ivar_get(VALUE obj, ID id) - VALUE rb_ivar_set(VALUE obj, ID id, VALUE val) - -idã¯rb_intern()ã§å¾—られるもã®ã‚’使ã£ã¦ãã ã•ã„． - -定数をå‚ç…§ã™ã‚‹ã«ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã£ã¦ãã ã•ã„． - - VALUE rb_const_get(VALUE obj, ID id) - -定数を新ã—ã定義ã™ã‚‹ãŸã‚ã«ã¯ã€Ž2.1.3 定数定義ã€ã§ç´¹ä»‹ã• -ã‚Œã¦ã„る関数を使ã£ã¦ãã ã•ã„． - -= Rubyã¨Cã¨ã®æƒ…å ±å…±æœ‰ - -C言語ã¨Rubyã®é–“ã§æƒ…å ±ã‚’å…±æœ‰ã™ã‚‹æ–¹æ³•ã«ã¤ã„ã¦è§£èª¬ã—ã¾ã™ï¼Ž - -== Cã‹ã‚‰å‚ç…§ã§ãã‚‹Rubyã®å®šæ•° - -以下ã®Rubyã®å®šæ•°ã¯Cã®ãƒ¬ãƒ™ãƒ«ã‹ã‚‰å‚ç…§ã§ãã¾ã™ï¼Ž - - Qtrue - Qfalse - -真å½å€¤ï¼ŽQfalseã¯C言語ã§ã‚‚å½ã¨ã¿ãªã•ã‚Œã¾ã™(ã¤ã¾ã‚Š0)． - - Qnil - -C言語ã‹ã‚‰è¦‹ãŸã€Œnilã€ï¼Ž - -== Cã¨Rubyã§å…±æœ‰ã•ã‚Œã‚‹å¤§åŸŸå¤‰æ•° - -Cã¨Rubyã§å¤§åŸŸå¤‰æ•°ã‚’使ã£ã¦æƒ…å ±ã‚’å…±æœ‰ã§ãã¾ã™ï¼Žå…±æœ‰ã§ãる大域 -変数ã«ã¯ã„ãã¤ã‹ã®ç¨®é¡žãŒã‚ã‚Šã¾ã™ï¼Žãã®ãªã‹ã§ã‚‚ã£ã¨ã‚‚良ã使゠-れるã¨æ€ã‚れるã®ã¯rb_define_variable()ã§ã™ï¼Ž - - void rb_define_variable(const char *name, VALUE *var) - -ã“ã®é–¢æ•°ã¯Rubyã¨Cã¨ã§å…±æœ‰ã™ã‚‹å¤§åŸŸå¤‰æ•°ã‚’定義ã—ã¾ã™ï¼Žå¤‰æ•°å㌠-`$'ã§å§‹ã¾ã‚‰ãªã„時ã«ã¯è‡ªå‹•çš„ã«è¿½åŠ ã•ã‚Œã¾ã™ï¼Žã“ã®å¤‰æ•°ã®å€¤ã‚’変 -æ›´ã™ã‚‹ã¨è‡ªå‹•çš„ã«Rubyã®å¯¾å¿œã™ã‚‹å¤‰æ•°ã®å€¤ã‚‚変ã‚ã‚Šã¾ã™ï¼Ž - -ã¾ãŸRubyå´ã‹ã‚‰ã¯æ›´æ–°ã§ããªã„変数もã‚ã‚Šã¾ã™ï¼Žã“ã®read onlyã® -変数ã¯ä»¥ä¸‹ã®é–¢æ•°ã§å®šç¾©ã—ã¾ã™ï¼Ž - - void rb_define_readonly_variable(const char *name, VALUE *var) - -ã“れら変数ã®ä»–ã«hookã‚’ã¤ã‘ãŸå¤§åŸŸå¤‰æ•°ã‚’定義ã§ãã¾ã™ï¼Žhook付ã -ã®å¤§åŸŸå¤‰æ•°ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’用ã„ã¦å®šç¾©ã—ã¾ã™ï¼Žhook付ã大域変数㮠-値ã®å‚照やè¨å®šã¯hookã§è¡Œã†å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Ž - - void rb_define_hooked_variable(const char *name, VALUE *var, - VALUE (*getter)(), void (*setter)()) - -ã“ã®é–¢æ•°ã¯Cã®é–¢æ•°ã«ã‚ˆã£ã¦hookã®ã¤ã‘られãŸå¤§åŸŸå¤‰æ•°ã‚’定義ã—ã¾ -ã™ï¼Žå¤‰æ•°ãŒå‚ç…§ã•ã‚ŒãŸæ™‚ã«ã¯é–¢æ•°getterãŒï¼Œå¤‰æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•ã‚Œ -ãŸæ™‚ã«ã¯é–¢æ•°setterãŒå‘¼ã°ã‚Œã‚‹ï¼Žhookを指定ã—ãªã„å ´åˆã¯getterã‚„ -setterã«0を指定ã—ã¾ã™ï¼Ž -# getterã‚‚setterã‚‚0ãªã‚‰ã°rb_define_variable()ã¨åŒã˜ã«ãªã‚‹ï¼Ž - -getterã¨setterã®ä»•æ§˜ã¯æ¬¡ã®é€šã‚Šã§ã™ï¼Ž - - VALUE (*getter)(ID id, VALUE *var); - void (*setter)(VALUE val, ID id, VALUE *var); - - -ãã‚Œã‹ã‚‰ï¼Œå¯¾å¿œã™ã‚‹Cã®å¤‰æ•°ã‚’æŒãŸãªã„Rubyã®å¤§åŸŸå¤‰æ•°ã‚’定義ã™ã‚‹ -ã“ã¨ã‚‚ã§ãã¾ã™. ãã®å¤‰æ•°ã®å€¤ã¯ãƒ•ãƒƒã‚¯é–¢æ•°ã®ã¿ã«ã‚ˆã£ã¦å–得・è¨å®š -ã•ã‚Œã¾ã™. - - void rb_define_virtual_variable(const char *name, - VALUE (*getter)(), void (*setter)()) - -ã“ã®é–¢æ•°ã«ã‚ˆã£ã¦å®šç¾©ã•ã‚ŒãŸRubyã®å¤§åŸŸå¤‰æ•°ãŒå‚ç…§ã•ã‚ŒãŸæ™‚ã«ã¯ -getterãŒï¼Œå¤‰æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•ã‚ŒãŸæ™‚ã«ã¯setterãŒå‘¼ã°ã‚Œã¾ã™ï¼Ž - -getterã¨setterã®ä»•æ§˜ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼Ž - - (*getter)(ID id); - (*setter)(VALUE val, ID id); - -== Cã®ãƒ‡ãƒ¼ã‚¿ã‚’Rubyオブジェクトã«ã™ã‚‹ - -Cã®ä¸–ç•Œã§å®šç¾©ã•ã‚ŒãŸãƒ‡ãƒ¼ã‚¿(æ§‹é€ ä½“)ã‚’Rubyã®ã‚ªãƒ–ジェクトã¨ã—㦠-å–り扱ã„ãŸã„å ´åˆãŒã‚ã‚Šãˆã¾ã™ï¼Žã“ã®ã‚ˆã†ãªå ´åˆã«ã¯ï¼ŒDataã¨ã„ㆠ-Rubyオブジェクトã«Cã®æ§‹é€ 体(ã¸ã®ãƒã‚¤ãƒ³ã‚¿)ã‚’ãã‚‹ã‚€ã“ã¨ã§Ruby -オブジェクトã¨ã—ã¦å–り扱ãˆã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ï¼Ž - -Dataオブジェクトを生æˆã—ã¦æ§‹é€ 体をRubyオブジェクトã«ã‚«ãƒ—セル -化ã™ã‚‹ãŸã‚ã«ã¯ï¼Œä»¥ä¸‹ã®ãƒžã‚¯ãƒã‚’使ã„ã¾ã™ï¼Ž - - Data_Wrap_Struct(klass, mark, free, sval) - -ã“ã®ãƒžã‚¯ãƒã®æˆ»ã‚Šå€¤ã¯ç”Ÿæˆã•ã‚ŒãŸDataオブジェクトã§ã™ï¼Ž - -klassã¯ã“ã®Dataオブジェクトã®ã‚¯ãƒ©ã‚¹ã§ã™ï¼Žmarkã¯ã“ã®æ§‹é€ 体㌠-Rubyã®ã‚ªãƒ–ジェクトã¸ã®å‚ç…§ãŒã‚る時ã«ä½¿ã†é–¢æ•°ã§ã™ï¼Žãã®ã‚ˆã†ãª -å‚照をå«ã¾ãªã„時ã«ã¯0を指定ã—ã¾ã™ï¼Ž - -# ãã®ã‚ˆã†ãªå‚ç…§ã¯å‹§ã‚られã¾ã›ã‚“． - -freeã¯ã“ã®æ§‹é€ 体ãŒã‚‚ã†ä¸è¦ã«ãªã£ãŸæ™‚ã«å‘¼ã°ã‚Œã‚‹é–¢æ•°ã§ã™ï¼Žã“ã® -関数ãŒã‚¬ãƒ¼ãƒ™ãƒ¼ã‚¸ã‚³ãƒ¬ã‚¯ã‚¿ã‹ã‚‰å‘¼ã°ã‚Œã¾ã™ï¼Žã“ã‚ŒãŒ-1ã®å ´åˆã¯ï¼Œå˜ -ç´”ã«é–‹æ”¾ã•ã‚Œã¾ã™ï¼Ž - -markãŠã‚ˆã³free関数ã¯GC実行ä¸ã«å‘¼ã³å‡ºã•ã‚Œã¾ã™. -ãªãŠ, GC実行ä¸ã¯Rubyオブジェクトã®ã‚¢ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¯ç¦æ¢ã•ã‚Œã¾ -ã™. よã£ã¦, markãŠã‚ˆã³free関数ã§Rubyオブジェクトã®ã‚¢ãƒã‚±ãƒ¼ã‚· -ョンã¯è¡Œã‚ãªã„ã§ãã ã•ã„. - -Cã®æ§‹é€ 体ã®å‰²å½“ã¨Dataオブジェクトã®ç”Ÿæˆã‚’åŒæ™‚ã«è¡Œã†ãƒžã‚¯ãƒã¨ -ã—ã¦ä»¥ä¸‹ã®ã‚‚ã®ãŒæä¾›ã•ã‚Œã¦ã„ã¾ã™ï¼Ž - - Data_Make_Struct(klass, type, mark, free, sval) - -ã“ã®ãƒžã‚¯ãƒã®æˆ»ã‚Šå€¤ã¯ç”Ÿæˆã•ã‚ŒãŸDataオブジェクトã§ã™ï¼Žã“ã®ãƒžã‚¯ -ãƒã¯ä»¥ä¸‹ã®å¼ã®ã‚ˆã†ã«åƒãã¾ã™: - - (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval)) - -klass, mark, freeã¯Data_Wrap_Structã¨åŒã˜åƒãã‚’ã—ã¾ã™ï¼Žtype -ã¯å‰²ã‚Šå½“ã¦ã‚‹Cæ§‹é€ ä½“ã®åž‹ã§ã™ï¼Žå‰²ã‚Šå½“ã¦ã‚‰ã‚ŒãŸæ§‹é€ 体ã¯å¤‰æ•°sval -ã«ä»£å…¥ã•ã‚Œã¾ã™ï¼Žã“ã®å¤‰æ•°ã®åž‹ã¯ (type*) ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Ž - -Dataオブジェクトã‹ã‚‰ãƒã‚¤ãƒ³ã‚¿ã‚’å–り出ã™ã®ã¯ä»¥ä¸‹ã®ãƒžã‚¯ãƒã‚’用ㄠ-ã¾ã™ï¼Ž - - Data_Get_Struct(obj, type, sval) - -Cã®æ§‹é€ 体ã¸ã®ãƒã‚¤ãƒ³ã‚¿ã¯å¤‰æ•°svalã«ä»£å…¥ã•ã‚Œã¾ã™ï¼Ž - -ã“れらã®Dataã®ä½¿ã„æ–¹ã¯ã¡ã‚‡ã£ã¨åˆ†ã‹ã‚Šã«ãã„ã®ã§ï¼Œå¾Œã§èª¬æ˜Žã™ã‚‹ -例題をå‚ç…§ã—ã¦ãã ã•ã„． - -= 例題 - dbmパッケージを作る - -ã“ã“ã¾ã§ã®èª¬æ˜Žã§ã¨ã‚Šã‚ãˆãšæ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã¯ä½œã‚Œã‚‹ã¯ãšã§ã™ï¼Ž -Rubyã®extディレクトリã«ã™ã§ã«å«ã¾ã‚Œã¦ã„ã‚‹dbmライブラリを例㫠-ã—ã¦æ®µéšŽçš„ã«èª¬æ˜Žã—ã¾ã™ï¼Ž - -== ディレクトリを作る - - % mkdir ext/dbm - -Ruby 1.1ã‹ã‚‰ã¯ä»»æ„ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ãƒ€ã‚¤ãƒŠãƒŸãƒƒã‚¯ãƒ©ã‚¤ãƒ–ラリを作 -ã‚‹ã“ã¨ãŒã§ãるよã†ã«ãªã‚Šã¾ã—ãŸï¼ŽRubyã«é™çš„ã«ãƒªãƒ³ã‚¯ã™ã‚‹å ´åˆã« -ã¯Rubyを展開ã—ãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ä¸‹ï¼Œextディレクトリã®ä¸ã«æ‹¡å¼µ -ライブラリ用ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作る必è¦ãŒã‚ã‚Šã¾ã™ï¼Žåå‰ã¯é©å½“ã« -é¸ã‚“ã§æ§‹ã„ã¾ã›ã‚“． - -== è¨è¨ˆã™ã‚‹ - -ã¾ã‚，当然ãªã‚“ã§ã™ã‘ã©ï¼Œã©ã†ã„ã†æ©Ÿèƒ½ã‚’実ç¾ã™ã‚‹ã‹ã©ã†ã‹ã¾ãšè¨ -計ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Žã©ã‚“ãªã‚¯ãƒ©ã‚¹ã‚’ã¤ãã‚‹ã‹ï¼Œãã®ã‚¯ãƒ©ã‚¹ã«ã¯ -ã©ã‚“ãªãƒ¡ã‚½ãƒƒãƒ‰ãŒã‚ã‚‹ã‹ï¼Œã‚¯ãƒ©ã‚¹ãŒæä¾›ã™ã‚‹å®šæ•°ãªã©ã«ã¤ã„ã¦è¨è¨ˆ -ã—ã¾ã™ï¼Ž - -== Cコードを書ã - -拡張ライブラリ本体ã¨ãªã‚‹C言語ã®ã‚½ãƒ¼ã‚¹ã‚’書ãã¾ã™ï¼ŽC言語ã®ã‚½ãƒ¼ -スãŒã²ã¨ã¤ã®æ™‚ã«ã¯ã€Œãƒ©ã‚¤ãƒ–ラリå.cã€ã‚’é¸ã¶ã¨è‰¯ã„ã§ã—ょã†ï¼ŽC -言語ã®ã‚½ãƒ¼ã‚¹ãŒè¤‡æ•°ã®å ´åˆã«ã¯é€†ã«ã€Œãƒ©ã‚¤ãƒ–ラリå.cã€ã¨ã„ã†ãƒ•ã‚¡ -イルåã¯é¿ã‘ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Žã‚ªãƒ–ジェクトファイルã¨ãƒ¢ã‚¸ãƒ¥ãƒ¼ -ル生æˆæ™‚ã«ä¸é–“çš„ã«ç”Ÿæˆã•ã‚Œã‚‹ã€Œãƒ©ã‚¤ãƒ–ラリå.oã€ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ« -ã¨ãŒè¡çªã™ã‚‹ã‹ã‚‰ã§ã™ï¼Žã¾ãŸï¼Œå¾Œè¿°ã™ã‚‹ mkmf ライブラリã®ã„ã㤠-ã‹ã®é–¢æ•°ãŒã‚³ãƒ³ãƒ‘イルをè¦ã™ã‚‹ãƒ†ã‚¹ãƒˆã®ãŸã‚ã«ã€Œconftest.cã€ã¨ã„ -ã†ãƒ•ã‚¡ã‚¤ãƒ«åを使用ã™ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„．ソースファイル -åã¨ã—ã¦ã€Œconftest.cã€ã‚’使用ã—ã¦ã¯ãªã‚Šã¾ã›ã‚“． - -Rubyã¯æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリをãƒãƒ¼ãƒ‰ã™ã‚‹æ™‚ã«ã€ŒInit_ライブラリåã€ã¨ -ã„ã†é–¢æ•°ã‚’自動的ã«å®Ÿè¡Œã—ã¾ã™ï¼Ždbmライブラリã®å ´åˆã€ŒInit_dbm〠-ã§ã™ï¼Žã“ã®é–¢æ•°ã®ä¸ã§ã‚¯ãƒ©ã‚¹ï¼Œãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ï¼Œãƒ¡ã‚½ãƒƒãƒ‰ï¼Œå®šæ•°ãªã©ã® -定義を行ã„ã¾ã™ï¼Ždbm.cã‹ã‚‰ä¸€éƒ¨å¼•ç”¨ã—ã¾ã™ï¼Ž - - void - Init_dbm(void) - { - /* DBMクラスを定義ã™ã‚‹ */ - VALUE cDBM = rb_define_class("DBM", rb_cObject); - /* DBMã¯Enumerableモジュールをインクルードã™ã‚‹ */ - rb_include_module(cDBM, rb_mEnumerable); - - /* DBMクラスã®ã‚¯ãƒ©ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰open(): 引数ã¯Cã®é…列ã§å—ã‘ã‚‹ */ - rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1); - - /* DBMクラスã®ãƒ¡ã‚½ãƒƒãƒ‰close(): 引数ã¯ãªã— */ - rb_define_method(cDBM, "close", fdbm_close, 0); - /* DBMクラスã®ãƒ¡ã‚½ãƒƒãƒ‰[]: 引数ã¯1個 */ - rb_define_method(cDBM, "[]", fdbm_fetch, 1); - - /* ... */ - - /* DBMãƒ‡ãƒ¼ã‚¿ã‚’æ ¼ç´ã™ã‚‹ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°åã®ãŸã‚ã®ID */ - id_dbm = rb_intern("dbm"); - } - -DBMライブラリã¯dbmã®ãƒ‡ãƒ¼ã‚¿ã¨å¯¾å¿œã™ã‚‹ã‚ªãƒ–ジェクトã«ãªã‚‹ã¯ãšã§ -ã™ã‹ã‚‰ï¼ŒCã®ä¸–ç•Œã®dbmã‚’Rubyã®ä¸–ç•Œã«å–り込む必è¦ãŒã‚ã‚Šã¾ã™ï¼Ž - -dbm.cã§ã¯Data_Make_Structを以下ã®ã‚ˆã†ã«ä½¿ã£ã¦ã„ã¾ã™ï¼Ž - - struct dbmdata { - int di_size; - DBM *di_dbm; - }; - - - obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp); - -ã“ã“ã§ã¯dbmstructæ§‹é€ ä½“ã¸ã®ãƒã‚¤ãƒ³ã‚¿ã‚’Dataã«ã‚«ãƒ—セル化ã—ã¦ã„ -ã¾ã™ï¼ŽDBM*を直接カプセル化ã—ãªã„ã®ã¯close()ã—ãŸæ™‚ã®å‡¦ç†ã‚’考 -ãˆã¦ã®ã“ã¨ã§ã™ï¼Ž - -Dataオブジェクトã‹ã‚‰dbmstructæ§‹é€ ä½“ã®ãƒã‚¤ãƒ³ã‚¿ã‚’å–り出ã™ãŸã‚ -ã«ä»¥ä¸‹ã®ãƒžã‚¯ãƒã‚’使ã£ã¦ã„ã¾ã™ï¼Ž - - #define GetDBM(obj, dbmp) do {\ - Data_Get_Struct(obj, struct dbmdata, dbmp);\ - if (dbmp->di_dbm == 0) closed_dbm();\ - } while (0) - -ã¡ã‚‡ã£ã¨è¤‡é›‘ãªãƒžã‚¯ãƒã§ã™ãŒï¼Œè¦ã™ã‚‹ã«dbmdataæ§‹é€ ä½“ã®ãƒã‚¤ãƒ³ã‚¿ -ã®å–り出ã—ã¨ï¼Œcloseã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã®ãƒã‚§ãƒƒã‚¯ã‚’ã¾ã¨ã‚ã¦ã„ -ã‚‹ã ã‘ã§ã™ï¼Ž - -DBMクラスã«ã¯ãŸãã•ã‚“メソッドãŒã‚ã‚Šã¾ã™ãŒï¼Œåˆ†é¡žã™ã‚‹ã¨3種類㮠-引数ã®å—ã‘æ–¹ãŒã‚ã‚Šã¾ã™ï¼Žã²ã¨ã¤ã¯å¼•æ•°ã®æ•°ãŒå›ºå®šã®ã‚‚ã®ã§ï¼Œä¾‹ã¨ -ã—ã¦ã¯deleteメソッドãŒã‚ã‚Šã¾ã™ï¼Ždeleteメソッドを実装ã—ã¦ã„ã‚‹ -fdbm_delete()ã¯ã“ã®ã‚ˆã†ã«ãªã£ã¦ã„ã¾ã™ï¼Ž - - static VALUE - fdbm_delete(VALUE obj, VALUE keystr) - { - /* ... */ - } - -引数ã®æ•°ãŒå›ºå®šã®ã‚¿ã‚¤ãƒ—ã¯ç¬¬1引数ãŒself，第2引数以é™ãŒãƒ¡ã‚½ãƒƒãƒ‰ -ã®å¼•æ•°ã¨ãªã‚Šã¾ã™ï¼Ž - -引数ã®æ•°ãŒä¸å®šã®ã‚‚ã®ã¯Cã®é…列ã§å—ã‘ã‚‹ã‚‚ã®ã¨Rubyã®é…列ã§å—ã‘ -ã‚‹ã‚‚ã®ã¨ãŒã‚ã‚Šã¾ã™ï¼Ždbmライブラリã®ä¸ã§ï¼ŒCã®é…列ã§å—ã‘ã‚‹ã‚‚ã® -ã¯DBMã®ã‚¯ãƒ©ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚ã‚‹open()ã§ã™ï¼Žã“れを実装ã—ã¦ã„ã‚‹é–¢ -æ•°fdbm_s_open()ã¯ã“ã†ãªã£ã¦ã„ã¾ã™ï¼Ž - - static VALUE - fdbm_s_open(int argc, VALUE *argv, VALUE klass) - { - /* ... */ - - if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) { - mode = 0666; /* default value */ - } - - /* ... */ - } - -ã“ã®ã‚¿ã‚¤ãƒ—ã®é–¢æ•°ã¯ç¬¬1引数ãŒä¸Žãˆã‚‰ã‚ŒãŸå¼•æ•°ã®æ•°ï¼Œç¬¬2引数ãŒä¸Žãˆ -られãŸå¼•æ•°ã®å…¥ã£ã¦ã„ã‚‹é…列ã«ãªã‚Šã¾ã™ï¼Žselfã¯ç¬¬3引数ã¨ã—ã¦ä¸Ž -ãˆã‚‰ã‚Œã¾ã™ï¼Ž - -ã“ã®é…列ã§ä¸Žãˆã‚‰ã‚ŒãŸå¼•æ•°ã‚’解æžã™ã‚‹ãŸã‚ã®é–¢æ•°ãŒopen()ã§ã‚‚使゠-ã‚Œã¦ã„ã‚‹rb_scan_args()ã§ã™ï¼Žç¬¬3引数ã«æŒ‡å®šã—ãŸãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«å¾“ -ã„，第4変数以é™ã«æŒ‡å®šã—ãŸVALUEã¸ã®å‚ç…§ã«å€¤ã‚’代入ã—ã¦ãれ㾠-ã™ï¼Ž - - -引数をRubyã®é…列ã¨ã—ã¦å—ã‘å–るメソッドã®ä¾‹ã«ã¯ -Thread#initializeãŒã‚ã‚Šã¾ã™ï¼Žå®Ÿè£…ã¯ã“ã†ã§ã™ï¼Ž - - static VALUE - thread_initialize(VALUE thread, VALUE args) - { - /* ... */ - } - -第1引数ã¯self，第2引数ã¯Rubyã®é…列ã§ã™ï¼Ž - -*注æ„äº‹é …* - -Rubyã¨å…±æœ‰ã¯ã—ãªã„ãŒRubyã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’æ ¼ç´ã™ã‚‹å¯èƒ½æ€§ã®ã‚ã‚‹ -Cã®å¤§åŸŸå¤‰æ•°ã¯ä»¥ä¸‹ã®é–¢æ•°ã‚’使ã£ã¦Rubyインタプリタã«å¤‰æ•°ã®å˜åœ¨ -ã‚’æ•™ãˆã¦ã‚ã’ã¦ãã ã•ã„．ã§ãªã„ã¨GCã§ãƒˆãƒ©ãƒ–ルを起ã“ã—ã¾ã™ï¼Ž - - void rb_global_variable(VALUE *var) - -== extconf.rbを用æ„ã™ã‚‹ - -Makefileã‚’ä½œã‚‹å ´åˆã®é››åž‹ã«ãªã‚‹extconf.rbã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作り -ã¾ã™ï¼Žextconf.rbã¯ãƒ©ã‚¤ãƒ–ラリã®ã‚³ãƒ³ãƒ‘イルã«å¿…è¦ãªæ¡ä»¶ã®ãƒã‚§ãƒƒ -クãªã©ã‚’è¡Œã†ã“ã¨ãŒç›®çš„ã§ã™ï¼Žã¾ãšï¼Œ - - require 'mkmf' - -ã‚’extconf.rbã®å…ˆé ã«ç½®ãã¾ã™ï¼Žextconf.rbã®ä¸ã§ã¯ä»¥ä¸‹ã®Rubyé–¢ -数を使ã†ã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼Ž - - have_library(lib, func): ライブラリã®å˜åœ¨ãƒã‚§ãƒƒã‚¯ - have_func(func, header): 関数ã®å˜åœ¨ãƒã‚§ãƒƒã‚¯ - have_header(header): ヘッダファイルã®å˜åœ¨ãƒã‚§ãƒƒã‚¯ - create_makefile(target[, target_prefix]): Makefileã®ç”Ÿæˆ - -以下ã®å¤‰æ•°ã‚’使ã†ã“ã¨ãŒã§ãã¾ã™ï¼Ž - - $CFLAGS: コンパイル時ã«è¿½åŠ çš„ã«æŒ‡å®šã™ã‚‹ãƒ•ãƒ©ã‚°(-Oãªã©) - $CPPFLAGS: プリプãƒã‚»ãƒƒã‚µã«è¿½åŠ çš„ã«æŒ‡å®šã™ã‚‹ãƒ•ãƒ©ã‚°(-Iã‚„-Dãªã©) - $LDFLAGS: リンク時ã«è¿½åŠ çš„ã«æŒ‡å®šã™ã‚‹ãƒ•ãƒ©ã‚°(-Lãªã©) - $objs: リンクã•ã‚Œã‚‹ã‚ªãƒ–ジェクトファイルåã®ãƒªã‚¹ãƒˆ - -オブジェクトファイルã®ãƒªã‚¹ãƒˆã¯ï¼Œé€šå¸¸ã¯ã‚½ãƒ¼ã‚¹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’検索㗠-ã¦è‡ªå‹•çš„ã«ç”Ÿæˆã•ã‚Œã¾ã™ãŒï¼Œmakeã®é€”ä¸ã§ã‚½ãƒ¼ã‚¹ã‚’生æˆã™ã‚‹ã‚ˆã†ãª -å ´åˆã¯æ˜Žç¤ºçš„ã«æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Ž - -ライブラリをコンパイルã™ã‚‹æ¡ä»¶ãŒæƒã‚ãšï¼Œãã®ãƒ©ã‚¤ãƒ–ラリをコン -パイルã—ãªã„時ã«ã¯create_makefileを呼ã°ãªã‘ã‚Œã°Makefileã¯ç”Ÿ -æˆã•ã‚Œãšï¼Œã‚³ãƒ³ãƒ‘イルも行ã‚ã‚Œã¾ã›ã‚“． - -== dependを用æ„ã™ã‚‹ - -ã‚‚ã—，ディレクトリã«dependã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã™ã‚Œã°ï¼Œ -MakefileãŒä¾å˜é–¢ä¿‚ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¦ãã‚Œã¾ã™ï¼Ž - - % gcc -MM *.c > depend - -ãªã©ã§ä½œã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼Žã‚ã£ã¦æã¯ç„¡ã„ã§ã—ょã†ï¼Ž - -== Makefileを生æˆã™ã‚‹ - -Makefileを実際ã«ç”Ÿæˆã™ã‚‹ãŸã‚ã«ã¯ - - ruby extconf.rb - -ã¨ã—ã¾ã™ï¼Žextconf.rbã« require 'mkmf' ã®è¡ŒãŒãªã„å ´åˆã«ã¯ã‚¨ãƒ©ãƒ¼ -ã«ãªã‚Šã¾ã™ã®ã§ï¼Œå¼•æ•°ã‚’è¿½åŠ ã—㦠- - ruby -r mkmf extconf.rb - -ã¨ã—ã¦ãã ã•ã„． - -site_ruby ディレクトリã§ãªã， -vendor_ruby ディレクトリã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹å ´åˆã«ã¯ -以下ã®ã‚ˆã†ã« --vendor ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’åŠ ãˆã¦ãã ã•ã„． - - ruby extconf.rb --vendor - -ディレクトリをext以下ã«ç”¨æ„ã—ãŸå ´åˆã«ã¯Ruby全体ã®makeã®æ™‚ã« -自動的ã«MakefileãŒç”Ÿæˆã•ã‚Œã¾ã™ã®ã§ï¼Œã“ã®ã‚¹ãƒ†ãƒƒãƒ—ã¯ä¸è¦ã§ã™ï¼Ž - -== makeã™ã‚‹ - -動的リンクライブラリを生æˆã™ã‚‹å ´åˆã«ã¯ãã®å ´ã§makeã—ã¦ãã ã• -ã„．必è¦ã§ã‚れ㰠make install ã§ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¾ã™ï¼Ž - -ext以下ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’用æ„ã—ãŸå ´åˆã¯ï¼ŒRubyã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ -makeを実行ã™ã‚‹ã¨Makefileを生æˆã‹ã‚‰make，必è¦ã«ã‚ˆã£ã¦ã¯ãã®ãƒ¢ -ジュールã®Rubyã¸ã®ãƒªãƒ³ã‚¯ã¾ã§è‡ªå‹•çš„ã«å®Ÿè¡Œã—ã¦ãã‚Œã¾ã™ï¼Ž -extconf.rbを書ãæ›ãˆã‚‹ãªã©ã—ã¦Makefileã®å†ç”ŸæˆãŒå¿…è¦ãªæ™‚ã¯ã¾ -ãŸRubyディレクトリã§makeã—ã¦ãã ã•ã„． - -拡張ライブラリã¯make installã§Rubyライブラリã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã® -下ã«ã‚³ãƒ”ーã•ã‚Œã¾ã™ï¼Žã‚‚ã—拡張ライブラリã¨å”調ã—ã¦ä½¿ã†Rubyã§è¨˜ -è¿°ã•ã‚ŒãŸãƒ—ãƒã‚°ãƒ©ãƒ ãŒã‚り，Rubyライブラリã«ç½®ããŸã„å ´åˆã«ã¯ï¼Œ -拡張ライブラリ用ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®ä¸‹ã« lib ã¨ã„ã†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª -を作り，ãã“ã« æ‹¡å¼µå .rb ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç½®ã„ã¦ãŠã‘ã°åŒæ™‚ã«ã‚¤ãƒ³ -ストールã•ã‚Œã¾ã™ï¼Ž - -== デãƒãƒƒã‚° - -ã¾ã‚，デãƒãƒƒã‚°ã—ãªã„ã¨å‹•ã‹ãªã„ã§ã—ょã†ã．ext/Setupã«ãƒ‡ã‚£ãƒ¬ -クトリåを書ãã¨é™çš„ã«ãƒªãƒ³ã‚¯ã™ã‚‹ã®ã§ãƒ‡ãƒãƒƒã‚¬ãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãª -ã‚Šã¾ã™ï¼Žãã®åˆ†ã‚³ãƒ³ãƒ‘イルãŒé…ããªã‚Šã¾ã™ã‘ã©ï¼Ž - -== ã§ãã‚ãŒã‚Š - -後ã¯ã“ã£ãり使ã†ãªã‚Šï¼Œåºƒã公開ã™ã‚‹ãªã‚Šï¼Œå£²ã‚‹ãªã‚Šï¼Œã”自由ã«ãŠ -使ã„ãã ã•ã„．Rubyã®ä½œè€…ã¯æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã«é–¢ã—ã¦ä¸€åˆ‡ã®æ¨©åˆ©ã‚’ -主張ã—ã¾ã›ã‚“． - -= Appendix A. Rubyã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã®åˆ†é¡ž - -Rubyã®ã‚½ãƒ¼ã‚¹ã¯ã„ãã¤ã‹ã«åˆ†é¡žã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ï¼Žã“ã®ã†ã¡ã‚¯ãƒ© -スライブラリã®éƒ¨åˆ†ã¯åŸºæœ¬çš„ã«æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã¨åŒã˜ä½œã‚Šæ–¹ã«ãªã£ -ã¦ã„ã¾ã™ï¼Žã“れらã®ã‚½ãƒ¼ã‚¹ã¯ä»Šã¾ã§ã®èª¬æ˜Žã§ã»ã¨ã‚“ã©ç†è§£ã§ãる㨠-æ€ã„ã¾ã™ï¼Ž - -== Ruby言語ã®ã‚³ã‚¢ - -class.c :: クラスã¨ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ« -error.c :: 例外クラスã¨ä¾‹å¤–機構 -gc.c :: è¨˜æ†¶é ˜åŸŸç®¡ç† -load.c :: ライブラリã®ãƒãƒ¼ãƒ‰ -object.c :: オブジェクト -variable.c :: 変数ã¨å®šæ•° - -== Rubyã®æ§‹æ–‡è§£æžå™¨ - - parse.y : å—å¥è§£æžå™¨ã¨æ§‹æ–‡å®šç¾© - -> parse.c : è‡ªå‹•ç”Ÿæˆ - keywords : 予約語 - -> lex.c : è‡ªå‹•ç”Ÿæˆ - -== Rubyã®è©•ä¾¡å™¨ (通称YARV) - compile.c - eval.c - eval_error.c - eval_jump.c - eval_safe.c - insns.def : 仮想機械語ã®å®šç¾© - iseq.c : VM::ISeqã®å®Ÿè£… - thread.c : スレッド管ç†ã¨ã‚³ãƒ³ãƒ†ã‚スト切り替㈠- thread_win32.c : スレッド実装 - thread_pthread.c : åŒä¸Š - vm.c - vm_dump.c - vm_eval.c - vm_exec.c - vm_insnhelper.c - vm_method.c - - opt_insns_unif.def : 命令èžåˆ - opt_operand.def : 最é©åŒ–ã®ãŸã‚ã®å®šç¾© - - -> insn*.inc : è‡ªå‹•ç”Ÿæˆ - -> opt*.inc : è‡ªå‹•ç”Ÿæˆ - -> vm.inc : è‡ªå‹•ç”Ÿæˆ - -== æ£è¦è¡¨ç¾ã‚¨ãƒ³ã‚¸ãƒ³ (鬼車) - - regex.c - regcomp.c - regenc.c - regerror.c - regexec.c - regparse.c - regsyntax.c - -== ユーティリティ関数 - -debug.c :: Cデãƒãƒƒã‚¬ç”¨ã®ãƒ‡ãƒãƒƒã‚°ã‚·ãƒ³ãƒœãƒ« -dln.c :: å‹•çš„ãƒãƒ¼ãƒ‡ã‚£ãƒ³ã‚° -st.c :: 汎用ãƒãƒƒã‚·ãƒ¥è¡¨ -strftime.c :: 時刻整形 -util.c :: ãã®ä»–ã®ãƒ¦ãƒ¼ãƒ†ã‚£ãƒªãƒ†ã‚£ - -== Rubyコマンドã®å®Ÿè£… - - dmyext.c - dmydln.c - dmyencoding.c - id.c - inits.c - main.c - ruby.c - version.c - - gem_prelude.rb - prelude.rb - -== クラスライブラリ - -array.c :: Array -bignum.c :: Bignum -compar.c :: Comparable -complex.c :: Complex -cont.c :: Fiber, Continuation -dir.c :: Dir -enum.c :: Enumerable -enumerator.c :: Enumerator -file.c :: File -hash.c :: Hash -io.c :: IO -marshal.c :: Marshal -math.c :: Math -numeric.c :: Numeric, Integer, Fixnum, Float -pack.c :: Array#pack, String#unpack -proc.c :: Binding, Proc -process.c :: Process -random.c :: 乱数 -range.c :: Range -rational.c :: Rational -re.c :: Regexp, MatchData -signal.c :: Signal -sprintf.c :: String#sprintf -string.c :: String -struct.c :: Struct -time.c :: Time -defs/known_errors.def :: 例外クラス Errno::* --> known_errors.inc :: è‡ªå‹•ç”Ÿæˆ - -== 多言語化 - -encoding.c :: Encoding -transcode.c :: Encoding::Converter -enc/*.c :: エンコーディングクラス群 -enc/trans/* :: コードãƒã‚¤ãƒ³ãƒˆå¯¾å¿œè¡¨ - -== gorubyコマンドã®å®Ÿè£… - - goruby.c - golf_prelude.rb : goruby固有ã®ãƒ©ã‚¤ãƒ–ラリ - -> golf_prelude.c : è‡ªå‹•ç”Ÿæˆ - -= Appendix B. 拡張用関数リファレンス - -C言語ã‹ã‚‰Rubyã®æ©Ÿèƒ½ã‚’利用ã™ã‚‹APIã¯ä»¥ä¸‹ã®é€šã‚Šã§ã‚る． - -== åž‹ - -VALUE :: - - Rubyオブジェクトを表ç¾ã™ã‚‹åž‹ï¼Žå¿…è¦ã«å¿œã˜ã¦ã‚ャストã—ã¦ç”¨ã„る． - 組ã¿è¾¼ã¿åž‹ã‚’表ç¾ã™ã‚‹Cã®åž‹ã¯ruby.hã«è¨˜è¿°ã—ã¦ã‚ã‚‹Rã§å§‹ã¾ã‚‹æ§‹é€ - 体ã§ã‚る．VALUEåž‹ã‚’ã“れらã«ã‚ャストã™ã‚‹ãŸã‚ã«Rã§å§‹ã¾ã‚‹æ§‹é€ 体 - åã‚’å…¨ã¦å¤§æ–‡å—ã«ã—ãŸåå‰ã®ãƒžã‚¯ãƒãŒç”¨æ„ã•ã‚Œã¦ã„る． - -== 変数・定数 - -Qnil :: - - 定数: nilオブジェクト - -Qtrue :: - - 定数: trueオブジェクト(真ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤) - -Qfalse :: - - 定数: falseオブジェクト - -== Cデータã®ã‚«ãƒ—セル化 - -Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) :: - - Cã®ä»»æ„ã®ãƒã‚¤ãƒ³ã‚¿ã‚’カプセル化ã—ãŸRubyオブジェクトを返ã™ï¼Žã“ - ã®ãƒã‚¤ãƒ³ã‚¿ãŒRubyã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œãªããªã£ãŸæ™‚，freeã§æŒ‡å®šã—㟠- 関数ãŒå‘¼ã°ã‚Œã‚‹ï¼Žã¾ãŸï¼Œã“ã®ãƒã‚¤ãƒ³ã‚¿ã®æŒ‡ã™ãƒ‡ãƒ¼ã‚¿ãŒä»–ã®Rubyオブ - ジェクトを指ã—ã¦ã„ã‚‹å ´åˆï¼Œmarkã«æŒ‡å®šã™ã‚‹é–¢æ•°ã§ãƒžãƒ¼ã‚¯ã™ã‚‹å¿…è¦ - ãŒã‚る． - -Data_Make_Struct(klass, type, mark, free, sval) :: - - typeåž‹ã®ãƒ¡ãƒ¢ãƒªã‚’mallocã—，変数svalã«ä»£å…¥ã—ãŸå¾Œï¼Œãれをカプセ - ル化ã—ãŸãƒ‡ãƒ¼ã‚¿ã‚’è¿”ã™ãƒžã‚¯ãƒï¼Ž - -Data_Get_Struct(data, type, sval) :: - - dataã‹ã‚‰typeåž‹ã®ãƒã‚¤ãƒ³ã‚¿ã‚’å–り出ã—変数svalã«ä»£å…¥ã™ã‚‹ãƒžã‚¯ãƒï¼Ž - -== åž‹ãƒã‚§ãƒƒã‚¯ - - TYPE(value) - FIXNUM_P(value) - NIL_P(value) - void Check_Type(VALUE value, int type) - SafeStringValue(value) - -== åž‹å¤‰æ› - - FIX2INT(value), INT2FIX(i) - FIX2LONG(value), LONG2FIX(l) - NUM2INT(value), INT2NUM(i) - NUM2UINT(value), UINT2NUM(ui) - NUM2LONG(value), LONG2NUM(l) - NUM2ULONG(value), ULONG2NUM(ul) - NUM2LL(value), LL2NUM(ll) - NUM2ULL(value), ULL2NUM(ull) - NUM2OFFT(value), OFFT2NUM(off) - NUM2SIZET(value), SIZET2NUM(size) - NUM2SSIZET(value), SSIZET2NUM(ssize) - rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags) - NUM2DBL(value) - rb_float_new(f) - RSTRING_LEN(str) - RSTRING_PTR(str) - StringValue(value) - StringValuePtr(value) - StringValueCStr(value) - rb_str_new2(s) - -== クラス/モジュール定義 - -VALUE rb_define_class(const char *name, VALUE super) :: - - superã®ã‚µãƒ–クラスã¨ã—ã¦æ–°ã—ã„Rubyクラスを定義ã™ã‚‹ï¼Ž - -VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) :: - - superã®ã‚µãƒ–クラスã¨ã—ã¦æ–°ã—ã„Rubyクラスを定義ã—，moduleã® - 定数ã¨ã—ã¦å®šç¾©ã™ã‚‹ï¼Ž - -VALUE rb_define_module(const char *name) :: - - æ–°ã—ã„Rubyモジュールを定義ã™ã‚‹ï¼Ž - -VALUE rb_define_module_under(VALUE module, const char *name) :: - - æ–°ã—ã„Rubyモジュールを定義ã—，moduleã®å®šæ•°ã¨ã—ã¦å®šç¾©ã™ã‚‹ï¼Ž - -void rb_include_module(VALUE klass, VALUE module) :: - - モジュールをインクルードã™ã‚‹ï¼ŽclassãŒã™ã§ã«moduleをインク - ルードã—ã¦ã„る時ã«ã¯ä½•ã‚‚ã—ãªã„(多é‡ã‚¤ãƒ³ã‚¯ãƒ«ãƒ¼ãƒ‰ã®ç¦æ¢)． - -void rb_extend_object(VALUE object, VALUE module) :: - - オブジェクトをモジュール(ã§å®šç¾©ã•ã‚Œã¦ã„るメソッド)ã§æ‹¡å¼µã™ã‚‹ï¼Ž - -== 大域変数定義 - -void rb_define_variable(const char *name, VALUE *var) :: - - Rubyã¨Cã¨ã§å…±æœ‰ã™ã‚‹ã‚°ãƒãƒ¼ãƒãƒ«å¤‰æ•°ã‚’定義ã™ã‚‹ï¼Žå¤‰æ•°åãŒ`$'㧠- 始ã¾ã‚‰ãªã„時ã«ã¯è‡ªå‹•çš„ã«è¿½åŠ ã•ã‚Œã‚‹ï¼Žnameã¨ã—ã¦Rubyã®è˜åˆ¥å - ã¨ã—ã¦è¨±ã•ã‚Œãªã„æ–‡å—(例ãˆã°` ')ã‚’å«ã‚€å ´åˆã«ã¯Rubyプãƒã‚°ãƒ© - ムã‹ã‚‰ã¯è¦‹ãˆãªããªã‚‹ï¼Ž - -void rb_define_readonly_variable(const char *name, VALUE *var) :: - - Rubyã¨Cã¨ã§å…±æœ‰ã™ã‚‹read onlyã®ã‚°ãƒãƒ¼ãƒãƒ«å¤‰æ•°ã‚’定義ã™ã‚‹ï¼Ž - read onlyã§ã‚ã‚‹ã“ã¨ä»¥å¤–ã¯rb_define_variable()ã¨åŒã˜ï¼Ž - -void rb_define_virtual_variable(const char *name, VALUE (*getter)(), void (*setter)()) :: - - 関数ã«ã‚ˆã£ã¦å®Ÿç¾ã•ã‚Œã‚‹Ruby変数を定義ã™ã‚‹ï¼Žå¤‰æ•°ãŒå‚ç…§ã•ã‚ŒãŸ - 時ã«ã¯getterãŒï¼Œå¤‰æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•ã‚ŒãŸæ™‚ã«ã¯setterãŒå‘¼ã°ã‚Œ - る． - -void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), void (*setter)()) :: - - 関数ã«ã‚ˆã£ã¦hookã®ã¤ã‘られãŸã‚°ãƒãƒ¼ãƒãƒ«å¤‰æ•°ã‚’定義ã™ã‚‹ï¼Žå¤‰æ•° - ãŒå‚ç…§ã•ã‚ŒãŸæ™‚ã«ã¯getterãŒï¼Œé–¢æ•°ã«å€¤ãŒã‚»ãƒƒãƒˆã•ã‚ŒãŸæ™‚ã«ã¯ - setterãŒå‘¼ã°ã‚Œã‚‹ï¼Žgetterã‚„setterã«0を指定ã—ãŸæ™‚ã«ã¯hookã‚’ - 指定ã—ãªã„ã®ã¨åŒã˜äº‹ã«ãªã‚‹ï¼Ž - -void rb_global_variable(VALUE *var) - - GCã®ãŸã‚，Rubyプãƒã‚°ãƒ©ãƒ ã‹ã‚‰ã¯ã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œãªã„ãŒ, Rubyオブ - ジェクトをå«ã‚€å¤§åŸŸå¤‰æ•°ã‚’マークã™ã‚‹ï¼Ž - -== 定数 - -void rb_define_const(VALUE klass, const char *name, VALUE val) :: - - 定数を定義ã™ã‚‹ï¼Ž - -void rb_define_global_const(const char *name, VALUE val) :: - - 大域定数を定義ã™ã‚‹ï¼Ž - - rb_define_const(rb_cObject, name, val) - - ã¨åŒã˜æ„味． - -== メソッド定義 - -rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) :: - - メソッドを定義ã™ã‚‹ï¼Žargcã¯selfを除ã引数ã®æ•°ï¼ŽargcãŒ-1ã®æ™‚, - 関数ã«ã¯å¼•æ•°ã®æ•°(selfã‚’å«ã¾ãªã„)を第1引数, 引数ã®é…列を第2 - 引数ã¨ã™ã‚‹å½¢å¼ã§ä¸Žãˆã‚‰ã‚Œã‚‹(第3引数ã¯self)．argcãŒ-2ã®æ™‚, - 第1引数ãŒself, 第2引数ãŒargs(argsã¯å¼•æ•°ã‚’å«ã‚€Rubyã®é…列)㨠- ã„ã†å½¢å¼ã§ä¸Žãˆã‚‰ã‚Œã‚‹ï¼Ž - -rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) :: - - privateメソッドを定義ã™ã‚‹ï¼Žå¼•æ•°ã¯rb_define_method()ã¨åŒã˜ï¼Ž - -rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) :: - - 特異メソッドを定義ã™ã‚‹ï¼Žå¼•æ•°ã¯rb_define_method()ã¨åŒã˜ï¼Ž - -rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) :: - - argc, argvå½¢å¼ã§ä¸Žãˆã‚‰ã‚ŒãŸæŒ‡å®šã•ã‚ŒãŸãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«å¾“ã£ã¦å¼• - 数を分解ã—，続ãVALUEã¸ã®å‚ç…§ã«ã‚»ãƒƒãƒˆã—ã¾ã™ï¼Žã“ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒ - トã¯ï¼ŒABNFã§è¨˜è¿°ã™ã‚‹ã¨ä»¥ä¸‹ã®é€šã‚Šã§ã™ï¼Ž - - scan-arg-spec := param-arg-spec [option-hash-arg-spec] [block-arg-spec] - - param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / - pre-opt-post-arg-spec - pre-arg-spec := num-of-leading-mandatory-args [num-of-optional-args] - post-arg-spec := sym-for-variable-length-args - [num-of-trailing-mandatory-args] - pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args - num-of-trailing-mandatory-args - option-hash-arg-spec := sym-for-option-hash-arg - block-arg-spec := sym-for-block-arg - - num-of-leading-mandatory-args := DIGIT ; å…ˆé ã«ç½®ã‹ã‚Œã‚‹çœç•¥ä¸èƒ½ãªå¼•æ•°ã®æ•° - num-of-optional-args := DIGIT ; 続ã„ã¦ç½®ã‹ã‚Œã‚‹çœç•¥å¯èƒ½ãªå¼•æ•°ã®æ•° - sym-for-variable-length-args := "*" ; 続ã„ã¦ç½®ã‹ã‚Œã‚‹å¯å¤‰é•·å¼•æ•°ã‚’ - ; Rubyã®é…列ã§å–å¾—ã™ã‚‹ãŸã‚ã®æŒ‡å®š - num-of-trailing-mandatory-args := DIGIT ; 終端ã«ç½®ã‹ã‚Œã‚‹çœç•¥ä¸èƒ½ãªå¼•æ•°ã®æ•° - sym-for-option-hash-arg := ":" ; オプションãƒãƒƒã‚·ãƒ¥ã‚’å–å¾—ã™ã‚‹ - ; ãŸã‚ã®æŒ‡å®š; çœç•¥ä¸èƒ½ãªå¼•æ•°ã® - ; 数よりも多ãã®å¼•æ•°ãŒæŒ‡å®šã•ã‚Œï¼Œ - ; 最後ã®å¼•æ•°ãŒãƒãƒƒã‚·ãƒ¥ï¼ˆã¾ãŸã¯ - ; #to_hashã§å¤‰æ›å¯èƒ½ï¼‰ã®å ´åˆã« - ; å–å¾—ã•ã‚Œã‚‹ï¼Žæœ€å¾Œã®å¼•æ•°ãŒnilã® - ; å ´åˆï¼Œå¯å¤‰é•·å¼•æ•°æŒ‡å®šãŒãªã， - ; çœç•¥ä¸èƒ½å¼•æ•°ã®æ•°ã‚ˆã‚Šã‚‚多ãã® - ; 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã«å–å¾—ã•ã‚Œã‚‹ - sym-for-block-arg := "&" ; イテレータブãƒãƒƒã‚¯ã‚’å–å¾—ã™ã‚‹ãŸã‚ã® - ; 指定 - - フォーマットãŒ"12"ã®å ´åˆï¼Œå¼•æ•°ã¯æœ€ä½Ž1ã¤ã§ï¼Œ3ã¤(1+2)ã¾ã§è¨±ã• - れるã¨ã„ã†æ„味ã«ãªã‚Šã¾ã™ï¼Žå¾“ã£ã¦ï¼Œãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆæ–‡å—列ã«ç¶šã„ - ã¦3ã¤ã®VALUEã¸ã®å‚照を置ãå¿…è¦ãŒã‚ã‚Šã¾ã™ï¼Žãれらã«ã¯å–å¾—ã—㟠- 変数ãŒã‚»ãƒƒãƒˆã•ã‚Œã¾ã™ï¼Žå¤‰æ•°ã¸ã®å‚ç…§ã®ä»£ã‚ã‚Šã«NULLを指定ã™ã‚‹ - ã“ã¨ã‚‚ã§ã，ãã®å ´åˆã¯å–å¾—ã—ãŸå¼•æ•°ã®å€¤ã¯æ¨ã¦ã‚‰ã‚Œã¾ã™ï¼ŽãªãŠï¼Œ - çœç•¥å¯èƒ½å¼•æ•°ãŒçœç•¥ã•ã‚ŒãŸæ™‚ã®å¤‰æ•°ã®å€¤ã¯nil(C言語ã®ãƒ¬ãƒ™ãƒ«ã§ã¯ - Qnil)ã«ãªã‚Šã¾ã™ï¼Ž - - 返り値ã¯ä¸Žãˆã‚‰ã‚ŒãŸå¼•æ•°ã®æ•°ã§ã™ï¼Žã‚ªãƒ—ションãƒãƒƒã‚·ãƒ¥ãŠã‚ˆã³ã‚¤ - テレータブãƒãƒƒã‚¯ã¯æ•°ãˆã¾ã›ã‚“． - -int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) - - ã‚ーワードã§æŒ‡å®šã•ã‚ŒãŸå€¤ã‚’tableã«ã—ãŸãŒã£ã¦å–り出ã—ã¾ã™ï¼Ž - tableã®æœ€åˆã®required個ã®IDã¯å¿…é ˆã‚ーワードを表ã—，続ã - optional (optionalãŒè² ã®å ´åˆã¯-optional-1) 個ã®IDã¯çœç•¥å¯èƒ½ - ã‚ーワードã§ã™ï¼Žå¿…é ˆã‚ーワードãŒkeyword_hashä¸ã«ãªã„å ´åˆï¼Œ - "missing keyword"ArgumentErrorãŒç™ºç”Ÿã—ã¾ã™ï¼Žçœç•¥å¯èƒ½ã‚ーワー - ドãŒãªã„å ´åˆã¯ï¼Œvaluesä¸ã®å¯¾å¿œã™ã‚‹è¦ç´ ã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“． - keyword_hashã«ä½¿ç”¨ã•ã‚Œãªã„è¦ç´ ãŒã‚ã‚‹å ´åˆã¯ï¼ŒoptionalãŒè² ãªã‚‰ - æ–°ã—ã„Hashã¨ã—ã¦çœç•¥å¯èƒ½å¼•æ•°ã®æ¬¡ã«ä¿å˜ã•ã‚Œã¾ã™ãŒï¼Œãã†ã§ãªã‘ - ã‚Œã°"unknown keyword"ArgumentErrorãŒç™ºç”Ÿã—ã¾ã™ï¼Ž - -VALUE rb_extract_keywords(VALUE *original_hash) - - original_hashã§å‚ç…§ã•ã‚Œã‚‹Hashオブジェクトã‹ã‚‰ï¼ŒSymbolã§ã‚ã‚‹ - ã‚ーã¨ãã®å€¤ã‚’æ–°ã—ã„Hashã«å–り出ã—ã¾ã™ï¼Žoriginal_hashã®æŒ‡ã™ - å…ˆã«ã¯ï¼Œå…ƒã®HashãŒSymbol以外ã®ã‚ーをå«ã‚“ã§ã„ãŸå ´åˆã¯ãれら㌠- コピーã•ã‚ŒãŸåˆ¥ã®æ–°ã—ã„Hash，ãã†ã§ãªã‘ã‚Œã°0ãŒä¿å˜ã•ã‚Œã¾ã™ï¼Ž - -== Rubyメソッド呼ã³å‡ºã— - -VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) :: - - メソッド呼ã³å‡ºã—．文å—列ã‹ã‚‰midã‚’å¾—ã‚‹ãŸã‚ã«ã¯rb_intern()ã‚’ - 使ã†ï¼Ž - private/protectedãªãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚‚呼ã³å‡ºã›ã‚‹ï¼Ž - -VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) :: -VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) :: - - メソッド呼ã³å‡ºã—．引数をargc, argvå½¢å¼ã§æ¸¡ã™ï¼Ž - private/protectedãªãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚‚呼ã³å‡ºã›ã‚‹ï¼Ž - -VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) :: - - メソッド呼ã³å‡ºã—． - publicãªãƒ¡ã‚½ãƒƒãƒ‰ã—ã‹å‘¼ã¹ãªã„． - -VALUE rb_eval_string(const char *str) - - æ–‡å—列をRubyスクリプトã¨ã—ã¦ã‚³ãƒ³ãƒ‘イル・実行ã™ã‚‹ï¼Ž - -ID rb_intern(const char *name) :: - - æ–‡å—列ã«å¯¾å¿œã™ã‚‹IDã‚’è¿”ã™ï¼Ž - -char *rb_id2name(ID id) :: - - IDã«å¯¾å¿œã™ã‚‹æ–‡å—列を返ã™(デãƒãƒƒã‚°ç”¨)． - -char *rb_class2name(VALUE klass) :: - - クラスã®åå‰ã‚’è¿”ã™(デãƒãƒƒã‚°ç”¨)．クラスãŒåå‰ã‚’æŒãŸãªã„時㫠- ã¯, 祖先をé¡ã£ã¦åå‰ã‚’æŒã¤ã‚¯ãƒ©ã‚¹ã®åå‰ã‚’è¿”ã™ï¼Ž - -int rb_respond_to(VALUE obj, ID id) :: - - objãŒidã§ç¤ºã•ã‚Œã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ã‚’æŒã¤ã‹ã©ã†ã‹ã‚’è¿”ã™ï¼Ž - -== インスタンス変数 - -VALUE rb_iv_get(VALUE obj, const char *name) :: - - objã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã®å€¤ã‚’得る．`@'ã§å§‹ã¾ã‚‰ãªã„インスタン - ス変数㯠Rubyプãƒã‚°ãƒ©ãƒ ã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„ã€Œéš ã‚ŒãŸã€ã‚¤ãƒ³ - スタンス変数ã«ãªã‚‹ï¼Žå®šæ•°ã¯å¤§æ–‡å—ã®åå‰ã‚’æŒã¤ã‚¯ãƒ©ã‚¹(ã¾ãŸã¯ - モジュール)ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã¨ã—ã¦å®Ÿè£…ã•ã‚Œã¦ã„る． - -VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) :: - - objã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã‚’valã«ã‚»ãƒƒãƒˆã™ã‚‹ï¼Ž - -== åˆ¶å¾¡æ§‹é€ - -VALUE rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2) :: - - funcをブãƒãƒƒã‚¯ã¨ã—ã¦è¨å®šã—，objをレシーãƒï¼Œargcã¨argvを引数 - ã¨ã—ã¦midメソッドを呼ã³å‡ºã™ï¼Žfuncã¯ç¬¬ä¸€å¼•æ•°ã«yieldã•ã‚ŒãŸå€¤ï¼Œ - 第二引数ã«data2ã‚’å—ã‘å–る．複数ã®å€¤ãŒyieldã•ã‚ŒãŸå ´åˆ(Cã§ã¯ - rb_yield_values()ã¨rb_yield_values2(), rb_yield_splat())， - data2ã¯Arrayã¨ã—ã¦ãƒ‘ックã•ã‚Œã¦ã„る．第三, 第四引数ã®argc㨠- argvã«ã‚ˆã£ã¦yieldã•ã‚ŒãŸå€¤ã‚’å–り出ã™ã“ã¨ãŒã§ãる． - -[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) :: - - func2をブãƒãƒƒã‚¯ã¨ã—ã¦è¨å®šã—, func1をイテレータã¨ã—ã¦å‘¼ã¶ï¼Ž - func1ã«ã¯ arg1ãŒå¼•æ•°ã¨ã—ã¦æ¸¡ã•ã‚Œ, func2ã«ã¯ç¬¬1引数ã«ã‚¤ãƒ†ãƒ¬ãƒ¼ - ã‚¿ã‹ã‚‰ä¸Žãˆã‚‰ã‚ŒãŸå€¤, 第2引数ã«arg2ãŒæ¸¡ã•ã‚Œã‚‹ï¼Ž - - 1.9ã§rb_iterateを使ã†å ´åˆã¯, func1ã®ä¸ã§Rubyレベルã®ãƒ¡ã‚½ãƒƒãƒ‰ - を呼ã³å‡ºã•ãªã‘ã‚Œã°ãªã‚‰ãªã„. - 1.9ã§obsoleteã¨ãªã£ãŸ. 代ã‚ã‚Šã«rb_block_callãŒç”¨æ„ã•ã‚ŒãŸ. - -VALUE rb_yield(VALUE val) :: - - valを値ã¨ã—ã¦ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ãƒ–ãƒãƒƒã‚¯ã‚’呼ã³å‡ºã™ï¼Ž - -VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) :: - - 関数func1ã‚’arg1を引数ã«å‘¼ã³å‡ºã™ï¼Žfunc1ã®å®Ÿè¡Œä¸ã«ä¾‹å¤–ãŒç™ºç”Ÿ - ã—ãŸæ™‚ã«ã¯ func2ã‚’arg2を引数ã¨ã—ã¦å‘¼ã¶ï¼Žæˆ»ã‚Šå€¤ã¯ä¾‹å¤–ãŒç™ºç”Ÿ - ã—ãªã‹ã£ãŸæ™‚ã¯func1ã®æˆ»ã‚Šå€¤, 例外ãŒç™ºç”Ÿã—ãŸæ™‚ã«ã¯func2ã®æˆ» - り値ã§ã‚る． - -VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) :: - - 関数func1ã‚’arg1を引数ã¨ã—ã¦å®Ÿè¡Œã—, 実行終了後(ãŸã¨ãˆä¾‹å¤–㌠- 発生ã—ã¦ã‚‚) func2ã‚’arg2を引数ã¨ã—ã¦å®Ÿè¡Œã™ã‚‹ï¼Žæˆ»ã‚Šå€¤ã¯func1 - ã®æˆ»ã‚Šå€¤ã§ã‚ã‚‹(例外ãŒç™ºç”Ÿã—ãŸæ™‚ã¯æˆ»ã‚‰ãªã„)． - -VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) :: - - 関数funcã‚’argを引数ã¨ã—ã¦å®Ÿè¡Œã—, 例外ãŒç™ºç”Ÿã—ãªã‘ã‚Œã°ãã®æˆ» - り値を返ã™ï¼Žä¾‹å¤–ãŒç™ºç”Ÿã—ãŸå ´åˆã¯, *stateã«éž0をセットã—㦠- Qnilã‚’è¿”ã™ï¼Ž - rb_jump_tag()を呼ã°ãšã«æ•æ‰ã—ãŸä¾‹å¤–を無視ã™ã‚‹å ´åˆã«ã¯ï¼Œ - rb_set_errinfo(Qnil)ã§ã‚¨ãƒ©ãƒ¼æƒ…å ±ã‚’ã‚¯ãƒªã‚¢ã—ãªã‘ã‚Œã°ãªã‚‰ãªã„． - -void rb_jump_tag(int state) :: - - rb_protect()ã‚„rb_eval_string_protect()ã§æ•æ‰ã•ã‚ŒãŸä¾‹å¤–ã‚’å† - é€ã™ã‚‹ï¼Žstateã¯ãれらã®é–¢æ•°ã‹ã‚‰è¿”ã•ã‚ŒãŸå€¤ã§ãªã‘ã‚Œã°ãªã‚‰ãªã„． - ã“ã®é–¢æ•°ã¯ç›´æŽ¥ã®å‘¼ã³å‡ºã—å…ƒã«æˆ»ã‚‰ãªã„． - -void rb_iter_break() :: - - ç¾åœ¨ã®æœ€ã‚‚内å´ã®ãƒ–ãƒãƒƒã‚¯ã‚’終了ã™ã‚‹ï¼Žã“ã®é–¢æ•°ã¯ç›´æŽ¥ã®å‘¼ã³å‡º - ã—å…ƒã«æˆ»ã‚‰ãªã„． - -void rb_iter_break_value(VALUE value) :: - - ç¾åœ¨ã®æœ€ã‚‚内å´ã®ãƒ–ãƒãƒƒã‚¯ã‚’valueã§çµ‚了ã™ã‚‹ï¼Žãƒ–ãƒãƒƒã‚¯ã¯å¼•æ•°ã§ - 与ãˆã‚‰ã‚ŒãŸvalueã‚’è¿”ã™ï¼Žã“ã®é–¢æ•°ã¯ç›´æŽ¥ã®å‘¼ã³å‡ºã—å…ƒã«æˆ»ã‚‰ãªã„． - -== 例外・エラー - -void rb_warning(const char *fmt, ...) :: - - rb_verbose時ã«æ¨™æº–エラー出力ã«è¦å‘Šæƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹ï¼Žå¼•æ•°ã¯ - printf()ã¨åŒã˜ï¼Ž - -void rb_raise(rb_eRuntimeError, const char *fmt, ...) :: - - RuntimeError例外を発生ã•ã›ã‚‹ï¼Žå¼•æ•°ã¯printf()ã¨åŒã˜ï¼Ž - -void rb_raise(VALUE exception, const char *fmt, ...) :: - - exceptionã§æŒ‡å®šã—ãŸä¾‹å¤–を発生ã•ã›ã‚‹ï¼Žfmt以下ã®å¼•æ•°ã¯ - printf()ã¨åŒã˜ï¼Ž - -void rb_fatal(const char *fmt, ...) :: - - 致命的例外を発生ã•ã›ã‚‹ï¼Žé€šå¸¸ã®ä¾‹å¤–処ç†ã¯è¡Œãªã‚ã‚Œãš, インター - プリタãŒçµ‚了ã™ã‚‹(ãŸã ã—ensureã§æŒ‡å®šã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã¯çµ‚了å‰ã« - 実行ã•ã‚Œã‚‹)． - -void rb_bug(const char *fmt, ...) :: - - インタープリタãªã©ãƒ—ãƒã‚°ãƒ©ãƒ ã®ãƒã‚°ã§ã—ã‹ç™ºç”Ÿã™ã‚‹ã¯ãšã®ãªã„ - 状æ³ã®æ™‚呼ã¶ï¼Žã‚¤ãƒ³ã‚¿ãƒ¼ãƒ—リタã¯ã‚³ã‚¢ãƒ€ãƒ³ãƒ—ã—ç›´ã¡ã«çµ‚了ã™ã‚‹ï¼Ž - 例外処ç†ã¯ä¸€åˆ‡è¡Œãªã‚ã‚Œãªã„． - -注æ„: "%"PRIsVALUEãŒObject#to_s('+'フラグãŒæŒ‡å®šã•ã‚Œã¦ã„る㨠-ãã¯Object#inspect)を使ã£ãŸVALUEã®å‡ºåŠ›ã«åˆ©ç”¨ã§ãる．ã“れ㯠-"%i"ã¨è¡çªã™ã‚‹ãŸã‚，整数ã«ã¯"%d"を使用ã™ã‚‹ã“ã¨ï¼Ž - -== Rubyã®åˆæœŸåŒ–・実行 - -Rubyをアプリケーションã«åŸ‹ã‚è¾¼ã‚€å ´åˆã«ã¯ä»¥ä¸‹ã®ã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ -を使ã†ï¼Žé€šå¸¸ã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã«ã¯å¿…è¦ãªã„． - -void ruby_init() :: - - Rubyインタプリタã®åˆæœŸåŒ–ã‚’è¡Œãªã†ï¼Ž - -void *ruby_options(int argc, char **argv) :: - - Rubyインタプリタã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³å¼•æ•°ã®å‡¦ç†ã‚’è¡Œãªã„， - Rubyã®ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã‚’コンパイルã™ã‚‹ï¼Ž - コンパイルã•ã‚ŒãŸã‚½ãƒ¼ã‚¹ã¸ã®ãƒã‚¤ãƒ³ã‚¿ï¼Œã‚‚ã—ãã¯ç‰¹æ®Šå€¤ã‚’è¿”ã™. - -int ruby_run_node(void *n) :: - - コンパイルã•ã‚ŒãŸã‚³ãƒ¼ãƒ‰ã‚’実行ã™ã‚‹ï¼Ž - 実行ã«æˆåŠŸã—ãŸå ´åˆã¯EXIT_SUCCESSを，エラーãŒèµ·ã“ã£ãŸã¨ãã¯ãれ以外を返ã™ï¼Ž - -void ruby_script(char *name) :: - - Rubyã®ã‚¹ã‚¯ãƒªãƒ—トå($0)ã‚’è¨å®šã™ã‚‹ï¼Ž - -== インタプリタã®ã‚¤ãƒ™ãƒ³ãƒˆã®ãƒ•ãƒƒã‚¯ - - void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, - VALUE data) - -指定ã•ã‚ŒãŸã‚¤ãƒ³ã‚¿ãƒ—リタã®ã‚¤ãƒ™ãƒ³ãƒˆã«å¯¾ã™ã‚‹ãƒ•ãƒƒã‚¯é–¢æ•°ã‚’è¿½åŠ ã—ã¾ã™ï¼Ž -eventsã¯ä»¥ä¸‹ã®å€¤ã®orã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“: - - RUBY_EVENT_LINE - RUBY_EVENT_CLASS - RUBY_EVENT_END - RUBY_EVENT_CALL - RUBY_EVENT_RETURN - RUBY_EVENT_C_CALL - RUBY_EVENT_C_RETURN - RUBY_EVENT_RAISE - RUBY_EVENT_ALL - -rb_event_hook_func_tã®å®šç¾©ã¯ä»¥ä¸‹ã®é€šã‚Šã§ã™: - - typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data, - VALUE self, ID id, VALUE klass) - -rb_add_event_hook() ã®ç¬¬3引数 data ã¯ï¼Œãƒ•ãƒƒã‚¯é–¢æ•°ã®ç¬¬2引数㨠-ã—ã¦æ¸¡ã•ã‚Œã¾ã™ï¼Žã“ã‚Œã¯1.8ã§ã¯ç¾åœ¨ã®NODEã¸ã®ãƒã‚¤ãƒ³ã‚¿ã§ã—ãŸï¼Žä»¥ -下㮠RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ã‚‚å‚ç…§ã—ã¦ãã ã•ã„． - - int rb_remove_event_hook(rb_event_hook_func_t func) - -指定ã•ã‚ŒãŸãƒ•ãƒƒã‚¯é–¢æ•°ã‚’削除ã—ã¾ã™ï¼Ž - -== 互æ›æ€§ã®ãŸã‚ã®ãƒžã‚¯ãƒ - -APIã®äº’æ›æ€§ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ãŸã‚ã«ä»¥ä¸‹ã®ãƒžã‚¯ãƒãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§å®šç¾©ã•ã‚Œã¦ã„ã¾ã™ï¼Ž - -NORETURN_STYLE_NEW :: - - NORETURN マクãƒãŒé–¢æ•°åž‹ãƒžã‚¯ãƒã¨ã—ã¦å®šç¾©ã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž - -HAVE_RB_DEFINE_ALLOC_FUNC :: - - rb_define_alloc_func() 関数ãŒæä¾›ã•ã‚Œã¦ã„ã‚‹ã“ã¨ï¼Œã¤ã¾ã‚Š - allocation framework ãŒä½¿ã‚れるã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž - have_func("rb_define_alloc_func", "ruby.h") - ã®çµæžœã¨åŒã˜ï¼Ž - -HAVE_RB_REG_NEW_STR :: - - Stringオブジェクトã‹ã‚‰Regexpオブジェクトを作る - rb_reg_new_str() 関数ãŒæä¾›ã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž - have_func("rb_reg_new_str", "ruby.h"). - ã®çµæžœã¨åŒã˜ï¼Ž - -HAVE_RB_IO_T :: - - rb_io_t åž‹ãŒæä¾›ã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž - -USE_SYMBOL_AS_METHOD_NAME :: - - メソッドåã‚’è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰ï¼ŒModule#methods, #singleton_methods - ãªã©ãŒSymbolã‚’è¿”ã™ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž - -HAVE_RUBY_*_H :: - - ruby.h ã§å®šç¾©ã•ã‚Œã¦ã„る．対応ã™ã‚‹ãƒ˜ãƒƒãƒ€ãŒæä¾›ã•ã‚Œã¦ã„ã‚‹ã“㨠- ã‚’æ„味ã™ã‚‹ï¼ŽãŸã¨ãˆã°ï¼ŒHAVE_RUBY_ST_H ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ - å˜ãªã‚‹ st.h ã§ã¯ãªã ruby/st.h を使用ã™ã‚‹ï¼Ž - -RB_EVENT_HOOKS_HAVE_CALLBACK_DATA :: - - rb_add_event_hook() ãŒãƒ•ãƒƒã‚¯é–¢æ•°ã«æ¸¡ã™ data を第3引数ã¨ã—㦠- å—ã‘å–ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ï¼Ž - -= Appendix C. extconf.rbã§ä½¿ãˆã‚‹é–¢æ•°ãŸã¡ - -extconf.rbã®ä¸ã§ã¯åˆ©ç”¨å¯èƒ½ãªã‚³ãƒ³ãƒ‘イルæ¡ä»¶ãƒã‚§ãƒƒã‚¯ã®é–¢æ•°ã¯ä»¥ -下ã®é€šã‚Šã§ã‚る． - -have_macro(macro, headers) :: - - ヘッダファイルheaderをインクルードã—ã¦ãƒžã‚¯ãƒmacroãŒå®šç¾©ã• - ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒžã‚¯ãƒãŒå®šç¾©ã•ã‚Œã¦ã„る時true - ã‚’è¿”ã™ï¼Ž - -have_library(lib, func) :: - - 関数funcを定義ã—ã¦ã„るライブラリlibã®å˜åœ¨ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Ž - ãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œ-llibã‚’$libsã«è¿½åŠ ã—，trueã‚’è¿”ã™ï¼Ž - -find_library(lib, func, path...) :: - - 関数funcを定義ã—ã¦ã„るライブラリlibã®å˜åœ¨ã‚’ -Lpath ã‚’è¿½åŠ - ã—ãªãŒã‚‰ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œ-llibã‚’$libsã« - è¿½åŠ ã—，trueã‚’è¿”ã™ï¼Ž - -have_func(func, header) :: - - ヘッダファイルheaderをインクルードã—ã¦é–¢æ•°funcã®å˜åœ¨ã‚’ãƒã‚§ - ックã™ã‚‹ï¼ŽfuncãŒæ¨™æº–ã§ã¯ãƒªãƒ³ã‚¯ã•ã‚Œãªã„ライブラリ内ã®ã‚‚ã®ã§ - ã‚る時ã«ã¯å…ˆã«have_libraryã§ãã®ãƒ©ã‚¤ãƒ–ラリをãƒã‚§ãƒƒã‚¯ã—ã¦ãŠ - ã事．ãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œãƒ—リプãƒã‚»ãƒƒã‚µãƒžã‚¯ãƒ - `HAVE_{FUNC}` を定義ã—，trueã‚’è¿”ã™ï¼Ž - -have_var(var, header) :: - - ヘッダファイルheaderをインクルードã—ã¦å¤‰æ•°varã®å˜åœ¨ã‚’ãƒã‚§ãƒƒ - クã™ã‚‹ï¼ŽvarãŒæ¨™æº–ã§ã¯ãƒªãƒ³ã‚¯ã•ã‚Œãªã„ライブラリ内ã®ã‚‚ã®ã§ã‚ - る時ã«ã¯å…ˆã«have_libraryã§ãã®ãƒ©ã‚¤ãƒ–ラリをãƒã‚§ãƒƒã‚¯ã—ã¦ãŠã - 事．ãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œãƒ—リプãƒã‚»ãƒƒã‚µãƒžã‚¯ãƒ - `HAVE_{VAR}` を定義ã—，trueã‚’è¿”ã™ï¼Ž - -have_header(header) :: - - ヘッダファイルã®å˜åœ¨ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œ - プリプãƒã‚»ãƒƒã‚µãƒžã‚¯ãƒ `HAVE_{HEADER_H}` を定義ã—，trueã‚’è¿”ã™ï¼Ž - (スラッシュやドットã¯ã‚¢ãƒ³ãƒ€ãƒ¼ã‚¹ã‚³ã‚¢ã«ç½®æ›ã•ã‚Œã‚‹) - -find_header(header, path...) :: - - ヘッダファイルheaderã®å˜åœ¨ã‚’ -Ipath ã‚’è¿½åŠ ã—ãªãŒã‚‰ãƒã‚§ãƒƒã‚¯ - ã™ã‚‹ï¼Žãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œãƒ—リプãƒã‚»ãƒƒã‚µãƒžã‚¯ãƒ - `HAVE_{HEADER_H}` を定義ã—，trueã‚’è¿”ã™ï¼Ž - (スラッシュやドットã¯ã‚¢ãƒ³ãƒ€ãƒ¼ã‚¹ã‚³ã‚¢ã«ç½®æ›ã•ã‚Œã‚‹) - -have_struct_member(type, member[, header[, opt]]) :: - - ヘッダファイルheaderをインクルードã—ã¦åž‹typeãŒå®šç¾©ã•ã‚Œï¼Œ - ãªãŠã‹ã¤ãƒ¡ãƒ³ãƒmemberãŒå˜åœ¨ã™ã‚‹ã‹ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒã‚§ãƒƒã‚¯ã« - æˆåŠŸã™ã‚‹ã¨ï¼Œãƒ—リプãƒã‚»ãƒƒã‚µãƒžã‚¯ãƒ `HAVE_{TYPE}_{MEMBER}` ã‚’ - 定義ã—，trueã‚’è¿”ã™ï¼Ž - -have_type(type, header, opt) :: - - ヘッダファイルheaderをインクルードã—ã¦åž‹typeãŒå˜åœ¨ã™ã‚‹ã‹ã‚’ - ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Žãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œãƒ—リプãƒã‚»ãƒƒã‚µãƒžã‚¯ãƒ - `HAVE_TYPE_{TYPE}` を定義ã—，trueã‚’è¿”ã™ï¼Ž - -check_sizeof(type, header) :: - - ヘッダファイルheaderをインクルードã—ã¦åž‹typeã®charå˜ä½ã‚µã‚¤ - ズを調ã¹ã‚‹ï¼Žãƒã‚§ãƒƒã‚¯ã«æˆåŠŸã™ã‚‹ã¨ï¼Œãƒ—リプãƒã‚»ãƒƒã‚µãƒžã‚¯ãƒ - `SIZEOF_{TYPE}` を定義ã—，ãã®ã‚µã‚¤ã‚ºã‚’è¿”ã™ï¼Žå®šç¾©ã•ã‚Œã¦ã„㪠- ã„ã¨ãã¯nilã‚’è¿”ã™ï¼Ž - -create_makefile(target[, target_prefix]) :: - - 拡張ライブラリ用ã®Makefileを生æˆã™ã‚‹ï¼Žã“ã®é–¢æ•°ã‚’呼ã°ãªã‘ã‚Œ - ã°ãã®ãƒ©ã‚¤ãƒ–ラリã¯ã‚³ãƒ³ãƒ‘イルã•ã‚Œãªã„．targetã¯ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«å - を表ã™ï¼Ž - -find_executable(command, path) :: - - コマンドcommandã‚’File::PATH_SEPARATORã§åŒºåˆ‡ã‚‰ã‚ŒãŸãƒ‘スåã® - リストpathã‹ã‚‰æŽ¢ã™ï¼ŽpathãŒnilã¾ãŸã¯çœç•¥ã•ã‚ŒãŸå ´åˆã¯ï¼Œç’°å¢ƒ - 変数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ã‚’è¿”ã™ï¼Ž - ã©ã¡ã‚‰ã‚‚指定ã•ã‚Œã¦ã„ãªã„å ´åˆã¯ï¼Œãƒ–ãƒãƒƒã‚¯ã¤ãã§å‘¼ã³å‡ºã•ã‚Œã¦ - ã„ã‚‹å ´åˆã¯*defaultsã‚’yieldã—ãŸçµæžœï¼Œãƒ–ãƒãƒƒã‚¯ãªã—ãªã‚‰ - *defaultsã‚’è¿”ã™ï¼Ž - -dir_config(target[, default_dir]) :: -dir_config(target[, default_include, default_lib]) :: - - コマンドライン上ã®--with-<target>-dir, --with-<target>-include, - --with-<target>-libã®ã„ãšã‚Œã‹ã§æŒ‡å®šã•ã‚Œã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ - $CFLAGS ã‚„ $LDFLAGS ã«è¿½åŠ ã™ã‚‹ï¼Ž--with-<target>-dir=/path㯠- --with-<target>-include=/path/include --with-<target>-lib=/path/lib - ã¨ç‰ä¾¡ã§ã‚ã‚‹ï¼Žè¿½åŠ ã•ã‚ŒãŸ include ディレクトリ㨠lib ディレ - クトリã®é…列を返ã™ï¼Ž ([include_dir, lib_dir]) - -pkg_config(pkg, option=nil) :: - - pkg-configコマンドã‹ã‚‰ãƒ‘ッケージpkgã®æƒ…å ±ã‚’ [cflags, ldflags, libs] - ã®é…列ã¨ã—ã¦å¾—る．$CFLAGS, $LDFLAGS, $libs ã«ã¯ãã‚Œãžã‚Œã®å€¤ãŒ - è¿½åŠ ã•ã‚Œã‚‹ï¼Ž - - pkg-configã®å®Ÿéš›ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ï¼Œä»¥ä¸‹ã®é †ã§è©¦ã•ã‚Œã‚‹ï¼Ž - - 1. コマンドラインã§--with-{pkg}-config={command}オプション㌠- 指定ã•ã‚ŒãŸå ´åˆ: {command} {option} - 2. {pkg}-config {option} - 3. pkg-config {option} {pkg} - - optionãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ï¼Œä¸Šè¨˜ã®é…列ã®ä»£ã‚ã‚Šã«ãã®ã‚ªãƒ—ションを - 指定ã—ã¦å¾—られãŸå‡ºåŠ›ã‚’stripã—ãŸã‚‚ã®ã‚’è¿”ã™ï¼Ž - -= Appendix D. 世代別GC - -Ruby 2.1ã‹ã‚‰ä¸–代別GCã«å¯¾å¿œã—ã¾ã—ãŸï¼Žæˆ‘々ã¯ã“れをRGenGCã¨å‘¼ã‚“ã§ã„ã¾ã™ï¼Ž -RGenGCã¯ï¼ŒéŽåŽ»ã®æ‹¡å¼µãƒ©ã‚¤ãƒ–ラリã«ï¼ˆã»ã¼ï¼‰äº’æ›æ€§ã‚’ä¿ã¤ã‚ˆã†ã«é–‹ç™ºã•ã‚Œã¦ã„ã‚‹ -ãŸã‚，拡張ライブラリå´ã®å¯¾å¿œã¯ã»ã¼ä¸è¦ã§ã™ï¼Ž - -ãŸã ã—，対応をã™ã‚‹ã“ã¨ã§æ€§èƒ½ã‚’å‘上ã™ã‚‹ã“ã¨ãŒã§ãã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ï¼Žã‚‚ã— -拡張ライブラリã«é«˜ã„性能ãŒå¿…è¦ã§ã‚ã‚‹å ´åˆã¯å¯¾å¿œã‚’検討ã—ã¦ä¸‹ã•ã„． - -ã¨ãã«RARRAY_PTR()/RHASH_TBL()ã®ã‚ˆã†ãªãƒžã‚¯ãƒã‚’用ã„ã¦ãƒã‚¤ãƒ³ã‚¿ã«ç›´æŽ¥ã‚¢ã‚¯ã‚» -スã™ã‚‹ã‚ˆã†ãªã‚³ãƒ¼ãƒ‰ã¯æ›¸ã‹ãªã„よã†ã«ã—ã¦ä¸‹ã•ã„．代ã‚ã‚Šã«ï¼Œrb_ary_aref(), -rb_ary_store() ãªã©ã®ï¼Œé©åˆ‡ãª API 関数を利用ã™ã‚‹ã‚ˆã†ã«ã—ã¦ä¸‹ã•ã„． - -ãã®ã»ã‹ï¼Œå¯¾å¿œã«ã¤ã„ã¦ã®è©³ç´°ã¯ README.EXT ã®ã€ŒAppendix D. Generational -GCã€ã‚’å‚ç…§ã—ã¦ä¸‹ã•ã„． - -/* - * Local variables: - * fill-column: 60 - * end: - */ +doc/extension.ja.rdocã«ç§»å‹•ã—ã¾ã—㟠diff --git a/README.ja.md b/README.ja.md index 1e9bae7e0c..9d6131e416 100644 --- a/README.ja.md +++ b/README.ja.md @@ -55,7 +55,7 @@ http://www.ruby-lang.org/ ## メーリングリスト -Rubyã®ãƒ¡ãƒ¼ãƒªãƒ³ã‚°ãƒªã‚¹ãƒˆãŒã‚ã‚Šã¾ã™ã€‚å‚åŠ å¸Œæœ›ã®æ–¹ã¯ +Rubyã®ãƒ¡ãƒ¼ãƒªãƒ³ã‚°ãƒªã‚¹ãƒˆãŒã‚ã‚Šã¾ã™ï¼Žå‚åŠ å¸Œæœ›ã®æ–¹ã¯ mailto:ruby-list-request@ruby-lang.org @@ -63,22 +63,22 @@ mailto:ruby-list-request@ruby-lang.org subscribe -ã¨æ›¸ã„ã¦é€ã£ã¦ä¸‹ã•ã„。 +ã¨æ›¸ã„ã¦é€ã£ã¦ä¸‹ã•ã„． -Ruby開発者å‘ã‘メーリングリストもã‚ã‚Šã¾ã™ã€‚ã“ã¡ã‚‰ã§ã¯rubyã®ãƒã‚°ã€å°†æ¥ã®ä»•æ§˜æ‹¡å¼µãªã©å®Ÿè£…上ã®å•é¡Œã«ã¤ã„ã¦è°è«–ã•ã‚Œã¦ã„ã¾ã™ã€‚ å‚åŠ å¸Œæœ›ã®æ–¹ã¯ +Ruby開発者å‘ã‘メーリングリストもã‚ã‚Šã¾ã™ï¼Žã“ã¡ã‚‰ã§ã¯rubyã®ãƒã‚°ï¼Œå°†æ¥ã®ä»•æ§˜æ‹¡å¼µãªã©å®Ÿè£…上ã®å•é¡Œã«ã¤ã„ã¦è°è«–ã•ã‚Œã¦ã„ã¾ã™ï¼Ž å‚åŠ å¸Œæœ›ã®æ–¹ã¯ mailto:ruby-dev-request@ruby-lang.org -ã¾ã§ruby-listã¨åŒæ§˜ã®æ–¹æ³•ã§ãƒ¡ãƒ¼ãƒ«ã—ã¦ãã ã•ã„。 +ã¾ã§ruby-listã¨åŒæ§˜ã®æ–¹æ³•ã§ãƒ¡ãƒ¼ãƒ«ã—ã¦ãã ã•ã„． Ruby拡張モジュールã«ã¤ã„ã¦è©±ã—åˆã†ruby-extメーリングリストã¨æ•°å¦é–¢ä¿‚ã®è©±é¡Œã«ã¤ã„ã¦è©±ã—åˆã†ruby-mathメーリングリスト㨠-英語ã§rubyã«ã¤ã„ã¦è©±ã—åˆã†ruby-talkメーリングリストもã‚ã‚Šã¾ã™ã€‚å‚åŠ æ–¹æ³•ã¯ã©ã‚Œã‚‚åŒã˜ã§ã™ã€‚ +英語ã§rubyã«ã¤ã„ã¦è©±ã—åˆã†ruby-talkメーリングリストもã‚ã‚Šã¾ã™ï¼Žå‚åŠ æ–¹æ³•ã¯ã©ã‚Œã‚‚åŒã˜ã§ã™ï¼Ž ## コンパイル・インストール 以下ã®æ‰‹é †ã§è¡Œã£ã¦ãã ã•ã„． -1. ã‚‚ã— `configure` ファイルãŒè¦‹ã¤ã‹ã‚‰ãªã„ã€ã‚‚ã—ã㯠`configure.in` よりå¤ã„よã†ãªã‚‰ã€ `autoconf` を実行ã—㦠+1. ã‚‚ã— `configure` ファイルãŒè¦‹ã¤ã‹ã‚‰ãªã„，もã—ã㯠`configure.in` よりå¤ã„よã†ãªã‚‰ï¼Œ `autoconf` を実行ã—㦠新ã—ã `configure` を生æˆã™ã‚‹ 2. `configure` を実行ã—㦠`Makefile` ãªã©ã‚’生æˆã™ã‚‹ @@ -109,20 +109,17 @@ Ruby拡張モジュールã«ã¤ã„ã¦è©±ã—åˆã†ruby-extメーリングリスム* `${DESTDIR}${prefix}/bin` * `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}` - * `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFOR - M}` + * `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib` * `${DESTDIR}${prefix}/lib/ruby` * `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}` * `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib/ruby/site_ruby` * `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}` - * `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${P - LATFORM}` + * `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby` * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}` - * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/$ - {PLATFORM}` + * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}` * `${DESTDIR}${prefix}/share/man/man1` * `${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system` @@ -147,17 +144,28 @@ UNIXã§ã‚れ㰠`configure` ãŒã»ã¨ã‚“ã©ã®å·®ç•°ã‚’å¸åŽã—ã¦ãれる㯠ã®ã‚¢ãƒ¼ã‚テクãƒãƒ£ãŒ`setjmp()`ã¾ãŸã¯`getcontext()`ã«ã‚ˆã£ã¦å…¨ã¦ã®ãƒ¬ã‚¸ã‚¹ã‚¿ã‚’ `jmp_buf` ã‚„ `ucontext_t` ã«æ ¼ç´ã™ã‚‹ã“ã¨ã¨ï¼Œ `jmp_buf` ã‚„ `ucontext_t` ã¨ã‚¹ã‚¿ãƒƒã‚¯ãŒ32bitアラインメントã•ã‚Œã¦ã„ã‚‹ã“ã¨ã‚’仮定 ã—ã¦ã„ã¾ã™ï¼Žç‰¹ã«å‰è€…ãŒæˆç«‹ã—ãªã„å ´åˆã®å¯¾å¿œã¯éžå¸¸ã«å›°é›£ã§ã—ょã†ï¼Ž 後者ã®è§£æ±ºã¯æ¯”較的簡å˜ã§ï¼Œ `gc.c` ã§ã‚¹ã‚¿ãƒƒã‚¯ã‚’マークã—ã¦ã„ã‚‹ -部分ã«ã‚¢ãƒ©ã‚¤ãƒ³ãƒ¡ãƒ³ãƒˆã®ãƒã‚¤ãƒˆæ•°ã ã‘ãšã‚‰ã—ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹ã‚³ãƒ¼ãƒ‰ã‚’è¿½åŠ ã™ã‚‹ã ã‘ã§æ¸ˆã¿ã¾ã™ï¼Ž`defined(_\*mc68000*\_)`ã§æ‹¬ã‚‰ã‚Œã¦ã„ +部分ã«ã‚¢ãƒ©ã‚¤ãƒ³ãƒ¡ãƒ³ãƒˆã®ãƒã‚¤ãƒˆæ•°ã ã‘ãšã‚‰ã—ã¦ãƒžãƒ¼ã‚¯ã™ã‚‹ã‚³ãƒ¼ãƒ‰ã‚’è¿½åŠ ã™ã‚‹ã ã‘ã§æ¸ˆã¿ã¾ã™ï¼Ž`defined(__mc68000__)`ã§æ‹¬ã‚‰ã‚Œã¦ã„ る部分をå‚考ã«ã—ã¦ãã ã•ã„． レジスタウィンドウをæŒã¤CPUã§ã¯ï¼Œãƒ¬ã‚¸ã‚¹ã‚¿ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’スタックã«ãƒ•ãƒ©ãƒƒã‚·ãƒ¥ã™ã‚‹ã‚¢ã‚»ãƒ³ãƒ–ãƒ©ã‚³ãƒ¼ãƒ‰ã‚’è¿½åŠ ã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“． ## é…布æ¡ä»¶ -`COPYING.ja` ファイルをå‚ç…§ã—ã¦ãã ã•ã„。 +[COPYING.ja](COPYING.ja) ファイルをå‚ç…§ã—ã¦ãã ã•ã„． + +## フィードãƒãƒƒã‚¯ + +Rubyã«é–¢ã™ã‚‹è³ªå•ã¯ Ruby-Talk（英語）や Ruby-List（日本語） (https://www.ruby-lang.org/ja/community/mailing-lists) や， +stackoverflow (http://ja.stackoverflow.com/) ãªã©ã®Webサイトã«æŠ•ç¨¿ã—ã¦ãã ã•ã„． + +ãƒã‚°å ±å‘Šã¯ http://bugs.ruby-lang.org ã§å—ã‘付ã‘ã¦ã„ã¾ã™ï¼Ž + ## 著者 -コメント，ãƒã‚°ãƒ¬ãƒãƒ¼ãƒˆãã®ä»–㯠mailto:matz@ruby-lang.org ã¾ã§ï¼Ž +Rubyã®ã‚ªãƒªã‚¸ãƒŠãƒ«ç‰ˆã¯ï¼Œ1995å¹´ã«ã¾ã¤ã‚‚ã¨ã‚†ãã²ã‚æ°ã«ã‚ˆã£ã¦è¨è¨ˆãƒ»é–‹ç™ºã•ã‚Œã¾ã—ãŸï¼Ž + +<mailto:matz@ruby-lang.org> + --- created at: Thu Aug 3 11:57:36 JST 1995 @@ -1,3 +1,6 @@ +[](https://travis-ci.org/ruby/ruby) +[](https://ci.appveyor.com/project/ruby/ruby/branch/trunk) + # What's Ruby Ruby is the interpreted scripting language for quick and easy object-oriented @@ -8,26 +11,26 @@ extensible. ## Features of Ruby * Simple Syntax -* **Normal** Object-Oriented features(ex. class, method calls) -* **Advanced** Object-Oriented features(ex. Mix-in, Singleton-method) +* **Normal** Object-oriented Features (e.g. class, method calls) +* **Advanced** Object-oriented Features (e.g. Mix-in, Singleton-method) * Operator Overloading * Exception Handling * Iterators and Closures * Garbage Collection -* Dynamic Loading of Object files(on some architecture) +* Dynamic Loading of Object Files (on some architectures) * Highly Portable (works on many Unix-like/POSIX compatible platforms as - well as Windows, Mac OS X, BeOS etc.) cf. + well as Windows, Mac OS X, BeOS, etc.) cf. http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms ## How to get Ruby -For a complete list of ways to install Ruby, including using third party tools +For a complete list of ways to install Ruby, including using third-party tools like rvm, see: http://www.ruby-lang.org/en/downloads/ -The Ruby distribution files can be found in the following FTP site: +The Ruby distribution files can be found on the following FTP site: ftp://ftp.ruby-lang.org/pub/ruby/ @@ -41,7 +44,7 @@ Or if you are using git then use the following command: $ git clone git://github.com/ruby/ruby.git There are some other branches under development. Try the following command -and see the list of branches: +to see the list of branches: $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/ @@ -49,16 +52,16 @@ Or if you are using git then use the following command: $ git ls-remote git://github.com/ruby/ruby.git -## Ruby home-page +## Ruby home page -The URL of the Ruby home-page is: +The URL of the Ruby home page is: http://www.ruby-lang.org/ ## Mailing list -There is a mailing list to talk about Ruby. To subscribe this list, please -send the following phrase +There is a mailing list to talk about Ruby. To subscribe to this list, please +send the following phrase: subscribe @@ -73,9 +76,9 @@ This is what you need to do to compile and install Ruby: win32/README.win32 instead of this document. 2. If `./configure` does not exist or is older than configure.in, run - autoconf to (re)generate configure. + `autoconf` to (re)generate configure. -3. Run `./configure`, which will generate config.h and Makefile. +3. Run `./configure`, which will generate `config.h` and `Makefile`. Some C compiler flags may be added by default depending on your environment. Specify `optflags=..` and `warnflags=..` as necessary to @@ -100,25 +103,22 @@ This is what you need to do to compile and install Ruby: 8. Run '`make install`' - This command will create following directories and install files onto + This command will create the following directories and install files into them. * `${DESTDIR}${prefix}/bin` * `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}` - * `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFOR - M}` + * `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib` * `${DESTDIR}${prefix}/lib/ruby` * `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}` * `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib/ruby/site_ruby` * `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}` - * `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${P - LATFORM}` + * `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby` * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}` - * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/$ - {PLATFORM}` + * `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}` * `${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}` * `${DESTDIR}${prefix}/share/man/man1` * `${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system` @@ -137,13 +137,12 @@ If you fail to compile ruby, please send the detailed error report with the error log and machine/OS type, to help others. Some extension libraries may not get compiled because of lack of necessary -external libraries and/or headers, then you will need to run '`make -distclean-ext`' to remove old configuration after installing them in such -case. +external libraries and/or headers, then you will need to run '`make distclean-ext`' +to remove old configuration after installing them in such case. ## Copying -See the file `COPYING`. +See the file [COPYING](COPYING). ## Feedback @@ -151,7 +150,14 @@ Questions about the Ruby language can be asked on the Ruby-Talk mailing list (http://www.ruby-lang.org/en/community/mailing-lists) or on websites like (http://stackoverflow.com). -Bug reports should be filed at http://bugs.ruby-lang.org +Bug reports should be filed at http://bugs.ruby-lang.org. Read [HowToReport] for more information. + +[HowToReport]: https://bugs.ruby-lang.org/projects/ruby/wiki/HowToReport + +##Contributing + +See the file [CONTRIBUTING.md](CONTRIBUTING.md) + ## The Author diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000000..99b24e6d93 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,46 @@ +# -*- autoconf -*- + +AC_DEFUN([_COLORIZE_RESULT_PREPARE], [ + msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset= + AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [ + msg_begin="`tput smso 2>/dev/null`" + AS_CASE(["$msg_begin"], ['@<:@'*m], + [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`" + msg_checking="${msg_begin}33m" + AS_IF([test ${TEST_COLORS:+set}], [ + msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`] + msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`] + msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`] + ]) + msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m" + msg_result_no="${msg_begin}${msg_result_no:-31;1}m" + msg_result_other="${msg_begin}${msg_result_other:-33;1}m" + msg_reset="${msg_begin}m" + ]) + AS_UNSET(msg_begin) + ]) + AS_REQUIRE_SHELL_FN([colorize_result], + [AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])], + [AS_CASE(["$[]1"], + [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}]")], + [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}]")], + [AS_ECHO(["${msg_result_other}$[]1${msg_reset}]")])]) +]) + +AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl + AS_LITERAL_IF([$1], + [m4_case([$1], + [yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])], + [no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])], + [AS_ECHO(["${msg_result_other}$1${msg_reset}"])])], + [colorize_result "$1"]) dnl +]) + +AC_DEFUN([AC_CHECKING],[dnl +AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl +AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])]) + +AC_DEFUN([AC_MSG_RESULT], [dnl +{ _AS_ECHO_LOG([result: $1]) +COLORIZE_RESULT([$1]); dnl +}]) diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000000..56e944be8f --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,15 @@ +# generated automatically by aclocal 1.15 -*- Autoconf -*- + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_include([acinclude.m4]) diff --git a/addr2line.c b/addr2line.c index c8faf48d62..a20e5000c4 100644 --- a/addr2line.c +++ b/addr2line.c @@ -36,11 +36,9 @@ /* Make alloca work the best possible way. */ #ifdef __GNUC__ -# ifndef atarist -# ifndef alloca -# define alloca __builtin_alloca -# endif -# endif /* atarist */ +# ifndef alloca +# define alloca __builtin_alloca +# endif #else # ifdef HAVE_ALLOCA_H # include <alloca.h> @@ -812,8 +810,7 @@ next_line: #include <stdarg.h> #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1) -extern int rb_toupper(int c); -#define toupper(c) rb_toupper(c) +static inline int toupper(int c) { return ('A' <= c && c <= 'Z') ? (c&0x5f) : c; } #define hex2ascii(hex) (hex2ascii_data[hex]) char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz"; static inline int imax(int a, int b) { return (a > b ? a : b); } diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000000..2cda4817a6 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,37 @@ +--- +shallow_clone: true +platform: x64 +install: + - SET + - '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64' + - SET PATH=\usr\local\bin;C:\Ruby22-x64\bin;C:\Ruby21-x64\Devkit\mingw\bin;%PATH%;C:\msys64\usr\bin + - ruby --version + - 'cl' + - SET + - mkdir \usr\local\bin + - mkdir \usr\local\include + - mkdir \usr\local\lib + - ps: Start-FileDownload 'http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.7-windows.zip' + - 7z x libressl-2.3.7-windows.zip + - copy libressl-2.3.7-windows\x64\libcrypto-37.lib \usr\local\lib\crypto.lib + - copy libressl-2.3.7-windows\x64\libssl-38.lib \usr\local\lib\ssl.lib + - copy libressl-2.3.7-windows\x64\libcrypto-37.dll \usr\local\bin + - copy libressl-2.3.7-windows\x64\libssl-38.dll \usr\local\bin + - xcopy /e libressl-2.3.7-windows\include \usr\local\include + - ps: Start-FileDownload 'http://zlib.net/zlib128.zip' + - 7z x zlib128.zip + - cd zlib-1.2.8 + - nmake -f win32/Makefile.msc + - copy zlib1.dll \usr\local\bin + - copy zlib.lib \usr\local\lib + - copy zconf.h \usr\local\include + - copy zlib.h \usr\local\include +build_script: + - cd %APPVEYOR_BUILD_FOLDER% + - win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local + - nmake -l up + - nmake -l + - nmake install-nodoc +test_script: + - nmake -l "OPTS=-v -q" btest + - nmake -l "OPTS=-v -q" test-basic @@ -20,7 +20,7 @@ #ifndef ARRAY_DEBUG # define NDEBUG #endif -#include <assert.h> +#include "ruby_assert.h" VALUE rb_cArray; @@ -453,10 +453,7 @@ ary_alloc(VALUE klass) static VALUE empty_ary_alloc(VALUE klass) { - if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) { - RUBY_DTRACE_ARRAY_CREATE(0, rb_sourcefile(), rb_sourceline()); - } - + RUBY_DTRACE_CREATE_HOOK(ARRAY, 0); return ary_alloc(klass); } @@ -472,9 +469,7 @@ ary_new(VALUE klass, long capa) rb_raise(rb_eArgError, "array size too big"); } - if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) { - RUBY_DTRACE_ARRAY_CREATE(capa, rb_sourcefile(), rb_sourceline()); - } + RUBY_DTRACE_CREATE_HOOK(ARRAY, capa); ary = ary_alloc(klass); if (capa > RARRAY_EMBED_LEN_MAX) { @@ -940,7 +935,7 @@ rb_ary_cat(VALUE ary, const VALUE *argv, long len) * a = [ "a", "b", "c" ] * a.push("d", "e", "f") * #=> ["a", "b", "c", "d", "e", "f"] - * [1, 2, 3,].push(4).push(5) + * [1, 2, 3].push(4).push(5) * #=> [1, 2, 3, 4, 5] */ @@ -1070,14 +1065,21 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary) n = RARRAY_LEN(result); if (ARY_SHARED_P(ary)) { if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) { + setup_occupied_shared: ary_mem_clear(ary, 0, n); } ARY_INCREASE_PTR(ary, n); } else { - RARRAY_PTR_USE(ary, ptr, { - MEMMOVE(ptr, ptr + n, VALUE, RARRAY_LEN(ary)-n); - }); /* WB: no new reference */ + if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) { + RARRAY_PTR_USE(ary, ptr, { + MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n); + }); /* WB: no new reference */ + } + else { + ary_make_shared(ary); + goto setup_occupied_shared; + } } ARY_INCREASE_LEN(ary, -n); @@ -1193,10 +1195,17 @@ rb_ary_elt(VALUE ary, long offset) VALUE rb_ary_entry(VALUE ary, long offset) { + long len = RARRAY_LEN(ary); + const VALUE *ptr = RARRAY_CONST_PTR(ary); + if (len == 0) return Qnil; if (offset < 0) { - offset += RARRAY_LEN(ary); + offset += len; + if (offset < 0) return Qnil; + } + else if (len <= offset) { + return Qnil; } - return rb_ary_elt(ary, offset); + return ptr[offset]; } VALUE @@ -1300,7 +1309,7 @@ rb_ary_aref(int argc, const VALUE *argv, VALUE ary) * a.at(-1) #=> "e" */ -static VALUE +VALUE rb_ary_at(VALUE ary, VALUE pos) { return rb_ary_entry(ary, NUM2LONG(pos)); @@ -1551,10 +1560,10 @@ rb_ary_to_ary(VALUE obj) } static void -rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) +rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen) { - long rlen; long olen; + long rofs; if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len); olen = RARRAY_LEN(ary); @@ -1569,14 +1578,11 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) len = olen - beg; } - if (rpl == Qundef) { - rlen = 0; - } - else { - rpl = rb_ary_to_ary(rpl); - rlen = RARRAY_LEN(rpl); - olen = RARRAY_LEN(ary); /* ary may be resized in rpl.to_ary too */ + { + const VALUE *optr = RARRAY_CONST_PTR(ary); + rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1; } + if (beg >= olen) { VALUE target_ary; if (beg > ARY_MAX_SIZE - rlen) { @@ -1586,7 +1592,8 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) len = beg + rlen; ary_mem_clear(ary, olen, beg - olen); if (rlen > 0) { - ary_memcpy0(ary, beg, rlen, RARRAY_CONST_PTR(rpl), target_ary); + if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs; + ary_memcpy0(ary, beg, rlen, rptr, target_ary); } ARY_SET_LEN(ary, len); } @@ -1609,10 +1616,10 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) ARY_SET_LEN(ary, alen); } if (rlen > 0) { - MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), VALUE, rlen); + if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs; + MEMMOVE(RARRAY_PTR(ary) + beg, rptr, VALUE, rlen); } } - RB_GC_GUARD(rpl); } void @@ -1715,13 +1722,13 @@ static VALUE rb_ary_aset(int argc, VALUE *argv, VALUE ary) { long offset, beg, len; + VALUE rpl; if (argc == 3) { rb_ary_modify_check(ary); beg = NUM2LONG(argv[0]); len = NUM2LONG(argv[1]); - rb_ary_splice(ary, beg, len, argv[2]); - return argv[2]; + goto range; } rb_check_arity(argc, 2, 2); rb_ary_modify_check(ary); @@ -1731,8 +1738,11 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary) } if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) { /* check if idx is Range */ - rb_ary_splice(ary, beg, len, argv[1]); - return argv[1]; + range: + rpl = rb_ary_to_ary(argv[argc-1]); + rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR(rpl), RARRAY_LEN(rpl)); + RB_GC_GUARD(rpl); + return argv[argc-1]; } offset = NUM2LONG(argv[0]); @@ -1772,7 +1782,7 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary) if (pos < 0) { pos++; } - rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1)); + rb_ary_splice(ary, pos, 0, argv + 1, argc - 1); return ary; } @@ -1791,9 +1801,9 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj) * ary.each -> Enumerator * * Calls the given block once for each element in +self+, passing that element - * as a parameter. + * as a parameter. Returns the array itself. * - * An Enumerator is returned if no block is given. + * If no block is given, an Enumerator is returned. * * a = [ "a", "b", "c" ] * a.each {|x| print x, " -- " } @@ -1804,10 +1814,9 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj) */ VALUE -rb_ary_each(VALUE array) +rb_ary_each(VALUE ary) { long i; - volatile VALUE ary = array; RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); for (i=0; i<RARRAY_LEN(ary); i++) { @@ -2164,10 +2173,11 @@ rb_ary_to_h(VALUE ary) long i; VALUE hash = rb_hash_new(); for (i=0; i<RARRAY_LEN(ary); i++) { - VALUE key_value_pair = rb_check_array_type(rb_ary_elt(ary, i)); + const VALUE elt = rb_ary_elt(ary, i); + const VALUE key_value_pair = rb_check_array_type(elt); if (NIL_P(key_value_pair)) { - rb_raise(rb_eTypeError, "wrong element type %s at %ld (expected array)", - rb_builtin_class_name(rb_ary_elt(ary, i)), i); + rb_raise(rb_eTypeError, "wrong element type %"PRIsVALUE" at %ld (expected array)", + rb_obj_class(elt), i); } if (RARRAY_LEN(key_value_pair) != 2) { rb_raise(rb_eArgError, "wrong array length at %ld (expected 2, was %ld)", @@ -2362,26 +2372,9 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary) struct ary_sort_data { VALUE ary; - int opt_methods; - int opt_inited; + struct cmp_opt_data cmp_opt; }; -enum { - sort_opt_Fixnum, - sort_opt_String, - sort_optimizable_count -}; - -#define STRING_P(s) (RB_TYPE_P((s), T_STRING) && CLASS_OF(s) == rb_cString) - -#define SORT_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(sort_opt_,type)) -#define SORT_OPTIMIZABLE(data, type) \ - (((data)->opt_inited & SORT_OPTIMIZABLE_BIT(type)) ? \ - ((data)->opt_methods & SORT_OPTIMIZABLE_BIT(type)) : \ - (((data)->opt_inited |= SORT_OPTIMIZABLE_BIT(type)), \ - rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \ - ((data)->opt_methods |= SORT_OPTIMIZABLE_BIT(type)))) - static VALUE sort_reentered(VALUE ary) { @@ -2413,12 +2406,12 @@ sort_2(const void *ap, const void *bp, void *dummy) VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp; int n; - if (FIXNUM_P(a) && FIXNUM_P(b) && SORT_OPTIMIZABLE(data, Fixnum)) { + if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Fixnum)) { if ((long)a > (long)b) return 1; if ((long)a < (long)b) return -1; return 0; } - if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) { + if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) { return rb_str_cmp(a, b); } @@ -2439,9 +2432,9 @@ sort_2(const void *ap, const void *bp, void *dummy) * Comparisons for the sort will be done using the <code><=></code> operator * or using an optional code block. * - * The block must implement a comparison between +a+ and +b+, and return - * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+ - * if +b+ follows +a+. + * The block must implement a comparison between +a+ and +b+ and return + * an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+ + * are equivalent, or an integer greater than 0 when +a+ follows +b+. * * See also Enumerable#sort_by. * @@ -2462,8 +2455,8 @@ rb_ary_sort_bang(VALUE ary) RBASIC_CLEAR_CLASS(tmp); data.ary = tmp; - data.opt_methods = 0; - data.opt_inited = 0; + data.cmp_opt.opt_methods = 0; + data.cmp_opt.opt_inited = 0; RARRAY_PTR_USE(tmp, ptr, { ruby_qsort(ptr, len, sizeof(VALUE), rb_block_given_p()?sort_1:sort_2, &data); @@ -2472,8 +2465,8 @@ rb_ary_sort_bang(VALUE ary) if (ARY_EMBED_P(tmp)) { if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */ rb_ary_unshare(ary); + FL_SET_EMBED(ary); } - FL_SET_EMBED(ary); ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp)); ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp)); } @@ -2520,9 +2513,9 @@ rb_ary_sort_bang(VALUE ary) * Comparisons for the sort will be done using the <code><=></code> operator * or using an optional code block. * - * The block must implement a comparison between +a+ and +b+, and return - * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+ - * if +b+ follows +a+. + * The block must implement a comparison between +a+ and +b+ and return + * an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+ + * are equivalent, or an integer greater than 0 when +a+ follows +b+. * * * See also Enumerable#sort_by. @@ -2540,6 +2533,8 @@ rb_ary_sort(VALUE ary) return ary; } +static VALUE rb_ary_bsearch_index(VALUE ary); + /* * call-seq: * ary.bsearch {|x| block } -> elem @@ -2596,6 +2591,30 @@ rb_ary_sort(VALUE ary) static VALUE rb_ary_bsearch(VALUE ary) { + VALUE index_result = rb_ary_bsearch_index(ary); + + if (FIXNUM_P(index_result)) { + return rb_ary_entry(ary, FIX2LONG(index_result)); + } + return index_result; +} + +/* + * call-seq: + * ary.bsearch_index {|x| block } -> int or nil + * + * By using binary search, finds an index of a value from this array which + * meets the given condition in O(log n) where n is the size of the array. + * + * It supports two modes, depending on the nature of the block and they are + * exactly the same as in the case of #bsearch method with the only difference + * being that this method returns the index of the element instead of the + * element itself. For more details consult the documentation for #bsearch. + */ + +static VALUE +rb_ary_bsearch_index(VALUE ary) +{ long low = 0, high = RARRAY_LEN(ary), mid; int smaller = 0, satisfied = 0; VALUE v, val; @@ -2606,8 +2625,8 @@ rb_ary_bsearch(VALUE ary) val = rb_ary_entry(ary, mid); v = rb_yield(val); if (FIXNUM_P(v)) { - if (FIX2INT(v) == 0) return val; - smaller = FIX2INT(v) < 0; + if (v == INT2FIX(0)) return INT2FIX(mid); + smaller = (SIGNED_VALUE)v < 0; /* Fixnum preserves its sign-bit */ } else if (v == Qtrue) { satisfied = 1; @@ -2618,16 +2637,16 @@ rb_ary_bsearch(VALUE ary) } else if (rb_obj_is_kind_of(v, rb_cNumeric)) { const VALUE zero = INT2FIX(0); - switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, INT2FIX(0))) { - case 0: return val; - case 1: smaller = 1; break; - case -1: smaller = 0; + switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) { + case 0: return INT2FIX(mid); + case 1: smaller = 1; break; + case -1: smaller = 0; } } else { - rb_raise(rb_eTypeError, "wrong argument type %s" - " (must be numeric, true, false or nil)", - rb_obj_classname(v)); + rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE + " (must be numeric, true, false or nil)", + rb_obj_class(v)); } if (smaller) { high = mid; @@ -2636,9 +2655,8 @@ rb_ary_bsearch(VALUE ary) low = mid + 1; } } - if (low == RARRAY_LEN(ary)) return Qnil; if (!satisfied) return Qnil; - return rb_ary_entry(ary, low); + return INT2FIX(low); } @@ -2689,9 +2707,9 @@ rb_ary_sort_by_bang(VALUE ary) * If no block is given, an Enumerator is returned instead. * * a = [ "a", "b", "c", "d" ] - * a.collect { |x| x + "!" } #=> ["a!", "b!", "c!", "d!"] - * a.map.with_index{ |x, i| x * i } #=> ["", "b", "cc", "ddd"] - * a #=> ["a", "b", "c", "d"] + * a.collect { |x| x + "!" } #=> ["a!", "b!", "c!", "d!"] + * a.map.with_index { |x, i| x * i } #=> ["", "b", "cc", "ddd"] + * a #=> ["a", "b", "c", "d"] */ static VALUE @@ -2828,6 +2846,48 @@ rb_ary_select(VALUE ary) return result; } +struct select_bang_arg { + VALUE ary; + long len[2]; +}; + +static VALUE +select_bang_i(VALUE a) +{ + volatile struct select_bang_arg *arg = (void *)a; + VALUE ary = arg->ary; + long i1, i2; + + for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) { + VALUE v = RARRAY_AREF(ary, i1); + if (!RTEST(rb_yield(v))) continue; + if (i1 != i2) { + rb_ary_store(ary, i2, v); + } + arg->len[1] = ++i2; + } + return (i1 == i2) ? Qnil : ary; +} + +static VALUE +select_bang_ensure(VALUE a) +{ + volatile struct select_bang_arg *arg = (void *)a; + VALUE ary = arg->ary; + long len = RARRAY_LEN(ary); + long i1 = arg->len[0], i2 = arg->len[1]; + + if (i2 < i1) { + if (i1 < len) { + RARRAY_PTR_USE(ary, ptr, { + MEMMOVE(ptr + i2, ptr + i1, VALUE, len - i1); + }); + } + ARY_SET_LEN(ary, len - i1 + i2); + } + return ary; +} + /* * call-seq: * ary.select! {|item| block } -> ary or nil @@ -2836,6 +2896,8 @@ rb_ary_select(VALUE ary) * Invokes the given block passing in successive elements from +self+, * deleting elements for which the block returns a +false+ value. * + * The array may not be changed instantly every time the block is called. + * * If changes were made, it will return +self+, otherwise it returns +nil+. * * See also Array#keep_if @@ -2847,23 +2909,14 @@ rb_ary_select(VALUE ary) static VALUE rb_ary_select_bang(VALUE ary) { - long i1, i2; + struct select_bang_arg args; RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); rb_ary_modify(ary); - for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) { - VALUE v = RARRAY_AREF(ary, i1); - if (!RTEST(rb_yield(v))) continue; - if (i1 != i2) { - rb_ary_store(ary, i2, v); - } - i2++; - } - if (i1 == i2) return Qnil; - if (i2 < i1) - ARY_SET_LEN(ary, i2); - return ary; + args.ary = ary; + args.len[0] = args.len[1] = 0; + return rb_ensure(select_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args); } /* @@ -3064,7 +3117,7 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary) if (len == 0) return rb_ary_new2(0); arg2 = rb_ary_new4(len, RARRAY_CONST_PTR(ary)+pos); RBASIC_SET_CLASS(arg2, rb_obj_class(ary)); - rb_ary_splice(ary, pos, len, Qundef); + rb_ary_splice(ary, pos, len, 0, 0); return arg2; } @@ -3106,23 +3159,32 @@ ary_reject(VALUE orig, VALUE result) } static VALUE -ary_reject_bang(VALUE ary) +reject_bang_i(VALUE a) { - long i; - VALUE result = Qnil; + volatile struct select_bang_arg *arg = (void *)a; + VALUE ary = arg->ary; + long i1, i2; - rb_ary_modify_check(ary); - for (i = 0; i < RARRAY_LEN(ary); ) { - VALUE v = RARRAY_AREF(ary, i); - if (RTEST(rb_yield(v))) { - rb_ary_delete_at(ary, i); - result = ary; - } - else { - i++; + for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) { + VALUE v = RARRAY_AREF(ary, i1); + if (RTEST(rb_yield(v))) continue; + if (i1 != i2) { + rb_ary_store(ary, i2, v); } + arg->len[1] = ++i2; } - return result; + return (i1 == i2) ? Qnil : ary; +} + +static VALUE +ary_reject_bang(VALUE ary) +{ + struct select_bang_arg args; + + rb_ary_modify_check(ary); + args.ary = ary; + args.len[0] = args.len[1] = 0; + return rb_ensure(reject_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args); } /* @@ -3130,11 +3192,10 @@ ary_reject_bang(VALUE ary) * ary.reject! { |item| block } -> ary or nil * ary.reject! -> Enumerator * - * Equivalent to Array#delete_if, deleting elements from +self+ for which the - * block evaluates to +true+, but returns +nil+ if no changes were made. + * Deletes every element of +self+ for which the block evaluates to +true+, + * if no changes were made returns +nil+. * - * The array is changed instantly every time the block is called, not after - * the iteration is over. + * The array may not be changed instantly every time the block is called. * * See also Enumerable#reject and Array#delete_if. * @@ -3154,7 +3215,7 @@ rb_ary_reject_bang(VALUE ary) * ary.reject -> Enumerator * * Returns a new array containing the items in +self+ for which the given - * block is not +true+. + * block is not +true+. The ordering of non-rejected elements is maintained. * * See also Array#delete_if * @@ -3460,12 +3521,10 @@ rb_ary_clear(VALUE ary) static VALUE rb_ary_fill(int argc, VALUE *argv, VALUE ary) { - VALUE item, arg1, arg2; + VALUE item = Qundef, arg1, arg2; long beg = 0, end = 0, len = 0; - int block_p = FALSE; if (rb_block_given_p()) { - block_p = TRUE; rb_scan_args(argc, argv, "02", &arg1, &arg2); argc += 1; /* hackish */ } @@ -3507,7 +3566,7 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary) ARY_SET_LEN(ary, end); } - if (block_p) { + if (item == Qundef) { VALUE v; long i; @@ -3564,31 +3623,58 @@ rb_ary_plus(VALUE x, VALUE y) return z; } +static VALUE +ary_append(VALUE x, VALUE y) +{ + long n = RARRAY_LEN(y); + if (n > 0) { + rb_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR(y), n); + } + return x; +} + /* * call-seq: - * ary.concat(other_ary) -> ary + * ary.concat(other_ary1, other_ary2,...) -> ary * - * Appends the elements of +other_ary+ to +self+. + * Appends the elements of +other_ary+s to +self+. * * [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ] + * [ "a" ].concat( ["b"], ["c", "d"] ) #=> [ "a", "b", "c", "d" ] + * [ "a" ].concat #=> [ "a" ] + * * a = [ 1, 2, 3 ] * a.concat( [ 4, 5 ] ) * a #=> [ 1, 2, 3, 4, 5 ] * + * a = [ 1, 2 ] + * a.concat(a, a) #=> [1, 2, 1, 2, 1, 2] + * * See also Array#+. */ -VALUE -rb_ary_concat(VALUE x, VALUE y) +static VALUE +rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary) { - rb_ary_modify_check(x); - y = to_ary(y); - if (RARRAY_LEN(y) > 0) { - rb_ary_splice(x, RARRAY_LEN(x), 0, y); + rb_ary_modify_check(ary); + + if (argc > 0) { + int i; + VALUE args = rb_ary_tmp_new(argc); + for (i = 0; i < argc; i++) { + rb_ary_concat(args, argv[i]); + } + ary_append(ary, args); } - return x; + + return ary; } +VALUE +rb_ary_concat(VALUE x, VALUE y) +{ + return ary_append(x, to_ary(y)); +} /* * call-seq: @@ -3655,7 +3741,7 @@ rb_ary_times(VALUE ary, VALUE times) /* * call-seq: - * ary.assoc(obj) -> new_ary or nil + * ary.assoc(obj) -> element_ary or nil * * Searches through an array whose elements are also arrays comparing +obj+ * with the first element of each contained array using <code>obj.==</code>. @@ -3690,7 +3776,7 @@ rb_ary_assoc(VALUE ary, VALUE key) /* * call-seq: - * ary.rassoc(obj) -> new_ary or nil + * ary.rassoc(obj) -> element_ary or nil * * Searches through the array whose elements are also arrays. * @@ -3817,7 +3903,7 @@ rb_ary_eql(VALUE ary1, VALUE ary2) /* * call-seq: - * ary.hash -> fixnum + * ary.hash -> integer * * Compute a hash-code for this array. * @@ -3950,9 +4036,7 @@ ary_add_hash(VALUE hash, VALUE ary) for (i=0; i<RARRAY_LEN(ary); i++) { VALUE elt = RARRAY_AREF(ary, i); - if (rb_hash_lookup2(hash, elt, Qundef) == Qundef) { - rb_hash_aset(hash, elt, elt); - } + rb_hash_add_new_element(hash, elt, elt); } return hash; } @@ -3980,9 +4064,7 @@ ary_add_hash_by(VALUE hash, VALUE ary) for (i = 0; i < RARRAY_LEN(ary); ++i) { VALUE v = rb_ary_elt(ary, i), k = rb_yield(v); - if (rb_hash_lookup2(hash, k, Qundef) == Qundef) { - rb_hash_aset(hash, k, v); - } + rb_hash_add_new_element(hash, k, v); } return hash; } @@ -4044,13 +4126,12 @@ rb_ary_diff(VALUE ary1, VALUE ary2) * call-seq: * ary & other_ary -> new_ary * - * Set Intersection --- Returns a new array containing elements common to the - * two arrays, excluding any duplicates. The order is preserved from the - * original array. + * Set Intersection --- Returns a new array containing unique elements common to the + * two arrays. The order is preserved from the original array. * * It compares elements using their #hash and #eql? methods for efficiency. * - * [ 1, 1, 3, 5 ] & [ 1, 2, 3 ] #=> [ 1, 3 ] + * [ 1, 1, 3, 5 ] & [ 3, 2, 1 ] #=> [ 1, 3 ] * [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ] #=> [ 'a', 'b' ] * * See also Array#uniq. @@ -4096,11 +4177,12 @@ ary_hash_orset(st_data_t *key, st_data_t *value, st_data_t arg, int existing) * ary | other_ary -> new_ary * * Set Union --- Returns a new array by joining +ary+ with +other_ary+, - * excluding any duplicates and preserving the order from the original array. + * excluding any duplicates and preserving the order from the given arrays. * * It compares elements using their #hash and #eql? methods for efficiency. * * [ "a", "b", "c" ] | [ "c", "d", "a" ] #=> [ "a", "b", "c", "d" ] + * [ "c", "d", "a" ] | [ "a", "b", "c" ] #=> [ "c", "d", "a", "b" ] * * See also Array#uniq. */ @@ -4125,6 +4207,116 @@ rb_ary_or(VALUE ary1, VALUE ary2) return ary3; } +/* + * call-seq: + * ary.max -> obj + * ary.max { |a, b| block } -> obj + * ary.max(n) -> array + * ary.max(n) { |a, b| block } -> array + * + * Returns the object in _ary_ 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" + * + * If the +n+ argument is given, maximum +n+ elements are returned + * as an array. + * + * a = %w[albatross dog horse] + * a.max(2) #=> ["horse", "dog"] + * a.max(2) {|a, b| a.length <=> b.length } #=> ["albatross", "horse"] + */ +static VALUE +rb_ary_max(int argc, VALUE *argv, VALUE ary) +{ + struct cmp_opt_data cmp_opt = { 0, 0 }; + VALUE result = Qundef, v; + VALUE num; + long i; + + rb_scan_args(argc, argv, "01", &num); + + if (!NIL_P(num)) + return rb_nmin_run(ary, num, 0, 1, 1); + + if (rb_block_given_p()) { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) { + result = v; + } + } + } + else { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) { + result = v; + } + } + } + if (result == Qundef) return Qnil; + return result; +} + +/* + * call-seq: + * ary.min -> obj + * ary.min {| a,b | block } -> obj + * ary.min(n) -> array + * ary.min(n) {| a,b | block } -> array + * + * Returns the object in _ary_ 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" + * + * If the +n+ argument is given, minimum +n+ elements are returned + * as an array. + * + * a = %w[albatross dog horse] + * a.min(2) #=> ["albatross", "dog"] + * a.min(2) {|a, b| a.length <=> b.length } #=> ["dog", "horse"] + */ +static VALUE +rb_ary_min(int argc, VALUE *argv, VALUE ary) +{ + struct cmp_opt_data cmp_opt = { 0, 0 }; + VALUE result = Qundef, v; + VALUE num; + long i; + + rb_scan_args(argc, argv, "01", &num); + + if (!NIL_P(num)) + return rb_nmin_run(ary, num, 0, 0, 1); + + if (rb_block_given_p()) { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) { + result = v; + } + } + } + else { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) { + result = v; + } + } + } + if (result == Qundef) return Qnil; + return result; +} + static int push_value(st_data_t key, st_data_t val, st_data_t ary) { @@ -4144,6 +4336,8 @@ push_value(st_data_t key, st_data_t val, st_data_t ary) * * It compares values using their #hash and #eql? methods for efficiency. * + * +self+ is traversed in order, and the first occurrence is kept. + * * Returns +nil+ if no changes are made (that is, no duplicates are found). * * a = [ "a", "a", "b", "b", "c" ] @@ -4199,6 +4393,8 @@ rb_ary_uniq_bang(VALUE ary) * * It compares values using their #hash and #eql? methods for efficiency. * + * +self+ is traversed in order, and the first occurrence is kept. + * * a = [ "a", "a", "b", "b", "c" ] * a.uniq # => ["a", "b", "c"] * @@ -4350,11 +4546,15 @@ flatten(VALUE ary, int level, int *modified) while (1) { while (i < RARRAY_LEN(ary)) { elt = RARRAY_AREF(ary, i++); + if (level >= 0 && RARRAY_LEN(stack) / 2 >= level) { + rb_ary_push(result, elt); + continue; + } tmp = rb_check_array_type(elt); if (RBASIC(result)->klass) { rb_raise(rb_eRuntimeError, "flatten reentered"); } - if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) { + if (NIL_P(tmp)) { rb_ary_push(result, elt); } else { @@ -4383,7 +4583,7 @@ flatten(VALUE ary, int level, int *modified) st_free_table(memo); - RBASIC_SET_CLASS(result, rb_class_of(ary)); + RBASIC_SET_CLASS(result, rb_obj_class(ary)); return result; } @@ -4766,8 +4966,8 @@ yield_indexed_values(const VALUE values, const long r, const long *const p) /* * Compute permutations of +r+ elements of the set <code>[0..n-1]</code>. * - * When we have a complete permutation of array indexes, copy the values - * at those indexes into a new array and yield that array. + * When we have a complete permutation of array indices, copy the values + * at those indices into a new array and yield that array. * * n: the size of the set * r: the number of elements in each permutation @@ -4901,7 +5101,7 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary) } else { /* this is the general case */ volatile VALUE t0; - long *p = (long*)ALLOCV(t0, r*sizeof(long)+n*sizeof(char)); + long *p = ALLOCV_N(long, t0, r+roomof(n, sizeof(long))); char *used = (char*)(p + r); VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */ RBASIC_CLEAR_CLASS(ary0); @@ -5006,8 +5206,8 @@ rb_ary_combination(VALUE ary, VALUE num) * Compute repeated permutations of +r+ elements of the set * <code>[0..n-1]</code>. * - * When we have a complete repeated permutation of array indexes, copy the - * values at those indexes into a new array and yield that array. + * When we have a complete repeated permutation of array indices, copy the + * values at those indices into a new array and yield that array. * * n: the size of the set * r: the number of elements in each permutation @@ -5341,7 +5541,7 @@ rb_ary_take(VALUE obj, VALUE n) /* * call-seq: - * ary.take_while { |arr| block } -> new_ary + * ary.take_while { |obj| block } -> new_ary * ary.take_while -> Enumerator * * Passes elements to the block until the block returns +nil+ or +false+, then @@ -5400,7 +5600,7 @@ rb_ary_drop(VALUE ary, VALUE n) /* * call-seq: - * ary.drop_while { |arr| block } -> new_ary + * ary.drop_while { |obj| block } -> new_ary * ary.drop_while -> Enumerator * * Drops elements up to, but not including, the first element for which the @@ -5454,6 +5654,184 @@ rb_ary_any_p(VALUE ary) } /* + * call-seq: + * ary.dig(idx, ...) -> object + * + * Extracts the nested value specified by the sequence of <i>idx</i> + * objects by calling +dig+ at each step, returning +nil+ if any + * intermediate step is +nil+. + * + * a = [[1, [2, 3]]] + * + * a.dig(0, 1, 1) #=> 3 + * a.dig(1, 2, 3) #=> nil + * a.dig(0, 0, 0) #=> TypeError: Fixnum does not have #dig method + * [42, {foo: :bar}].dig(1, :foo) #=> :bar + */ + +VALUE +rb_ary_dig(int argc, VALUE *argv, VALUE self) +{ + rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS); + self = rb_ary_at(self, *argv); + if (!--argc) return self; + ++argv; + return rb_obj_dig(argc, argv, self, Qnil); +} + +/* + * call-seq: + * ary.sum(init=0) -> number + * ary.sum(init=0) {|e| expr } -> number + * + * Returns the sum of elements. + * For example, [e1, e2, e3].sum returns init + e1 + e2 + e3. + * + * If a block is given, the block is applied to each element + * before addition. + * + * If <i>ary</i> is empty, it returns <i>init</i>. + * + * [].sum #=> 0 + * [].sum(0.0) #=> 0.0 + * [1, 2, 3].sum #=> 6 + * [3, 5.5].sum #=> 8.5 + * [2.5, 3.0].sum(0.0) {|e| e * e } #=> 15.25 + * [Object.new].sum #=> TypeError + * + * The (arithmetic) mean value of an array can be obtained as follows. + * + * mean = ary.sum(0.0) / ary.length + * + * This method can be used for non-numeric objects by + * explicit <i>init</i> argument. + * + * ["a", "b", "c"].sum("") #=> "abc" + * [[1], [[2]], [3]].sum([]) #=> [1, [2], 3] + * + * However, Array#join and Array#flatten is faster than Array#sum. + * + * ["a", "b", "c"].join #=> "abc" + * [[1], [[2]], [3]].flatten(1) #=> [1, [2], 3] + * + * + * Array#sum method may not respect method redefinition of "+" methods + * such as Fixnum#+. + * + */ + +static VALUE +rb_ary_sum(int argc, VALUE *argv, VALUE ary) +{ + VALUE e, v, r; + long i, n; + int block_given; + + if (rb_scan_args(argc, argv, "01", &v) == 0) + v = LONG2FIX(0); + + block_given = rb_block_given_p(); + + if (RARRAY_LEN(ary) == 0) + return v; + + n = 0; + r = Qundef; + for (i = 0; i < RARRAY_LEN(ary); i++) { + e = RARRAY_AREF(ary, i); + if (block_given) + e = rb_yield(e); + if (FIXNUM_P(e)) { + n += FIX2LONG(e); /* should not overflow long type */ + if (!FIXABLE(n)) { + v = rb_big_plus(LONG2NUM(n), v); + n = 0; + } + } + else if (RB_TYPE_P(e, T_BIGNUM)) + v = rb_big_plus(e, v); + else if (RB_TYPE_P(e, T_RATIONAL)) { + if (r == Qundef) + r = e; + else + r = rb_rational_plus(r, e); + } + else + goto not_exact; + } + if (n != 0) + v = rb_fix_plus(LONG2FIX(n), v); + if (r != Qundef) { + /* r can be a Integer when mathn is loaded */ + if (FIXNUM_P(r)) + v = rb_fix_plus(r, v); + else if (RB_TYPE_P(r, T_BIGNUM)) + v = rb_big_plus(r, v); + else + v = rb_rational_plus(r, v); + } + return v; + + not_exact: + if (n != 0) + v = rb_fix_plus(LONG2FIX(n), v); + if (r != Qundef) { + /* r can be a Integer when mathn is loaded */ + if (FIXNUM_P(r)) + v = rb_fix_plus(r, v); + else if (RB_TYPE_P(r, T_BIGNUM)) + v = rb_big_plus(r, v); + else + v = rb_rational_plus(r, v); + } + + if (RB_FLOAT_TYPE_P(e)) { + /* Kahan's compensated summation algorithm */ + double f, c; + + f = NUM2DBL(v); + c = 0.0; + goto has_float_value; + for (; i < RARRAY_LEN(ary); i++) { + double x, y, t; + e = RARRAY_AREF(ary, i); + if (block_given) + e = rb_yield(e); + if (RB_FLOAT_TYPE_P(e)) + has_float_value: + x = RFLOAT_VALUE(e); + else if (FIXNUM_P(e)) + x = FIX2LONG(e); + else if (RB_TYPE_P(e, T_BIGNUM)) + x = rb_big2dbl(e); + else if (RB_TYPE_P(e, T_RATIONAL)) + x = rb_num2dbl(e); + else + goto not_float; + + y = x - c; + t = f + y; + c = (t - f) - y; + f = t; + } + return DBL2NUM(f); + + not_float: + v = DBL2NUM(f); + } + + goto has_some_value; + for (; i < RARRAY_LEN(ary); i++) { + e = RARRAY_AREF(ary, i); + if (block_given) + e = rb_yield(e); + has_some_value: + v = rb_funcall(v, idPLUS, 1, e); + } + return v; +} + +/* * Arrays are ordered, integer-indexed collections of any object. * * Array indexing starts at 0, as in C or Java. A negative index is assumed @@ -5722,7 +6100,7 @@ Init_Array(void) 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, "concat", rb_ary_concat, 1); + rb_define_method(rb_cArray, "concat", rb_ary_concat_multi, -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_m, -1); @@ -5780,6 +6158,9 @@ Init_Array(void) rb_define_method(rb_cArray, "&", rb_ary_and, 1); rb_define_method(rb_cArray, "|", rb_ary_or, 1); + rb_define_method(rb_cArray, "max", rb_ary_max, -1); + rb_define_method(rb_cArray, "min", rb_ary_min, -1); + rb_define_method(rb_cArray, "uniq", rb_ary_uniq, 0); rb_define_method(rb_cArray, "uniq!", rb_ary_uniq_bang, 0); rb_define_method(rb_cArray, "compact", rb_ary_compact, 0); @@ -5802,7 +6183,10 @@ Init_Array(void) rb_define_method(rb_cArray, "drop", rb_ary_drop, 1); rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0); rb_define_method(rb_cArray, "bsearch", rb_ary_bsearch, 0); + rb_define_method(rb_cArray, "bsearch_index", rb_ary_bsearch_index, 0); rb_define_method(rb_cArray, "any?", rb_ary_any_p, 0); + rb_define_method(rb_cArray, "dig", rb_ary_dig, -1); + rb_define_method(rb_cArray, "sum", rb_ary_sum, -1); id_cmp = rb_intern("<=>"); id_random = rb_intern("random"); diff --git a/basictest/runner.rb b/basictest/runner.rb new file mode 100755 index 0000000000..0330b6d506 --- /dev/null +++ b/basictest/runner.rb @@ -0,0 +1,33 @@ +#! ./miniruby + +exit if defined?(CROSS_COMPILING) and CROSS_COMPILING +ruby = ENV["RUBY"] +unless ruby + load './rbconfig.rb' + ruby = "./#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}" +end +unless File.exist? ruby + print "#{ruby} is not found.\n" + print "Try `make' first, then `make test', please.\n" + exit false +end +ARGV[0] and opt = ARGV[0][/\A--run-opt=(.*)/, 1] and ARGV.shift + +$stderr.reopen($stdout) +error = '' + +srcdir = File.expand_path('..', File.dirname(__FILE__)) +if opt = ENV["RUBYOPT"] + ENV["RUBYOPT"] = opt + " -W1" +end +`#{ruby} #{opt} -W1 #{srcdir}/basictest/test.rb #{ARGV.join(' ')}`.each_line do |line| + if line =~ /^end of test/ + print "\ntest succeeded\n" + exit true + end + error << line if %r:^(basictest/test.rb|not): =~ line +end +puts +print error +print "test failed\n" +exit false diff --git a/basictest/test.rb b/basictest/test.rb new file mode 100755 index 0000000000..8472a0d14a --- /dev/null +++ b/basictest/test.rb @@ -0,0 +1,2367 @@ +#! /usr/bin/env ruby +# -*- coding: us-ascii -*- + +$testnum=0 +$ntest=0 +$failed = 0 +class Progress + def initialize + @color = nil + @tty = nil + @quiet = nil + @verbose = nil + ARGV.each do |arg| + case arg + when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/ + warn "unknown --color argument: #$3" if $3 + @color = $1 ? nil : !$2 + when /\A--tty(=(?:yes|(no)|(.*)))?\z/ + warn "unknown --tty argument: #$3" if $3 + @tty = !$1 || !$2 + true + when /\A-(q|-quiet)\z/ + @quiet = true + when /\A-(v|-verbose)\z/ + @verbose = true + end + end + @tty = STDERR.tty? && !STDOUT.tty? && /dumb/ !~ ENV["TERM"] if @tty.nil? + @eol = @tty && !@verbose ? "\r\e[K\r" : "\n" + case @color + when nil + @color = @tty + end + if @color + # dircolors-like style + colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {} + begin + File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c| + colors[n] ||= c + end + rescue + end + @passed = "\e[;#{colors["pass"] || "32"}m" + @failed = "\e[;#{colors["fail"] || "31"}m" + @reset = "\e[m" + else + @passed = @failed = @reset = "" + end + extend(Rotator) if @tty + end + + def passed_string + "." + end + def failed_string + "#{@failed}F#{@reset}" + end + def init_string + end + def finish_string + if @quiet + @eol + else + "#{@passed}#{@ok ? 'OK' : ''} #{$testnum}#{@reset}#{@eol}" + end + end + def pass + STDERR.print passed_string + end + def fail + @ok = false + STDERR.print failed_string + end + def init + @ok = true + STDERR.print init_string + end + def finish + STDERR.print finish_string + end + + module Rotator + ROTATOR = %w[- \\ | /] + BS = "\b" * ROTATOR[0].size + def passed_string + "#{BS}#{ROTATOR[(@count += 1) % ROTATOR.size]}" + end + def failed_string + "#{BS}#{super}#{ROTATOR[@count % ROTATOR.size]}" + end + def init_string + @count = 0 + " " + end + def finish_string + s = "#{BS}#{' ' * BS.size}#{BS}#{super}" + s.gsub!(/\n/, "\r\e[2K\r") if @quiet + s + end + end +end +PROGRESS = Progress.new + +def test_check(what) + unless $ntest.zero? + PROGRESS.finish + end + STDERR.print "#{$0}:#{what} " + PROGRESS.init + $what = what + $testnum = 0 +end + +def test_ok(cond,n=1) + $testnum+=1 + $ntest+=1 + where = (st = caller(n)) ? st[0] : "caller error! (n=#{n}, trace=#{caller(0).join(', ')}" + if cond + PROGRESS.pass + printf "ok %d (%s)\n", $testnum, where + else + PROGRESS.fail + printf "not ok %s %d -- %s\n", $what, $testnum, where + $failed+=1 + end + STDOUT.flush + STDERR.flush +end + +# make sure conditional operators work + +test_check "assignment" + +a=[]; a[0] ||= "bar"; +test_ok(a[0] == "bar") +h={}; h["foo"] ||= "bar"; +test_ok(h["foo"] == "bar") + +aa = 5 +aa ||= 25 +test_ok(aa == 5) +bb ||= 25 +test_ok(bb == 25) +cc &&=33 +test_ok(cc == nil) +cc = 5 +cc &&=44 +test_ok(cc == 44) + +a = nil; test_ok(a == nil) +a = 1; test_ok(a == 1) +a = []; test_ok(a == []) +a = [1]; test_ok(a == [1]) +a = [nil]; test_ok(a == [nil]) +a = [[]]; test_ok(a == [[]]) +a = [1,2]; test_ok(a == [1,2]) +a = [*[]]; test_ok(a == []) +a = [*[1]]; test_ok(a == [1]) +a = [*[1,2]]; test_ok(a == [1,2]) + +a = *[]; test_ok(a == []) +a = *[1]; test_ok(a == [1]) +a = *[nil]; test_ok(a == [nil]) +a = *[[]]; test_ok(a == [[]]) +a = *[1,2]; test_ok(a == [1,2]) +a = *[*[]]; test_ok(a == []) +a = *[*[1]]; test_ok(a == [1]) +a = *[*[1,2]]; test_ok(a == [1,2]) + +a, = nil; test_ok(a == nil) +a, = 1; test_ok(a == 1) +a, = []; test_ok(a == nil) +a, = [1]; test_ok(a == 1) +a, = [nil]; test_ok(a == nil) +a, = [[]]; test_ok(a == []) +a, = 1,2; test_ok(a == 1) +a, = [1,2]; test_ok(a == 1) +a, = [*[]]; test_ok(a == nil) +a, = [*[1]]; test_ok(a == 1) +a, = *[1,2]; test_ok(a == 1) +a, = [*[1,2]]; test_ok(a == 1) + +a, = *[]; test_ok(a == nil) +a, = *[1]; test_ok(a == 1) +a, = *[nil]; test_ok(a == nil) +a, = *[[]]; test_ok(a == []) +a, = *[1,2]; test_ok(a == 1) +a, = *[*[]]; test_ok(a == nil) +a, = *[*[1]]; test_ok(a == 1) +a, = *[*[1,2]]; test_ok(a == 1) + +*a = nil; test_ok(a == [nil]) +*a = 1; test_ok(a == [1]) +*a = []; test_ok(a == []) +*a = [1]; test_ok(a == [1]) +*a = [nil]; test_ok(a == [nil]) +*a = [[]]; test_ok(a == [[]]) +*a = [1,2]; test_ok(a == [1,2]) +*a = [*[]]; test_ok(a == []) +*a = [*[1]]; test_ok(a == [1]) +*a = [*[1,2]]; test_ok(a == [1,2]) + +*a = *[]; test_ok(a == []) +*a = *[1]; test_ok(a == [1]) +*a = *[nil]; test_ok(a == [nil]) +*a = *[[]]; test_ok(a == [[]]) +*a = *[1,2]; test_ok(a == [1,2]) +*a = *[*[]]; test_ok(a == []) +*a = *[*[1]]; test_ok(a == [1]) +*a = *[*[1,2]]; test_ok(a == [1,2]) + +a,b,*c = nil; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = 1; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = []; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = [1]; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = [nil]; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = [[]]; test_ok([a,b,c] == [[],nil,[]]) +a,b,*c = [1,2]; test_ok([a,b,c] == [1,2,[]]) +a,b,*c = [*[]]; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = [*[1]]; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = [*[1,2]]; test_ok([a,b,c] == [1,2,[]]) + +a,b,*c = *[]; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = *[1]; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = *[nil]; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = *[[]]; test_ok([a,b,c] == [[],nil,[]]) +a,b,*c = *[1,2]; test_ok([a,b,c] == [1,2,[]]) +a,b,*c = *[*[]]; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = *[*[1]]; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = *[*[1,2]]; test_ok([a,b,c] == [1,2,[]]) + +def f; yield nil; end; f {|a| test_ok(a == nil)} +def f; yield 1; end; f {|a| test_ok(a == 1)} +def f; yield []; end; f {|a| test_ok(a == [])} +def f; yield [1]; end; f {|a| test_ok(a == [1])} +def f; yield [nil]; end; f {|a| test_ok(a == [nil])} +def f; yield [[]]; end; f {|a| test_ok(a == [[]])} +def f; yield [*[]]; end; f {|a| test_ok(a == [])} +def f; yield [*[1]]; end; f {|a| test_ok(a == [1])} +def f; yield [*[1,2]]; end; f {|a| test_ok(a == [1,2])} +def f; yield *[]; end; f {|a| test_ok(a == nil)} +def f; yield *[1]; end; f {|a| test_ok(a == 1)} +def f; yield *[nil]; end; f {|a| test_ok(a == nil)} +def f; yield *[[]]; end; f {|a| test_ok(a == [])} +def f; yield *[*[]]; end; f {|a| test_ok(a == nil)} +def f; yield *[*[1]]; end; f {|a| test_ok(a == 1)} +def f; yield *[*[1,2]]; end; f {|a| test_ok(a == 1)} + +def f; yield; end; f {|a,| test_ok(a == nil)} +def f; yield nil; end; f {|a,| test_ok(a == nil)} +def f; yield 1; end; f {|a,| test_ok(a == 1)} +def f; yield []; end; f {|a,| test_ok(a == nil)} +def f; yield [1]; end; f {|a,| test_ok(a == 1)} +def f; yield [nil]; end; f {|a,| test_ok(a == nil)} +def f; yield [[]]; end; f {|a,| test_ok(a == [])} +def f; yield [*[]]; end; f {|a,| test_ok(a == nil)} +def f; yield [*[1]]; end; f {|a,| test_ok(a == 1)} +def f; yield [*[1,2]]; end; f {|a,| test_ok(a == 1)} + +def f; yield *[]; end; f {|a,| test_ok(a == nil)} +def f; yield *[1]; end; f {|a,| test_ok(a == 1)} +def f; yield *[nil]; end; f {|a,| test_ok(a == nil)} +def f; yield *[[]]; end; f {|a,| test_ok(a == nil)} +def f; yield *[*[]]; end; f {|a,| test_ok(a == nil)} +def f; yield *[*[1]]; end; f {|a,| test_ok(a == 1)} +def f; yield *[*[1,2]]; end; f {|a,| test_ok(a == 1)} + +def f; yield; end; f {|*a| test_ok(a == [])} +def f; yield nil; end; f {|*a| test_ok(a == [nil])} +def f; yield 1; end; f {|*a| test_ok(a == [1])} +def f; yield []; end; f {|*a| test_ok(a == [[]])} +def f; yield [1]; end; f {|*a| test_ok(a == [[1]])} +def f; yield [nil]; end; f {|*a| test_ok(a == [[nil]])} +def f; yield [[]]; end; f {|*a| test_ok(a == [[[]]])} +def f; yield [1,2]; end; f {|*a| test_ok(a == [[1,2]])} +def f; yield [*[]]; end; f {|*a| test_ok(a == [[]])} +def f; yield [*[1]]; end; f {|*a| test_ok(a == [[1]])} +def f; yield [*[1,2]]; end; f {|*a| test_ok(a == [[1,2]])} + +def f; yield *[]; end; f {|*a| test_ok(a == [])} +def f; yield *[1]; end; f {|*a| test_ok(a == [1])} +def f; yield *[nil]; end; f {|*a| test_ok(a == [nil])} +def f; yield *[[]]; end; f {|*a| test_ok(a == [[]])} +def f; yield *[*[]]; end; f {|*a| test_ok(a == [])} +def f; yield *[*[1]]; end; f {|*a| test_ok(a == [1])} +def f; yield *[*[1,2]]; end; f {|*a| test_ok(a == [1,2])} + +def f; yield; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield 1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} +def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} +def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])} +def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} +def f; yield [*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])} + +def f; yield *[]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield *[1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} +def f; yield *[nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield *[*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])} +def f; yield *[*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])} +def f; yield *[*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])} + +def r; return; end; a = r(); test_ok(a == nil) +def r; return nil; end; a = r(); test_ok(a == nil) +def r; return 1; end; a = r(); test_ok(a == 1) +def r; return []; end; a = r(); test_ok(a == []) +def r; return [1]; end; a = r(); test_ok(a == [1]) +def r; return [nil]; end; a = r(); test_ok(a == [nil]) +def r; return [[]]; end; a = r(); test_ok(a == [[]]) +def r; return [*[]]; end; a = r(); test_ok(a == []) +def r; return [*[1]]; end; a = r(); test_ok(a == [1]) +def r; return [*[1,2]]; end; a = r(); test_ok(a == [1,2]) + +def r; return *[]; end; a = r(); test_ok(a == []) +def r; return *[1]; end; a = r(); test_ok(a == [1]) +def r; return *[nil]; end; a = r(); test_ok(a == [nil]) +def r; return *[[]]; end; a = r(); test_ok(a == [[]]) +def r; return *[*[]]; end; a = r(); test_ok(a == []) +def r; return *[*[1]]; end; a = r(); test_ok(a == [1]) +def r; return *[*[1,2]]; end; a = r(); test_ok(a == [1,2]) + +def r; return *[[]]; end; a = *r(); test_ok(a == [[]]) +def r; return *[*[1,2]]; end; a = *r(); test_ok(a == [1,2]) + +def r; return; end; *a = r(); test_ok(a == [nil]) +def r; return nil; end; *a = r(); test_ok(a == [nil]) +def r; return 1; end; *a = r(); test_ok(a == [1]) +def r; return []; end; *a = r(); test_ok(a == []) +def r; return [1]; end; *a = r(); test_ok(a == [1]) +def r; return [nil]; end; *a = r(); test_ok(a == [nil]) +def r; return [[]]; end; *a = r(); test_ok(a == [[]]) +def r; return [1,2]; end; *a = r(); test_ok(a == [1,2]) +def r; return [*[]]; end; *a = r(); test_ok(a == []) +def r; return [*[1]]; end; *a = r(); test_ok(a == [1]) +def r; return [*[1,2]]; end; *a = r(); test_ok(a == [1,2]) + +def r; return *[]; end; *a = r(); test_ok(a == []) +def r; return *[1]; end; *a = r(); test_ok(a == [1]) +def r; return *[nil]; end; *a = r(); test_ok(a == [nil]) +def r; return *[[]]; end; *a = r(); test_ok(a == [[]]) +def r; return *[1,2]; end; *a = r(); test_ok(a == [1,2]) +def r; return *[*[]]; end; *a = r(); test_ok(a == []) +def r; return *[*[1]]; end; *a = r(); test_ok(a == [1]) +def r; return *[*[1,2]]; end; *a = r(); test_ok(a == [1,2]) + +def r; return *[[]]; end; *a = *r(); test_ok(a == [[]]) +def r; return *[1,2]; end; *a = *r(); test_ok(a == [1,2]) +def r; return *[*[1,2]]; end; *a = *r(); test_ok(a == [1,2]) + +def r; return; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return nil; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return 1; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]]) +def r; return []; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return [1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]]) +def r; return [nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return [[]]; end; a,b,*c = r(); test_ok([a,b,c] == [[],nil,[]]) +def r; return [1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]]) +def r; return [*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return [*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]]) +def r; return [*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]]) + +def r; return *[]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return *[1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]]) +def r; return *[nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return *[[]]; end; a,b,*c = r(); test_ok([a,b,c] == [[],nil,[]]) +def r; return *[1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]]) +def r; return *[*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]]) +def r; return *[*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]]) +def r; return *[*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]]) + +f = lambda {|r,| test_ok([] == r)} +f.call([], *[]) + +f = lambda {|r,*l| test_ok([] == r); test_ok([1] == l)} +f.call([], *[1]) + +f = lambda{|x| x} +test_ok(f.call(42) == 42) +test_ok(f.call([42]) == [42]) +test_ok(f.call([[42]]) == [[42]]) +test_ok(f.call([42,55]) == [42,55]) + +f = lambda{|x,| x} +test_ok(f.call(42) == 42) +test_ok(f.call([42]) == [42]) +test_ok(f.call([[42]]) == [[42]]) +test_ok(f.call([42,55]) == [42,55]) + +f = lambda{|*x| x} +test_ok(f.call(42) == [42]) +test_ok(f.call([42]) == [[42]]) +test_ok(f.call([[42]]) == [[[42]]]) +test_ok(f.call([42,55]) == [[42,55]]) +test_ok(f.call(42,55) == [42,55]) + +f = lambda { |a, b=42, *c| [a,b,c] } +test_ok(f.call(1 ) == [1,42,[ ]] ) +test_ok(f.call(1,43 ) == [1,43,[ ]] ) +test_ok(f.call(1,43,44) == [1,43,[44]] ) + +f = lambda { |a, b=(a|16), *c, &block| [a,b,c,block&&block[]] } +test_ok(f.call(8 ) == [8,24,[ ],nil] ) +test_ok(f.call(8,43 ) == [8,43,[ ],nil] ) +test_ok(f.call(8,43,44) == [8,43,[44],nil] ) +test_ok(f.call(8 ){45} == [8,24,[ ],45 ] ) +test_ok(f.call(8,43 ){45} == [8,43,[ ],45 ] ) +test_ok(f.call(8,43,44){45} == [8,43,[44],45 ] ) + +f = lambda { |a, b=42, *c, d| [a,b,c,d] } +test_ok(f.call(1 ,99) == [1,42,[ ],99] ) +test_ok(f.call(1,43 ,99) == [1,43,[ ],99] ) +test_ok(f.call(1,43,44,99) == [1,43,[44],99] ) + +f = lambda { |a, b=(a|16), &block| [a,b,block&&block[]] } +test_ok(f.call(8 ) == [8,24,nil] ) +test_ok(f.call(8,43) == [8,43,nil] ) +test_ok(f.call(8,43) == [8,43,nil] ) +test_ok(f.call(8 ){45} == [8,24,45 ] ) +test_ok(f.call(8,43){45} == [8,43,45 ] ) +test_ok(f.call(8,43){45} == [8,43,45 ] ) + +f = lambda { |a, b=42, d| [a,b,d] } +test_ok(f.call(1 ,99) == [1,42,99] ) +test_ok(f.call(1,43,99) == [1,43,99] ) +test_ok(f.call(1,43,99) == [1,43,99] ) + +f = lambda { |b=42, *c, &block| [b,c,block&&block[]] } +test_ok(f.call( ) == [42,[ ],nil] ) +test_ok(f.call(43 ) == [43,[ ],nil] ) +test_ok(f.call(43,44) == [43,[44],nil] ) +test_ok(f.call( ){45} == [42,[ ],45 ] ) +test_ok(f.call(43 ){45} == [43,[ ],45 ] ) +test_ok(f.call(43,44){45} == [43,[44],45 ] ) + +f = lambda { |b=42, *c, d| [b,c,d] } +test_ok(f.call( 99) == [42,[ ],99] ) +test_ok(f.call(43 ,99) == [43,[ ],99] ) +test_ok(f.call(43,44,99) == [43,[44],99] ) + +f = lambda { |b=42, &block| [b,block&&block[]] } +test_ok(f.call( ) == [42,nil] ) +test_ok(f.call(43) == [43,nil] ) +test_ok(f.call(43) == [43,nil] ) +test_ok(f.call( ){45} == [42,45 ] ) +test_ok(f.call(43){45} == [43,45 ] ) +test_ok(f.call(43){45} == [43,45 ] ) + +f = lambda { |b=42, d| [b,d] } +test_ok(f.call( 99) == [42,99] ) +test_ok(f.call(43,99) == [43,99] ) +test_ok(f.call(43,99) == [43,99] ) + + +a,=*[1] +test_ok(a == 1) +a,=*[[1]] +test_ok(a == [1]) +a,=*[[[1]]] +test_ok(a == [[1]]) + +x, (y, z) = 1, 2, 3 +test_ok([1,2,nil] == [x,y,z]) +x, (y, z) = 1, [2,3] +test_ok([1,2,3] == [x,y,z]) +x, (y, z) = 1, [2] +test_ok([1,2,nil] == [x,y,z]) + +a = loop do break; end; test_ok(a == nil) +a = loop do break nil; end; test_ok(a == nil) +a = loop do break 1; end; test_ok(a == 1) +a = loop do break []; end; test_ok(a == []) +a = loop do break [1]; end; test_ok(a == [1]) +a = loop do break [nil]; end; test_ok(a == [nil]) +a = loop do break [[]]; end; test_ok(a == [[]]) +a = loop do break [*[]]; end; test_ok(a == []) +a = loop do break [*[1]]; end; test_ok(a == [1]) +a = loop do break [*[1,2]]; end; test_ok(a == [1,2]) + +a = loop do break *[]; end; test_ok(a == []) +a = loop do break *[1]; end; test_ok(a == [1]) +a = loop do break *[nil]; end; test_ok(a == [nil]) +a = loop do break *[[]]; end; test_ok(a == [[]]) +a = loop do break *[*[]]; end; test_ok(a == []) +a = loop do break *[*[1]]; end; test_ok(a == [1]) +a = loop do break *[*[1,2]]; end; test_ok(a == [1,2]) + +*a = loop do break; end; test_ok(a == [nil]) +*a = loop do break nil; end; test_ok(a == [nil]) +*a = loop do break 1; end; test_ok(a == [1]) +*a = loop do break []; end; test_ok(a == []) +*a = loop do break [1]; end; test_ok(a == [1]) +*a = loop do break [nil]; end; test_ok(a == [nil]) +*a = loop do break [[]]; end; test_ok(a == [[]]) +*a = loop do break [1,2]; end; test_ok(a == [1,2]) +*a = loop do break [*[]]; end; test_ok(a == []) +*a = loop do break [*[1]]; end; test_ok(a == [1]) +*a = loop do break [*[1,2]]; end; test_ok(a == [1,2]) + +*a = loop do break *[]; end; test_ok(a == []) +*a = loop do break *[1]; end; test_ok(a == [1]) +*a = loop do break *[nil]; end; test_ok(a == [nil]) +*a = loop do break *[[]]; end; test_ok(a == [[]]) +*a = loop do break *[1,2]; end; test_ok(a == [1,2]) +*a = loop do break *[*[]]; end; test_ok(a == []) +*a = loop do break *[*[1]]; end; test_ok(a == [1]) +*a = loop do break *[*[1,2]]; end; test_ok(a == [1,2]) + +*a = *loop do break *[[]]; end; test_ok(a == [[]]) +*a = *loop do break *[1,2]; end; test_ok(a == [1,2]) +*a = *loop do break *[*[1,2]]; end; test_ok(a == [1,2]) + +a,b,*c = loop do break; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break nil; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break 1; end; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = loop do break []; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break [1]; end; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = loop do break [nil]; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break [[]]; end; test_ok([a,b,c] == [[],nil,[]]) +a,b,*c = loop do break [1,2]; end; test_ok([a,b,c] == [1,2,[]]) +a,b,*c = loop do break [*[]]; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break [*[1]]; end; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = loop do break [*[1,2]]; end; test_ok([a,b,c] == [1,2,[]]) + +a,b,*c = loop do break *[]; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break *[1]; end; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = loop do break *[nil]; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break *[[]]; end; test_ok([a,b,c] == [[],nil,[]]) +a,b,*c = loop do break *[1,2]; end; test_ok([a,b,c] == [1,2,[]]) +a,b,*c = loop do break *[*[]]; end; test_ok([a,b,c] == [nil,nil,[]]) +a,b,*c = loop do break *[*[1]]; end; test_ok([a,b,c] == [1,nil,[]]) +a,b,*c = loop do break *[*[1,2]]; end; test_ok([a,b,c] == [1,2,[]]) + +def r(val); a = yield(); test_ok(a == val, 2); end +r(nil){next} +r(nil){next nil} +r(1){next 1} +r([]){next []} +r([1]){next [1]} +r([nil]){next [nil]} +r([[]]){next [[]]} +r([]){next [*[]]} +r([1]){next [*[1]]} +r([1,2]){next [*[1,2]]} + +r([]){next *[]} +r([1]){next *[1]} +r([nil]){next *[nil]} +r([[]]){next *[[]]} +r([]){next *[*[]]} +r([1]){next *[*[1]]} +r([1,2]){next *[*[1,2]]} + +def r(val); *a = yield(); test_ok(a == val, 2); end +r([nil]){next} +r([nil]){next nil} +r([1]){next 1} +r([]){next []} +r([1]){next [1]} +r([nil]){next [nil]} +r([[]]){next [[]]} +r([1,2]){next [1,2]} +r([]){next [*[]]} +r([1]){next [*[1]]} +r([1,2]){next [*[1,2]]} + +def r(val); *a = *yield(); test_ok(a == val, 2); end +r([[]]){next *[[]]} +r([1,2]){next *[1,2]} +r([1,2]){next *[*[1,2]]} + +def r(val); a,b,*c = yield(); test_ok([a,b,c] == val, 2); end +r([nil,nil,[]]){next} +r([nil,nil,[]]){next nil} +r([1,nil,[]]){next 1} +r([nil,nil,[]]){next []} +r([1,nil,[]]){next [1]} +r([nil,nil,[]]){next [nil]} +r([[],nil,[]]){next [[]]} +r([1,2,[]]){next [1,2]} +r([nil,nil,[]]){next [*[]]} +r([1,nil,[]]){next [*[1]]} +r([1,2,[]]){next [*[1,2]]} + +def r(val); a,b,*c = *yield(); test_ok([a,b,c] == val, 2); end +r([[],nil,[]]){next *[[]]} +r([1,2,[]]){next *[1,2]} +r([1,2,[]]){next *[*[1,2]]} + +test_check "condition" + +$x = '0'; + +$x == $x && test_ok(true) +$x != $x && test_ok(false) +$x == $x || test_ok(false) +$x != $x || test_ok(true) + +# first test to see if we can run the tests. + +test_check "if/unless"; + +$x = 'test'; +test_ok(if $x == $x then true else false end) +$bad = false +unless $x == $x + $bad = true +end +test_ok(!$bad) +test_ok(unless $x != $x then true else false end) + +test_check "case" + +case 5 +when 1, 2, 3, 4, 6, 7, 8 + test_ok(false) +when 5 + test_ok(true) +end + +case 5 +when 5 + test_ok(true) +when 1..10 + test_ok(false) +end + +case 5 +when 1..10 + test_ok(true) +else + test_ok(false) +end + +case 5 +when 5 + test_ok(true) +else + test_ok(false) +end + +case "foobar" +when /^f.*r$/ + test_ok(true) +else + test_ok(false) +end + +test_check "while/until"; + +while_tmp = "while_tmp.#{$$}" +tmp = open(while_tmp, "w") +tmp.print "tvi925\n"; +tmp.print "tvi920\n"; +tmp.print "vt100\n"; +tmp.print "Amiga\n"; +tmp.print "paper\n"; +tmp.close + +# test break + +tmp = open(while_tmp, "r") +test_ok(tmp.kind_of?(File)) + +while line = tmp.gets() + break if /vt100/ =~ line +end + +test_ok(!tmp.eof? && /vt100/ =~ line) +tmp.close + +# test next +$bad = false +tmp = open(while_tmp, "r") +while line = tmp.gets() + next if /vt100/ =~ line + $bad = 1 if /vt100/ =~ line +end +test_ok(!(!tmp.eof? || /vt100/ =~ line || $bad)) +tmp.close + +# test redo +$bad = false +tmp = open(while_tmp, "r") +while line = tmp.gets() + lastline = line + line = line.gsub(/vt100/, 'VT100') + if lastline != line + line.gsub!('VT100', 'Vt100') + redo + end + $bad = 1 if /vt100/ =~ line + $bad = 1 if /VT100/ =~ line +end +test_ok(tmp.eof? && !$bad) +tmp.close + +sum=0 +for i in 1..10 + sum += i + i -= 1 + if i > 0 + redo + end +end +test_ok(sum == 220) + +# test interval +$bad = false +tmp = open(while_tmp, "r") +while line = tmp.gets() + break if 3 + case line + when /vt100/, /Amiga/, /paper/ + $bad = true + end +end +test_ok(!$bad) +tmp.close + +File.unlink while_tmp or `/bin/rm -f "#{while_tmp}"` +test_ok(!File.exist?(while_tmp)) + +i = 0 +until i>4 + i+=1 +end +test_ok(i>4) + + +# exception handling +test_check "exception"; + +begin + raise "this must be handled" + test_ok(false) +rescue + test_ok(true) +end + +$bad = true +begin + raise "this must be handled no.2" +rescue + if $bad + $bad = false + retry + test_ok(false) + end +end +test_ok(true) + +# exception in rescue clause +$string = "this must be handled no.3" +begin + begin + raise "exception in rescue clause" + rescue + raise $string + end + test_ok(false) +rescue => e + test_ok($! == e) + test_ok(e.message == $string) + test_ok(e != $string) +end + +# exception in ensure clause +begin + begin + raise "this must be handled no.4" + ensure + raise "exception in ensure clause" + end + test_ok(false) +rescue + test_ok(true) +end + +$bad = true +begin + begin + raise "this must be handled no.5" + ensure + $bad = false + end +rescue +end +test_ok(!$bad) + +$bad = true +begin + begin + raise "this must be handled no.6" + ensure + $bad = false + end +rescue +end +test_ok(!$bad) + +$bad = true +while true + begin + break + ensure + $bad = false + end +end +test_ok(!$bad) + +test_ok(catch(:foo) { + loop do + loop do + throw :foo, true + break + end + break + test_ok(false) # should not reach here + end + false + }) + +test_check "array" +test_ok([1, 2] + [3, 4] == [1, 2, 3, 4]) +test_ok([1, 2] * 2 == [1, 2, 1, 2]) +test_ok([1, 2] * ":" == "1:2") + +test_ok([1, 2].hash == [1, 2].hash) + +test_ok([1,2,3] & [2,3,4] == [2,3]) +test_ok([1,2,3] | [2,3,4] == [1,2,3,4]) +test_ok([1,2,3] - [2,3] == [1]) + +$x = [0, 1, 2, 3, 4, 5] +test_ok($x[2] == 2) +test_ok($x[1..3] == [1, 2, 3]) +test_ok($x[1,3] == [1, 2, 3]) + +$x[0, 2] = 10 +test_ok($x[0] == 10 && $x[1] == 2) + +$x[0, 0] = -1 +test_ok($x[0] == -1 && $x[1] == 10) + +$x[-1, 1] = 20 +test_ok($x[-1] == 20 && $x.pop == 20) + +# array and/or +test_ok(([1,2,3]&[2,4,6]) == [2]) +test_ok(([1,2,3]|[2,4,6]) == [1,2,3,4,6]) + +# compact +$x = [nil, 1, nil, nil, 5, nil, nil] +$x.compact! +test_ok($x == [1, 5]) + +# uniq +$x = [1, 1, 4, 2, 5, 4, 5, 1, 2] +$x.uniq! +test_ok($x == [1, 4, 2, 5]) + +# empty? +test_ok(!$x.empty?) +$x = [] +test_ok($x.empty?) + +# sort +$x = ["it", "came", "to", "pass", "that", "..."] +$x = $x.sort.join(" ") +test_ok($x == "... came it pass that to") +$x = [2,5,3,1,7] +$x.sort!{|a,b| a<=>b} # sort with condition +test_ok($x == [1,2,3,5,7]) +$x.sort!{|a,b| b-a} # reverse sort +test_ok($x == [7,5,3,2,1]) + +# split test +$x = "The Book of Mormon" +test_ok($x.split(//).reverse!.join == $x.reverse) +test_ok($x.reverse == $x.reverse!) +test_ok("1 byte string".split(//).reverse.join(":") == "g:n:i:r:t:s: :e:t:y:b: :1") +$x = "a b c d" +test_ok($x.split == ['a', 'b', 'c', 'd']) +test_ok($x.split(' ') == ['a', 'b', 'c', 'd']) +test_ok(defined? "a".chomp) +test_ok("abc".scan(/./) == ["a", "b", "c"]) +test_ok("1a2b3c".scan(/(\d.)/) == [["1a"], ["2b"], ["3c"]]) +# non-greedy match +test_ok("a=12;b=22".scan(/(.*?)=(\d*);?/) == [["a", "12"], ["b", "22"]]) + +$x = [1] +test_ok(($x * 5).join(":") == '1:1:1:1:1') +test_ok(($x * 1).join(":") == '1') +test_ok(($x * 0).join(":") == '') + +*$x = *(1..7).to_a +test_ok($x.size == 7) +test_ok($x == [1, 2, 3, 4, 5, 6, 7]) + +$x = [1,2,3] +$x[1,0] = $x +test_ok($x == [1,1,2,3,2,3]) + +$x = [1,2,3] +$x[-1,0] = $x +test_ok($x == [1,2,1,2,3,3]) + +$x = [1,2,3] +$x.concat($x) +test_ok($x == [1,2,3,1,2,3]) + +test_check "hash" +$x = {1=>2, 2=>4, 3=>6} + +test_ok($x[1] == 2) + +test_ok(begin + for k,v in $x + raise if k*2 != v + end + true + rescue + false + end) + +test_ok($x.length == 3) +test_ok($x.has_key?(1)) +test_ok($x.has_value?(4)) +test_ok($x.values_at(2,3) == [4,6]) +test_ok($x == {1=>2, 2=>4, 3=>6}) + +$z = $x.keys.sort.join(":") +test_ok($z == "1:2:3") + +$z = $x.values.sort.join(":") +test_ok($z == "2:4:6") +test_ok($x == $x) + +$x.shift +test_ok($x.length == 2) + +$z = [1,2] +$x[$z] = 256 +test_ok($x[$z] == 256) + +$x = Hash.new(0) +$x[1] = 1 +test_ok($x[1] == 1) +test_ok($x[2] == 0) + +$x = Hash.new([]) +test_ok($x[22] == []) +test_ok($x[22].equal?($x[22])) + +$x = Hash.new{[]} +test_ok($x[22] == []) +test_ok(!$x[22].equal?($x[22])) + +$x = Hash.new{|h,k| $z = k; h[k] = k*2} +$z = 0 +test_ok($x[22] == 44) +test_ok($z == 22) +$z = 0 +test_ok($x[22] == 44) +test_ok($z == 0) +$x.default = 5 +test_ok($x[23] == 5) + +$x = Hash.new +def $x.default(k) + $z = k + self[k] = k*2 +end +$z = 0 +test_ok($x[22] == 44) +test_ok($z == 22) +$z = 0 +test_ok($x[22] == 44) +test_ok($z == 0) + +test_check "iterator" + +test_ok(!iterator?) + +def ttt + test_ok(iterator?) +end +ttt{} + +# yield at top level +test_ok(!defined?(yield)) + +$x = [1, 2, 3, 4] +$y = [] + +# iterator over array +for i in $x + $y.push i +end +test_ok($x == $y) + +# nested iterator +def tt + 1.upto(10) {|i| + yield i + } +end + +i=0 +tt{|i| break if i == 5} +test_ok(i == 0) + +def tt2(dummy) + yield 1 +end + +def tt3(&block) + tt2(raise(ArgumentError,""),&block) +end + +$x = false +begin + tt3{} +rescue ArgumentError + $x = true +rescue Exception +end +test_ok($x) + +def tt4 &block + tt2(raise(ArgumentError,""),&block) +end +$x = false +begin + tt4{} +rescue ArgumentError + $x = true +rescue Exception +end +test_ok($x) + +# iterator break/redo/next/retry +done = true +loop{ + break + done = false # should not reach here +} +test_ok(done) + +done = false +$bad = false +loop { + break if done + done = true + next + $bad = true # should not reach here +} +test_ok(!$bad) + +done = false +$bad = false +loop { + break if done + done = true + redo + $bad = true # should not reach here +} +test_ok(!$bad) + +$x = [] +for i in 1 .. 7 + $x.push i +end +test_ok($x.size == 7) +test_ok($x == [1, 2, 3, 4, 5, 6, 7]) + +# append method to built-in class +class Array + def iter_test1 + collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]} + end + def iter_test2 + a = collect{|e| [e, yield(e)]} + a.sort{|a,b|a[1]<=>b[1]} + end +end +$x = [[1,2],[3,4],[5,6]] +test_ok($x.iter_test1{|x|x} == $x.iter_test2{|x|x}) + +class IterTest + def initialize(e); @body = e; end + + def each0(&block); @body.each(&block); end + def each1(&block); @body.each {|*x| block.call(*x) } end + def each2(&block); @body.each {|*x| block.call(x) } end + def each3(&block); @body.each {|x| block.call(*x) } end + def each4(&block); @body.each {|x| block.call(x) } end + def each5; @body.each {|*x| yield(*x) } end + def each6; @body.each {|*x| yield(x) } end + def each7; @body.each {|x| yield(*x) } end + def each8; @body.each {|x| yield(x) } end + + def f(a) + a + end +end +test_ok(IterTest.new(nil).method(:f).to_proc.call([1]) == [1]) +m = /\w+/.match("abc") +test_ok(IterTest.new(nil).method(:f).to_proc.call([m]) == [m]) + +IterTest.new([0]).each0 {|x| test_ok(x == 0)} +IterTest.new([1]).each1 {|x| test_ok(x == 1)} +IterTest.new([2]).each2 {|x| test_ok(x == [2])} +#IterTest.new([3]).each3 {|x| test_ok(x == 3)} +IterTest.new([4]).each4 {|x| test_ok(x == 4)} +IterTest.new([5]).each5 {|x| test_ok(x == 5)} +IterTest.new([6]).each6 {|x| test_ok(x == [6])} +#IterTest.new([7]).each7 {|x| test_ok(x == 7)} +IterTest.new([8]).each8 {|x| test_ok(x == 8)} + +IterTest.new([[0]]).each0 {|x| test_ok(x == [0])} +IterTest.new([[1]]).each1 {|x| test_ok(x == [1])} +IterTest.new([[2]]).each2 {|x| test_ok(x == [[2]])} +IterTest.new([[3]]).each3 {|x| test_ok(x == 3)} +IterTest.new([[4]]).each4 {|x| test_ok(x == [4])} +IterTest.new([[5]]).each5 {|x| test_ok(x == [5])} +IterTest.new([[6]]).each6 {|x| test_ok(x == [[6]])} +IterTest.new([[7]]).each7 {|x| test_ok(x == 7)} +IterTest.new([[8]]).each8 {|x| test_ok(x == [8])} + +IterTest.new([[0,0]]).each0 {|*x| test_ok(x == [[0,0]])} +IterTest.new([[8,8]]).each8 {|*x| test_ok(x == [[8,8]])} + +def m0(v) + v +end + +def m1 + m0(block_given?) +end +test_ok(m1{p 'test'}) +test_ok(!m1) + +def m + m0(block_given?,&Proc.new{}) +end +test_ok(m1{p 'test'}) +test_ok(!m1) + +class C + include Enumerable + def initialize + @a = [1,2,3] + end + def each(&block) + @a.each(&block) + end +end + +test_ok(C.new.collect{|n| n} == [1,2,3]) + +test_ok(Proc == lambda{}.class) +test_ok(Proc == Proc.new{}.class) +lambda{|a|test_ok(a==1)}.call(1) +def block_test(klass, &block) + test_ok(klass === block) +end + +block_test(NilClass) +block_test(Proc){} + +def call_argument_test(state, proc, *args) + x = state + begin + proc.call(*args) + rescue ArgumentError + x = !x + end + test_ok(x,2) +end + +call_argument_test(true, lambda{||}) +call_argument_test(false, lambda{||}, 1) +call_argument_test(true, lambda{|a,|}, 1) +call_argument_test(false, lambda{|a,|}) +call_argument_test(false, lambda{|a,|}, 1,2) + +call_argument_test(true, Proc.new{||}) +call_argument_test(true, Proc.new{||}, 1) +call_argument_test(true, Proc.new{|a,|}, 1) +call_argument_test(true, Proc.new{|a,|}) +call_argument_test(true, Proc.new{|a,|}, 1,2) + +def block_get(&block) + block +end + +test_ok(Proc == block_get{}.class) +call_argument_test(true, block_get{||}) +call_argument_test(true, block_get{||}, 1) +call_argument_test(true, block_get{|a,|}, 1) +call_argument_test(true, block_get{|a,|}) +call_argument_test(true, block_get{|a,|}, 1,2) + +call_argument_test(true, block_get(&lambda{||})) +call_argument_test(false, block_get(&lambda{||}),1) +call_argument_test(true, block_get(&lambda{|a,|}),1) +call_argument_test(false, block_get(&lambda{|a,|}),1,2) + +blk = block_get{11} +test_ok(blk.class == Proc) +test_ok(blk.to_proc.class == Proc) +test_ok(blk.clone.call == 11) +test_ok(block_get(&blk).class == Proc) + +lmd = lambda{44} +test_ok(lmd.class == Proc) +test_ok(lmd.to_proc.class == Proc) +test_ok(lmd.clone.call == 44) +test_ok(block_get(&lmd).class == Proc) + +test_ok(Proc.new{|a,| a}.yield(1,2,3) == 1) +call_argument_test(true, Proc.new{|a,|}, 1,2) + +test_ok(Proc.new{|&b| b.call(10)}.call {|x| x} == 10) +test_ok(Proc.new{|a,&b| b.call(a)}.call(12) {|x| x} == 12) + +def test_return1 + Proc.new { + return 55 + }.yield + 5 +end +test_ok(test_return1() == 55) +def test_return2 + lambda { + return 55 + }.call + 5 +end +test_ok(test_return2() == 60) + +def proc_call(&b) + b.call +end +def proc_yield() + yield +end +def proc_return1 + lambda{return 42}.call+1 +end +test_ok(proc_return1() == 43) +def proc_return2 + ->{return 42}.call+1 +end +test_ok(proc_return2() == 43) +def proc_return3 + proc_call{return 42}+1 +end +test_ok(proc_return3() == 42) +def proc_return4 + proc_yield{return 42}+1 +end +test_ok(proc_return4() == 42) + +def ljump_test(state, proc, *args) + x = state + begin + proc.call(*args) + rescue LocalJumpError + x = !x + end + test_ok(x,2) +end + +ljump_test(false, block_get{break}) +ljump_test(true, lambda{break}) + +def exit_value_test(&block) + block.call +rescue LocalJumpError + $!.exit_value +end + +test_ok(45 == exit_value_test{break 45}) + +test_ok(55 == begin + block_get{break 55}.call + rescue LocalJumpError + $!.exit_value + end) + +def block_call(&block) + block.call +end + +def test_b1 + block_call{break 11} +end +test_ok(test_b1() == 11) + +def ljump_rescue(r) + begin + yield + rescue LocalJumpError => e + r if /from proc-closure/ =~ e.message + end +end + +def test_b2 + ljump_rescue(22) do + block_get{break 21}.call + end +end +test_ok(test_b2() == 22) + +def test_b3 + ljump_rescue(33) do + Proc.new{break 31}.yield + end +end +test_ok(test_b3() == 33) + +def test_b4 + lambda{break 44}.call +end +test_ok(test_b4() == 44) + +def test_b5 + ljump_rescue(55) do + b = block_get{break 54} + block_call(&b) + end +end +test_ok(test_b5() == 55) + +def test_b6 + b = lambda{break 67} + block_call(&b) + 66 +end +test_ok(test_b6() == 66) + +def util_r7 + block_get{break 78} +end + +def test_b7 + b = util_r7() + ljump_rescue(77) do + block_call(&b) + end +end +test_ok(test_b7() == 77) + +def util_b8(&block) + block_call(&block) +end + +def test_b8 + util_b8{break 88} +end +test_ok(test_b8() == 88) + +def util_b9(&block) + lambda{block.call; 98}.call +end + +def test_b9 + util_b9{break 99} +end +test_ok(test_b9() == 99) + +def util_b10 + util_b9{break 100} +end + +def test_b10 + util_b10() +end +test_ok(test_b10() == 100) + +def test_b11 + ljump_rescue(111) do + loop do + Proc.new{break 110}.yield + break 112 + end + end +end +test_ok(test_b11() == 111) + +def test_b12 + loop do + break lambda{break 122}.call + break 121 + end +end +test_ok(test_b12() == 122) + +def test_b13 + ljump_rescue(133) do + while true + Proc.new{break 130}.yield + break 131 + end + end +end +test_ok(test_b13() == 133) + +def test_b14 + while true + break lambda{break 144}.call + break 143 + end +end +test_ok(test_b14() == 144) + +def test_b15 + [0].each {|c| yield 1 } + 156 +end +test_ok(test_b15{|e| break 155 } == 155) + +def marity_test(m) + method = method(m) + test_ok(method.arity == method.to_proc.arity, 2) +end +marity_test(:test_ok) +marity_test(:marity_test) +marity_test(:p) + +lambda(&method(:test_ok)).call(true) +lambda(&block_get{|a,n| test_ok(a,n)}).call(true, 2) + +class ITER_TEST1 + def a + block_given? + end +end + +class ITER_TEST2 < ITER_TEST1 + def a + test_ok(super) + super + end +end +test_ok(ITER_TEST2.new.a {}) + +class ITER_TEST3 + def foo x + return yield if block_given? + x + end +end + +class ITER_TEST4 < ITER_TEST3 + def foo x + test_ok(super == yield) + test_ok(super(x, &nil) == x) + end +end + +ITER_TEST4.new.foo(44){55} + +class ITER_TEST5 + def tt(aa) + aa + end + + def uu(a) + class << self + define_method(:tt) do |sym| + super(sym) + end + end + end + + def xx(*x) + x.size + end +end + +a = ITER_TEST5.new +a.uu(12) +test_ok(a.tt(1) == 1) + +class ITER_TEST6 < ITER_TEST5 + def xx(*a) + a << 12 + super + end +end + +test_ok(ITER_TEST6.new.xx([24]) == 2) + +test_check "float" +test_ok(2.6.floor == 2) +test_ok((-2.6).floor == -3) +test_ok(2.6.ceil == 3) +test_ok((-2.6).ceil == -2) +test_ok(2.6.truncate == 2) +test_ok((-2.6).truncate == -2) +test_ok(2.6.round == 3) +test_ok((-2.4).truncate == -2) +test_ok((13.4 % 1 - 0.4).abs < 0.0001) +nan = 0.0/0 +def nan_test(x,y) + test_ok(x != y) + test_ok((x < y) == false) + test_ok((x > y) == false) + test_ok((x <= y) == false) + test_ok((x >= y) == false) +end +nan_test(nan, nan) +nan_test(nan, 0) +nan_test(nan, 1) +nan_test(nan, -1) +nan_test(nan, 1000) +nan_test(nan, -1000) +nan_test(nan, 1_000_000_000_000) +nan_test(nan, -1_000_000_000_000) +nan_test(nan, 100.0); +nan_test(nan, -100.0); +nan_test(nan, 0.001); +nan_test(nan, -0.001); +nan_test(nan, 1.0/0); +nan_test(nan, -1.0/0); + +#s = "3.7517675036461267e+17" +#test_ok(s == sprintf("%.16e", s.to_f)) +f = 3.7517675036461267e+17 +test_ok(f == sprintf("%.16e", f).to_f) + + +test_check "bignum" +def fact(n) + return 1 if n == 0 + f = 1 + while n>0 + f *= n + n -= 1 + end + return f +end +$x = fact(40) +test_ok($x == $x) +test_ok($x == fact(40)) +test_ok($x < $x+2) +test_ok($x > $x-2) +test_ok($x == 815915283247897734345611269596115894272000000000) +test_ok($x != 815915283247897734345611269596115894272000000001) +test_ok($x+1 == 815915283247897734345611269596115894272000000001) +test_ok($x/fact(20) == 335367096786357081410764800000) +$x = -$x +test_ok($x == -815915283247897734345611269596115894272000000000) +test_ok(2-(2**32) == -(2**32-2)) +test_ok(2**32 - 5 == (2**32-3)-2) + +$good = true; +for i in 1000..1014 + $good = false if ((1 << i) != (2**i)) +end +test_ok($good) + +$good = true; +n1= 1 << 1000 +for i in 1000..1014 + $good = false if ((1 << i) != n1) + n1 *= 2 +end +test_ok($good) + +$good = true; +n2=n1 +for i in 1..10 + n1 = n1 / 2 + n2 = n2 >> 1 + $good = false if (n1 != n2) +end +test_ok($good) + +$good = true; +for i in 4000..4096 + n1 = 1 << i; + if (n1**2-1) / (n1+1) != (n1-1) + $good = false + end +end +test_ok($good) + +b = 10**80 +a = b * 9 + 7 +test_ok(7 == a.modulo(b)) +test_ok(-b + 7 == a.modulo(-b)) +test_ok(b + -7 == (-a).modulo(b)) +test_ok(-7 == (-a).modulo(-b)) +test_ok(7 == a.remainder(b)) +test_ok(7 == a.remainder(-b)) +test_ok(-7 == (-a).remainder(b)) +test_ok(-7 == (-a).remainder(-b)) + +test_ok(10**40+10**20 == 10000000000000000000100000000000000000000) +test_ok(10**40/10**20 == 100000000000000000000) + +a = 677330545177305025495135714080 +b = 14269972710765292560 +test_ok(a % b == 0) +test_ok(-a % b == 0) + +def shift_test(a) + b = a / (2 ** 32) + c = a >> 32 + test_ok(b == c) + + b = a * (2 ** 32) + c = a << 32 + test_ok(b == c) +end + +shift_test(-4518325415524767873) +shift_test(-0xfffffffffffffffff) + +test_check "string & char" + +test_ok("abcd" == "abcd") +test_ok("abcd" =~ /abcd/) +test_ok("abcd" === "abcd") +# compile time string concatenation +test_ok("ab" "cd" == "abcd") +test_ok("#{22}aa" "cd#{44}" == "22aacd44") +test_ok("#{22}aa" "cd#{44}" "55" "#{66}" == "22aacd445566") +test_ok("abc" !~ /^$/) +test_ok("abc\n" !~ /^$/) +test_ok("abc" !~ /^d*$/) +test_ok(("abc" =~ /d*$/) == 3) +test_ok("" =~ /^$/) +test_ok("\n" =~ /^$/) +test_ok("a\n\n" =~ /^$/) +test_ok("abcabc" =~ /.*a/ && $& == "abca") +test_ok("abcabc" =~ /.*c/ && $& == "abcabc") +test_ok("abcabc" =~ /.*?a/ && $& == "a") +test_ok("abcabc" =~ /.*?c/ && $& == "abc") +test_ok(/(.|\n)*?\n(b|\n)/ =~ "a\nb\n\n" && $& == "a\nb") + +test_ok(/^(ab+)+b/ =~ "ababb" && $& == "ababb") +test_ok(/^(?:ab+)+b/ =~ "ababb" && $& == "ababb") +test_ok(/^(ab+)+/ =~ "ababb" && $& == "ababb") +test_ok(/^(?:ab+)+/ =~ "ababb" && $& == "ababb") + +test_ok(/(\s+\d+){2}/ =~ " 1 2" && $& == " 1 2") +test_ok(/(?:\s+\d+){2}/ =~ " 1 2" && $& == " 1 2") + +$x = <<END; +ABCD +ABCD +END +$x.gsub!(/((.|\n)*?)B((.|\n)*?)D/, '\1\3') +test_ok($x == "AC\nAC\n") + +test_ok("foobar" =~ /foo(?=(bar)|(baz))/) +test_ok("foobaz" =~ /foo(?=(bar)|(baz))/) + +$foo = "abc" +test_ok("#$foo = abc" == "abc = abc") +test_ok("#{$foo} = abc" == "abc = abc") + +foo = "abc" +test_ok("#{foo} = abc" == "abc = abc") + +test_ok('-' * 5 == '-----') +test_ok('-' * 1 == '-') +test_ok('-' * 0 == '') + +foo = '-' +test_ok(foo * 5 == '-----') +test_ok(foo * 1 == '-') +test_ok(foo * 0 == '') + +$x = "a.gif" +test_ok($x.sub(/.*\.([^\.]+)$/, '\1') == "gif") +test_ok($x.sub(/.*\.([^\.]+)$/, 'b.\1') == "b.gif") +test_ok($x.sub(/.*\.([^\.]+)$/, '\2') == "") +test_ok($x.sub(/.*\.([^\.]+)$/, 'a\2b') == "ab") +test_ok($x.sub(/.*\.([^\.]+)$/, '<\&>') == "<a.gif>") + +# character constants(assumes ASCII) +test_ok("a"[0] == ?a) +test_ok(?a == ?a) +test_ok(?\C-a == "\1") +test_ok(?\M-a == "\341") +test_ok(?\M-\C-a == "\201") +test_ok("a".upcase![0] == ?A) +test_ok("A".downcase![0] == ?a) +test_ok("abc".tr!("a-z", "A-Z") == "ABC") +test_ok("aabbcccc".tr_s!("a-z", "A-Z") == "ABC") +test_ok("abcc".squeeze!("a-z") == "abc") +test_ok("abcd".delete!("bc") == "ad") + +$x = "abcdef" +$y = [ ?a, ?b, ?c, ?d, ?e, ?f ] +$bad = false +$x.each_byte {|i| + if i.chr != $y.shift + $bad = true + break + end +} +test_ok(!$bad) + +s = "a string" +s[0..s.size]="another string" +test_ok(s == "another string") + +s = <<EOS +#{ +[1,2,3].join(",") +} +EOS +test_ok(s == "1,2,3\n") +test_ok("Just".to_i(36) == 926381) +test_ok("-another".to_i(36) == -23200231779) +test_ok(1299022.to_s(36) == "ruby") +test_ok(-1045307475.to_s(36) == "-hacker") +test_ok("Just_another_Ruby_hacker".to_i(36) == 265419172580680477752431643787347) +test_ok(-265419172580680477752431643787347.to_s(36) == "-justanotherrubyhacker") + +a = [] +(0..255).each {|n| + ch = [n].pack("C") + a.push ch if /a#{Regexp.quote ch}b/x =~ "ab" +} +test_ok(a.size == 0) + +test_check "assignment" +a = nil +test_ok(defined?(a)) +test_ok(a == nil) + +# multiple asignment +a, b = 1, 2 +test_ok(a == 1 && b == 2) + +a, b = b, a +test_ok(a == 2 && b == 1) + +a, = 1,2 +test_ok(a == 1) + +a, *b = 1, 2, 3 +test_ok(a == 1 && b == [2, 3]) + +a, (b, c), d = 1, [2, 3], 4 +test_ok(a == 1 && b == 2 && c == 3 && d == 4) + +*a = 1, 2, 3 +test_ok(a == [1, 2, 3]) + +*a = 4 +test_ok(a == [4]) + +*a = nil +test_ok(a == [nil]) + +test_check "call" +def aaa(a, b=100, *rest) + res = [a, b] + res += rest if rest + return res +end + +# not enough argument +begin + aaa() # need at least 1 arg + test_ok(false) +rescue + test_ok(true) +end + +begin + aaa # no arg given (exception raised) + test_ok(false) +rescue + test_ok(true) +end + +test_ok(aaa(1) == [1, 100]) +test_ok(aaa(1, 2) == [1, 2]) +test_ok(aaa(1, 2, 3, 4) == [1, 2, 3, 4]) +test_ok(aaa(1, *[2, 3, 4]) == [1, 2, 3, 4]) + +test_check "proc" +$proc = Proc.new{|i| i} +test_ok($proc.call(2) == 2) +test_ok($proc.call(3) == 3) + +$proc = Proc.new{|i| i*2} +test_ok($proc.call(2) == 4) +test_ok($proc.call(3) == 6) + +Proc.new{ + iii=5 # nested local variable + $proc = Proc.new{|i| + iii = i + } + $proc2 = Proc.new { + $x = iii # nested variables shared by procs + } + # scope of nested variables + test_ok(defined?(iii)) +}.call +test_ok(!defined?(iii)) # out of scope + +loop{iii=5; test_ok(eval("defined? iii")); break} +loop { + iii = 10 + def dyna_var_check + loop { + test_ok(!defined?(iii)) + break + } + end + dyna_var_check + break +} +$x=0 +$proc.call(5) +$proc2.call +test_ok($x == 5) + +if defined? Process.kill + test_check "signal" + + $x = 0 + trap "SIGINT", Proc.new{|sig| $x = 2} + Process.kill "SIGINT", $$ + 100.times { + sleep 0.1 + break if $x != 0 + } + test_ok($x == 2) + + trap "SIGINT", Proc.new{raise "Interrupt"} + + x = false + begin + Process.kill "SIGINT", $$ + sleep 0.1 + rescue + x = $! + end + test_ok(x && /Interrupt/ =~ x.message) +end + +test_check "eval" +test_ok(eval("") == nil) +$bad=false +eval 'while false; $bad = true; print "foo\n" end' +test_ok(!$bad) + +test_ok(eval('Object')) +test_ok(eval('true')) +test_ok(!eval('nil')) +test_ok(!eval('false')) + +$foo = 'test_ok(true)' +begin + eval $foo +rescue + test_ok(false) +end + +test_ok(eval("$foo") == 'test_ok(true)') +test_ok(eval("true") == true) +i = 5 +test_ok(eval("i == 5")) +test_ok(eval("i") == 5) +test_ok(eval("defined? i")) + +# eval with binding +def test_ev + local1 = "local1" + lambda { + local2 = "local2" + return binding + }.call +end + +$x = test_ev +test_ok(eval("local1", $x) == "local1") # normal local var +test_ok(eval("local2", $x) == "local2") # nested local var +$bad = true +begin + p eval("local1") +rescue NameError # must raise error + $bad = false +end +test_ok(!$bad) + +module EvTest + EVTEST1 = 25 + evtest2 = 125 + $x = binding +end +test_ok(eval("EVTEST1", $x) == 25) # constant in module +test_ok(eval("evtest2", $x) == 125) # local var in module +$bad = true +begin + eval("EVTEST1") +rescue NameError # must raise error + $bad = false +end +test_ok(!$bad) + +x = binding #! YARV Limitation: Proc.new{} +eval "i4 = 1", x +test_ok(eval("i4", x) == 1) +x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call +eval "i4 = 22", x +test_ok(eval("i4", x) == 22) +$x = [] +x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call +eval "(0..9).each{|i5| $x[i5] = Proc.new{i5*2}}", x +test_ok($x[4].call == 8) + +x = binding +eval "i = 1", x +test_ok(eval("i", x) == 1) +x = Proc.new{binding}.call +eval "i = 22", x +test_ok(eval("i", x) == 22) +$x = [] +x = Proc.new{binding}.call +eval "(0..9).each{|i5| $x[i5] = Proc.new{i5*2}}", x +test_ok($x[4].call == 8) +x = Proc.new{binding}.call +eval "for i6 in 1..1; j6=i6; end", x +test_ok(eval("defined? i6", x)) +test_ok(eval("defined? j6", x)) + +Proc.new { + p = binding + eval "foo11 = 1", p + foo22 = 5 + Proc.new{foo11=22}.call + Proc.new{foo22=55}.call + test_ok(eval("foo11", p) == eval("foo11")) + test_ok(eval("foo11") == 1) + test_ok(eval("foo22", p) == eval("foo22")) + test_ok(eval("foo22") == 55) +}.call if false #! YARV Limitation + +#! YARV Limitation: p1 = Proc.new{i7 = 0; Proc.new{i7}}.call +p1 = Proc.new{i7 = 0; binding}.call +#! YARV Limitation: test_ok(p1.call == 0) +eval "i7=5", p1 +#! YARV Limitation: test_ok(p1.call == 5) +test_ok(!defined?(i7)) + +if false #! YARV Limitation +p1 = Proc.new{i7 = 0; Proc.new{i7}}.call +i7 = nil +test_ok(p1.call == 0) +eval "i7=1", p1 +test_ok(p1.call == 1) +eval "i7=5", p1 +test_ok(p1.call == 5) +test_ok(i7 == nil) +end + +test_check "system" +test_ok(`echo foobar` == "foobar\n") +test_ok(`./miniruby -e 'print "foobar"'` == 'foobar') + +script_tmp = "script_tmp.#{$$}" +tmp = open(script_tmp, "w") +tmp.print "print $zzz\n"; +tmp.close + +test_ok(`./miniruby -s #{script_tmp} -zzz` == 'true') +test_ok(`./miniruby -s #{script_tmp} -zzz=555` == '555') + +tmp = open(script_tmp, "w") +tmp.print "#! /usr/local/bin/ruby -s\n"; +tmp.print "print $zzz\n"; +tmp.close + +test_ok(`./miniruby #{script_tmp} -zzz=678` == '678') + +tmp = open(script_tmp, "w") +tmp.print "this is a leading junk\n"; +tmp.print "#! /usr/local/bin/ruby -s\n"; +tmp.print "print $zzz\n"; +tmp.print "__END__\n"; +tmp.print "this is a trailing junk\n"; +tmp.close + +test_ok(`./miniruby -x #{script_tmp}` == '') +test_ok(`./miniruby -x #{script_tmp} -zzz=555` == '555') + +tmp = open(script_tmp, "w") +for i in 1..5 + tmp.print i, "\n" +end +tmp.close + +`./miniruby -i.bak -pe '$_.sub!(/^[0-9]+$/){$&.to_i * 5}' #{script_tmp}` +done = true +tmp = open(script_tmp, "r") +while tmp.gets + if $_.to_i % 5 != 0 + done = false + break + end +end +tmp.close +test_ok(done) + +File.unlink script_tmp or `/bin/rm -f "#{script_tmp}"` +File.unlink "#{script_tmp}.bak" or `/bin/rm -f "#{script_tmp}.bak"` + +test_check "const" +TEST1 = 1 +TEST2 = 2 + +module Const + TEST3 = 3 + TEST4 = 4 +end + +module Const2 + TEST3 = 6 + TEST4 = 8 +end + +include Const + +test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,3,4]) + +include Const2 +STDERR.print "intentionally redefines TEST3, TEST4\n" if $VERBOSE +test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,6,8]) + + +test_ok((String <=> Object) == -1) +test_ok((Object <=> String) == 1) +test_ok((Array <=> String) == nil) + +test_check "clone" +foo = Object.new +def foo.test + "test" +end +bar = foo.clone +def bar.test2 + "test2" +end + +test_ok(bar.test2 == "test2") +test_ok(bar.test == "test") +test_ok(foo.test == "test") + +begin + foo.test2 + test_ok false +rescue NoMethodError + test_ok true +end + +module M001; end +module M002; end +module M003; include M002; end +module M002; include M001; end +module M003; include M002; end + +test_ok(M003.ancestors == [M003, M002, M001]) + +test_check "marshal" +$x = [1,2,3,[4,5,"foo"],{1=>"bar"},2.5,fact(30)] +$y = Marshal.dump($x) +test_ok($x == Marshal.load($y)) + +StrClone=String.clone; +test_ok(Marshal.load(Marshal.dump(StrClone.new("abc"))).class == StrClone) + +[[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z| + a = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f)) + ma = Marshal.dump(a) + b = Marshal.load(ma) + test_ok(a == b) +} + +test_check "pack" + +$format = "c2x5CCxsdils_l_a6"; +# Need the expression in here to force ary[5] to be numeric. This avoids +# test2 failing because ary2 goes str->numeric->str and ary does not. +ary = [1,-100,127,128,32767,987.654321098 / 100.0,12345,123456,-32767,-123456,"abcdef"] +$x = ary.pack($format) +ary2 = $x.unpack($format) + +test_ok(ary.length == ary2.length) +test_ok(ary.join(':') == ary2.join(':')) +test_ok($x =~ /def/) + +$x = [-1073741825] +test_ok($x.pack("q").unpack("q") == $x) + +test_check "math" +test_ok(Math.sqrt(4) == 2) + +include Math +test_ok(sqrt(4) == 2) + +test_check "struct" +struct_test = Struct.new("Test", :foo, :bar) +test_ok(struct_test == Struct::Test) + +test = struct_test.new(1, 2) +test_ok(test.foo == 1 && test.bar == 2) +test_ok(test[0] == 1 && test[1] == 2) + +a, b = test.to_a +test_ok(a == 1 && b == 2) + +test[0] = 22 +test_ok(test.foo == 22) + +test.bar = 47 +test_ok(test.bar == 47) + +test_check "variable" +test_ok($$.instance_of?(Integer)) + +# read-only variable +begin + $$ = 5 + test_ok false +rescue NameError + test_ok true +end + +foobar = "foobar" +$_ = foobar +test_ok($_ == foobar) + +class Gods + @@rule = "Uranus" # private to Gods + def ruler0 + @@rule + end + + def self.ruler1 # <= per method definition style + @@rule + end + class << self # <= multiple method definition style + def ruler2 + @@rule + end + end +end + +module Olympians + @@rule ="Zeus" + def ruler3 + @@rule + end +end + +class Titans < Gods + @@rule = "Cronus" # do not affect @@rule in Gods + include Olympians + def ruler4 + @@rule + end +end + +test_ok(Gods.new.ruler0 == "Cronus") +test_ok(Gods.ruler1 == "Cronus") +test_ok(Gods.ruler2 == "Cronus") +test_ok(Titans.ruler1 == "Cronus") +test_ok(Titans.ruler2 == "Cronus") +atlas = Titans.new +test_ok(atlas.ruler0 == "Cronus") +test_ok(atlas.ruler3 == "Zeus") +test_ok(atlas.ruler4 == "Cronus") + +test_check "trace" +$x = 1234 +$y = 0 +trace_var :$x, Proc.new{$y = $x} +$x = 40414 +test_ok($y == $x) + +untrace_var :$x +$x = 19660208 +test_ok($y != $x) + +trace_var :$x, Proc.new{$x *= 2} +$x = 5 +test_ok($x == 10) + +untrace_var :$x + +test_check "defined?" + +test_ok(defined?($x)) # global variable +test_ok(defined?($x) == 'global-variable')# returns description + +foo=5 +test_ok(defined?(foo)) # local variable + +test_ok(defined?(Array)) # constant +test_ok(defined?(Object.new)) # method +test_ok(!defined?(Object.print))# private method +test_ok(defined?(1 == 2)) # operator expression + +class Foo + def foo + p :foo + end + protected :foo + def bar(f) + test_ok(defined?(self.foo)) + test_ok(defined?(f.foo)) + end +end +f = Foo.new +test_ok(defined?(f.foo) == nil) +f.bar(f) + +def defined_test + return !defined?(yield) +end + +test_ok(defined_test) # not iterator +test_ok(!defined_test{}) # called as iterator + +test_check "alias" +class Alias0 + def foo; "foo" end +end +class Alias1<Alias0 + alias bar foo + def foo; "foo+" + super end +end +class Alias2<Alias1 + alias baz foo + undef foo +end + +x = Alias2.new +test_ok(x.bar == "foo") +test_ok(x.baz == "foo+foo") + +# test_check for cache +test_ok(x.baz == "foo+foo") + +class Alias3<Alias2 + def foo + defined? super + end + def bar + defined? super + end + def quux + defined? super + end +end +x = Alias3.new +test_ok(!x.foo) +test_ok(x.bar) +test_ok(!x.quux) + +test_check "path" +test_ok(File.basename("a") == "a") +test_ok(File.basename("a/b") == "b") +test_ok(File.basename("a/b/") == "b") +test_ok(File.basename("/") == "/") +test_ok(File.basename("//") == "/") +test_ok(File.basename("///") == "/") +test_ok(File.basename("a/b////") == "b") +test_ok(File.basename("a.rb", ".rb") == "a") +test_ok(File.basename("a.rb///", ".rb") == "a") +test_ok(File.basename("a.rb///", ".*") == "a") +test_ok(File.basename("a.rb///", ".c") == "a.rb") +test_ok(File.dirname("a") == ".") +test_ok(File.dirname("/") == "/") +test_ok(File.dirname("/a") == "/") +test_ok(File.dirname("a/b") == "a") +test_ok(File.dirname("a/b/c") == "a/b") +test_ok(File.dirname("/a/b/c") == "/a/b") +test_ok(File.dirname("/a/b/") == "/a") +test_ok(File.dirname("/a/b///") == "/a") +case Dir.pwd +when %r'\A\w:' + test_ok(/\A\w:\/\z/ =~ File.expand_path(".", "/")) + test_ok(/\A\w:\/a\z/ =~ File.expand_path("a", "/")) + dosish = true +when %r'\A//' + test_ok(%r'\A//[^/]+/[^/]+\z' =~ File.expand_path(".", "/")) + test_ok(%r'\A//[^/]+/[^/]+/a\z' =~ File.expand_path(".", "/")) + dosish = true +else + test_ok(File.expand_path(".", "/") == "/") + test_ok(File.expand_path("sub", "/") == "/sub") +end +if dosish + test_ok(File.expand_path("/", "//machine/share/sub") == "//machine/share") + test_ok(File.expand_path("/dir", "//machine/share/sub") == "//machine/share/dir") + test_ok(File.expand_path("/", "z:/sub") == "z:/") + test_ok(File.expand_path("/dir", "z:/sub") == "z:/dir") +end +test_ok(File.expand_path(".", "//") == "//") +test_ok(File.expand_path("sub", "//") == "//sub") + +# test_check "Proc#binding" +ObjectSpace.each_object(Proc){|o| + begin + b = o.binding + eval 'self', b + rescue ArgumentError + end +} + +test_check "gc" +begin + 1.upto(10000) { + tmp = [0,1,2,3,4,5,6,7,8,9] + } + tmp = nil + test_ok true +rescue + test_ok false +end +class S + def initialize(a) + @a = a + end +end +l=nil +100000.times { + l = S.new(l) +} +GC.start +test_ok true # reach here or dumps core +l = [] +100000.times { + l.push([l]) +} +GC.start +test_ok true # reach here or dumps core + +ObjectSpace.each_object{|o| + o.class.name +} + +test_ok true # reach here or dumps core + +PROGRESS.finish +if $failed > 0 + printf "not ok/test: %d failed %d\n", $ntest, $failed +else + printf "end of test(test: %d)\n", $ntest +end diff --git a/benchmark/bm_app_aobench.rb b/benchmark/bm_app_aobench.rb index ffab116fcd..2bd6acfaf8 100644 --- a/benchmark/bm_app_aobench.rb +++ b/benchmark/bm_app_aobench.rb @@ -229,7 +229,7 @@ class Scene w.times do |x| rad = Vec.new(0.0, 0.0, 0.0) - # Subsmpling + # Subsampling nsubsamples.times do |v| nsubsamples.times do |u| diff --git a/benchmark/bm_array_shift.rb b/benchmark/bm_array_shift.rb new file mode 100644 index 0000000000..798bb9e3f4 --- /dev/null +++ b/benchmark/bm_array_shift.rb @@ -0,0 +1,14 @@ +require 'benchmark' + +Benchmark.bm do |x| + [10_000,1_000_000,100_000_000].each do |n| + ary = Array.new(n,0) + GC.start + x.report("#{n}:shift"){ ary.shift } + (0..4).each do |i| + ary = Array.new(n,0) + GC.start + x.report("#{n}:shift(#{i})"){ ary.shift(i) } + end + end +end diff --git a/benchmark/bm_hash_aref_dsym.rb b/benchmark/bm_hash_aref_dsym.rb new file mode 100644 index 0000000000..af4f8c36d4 --- /dev/null +++ b/benchmark/bm_hash_aref_dsym.rb @@ -0,0 +1,4 @@ +h = {} +syms = ('a'..'z').map { |s| s.to_sym } +syms.each { |s| h[s] = 1 } +200_000.times { syms.each { |s| h[s] } } diff --git a/benchmark/bm_hash_aref_dsym_long.rb b/benchmark/bm_hash_aref_dsym_long.rb new file mode 100644 index 0000000000..9d7759379e --- /dev/null +++ b/benchmark/bm_hash_aref_dsym_long.rb @@ -0,0 +1,21 @@ +# [ruby-core:70129] [Bug #11396] +collection_size = 200000 +sample_size = 10000 + +values = (1..collection_size).to_a.map do |x| + "THIS IS A LONGER STRING THAT IS ALSO UNIQUE #{x}" +end + +symbol_hash = {} + +values.each do |x| + symbol_hash[x.to_sym] = 1 +end + +# use the same samples each time to minimize deviations +rng = Random.new(0) +symbol_sample_array = values.sample(sample_size, random: rng).map(&:to_sym) + +3000.times do + symbol_sample_array.each { |x| symbol_hash[x] } +end diff --git a/benchmark/bm_hash_aref_fix.rb b/benchmark/bm_hash_aref_fix.rb new file mode 100644 index 0000000000..1346890582 --- /dev/null +++ b/benchmark/bm_hash_aref_fix.rb @@ -0,0 +1,4 @@ +h = {} +nums = (1..26).to_a +nums.each { |i| h[i] = i } +200_000.times { nums.each { |s| h[s] } } diff --git a/benchmark/bm_hash_shift_u16.rb b/benchmark/bm_hash_shift_u16.rb new file mode 100644 index 0000000000..ec800d0342 --- /dev/null +++ b/benchmark/bm_hash_shift_u16.rb @@ -0,0 +1,10 @@ +h = {} + +(16384..65536).each do |i| + h[i] = nil +end + +300000.times do + k, v = h.shift + h[k] = v +end diff --git a/benchmark/bm_hash_shift_u24.rb b/benchmark/bm_hash_shift_u24.rb new file mode 100644 index 0000000000..de4e0fa696 --- /dev/null +++ b/benchmark/bm_hash_shift_u24.rb @@ -0,0 +1,10 @@ +h = {} + +(0xff4000..0xffffff).each do |i| + h[i] = nil +end + +300000.times do + k, v = h.shift + h[k] = v +end diff --git a/benchmark/bm_hash_shift_u32.rb b/benchmark/bm_hash_shift_u32.rb new file mode 100644 index 0000000000..656aa55583 --- /dev/null +++ b/benchmark/bm_hash_shift_u32.rb @@ -0,0 +1,10 @@ +h = {} + +(0xffff4000..0xffffffff).each do |i| + h[i] = nil +end + +300000.times do + k, v = h.shift + h[k] = v +end diff --git a/benchmark/bm_hash_to_proc.rb b/benchmark/bm_hash_to_proc.rb new file mode 100644 index 0000000000..2b675bf509 --- /dev/null +++ b/benchmark/bm_hash_to_proc.rb @@ -0,0 +1,9 @@ +h = {} + +10000.times do |i| + h[i] = nil +end + +5000.times do |i| + [i].map(&h) +end diff --git a/benchmark/bm_io_nonblock_noex.rb b/benchmark/bm_io_nonblock_noex.rb new file mode 100644 index 0000000000..da9357fdc6 --- /dev/null +++ b/benchmark/bm_io_nonblock_noex.rb @@ -0,0 +1,22 @@ +nr = 1_000_000 +i = 0 +msg = '.' +buf = '.' +noex = { exception: false } +begin + r, w = IO.pipe + while i < nr + i += 1 + w.write_nonblock(msg, noex) + r.read_nonblock(1, buf, noex) + end +rescue ArgumentError # old Rubies + while i < nr + i += 1 + w.write_nonblock(msg) + r.read_nonblock(1, buf) + end +ensure + r.close + w.close +end diff --git a/benchmark/bm_io_nonblock_noex2.rb b/benchmark/bm_io_nonblock_noex2.rb new file mode 100644 index 0000000000..56819d049b --- /dev/null +++ b/benchmark/bm_io_nonblock_noex2.rb @@ -0,0 +1,21 @@ +nr = 1_000_000 +i = 0 +msg = '.' +buf = '.' +begin + r, w = IO.pipe + while i < nr + i += 1 + w.write_nonblock(msg, exception: false) + r.read_nonblock(1, buf, exception: false) + end +rescue ArgumentError # old Rubies + while i < nr + i += 1 + w.write_nonblock(msg) + r.read_nonblock(1, buf) + end +ensure + r.close + w.close +end diff --git a/benchmark/bm_marshal_dump_load_geniv.rb b/benchmark/bm_marshal_dump_load_geniv.rb new file mode 100644 index 0000000000..8252ad90fa --- /dev/null +++ b/benchmark/bm_marshal_dump_load_geniv.rb @@ -0,0 +1,10 @@ +a = '' +a.instance_eval do + @a = :a + @b = :b + @c = :c +end +100000.times do + a = Marshal.load(Marshal.dump(a)) +end +#p(a.instance_eval { @a == :a && @b == :b && @c == :c }) diff --git a/benchmark/bm_marshal_dump_load_time.rb b/benchmark/bm_marshal_dump_load_time.rb new file mode 100644 index 0000000000..e29743b791 --- /dev/null +++ b/benchmark/bm_marshal_dump_load_time.rb @@ -0,0 +1 @@ +100000.times { Marshal.load(Marshal.dump(Time.now)) } diff --git a/benchmark/bm_require.rb b/benchmark/bm_require.rb new file mode 100644 index 0000000000..b8abc88f41 --- /dev/null +++ b/benchmark/bm_require.rb @@ -0,0 +1,7 @@ +$:.push File.join(File.dirname(__FILE__), "bm_require.data") + +1.upto(10000) do |i| + require "c#{i}" +end + +$:.pop diff --git a/benchmark/bm_require_thread.rb b/benchmark/bm_require_thread.rb new file mode 100644 index 0000000000..e54db6c6e5 --- /dev/null +++ b/benchmark/bm_require_thread.rb @@ -0,0 +1,15 @@ +$:.push File.join(File.dirname(__FILE__), "bm_require.data") + +i=0 +t = Thread.new do + while true + i = i+1 # dummy loop + end +end + +1.upto(100) do |i| + require "c#{i}" +end + +$:.pop +t.kill diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb index b8e93bd150..64a7d46afe 100644 --- a/benchmark/bm_so_meteor_contest.rb +++ b/benchmark/bm_so_meteor_contest.rb @@ -260,7 +260,7 @@ end # support function that create three utility maps: # $converter -- for each row an array that maps a five bit row (via array mapping) -# to the a a five bit representation of the bits below it +# to the a five bit representation of the bits below it # $bit_count -- maps a five bit row (via array mapping) to the number of 1s in the row # @@new_regions -- maps a five bit row (via array mapping) to an array of "region" arrays # a region array has three values the first is a mask of bits in the region, @@ -467,7 +467,7 @@ def find_top( rotation_skip) end # the normail find routine, iterates through the available pieces, checks all rotations at the current location -# and adds any boards found. depth is acheived via recursion. the overall approach is described +# and adds any boards found. depth is achieved via recursion. the overall approach is described # here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/ # parameters: # start_location -- where to start looking for place for the next piece at @@ -561,4 +561,3 @@ create_collector_support @boards_found = 0 find_all ######## DO IT!!! - diff --git a/benchmark/bm_vm1_gc_wb_ary.rb b/benchmark/bm_vm1_gc_wb_ary.rb index ecfab51dbf..881528845b 100644 --- a/benchmark/bm_vm1_gc_wb_ary.rb +++ b/benchmark/bm_vm1_gc_wb_ary.rb @@ -1,10 +1,12 @@ -long_lived = [] -GC.start -GC.start +short_lived_ary = [] + +if RUBY_VERSION >= "2.2.0" + GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) +end i = 0 short_lived = '' while i<30_000_000 # while loop 1 - long_lived[0] = short_lived # write barrier + short_lived_ary[0] = short_lived # write barrier i+=1 end diff --git a/benchmark/bm_vm1_gc_wb_ary_promoted.rb b/benchmark/bm_vm1_gc_wb_ary_promoted.rb new file mode 100644 index 0000000000..3c8279c956 --- /dev/null +++ b/benchmark/bm_vm1_gc_wb_ary_promoted.rb @@ -0,0 +1,14 @@ +long_lived = [] + +if RUBY_VERSION > "2.2.0" + 3.times{ GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) } +elsif + GC.start +end + +i = 0 +short_lived = '' +while i<30_000_000 # while loop 1 + long_lived[0] = short_lived # write barrier + i+=1 +end diff --git a/benchmark/bm_vm1_gc_wb_obj.rb b/benchmark/bm_vm1_gc_wb_obj.rb index 017eff4f94..a4067af36b 100644 --- a/benchmark/bm_vm1_gc_wb_obj.rb +++ b/benchmark/bm_vm1_gc_wb_obj.rb @@ -1,13 +1,15 @@ class C attr_accessor :foo end -long_lived = C.new -GC.start -GC.start +short_lived_obj = C.new + +if RUBY_VERSION >= "2.2.0" + GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) +end i = 0 short_lived = '' while i<30_000_000 # while loop 1 - long_lived.foo = short_lived # write barrier + short_lived_obj.foo = short_lived # write barrier i+=1 end diff --git a/benchmark/bm_vm1_gc_wb_obj_promoted.rb b/benchmark/bm_vm1_gc_wb_obj_promoted.rb new file mode 100644 index 0000000000..eee07a0248 --- /dev/null +++ b/benchmark/bm_vm1_gc_wb_obj_promoted.rb @@ -0,0 +1,17 @@ +class C + attr_accessor :foo +end +long_lived = C.new + +if RUBY_VERSION >= "2.2.0" + 3.times{ GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) } +elsif + GC.start +end + +i = 0 +short_lived = '' +while i<30_000_000 # while loop 1 + long_lived.foo = short_lived # write barrier + i+=1 +end diff --git a/benchmark/bm_vm2_case_lit.rb b/benchmark/bm_vm2_case_lit.rb new file mode 100644 index 0000000000..c62b294e0e --- /dev/null +++ b/benchmark/bm_vm2_case_lit.rb @@ -0,0 +1,19 @@ +i = 0 +@ret = [ "foo", true, false, :sym, 6, nil, 0.1, 0xffffffffffffffff ] +def foo(i) + @ret[i % @ret.size] +end + +while i<6_000_000 # while loop 2 + case foo(i) + when "foo" then :foo + when true then true + when false then false + when :sym then :sym + when 6 then :fix + when nil then nil + when 0.1 then :float + when 0xffffffffffffffff then :big + end + i += 1 +end diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb index 7362f738c5..5d16480c6b 100644 --- a/benchmark/bm_vm2_mutex.rb +++ b/benchmark/bm_vm2_mutex.rb @@ -1,6 +1,6 @@ require 'thread' -m = Mutex.new +m = Thread::Mutex.new i = 0 while i<6_000_000 # benchmark loop 2 diff --git a/benchmark/bm_vm2_string_literal.rb b/benchmark/bm_vm2_string_literal.rb new file mode 100644 index 0000000000..1d73036849 --- /dev/null +++ b/benchmark/bm_vm2_string_literal.rb @@ -0,0 +1,5 @@ +i = 0 +while i<6_000_000 # benchmark loop 2 + i += 1 + x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" +end diff --git a/benchmark/bm_vm2_struct_big_href_hi.rb b/benchmark/bm_vm2_struct_big_href_hi.rb new file mode 100644 index 0000000000..fff940a80a --- /dev/null +++ b/benchmark/bm_vm2_struct_big_href_hi.rb @@ -0,0 +1,7 @@ +s = Struct.new(*('a'..'z').map { |x| x.to_sym }) +x = s.new +i = 0 +while i<6_000_000 # benchmark loop 2 + i += 1 + x[:z] +end diff --git a/benchmark/bm_vm2_struct_big_href_lo.rb b/benchmark/bm_vm2_struct_big_href_lo.rb new file mode 100644 index 0000000000..5e4085d59d --- /dev/null +++ b/benchmark/bm_vm2_struct_big_href_lo.rb @@ -0,0 +1,7 @@ +s = Struct.new(*('a'..'z').map { |x| x.to_sym }) +x = s.new +i = 0 +while i<6_000_000 # benchmark loop 2 + i += 1 + x[:k] +end diff --git a/benchmark/bm_vm2_struct_big_hset.rb b/benchmark/bm_vm2_struct_big_hset.rb new file mode 100644 index 0000000000..9c0cee4141 --- /dev/null +++ b/benchmark/bm_vm2_struct_big_hset.rb @@ -0,0 +1,7 @@ +s = Struct.new(*('a'..'z').map { |x| x.to_sym }) +x = s.new +i = 0 +while i<6_000_000 # benchmark loop 2 + i += 1 + x[:k] = i +end diff --git a/benchmark/bm_vm2_struct_small_href.rb b/benchmark/bm_vm2_struct_small_href.rb new file mode 100644 index 0000000000..2c88fee6bf --- /dev/null +++ b/benchmark/bm_vm2_struct_small_href.rb @@ -0,0 +1,7 @@ +s = Struct.new(:a, :b, :c) +x = s.new +i = 0 +while i<6_000_000 # benchmark loop 2 + i += 1 + x[:a] +end diff --git a/benchmark/bm_vm2_struct_small_hset.rb b/benchmark/bm_vm2_struct_small_hset.rb new file mode 100644 index 0000000000..33c36d20f1 --- /dev/null +++ b/benchmark/bm_vm2_struct_small_hset.rb @@ -0,0 +1,7 @@ +s = Struct.new(:a, :b, :c) +x = s.new +i = 0 +while i<6_000_000 # benchmark loop 2 + i += 1 + x[:a] = 1 +end diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb index 7db9829d44..e668026915 100755..100644 --- a/benchmark/bm_vm3_gc.rb +++ b/benchmark/bm_vm3_gc.rb @@ -1,4 +1,3 @@ -#! /usr/bin/ruby 5000.times do 100.times do {"xxxx"=>"yyyy"} diff --git a/benchmark/bm_vm3_gc_old_full.rb b/benchmark/bm_vm3_gc_old_full.rb new file mode 100644 index 0000000000..cfdfc8c5a5 --- /dev/null +++ b/benchmark/bm_vm3_gc_old_full.rb @@ -0,0 +1,4 @@ +old_object = Array.new(1_000_000){''} +100.times do + GC.start +end diff --git a/benchmark/bm_vm3_gc_old_immediate.rb b/benchmark/bm_vm3_gc_old_immediate.rb new file mode 100644 index 0000000000..ad22feb655 --- /dev/null +++ b/benchmark/bm_vm3_gc_old_immediate.rb @@ -0,0 +1,4 @@ +old_object = Array.new(1_000_000){''} +30_000.times do + GC.start(full_mark: false, immediate_sweep: true) +end diff --git a/benchmark/bm_vm3_gc_old_lazy.rb b/benchmark/bm_vm3_gc_old_lazy.rb new file mode 100644 index 0000000000..b74d44baf1 --- /dev/null +++ b/benchmark/bm_vm3_gc_old_lazy.rb @@ -0,0 +1,4 @@ +old_object = Array.new(1_000_000){''} +30_000.times do + GC.start(full_mark: false, immediate_sweep: false) +end diff --git a/benchmark/bm_vm_symbol_block_pass.rb b/benchmark/bm_vm_symbol_block_pass.rb new file mode 100644 index 0000000000..1d433353e1 --- /dev/null +++ b/benchmark/bm_vm_symbol_block_pass.rb @@ -0,0 +1,13 @@ +class C + 1000.times {|i| + eval("def i#{i};end") + } +end + +c = C.new +m = C.instance_methods(false) +5_000.times do + m.each do |n| + c.tap(&n) + end +end diff --git a/benchmark/bm_vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb index 5c9f85dfb7..66e42c85e1 100644 --- a/benchmark/bm_vm_thread_mutex1.rb +++ b/benchmark/bm_vm_thread_mutex1.rb @@ -1,7 +1,7 @@ # one thread, one mutex (no contention) require 'thread' -m = Mutex.new +m = Thread::Mutex.new r = 0 max = 2000 lmax = max * max diff --git a/benchmark/bm_vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb index 10de59054f..6e6c804c31 100644 --- a/benchmark/bm_vm_thread_mutex2.rb +++ b/benchmark/bm_vm_thread_mutex2.rb @@ -1,7 +1,7 @@ # two threads, one mutex require 'thread' -m = Mutex.new +m = Thread::Mutex.new r = 0 max = 2000 lmax = (max * max)/2 diff --git a/benchmark/bm_vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb index 7f9a44b39d..c750dc542a 100644 --- a/benchmark/bm_vm_thread_mutex3.rb +++ b/benchmark/bm_vm_thread_mutex3.rb @@ -1,7 +1,7 @@ # 1000 threads, one mutex require 'thread' -m = Mutex.new +m = Thread::Mutex.new r = 0 max = 2000 (1..max).map{ diff --git a/benchmark/bm_vm_thread_pipe.rb b/benchmark/bm_vm_thread_pipe.rb index 272d231eba..112a621905 100644 --- a/benchmark/bm_vm_thread_pipe.rb +++ b/benchmark/bm_vm_thread_pipe.rb @@ -1,4 +1,4 @@ -# Mesure small and plenty pipe read/write. +# Measure small and plenty pipe read/write. # A performance may depend on GVL implementation. lmax = 100_000 diff --git a/benchmark/bm_vm_thread_queue.rb b/benchmark/bm_vm_thread_queue.rb index 37381ae62b..274ceda366 100644 --- a/benchmark/bm_vm_thread_queue.rb +++ b/benchmark/bm_vm_thread_queue.rb @@ -1,7 +1,7 @@ require 'thread' n = 1_000_000 -q = Queue.new +q = Thread::Queue.new consumer = Thread.new{ while q.pop # consuming diff --git a/benchmark/driver.rb b/benchmark/driver.rb index 3904e25503..eb976b4a90 100644 --- a/benchmark/driver.rb +++ b/benchmark/driver.rb @@ -18,6 +18,7 @@ end require 'benchmark' require 'pp' +require 'tempfile' class BenchmarkDriver def self.benchmark(opt) @@ -29,6 +30,24 @@ class BenchmarkDriver end end + def self.load(input, type, opt) + case type + when 'yaml' + require 'yaml' + h = YAML.load(input) + when 'json' + require 'json' + h = JSON.load(input) + else + h = eval(input.read) + end + obj = allocate + obj.instance_variable_set("@execs", h[:executables] || h["executables"]) + obj.instance_variable_set("@results", h[:results] || h["results"]) + obj.instance_variable_set("@opt", opt) + obj + end + def output *args puts(*args) @output and @output.puts(*args) @@ -77,9 +96,9 @@ class BenchmarkDriver @exclude = opt[:exclude] || nil @verbose = opt[:quiet] ? false : (opt[:verbose] || false) @output = opt[:output] ? open(opt[:output], 'w') : nil - @rawdata_output = opt[:rawdata_output] ? open(opt[:rawdata_output], 'w') : nil @loop_wl1 = @loop_wl2 = nil @ruby_arg = opt[:ruby_arg] || nil + @measure_target = opt[:measure_target] @opt = opt # [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...] @@ -91,6 +110,7 @@ class BenchmarkDriver @execs.each_with_index{|(path, label, version), i| message "target #{i}: " + (label == version ? "#{label}" : "#{label} (#{version})") + " at \"#{path}\"" } + message "measure target: #{@measure_target}" end end @@ -118,6 +138,25 @@ class BenchmarkDriver end def show_results + case @opt[:format] + when :tsv + strformat = "\t%1$s" + numformat = "\t%1$*2$.3f" + minwidth = 0 + name_width = 0 + when :markdown + markdown = true + strformat = "|%1$-*2$s" + numformat = "|%1$*2$.3f" + when :plain + strformat = " %1$-*2$s" + numformat = " %1$*2$.3f" + end + + name_width ||= @results.map {|v,*| v.size}.max + minwidth ||= 7 + width = @execs.map{|(_, v)| [v.size, minwidth].max} + output if @verbose @@ -129,12 +168,27 @@ class BenchmarkDriver message "Elapsed time: #{Time.now - @start_time} (sec)" end - if @rawdata_output + if rawdata_output = @opt[:rawdata_output] h = {} h[:cpuinfo] = File.read('/proc/cpuinfo') if File.exist?('/proc/cpuinfo') h[:executables] = @execs h[:results] = @results - @rawdata_output.puts h.inspect + if (type = File.extname(rawdata_output)).empty? + type = rawdata_output + rawdata_output = @output.path.sub(/\.[^.\/]+\z/, '') << '.' << rawdata_output + end + case type + when 'yaml' + require 'yaml' + h = YAML.dump(h) + when 'json' + require 'json' + h = JSON.pretty_generate(h) + else + require 'pp' + h = h.pretty_inspect + end + open(rawdata_output, 'w') {|f| f.puts h} end output '-----------------------------------------------------------' @@ -144,20 +198,33 @@ class BenchmarkDriver output "minimum results in each #{@repeat} measurements." end - output "Execution time (sec)" - output "name\t#{@execs.map{|(_, v)| v}.join("\t")}" + output({ + real: "Execution time (sec)", + peak: "Memory usage (peak) (B)", + size: "Memory usage (last size) (B)", + }[@measure_target]) + output if markdown + output ["name".ljust(name_width), @execs.map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip + output ["-"*name_width, width.map{|n|":".rjust(n, "-")}].join("|") if markdown @results.each{|v, result| rets = [] s = adjusted_results(v, result){|r| - rets << sprintf("%.3f", r) + rets << sprintf(numformat, r, width[rets.size]) } - output "#{v}#{s}\t#{rets.join("\t")}" + v += s if s + output [v.ljust(name_width), rets].join("") } if @execs.size > 1 output - output "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)" - output "name\t#{@execs[1..-1].map{|(_, v)| v}.join("\t")}" + output({ + real: "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)", + peak: "Memory consuming ratio (peak) with the result of `#{@execs[0][1]}' (greater is better)", + size: "Memory consuming ratio (size) with the result of `#{@execs[0][1]}' (greater is better)", + }[@measure_target]) + output if markdown + output ["name".ljust(name_width), @execs[1..-1].map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip + output ["-"*name_width, width[1..-1].map{|n|":".rjust(n, "-")}].join("|") if markdown @results.each{|v, result| rets = [] first_value = nil @@ -166,13 +233,14 @@ class BenchmarkDriver if r == 0 rets << "Error" else - rets << sprintf("%.3f", first_value/r) + rets << sprintf(numformat, first_value/Float(r), width[rets.size+1]) end else first_value = r end } - output "#{v}#{s}\t#{rets.join("\t")}" + v += s if s + output [v.ljust(name_width), rets].join("") } end @@ -254,17 +322,30 @@ class BenchmarkDriver end def measure executable, file - cmd = "#{executable} #{@ruby_arg} #{file}" - - m = Benchmark.measure{ + case @measure_target + when :real + cmd = "#{executable} #{@ruby_arg} #{file}" + m = Benchmark.measure{ + system(cmd, out: File::NULL) + } + result = m.real + when :peak, :size + tmp = Tempfile.new("benchmark-memory-wrapper-data") + wrapper = "#{File.join(__dir__, 'memory_wrapper.rb')} #{tmp.path} #{@measure_target}" + cmd = "#{executable} #{@ruby_arg} #{wrapper} #{file}" system(cmd, out: File::NULL) - } + result = tmp.read.to_i + tmp.close + else + raise "unknown measure target" + end if $? != 0 + raise $?.inspect if $? && $?.signaled? output "\`#{cmd}\' exited with abnormal status (#{$?})" 0 else - m.real + result end end end @@ -274,8 +355,15 @@ if __FILE__ == $0 :execs => [], :dir => File.dirname(__FILE__), :repeat => 1, - :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}", - :raw_output => nil + :measure_target => :real, + :output => nil, + :raw_output => nil, + :format => :tsv, + } + formats = { + :tsv => ".tsv", + :markdown => ".md", + :plain => ".txt", } parser = OptionParser.new{|o| @@ -303,9 +391,18 @@ if __FILE__ == $0 o.on('--ruby-arg [ARG]', "Optional argument for ruby"){|a| opt[:ruby_arg] = a } + o.on('--measure-target [TARGET]', 'real (execution time), peak, size (memory)'){|mt| + opt[:measure_target] = mt.to_sym + } o.on('--rawdata-output [FILE]', 'output rawdata'){|r| opt[:rawdata_output] = r } + o.on('--load-rawdata=FILE', 'input rawdata'){|r| + opt[:rawdata_input] = r + } + o.on('-f', "--format=FORMAT", "output format (#{formats.keys.join(",")})", formats.keys){|r| + opt[:format] = r + } o.on('-v', '--verbose'){|v| opt[:verbose] = v } @@ -316,6 +413,15 @@ if __FILE__ == $0 } parser.parse!(ARGV) - BenchmarkDriver.benchmark(opt) + opt[:output] ||= "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}#{formats[opt[:format]]}" + + if input = opt[:rawdata_input] + b = open(input) {|f| + BenchmarkDriver.load(f, File.extname(input)[1..-1], opt) + } + b.show_results + else + BenchmarkDriver.benchmark(opt) + end end diff --git a/benchmark/memory_wrapper.rb b/benchmark/memory_wrapper.rb new file mode 100644 index 0000000000..3f4451a037 --- /dev/null +++ b/benchmark/memory_wrapper.rb @@ -0,0 +1,16 @@ + +write_file, target, script_file = ARGV + +load(script_file) +require_relative '../test/lib/memory_status' +open(write_file, 'wb'){|f| + ms = Memory::Status.new + case target.to_sym + when :peak + key = ms.respond_to?(:hwm) ? :hwm : :peak + when :size + key = ms.respond_to?(:rss) ? :rss : :size + end + + f.puts ms[key] +} diff --git a/benchmark/prepare_require.rb b/benchmark/prepare_require.rb new file mode 100644 index 0000000000..c4786f04ad --- /dev/null +++ b/benchmark/prepare_require.rb @@ -0,0 +1,25 @@ +require "fileutils" + +def prepare + num_files = 10000 + + basename = File.dirname($0) + data_dir = File.join(basename, "bm_require.data") + + # skip if all of files exists + if File.exist?(File.join(data_dir, "c#{num_files}.rb")) + return + end + + FileUtils.mkdir_p(data_dir) + + 1.upto(num_files) do |i| + f = File.open("#{data_dir}/c#{i}.rb", "w") + f.puts <<-END + class C#{i} + end + END + end +end + +prepare diff --git a/benchmark/prepare_require_thread.rb b/benchmark/prepare_require_thread.rb new file mode 100644 index 0000000000..339ecb8b39 --- /dev/null +++ b/benchmark/prepare_require_thread.rb @@ -0,0 +1,2 @@ +load File.join(File.dirname(__FILE__), "prepare_require.rb") + @@ -22,7 +22,7 @@ #ifdef HAVE_IEEEFP_H #include <ieeefp.h> #endif -#include <assert.h> +#include "ruby_assert.h" #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H) #define USE_GMP @@ -31,7 +31,9 @@ #define RB_BIGNUM_TYPE_P(x) RB_TYPE_P((x), T_BIGNUM) +#ifndef RUBY_INTEGER_UNIFICATION VALUE rb_cBignum; +#endif const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz"; #ifndef SIZEOF_BDIGIT_DBL @@ -98,7 +100,6 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0); rb_absint_size(x, NULL)) #define BIGDIVREM_EXTRA_WORDS 1 -#define roomof(n, m) ((long)(((n)+(m)-1) / (m))) #define bdigit_roomof(n) roomof(n, SIZEOF_BDIGIT) #define BARY_ARGS(ary) ary, numberof(ary) @@ -111,7 +112,7 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0); #define BIGNUM_SET_NEGATIVE_SIGN(b) BIGNUM_SET_SIGN(b, 0) #define BIGNUM_SET_POSITIVE_SIGN(b) BIGNUM_SET_SIGN(b, 1) -#define bignew(len,sign) bignew_1(rb_cBignum,(len),(sign)) +#define bignew(len,sign) bignew_1(rb_cInteger,(len),(sign)) #define BDIGITS_ZERO(ptr, n) do { \ BDIGIT *bdigitz_zero_ptr = (ptr); \ @@ -173,7 +174,7 @@ static int nlz(BDIGIT x) { return nlz_int128((uint128_t)x) - (SIZEOF_INT128_T-SI #define U128(a,b,c,d) (((uint128_t)U64(a,b) << 64) | U64(c,d)) #endif -/* The following scirpt, maxpow.rb, generates the tables follows. +/* The following script, maxpow.rb, generates the tables follows. def big(n, bits) ns = [] @@ -2979,7 +2980,7 @@ static VALUE bignew_1(VALUE klass, size_t len, int sign) { NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0)); - BIGNUM_SET_SIGN(big, sign?1:0); + BIGNUM_SET_SIGN(big, sign); if (len <= BIGNUM_EMBED_LEN_MAX) { RBASIC(big)->flags |= BIGNUM_EMBED_FLAG; BIGNUM_SET_LEN(big, len); @@ -3175,7 +3176,7 @@ rb_int2big(SIGNED_VALUE n) } big = rb_uint2big(u); if (neg) { - BIGNUM_SET_SIGN(big, 0); + BIGNUM_SET_NEGATIVE_SIGN(big); } return big; } @@ -3686,16 +3687,44 @@ rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t na #define conv_digit(c) (ruby_digit36_to_number_table[(unsigned char)(c)]) -static void -str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size_t *num_digits_p, size_t *len_p) +NORETURN(static inline void invalid_radix(int base)); +NORETURN(static inline void invalid_integer(VALUE s)); + +static inline int +valid_radix_p(int base) +{ + return (1 < base && base <= 36); +} + +static inline void +invalid_radix(int base) +{ + rb_raise(rb_eArgError, "invalid radix %d", base); +} + +static inline void +invalid_integer(VALUE s) +{ + rb_raise(rb_eArgError, "invalid value for Integer(): %+"PRIsVALUE, s); +} + +static int +str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size_t *num_digits_p, ssize_t *len_p) { char nondigit = 0; size_t num_digits = 0; const char *digits_start = str; const char *digits_end = str; + ssize_t len = *len_p; int c; + if (!len) { + *num_digits_p = 0; + *len_p = 0; + return TRUE; + } + if (badcheck && *str == '_') goto bad; while ((c = *str++) != 0) { @@ -3705,27 +3734,32 @@ str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size break; } nondigit = (char) c; - continue; } - else if ((c = conv_digit(c)) < 0) { + else if ((c = conv_digit(c)) < 0 || c >= base) { break; } - if (c >= base) break; - nondigit = 0; - num_digits++; - digits_end = str; + else { + nondigit = 0; + num_digits++; + digits_end = str; + } + if (len > 0 && !--len) break; } - if (badcheck) { + if (badcheck && nondigit) goto bad; + if (badcheck && len) { str--; - if (s+1 < str && str[-1] == '_') goto bad; - while (*str && ISSPACE(*str)) str++; - if (*str) { + while (*str && ISSPACE(*str)) { + str++; + if (len > 0 && !--len) break; + } + if (len && *str) { bad: - rb_invalid_str(s, "Integer()"); + return FALSE; } } *num_digits_p = num_digits; *len_p = digits_end - digits_start; + return TRUE; } static VALUE @@ -3940,59 +3974,111 @@ str2big_gmp( } #endif +/* + * Parse +str+ as Ruby Integer, i.e., underscores, 0d and 0b prefixes. + * + * str: pointer to the string to be parsed. + * should be NUL-terminated. + * base: base of conversion, must be 2..36, or -36..0. + * if +base+ > 0, the conversion is done according to the +base+ + * and unmatched prefix is parsed as a part of the result if + * present. + * if +base+ <= 0, the conversion is done according to the + * prefix if present, in base <code>-base</code> if +base+ < -1, + * or in base 10. + * badcheck: if non-zero, +ArgumentError+ is raised when +str+ is not + * valid as an Integer. if zero, Fixnum 0 is returned in + * that case. + */ VALUE rb_cstr_to_inum(const char *str, int base, int badcheck) { - const char *s = str; + char *end; + VALUE ret = rb_cstr_parse_inum(str, -1, (badcheck ? NULL : &end), base); + if (NIL_P(ret)) { + if (badcheck) rb_invalid_str(str, "Integer()"); + ret = INT2FIX(0); + } + return ret; +} + +/* + * Parse +str+ as Ruby Integer, i.e., underscores, 0d and 0b prefixes. + * + * str: pointer to the string to be parsed. + * should be NUL-terminated if +len+ is negative. + * len: length of +str+ if >= 0. if +len+ is negative, +str+ should + * be NUL-terminated. + * endp: if non-NULL, the address after parsed part is stored. if + * NULL, Qnil is returned when +str+ is not valid as an Integer. + * base: see +rb_cstr_to_inum+ + */ + +VALUE +rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base) +{ + const char *const s = str; char sign = 1; int c; VALUE z; - int bits_per_digit; + unsigned long val; + int ov; const char *digits_start, *digits_end; size_t num_digits; size_t num_bdigits; - size_t len; + const ssize_t len0 = len; + const int badcheck = !endp; + +#define ADV(n) do {\ + if (len > 0 && len <= (n)) goto bad; \ + str += (n); \ + len -= (n); \ + } while (0) +#define ASSERT_LEN() do {\ + assert(len != 0); \ + if (len0 >= 0) assert(s + len0 == str + len); \ + } while (0) if (!str) { - if (badcheck) { - bad: - rb_invalid_str(s, "Integer()"); - } - return INT2FIX(0); + bad: + if (endp) *endp = (char *)str; + return Qnil; } - while (ISSPACE(*str)) str++; + if (len) { + while (ISSPACE(*str)) ADV(1); - if (str[0] == '+') { - str++; - } - else if (str[0] == '-') { - str++; - sign = 0; - } - if (str[0] == '+' || str[0] == '-') { - if (badcheck) goto bad; - return INT2FIX(0); + if (str[0] == '+') { + ADV(1); + } + else if (str[0] == '-') { + ADV(1); + sign = 0; + } + ASSERT_LEN(); + if (str[0] == '+' || str[0] == '-') { + goto bad; + } } if (base <= 0) { - if (str[0] == '0') { + if (str[0] == '0' && len > 1) { switch (str[1]) { case 'x': case 'X': base = 16; - str += 2; + ADV(2); break; case 'b': case 'B': base = 2; - str += 2; + ADV(2); break; case 'o': case 'O': base = 8; - str += 2; + ADV(2); break; case 'd': case 'D': base = 10; - str += 2; + ADV(2); break; default: base = 8; @@ -4005,31 +4091,36 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) base = 10; } } + else if (len == 1) { + /* no prefix */ + } else if (base == 2) { if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) { - str += 2; + ADV(2); } } else if (base == 8) { if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) { - str += 2; + ADV(2); } } else if (base == 10) { if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) { - str += 2; + ADV(2); } } else if (base == 16) { if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) { - str += 2; + ADV(2); } } - if (base < 2 || 36 < base) { - rb_raise(rb_eArgError, "invalid radix %d", base); + if (!valid_radix_p(base)) { + invalid_radix(base); } - if (*str == '0') { /* squeeze preceding 0s */ + if (!len) goto bad; + if (*str == '0' && len != 1) { /* squeeze preceding 0s */ int us = 0; + const char *end = len < 0 ? NULL : str + len; while ((c = *++str) == '0' || c == '_') { if (c == '_') { if (++us >= 2) @@ -4038,26 +4129,29 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) else { us = 0; } + if (str == end) break; } - if (!(c = *str) || ISSPACE(c)) --str; + if (!c || ISSPACE(c)) --str; + if (end) len = end - str; + ASSERT_LEN(); } c = *str; c = conv_digit(c); if (c < 0 || c >= base) { - if (badcheck) goto bad; - return INT2FIX(0); + goto bad; } - bits_per_digit = bit_length(base-1); - if (bits_per_digit * strlen(str) <= sizeof(long) * CHAR_BIT) { - char *end; - unsigned long val = STRTOUL(str, &end, base); - - if (str < end && *end == '_') goto bigparse; + val = ruby_scan_digits(str, len, base, &num_digits, &ov); + if (!ov) { + const char *end = &str[num_digits]; + if (num_digits > 0 && *end == '_') goto bigparse; + if (endp) *endp = (char *)end; if (badcheck) { - if (end == str) goto bad; /* no number */ - while (*end && ISSPACE(*end)) end++; - if (*end) goto bad; /* trailing garbage */ + if (num_digits == 0) return Qnil; /* no number */ + while (len < 0 ? *end : end < str + len) { + if (!ISSPACE(*end)) return Qnil; /* trailing garbage */ + end++; + } } if (POSFIXABLE(val)) { @@ -4076,12 +4170,13 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) bigparse: digits_start = str; - str2big_scan_digits(s, str, base, badcheck, &num_digits, &len); + if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len)) + goto bad; digits_end = digits_start + len; if (POW2_P(base)) { z = str2big_poweroftwo(sign, digits_start, digits_end, num_digits, - bits_per_digit); + bit_length(base-1)); } else { int digits_per_bdigits_dbl; @@ -4111,32 +4206,19 @@ rb_cstr_to_inum(const char *str, int base, int badcheck) VALUE rb_str_to_inum(VALUE str, int base, int badcheck) { - char *s; - long len; - VALUE v = 0; VALUE ret; + const char *s; + long len; + char *end; StringValue(str); rb_must_asciicompat(str); - if (badcheck) { - s = StringValueCStr(str); - } - else { - s = RSTRING_PTR(str); - } - if (s) { - len = RSTRING_LEN(str); - if (s[len]) { /* no sentinel somehow */ - char *p = ALLOCV(v, len+1); - - MEMCPY(p, s, char, len); - p[len] = '\0'; - s = p; - } + RSTRING_GETMEM(str, s, len); + ret = rb_cstr_parse_inum(s, len, (badcheck ? NULL : &end), base); + if (NIL_P(ret)) { + if (badcheck) invalid_integer(str); + ret = INT2FIX(0); } - ret = rb_cstr_to_inum(s, base, badcheck); - if (v) - ALLOCV_END(v); return ret; } @@ -4147,22 +4229,25 @@ rb_str2big_poweroftwo(VALUE arg, int base, int badcheck) const char *s, *str; const char *digits_start, *digits_end; size_t num_digits; - size_t len; + ssize_t len; VALUE z; - if (base < 2 || 36 < base || !POW2_P(base)) { - rb_raise(rb_eArgError, "invalid radix %d", base); + if (!valid_radix_p(base) || !POW2_P(base)) { + invalid_radix(base); } rb_must_asciicompat(arg); s = str = StringValueCStr(arg); + len = RSTRING_LEN(arg); if (*str == '-') { + len--; str++; positive_p = 0; } digits_start = str; - str2big_scan_digits(s, str, base, badcheck, &num_digits, &len); + if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len)) + invalid_integer(arg); digits_end = digits_start + len; z = str2big_poweroftwo(positive_p, digits_start, digits_end, num_digits, @@ -4180,25 +4265,28 @@ rb_str2big_normal(VALUE arg, int base, int badcheck) const char *s, *str; const char *digits_start, *digits_end; size_t num_digits; - size_t len; + ssize_t len; VALUE z; int digits_per_bdigits_dbl; size_t num_bdigits; - if (base < 2 || 36 < base) { - rb_raise(rb_eArgError, "invalid radix %d", base); + if (!valid_radix_p(base)) { + invalid_radix(base); } rb_must_asciicompat(arg); - s = str = StringValueCStr(arg); - if (*str == '-') { + s = str = StringValuePtr(arg); + len = RSTRING_LEN(arg); + if (len > 0 && *str == '-') { + len--; str++; positive_p = 0; } digits_start = str; - str2big_scan_digits(s, str, base, badcheck, &num_digits, &len); + if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len)) + invalid_integer(arg); digits_end = digits_start + len; maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl); @@ -4219,25 +4307,28 @@ rb_str2big_karatsuba(VALUE arg, int base, int badcheck) const char *s, *str; const char *digits_start, *digits_end; size_t num_digits; - size_t len; + ssize_t len; VALUE z; int digits_per_bdigits_dbl; size_t num_bdigits; - if (base < 2 || 36 < base) { - rb_raise(rb_eArgError, "invalid radix %d", base); + if (!valid_radix_p(base)) { + invalid_radix(base); } rb_must_asciicompat(arg); - s = str = StringValueCStr(arg); - if (*str == '-') { + s = str = StringValuePtr(arg); + len = RSTRING_LEN(arg); + if (len > 0 && *str == '-') { + len--; str++; positive_p = 0; } digits_start = str; - str2big_scan_digits(s, str, base, badcheck, &num_digits, &len); + if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len)) + invalid_integer(arg); digits_end = digits_start + len; maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl); @@ -4259,25 +4350,28 @@ rb_str2big_gmp(VALUE arg, int base, int badcheck) const char *s, *str; const char *digits_start, *digits_end; size_t num_digits; - size_t len; + ssize_t len; VALUE z; int digits_per_bdigits_dbl; size_t num_bdigits; - if (base < 2 || 36 < base) { - rb_raise(rb_eArgError, "invalid radix %d", base); + if (!valid_radix_p(base)) { + invalid_radix(base); } rb_must_asciicompat(arg); - s = str = StringValueCStr(arg); - if (*str == '-') { + s = str = StringValuePtr(arg); + len = RSTRING_LEN(arg); + if (len > 0 && *str == '-') { + len--; str++; positive_p = 0; } digits_start = str; - str2big_scan_digits(s, str, base, badcheck, &num_digits, &len); + if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len)) + invalid_integer(arg); digits_end = digits_start + len; maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl); @@ -4331,7 +4425,7 @@ rb_ll2big(LONG_LONG n) } big = rb_ull2big(u); if (neg) { - BIGNUM_SET_SIGN(big, 0); + BIGNUM_SET_NEGATIVE_SIGN(big); } return big; } @@ -4352,6 +4446,46 @@ rb_ll2inum(LONG_LONG n) #endif /* HAVE_LONG_LONG */ +#ifdef HAVE_INT128_T +static VALUE +rb_uint128t2big(uint128_t n) +{ + long i; + VALUE big = bignew(bdigit_roomof(SIZEOF_INT128_T), 1); + BDIGIT *digits = BDIGITS(big); + + for (i = 0; i < bdigit_roomof(SIZEOF_INT128_T); i++) { + digits[i] = BIGLO(RSHIFT(n ,BITSPERDIG*i)); + } + + i = bdigit_roomof(SIZEOF_INT128_T); + while (i-- && !digits[i]) ; + BIGNUM_SET_LEN(big, i+1); + return big; +} + +VALUE +rb_int128t2big(int128_t n) +{ + int neg = 0; + uint128_t u; + VALUE big; + + if (n < 0) { + u = 1 + (uint128_t)(-(n + 1)); /* u = -n avoiding overflow */ + neg = 1; + } + else { + u = n; + } + big = rb_uint128t2big(u); + if (neg) { + BIGNUM_SET_NEGATIVE_SIGN(big); + } + return big; +} +#endif + VALUE rb_cstr2inum(const char *str, int base) { @@ -4560,8 +4694,9 @@ big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t tail p = buf; j = sizeof(buf); do { - p[--j] = ruby_digitmap[num % b2s->base]; + BDIGIT_DBL idx = num % b2s->base; num /= b2s->base; + p[--j] = ruby_digitmap[idx]; } while (num); len = sizeof(buf) - j; big2str_alloc(b2s, len + taillen); @@ -4571,8 +4706,9 @@ big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t tail p = b2s->ptr; j = b2s->hbase2_numdigits; do { - p[--j] = ruby_digitmap[num % b2s->base]; + BDIGIT_DBL idx = num % b2s->base; num /= b2s->base; + p[--j] = ruby_digitmap[idx]; } while (j); len = b2s->hbase2_numdigits; } @@ -4756,8 +4892,8 @@ big2str_generic(VALUE x, int base) return rb_usascii_str_new2("0"); } - if (base < 2 || 36 < base) - rb_raise(rb_eArgError, "invalid radix %d", base); + if (!valid_radix_p(base)) + invalid_radix(base); if (xn >= LONG_MAX/BITSPERDIG) { rb_raise(rb_eRangeError, "bignum too big to convert into `string'"); @@ -4823,7 +4959,7 @@ rb_big2str_generic(VALUE x, int base) } #ifdef USE_GMP -VALUE +static VALUE big2str_gmp(VALUE x, int base) { const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT; @@ -4882,8 +5018,8 @@ rb_big2str1(VALUE x, int base) return rb_usascii_str_new2("0"); } - if (base < 2 || 36 < base) - rb_raise(rb_eArgError, "invalid radix %d", base); + if (!valid_radix_p(base)) + invalid_radix(base); if (xn >= LONG_MAX/BITSPERDIG) { rb_raise(rb_eRangeError, "bignum too big to convert into `string'"); @@ -4909,35 +5045,6 @@ rb_big2str(VALUE x, int base) return rb_big2str1(x, base); } -/* - * 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(int argc, VALUE *argv, VALUE x) -{ - int base; - - if (argc == 0) base = 10; - else { - VALUE b; - - rb_scan_args(argc, argv, "01", &b); - base = NUM2INT(b); - } - return rb_big2str(x, base); -} - static unsigned long big2ulong(VALUE x, const char *type) { @@ -4972,10 +5079,8 @@ rb_big2ulong(VALUE x) return num; } else { - if (num <= LONG_MAX) - return -(long)num; - if (num == 1+(unsigned long)(-(LONG_MIN+1))) - return LONG_MIN; + if (num <= 1+(unsigned long)(-(LONG_MIN+1))) + return -(long)(num-1)-1; } rb_raise(rb_eRangeError, "bignum out of range of unsigned long"); } @@ -4990,10 +5095,8 @@ rb_big2long(VALUE x) return num; } else { - if (num <= LONG_MAX) - return -(long)num; - if (num == 1+(unsigned long)(-(LONG_MIN+1))) - return LONG_MIN; + if (num <= 1+(unsigned long)(-(LONG_MIN+1))) + return -(long)(num-1)-1; } rb_raise(rb_eRangeError, "bignum too big to convert into `long'"); } @@ -5032,10 +5135,8 @@ rb_big2ull(VALUE x) return num; } else { - if (num <= LLONG_MAX) - return -(LONG_LONG)num; - if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1))) - return LLONG_MIN; + if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1))) + return -(LONG_LONG)(num-1)-1; } rb_raise(rb_eRangeError, "bignum out of range of unsigned long long"); } @@ -5050,10 +5151,8 @@ rb_big2ll(VALUE x) return num; } else { - if (num <= LLONG_MAX) - return -(LONG_LONG)num; - if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1))) - return LLONG_MIN; + if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1))) + return -(LONG_LONG)(num-1)-1; } rb_raise(rb_eRangeError, "bignum too big to convert into `long long'"); } @@ -5144,7 +5243,7 @@ big2dbl(VALUE x) } } } - if (!BIGNUM_SIGN(x)) d = -d; + if (BIGNUM_NEGATIVE_P(x)) d = -d; return d; } @@ -5163,21 +5262,6 @@ rb_big2dbl(VALUE x) 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(VALUE x) -{ - return DBL2NUM(rb_big2dbl(x)); -} - VALUE rb_integer_float_cmp(VALUE x, VALUE y) { @@ -5260,36 +5344,24 @@ rb_integer_float_eq(VALUE x, VALUE y) return rb_big_eq(x, y); } -/* - * call-seq: - * big <=> numeric -> -1, 0, +1 or nil - * - * Comparison---Returns -1, 0, or +1 depending on whether +big+ is - * less than, equal to, or greater than +numeric+. This is the - * basis for the tests in Comparable. - * - * +nil+ is returned if the two values are incomparable. - * - */ - VALUE rb_big_cmp(VALUE x, VALUE y) { - int cmp; - if (FIXNUM_P(y)) { - x = bignorm(x); + x = bigfixize(x); if (FIXNUM_P(x)) { - if (FIX2LONG(x) > FIX2LONG(y)) return INT2FIX(1); - if (FIX2LONG(x) < FIX2LONG(y)) return INT2FIX(-1); - return INT2FIX(0); - } - else { - if (BIGNUM_NEGATIVE_P(x)) return INT2FIX(-1); - return INT2FIX(1); + /* SIGNED_VALUE and Fixnum have same sign-bits, same + * order */ + SIGNED_VALUE sx = (SIGNED_VALUE)x, sy = (SIGNED_VALUE)y; + if (sx < sy) return INT2FIX(-1); + return INT2FIX(sx > sy); } } else if (RB_BIGNUM_TYPE_P(y)) { + if (BIGNUM_SIGN(x) == BIGNUM_SIGN(y)) { + int cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y)); + return INT2FIX(BIGNUM_SIGN(x) ? cmp : -cmp); + } } else if (RB_FLOAT_TYPE_P(y)) { return rb_integer_float_cmp(x, y); @@ -5297,15 +5369,7 @@ rb_big_cmp(VALUE x, VALUE y) else { return rb_num_coerce_cmp(x, y, rb_intern("<=>")); } - - if (BIGNUM_SIGN(x) > BIGNUM_SIGN(y)) return INT2FIX(1); - if (BIGNUM_SIGN(x) < BIGNUM_SIGN(y)) return INT2FIX(-1); - - cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y)); - if (BIGNUM_SIGN(x)) - return INT2FIX(cmp); - else - return INT2FIX(-cmp); + return INT2FIX(BIGNUM_SIGN(x) ? 1 : -1); } enum big_op_t { @@ -5350,58 +5414,26 @@ big_op(VALUE x, VALUE y, enum big_op_t op) return Qundef; } -/* - * call-seq: - * big > real -> true or false - * - * Returns <code>true</code> if the value of <code>big</code> is - * greater than that of <code>real</code>. - */ - -static VALUE -big_gt(VALUE x, VALUE y) +VALUE +rb_big_gt(VALUE x, VALUE y) { return big_op(x, y, big_op_gt); } -/* - * call-seq: - * big >= real -> true or false - * - * Returns <code>true</code> if the value of <code>big</code> is - * greater than or equal to that of <code>real</code>. - */ - -static VALUE -big_ge(VALUE x, VALUE y) +VALUE +rb_big_ge(VALUE x, VALUE y) { return big_op(x, y, big_op_ge); } -/* - * call-seq: - * big < real -> true or false - * - * Returns <code>true</code> if the value of <code>big</code> is - * less than that of <code>real</code>. - */ - -static VALUE -big_lt(VALUE x, VALUE y) +VALUE +rb_big_lt(VALUE x, VALUE y) { return big_op(x, y, big_op_lt); } -/* - * call-seq: - * big <= real -> true or false - * - * Returns <code>true</code> if the value of <code>big</code> is - * less than or equal to that of <code>real</code>. - */ - -static VALUE -big_le(VALUE x, VALUE y) +VALUE +rb_big_le(VALUE x, VALUE y) { return big_op(x, y, big_op_le); } @@ -5421,8 +5453,7 @@ VALUE rb_big_eq(VALUE x, VALUE y) { if (FIXNUM_P(y)) { - if (bignorm(x) == y) return Qtrue; - y = rb_int2big(FIX2LONG(y)); + return bignorm(x) == y ? Qtrue : Qfalse; } else if (RB_BIGNUM_TYPE_P(y)) { } @@ -5438,17 +5469,6 @@ rb_big_eq(VALUE x, VALUE 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 - */ - VALUE rb_big_eql(VALUE x, VALUE y) { @@ -5459,37 +5479,18 @@ rb_big_eql(VALUE x, VALUE y) return Qtrue; } -/* - * call-seq: - * -big -> integer - * - * Unary minus (returns an integer whose value is 0-big) - */ - VALUE rb_big_uminus(VALUE x) { VALUE z = rb_big_clone(x); - BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x)); + BIGNUM_NEGATE(z); 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(VALUE x) +VALUE +rb_big_comp(VALUE x) { VALUE z = rb_big_clone(x); BDIGIT *ds = BDIGITS(z); @@ -5569,7 +5570,7 @@ bigsub_int(VALUE x, long y0) assert(xn == zn); num = (BDIGIT_DBL_SIGNED)xds[0] - y; if (xn == 1 && num < 0) { - BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x)); + BIGNUM_NEGATE(z); zds[0] = (BDIGIT)-num; RB_GC_GUARD(x); return bignorm(z); @@ -5632,7 +5633,7 @@ bigsub_int(VALUE x, long y0) assert(num == 0 || num == -1); if (num < 0) { get2comp(z); - BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x)); + BIGNUM_NEGATE(z); } RB_GC_GUARD(x); return bignorm(z); @@ -5748,13 +5749,6 @@ bigadd(VALUE x, VALUE y, int sign) return z; } -/* - * call-seq: - * big + other -> Numeric - * - * Adds big and other, returning the result. - */ - VALUE rb_big_plus(VALUE x, VALUE y) { @@ -5784,13 +5778,6 @@ rb_big_plus(VALUE x, VALUE y) } } -/* - * call-seq: - * big - other -> Numeric - * - * Subtracts other from big, returning the result. - */ - VALUE rb_big_minus(VALUE x, VALUE y) { @@ -5878,13 +5865,6 @@ bigmul0(VALUE x, VALUE y) return z; } -/* - * call-seq: - * big * other -> Numeric - * - * Multiplies big and other, returning the result. - */ - VALUE rb_big_mul(VALUE x, VALUE y) { @@ -6040,43 +6020,18 @@ rb_big_divide(VALUE x, VALUE y, ID op) return bignorm(z); } -/* - * call-seq: - * big / other -> Numeric - * - * Performs division: the class of the resulting object depends on - * the class of <code>numeric</code> and on the magnitude of the - * result. - */ - VALUE rb_big_div(VALUE x, VALUE y) { return rb_big_divide(x, y, '/'); } -/* - * call-seq: - * big.div(other) -> integer - * - * Performs integer division: returns integer value. - */ - VALUE rb_big_idiv(VALUE x, VALUE y) { return rb_big_divide(x, y, rb_intern("div")); } -/* - * call-seq: - * big % other -> Numeric - * big.modulo(other) -> Numeric - * - * Returns big modulo other. See Numeric.divmod for more - * information. - */ - VALUE rb_big_modulo(VALUE x, VALUE y) { @@ -6093,16 +6048,7 @@ rb_big_modulo(VALUE x, VALUE 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 +VALUE rb_big_remainder(VALUE x, VALUE y) { VALUE z; @@ -6118,13 +6064,6 @@ rb_big_remainder(VALUE x, VALUE y) return bignorm(z); } -/* - * call-seq: - * big.divmod(numeric) -> array - * - * See <code>Numeric#divmod</code>. - * - */ VALUE rb_big_divmod(VALUE x, VALUE y) { @@ -6196,19 +6135,6 @@ big_fdiv_float(VALUE x, VALUE y) return big_fdiv(x, y, i - DBL_MANT_DIG); } -/* - * call-seq: - * big.fdiv(numeric) -> float - * - * Returns the floating point result of dividing <i>big</i> by - * <i>numeric</i>. - * - * -1234567890987654321.fdiv(13731) #=> -89910996357705.5 - * -1234567890987654321.fdiv(13731.24) #=> -89909424858035.7 - * - */ - - VALUE rb_big_fdiv(VALUE x, VALUE y) { @@ -6238,19 +6164,6 @@ rb_big_fdiv(VALUE x, VALUE y) return DBL2NUM(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(VALUE x, VALUE y) { @@ -6261,7 +6174,7 @@ rb_big_pow(VALUE x, VALUE y) if (y == INT2FIX(0)) return INT2FIX(1); if (RB_FLOAT_TYPE_P(y)) { d = RFLOAT_VALUE(y); - if ((!BIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d)) + if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x)) && d != round(d)) return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y); } else if (RB_BIGNUM_TYPE_P(y)) { @@ -6360,13 +6273,6 @@ bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y) return bignorm(z); } -/* - * call-seq: - * big & numeric -> integer - * - * Performs bitwise +and+ between _big_ and _numeric_. - */ - VALUE rb_big_and(VALUE x, VALUE y) { @@ -6486,13 +6392,6 @@ bigor_int(VALUE x, long xn, BDIGIT hibitsx, long y) return bignorm(z); } -/* - * call-seq: - * big | numeric -> integer - * - * Performs bitwise +or+ between _big_ and _numeric_. - */ - VALUE rb_big_or(VALUE x, VALUE y) { @@ -6586,12 +6485,6 @@ bigxor_int(VALUE x, long xn, BDIGIT hibitsx, long y) RB_GC_GUARD(x); return bignorm(z); } -/* - * call-seq: - * big ^ numeric -> integer - * - * Performs bitwise +exclusive or+ between _big_ and _numeric_. - */ VALUE rb_big_xor(VALUE x, VALUE y) @@ -6641,13 +6534,6 @@ rb_big_xor(VALUE x, VALUE y) return bignorm(z); } -/* - * call-seq: - * big << numeric -> integer - * - * Shifts big left _numeric_ positions (right if _numeric_ is negative). - */ - VALUE rb_big_lshift(VALUE x, VALUE y) { @@ -6678,14 +6564,6 @@ rb_big_lshift(VALUE x, VALUE y) } } - -/* - * call-seq: - * big >> numeric -> integer - * - * Shifts big right _numeric_ positions (left if _numeric_ is negative). - */ - VALUE rb_big_rshift(VALUE x, VALUE y) { @@ -6716,26 +6594,7 @@ rb_big_rshift(VALUE x, VALUE y) } } -/* - * 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 +VALUE rb_big_aref(VALUE x, VALUE y) { BDIGIT *xds; @@ -6745,7 +6604,7 @@ rb_big_aref(VALUE x, VALUE y) BDIGIT bit; if (RB_BIGNUM_TYPE_P(y)) { - if (!BIGNUM_SIGN(y)) + if (BIGNUM_NEGATIVE_P(y)) return INT2FIX(0); bigtrunc(y); if (BIGSIZE(y) > sizeof(size_t)) { @@ -6780,16 +6639,7 @@ rb_big_aref(VALUE x, VALUE y) return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0); } -/* - * call-seq: - * big.hash -> fixnum - * - * Compute a hash based on the value of _big_. - * - * See also Object#hash. - */ - -static VALUE +VALUE rb_big_hash(VALUE x) { st_index_t hash; @@ -6813,95 +6663,41 @@ rb_big_hash(VALUE x) */ static VALUE -rb_big_coerce(VALUE x, VALUE y) +rb_int_coerce(VALUE x, VALUE y) { - if (FIXNUM_P(y)) { - y = rb_int2big(FIX2LONG(y)); + if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) { + return rb_assoc_new(y, x); } - else if (!RB_BIGNUM_TYPE_P(y)) { - rb_raise(rb_eTypeError, "can't coerce %s to Bignum", - rb_obj_classname(y)); + else { + x = rb_Float(x); + y = rb_Float(y); + return rb_assoc_new(y, x); } - return rb_assoc_new(y, x); } -/* - * call-seq: - * big.abs -> aBignum - * big.magnitude -> aBignum - * - * Returns the absolute value of <i>big</i>. - * - * -1234567890987654321.abs #=> 1234567890987654321 - */ - -static VALUE +VALUE rb_big_abs(VALUE x) { - if (!BIGNUM_SIGN(x)) { + if (BIGNUM_NEGATIVE_P(x)) { x = rb_big_clone(x); - BIGNUM_SET_SIGN(x, 1); + BIGNUM_SET_POSITIVE_SIGN(x); } return x; } -/* - * 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 +size_t rb_big_size(VALUE big) { - return SIZET2NUM(BIGSIZE(big)); + return BIGSIZE(big); } -/* - * call-seq: - * int.bit_length -> integer - * - * Returns the number of bits of the value of <i>int</i>. - * - * "the number of bits" means that - * the bit position of the highest bit which is different to the sign bit. - * (The bit position of the bit 2**n is n+1.) - * If there is no such bit (zero or minus one), zero is returned. - * - * I.e. This method returns ceil(log2(int < 0 ? -int : int+1)). - * - * (-2**10000-1).bit_length #=> 10001 - * (-2**10000).bit_length #=> 10000 - * (-2**10000+1).bit_length #=> 10000 - * - * (-2**1000-1).bit_length #=> 1001 - * (-2**1000).bit_length #=> 1000 - * (-2**1000+1).bit_length #=> 1000 - * - * (2**1000-1).bit_length #=> 1000 - * (2**1000).bit_length #=> 1001 - * (2**1000+1).bit_length #=> 1001 - * - * (2**10000-1).bit_length #=> 10000 - * (2**10000).bit_length #=> 10001 - * (2**10000+1).bit_length #=> 10001 - * - * This method can be used to detect overflow in Array#pack as follows. - * - * if n.bit_length < 32 - * [n].pack("l") # no overflow - * else - * raise "overflow" - * end - */ +VALUE +rb_big_size_m(VALUE big) +{ + return SIZET2NUM(rb_big_size(big)); +} -static VALUE +VALUE rb_big_bit_length(VALUE big) { int nlz_bits; @@ -6942,14 +6738,7 @@ rb_big_bit_length(VALUE big) INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER); } -/* - * call-seq: - * big.odd? -> true or false - * - * Returns <code>true</code> if <i>big</i> is an odd number. - */ - -static VALUE +VALUE rb_big_odd_p(VALUE num) { if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) { @@ -6958,14 +6747,7 @@ rb_big_odd_p(VALUE num) return Qfalse; } -/* - * call-seq: - * big.even? -> true or false - * - * Returns <code>true</code> if <i>big</i> is an even number. - */ - -static VALUE +VALUE rb_big_even_p(VALUE num) { if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) { @@ -6995,51 +6777,16 @@ rb_big_even_p(VALUE num) void Init_Bignum(void) { - rb_cBignum = rb_define_class("Bignum", rb_cInteger); - - rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1); - rb_define_alias(rb_cBignum, "inspect", "to_s"); - rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1); - rb_define_method(rb_cBignum, "-@", rb_big_uminus, 0); - rb_define_method(rb_cBignum, "+", rb_big_plus, 1); - rb_define_method(rb_cBignum, "-", rb_big_minus, 1); - rb_define_method(rb_cBignum, "*", rb_big_mul, 1); - rb_define_method(rb_cBignum, "/", rb_big_div, 1); - rb_define_method(rb_cBignum, "%", rb_big_modulo, 1); - rb_define_method(rb_cBignum, "div", rb_big_idiv, 1); - rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1); - rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1); - rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1); - rb_define_method(rb_cBignum, "fdiv", rb_big_fdiv, 1); - rb_define_method(rb_cBignum, "**", rb_big_pow, 1); - rb_define_method(rb_cBignum, "&", rb_big_and, 1); - rb_define_method(rb_cBignum, "|", rb_big_or, 1); - rb_define_method(rb_cBignum, "^", rb_big_xor, 1); - rb_define_method(rb_cBignum, "~", rb_big_neg, 0); - rb_define_method(rb_cBignum, "<<", rb_big_lshift, 1); - rb_define_method(rb_cBignum, ">>", rb_big_rshift, 1); - rb_define_method(rb_cBignum, "[]", rb_big_aref, 1); - - rb_define_method(rb_cBignum, "<=>", rb_big_cmp, 1); - rb_define_method(rb_cBignum, "==", rb_big_eq, 1); - rb_define_method(rb_cBignum, ">", big_gt, 1); - rb_define_method(rb_cBignum, ">=", big_ge, 1); - rb_define_method(rb_cBignum, "<", big_lt, 1); - rb_define_method(rb_cBignum, "<=", big_le, 1); - rb_define_method(rb_cBignum, "===", rb_big_eq, 1); - rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1); - rb_define_method(rb_cBignum, "hash", rb_big_hash, 0); - rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0); - rb_define_method(rb_cBignum, "abs", rb_big_abs, 0); - rb_define_method(rb_cBignum, "magnitude", rb_big_abs, 0); - rb_define_method(rb_cBignum, "size", rb_big_size, 0); - rb_define_method(rb_cBignum, "bit_length", rb_big_bit_length, 0); - rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0); - rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0); +#ifndef RUBY_INTEGER_UNIFICATION + rb_cBignum = rb_cInteger; +#endif + rb_define_const(rb_cObject, "Bignum", rb_cInteger); + + rb_define_method(rb_cInteger, "coerce", rb_int_coerce, 1); #ifdef USE_GMP /* The version of loaded GMP. */ - rb_define_const(rb_cBignum, "GMP_VERSION", rb_sprintf("GMP %s", gmp_version)); + rb_define_const(rb_cInteger, "GMP_VERSION", rb_sprintf("GMP %s", gmp_version)); #endif power_cache_init(); @@ -76,7 +76,7 @@ class ERB require ARGV.req_arg when '-S' # security level arg = ARGV.req_arg - raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-3]\z/ + raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-1]\z/ safe_level = arg.to_i when '-T' # trim mode arg = ARGV.req_arg @@ -112,7 +112,7 @@ class ERB -v enable verbose mode -d set $DEBUG to true -r library load a library - -S safe_level set $SAFE (0..3) + -S safe_level set $SAFE (0..1) -E ex[:in] set default external/internal encodings -U set default encoding to UTF-8. -T trim_mode specify trim_mode (0..2, -) diff --git a/bin/rake b/bin/rake deleted file mode 100755 index 4e0bbb7b7a..0000000000 --- a/bin/rake +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env ruby - -#-- -# Copyright (c) 2003, 2004, 2005, 2006, 2007 Jim Weirich -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -#++ - -begin - require 'rubygems' - gem 'rake' -rescue LoadError -end - -require 'rake' - -Rake.application.run diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index d58b824386..8945c16bd7 100755 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -60,6 +60,7 @@ end def main @ruby = File.expand_path('miniruby') @verbose = false + $VERBOSE = false $stress = false @color = nil @tty = nil @@ -136,9 +137,15 @@ End @tty &&= !@verbose if @color # dircolors-like style - colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {} - @passed = "\e[#{colors["pass"] || "32"}m" - @failed = "\e[#{colors["fail"] || "31"}m" + colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {} + begin + File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c| + colors[n] ||= c + end + rescue + end + @passed = "\e[;#{colors["pass"] || "32"}m" + @failed = "\e[;#{colors["fail"] || "31"}m" @reset = "\e[m" else @passed = @failed = @reset = "" diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb index bf7478006d..8e90ac2728 100644 --- a/bootstraptest/test_eval.rb +++ b/bootstraptest/test_eval.rb @@ -109,7 +109,7 @@ assert_equal %q{foo}, %q{ } } assert_equal %q{1}, %q{ - class Fixnum + class Integer Const = 1 end 1.instance_eval %{ diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb index 5de6ee1b12..1cd9f7ac6c 100644 --- a/bootstraptest/test_fork.rb +++ b/bootstraptest/test_fork.rb @@ -24,7 +24,7 @@ assert_finish 10, %q{ assert_normal_exit(<<'End', '[ruby-dev:37934]') main = Thread.current Thread.new { sleep 0.01 until main.stop?; Thread.kill main } - Process.setrlimit(:NPROC, 1) + Process.setrlimit(:NPROC, 1) if defined?(Process::RLIMIT_NPROC) fork {} End diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb index aa65bddae1..e79092e411 100644 --- a/bootstraptest/test_literal.rb +++ b/bootstraptest/test_literal.rb @@ -15,17 +15,17 @@ assert_equal 'sym', ':sym' assert_equal ':sym', ':sym.inspect' assert_equal 'Symbol', ':sym.class' assert_equal '1234', '1234' -assert_equal 'Fixnum', '1234.class' +assert_equal 'Integer', '1234.class' assert_equal '1234', '1_2_3_4' -assert_equal 'Fixnum', '1_2_3_4.class' +assert_equal 'Integer', '1_2_3_4.class' assert_equal '18', '0x12' -assert_equal 'Fixnum', '0x12.class' +assert_equal 'Integer', '0x12.class' assert_equal '15', '0o17' -assert_equal 'Fixnum', '0o17.class' +assert_equal 'Integer', '0o17.class' assert_equal '5', '0b101' -assert_equal 'Fixnum', '0b101.class' +assert_equal 'Integer', '0b101.class' assert_equal '123456789012345678901234567890', '123456789012345678901234567890' -assert_equal 'Bignum', '123456789012345678901234567890.class' +assert_equal 'Integer', '123456789012345678901234567890.class' assert_equal '2.0', '2.0' assert_equal 'Float', '1.3.class' @@ -99,7 +99,7 @@ assert_equal '[3]', '[3].inspect' assert_equal '3', 'a = [3]; a[0]' assert_equal 'Array', '[1,2].class' assert_equal '2', '[1,2].size' -assert_equal '[1, 2]', '[1,2].inspect' +assert_equal '[1, 2]', '[1,2].inspect' assert_equal 'Array', '[1,2,3,4,5].class' assert_equal '5', '[1,2,3,4,5].size' assert_equal '[1, 2, 3, 4, 5]', '[1,2,3,4,5].inspect' @@ -169,7 +169,7 @@ assert_equal 'a', 'r = ("a".."c"); r.begin' assert_equal 'c', 'r = ("a".."c"); r.end' assert_equal 'String', '__FILE__.class' -assert_equal 'Fixnum', '__LINE__.class' +assert_equal 'Integer', '__LINE__.class' ### diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb index 0a7cb0a577..3462aa9434 100644 --- a/bootstraptest/test_method.rb +++ b/bootstraptest/test_method.rb @@ -3,7 +3,7 @@ assert_equal '1', 'def m() 1 end; m()' assert_equal '1', 'def m(a) a end; m(1)' assert_equal '[1, 2]', 'def m(a,b) [a, b] end; m(1,2)' assert_equal '[1, 2, 3]', 'def m(a,b,c) [a, b, c] end; m(1,2,3)' -assert_equal 'wrong number of arguments (1 for 0)', %q{ +assert_match /\Awrong number of arguments \(.*\b1\b.* 0\)\z/, %q{ def m; end begin m(1) @@ -12,7 +12,7 @@ assert_equal 'wrong number of arguments (1 for 0)', %q{ end } -assert_equal 'wrong number of arguments (0 for 1)', %q{ +assert_match /\Awrong number of arguments \(.*\b0\b.* 1\)\z/, %q{ def m a; end begin m @@ -910,34 +910,6 @@ assert_equal 'ok', %q{ }, '[ruby-core:11998]' assert_equal 'ok', %q{ - proc{ - $SAFE = 2 - class C - def m - :ok - end - end - }.call - C.new.m -}, '[ruby-core:11998]' - -assert_equal 'ok', %q{ - proc{ - $SAFE = 3 - class C - def m - :ng - end - end - }.call - begin - C.new.m - rescue SecurityError - :ok - end -}, '[ruby-core:11998]' - -assert_equal 'ok', %q{ class B def m() :fail end end diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb index 862a94e376..24a1a0ce2c 100644 --- a/bootstraptest/test_objectspace.rb +++ b/bootstraptest/test_objectspace.rb @@ -35,7 +35,7 @@ assert_normal_exit %q{ assert_normal_exit %q{ ObjectSpace.define_finalizer("") do - Mutex.new.lock + Thread::Mutex.new.lock end }, '[ruby-dev:44049]' diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index 80eaa6416d..a111990a1f 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -376,6 +376,8 @@ assert_equal %q{1}, %q{1 or 2 or 3 or 4} assert_equal %q{1}, %q{1 or false or 3 or 4} assert_equal %q{2}, %q{nil or 2 or 3 or 4} assert_equal %q{2}, %q{false or 2 or 3 or 4} +assert_equal %q{1}, %q{if true && ""; then 1; end} +assert_equal %q{1}, %q{if nil || true; then 1; end} assert_equal %q{false}, %q{nil or false or nil or false} assert_equal %q{elseng}, %q{ case diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb index d64f44be49..d16295de8b 100644 --- a/bootstraptest/test_thread.rb +++ b/bootstraptest/test_thread.rb @@ -25,8 +25,9 @@ rescue ThreadError => e :ok if /can't create Thread/ =~ e.message end } -assert_equal %q{5000}, %q{ - 5000.times{|e| +assert_equal %q{ok}, %q{ +begin + :ok if 5000 == 5000.times{|e| (1..2).map{ Thread.new{ } @@ -34,9 +35,13 @@ assert_equal %q{5000}, %q{ e.join() } } +rescue ThreadError => e + :ok if /can't create Thread/ =~ e.message +end } -assert_equal %q{5000}, %q{ - 5000.times{|e| +assert_equal %q{ok}, %q{ +begin + :ok if 5000 == 5000.times{|e| (1..2).map{ Thread.new{ } @@ -44,6 +49,9 @@ assert_equal %q{5000}, %q{ e.join(1000000000) } } +rescue ThreadError => e + :ok if /can't create Thread/ =~ e.message +end } assert_equal %q{ok}, %q{ begin @@ -339,7 +347,7 @@ assert_equal 'ok', %q{ assert_equal 'ok', %q{ begin - m1, m2 = Mutex.new, Mutex.new + m1, m2 = Thread::Mutex.new, Thread::Mutex.new f1 = f2 = false Thread.new { m1.lock; f2 = true; sleep 0.001 until f1; m2.lock } m2.lock; f1 = true; sleep 0.001 until f2; m1.lock @@ -350,32 +358,32 @@ assert_equal 'ok', %q{ } assert_equal 'ok', %q{ - m = Mutex.new + m = Thread::Mutex.new Thread.new { m.lock }; sleep 0.1; m.lock :ok } assert_equal 'ok', %q{ - m = Mutex.new + m = Thread::Mutex.new Thread.new { m.lock }; m.lock :ok } assert_equal 'ok', %q{ - m = Mutex.new + m = Thread::Mutex.new Thread.new { m.lock }.join; m.lock :ok } assert_equal 'ok', %q{ - m = Mutex.new + m = Thread::Mutex.new Thread.new { m.lock; sleep 0.2 } sleep 0.1; m.lock :ok } assert_equal 'ok', %q{ - m = Mutex.new + m = Thread::Mutex.new Thread.new { m.lock; sleep 0.2; m.unlock } sleep 0.1; m.lock :ok @@ -401,7 +409,7 @@ assert_equal 'ok', %{ open("zzz.rb", "w") do |f| f.puts <<-'end;' # do begin - m = Mutex.new + m = Thread::Mutex.new parent = Thread.current th1 = Thread.new { m.lock; sleep } sleep 0.01 until th1.stop? @@ -429,8 +437,8 @@ assert_equal 'ok', %{ assert_finish 3, %q{ require 'thread' - lock = Mutex.new - cond = ConditionVariable.new + lock = Thread::Mutex.new + cond = Thread::ConditionVariable.new t = Thread.new do lock.synchronize do cond.wait(lock) diff --git a/ccan/list/list.h b/ccan/list/list.h index 749db7849a..ca9f9f1f7f 100644 --- a/ccan/list/list.h +++ b/ccan/list/list.h @@ -42,8 +42,8 @@ struct list_head }; #define LIST_LOC __FILE__ ":" stringify(__LINE__) -#define list_debug(h, loc) (h) -#define list_debug_node(n, loc) (n) +#define list_debug(h, loc) ((void)loc, h) +#define list_debug_node(n, loc) ((void)loc, n) /** * LIST_HEAD_INIT - initializer for an empty list_head @@ -104,6 +104,36 @@ static inline void list_node_init(struct list_node *n) } /** + * list_add_after - add an entry after an existing node in a linked list + * @h: the list_head to add the node to (for debugging) + * @p: the existing list_node to add the node after + * @n: the new list_node to add to the list. + * + * The existing list_node must already be a member of the list. + * The new list_node does not need to be initialized; it will be overwritten. + * + * Example: + * struct child c1, c2, c3; + * LIST_HEAD(h); + * + * list_add_tail(&h, &c1.list); + * list_add_tail(&h, &c3.list); + * list_add_after(&h, &c1.list, &c2.list); + */ +#define list_add_after(h, p, n) list_add_after_(h, p, n, LIST_LOC) +static inline void list_add_after_(struct list_head *h, + struct list_node *p, + struct list_node *n, + const char *abortstr) +{ + n->next = p->next; + n->prev = p; + p->next->prev = n; + p->next = n; + (void)list_debug(h, abortstr); +} + +/** * list_add - add an entry at the start of a linked list. * @h: the list_head to add the node to * @n: the list_node to add to the list. @@ -121,10 +151,34 @@ static inline void list_add_(struct list_head *h, struct list_node *n, const char *abortstr) { - n->next = h->n.next; - n->prev = &h->n; - h->n.next->prev = n; - h->n.next = n; + list_add_after_(h, &h->n, n, abortstr); +} + +/** + * list_add_before - add an entry before an existing node in a linked list + * @h: the list_head to add the node to (for debugging) + * @p: the existing list_node to add the node before + * @n: the new list_node to add to the list. + * + * The existing list_node must already be a member of the list. + * The new list_node does not need to be initialized; it will be overwritten. + * + * Example: + * list_head_init(&h); + * list_add_tail(&h, &c1.list); + * list_add_tail(&h, &c3.list); + * list_add_before(&h, &c3.list, &c2.list); + */ +#define list_add_before(h, p, n) list_add_before_(h, p, n, LIST_LOC) +static inline void list_add_before_(struct list_head *h, + struct list_node *p, + struct list_node *n, + const char *abortstr) +{ + n->next = p; + n->prev = p->prev; + p->prev->next = n; + p->prev = n; (void)list_debug(h, abortstr); } @@ -143,11 +197,7 @@ static inline void list_add_tail_(struct list_head *h, struct list_node *n, const char *abortstr) { - n->next = &h->n; - n->prev = h->n.prev; - h->n.prev->next = n; - h->n.prev = n; - (void)list_debug(h, abortstr); + list_add_before_(h, &h->n, n, abortstr); } /** @@ -265,6 +315,39 @@ static inline void list_del_from(struct list_head *h, struct list_node *n) } /** + * list_swap - swap out an entry from an (unknown) linked list for a new one. + * @o: the list_node to replace from the list. + * @n: the list_node to insert in place of the old one. + * + * Note that this leaves @o in an undefined state; it can be added to + * another list, but not deleted/swapped again. + * + * See also: + * list_del() + * + * Example: + * struct child x1, x2; + * LIST_HEAD(xh); + * + * list_add(&xh, &x1.list); + * list_swap(&x1.list, &x2.list); + */ +#define list_swap(o, n) list_swap_(o, n, LIST_LOC) +static inline void list_swap_(struct list_node *o, + struct list_node *n, + const char* abortstr) +{ + (void)list_debug_node(o, abortstr); + *n = *o; + n->next->prev = n; + n->prev->next = n; +#ifdef CCAN_LIST_DEBUG + /* Catch use-after-del. */ + o->next = o->prev = NULL; +#endif +} + +/** * list_entry - convert a list_node back into the structure containing it. * @n: the list_node * @type: the type of the entry @@ -385,9 +468,29 @@ static inline const void *list_tail_(const struct list_head *h, size_t off) * printf("Name: %s\n", child->name); */ #define list_for_each_rev(h, i, member) \ - for (i = container_of_var(list_debug(h, LIST_LOC)->n.prev, i, member); \ - &i->member != &(h)->n; \ - i = container_of_var(i->member.prev, i, member)) + list_for_each_rev_off(h, i, list_off_var_(i, member)) + +/** + * list_for_each_rev_safe - iterate through a list backwards, + * maybe during deletion + * @h: the list_head + * @i: the structure containing the list_node + * @nxt: the structure containing the list_node + * @member: the list_node member of the structure + * + * This is a convenient wrapper to iterate @i over the entire list backwards. + * It's a for loop, so you can break and continue as normal. The extra + * variable * @nxt is used to hold the next element, so you can delete @i + * from the list. + * + * Example: + * struct child *next; + * list_for_each_rev_safe(&parent->children, child, next, list) { + * printf("Name: %s\n", child->name); + * } + */ +#define list_for_each_rev_safe(h, i, nxt, member) \ + list_for_each_rev_safe_off(h, i, nxt, list_off_var_(i, member)) /** * list_for_each_safe - iterate through a list, maybe during deletion @@ -401,7 +504,6 @@ static inline const void *list_tail_(const struct list_head *h, size_t off) * @nxt is used to hold the next element, so you can delete @i from the list. * * Example: - * struct child *next; * list_for_each_safe(&parent->children, child, next, list) { * list_del(&child->list); * parent->num_children--; @@ -516,6 +618,24 @@ static inline void list_prepend_list_(struct list_head *to, list_head_init(from); } +/* internal macros, do not use directly */ +#define list_for_each_off_dir_(h, i, off, dir) \ + for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.dir, \ + (off)); \ + list_node_from_off_((void *)i, (off)) != &(h)->n; \ + i = list_node_to_off_(list_node_from_off_((void *)i, (off))->dir, \ + (off))) + +#define list_for_each_safe_off_dir_(h, i, nxt, off, dir) \ + for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.dir, \ + (off)), \ + nxt = list_node_to_off_(list_node_from_off_(i, (off))->dir, \ + (off)); \ + list_node_from_off_(i, (off)) != &(h)->n; \ + i = nxt, \ + nxt = list_node_to_off_(list_node_from_off_(i, (off))->dir, \ + (off))) + /** * list_for_each_off - iterate through a list of memory regions. * @h: the list_head @@ -546,11 +666,18 @@ static inline void list_prepend_list_(struct list_head *to, * printf("Name: %s\n", child->name); */ #define list_for_each_off(h, i, off) \ - for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next, \ - (off)); \ - list_node_from_off_((void *)i, (off)) != &(h)->n; \ - i = list_node_to_off_(list_node_from_off_((void *)i, (off))->next, \ - (off))) + list_for_each_off_dir_((h),(i),(off),next) + +/** + * list_for_each_rev_off - iterate through a list of memory regions backwards + * @h: the list_head + * @i: the pointer to a memory region wich contains list node data. + * @off: offset(relative to @i) at which list node data resides. + * + * See list_for_each_off for details + */ +#define list_for_each_rev_off(h, i, off) \ + list_for_each_off_dir_((h),(i),(off),prev) /** * list_for_each_safe_off - iterate through a list of memory regions, maybe @@ -569,15 +696,26 @@ static inline void list_prepend_list_(struct list_head *to, * printf("Name: %s\n", child->name); */ #define list_for_each_safe_off(h, i, nxt, off) \ - for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next, \ - (off)), \ - nxt = list_node_to_off_(list_node_from_off_(i, (off))->next, \ - (off)); \ - list_node_from_off_(i, (off)) != &(h)->n; \ - i = nxt, \ - nxt = list_node_to_off_(list_node_from_off_(i, (off))->next, \ - (off))) + list_for_each_safe_off_dir_((h),(i),(nxt),(off),next) +/** + * list_for_each_rev_safe_off - iterate backwards through a list of + * memory regions, maybe during deletion + * @h: the list_head + * @i: the pointer to a memory region wich contains list node data. + * @nxt: the structure containing the list_node + * @off: offset(relative to @i) at which list node data resides. + * + * For details see `list_for_each_rev_off' and `list_for_each_rev_safe' + * descriptions. + * + * Example: + * list_for_each_rev_safe_off(&parent->children, child, + * next, offsetof(struct child, list)) + * printf("Name: %s\n", child->name); + */ +#define list_for_each_rev_safe_off(h, i, nxt, off) \ + list_for_each_safe_off_dir_((h),(i),(nxt),(off),prev) /* Other -off variants. */ #define list_entry_off(n, type, off) \ @@ -25,9 +25,9 @@ #include "internal.h" #include "ruby/st.h" -#include "method.h" #include "constant.h" #include "vm_core.h" +#include "id_table.h" #include <ctype.h> #define id_attached id__attached__ @@ -110,7 +110,7 @@ rb_class_remove_from_module_subclasses(VALUE klass) } void -rb_class_foreach_subclass(VALUE klass, void(*f)(VALUE)) +rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE arg) { rb_subclass_entry_t *cur = RCLASS_EXT(klass)->subclasses; @@ -119,20 +119,32 @@ rb_class_foreach_subclass(VALUE klass, void(*f)(VALUE)) while (cur) { VALUE curklass = cur->klass; cur = cur->next; - f(curklass); + f(curklass, arg); } } +static void +class_detach_subclasses(VALUE klass, VALUE arg) +{ + rb_class_remove_from_super_subclasses(klass); +} + void rb_class_detach_subclasses(VALUE klass) { - rb_class_foreach_subclass(klass, rb_class_remove_from_super_subclasses); + rb_class_foreach_subclass(klass, class_detach_subclasses, Qnil); +} + +static void +class_detach_module_subclasses(VALUE klass, VALUE arg) +{ + rb_class_remove_from_module_subclasses(klass); } void rb_class_detach_module_subclasses(VALUE klass) { - rb_class_foreach_subclass(klass, rb_class_remove_from_module_subclasses); + rb_class_foreach_subclass(klass, class_detach_module_subclasses, Qnil); } /** @@ -151,24 +163,30 @@ static VALUE class_alloc(VALUE flags, VALUE klass) { NEWOBJ_OF(obj, struct RClass, klass, (flags & T_MASK) | FL_PROMOTED1 /* start from age == 2 */ | (RGENGC_WB_PROTECTED_CLASS ? FL_WB_PROTECTED : 0)); - obj->ptr = ALLOC(rb_classext_t); - RCLASS_IV_TBL(obj) = 0; - RCLASS_CONST_TBL(obj) = 0; - RCLASS_M_TBL_WRAPPER(obj) = 0; - RCLASS_SET_SUPER((VALUE)obj, 0); - RCLASS_ORIGIN(obj) = (VALUE)obj; - RCLASS_IV_INDEX_TBL(obj) = 0; - - RCLASS_EXT(obj)->subclasses = NULL; - RCLASS_EXT(obj)->parent_subclasses = NULL; - RCLASS_EXT(obj)->module_subclasses = NULL; + obj->ptr = ZALLOC(rb_classext_t); + /* ZALLOC + RCLASS_IV_TBL(obj) = 0; + RCLASS_CONST_TBL(obj) = 0; + RCLASS_M_TBL(obj) = 0; + RCLASS_IV_INDEX_TBL(obj) = 0; + RCLASS_SET_SUPER((VALUE)obj, 0); + RCLASS_EXT(obj)->subclasses = NULL; + RCLASS_EXT(obj)->parent_subclasses = NULL; + RCLASS_EXT(obj)->module_subclasses = NULL; + */ + RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj); RCLASS_SERIAL(obj) = rb_next_class_serial(); - RCLASS_REFINED_CLASS(obj) = Qnil; RCLASS_EXT(obj)->allocator = 0; + return (VALUE)obj; } +static void +RCLASS_M_TBL_INIT(VALUE c) +{ + RCLASS_M_TBL(c) = rb_id_table_create(0); +} /*! * A utility function that wraps class_alloc. @@ -202,8 +220,8 @@ void rb_check_inheritable(VALUE super) { if (!RB_TYPE_P(super, T_CLASS)) { - rb_raise(rb_eTypeError, "superclass must be a Class (%s given)", - rb_obj_classname(super)); + rb_raise(rb_eTypeError, "superclass must be a Class (%"PRIsVALUE" given)", + rb_obj_class(super)); } if (RBASIC(super)->flags & FL_SINGLETON) { rb_raise(rb_eTypeError, "can't make subclass of singleton class"); @@ -229,34 +247,34 @@ rb_class_new(VALUE super) } static void -clone_method(VALUE klass, ID mid, const rb_method_entry_t *me) -{ - VALUE newiseqval; - if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) { - rb_iseq_t *iseq; - NODE *new_cref; - newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass); - GetISeqPtr(newiseqval, iseq); - rb_vm_rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref); - RB_OBJ_WRITE(iseq->self, &iseq->cref_stack, new_cref); - rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag); - RB_GC_GUARD(newiseqval); +clone_method(VALUE old_klass, VALUE new_klass, ID mid, const rb_method_entry_t *me) +{ + if (me->def->type == VM_METHOD_TYPE_ISEQ) { + rb_cref_t *new_cref; + rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass, &new_cref); + rb_add_method_iseq(new_klass, mid, me->def->body.iseq.iseqptr, new_cref, METHOD_ENTRY_VISI(me)); } else { - rb_method_entry_set(klass, mid, me, me->flag); + rb_method_entry_set(new_klass, mid, me, METHOD_ENTRY_VISI(me)); } } -static int -clone_method_i(st_data_t key, st_data_t value, st_data_t data) +struct clone_method_arg { + VALUE new_klass; + VALUE old_klass; +}; + +static enum rb_id_table_iterator_result +clone_method_i(ID key, VALUE value, void *data) { - clone_method((VALUE)data, (ID)key, (const rb_method_entry_t *)value); - return ST_CONTINUE; + const struct clone_method_arg *arg = (struct clone_method_arg *)data; + clone_method(arg->old_klass, arg->new_klass, key, (const rb_method_entry_t *)value); + return ID_TABLE_CONTINUE; } struct clone_const_arg { VALUE klass; - st_table *tbl; + struct rb_id_table *tbl; }; static int @@ -267,14 +285,14 @@ clone_const(ID key, const rb_const_entry_t *ce, struct clone_const_arg *arg) RB_OBJ_WRITTEN(arg->klass, Qundef, ce->value); RB_OBJ_WRITTEN(arg->klass, Qundef, ce->file); - st_insert(arg->tbl, key, (st_data_t)nce); - return ST_CONTINUE; + rb_id_table_insert(arg->tbl, key, (VALUE)nce); + return ID_TABLE_CONTINUE; } -static int -clone_const_i(st_data_t key, st_data_t value, st_data_t data) +static enum rb_id_table_iterator_result +clone_const_i(ID key, VALUE value, void *data) { - return clone_const((ID)key, (const rb_const_entry_t *)value, (struct clone_const_arg *)data); + return clone_const(key, (const rb_const_entry_t *)value, data); } static void @@ -313,10 +331,7 @@ rb_mod_init_copy(VALUE clone, VALUE orig) rb_free_const_table(RCLASS_CONST_TBL(clone)); RCLASS_CONST_TBL(clone) = 0; } - if (RCLASS_M_TBL_WRAPPER(clone)) { - rb_free_m_tbl_wrapper(RCLASS_M_TBL_WRAPPER(clone)); - RCLASS_M_TBL_WRAPPER(clone) = 0; - } + RCLASS_M_TBL(clone) = 0; if (RCLASS_IV_TBL(orig)) { st_data_t id; @@ -331,14 +346,16 @@ rb_mod_init_copy(VALUE clone, VALUE orig) if (RCLASS_CONST_TBL(orig)) { struct clone_const_arg arg; - RCLASS_CONST_TBL(clone) = st_init_numtable(); + arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0); arg.klass = clone; - arg.tbl = RCLASS_CONST_TBL(clone); - st_foreach(RCLASS_CONST_TBL(orig), clone_const_i, (st_data_t)&arg); + rb_id_table_foreach(RCLASS_CONST_TBL(orig), clone_const_i, &arg); } if (RCLASS_M_TBL(orig)) { + struct clone_method_arg arg; + arg.old_klass = orig; + arg.new_klass = clone; RCLASS_M_TBL_INIT(clone); - st_foreach(RCLASS_M_TBL(orig), clone_method_i, (st_data_t)clone); + rb_id_table_foreach(RCLASS_M_TBL(orig), clone_method_i, &arg); } return clone; @@ -353,7 +370,7 @@ rb_singleton_class_clone(VALUE obj) VALUE rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach) { - VALUE klass = RBASIC(obj)->klass; + const VALUE klass = RBASIC(obj)->klass; if (!FL_TEST(klass, FL_SINGLETON)) return klass; @@ -375,16 +392,20 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach) } if (RCLASS_CONST_TBL(klass)) { struct clone_const_arg arg; - RCLASS_CONST_TBL(clone) = st_init_numtable(); + arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0); arg.klass = clone; - arg.tbl = RCLASS_CONST_TBL(clone); - st_foreach(RCLASS_CONST_TBL(klass), clone_const_i, (st_data_t)&arg); + rb_id_table_foreach(RCLASS_CONST_TBL(klass), clone_const_i, &arg); } if (attach != Qundef) { rb_singleton_class_attached(clone, attach); } RCLASS_M_TBL_INIT(clone); - st_foreach(RCLASS_M_TBL(klass), clone_method_i, (st_data_t)clone); + { + struct clone_method_arg arg; + arg.old_klass = klass; + arg.new_klass = clone; + rb_id_table_foreach(RCLASS_M_TBL(klass), clone_method_i, &arg); + } rb_singleton_class_attached(RBASIC(clone)->klass, clone); FL_SET(clone, FL_SINGLETON); @@ -403,7 +424,7 @@ rb_singleton_class_attached(VALUE klass, VALUE obj) if (!RCLASS_IV_TBL(klass)) { RCLASS_IV_TBL(klass) = st_init_numtable(); } - rb_st_insert_id_and_value(klass, RCLASS_IV_TBL(klass), id_attached, obj); + rb_class_ivar_set(klass, id_attached, obj); } } @@ -419,6 +440,19 @@ rb_singleton_class_attached(VALUE klass, VALUE obj) */ #define META_CLASS_OF_CLASS_CLASS_P(k) (METACLASS_OF(k) == (k)) +static int +rb_singleton_class_has_metaclass_p(VALUE sklass) +{ + return rb_attr_get(METACLASS_OF(sklass), id_attached) == sklass; +} + +int +rb_singleton_class_internal_p(VALUE sklass) +{ + return (RB_TYPE_P(rb_attr_get(sklass, id_attached), T_CLASS) && + !rb_singleton_class_has_metaclass_p(sklass)); +} + /*! * whether k has a metaclass * @retval 1 if \a k has a metaclass @@ -426,7 +460,7 @@ rb_singleton_class_attached(VALUE klass, VALUE obj) */ #define HAVE_METACLASS_P(k) \ (FL_TEST(METACLASS_OF(k), FL_SINGLETON) && \ - rb_ivar_get(METACLASS_OF(k), id_attached) == (k)) + rb_singleton_class_has_metaclass_p(k)) /*! * ensures \a klass belongs to its own eigenclass. @@ -513,6 +547,11 @@ Init_class_hierarchy(void) { rb_cBasicObject = boot_defclass("BasicObject", 0); rb_cObject = boot_defclass("Object", rb_cBasicObject); + rb_gc_register_mark_object(rb_cObject); + + /* resolve class name ASAP for order-independence */ + rb_class_name(rb_cObject); + rb_cModule = boot_defclass("Module", rb_cObject); rb_cClass = boot_defclass("Class", rb_cModule); @@ -592,12 +631,12 @@ rb_class_inherited(VALUE super, VALUE klass) * Defines a top-level class. * \param name name of the class * \param super a class from which the new class will derive. - * NULL means \c Object class. * \return the created class * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. - * \throw NameError if the class is already defined but the class can not + * \throw TypeError if the class is already defined but the class can not * be reopened because its superclass is not \a super. + * \throw ArgumentError if the \a super is NULL. * \post top-level constant named \a name refers the returned class. * * \note if a class named \a name is already defined and its superclass is @@ -613,7 +652,8 @@ rb_define_class(const char *name, VALUE super) if (rb_const_defined(rb_cObject, id)) { klass = rb_const_get(rb_cObject, id); if (!RB_TYPE_P(klass, T_CLASS)) { - rb_raise(rb_eTypeError, "%s is not a class", name); + rb_raise(rb_eTypeError, "%s is not a class (%"PRIsVALUE")", + name, rb_obj_class(klass)); } if (rb_class_real(RCLASS_SUPER(klass)) != super) { rb_raise(rb_eTypeError, "superclass mismatch for class %s", name); @@ -621,7 +661,7 @@ rb_define_class(const char *name, VALUE super) return klass; } if (!super) { - rb_warn("no super class for `%s', Object assumed", name); + rb_raise(rb_eArgError, "no super class for `%s'", name); } klass = rb_define_class_id(id, super); rb_vm_add_root_module(id, klass); @@ -642,7 +682,7 @@ rb_define_class(const char *name, VALUE super) * \return the created class * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. - * \throw NameError if the class is already defined but the class can not + * \throw TypeError if the class is already defined but the class can not * be reopened because its superclass is not \a super. * \post top-level constant named \a name refers the returned class. * @@ -665,7 +705,7 @@ rb_define_class_under(VALUE outer, const char *name, VALUE super) * \return the created class * \throw TypeError if the constant name \a name is already taken but * the constant is not a \c Class. - * \throw NameError if the class is already defined but the class can not + * \throw TypeError if the class is already defined but the class can not * be reopened because its superclass is not \a super. * \post top-level constant named \a name refers the returned class. * @@ -680,16 +720,21 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super) if (rb_const_defined_at(outer, id)) { klass = rb_const_get_at(outer, id); if (!RB_TYPE_P(klass, T_CLASS)) { - rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a class", rb_id2str(id)); + rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a class" + " (%"PRIsVALUE")", + outer, rb_id2str(id), rb_obj_class(klass)); } if (rb_class_real(RCLASS_SUPER(klass)) != super) { - rb_name_error(id, "%"PRIsVALUE" is already defined", rb_id2str(id)); + rb_raise(rb_eTypeError, "superclass mismatch for class " + "%"PRIsVALUE"::%"PRIsVALUE"" + " (%"PRIsVALUE" is given but was %"PRIsVALUE")", + outer, rb_id2str(id), RCLASS_SUPER(klass), super); } return klass; } if (!super) { - rb_warn("no super class for `%"PRIsVALUE"::%"PRIsVALUE"', Object assumed", - rb_class_path(outer), rb_id2str(id)); + rb_raise(rb_eArgError, "no super class for `%"PRIsVALUE"::%"PRIsVALUE"'", + rb_class_path(outer), rb_id2str(id)); } klass = rb_define_class_id(id, super); rb_set_class_path_string(klass, outer, rb_id2str(id)); @@ -728,9 +773,11 @@ rb_define_module(const char *name) id = rb_intern(name); if (rb_const_defined(rb_cObject, id)) { module = rb_const_get(rb_cObject, id); - if (RB_TYPE_P(module, T_MODULE)) - return module; - rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module)); + if (!RB_TYPE_P(module, T_MODULE)) { + rb_raise(rb_eTypeError, "%s is not a module (%"PRIsVALUE")", + name, rb_obj_class(module)); + } + return module; } module = rb_define_module_id(id); rb_vm_add_root_module(id, module); @@ -752,10 +799,12 @@ rb_define_module_id_under(VALUE outer, ID id) if (rb_const_defined_at(outer, id)) { module = rb_const_get_at(outer, id); - if (RB_TYPE_P(module, T_MODULE)) - return module; - rb_raise(rb_eTypeError, "%s::%s is not a module", - rb_class2name(outer), rb_obj_classname(module)); + if (!RB_TYPE_P(module, T_MODULE)) { + rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a module" + " (%"PRIsVALUE")", + outer, rb_id2str(id), rb_obj_class(module)); + } + return module; } module = rb_define_module_id(id); rb_const_set(outer, id, module); @@ -777,13 +826,13 @@ rb_include_class_new(VALUE module, VALUE super) RCLASS_IV_TBL(module) = st_init_numtable(); } if (!RCLASS_CONST_TBL(module)) { - RCLASS_CONST_TBL(module) = st_init_numtable(); + RCLASS_CONST_TBL(module) = rb_id_table_create(0); } RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module); RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module); - RCLASS_M_TBL_WRAPPER(OBJ_WB_UNPROTECT(klass)) = - RCLASS_M_TBL_WRAPPER(OBJ_WB_UNPROTECT(RCLASS_ORIGIN(module))); + RCLASS_M_TBL(OBJ_WB_UNPROTECT(klass)) = + RCLASS_M_TBL(OBJ_WB_UNPROTECT(RCLASS_ORIGIN(module))); /* TODO: unprotected? */ RCLASS_SET_SUPER(klass, super); if (RB_TYPE_P(module, T_ICLASS)) { @@ -798,7 +847,7 @@ rb_include_class_new(VALUE module, VALUE super) return (VALUE)klass; } -static int include_modules_at(const VALUE klass, VALUE c, VALUE module); +static int include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super); void rb_include_module(VALUE klass, VALUE module) @@ -806,34 +855,31 @@ rb_include_module(VALUE klass, VALUE module) int changed = 0; rb_frozen_class_p(klass); - - if (!RB_TYPE_P(module, T_MODULE)) { - Check_Type(module, T_MODULE); - } - + Check_Type(module, T_MODULE); OBJ_INFECT(klass, module); - changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module); + changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module, TRUE); if (changed < 0) rb_raise(rb_eArgError, "cyclic include detected"); } -static int -add_refined_method_entry_i(st_data_t key, st_data_t value, st_data_t data) +static enum rb_id_table_iterator_result +add_refined_method_entry_i(ID key, VALUE value, void *data) { - rb_add_refined_method_entry((VALUE) data, (ID) key); - return ST_CONTINUE; + rb_add_refined_method_entry((VALUE)data, key); + return ID_TABLE_CONTINUE; } static int -include_modules_at(const VALUE klass, VALUE c, VALUE module) +include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super) { VALUE p, iclass; int method_changed = 0, constant_changed = 0; - const st_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass)); + struct rb_id_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass)); while (module) { int superclass_seen = FALSE; + struct rb_id_table *tbl; if (RCLASS_ORIGIN(module) != module) goto skip; @@ -841,42 +887,42 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module) return -1; /* ignore if the module included already in superclasses */ for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) { - switch (BUILTIN_TYPE(p)) { - case T_ICLASS: - if (RCLASS_M_TBL_WRAPPER(p) == RCLASS_M_TBL_WRAPPER(module)) { + int type = BUILTIN_TYPE(p); + if (type == T_ICLASS) { + if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) { if (!superclass_seen) { c = p; /* move insertion point */ } goto skip; } - break; - case T_CLASS: + } + else if (type == T_CLASS) { + if (!search_super) break; superclass_seen = TRUE; - break; } } iclass = rb_include_class_new(module, RCLASS_SUPER(c)); c = RCLASS_SET_SUPER(c, iclass); - if (BUILTIN_TYPE(module) == T_ICLASS) { - rb_module_add_to_subclasses_list(RBASIC(module)->klass, iclass); - } - else { - rb_module_add_to_subclasses_list(module, iclass); + { + VALUE m = module; + if (BUILTIN_TYPE(m) == T_ICLASS) m = RBASIC(m)->klass; + rb_module_add_to_subclasses_list(m, iclass); } if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) { VALUE refined_class = rb_refinement_module_get_refined_class(klass); - st_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i, - (st_data_t) refined_class); + rb_id_table_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i, (void *)refined_class); FL_SET(c, RMODULE_INCLUDED_INTO_REFINEMENT); } - if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries) - method_changed = 1; - if (RMODULE_CONST_TBL(module) && RMODULE_CONST_TBL(module)->num_entries) - constant_changed = 1; + + tbl = RMODULE_M_TBL(module); + if (tbl && rb_id_table_size(tbl)) method_changed = 1; + + tbl = RMODULE_CONST_TBL(module); + if (tbl && rb_id_table_size(tbl)) constant_changed = 1; skip: module = RCLASS_SUPER(module); } @@ -887,30 +933,30 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module) return method_changed; } -static int -move_refined_method(st_data_t key, st_data_t value, st_data_t data) +static enum rb_id_table_iterator_result +move_refined_method(ID key, VALUE value, void *data) { rb_method_entry_t *me = (rb_method_entry_t *) value; - st_table *tbl = (st_table *) data; + VALUE klass = (VALUE)data; + struct rb_id_table *tbl = RCLASS_M_TBL(klass); if (me->def->type == VM_METHOD_TYPE_REFINED) { - if (me->def->body.orig_me) { - rb_method_entry_t *orig_me = me->def->body.orig_me, *new_me; - me->def->body.orig_me = NULL; - new_me = ALLOC(rb_method_entry_t); - *new_me = *me; - st_add_direct(tbl, key, (st_data_t) new_me); - *me = *orig_me; - xfree(orig_me); - return ST_CONTINUE; + if (me->def->body.refined.orig_me) { + const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me; + RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL); + new_me = rb_method_entry_clone(me); + rb_id_table_insert(tbl, key, (VALUE)new_me); + RB_OBJ_WRITTEN(klass, Qundef, new_me); + rb_method_entry_copy(me, orig_me); + return ID_TABLE_CONTINUE; } else { - st_add_direct(tbl, key, (st_data_t) me); - return ST_DELETE; + rb_id_table_insert(tbl, key, (VALUE)me); + return ID_TABLE_DELETE; } } else { - return ST_CONTINUE; + return ID_TABLE_CONTINUE; } } @@ -921,9 +967,7 @@ rb_prepend_module(VALUE klass, VALUE module) int changed = 0; rb_frozen_class_p(klass); - Check_Type(module, T_MODULE); - OBJ_INFECT(klass, module); origin = RCLASS_ORIGIN(klass); @@ -932,13 +976,12 @@ rb_prepend_module(VALUE klass, VALUE module) OBJ_WB_UNPROTECT(origin); /* TODO: conservative shading. Need more survey. */ RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass)); RCLASS_SET_SUPER(klass, origin); - RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin); - RCLASS_M_TBL_WRAPPER(origin) = RCLASS_M_TBL_WRAPPER(klass); + RCLASS_SET_ORIGIN(klass, origin); + RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass); RCLASS_M_TBL_INIT(klass); - st_foreach(RCLASS_M_TBL(origin), move_refined_method, - (st_data_t) RCLASS_M_TBL(klass)); + rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass); } - changed = include_modules_at(klass, klass, module); + changed = include_modules_at(klass, klass, module, FALSE); if (changed < 0) rb_raise(rb_eArgError, "cyclic prepend detected"); if (changed) { @@ -1047,52 +1090,51 @@ rb_mod_ancestors(VALUE mod) return ary; } -#define VISI(x) ((x)&NOEX_MASK) -#define VISI_CHECK(x,f) (VISI(x) == (f)) +static void +ins_methods_push(st_data_t name, st_data_t ary) +{ + rb_ary_push((VALUE)ary, ID2SYM((ID)name)); +} static int -ins_methods_push(ID name, long type, VALUE ary, long visi) +ins_methods_i(st_data_t name, st_data_t type, st_data_t ary) { - if (type == -1) return ST_CONTINUE; - - switch (visi) { - case NOEX_PRIVATE: - case NOEX_PROTECTED: - case NOEX_PUBLIC: - visi = (type == visi); + switch ((rb_method_visibility_t)type) { + case METHOD_VISI_UNDEF: + case METHOD_VISI_PRIVATE: break; - default: - visi = (type != NOEX_PRIVATE); + default: /* everything but private */ + ins_methods_push(name, ary); break; } - if (visi) { - rb_ary_push(ary, ID2SYM(name)); - } return ST_CONTINUE; } static int -ins_methods_i(st_data_t name, st_data_t type, st_data_t ary) -{ - return ins_methods_push((ID)name, (long)type, (VALUE)ary, -1); /* everything but private */ -} - -static int ins_methods_prot_i(st_data_t name, st_data_t type, st_data_t ary) { - return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PROTECTED); + if ((rb_method_visibility_t)type == METHOD_VISI_PROTECTED) { + ins_methods_push(name, ary); + } + return ST_CONTINUE; } static int ins_methods_priv_i(st_data_t name, st_data_t type, st_data_t ary) { - return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PRIVATE); + if ((rb_method_visibility_t)type == METHOD_VISI_PRIVATE) { + ins_methods_push(name, ary); + } + return ST_CONTINUE; } static int ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary) { - return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PUBLIC); + if ((rb_method_visibility_t)type == METHOD_VISI_PUBLIC) { + ins_methods_push(name, ary); + } + return ST_CONTINUE; } struct method_entry_arg { @@ -1100,29 +1142,29 @@ struct method_entry_arg { int recur; }; -static int -method_entry_i(st_data_t key, st_data_t value, st_data_t data) +static enum rb_id_table_iterator_result +method_entry_i(ID key, VALUE value, void *data) { const rb_method_entry_t *me = (const rb_method_entry_t *)value; struct method_entry_arg *arg = (struct method_entry_arg *)data; - long type; + rb_method_visibility_t type; - if (me && me->def->type == VM_METHOD_TYPE_REFINED) { - VALUE klass = me->klass; - me = rb_resolve_refined_method(Qnil, me, NULL); - if (!me) return ST_CONTINUE; - if (!arg->recur && me->klass != klass) return ST_CONTINUE; + if (me->def->type == VM_METHOD_TYPE_REFINED) { + VALUE owner = me->owner; + me = rb_resolve_refined_method(Qnil, me); + if (!me) return ID_TABLE_CONTINUE; + if (!arg->recur && me->owner != owner) return ID_TABLE_CONTINUE; } if (!st_lookup(arg->list, key, 0)) { if (UNDEFINED_METHOD_ENTRY_P(me)) { - type = -1; /* none */ + type = METHOD_VISI_UNDEF; /* none */ } else { - type = VISI(me->flag); + type = METHOD_ENTRY_VISI(me); } - st_add_direct(arg->list, key, type); + st_add_direct(arg->list, key, (st_data_t)type); } - return ST_CONTINUE; + return ID_TABLE_CONTINUE; } static VALUE @@ -1149,7 +1191,7 @@ class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int me_arg.list = st_init_numtable(); me_arg.recur = recur; for (; mod; mod = RCLASS_SUPER(mod)) { - if (RCLASS_M_TBL(mod)) st_foreach(RCLASS_M_TBL(mod), method_entry_i, (st_data_t)&me_arg); + if (RCLASS_M_TBL(mod)) rb_id_table_foreach(RCLASS_M_TBL(mod), method_entry_i, &me_arg); if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue; if (obj && FL_TEST(mod, FL_SINGLETON)) continue; if (!recur) break; @@ -1370,7 +1412,7 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj) { VALUE recur, ary, klass, origin; struct method_entry_arg me_arg; - st_table *mtbl; + struct rb_id_table *mtbl; if (argc == 0) { recur = Qtrue; @@ -1383,14 +1425,12 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj) me_arg.list = st_init_numtable(); me_arg.recur = RTEST(recur); if (klass && FL_TEST(klass, FL_SINGLETON)) { - if ((mtbl = RCLASS_M_TBL(origin)) != 0) - st_foreach(mtbl, method_entry_i, (st_data_t)&me_arg); + if ((mtbl = RCLASS_M_TBL(origin)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg); klass = RCLASS_SUPER(klass); } if (RTEST(recur)) { while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) { - if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0) - st_foreach(mtbl, method_entry_i, (st_data_t)&me_arg); + if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg); klass = RCLASS_SUPER(klass); } } @@ -1461,31 +1501,31 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj) void rb_define_method_id(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc) { - rb_add_method_cfunc(klass, mid, func, argc, NOEX_PUBLIC); + rb_add_method_cfunc(klass, mid, func, argc, METHOD_VISI_PUBLIC); } void rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) { - rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PUBLIC); + rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PUBLIC); } void rb_define_protected_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) { - rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PROTECTED); + rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PROTECTED); } void rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) { - rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PRIVATE); + rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PRIVATE); } void rb_undef_method(VALUE klass, const char *name) { - rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, NOEX_UNDEF); + rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, METHOD_VISI_UNDEF); } /*! @@ -1707,16 +1747,143 @@ rb_define_attr(VALUE klass, const char *name, int read, int write) int rb_obj_basic_to_s_p(VALUE obj) { - const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"), 0); + const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s")); if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC && me->def->body.cfunc.func == rb_any_to_s) return 1; return 0; } -#include <stdarg.h> +VALUE +rb_keyword_error_new(const char *error, VALUE keys) +{ + const char *msg = ""; + VALUE error_message; + + if (RARRAY_LEN(keys) == 1) { + keys = RARRAY_AREF(keys, 0); + } + else { + keys = rb_ary_join(keys, rb_usascii_str_new2(", ")); + msg = "s"; + } + + error_message = rb_sprintf("%s keyword%s: %"PRIsVALUE, error, msg, keys); + + return rb_exc_new_str(rb_eArgError, error_message); +} + +NORETURN(static void rb_keyword_error(const char *error, VALUE keys)); +static void +rb_keyword_error(const char *error, VALUE keys) +{ + rb_exc_raise(rb_keyword_error_new(error, keys)); +} + +NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keywords)); +static void +unknown_keyword_error(VALUE hash, const ID *table, int keywords) +{ + st_table *tbl = rb_hash_tbl_raw(hash); + VALUE keys; + int i; + for (i = 0; i < keywords; i++) { + st_data_t key = ID2SYM(table[i]); + st_delete(tbl, &key, NULL); + } + keys = rb_funcallv(hash, rb_intern("keys"), 0, 0); + if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword"); + rb_keyword_error("unknown", keys); +} + +static int +separate_symbol(st_data_t key, st_data_t value, st_data_t arg) +{ + VALUE *kwdhash = (VALUE *)arg; + + if (!SYMBOL_P(key)) kwdhash++; + if (!*kwdhash) *kwdhash = rb_hash_new(); + rb_hash_aset(*kwdhash, (VALUE)key, (VALUE)value); + return ST_CONTINUE; +} + +VALUE +rb_extract_keywords(VALUE *orighash) +{ + VALUE parthash[2] = {0, 0}; + VALUE hash = *orighash; + + if (RHASH_EMPTY_P(hash)) { + *orighash = 0; + return hash; + } + st_foreach(rb_hash_tbl_raw(hash), separate_symbol, (st_data_t)&parthash); + *orighash = parthash[1]; + return parthash[0]; +} int +rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) +{ + int i = 0, j; + int rest = 0; + VALUE missing = Qnil; + st_data_t key; + +#define extract_kwarg(keyword, val) \ + (key = (st_data_t)(keyword), values ? \ + st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) : \ + st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val))) + + if (NIL_P(keyword_hash)) keyword_hash = 0; + + if (optional < 0) { + rest = 1; + optional = -1-optional; + } + if (values) { + for (j = 0; j < required + optional; j++) { + values[j] = Qundef; + } + } + if (required) { + for (; i < required; i++) { + VALUE keyword = ID2SYM(table[i]); + if (keyword_hash) { + st_data_t val; + if (extract_kwarg(keyword, &val)) { + if (values) values[i] = (VALUE)val; + continue; + } + } + if (NIL_P(missing)) missing = rb_ary_tmp_new(1); + rb_ary_push(missing, keyword); + } + if (!NIL_P(missing)) { + rb_keyword_error("missing", missing); + } + } + j = i; + if (optional && keyword_hash) { + for (i = 0; i < optional; i++) { + st_data_t val; + if (extract_kwarg(ID2SYM(table[required+i]), &val)) { + if (values) values[required+i] = (VALUE)val; + j++; + } + } + } + if (!rest && keyword_hash) { + if (RHASH_SIZE(keyword_hash) > (unsigned int)j) { + unknown_keyword_error(keyword_hash, table, required+optional); + } + } + return j; +#undef extract_kwarg +} + +#undef rb_scan_args +int rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) { int i; @@ -1734,22 +1901,16 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) if (ISDIGIT(*p)) { n_opt = *p - '0'; p++; - if (ISDIGIT(*p)) { - n_trail = *p - '0'; - p++; - goto block_arg; - } } } if (*p == '*') { f_var = 1; p++; - if (ISDIGIT(*p)) { - n_trail = *p - '0'; - p++; - } } - block_arg: + if (ISDIGIT(*p)) { + n_trail = *p - '0'; + p++; + } if (*p == ':') { f_hash = 1; p++; @@ -1849,132 +2010,10 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...) return argc; } -VALUE -rb_keyword_error_new(const char *error, VALUE keys) -{ - const char *msg = ""; - VALUE error_message; - - if (RARRAY_LEN(keys) == 1) { - keys = RARRAY_AREF(keys, 0); - } - else { - keys = rb_ary_join(keys, rb_usascii_str_new2(", ")); - msg = "s"; - } - - error_message = rb_sprintf("%s keyword%s: %"PRIsVALUE, error, msg, keys); - - return rb_exc_new_str(rb_eArgError, error_message); -} - -NORETURN(static void rb_keyword_error(const char *error, VALUE keys)); -static void -rb_keyword_error(const char *error, VALUE keys) -{ - rb_exc_raise(rb_keyword_error_new(error, keys)); -} - -NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keywords)); -static void -unknown_keyword_error(VALUE hash, const ID *table, int keywords) -{ - st_table *tbl = rb_hash_tbl_raw(hash); - VALUE keys; - int i; - for (i = 0; i < keywords; i++) { - st_data_t key = ID2SYM(table[i]); - st_delete(tbl, &key, NULL); - } - keys = rb_funcall(hash, rb_intern("keys"), 0, 0); - if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword"); - rb_keyword_error("unknown", keys); -} - -static int -separate_symbol(st_data_t key, st_data_t value, st_data_t arg) -{ - VALUE *kwdhash = (VALUE *)arg; - - if (!SYMBOL_P(key)) kwdhash++; - if (!*kwdhash) *kwdhash = rb_hash_new(); - rb_hash_aset(*kwdhash, (VALUE)key, (VALUE)value); - return ST_CONTINUE; -} - -VALUE -rb_extract_keywords(VALUE *orighash) -{ - VALUE parthash[2] = {0, 0}; - VALUE hash = *orighash; - - if (RHASH_EMPTY_P(hash)) { - *orighash = 0; - return hash; - } - st_foreach(rb_hash_tbl_raw(hash), separate_symbol, (st_data_t)&parthash); - *orighash = parthash[1]; - return parthash[0]; -} - int -rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) +rb_class_has_methods(VALUE c) { - int i = 0, j; - int rest = 0; - VALUE missing = Qnil; - st_data_t key; - -#define extract_kwarg(keyword, val) \ - (key = (st_data_t)(keyword), values ? \ - st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) : \ - st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val))) - - if (NIL_P(keyword_hash)) keyword_hash = 0; - - if (optional < 0) { - rest = 1; - optional = -1-optional; - } - if (values) { - for (j = 0; j < required + optional; j++) { - values[j] = Qundef; - } - } - if (required) { - for (; i < required; i++) { - VALUE keyword = ID2SYM(table[i]); - if (keyword_hash) { - st_data_t val; - if (extract_kwarg(keyword, &val)) { - if (values) values[i] = (VALUE)val; - continue; - } - } - if (NIL_P(missing)) missing = rb_ary_tmp_new(1); - rb_ary_push(missing, keyword); - } - if (!NIL_P(missing)) { - rb_keyword_error("missing", missing); - } - } - j = i; - if (optional && keyword_hash) { - for (i = 0; i < optional; i++) { - st_data_t val; - if (extract_kwarg(ID2SYM(table[required+i]), &val)) { - if (values) values[required+i] = (VALUE)val; - j++; - } - } - } - if (!rest && keyword_hash) { - if (RHASH_SIZE(keyword_hash) > (unsigned int)j) { - unknown_keyword_error(keyword_hash, table, required+optional); - } - } - return j; -#undef extract_kwarg + return rb_id_table_size(RCLASS_M_TBL(c)) == 0 ? FALSE : TRUE; } /*! @@ -11,24 +11,49 @@ Q = $(Q1:0=@) ECHO0 = $(ECHO1:0=echo) ECHO = @$(ECHO0) -UNICODE_VERSION = 7.0.0 +UNICODE_VERSION = 9.0.0 +### set the following environment variable or uncomment the line if +### the Unicode data files should be updated completely on every update ('make up',...). +# ALWAYS_UPDATE_UNICODE = yes +UNICODE_DATA_DIR = enc/unicode/data/$(UNICODE_VERSION) +UNICODE_SRC_DATA_DIR = $(srcdir)/$(UNICODE_DATA_DIR) +UNICODE_HDR_DIR = $(srcdir)/enc/unicode/$(UNICODE_VERSION) +UNICODE_DATA_HEADERS = \ + $(UNICODE_HDR_DIR)/casefold.h \ + $(UNICODE_HDR_DIR)/name2ctype.h \ + $(empty) + +RUBY_RELEASE_DATE = $(RUBY_RELEASE_YEAR)-$(RUBY_RELEASE_MONTH)-$(RUBY_RELEASE_DAY) RUBYLIB = $(PATH_SEPARATOR) RUBYOPT = - RUN_OPTS = --disable-gems +INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR) + +GEM_HOME = +GEM_PATH = +GEM_VENDOR = + SPEC_GIT_BASE = git://github.com/ruby MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git -RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git +RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/spec.git -SIMPLECOV_GIT_URL = git://github.com/hsbt/simplecov.git +SIMPLECOV_GIT_URL = git://github.com/colszowka/simplecov.git +SIMPLECOV_GIT_REF = v0.10.0 +SIMPLECOV_HTML_GIT_URL = git://github.com/colszowka/simplecov-html.git +SIMPLECOV_HTML_GIT_REF = v0.10.0 +DOCLIE_GIT_URL = git://github.com/ms-ati/docile.git +DOCLIE_GIT_REF = v1.1.5 STATIC_RUBY = static-ruby +TIMESTAMPDIR = $(EXTOUT)/.timestamp EXTCONF = extconf.rb LIBRUBY_EXTS = ./.libruby-with-ext.time REVISION_H = ./.revision.time -PLATFORM_D = ./$(PLATFORM_DIR)/.time +PLATFORM_D = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time +ENC_TRANS_D = $(TIMESTAMPDIR)/.enc-trans.time RDOCOUT = $(EXTOUT)/rdoc HTMLOUT = $(EXTOUT)/html CAPIOUT = doc/capi @@ -38,14 +63,19 @@ NORMALMAINOBJ = main.$(OBJEXT) MAINOBJ = $(NORMALMAINOBJ) DLDOBJS = $(INITOBJS) EXTSOLIBS = -MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) miniprelude.$(OBJEXT) +MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT) ENC_MK = enc.mk +MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \ + RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) COMMONOBJS = array.$(OBJEXT) \ bignum.$(OBJEXT) \ class.$(OBJEXT) \ compar.$(OBJEXT) \ + compile.$(OBJEXT) \ complex.$(OBJEXT) \ + cont.$(OBJEXT) \ + debug.$(OBJEXT) \ dir.$(OBJEXT) \ dln_find.$(OBJEXT) \ encoding.$(OBJEXT) \ @@ -53,13 +83,13 @@ COMMONOBJS = array.$(OBJEXT) \ enumerator.$(OBJEXT) \ error.$(OBJEXT) \ eval.$(OBJEXT) \ - load.$(OBJEXT) \ - proc.$(OBJEXT) \ file.$(OBJEXT) \ gc.$(OBJEXT) \ hash.$(OBJEXT) \ inits.$(OBJEXT) \ io.$(OBJEXT) \ + iseq.$(OBJEXT) \ + load.$(OBJEXT) \ marshal.$(OBJEXT) \ math.$(OBJEXT) \ node.$(OBJEXT) \ @@ -67,6 +97,7 @@ COMMONOBJS = array.$(OBJEXT) \ object.$(OBJEXT) \ pack.$(OBJEXT) \ parse.$(OBJEXT) \ + proc.$(OBJEXT) \ process.$(OBJEXT) \ random.$(OBJEXT) \ range.$(OBJEXT) \ @@ -87,20 +118,16 @@ COMMONOBJS = array.$(OBJEXT) \ string.$(OBJEXT) \ struct.$(OBJEXT) \ symbol.$(OBJEXT) \ + thread.$(OBJEXT) \ time.$(OBJEXT) \ transcode.$(OBJEXT) \ util.$(OBJEXT) \ variable.$(OBJEXT) \ version.$(OBJEXT) \ - compile.$(OBJEXT) \ - debug.$(OBJEXT) \ - iseq.$(OBJEXT) \ vm.$(OBJEXT) \ - vm_dump.$(OBJEXT) \ vm_backtrace.$(OBJEXT) \ + vm_dump.$(OBJEXT) \ vm_trace.$(OBJEXT) \ - thread.$(OBJEXT) \ - cont.$(OBJEXT) \ $(DTRACE_OBJ) \ $(BUILTIN_ENCOBJS) \ $(BUILTIN_TRANSOBJS) \ @@ -127,7 +154,8 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --mflags="$(MFLAGS)" \ --make-flags="$(MAKEFLAGS)" EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \ - --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --gnumake=$(gnumake) \ + --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \ + --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ -- INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb INSTRUBY_ARGS = $(SCRIPT_ARGS) \ @@ -142,21 +170,24 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' $(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE) TESTSDIR = $(srcdir)/test +TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/ +EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/ TESTWORKDIR = testwork +TESTOPTS = $(RUBY_TESTOPTS) TESTRUN_SCRIPT = $(srcdir)/test.rb -BOOTSTRAPRUBY = $(BASERUBY) - COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl -all: showflags main docs +SHOWFLAGS = showflags + +all: $(SHOWFLAGS) main docs -main: showflags $(ENCSTATIC:static=lib)encs exts +main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs @$(NULLCMD) .PHONY: showflags -exts enc trans: showflags +exts enc trans: $(SHOWFLAGS) showflags: $(MESSAGE_BEGIN) \ " CC = $(CC)" \ @@ -179,7 +210,7 @@ showconfig: exts: build-ext EXTS_MK = exts.mk -$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) +$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) $(TIMESTAMPDIR)/.$(arch).time $(ECHO) generating makefile $@ $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure @@ -187,7 +218,7 @@ configure-ext: $(EXTS_MK) build-ext: $(EXTS_MK) $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \ - ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) + EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC) prog: program wprogram @@ -213,8 +244,8 @@ Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \ --srcdir="$(srcdir)" --miniruby="$(MINIRUBY)" -program: showflags $(PROGRAM) -wprogram: showflags $(WPROGRAM) +program: $(SHOWFLAGS) $(PROGRAM) +wprogram: $(SHOWFLAGS) $(WPROGRAM) mini: PHONY miniruby$(EXEEXT) $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) @@ -232,7 +263,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) ruby.imp: $(COMMONOBJS) $(Q)$(NM) -Pgp $(COMMONOBJS) | \ - awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \ + awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|ruby_static_id_|.*_threadptr_|\.)/{print $$1}' | \ sort -u -o $@ install: install-$(INSTALLDOC) @@ -462,12 +493,13 @@ install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake sudo-precheck PHONY clear-installed-list: PHONY @> $(INSTALLED_LIST) set MAKE="$(MAKE)" -clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform +clean: clean-ext clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-local clean-platform clean-local:: clean-runnable $(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) $(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time $(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT) - $(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb + $(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D) + -$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || exit 0 clean-runnable:: PHONY $(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || exit 0 $(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || exit 0 @@ -483,11 +515,12 @@ clean-extout: PHONY -$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0 clean-docs: clean-rdoc clean-html clean-capi -distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform +distclean: distclean-ext distclean-enc distclean-golf distclean-extout distclean-local distclean-platform distclean-local:: clean-local - $(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(arch)-fake.rb + $(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES) $(Q)$(RM) config.cache config.status config.status.lineno $(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP) + -$(Q)$(RMALL) $(srcdir)/autom4te.cache distclean-ext:: PHONY distclean-golf: clean-golf distclean-rdoc: PHONY @@ -498,9 +531,11 @@ distclean-platform: clean-platform realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout realclean-local:: distclean-local - $(Q)$(RM) parse.c parse.h lex.c newline.c $(PRELUDES) revision.h - $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c newline.c $(PRELUDES) revision.h - $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure tool/config.guess tool/config.sub gems/*.gem + $(Q)$(RM) parse.c parse.h lex.c enc/trans/newline.c revision.h + $(Q)$(RM) id.c id.h probes.dmyh + $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h + $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) id.c id.h probes.dmyh + $(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem realclean-ext:: PHONY realclean-golf: distclean-golf $(Q)$(RM) $(GOLFPRELUDES) @@ -509,11 +544,17 @@ realclean-extout: distclean-extout clean-ext distclean-ext realclean-ext:: $(Q)$(RM) $(EXTS_MK) - $(Q)$(RM) $(EXTOUT)/.timestamp/.*.time - $(Q)$(RMDIR) $(EXTOUT)/.timestamp 2> $(NULL) || exit 0 + $(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/.$(arch).time $(TIMESTAMPDIR)/$(arch)/.time + $(Q)$(RMDIR) $(TIMESTAMPDIR)/$(arch) $(TIMESTAMPDIR) 2> $(NULL) || exit 0 clean-enc distclean-enc realclean-enc: PHONY +clean-enc: clean-enc.d + +clean-enc.d: PHONY + $(Q)$(RM) $(ENC_TRANS_D) + -$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || exit 0 + clean-rdoc distclean-rdoc realclean-rdoc: @echo $(@:-rdoc=ing) rdoc $(Q)$(RMALL) $(RDOCOUT) @@ -530,62 +571,93 @@ clean-platform: $(Q) $(RM) $(PLATFORM_D) -$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0 -check: main test test-all +check: main test test-testframework test-almost $(ECHO) check succeeded check-ruby: test test-ruby fake: $(CROSS_COMPILING)-fake yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY -no-fake: PHONY +no-fake -fake: PHONY + +# really doesn't depend on .o, just ensure newer than headers which +# version.o depends on. +$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(srcdir)/tool/generic_erb.rb version.$(OBJEXT) miniruby$(EXEEXT) + $(ECHO) generating $@ + $(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \ + $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \ + i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)" btest: $(TEST_RUNNABLE)-btest no-btest: PHONY yes-btest: fake miniruby$(EXEEXT) PHONY - $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) + $(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) btest-ruby: $(TEST_RUNNABLE)-btest-ruby no-btest-ruby: PHONY yes-btest-ruby: prog PHONY - $(Q)$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) + $(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS) -test-sample: $(TEST_RUNNABLE)-test-sample -no-test-sample: PHONY -yes-test-sample: prog PHONY - $(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS) +test-basic: $(TEST_RUNNABLE)-test-basic +no-test-basic: PHONY +yes-test-basic: prog PHONY + $(Q)$(exec) $(RUNRUBY) "$(srcdir)/basictest/runner.rb" --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS) test-knownbugs: test-knownbug test-knownbug: $(TEST_RUNNABLE)-test-knownbug no-test-knownbug: PHONY yes-test-knownbug: prog PHONY - -$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb + -$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb -test: test-sample btest-ruby test-knownbug +test-testframework: $(TEST_RUNNABLE)-test-testframework +yes-test-testframework: prog PHONY + $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest +no-test-testframework: PHONY +test-sample: test-basic # backword compatibility for mswin-build +test: btest-ruby test-knownbug test-basic + +# $ make test-all TESTOPTS="--help" displays more detail +# for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name" test-all: $(TEST_RUNNABLE)-test-all yes-test-all: prog PHONY - $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) $(TESTS) + $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS) TESTS_BUILD = mkmf no-test-all: PHONY $(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD) +test-almost: $(TEST_RUNNABLE)-test-almost +yes-test-almost: prog PHONY + $(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(TESTS) +no-test-almost: PHONY + test-ruby: $(TEST_RUNNABLE)-test-ruby no-test-ruby: PHONY yes-test-ruby: prog encs PHONY - $(RUNRUBY) "$(srcdir)/test/runner.rb" -q $(TESTOPTS) -- ruby -ext- + $(RUNRUBY) "$(srcdir)/test/runner.rb" $(TEST_EXCLUDES) $(TESTOPTS) -- ruby -ext- extconf: $(PREP) $(Q) $(MAKEDIRS) "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) -$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP) - $(Q)$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \ +$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h + $(Q)$(BOOTSTRAPRUBY) -n \ + -e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \ + -e 'END{abort "UNICODE version mismatch: #{mis}" unless mis.empty?}' \ + -e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \ + $(UNICODE_VERSION) $(UNICODE_DATA_HEADERS) + $(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \ + -cross_compiling=$(CROSS_COMPILING) \ + -arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \ -install_name=$(RUBY_INSTALL_NAME) \ - -so_name=$(RUBY_SO_NAME) rbconfig.rb + -so_name=$(RUBY_SO_NAME) \ + -unicode_version=$(UNICODE_VERSION) \ + > rbconfig.tmp + $(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp test-rubyspec-precheck: -test-rubyspec: test-rubyspec-precheck - $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) +test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb + $(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT) RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY @@ -594,20 +666,18 @@ yes-runnable: PHONY encs: enc trans libencs: libenc libtrans -encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP) PHONY +encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY $(ECHO) making $@ - $(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \ - RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \ - $(MFLAGS) $@ + $(Q) $(MAKE) $(MAKE_ENC) $@ libenc enc: {$(VPATH)}encdb.h libtrans trans: {$(VPATH)}transdb.h $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ - $(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) + $(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $@ $(ENCS) + $(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $(ENCS) $@ .PRECIOUS: $(MKFILES) @@ -617,7 +687,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc .PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-html clean-extout .PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout .PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout -.PHONY: check test test-all btest btest-ruby test-sample test-knownbug +.PHONY: check test test-all btest btest-ruby test-basic test-knownbug .PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby .PHONY: update-mspec update-rubyspec test-rubyspec @@ -637,7 +707,17 @@ PHONY: $(Q)$(RM) y.tab.c y.tab.h $(PLATFORM_D): - $(Q) $(MAKEDIRS) $(PLATFORM_DIR) + $(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D) + @exit > $@ + +$(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D) + +$(ENC_TRANS_D): + $(Q) $(MAKEDIRS) enc/trans $(@D) + @exit > $@ + +$(TIMESTAMPDIR)/.$(arch).time: + $(Q)$(MAKEDIRS) $(@D) $(TIMESTAMPDIR)/$(arch) @exit > $@ ### @@ -651,9 +731,10 @@ RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \ acosh.$(OBJEXT): {$(VPATH)}acosh.c alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h -crypt.$(OBJEXT): {$(VPATH)}crypt.c +crypt.$(OBJEXT): {$(VPATH)}crypt.c {$(VPATH)}crypt.h {$(VPATH)}missing/des_tables.c dup2.$(OBJEXT): {$(VPATH)}dup2.c erf.$(OBJEXT): {$(VPATH)}erf.c +explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c finite.$(OBJEXT): {$(VPATH)}finite.c flock.$(OBJEXT): {$(VPATH)}flock.c memcmp.$(OBJEXT): {$(VPATH)}memcmp.c @@ -669,8 +750,6 @@ strstr.$(OBJEXT): {$(VPATH)}strstr.c strtod.$(OBJEXT): {$(VPATH)}strtod.c strtol.$(OBJEXT): {$(VPATH)}strtol.c nt.$(OBJEXT): {$(VPATH)}nt.c -os2.$(OBJEXT): {$(VPATH)}os2.c -dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c ia64.$(OBJEXT): {$(VPATH)}ia64.s $(CC) $(CFLAGS) -c $< @@ -684,18 +763,20 @@ prelude.$(OBJEXT): {$(VPATH)}prelude.c # dependencies for optional sources. compile.$(OBJEXT): {$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc -win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}dln.h {$(VPATH)}dln_find.c \ - {$(VPATH)}internal.h $(RUBY_H_INCLUDES) $(PLATFORM_D) -win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}thread.h \ +win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}win32/file.h \ + {$(VPATH)}dln.h {$(VPATH)}dln_find.c {$(VPATH)}encindex.h \ + {$(VPATH)}internal.h {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(PLATFORM_D) +win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}win32/file.h \ $(RUBY_H_INCLUDES) $(PLATFORM_D) $(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb + $(Q) $(MAKEDIRS) $(@D) $(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans -newline.$(OBJEXT): $(NEWLINE_C) +enc/trans/newline.$(OBJEXT): $(NEWLINE_C) verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(ECHO) creating $@ - $(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl + $(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl ruby-glommed.$(OBJEXT): $(OBJS) @@ -719,17 +800,23 @@ INSNS2VMOPT = --srcdir="$(srcdir)" {$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl -common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c \ +common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}enc/trans/newline.c {$(VPATH)}id.c \ srcs-lib srcs-ext -srcs: common-srcs srcs-enc +missing-srcs: $(srcdir)/missing/des_tables.c + +srcs: common-srcs missing-srcs srcs-enc EXT_SRCS = $(srcdir)/ext/ripper/ripper.c \ - $(srcdir)/ext/rbconfig/sizeof/sizes.c + $(srcdir)/ext/rbconfig/sizeof/sizes.c \ + $(srcdir)/ext/socket/constdefs.c \ + # EXT_SRCS srcs-ext: $(EXT_SRCS) -srcs-extra: $(srcdir)/ext/json/parser/parser.c +srcs-extra: $(srcdir)/ext/json/parser/parser.c \ + $(srcdir)/ext/date/zonetab.h \ + $(empty) LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb @@ -737,11 +824,13 @@ srcs-lib: $(LIB_SRCS) srcs-enc: $(ENC_MK) $(ECHO) making srcs under enc - $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs + $(Q) $(MAKE) $(MAKE_ENC) srcs all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \ - $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h enc/jis/props.h \ + {$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \ + $(REVISION_H) \ + $(UNICODE_DATA_HEADERS) $(srcdir)/enc/jis/props.h \ {$(VPATH)}id.h {$(VPATH)}probes.dmyh insns: $(INSNS) @@ -774,15 +863,17 @@ known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_ $(ECHO) generating $@ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def +vm_call_iseq_optimized.inc: $(srcdir)/tool/mk_call_iseq_optimized.rb + $(ECHO) generating $@ + $(Q) $(BASERUBY) $(srcdir)/tool/mk_call_iseq_optimized.rb > $@ + $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(ECHO) generating $@ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \ $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ - {$(srcdir)}lib/rubygems/defaults.rb \ - {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \ - $(PRELUDE_SCRIPTS) $(LIB_SRCS) + $(PRELUDE_SCRIPTS) $(ECHO) generating $@ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ $(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS) @@ -792,7 +883,9 @@ $(PRELUDE_C): $(COMPILE_PRELUDE) \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ $(srcdir)/template/prelude.c.tmpl golf_prelude.rb -probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb +{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb + +probes.dmyh: $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@ probes.h: {$(VPATH)}probes.$(DTRACE_EXT) @@ -810,11 +903,12 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr -$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > revision.tmp $(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp -$(srcdir)/ext/ripper/ripper.c: parse.y id.h +$(srcdir)/ext/ripper/ripper.c: $(srcdir)/parse.y id.h $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \ - Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH="$(PWD)" \ - top_srcdir=../.. srcdir=. \ + $(Q) $(CHDIR) $(@D) && \ + sed /AUTOGENERATED/q depend | \ + $(exec) $(MAKE) -f - $(MFLAGS) \ + Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl @@ -822,12 +916,25 @@ $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" +$(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list + $(ECHO) generating $@ + $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \ + Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. BASERUBY="$(BASERUBY)" + $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \ + $(Q) $(CHDIR) $(@D) && \ + sed '/AUTOGENERATED/q' depend | \ + $(exec) $(MAKE) -f - $(MFLAGS) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" +$(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend + $(Q) $(CHDIR) $(@D) && \ + sed '/AUTOGENERATED/q' depend | \ + $(exec) $(MAKE) -f - $(MFLAGS) \ + Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" + ## run: fake miniruby$(EXEEXT) PHONY @@ -849,19 +956,24 @@ COMPARE_RUBY = $(BASERUBY) ITEM = OPTS = -benchmark: $(PROGRAM) PHONY +# You can pass several options through OPTS environment variable. +# $ make benchmark OPTS="--help" displays more detail. +# for example, +# $ make benchmark COMPARE_RUBY="ruby-trunk" OPTS="-e ruby-2.2.2" +# This command compares trunk and built-ruby and 2.2.2 +benchmark: miniruby$(EXEEXT) PHONY $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \ - --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \ + --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \ --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS) -benchmark-each: $(PROGRAM) PHONY +benchmark-each: miniruby$(EXEEXT) PHONY $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \ - --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \ + --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \ --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS) -tbench: $(PROGRAM) PHONY +tbench: miniruby$(EXEEXT) PHONY $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \ - --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \ + --executables="$(COMPARE_RUBY) -I../../ruby/lib -I. -I.ext/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \ --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS) run.gdb: @@ -886,7 +998,12 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY $(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT) dist: - $(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME) + $(BASERUBY) $(srcdir)/tool/make-snapshot \ + -srcdir=$(srcdir) \ + -unicode-version=$(UNICODE_VERSION) \ + tmp $(RELNAME) + +up:: update-remote up:: -$(Q)$(MAKE) $(MFLAGS) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)" @@ -894,7 +1011,10 @@ up:: up:: -$(Q)$(MAKE) $(MFLAGS) Q=$(Q) after-update -after-update:: update-unicode update-gems extract-extlibs +after-update:: extract-extlibs + +update-remote:: update-src update-rubyspec update-download +update-download:: update-unicode update-gems download-extlibs update-config_files: PHONY $(Q) $(BASERUBY) -C "$(srcdir)/tool" \ @@ -903,7 +1023,7 @@ update-config_files: PHONY update-gems: PHONY $(ECHO) Downloading bundled gem files... - $(Q) $(RUNRUBY) -C "$(srcdir)/gems" \ + $(Q) $(BASERUBY) -C "$(srcdir)/gems" \ -I../tool -rdownloader -answ \ -e 'gem, ver = *$$F' \ -e 'old = Dir.glob("#{gem}-*.gem")' \ @@ -912,45 +1032,99 @@ update-gems: PHONY -e 'File.unlink(*(old-[gem]))' \ bundled_gems -UPDATE_LIBRARIES = no - -### set the following environment variable or uncomment the line if -### the Unicode data files are updated every minute. -# ALWAYS_UPDATE_UNICODE = yes - -UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \ - $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CompositionExclusions.txt \ - $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt - -update-unicode: $(UNICODE_FILES) PHONY - -UNICODE_FILES_DEPS0 = $(UPDATE_LIBRARIES:yes=download-unicode-data) -UNICODE_FILES_DEPS = $(UNICODE_FILES_DEPS0:no=) -$(UNICODE_FILES): $(UNICODE_FILES_DEPS) +extract-gems: PHONY + $(ECHO) Extracting bundled gem files... + $(Q) $(RUNRUBY) -C "$(srcdir)/gems" \ + -I../tool -rgem-unpack -answ \ + -e 'gem, ver = *$$F' \ + -e 'Gem.unpack("#{gem}-#{ver}.gem")' \ + bundled_gems -download-unicode-data: ./.unicode-$(UNICODE_VERSION).time -./.unicode-$(UNICODE_VERSION).time: PHONY +update-bundled_gems: PHONY + $(Q) $(RUNRUBY) -rrubygems \ + -pla \ + -e '$$_=Gem::SpecFetcher.fetcher.detect(:latest) {|s|' \ + -e 'break "#{s.name} #{s.version}" if s.platform=="ruby"&&s.name==$$F[0]' \ + -e '}' \ + "$(srcdir)/gems/bundled_gems" | \ + "$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" - + +UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ + $(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \ + $(UNICODE_SRC_DATA_DIR)/NormalizationTest.txt \ + $(UNICODE_SRC_DATA_DIR)/CaseFolding.txt \ + $(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \ + $(empty) + +UNICODE_PROPERTY_FILES = \ + $(UNICODE_SRC_DATA_DIR)/Blocks.txt \ + $(UNICODE_SRC_DATA_DIR)/DerivedAge.txt \ + $(UNICODE_SRC_DATA_DIR)/DerivedCoreProperties.txt \ + $(UNICODE_SRC_DATA_DIR)/PropList.txt \ + $(UNICODE_SRC_DATA_DIR)/PropertyAliases.txt \ + $(UNICODE_SRC_DATA_DIR)/PropertyValueAliases.txt \ + $(UNICODE_SRC_DATA_DIR)/Scripts.txt \ + $(empty) + +update-unicode: $(UNICODE_FILES) + +UNICODE_DOWNLOAD = \ + $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ + -d $(UNICODE_DATA_DIR) \ + -p $(UNICODE_VERSION)/ucd \ + -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode + +$(UNICODE_PROPERTY_FILES): + $(ECHO) Downloading Unicode $(UNICODE_VERSION) property files... + $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)" + $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES) + +$(UNICODE_FILES): $(ECHO) Downloading Unicode $(UNICODE_VERSION) data files... - $(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)" - $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \ - -d enc/unicode/data/$(UNICODE_VERSION) \ - -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \ - $(UNICODE_VERSION)/ucd/UnicodeData.txt \ - $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \ - $(UNICODE_VERSION)/ucd/NormalizationTest.txt - @exit > $@ + $(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)" + $(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES) $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \ - $(UNICODE_FILES_DEPS:download-unicode-data=./.unicode-tables.time) + $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time + +$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): $(UNICODE_FILES) -./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ - $(UNICODE_FILES) $(UNICODE_FILES_DEPS) \ +$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ $(srcdir)/template/unicode_norm_gen.tmpl + $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ -c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \ -I $(srcdir) \ $(srcdir)/template/unicode_norm_gen.tmpl \ - enc/unicode/data/$(UNICODE_VERSION) lib/unicode_normalize + $(UNICODE_DATA_DIR) lib/unicode_normalize + +# UPDATE_NAME2CTYPE= : toplevel +# UPDATE_NAME2CTYPE=yes : sub-make to update name2ctype.h +$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=.ignore.)name2ctype.h: + $(Q) $(MAKE) $(MFLAGS) Q=$(Q) UPDATE_NAME2CTYPE=yes UNICODE_VERSION=$(UNICODE_VERSION) $@ + +$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=name2ctype.h): \ + $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ + $(UNICODE_PROPERTY_FILES) + $(MAKEDIRS) $(@D) + $(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header $(UNICODE_SRC_DATA_DIR) > $@ + +# the next non-comment line was: +# $(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \ +# but was changed to make sure CI works on systems that don't have gperf +unicode-up: $(UNICODE_DATA_HEADERS) + +$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=casefold.h): \ + $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ + $(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \ + $(UNICODE_SRC_DATA_DIR)/CaseFolding.txt + +$(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb + $(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode + $(MAKEDIRS) $(@D) + $(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \ + --output-file=$@ \ + --mapping-data-directory=$(UNICODE_SRC_DATA_DIR) download-extlibs: $(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext @@ -961,6 +1135,9 @@ extract-extlibs: clean-extlibs: $(Q) $(RMALL) $(srcdir)/.downloaded-cache +clean-gems: + $(Q) $(RM) gems/*.gem + CLEAN_CACHE = clean-extlibs info: info-program info-libruby_a info-libruby_so info-arch @@ -976,7 +1153,9 @@ info-arch: PHONY change: PHONY $(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log -love: sudo-precheck up all test install test-all +exam: check test-rubyspec + +love: sudo-precheck up all test install check @echo love is all you need yes-test-all: sudo-precheck @@ -984,6 +1163,12 @@ yes-test-all: sudo-precheck sudo-precheck: PHONY @$(SUDO) echo > $(NULL) +update-man-date: PHONY + -$(Q) $(BASERUBY) -I"$(srcdir)/tool" -rvcs -i -p \ + -e 'BEGIN{@vcs=VCS.detect(ARGV.shift)}' \ + -e '$$_.sub!(/^(\.Dd ).*/){$$1+@vcs.modified(ARGF.path).strftime("%B %d, %Y")}' \ + "$(srcdir)" "$(srcdir)"/man/*.1 + help: PHONY $(MESSAGE_BEGIN) \ " Makefile of Ruby" \ @@ -1000,16 +1185,18 @@ help: PHONY " gdb: runs test.rb by miniruby under gdb" \ " gdb-ruby: runs test.rb by ruby under gdb" \ " check: equals make test test-all" \ + " exam: equals make check test-rubyspec" \ " test: ruby core tests" \ - " test-all: all ruby tests [TESTS=<test files>]" \ - " test-rubyspec: run RubySpec test suite" \ - " update-rubyspec: update local copy of RubySpec" \ - " benchmark: benchmark this ruby and COMPARE_RUBY" \ + " test-all: all ruby tests [TESTOPTS=-j4 TESTS=\"<test files>\"]" \ + " test-rubyspec: run the Ruby spec suite" \ + " up: update local copy and autogenerated files" \ + " update-rubyspec: update local copy of the Ruby spec suite" \ + " benchmark: benchmark this ruby and COMPARE_RUBY." \ " gcbench: gc benchmark [GCBENCH_ITEM=<item_name>]" \ " gcbench-rdoc: gc benchmark with GCBENCH_ITEM=rdoc" \ " install: install all ruby distributions" \ " install-nodoc: install without rdoc" \ - " install-cross: install cross compiling staff" \ + " install-cross: install cross compiling stuff" \ " clean: clean for tarball" \ " distclean: clean for repository" \ " change: make change log template" \ @@ -1036,17 +1223,12 @@ array.$(OBJEXT): {$(VPATH)}internal.h array.$(OBJEXT): {$(VPATH)}io.h array.$(OBJEXT): {$(VPATH)}missing.h array.$(OBJEXT): {$(VPATH)}oniguruma.h +array.$(OBJEXT): {$(VPATH)}probes.dmyh array.$(OBJEXT): {$(VPATH)}probes.h +array.$(OBJEXT): {$(VPATH)}ruby_assert.h array.$(OBJEXT): {$(VPATH)}st.h array.$(OBJEXT): {$(VPATH)}subst.h array.$(OBJEXT): {$(VPATH)}util.h -array.$(OBJEXT): {$(VPATH)}vm_opts.h -ascii.$(OBJEXT): {$(VPATH)}ascii.c -ascii.$(OBJEXT): {$(VPATH)}config.h -ascii.$(OBJEXT): {$(VPATH)}defines.h -ascii.$(OBJEXT): {$(VPATH)}missing.h -ascii.$(OBJEXT): {$(VPATH)}oniguruma.h -ascii.$(OBJEXT): {$(VPATH)}regenc.h bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h bignum.$(OBJEXT): $(top_srcdir)/include/ruby.h bignum.$(OBJEXT): {$(VPATH)}bignum.c @@ -1058,6 +1240,7 @@ bignum.$(OBJEXT): {$(VPATH)}internal.h bignum.$(OBJEXT): {$(VPATH)}io.h bignum.$(OBJEXT): {$(VPATH)}missing.h bignum.$(OBJEXT): {$(VPATH)}oniguruma.h +bignum.$(OBJEXT): {$(VPATH)}ruby_assert.h bignum.$(OBJEXT): {$(VPATH)}st.h bignum.$(OBJEXT): {$(VPATH)}subst.h bignum.$(OBJEXT): {$(VPATH)}thread.h @@ -1074,6 +1257,7 @@ class.$(OBJEXT): {$(VPATH)}constant.h class.$(OBJEXT): {$(VPATH)}defines.h class.$(OBJEXT): {$(VPATH)}encoding.h class.$(OBJEXT): {$(VPATH)}id.h +class.$(OBJEXT): {$(VPATH)}id_table.h class.$(OBJEXT): {$(VPATH)}intern.h class.$(OBJEXT): {$(VPATH)}internal.h class.$(OBJEXT): {$(VPATH)}io.h @@ -1081,6 +1265,7 @@ class.$(OBJEXT): {$(VPATH)}method.h class.$(OBJEXT): {$(VPATH)}missing.h class.$(OBJEXT): {$(VPATH)}node.h class.$(OBJEXT): {$(VPATH)}oniguruma.h +class.$(OBJEXT): {$(VPATH)}ruby_assert.h class.$(OBJEXT): {$(VPATH)}ruby_atomic.h class.$(OBJEXT): {$(VPATH)}st.h class.$(OBJEXT): {$(VPATH)}subst.h @@ -1093,6 +1278,7 @@ compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h compar.$(OBJEXT): {$(VPATH)}compar.c compar.$(OBJEXT): {$(VPATH)}config.h compar.$(OBJEXT): {$(VPATH)}defines.h +compar.$(OBJEXT): {$(VPATH)}id.h compar.$(OBJEXT): {$(VPATH)}intern.h compar.$(OBJEXT): {$(VPATH)}missing.h compar.$(OBJEXT): {$(VPATH)}st.h @@ -1106,8 +1292,11 @@ compile.$(OBJEXT): $(top_srcdir)/include/ruby.h compile.$(OBJEXT): {$(VPATH)}compile.c compile.$(OBJEXT): {$(VPATH)}config.h compile.$(OBJEXT): {$(VPATH)}defines.h +compile.$(OBJEXT): {$(VPATH)}encindex.h compile.$(OBJEXT): {$(VPATH)}encoding.h +compile.$(OBJEXT): {$(VPATH)}gc.h compile.$(OBJEXT): {$(VPATH)}id.h +compile.$(OBJEXT): {$(VPATH)}id_table.h compile.$(OBJEXT): {$(VPATH)}insns.inc compile.$(OBJEXT): {$(VPATH)}insns_info.inc compile.$(OBJEXT): {$(VPATH)}intern.h @@ -1118,7 +1307,12 @@ compile.$(OBJEXT): {$(VPATH)}method.h compile.$(OBJEXT): {$(VPATH)}missing.h compile.$(OBJEXT): {$(VPATH)}node.h compile.$(OBJEXT): {$(VPATH)}oniguruma.h +compile.$(OBJEXT): {$(VPATH)}opt_sc.inc compile.$(OBJEXT): {$(VPATH)}optinsn.inc +compile.$(OBJEXT): {$(VPATH)}optunifs.inc +compile.$(OBJEXT): {$(VPATH)}re.h +compile.$(OBJEXT): {$(VPATH)}regex.h +compile.$(OBJEXT): {$(VPATH)}ruby_assert.h compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h compile.$(OBJEXT): {$(VPATH)}st.h compile.$(OBJEXT): {$(VPATH)}subst.h @@ -1138,6 +1332,7 @@ complex.$(OBJEXT): {$(VPATH)}internal.h complex.$(OBJEXT): {$(VPATH)}io.h complex.$(OBJEXT): {$(VPATH)}missing.h complex.$(OBJEXT): {$(VPATH)}oniguruma.h +complex.$(OBJEXT): {$(VPATH)}ruby_assert.h complex.$(OBJEXT): {$(VPATH)}st.h complex.$(OBJEXT): {$(VPATH)}subst.h cont.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h @@ -1160,6 +1355,7 @@ cont.$(OBJEXT): {$(VPATH)}method.h cont.$(OBJEXT): {$(VPATH)}missing.h cont.$(OBJEXT): {$(VPATH)}node.h cont.$(OBJEXT): {$(VPATH)}oniguruma.h +cont.$(OBJEXT): {$(VPATH)}ruby_assert.h cont.$(OBJEXT): {$(VPATH)}ruby_atomic.h cont.$(OBJEXT): {$(VPATH)}st.h cont.$(OBJEXT): {$(VPATH)}subst.h @@ -1187,6 +1383,7 @@ debug.$(OBJEXT): {$(VPATH)}method.h debug.$(OBJEXT): {$(VPATH)}missing.h debug.$(OBJEXT): {$(VPATH)}node.h debug.$(OBJEXT): {$(VPATH)}oniguruma.h +debug.$(OBJEXT): {$(VPATH)}ruby_assert.h debug.$(OBJEXT): {$(VPATH)}ruby_atomic.h debug.$(OBJEXT): {$(VPATH)}st.h debug.$(OBJEXT): {$(VPATH)}subst.h @@ -1201,6 +1398,7 @@ dir.$(OBJEXT): $(top_srcdir)/include/ruby.h dir.$(OBJEXT): {$(VPATH)}config.h dir.$(OBJEXT): {$(VPATH)}defines.h dir.$(OBJEXT): {$(VPATH)}dir.c +dir.$(OBJEXT): {$(VPATH)}encindex.h dir.$(OBJEXT): {$(VPATH)}encoding.h dir.$(OBJEXT): {$(VPATH)}intern.h dir.$(OBJEXT): {$(VPATH)}internal.h @@ -1238,10 +1436,54 @@ dmydln.$(OBJEXT): {$(VPATH)}st.h dmydln.$(OBJEXT): {$(VPATH)}subst.h dmyenc.$(OBJEXT): {$(VPATH)}dmyenc.c dmyext.$(OBJEXT): {$(VPATH)}dmyext.c +enc/ascii.$(OBJEXT): {$(VPATH)}config.h +enc/ascii.$(OBJEXT): {$(VPATH)}defines.h +enc/ascii.$(OBJEXT): {$(VPATH)}enc/ascii.c +enc/ascii.$(OBJEXT): {$(VPATH)}encindex.h +enc/ascii.$(OBJEXT): {$(VPATH)}missing.h +enc/ascii.$(OBJEXT): {$(VPATH)}oniguruma.h +enc/ascii.$(OBJEXT): {$(VPATH)}regenc.h +enc/trans/newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}config.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}defines.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}enc/trans/newline.c +enc/trans/newline.$(OBJEXT): {$(VPATH)}intern.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}missing.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}st.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}subst.h +enc/trans/newline.$(OBJEXT): {$(VPATH)}transcode_data.h +enc/unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.h +enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/casefold.h +enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.h +enc/unicode.$(OBJEXT): {$(VPATH)}config.h +enc/unicode.$(OBJEXT): {$(VPATH)}defines.h +enc/unicode.$(OBJEXT): {$(VPATH)}enc/unicode.c +enc/unicode.$(OBJEXT): {$(VPATH)}intern.h +enc/unicode.$(OBJEXT): {$(VPATH)}missing.h +enc/unicode.$(OBJEXT): {$(VPATH)}oniguruma.h +enc/unicode.$(OBJEXT): {$(VPATH)}regenc.h +enc/unicode.$(OBJEXT): {$(VPATH)}regint.h +enc/unicode.$(OBJEXT): {$(VPATH)}st.h +enc/unicode.$(OBJEXT): {$(VPATH)}subst.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}config.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}defines.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}enc/us_ascii.c +enc/us_ascii.$(OBJEXT): {$(VPATH)}encindex.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}missing.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}oniguruma.h +enc/us_ascii.$(OBJEXT): {$(VPATH)}regenc.h +enc/utf_8.$(OBJEXT): {$(VPATH)}config.h +enc/utf_8.$(OBJEXT): {$(VPATH)}defines.h +enc/utf_8.$(OBJEXT): {$(VPATH)}enc/utf_8.c +enc/utf_8.$(OBJEXT): {$(VPATH)}encindex.h +enc/utf_8.$(OBJEXT): {$(VPATH)}missing.h +enc/utf_8.$(OBJEXT): {$(VPATH)}oniguruma.h +enc/utf_8.$(OBJEXT): {$(VPATH)}regenc.h encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h encoding.$(OBJEXT): $(top_srcdir)/include/ruby.h encoding.$(OBJEXT): {$(VPATH)}config.h encoding.$(OBJEXT): {$(VPATH)}defines.h +encoding.$(OBJEXT): {$(VPATH)}encindex.h encoding.$(OBJEXT): {$(VPATH)}encoding.c encoding.$(OBJEXT): {$(VPATH)}encoding.h encoding.$(OBJEXT): {$(VPATH)}intern.h @@ -1250,6 +1492,7 @@ encoding.$(OBJEXT): {$(VPATH)}io.h encoding.$(OBJEXT): {$(VPATH)}missing.h encoding.$(OBJEXT): {$(VPATH)}oniguruma.h encoding.$(OBJEXT): {$(VPATH)}regenc.h +encoding.$(OBJEXT): {$(VPATH)}ruby_assert.h encoding.$(OBJEXT): {$(VPATH)}st.h encoding.$(OBJEXT): {$(VPATH)}subst.h encoding.$(OBJEXT): {$(VPATH)}util.h @@ -1264,7 +1507,6 @@ enum.$(OBJEXT): {$(VPATH)}intern.h enum.$(OBJEXT): {$(VPATH)}internal.h enum.$(OBJEXT): {$(VPATH)}io.h enum.$(OBJEXT): {$(VPATH)}missing.h -enum.$(OBJEXT): {$(VPATH)}node.h enum.$(OBJEXT): {$(VPATH)}oniguruma.h enum.$(OBJEXT): {$(VPATH)}st.h enum.$(OBJEXT): {$(VPATH)}subst.h @@ -1279,7 +1521,6 @@ enumerator.$(OBJEXT): {$(VPATH)}intern.h enumerator.$(OBJEXT): {$(VPATH)}internal.h enumerator.$(OBJEXT): {$(VPATH)}io.h enumerator.$(OBJEXT): {$(VPATH)}missing.h -enumerator.$(OBJEXT): {$(VPATH)}node.h enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h enumerator.$(OBJEXT): {$(VPATH)}st.h enumerator.$(OBJEXT): {$(VPATH)}subst.h @@ -1302,6 +1543,7 @@ error.$(OBJEXT): {$(VPATH)}method.h error.$(OBJEXT): {$(VPATH)}missing.h error.$(OBJEXT): {$(VPATH)}node.h error.$(OBJEXT): {$(VPATH)}oniguruma.h +error.$(OBJEXT): {$(VPATH)}ruby_assert.h error.$(OBJEXT): {$(VPATH)}ruby_atomic.h error.$(OBJEXT): {$(VPATH)}st.h error.$(OBJEXT): {$(VPATH)}subst.h @@ -1333,8 +1575,10 @@ eval.$(OBJEXT): {$(VPATH)}method.h eval.$(OBJEXT): {$(VPATH)}missing.h eval.$(OBJEXT): {$(VPATH)}node.h eval.$(OBJEXT): {$(VPATH)}oniguruma.h +eval.$(OBJEXT): {$(VPATH)}probes.dmyh eval.$(OBJEXT): {$(VPATH)}probes.h eval.$(OBJEXT): {$(VPATH)}probes_helper.h +eval.$(OBJEXT): {$(VPATH)}ruby_assert.h eval.$(OBJEXT): {$(VPATH)}ruby_atomic.h eval.$(OBJEXT): {$(VPATH)}st.h eval.$(OBJEXT): {$(VPATH)}subst.h @@ -1344,11 +1588,15 @@ eval.$(OBJEXT): {$(VPATH)}vm.h eval.$(OBJEXT): {$(VPATH)}vm_core.h eval.$(OBJEXT): {$(VPATH)}vm_debug.h eval.$(OBJEXT): {$(VPATH)}vm_opts.h +explicit_bzero.$(OBJEXT): {$(VPATH)}config.h +explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c +explicit_bzero.$(OBJEXT): {$(VPATH)}missing.h file.$(OBJEXT): $(hdrdir)/ruby/ruby.h file.$(OBJEXT): $(top_srcdir)/include/ruby.h file.$(OBJEXT): {$(VPATH)}config.h file.$(OBJEXT): {$(VPATH)}defines.h file.$(OBJEXT): {$(VPATH)}dln.h +file.$(OBJEXT): {$(VPATH)}encindex.h file.$(OBJEXT): {$(VPATH)}encoding.h file.$(OBJEXT): {$(VPATH)}file.c file.$(OBJEXT): {$(VPATH)}intern.h @@ -1358,7 +1606,6 @@ file.$(OBJEXT): {$(VPATH)}missing.h file.$(OBJEXT): {$(VPATH)}oniguruma.h file.$(OBJEXT): {$(VPATH)}st.h file.$(OBJEXT): {$(VPATH)}subst.h -file.$(OBJEXT): {$(VPATH)}thread.h file.$(OBJEXT): {$(VPATH)}util.h gc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h gc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h @@ -1375,6 +1622,7 @@ gc.$(OBJEXT): {$(VPATH)}eval_intern.h gc.$(OBJEXT): {$(VPATH)}gc.c gc.$(OBJEXT): {$(VPATH)}gc.h gc.$(OBJEXT): {$(VPATH)}id.h +gc.$(OBJEXT): {$(VPATH)}id_table.h gc.$(OBJEXT): {$(VPATH)}intern.h gc.$(OBJEXT): {$(VPATH)}internal.h gc.$(OBJEXT): {$(VPATH)}io.h @@ -1382,11 +1630,13 @@ gc.$(OBJEXT): {$(VPATH)}method.h gc.$(OBJEXT): {$(VPATH)}missing.h gc.$(OBJEXT): {$(VPATH)}node.h gc.$(OBJEXT): {$(VPATH)}oniguruma.h +gc.$(OBJEXT): {$(VPATH)}probes.dmyh gc.$(OBJEXT): {$(VPATH)}probes.h gc.$(OBJEXT): {$(VPATH)}re.h gc.$(OBJEXT): {$(VPATH)}regenc.h gc.$(OBJEXT): {$(VPATH)}regex.h gc.$(OBJEXT): {$(VPATH)}regint.h +gc.$(OBJEXT): {$(VPATH)}ruby_assert.h gc.$(OBJEXT): {$(VPATH)}ruby_atomic.h gc.$(OBJEXT): {$(VPATH)}st.h gc.$(OBJEXT): {$(VPATH)}subst.h @@ -1411,10 +1661,12 @@ golf_prelude.$(OBJEXT): {$(VPATH)}id.h golf_prelude.$(OBJEXT): {$(VPATH)}intern.h golf_prelude.$(OBJEXT): {$(VPATH)}internal.h golf_prelude.$(OBJEXT): {$(VPATH)}io.h +golf_prelude.$(OBJEXT): {$(VPATH)}iseq.h golf_prelude.$(OBJEXT): {$(VPATH)}method.h golf_prelude.$(OBJEXT): {$(VPATH)}missing.h golf_prelude.$(OBJEXT): {$(VPATH)}node.h golf_prelude.$(OBJEXT): {$(VPATH)}oniguruma.h +golf_prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h golf_prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h golf_prelude.$(OBJEXT): {$(VPATH)}st.h golf_prelude.$(OBJEXT): {$(VPATH)}subst.h @@ -1425,6 +1677,7 @@ golf_prelude.$(OBJEXT): {$(VPATH)}vm_debug.h golf_prelude.$(OBJEXT): {$(VPATH)}vm_opts.h goruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h goruby.$(OBJEXT): $(top_srcdir)/include/ruby.h +goruby.$(OBJEXT): {$(VPATH)}backward.h goruby.$(OBJEXT): {$(VPATH)}config.h goruby.$(OBJEXT): {$(VPATH)}defines.h goruby.$(OBJEXT): {$(VPATH)}goruby.c @@ -1447,12 +1700,12 @@ hash.$(OBJEXT): {$(VPATH)}internal.h hash.$(OBJEXT): {$(VPATH)}io.h hash.$(OBJEXT): {$(VPATH)}missing.h hash.$(OBJEXT): {$(VPATH)}oniguruma.h +hash.$(OBJEXT): {$(VPATH)}probes.dmyh hash.$(OBJEXT): {$(VPATH)}probes.h hash.$(OBJEXT): {$(VPATH)}st.h hash.$(OBJEXT): {$(VPATH)}subst.h hash.$(OBJEXT): {$(VPATH)}symbol.h hash.$(OBJEXT): {$(VPATH)}util.h -hash.$(OBJEXT): {$(VPATH)}vm_opts.h inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h inits.$(OBJEXT): $(top_srcdir)/include/ruby.h inits.$(OBJEXT): {$(VPATH)}config.h @@ -1471,6 +1724,7 @@ io.$(OBJEXT): $(top_srcdir)/include/ruby.h io.$(OBJEXT): {$(VPATH)}config.h io.$(OBJEXT): {$(VPATH)}defines.h io.$(OBJEXT): {$(VPATH)}dln.h +io.$(OBJEXT): {$(VPATH)}encindex.h io.$(OBJEXT): {$(VPATH)}encoding.h io.$(OBJEXT): {$(VPATH)}id.h io.$(OBJEXT): {$(VPATH)}intern.h @@ -1496,6 +1750,7 @@ iseq.$(OBJEXT): {$(VPATH)}encoding.h iseq.$(OBJEXT): {$(VPATH)}eval_intern.h iseq.$(OBJEXT): {$(VPATH)}gc.h iseq.$(OBJEXT): {$(VPATH)}id.h +iseq.$(OBJEXT): {$(VPATH)}id_table.h iseq.$(OBJEXT): {$(VPATH)}insns.inc iseq.$(OBJEXT): {$(VPATH)}insns_info.inc iseq.$(OBJEXT): {$(VPATH)}intern.h @@ -1508,6 +1763,7 @@ iseq.$(OBJEXT): {$(VPATH)}missing.h iseq.$(OBJEXT): {$(VPATH)}node.h iseq.$(OBJEXT): {$(VPATH)}node_name.inc iseq.$(OBJEXT): {$(VPATH)}oniguruma.h +iseq.$(OBJEXT): {$(VPATH)}ruby_assert.h iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h iseq.$(OBJEXT): {$(VPATH)}st.h iseq.$(OBJEXT): {$(VPATH)}subst.h @@ -1537,7 +1793,9 @@ load.$(OBJEXT): {$(VPATH)}method.h load.$(OBJEXT): {$(VPATH)}missing.h load.$(OBJEXT): {$(VPATH)}node.h load.$(OBJEXT): {$(VPATH)}oniguruma.h +load.$(OBJEXT): {$(VPATH)}probes.dmyh load.$(OBJEXT): {$(VPATH)}probes.h +load.$(OBJEXT): {$(VPATH)}ruby_assert.h load.$(OBJEXT): {$(VPATH)}ruby_atomic.h load.$(OBJEXT): {$(VPATH)}st.h load.$(OBJEXT): {$(VPATH)}subst.h @@ -1562,6 +1820,7 @@ localeinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h localeinit.$(OBJEXT): $(top_srcdir)/include/ruby.h localeinit.$(OBJEXT): {$(VPATH)}config.h localeinit.$(OBJEXT): {$(VPATH)}defines.h +localeinit.$(OBJEXT): {$(VPATH)}encindex.h localeinit.$(OBJEXT): {$(VPATH)}encoding.h localeinit.$(OBJEXT): {$(VPATH)}intern.h localeinit.$(OBJEXT): {$(VPATH)}internal.h @@ -1573,6 +1832,7 @@ localeinit.$(OBJEXT): {$(VPATH)}st.h localeinit.$(OBJEXT): {$(VPATH)}subst.h main.$(OBJEXT): $(hdrdir)/ruby/ruby.h main.$(OBJEXT): $(top_srcdir)/include/ruby.h +main.$(OBJEXT): {$(VPATH)}backward.h main.$(OBJEXT): {$(VPATH)}config.h main.$(OBJEXT): {$(VPATH)}defines.h main.$(OBJEXT): {$(VPATH)}intern.h @@ -1586,7 +1846,9 @@ marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h marshal.$(OBJEXT): $(top_srcdir)/include/ruby.h marshal.$(OBJEXT): {$(VPATH)}config.h marshal.$(OBJEXT): {$(VPATH)}defines.h +marshal.$(OBJEXT): {$(VPATH)}encindex.h marshal.$(OBJEXT): {$(VPATH)}encoding.h +marshal.$(OBJEXT): {$(VPATH)}id_table.h marshal.$(OBJEXT): {$(VPATH)}intern.h marshal.$(OBJEXT): {$(VPATH)}internal.h marshal.$(OBJEXT): {$(VPATH)}io.h @@ -1619,16 +1881,8 @@ miniinit.$(OBJEXT): {$(VPATH)}missing.h miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h miniinit.$(OBJEXT): {$(VPATH)}st.h miniinit.$(OBJEXT): {$(VPATH)}subst.h +miniprelude.$(OBJEXT): {$(VPATH)}iseq.h miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c -newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h -newline.$(OBJEXT): {$(VPATH)}config.h -newline.$(OBJEXT): {$(VPATH)}defines.h -newline.$(OBJEXT): {$(VPATH)}intern.h -newline.$(OBJEXT): {$(VPATH)}missing.h -newline.$(OBJEXT): {$(VPATH)}newline.c -newline.$(OBJEXT): {$(VPATH)}st.h -newline.$(OBJEXT): {$(VPATH)}subst.h -newline.$(OBJEXT): {$(VPATH)}transcode_data.h node.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h node.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h node.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -1647,6 +1901,7 @@ node.$(OBJEXT): {$(VPATH)}missing.h node.$(OBJEXT): {$(VPATH)}node.c node.$(OBJEXT): {$(VPATH)}node.h node.$(OBJEXT): {$(VPATH)}oniguruma.h +node.$(OBJEXT): {$(VPATH)}ruby_assert.h node.$(OBJEXT): {$(VPATH)}ruby_atomic.h node.$(OBJEXT): {$(VPATH)}st.h node.$(OBJEXT): {$(VPATH)}subst.h @@ -1683,11 +1938,11 @@ object.$(OBJEXT): {$(VPATH)}io.h object.$(OBJEXT): {$(VPATH)}missing.h object.$(OBJEXT): {$(VPATH)}object.c object.$(OBJEXT): {$(VPATH)}oniguruma.h +object.$(OBJEXT): {$(VPATH)}probes.dmyh object.$(OBJEXT): {$(VPATH)}probes.h object.$(OBJEXT): {$(VPATH)}st.h object.$(OBJEXT): {$(VPATH)}subst.h object.$(OBJEXT): {$(VPATH)}util.h -object.$(OBJEXT): {$(VPATH)}vm_opts.h pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h pack.$(OBJEXT): $(top_srcdir)/include/ruby.h pack.$(OBJEXT): {$(VPATH)}config.h @@ -1718,6 +1973,7 @@ parse.$(OBJEXT): {$(VPATH)}oniguruma.h parse.$(OBJEXT): {$(VPATH)}parse.c parse.$(OBJEXT): {$(VPATH)}parse.h parse.$(OBJEXT): {$(VPATH)}parse.y +parse.$(OBJEXT): {$(VPATH)}probes.dmyh parse.$(OBJEXT): {$(VPATH)}probes.h parse.$(OBJEXT): {$(VPATH)}regenc.h parse.$(OBJEXT): {$(VPATH)}regex.h @@ -1725,7 +1981,6 @@ parse.$(OBJEXT): {$(VPATH)}st.h parse.$(OBJEXT): {$(VPATH)}subst.h parse.$(OBJEXT): {$(VPATH)}symbol.h parse.$(OBJEXT): {$(VPATH)}util.h -parse.$(OBJEXT): {$(VPATH)}vm_opts.h prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -1739,11 +1994,13 @@ prelude.$(OBJEXT): {$(VPATH)}id.h prelude.$(OBJEXT): {$(VPATH)}intern.h prelude.$(OBJEXT): {$(VPATH)}internal.h prelude.$(OBJEXT): {$(VPATH)}io.h +prelude.$(OBJEXT): {$(VPATH)}iseq.h prelude.$(OBJEXT): {$(VPATH)}method.h prelude.$(OBJEXT): {$(VPATH)}missing.h prelude.$(OBJEXT): {$(VPATH)}node.h prelude.$(OBJEXT): {$(VPATH)}oniguruma.h prelude.$(OBJEXT): {$(VPATH)}prelude.c +prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h prelude.$(OBJEXT): {$(VPATH)}st.h prelude.$(OBJEXT): {$(VPATH)}subst.h @@ -1773,6 +2030,7 @@ proc.$(OBJEXT): {$(VPATH)}missing.h proc.$(OBJEXT): {$(VPATH)}node.h proc.$(OBJEXT): {$(VPATH)}oniguruma.h proc.$(OBJEXT): {$(VPATH)}proc.c +proc.$(OBJEXT): {$(VPATH)}ruby_assert.h proc.$(OBJEXT): {$(VPATH)}ruby_atomic.h proc.$(OBJEXT): {$(VPATH)}st.h proc.$(OBJEXT): {$(VPATH)}subst.h @@ -1800,6 +2058,7 @@ process.$(OBJEXT): {$(VPATH)}missing.h process.$(OBJEXT): {$(VPATH)}node.h process.$(OBJEXT): {$(VPATH)}oniguruma.h process.$(OBJEXT): {$(VPATH)}process.c +process.$(OBJEXT): {$(VPATH)}ruby_assert.h process.$(OBJEXT): {$(VPATH)}ruby_atomic.h process.$(OBJEXT): {$(VPATH)}st.h process.$(OBJEXT): {$(VPATH)}subst.h @@ -1821,6 +2080,7 @@ random.$(OBJEXT): {$(VPATH)}io.h random.$(OBJEXT): {$(VPATH)}missing.h random.$(OBJEXT): {$(VPATH)}oniguruma.h random.$(OBJEXT): {$(VPATH)}random.c +random.$(OBJEXT): {$(VPATH)}ruby_atomic.h random.$(OBJEXT): {$(VPATH)}siphash.c random.$(OBJEXT): {$(VPATH)}siphash.h random.$(OBJEXT): {$(VPATH)}st.h @@ -1850,12 +2110,14 @@ rational.$(OBJEXT): {$(VPATH)}io.h rational.$(OBJEXT): {$(VPATH)}missing.h rational.$(OBJEXT): {$(VPATH)}oniguruma.h rational.$(OBJEXT): {$(VPATH)}rational.c +rational.$(OBJEXT): {$(VPATH)}ruby_assert.h rational.$(OBJEXT): {$(VPATH)}st.h rational.$(OBJEXT): {$(VPATH)}subst.h re.$(OBJEXT): $(hdrdir)/ruby/ruby.h re.$(OBJEXT): $(top_srcdir)/include/ruby.h re.$(OBJEXT): {$(VPATH)}config.h re.$(OBJEXT): {$(VPATH)}defines.h +re.$(OBJEXT): {$(VPATH)}encindex.h re.$(OBJEXT): {$(VPATH)}encoding.h re.$(OBJEXT): {$(VPATH)}intern.h re.$(OBJEXT): {$(VPATH)}internal.h @@ -1938,6 +2200,8 @@ regsyntax.$(OBJEXT): {$(VPATH)}regint.h regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c regsyntax.$(OBJEXT): {$(VPATH)}st.h regsyntax.$(OBJEXT): {$(VPATH)}subst.h +ruby-runner.$(OBJEXT): {$(VPATH)}ruby-runner.c +ruby-runner.$(OBJEXT): {$(VPATH)}ruby-runner.h ruby.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h ruby.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h ruby.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -1958,9 +2222,11 @@ ruby.$(OBJEXT): {$(VPATH)}missing.h ruby.$(OBJEXT): {$(VPATH)}node.h ruby.$(OBJEXT): {$(VPATH)}oniguruma.h ruby.$(OBJEXT): {$(VPATH)}ruby.c +ruby.$(OBJEXT): {$(VPATH)}ruby_assert.h ruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h ruby.$(OBJEXT): {$(VPATH)}st.h ruby.$(OBJEXT): {$(VPATH)}subst.h +ruby.$(OBJEXT): {$(VPATH)}thread.h ruby.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h ruby.$(OBJEXT): {$(VPATH)}thread_native.h ruby.$(OBJEXT): {$(VPATH)}util.h @@ -1984,6 +2250,7 @@ safe.$(OBJEXT): {$(VPATH)}method.h safe.$(OBJEXT): {$(VPATH)}missing.h safe.$(OBJEXT): {$(VPATH)}node.h safe.$(OBJEXT): {$(VPATH)}oniguruma.h +safe.$(OBJEXT): {$(VPATH)}ruby_assert.h safe.$(OBJEXT): {$(VPATH)}ruby_atomic.h safe.$(OBJEXT): {$(VPATH)}safe.c safe.$(OBJEXT): {$(VPATH)}st.h @@ -2021,6 +2288,7 @@ signal.$(OBJEXT): {$(VPATH)}method.h signal.$(OBJEXT): {$(VPATH)}missing.h signal.$(OBJEXT): {$(VPATH)}node.h signal.$(OBJEXT): {$(VPATH)}oniguruma.h +signal.$(OBJEXT): {$(VPATH)}ruby_assert.h signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h signal.$(OBJEXT): {$(VPATH)}signal.c signal.$(OBJEXT): {$(VPATH)}st.h @@ -2047,6 +2315,10 @@ sprintf.$(OBJEXT): {$(VPATH)}sprintf.c sprintf.$(OBJEXT): {$(VPATH)}st.h sprintf.$(OBJEXT): {$(VPATH)}subst.h sprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c +st.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h +st.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h +st.$(OBJEXT): $(CCAN_DIR)/list/list.h +st.$(OBJEXT): $(CCAN_DIR)/str/str.h st.$(OBJEXT): $(hdrdir)/ruby/ruby.h st.$(OBJEXT): $(top_srcdir)/include/ruby.h st.$(OBJEXT): {$(VPATH)}config.h @@ -2061,10 +2333,13 @@ st.$(OBJEXT): {$(VPATH)}st.c st.$(OBJEXT): {$(VPATH)}st.h st.$(OBJEXT): {$(VPATH)}subst.h strftime.$(OBJEXT): $(hdrdir)/ruby/ruby.h +strftime.$(OBJEXT): $(top_srcdir)/include/ruby.h strftime.$(OBJEXT): {$(VPATH)}config.h strftime.$(OBJEXT): {$(VPATH)}defines.h strftime.$(OBJEXT): {$(VPATH)}encoding.h strftime.$(OBJEXT): {$(VPATH)}intern.h +strftime.$(OBJEXT): {$(VPATH)}internal.h +strftime.$(OBJEXT): {$(VPATH)}io.h strftime.$(OBJEXT): {$(VPATH)}missing.h strftime.$(OBJEXT): {$(VPATH)}oniguruma.h strftime.$(OBJEXT): {$(VPATH)}st.h @@ -2074,21 +2349,25 @@ strftime.$(OBJEXT): {$(VPATH)}timev.h string.$(OBJEXT): $(hdrdir)/ruby/ruby.h string.$(OBJEXT): $(top_srcdir)/include/ruby.h string.$(OBJEXT): {$(VPATH)}config.h +string.$(OBJEXT): {$(VPATH)}crypt.h string.$(OBJEXT): {$(VPATH)}defines.h +string.$(OBJEXT): {$(VPATH)}encindex.h string.$(OBJEXT): {$(VPATH)}encoding.h string.$(OBJEXT): {$(VPATH)}gc.h +string.$(OBJEXT): {$(VPATH)}id.h string.$(OBJEXT): {$(VPATH)}intern.h string.$(OBJEXT): {$(VPATH)}internal.h string.$(OBJEXT): {$(VPATH)}io.h string.$(OBJEXT): {$(VPATH)}missing.h string.$(OBJEXT): {$(VPATH)}oniguruma.h +string.$(OBJEXT): {$(VPATH)}probes.dmyh string.$(OBJEXT): {$(VPATH)}probes.h string.$(OBJEXT): {$(VPATH)}re.h string.$(OBJEXT): {$(VPATH)}regex.h +string.$(OBJEXT): {$(VPATH)}ruby_assert.h string.$(OBJEXT): {$(VPATH)}st.h string.$(OBJEXT): {$(VPATH)}string.c string.$(OBJEXT): {$(VPATH)}subst.h -string.$(OBJEXT): {$(VPATH)}vm_opts.h strlcat.$(OBJEXT): {$(VPATH)}config.h strlcat.$(OBJEXT): {$(VPATH)}missing.h strlcat.$(OBJEXT): {$(VPATH)}strlcat.c @@ -2112,6 +2391,7 @@ struct.$(OBJEXT): {$(VPATH)}method.h struct.$(OBJEXT): {$(VPATH)}missing.h struct.$(OBJEXT): {$(VPATH)}node.h struct.$(OBJEXT): {$(VPATH)}oniguruma.h +struct.$(OBJEXT): {$(VPATH)}ruby_assert.h struct.$(OBJEXT): {$(VPATH)}ruby_atomic.h struct.$(OBJEXT): {$(VPATH)}st.h struct.$(OBJEXT): {$(VPATH)}struct.c @@ -2129,18 +2409,20 @@ symbol.$(OBJEXT): {$(VPATH)}encoding.h symbol.$(OBJEXT): {$(VPATH)}gc.h symbol.$(OBJEXT): {$(VPATH)}id.c symbol.$(OBJEXT): {$(VPATH)}id.h +symbol.$(OBJEXT): {$(VPATH)}id_table.c +symbol.$(OBJEXT): {$(VPATH)}id_table.h symbol.$(OBJEXT): {$(VPATH)}intern.h symbol.$(OBJEXT): {$(VPATH)}internal.h symbol.$(OBJEXT): {$(VPATH)}io.h symbol.$(OBJEXT): {$(VPATH)}missing.h -symbol.$(OBJEXT): {$(VPATH)}node.h symbol.$(OBJEXT): {$(VPATH)}oniguruma.h +symbol.$(OBJEXT): {$(VPATH)}probes.dmyh symbol.$(OBJEXT): {$(VPATH)}probes.h +symbol.$(OBJEXT): {$(VPATH)}ruby_assert.h symbol.$(OBJEXT): {$(VPATH)}st.h symbol.$(OBJEXT): {$(VPATH)}subst.h symbol.$(OBJEXT): {$(VPATH)}symbol.c symbol.$(OBJEXT): {$(VPATH)}symbol.h -symbol.$(OBJEXT): {$(VPATH)}vm_opts.h thread.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h thread.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h thread.$(OBJEXT): $(CCAN_DIR)/list/list.h @@ -2160,6 +2442,7 @@ thread.$(OBJEXT): {$(VPATH)}method.h thread.$(OBJEXT): {$(VPATH)}missing.h thread.$(OBJEXT): {$(VPATH)}node.h thread.$(OBJEXT): {$(VPATH)}oniguruma.h +thread.$(OBJEXT): {$(VPATH)}ruby_assert.h thread.$(OBJEXT): {$(VPATH)}ruby_atomic.h thread.$(OBJEXT): {$(VPATH)}st.h thread.$(OBJEXT): {$(VPATH)}subst.h @@ -2168,6 +2451,7 @@ thread.$(OBJEXT): {$(VPATH)}thread.h thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).c thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h thread.$(OBJEXT): {$(VPATH)}thread_native.h +thread.$(OBJEXT): {$(VPATH)}thread_sync.c thread.$(OBJEXT): {$(VPATH)}timev.h thread.$(OBJEXT): {$(VPATH)}vm_core.h thread.$(OBJEXT): {$(VPATH)}vm_debug.h @@ -2200,31 +2484,6 @@ transcode.$(OBJEXT): {$(VPATH)}st.h transcode.$(OBJEXT): {$(VPATH)}subst.h transcode.$(OBJEXT): {$(VPATH)}transcode.c transcode.$(OBJEXT): {$(VPATH)}transcode_data.h -unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.h -unicode.$(OBJEXT): {$(VPATH)}config.h -unicode.$(OBJEXT): {$(VPATH)}defines.h -unicode.$(OBJEXT): {$(VPATH)}intern.h -unicode.$(OBJEXT): {$(VPATH)}missing.h -unicode.$(OBJEXT): {$(VPATH)}oniguruma.h -unicode.$(OBJEXT): {$(VPATH)}regenc.h -unicode.$(OBJEXT): {$(VPATH)}regint.h -unicode.$(OBJEXT): {$(VPATH)}st.h -unicode.$(OBJEXT): {$(VPATH)}subst.h -unicode.$(OBJEXT): {$(VPATH)}unicode.c -unicode.$(OBJEXT): {$(VPATH)}unicode/casefold.h -unicode.$(OBJEXT): {$(VPATH)}unicode/name2ctype.h -us_ascii.$(OBJEXT): {$(VPATH)}config.h -us_ascii.$(OBJEXT): {$(VPATH)}defines.h -us_ascii.$(OBJEXT): {$(VPATH)}missing.h -us_ascii.$(OBJEXT): {$(VPATH)}oniguruma.h -us_ascii.$(OBJEXT): {$(VPATH)}regenc.h -us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c -utf_8.$(OBJEXT): {$(VPATH)}config.h -utf_8.$(OBJEXT): {$(VPATH)}defines.h -utf_8.$(OBJEXT): {$(VPATH)}missing.h -utf_8.$(OBJEXT): {$(VPATH)}oniguruma.h -utf_8.$(OBJEXT): {$(VPATH)}regenc.h -utf_8.$(OBJEXT): {$(VPATH)}utf_8.c util.$(OBJEXT): $(hdrdir)/ruby/ruby.h util.$(OBJEXT): $(top_srcdir)/include/ruby.h util.$(OBJEXT): {$(VPATH)}config.h @@ -2239,6 +2498,10 @@ util.$(OBJEXT): {$(VPATH)}st.h util.$(OBJEXT): {$(VPATH)}subst.h util.$(OBJEXT): {$(VPATH)}util.c util.$(OBJEXT): {$(VPATH)}util.h +variable.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h +variable.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h +variable.$(OBJEXT): $(CCAN_DIR)/list/list.h +variable.$(OBJEXT): $(CCAN_DIR)/str/str.h variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h variable.$(OBJEXT): $(top_srcdir)/include/ruby.h variable.$(OBJEXT): {$(VPATH)}config.h @@ -2246,11 +2509,11 @@ variable.$(OBJEXT): {$(VPATH)}constant.h variable.$(OBJEXT): {$(VPATH)}defines.h variable.$(OBJEXT): {$(VPATH)}encoding.h variable.$(OBJEXT): {$(VPATH)}id.h +variable.$(OBJEXT): {$(VPATH)}id_table.h variable.$(OBJEXT): {$(VPATH)}intern.h variable.$(OBJEXT): {$(VPATH)}internal.h variable.$(OBJEXT): {$(VPATH)}io.h variable.$(OBJEXT): {$(VPATH)}missing.h -variable.$(OBJEXT): {$(VPATH)}node.h variable.$(OBJEXT): {$(VPATH)}oniguruma.h variable.$(OBJEXT): {$(VPATH)}st.h variable.$(OBJEXT): {$(VPATH)}subst.h @@ -2280,6 +2543,7 @@ vm.$(OBJEXT): {$(VPATH)}encoding.h vm.$(OBJEXT): {$(VPATH)}eval_intern.h vm.$(OBJEXT): {$(VPATH)}gc.h vm.$(OBJEXT): {$(VPATH)}id.h +vm.$(OBJEXT): {$(VPATH)}id_table.h vm.$(OBJEXT): {$(VPATH)}insns.def vm.$(OBJEXT): {$(VPATH)}insns.inc vm.$(OBJEXT): {$(VPATH)}intern.h @@ -2290,8 +2554,10 @@ vm.$(OBJEXT): {$(VPATH)}method.h vm.$(OBJEXT): {$(VPATH)}missing.h vm.$(OBJEXT): {$(VPATH)}node.h vm.$(OBJEXT): {$(VPATH)}oniguruma.h +vm.$(OBJEXT): {$(VPATH)}probes.dmyh vm.$(OBJEXT): {$(VPATH)}probes.h vm.$(OBJEXT): {$(VPATH)}probes_helper.h +vm.$(OBJEXT): {$(VPATH)}ruby_assert.h vm.$(OBJEXT): {$(VPATH)}ruby_atomic.h vm.$(OBJEXT): {$(VPATH)}st.h vm.$(OBJEXT): {$(VPATH)}subst.h @@ -2301,6 +2567,7 @@ vm.$(OBJEXT): {$(VPATH)}vm.c vm.$(OBJEXT): {$(VPATH)}vm.h vm.$(OBJEXT): {$(VPATH)}vm.inc vm.$(OBJEXT): {$(VPATH)}vm_args.c +vm.$(OBJEXT): {$(VPATH)}vm_call_iseq_optimized.inc vm.$(OBJEXT): {$(VPATH)}vm_core.h vm.$(OBJEXT): {$(VPATH)}vm_debug.h vm.$(OBJEXT): {$(VPATH)}vm_eval.c @@ -2331,6 +2598,7 @@ vm_backtrace.$(OBJEXT): {$(VPATH)}method.h vm_backtrace.$(OBJEXT): {$(VPATH)}missing.h vm_backtrace.$(OBJEXT): {$(VPATH)}node.h vm_backtrace.$(OBJEXT): {$(VPATH)}oniguruma.h +vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_assert.h vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_atomic.h vm_backtrace.$(OBJEXT): {$(VPATH)}st.h vm_backtrace.$(OBJEXT): {$(VPATH)}subst.h @@ -2359,6 +2627,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}method.h vm_dump.$(OBJEXT): {$(VPATH)}missing.h vm_dump.$(OBJEXT): {$(VPATH)}node.h vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h +vm_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h vm_dump.$(OBJEXT): {$(VPATH)}st.h vm_dump.$(OBJEXT): {$(VPATH)}subst.h @@ -2387,6 +2656,7 @@ vm_trace.$(OBJEXT): {$(VPATH)}method.h vm_trace.$(OBJEXT): {$(VPATH)}missing.h vm_trace.$(OBJEXT): {$(VPATH)}node.h vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h +vm_trace.$(OBJEXT): {$(VPATH)}ruby_assert.h vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h vm_trace.$(OBJEXT): {$(VPATH)}st.h vm_trace.$(OBJEXT): {$(VPATH)}subst.h @@ -10,10 +10,15 @@ **********************************************************************/ #include "ruby/ruby.h" +#include "id.h" VALUE rb_mComparable; -static ID cmp; +static VALUE +rb_cmp(VALUE x, VALUE y) +{ + return rb_funcallv(x, idCmp, 1, &y); +} void rb_cmperr(VALUE x, VALUE y) @@ -34,7 +39,7 @@ static VALUE invcmp_recursive(VALUE x, VALUE y, int recursive) { if (recursive) return Qnil; - return rb_check_funcall(y, cmp, 1, &x); + return rb_cmp(y, x); } VALUE @@ -54,25 +59,7 @@ static VALUE cmp_eq_recursive(VALUE arg1, VALUE arg2, int recursive) { if (recursive) return Qnil; - return rb_funcallv(arg1, cmp, 1, &arg2); -} - -static VALUE -cmp_eq(VALUE *a) -{ - VALUE c = rb_exec_recursive_paired_outer(cmp_eq_recursive, a[0], a[1], a[1]); - - if (NIL_P(c)) return Qfalse; - if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue; - return Qfalse; -} - -static VALUE -cmp_failed(void) -{ - rb_warn("Comparable#== will no more rescue exceptions of #<=> in the next release."); - rb_warn("Return nil in #<=> if the comparison is inappropriate or avoid such comparison."); - return Qfalse; + return rb_cmp(arg1, arg2); } /* @@ -82,20 +69,25 @@ cmp_failed(void) * Compares two objects based on the receiver's <code><=></code> * method, returning true if it returns 0. Also returns true if * _obj_ and _other_ are the same object. - * - * Even if _obj_ <=> _other_ raised an exception, the exception - * is ignored and returns false. */ static VALUE cmp_equal(VALUE x, VALUE y) { - VALUE a[2]; - + VALUE c; if (x == y) return Qtrue; - a[0] = x; a[1] = y; - return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0); + c = rb_exec_recursive_paired_outer(cmp_eq_recursive, x, y, y); + + if (NIL_P(c)) return Qfalse; + if (rb_cmpint(c, x, y) == 0) return Qtrue; + return Qfalse; +} + +static int +cmpint(VALUE x, VALUE y) +{ + return rb_cmpint(rb_cmp(x, y), x, y); } /* @@ -109,9 +101,7 @@ cmp_equal(VALUE x, VALUE y) static VALUE cmp_gt(VALUE x, VALUE y) { - VALUE c = rb_funcall(x, cmp, 1, y); - - if (rb_cmpint(c, x, y) > 0) return Qtrue; + if (cmpint(x, y) > 0) return Qtrue; return Qfalse; } @@ -126,9 +116,7 @@ cmp_gt(VALUE x, VALUE y) static VALUE cmp_ge(VALUE x, VALUE y) { - VALUE c = rb_funcall(x, cmp, 1, y); - - if (rb_cmpint(c, x, y) >= 0) return Qtrue; + if (cmpint(x, y) >= 0) return Qtrue; return Qfalse; } @@ -143,9 +131,7 @@ cmp_ge(VALUE x, VALUE y) static VALUE cmp_lt(VALUE x, VALUE y) { - VALUE c = rb_funcall(x, cmp, 1, y); - - if (rb_cmpint(c, x, y) < 0) return Qtrue; + if (cmpint(x, y) < 0) return Qtrue; return Qfalse; } @@ -160,9 +146,7 @@ cmp_lt(VALUE x, VALUE y) static VALUE cmp_le(VALUE x, VALUE y) { - VALUE c = rb_funcall(x, cmp, 1, y); - - if (rb_cmpint(c, x, y) <= 0) return Qtrue; + if (cmpint(x, y) <= 0) return Qtrue; return Qfalse; } @@ -184,12 +168,45 @@ cmp_le(VALUE x, VALUE y) static VALUE cmp_between(VALUE x, VALUE min, VALUE max) { - if (RTEST(cmp_lt(x, min))) return Qfalse; - if (RTEST(cmp_gt(x, max))) return Qfalse; + if (cmpint(x, min) < 0) return Qfalse; + if (cmpint(x, max) > 0) return Qfalse; return Qtrue; } /* + * call-seq: + * obj.clamp(min, max) -> obj + * + * Returns <i>min</i> if <i>obj</i> <code><=></code> <i>min</i> is less + * than zero, <i>max</i> if <i>obj</i> <code><=></code> <i>max</i> is + * greater than zero and <i>obj</i> otherwise. + * + * 12.clamp(0, 100) #=> 12 + * 523.clamp(0, 100) #=> 100 + * -3.123.clamp(0, 100) #=> 0 + * + * 'd'.clamp('a', 'f') #=> 'd' + * 'z'.clamp('a', 'f') #=> 'f' + */ + +static VALUE +cmp_clamp(VALUE x, VALUE min, VALUE max) +{ + int c; + + if (cmpint(min, max) > 0) { + rb_raise(rb_eArgError, "min argument must be smaller than max argument"); + } + + c = cmpint(x, min); + if (c == 0) return x; + if (c < 0) return min; + c = cmpint(x, max); + if (c > 0) return max; + return x; +} + +/* * 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, @@ -204,8 +221,8 @@ cmp_between(VALUE x, VALUE min, VALUE max) * class SizeMatters * include Comparable * attr :str - * def <=>(anOther) - * str.size <=> anOther.str.size + * def <=>(other) + * str.size <=> other.str.size * end * def initialize(str) * @str = str @@ -241,6 +258,5 @@ Init_Comparable(void) rb_define_method(rb_mComparable, "<", cmp_lt, 1); rb_define_method(rb_mComparable, "<=", cmp_le, 1); rb_define_method(rb_mComparable, "between?", cmp_between, 2); - - cmp = rb_intern("<=>"); + rb_define_method(rb_mComparable, "clamp", cmp_clamp, 2); } @@ -10,6 +10,8 @@ **********************************************************************/ #include "internal.h" +#include "ruby/re.h" +#include "encindex.h" #include <math.h> #define USE_INSN_STACK_INCREASE 1 @@ -17,11 +19,16 @@ #include "iseq.h" #include "insns.inc" #include "insns_info.inc" +#include "id_table.h" +#include "gc.h" #ifdef HAVE_DLADDR # include <dlfcn.h> #endif +#undef RUBY_UNTYPED_DATA_WARNING +#define RUBY_UNTYPED_DATA_WARNING 0 + #define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG)) #define FIXNUM_OR(n, i) ((n)|INT2FIX(i)) @@ -41,13 +48,22 @@ typedef struct iseq_link_anchor { LINK_ELEMENT *last; } LINK_ANCHOR; +typedef enum { + LABEL_RESCUE_NONE, + LABEL_RESCUE_BEG, + LABEL_RESCUE_END, + LABEL_RESCUE_TYPE_MAX +} LABEL_RESCUE_TYPE; + typedef struct iseq_label_data { LINK_ELEMENT link; int label_no; int position; int sc_state; - int set; int sp; + int refcnt; + unsigned int set: 1; + unsigned int rescued: 2; } LABEL; typedef struct iseq_insn_data { @@ -97,7 +113,7 @@ struct iseq_compile_data_ensure_node_stack { #if CPDEBUG >= 0 #define compile_debug CPDEBUG #else -#define compile_debug iseq->compile_data->option->debug_level +#define compile_debug ISEQ_COMPILE_DATA(iseq)->option->debug_level #endif #if CPDEBUG @@ -156,6 +172,7 @@ r_value(VALUE value) #endif #if CPDEBUG > 1 || CPDEBUG < 0 +#define printf ruby_debug_printf #define debugs if (compile_debug_print_indent(1)) ruby_debug_printf #define debug_compile(msg, v) ((void)(compile_debug_print_indent(1) && fputs((msg), stderr)), (v)) #else @@ -163,21 +180,19 @@ r_value(VALUE value) #define debug_compile(msg, v) (v) #endif +#define LVAR_ERRINFO (1) /* create new label */ #define NEW_LABEL(l) new_label_body(iseq, (l)) -#define iseq_path(iseq) \ - (((rb_iseq_t*)DATA_PTR(iseq))->location.path) +#define iseq_path(iseq) ((iseq)->body->location.path) +#define iseq_absolute_path(iseq) ((iseq)->body->location.absolute_path) -#define iseq_absolute_path(iseq) \ - (((rb_iseq_t*)DATA_PTR(iseq))->location.absolute_path) - -#define NEW_ISEQVAL(node, name, type, line_no) \ +#define NEW_ISEQ(node, name, type, line_no) \ new_child_iseq(iseq, (node), rb_fstring(name), 0, (type), (line_no)) -#define NEW_CHILD_ISEQVAL(node, name, type, line_no) \ - new_child_iseq(iseq, (node), rb_fstring(name), iseq->self, (type), (line_no)) +#define NEW_CHILD_ISEQ(node, name, type, line_no) \ + new_child_iseq(iseq, (node), rb_fstring(name), iseq, (type), (line_no)) /* add instructions */ #define ADD_SEQ(seq1, seq2) \ @@ -187,13 +202,24 @@ r_value(VALUE value) #define ADD_INSN(seq, line, insn) \ ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0)) +/* insert an instruction before prev */ +#define INSERT_BEFORE_INSN(prev, line, insn) \ + INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0)) + /* add an instruction with some operands (1, 2, 3, 5) */ #define ADD_INSN1(seq, line, insn, op1) \ ADD_ELEM((seq), (LINK_ELEMENT *) \ new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1))) +/* insert an instruction with some operands (1, 2, 3, 5) before prev */ +#define INSERT_BEFORE_INSN1(prev, line, insn, op1) \ + INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) \ + new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1))) + +#define LABEL_REF(label) ((label)->refcnt++) + /* add an instruction with label operand (alias of ADD_INSN1) */ -#define ADD_INSNL(seq, line, insn, label) ADD_INSN1(seq, line, insn, label) +#define ADD_INSNL(seq, line, insn, label) (ADD_INSN1(seq, line, insn, label), LABEL_REF(label)) #define ADD_INSN2(seq, line, insn, op1, op2) \ ADD_ELEM((seq), (LINK_ELEMENT *) \ @@ -205,39 +231,50 @@ r_value(VALUE value) /* Specific Insn factory */ #define ADD_SEND(seq, line, id, argc) \ - ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0), NULL) + ADD_SEND_R((seq), (line), (id), (argc), NULL, (VALUE)INT2FIX(0), NULL) #define ADD_SEND_WITH_FLAG(seq, line, id, argc, flag) \ - ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)(flag), NULL) + ADD_SEND_R((seq), (line), (id), (argc), NULL, (VALUE)(flag), NULL) #define ADD_SEND_WITH_BLOCK(seq, line, id, argc, block) \ - ADD_SEND_R((seq), (line), (id), (argc), (VALUE)(block), (VALUE)INT2FIX(0), NULL) + ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(0), NULL) #define ADD_CALL_RECEIVER(seq, line) \ ADD_INSN((seq), (line), putself) #define ADD_CALL(seq, line, id, argc) \ - ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL), NULL) + ADD_SEND_R((seq), (line), (id), (argc), NULL, (VALUE)INT2FIX(VM_CALL_FCALL), NULL) #define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \ ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL), NULL) #define ADD_SEND_R(seq, line, id, argc, block, flag, keywords) \ - ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, (line), (id), (VALUE)(argc), (VALUE)(block), (VALUE)(flag), (keywords))) + ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, (line), (id), (VALUE)(argc), (block), (VALUE)(flag), (keywords))) #define ADD_TRACE(seq, line, event) \ do { \ - if ((event) == RUBY_EVENT_LINE && iseq->coverage && \ - (line) != iseq->compile_data->last_coverable_line) { \ - RARRAY_ASET(iseq->coverage, (line) - 1, INT2FIX(0)); \ - iseq->compile_data->last_coverable_line = (line); \ + if ((event) == RUBY_EVENT_LINE && ISEQ_COVERAGE(iseq) && \ + (line) > 0 && \ + (line) != ISEQ_COMPILE_DATA(iseq)->last_coverable_line) { \ + RARRAY_ASET(ISEQ_COVERAGE(iseq), (line) - 1, INT2FIX(0)); \ + ISEQ_COMPILE_DATA(iseq)->last_coverable_line = (line); \ ADD_INSN1((seq), (line), trace, INT2FIX(RUBY_EVENT_COVERAGE)); \ } \ - if (iseq->compile_data->option->trace_instruction) { \ + if (ISEQ_COMPILE_DATA(iseq)->option->trace_instruction) { \ ADD_INSN1((seq), (line), trace, INT2FIX(event)); \ } \ } while (0) +#define ADD_GETLOCAL(seq, line, idx, level) \ + do { \ + ADD_INSN2((seq), (line), getlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)); \ + } while (0) + +#define ADD_SETLOCAL(seq, line, idx, level) \ + do { \ + ADD_INSN2((seq), (line), setlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)); \ + } while (0) + /* add label */ #define ADD_LABEL(seq, label) \ ADD_ELEM((seq), (LINK_ELEMENT *) (label)) @@ -251,11 +288,15 @@ r_value(VALUE value) #define ADD_ADJUST_RESTORE(seq, label) \ ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), -1)) -#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc) \ - (rb_ary_push(iseq->compile_data->catch_table_ary, \ - rb_ary_new3(5, (type), \ - (VALUE)(ls) | 1, (VALUE)(le) | 1, \ - (VALUE)(iseqv), (VALUE)(lc) | 1))) +#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc) do { \ + VALUE _e = rb_ary_new3(5, (type), \ + (VALUE)(ls) | 1, (VALUE)(le) | 1, \ + (VALUE)(iseqv), (VALUE)(lc) | 1); \ + if (ls) LABEL_REF(ls); \ + if (le) LABEL_REF(le); \ + if (lc) LABEL_REF(lc); \ + rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e)); \ +} while (0) /* compile node */ #define COMPILE(anchor, desc, node) \ @@ -283,21 +324,78 @@ r_value(VALUE value) #define INSN_OF(insn) \ (((INSN*)(insn))->insn_id) +#define IS_INSN(link) ((link)->type == ISEQ_ELEMENT_INSN) +#define IS_LABEL(link) ((link)->type == ISEQ_ELEMENT_LABEL) +#define IS_ADJUST(link) ((link)->type == ISEQ_ELEMENT_ADJUST) +#define IS_INSN_ID(iobj, insn) (INSN_OF(iobj) == BIN(insn)) + /* error */ -#define COMPILE_ERROR(strs) \ -{ \ - VALUE tmp = GET_THREAD()->errinfo; \ - if (compile_debug) rb_compile_bug strs; \ - GET_THREAD()->errinfo = iseq->compile_data->err_info; \ - rb_compile_error strs; \ - RB_OBJ_WRITE(iseq->self, &iseq->compile_data->err_info, GET_THREAD()->errinfo); \ - GET_THREAD()->errinfo = tmp; \ - ret = 0; \ - break; \ +typedef void (*compile_error_func)(rb_iseq_t *, int, const char *, ...); + +static void +append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...) +{ + VALUE err_info = ISEQ_COMPILE_DATA(iseq)->err_info; + VALUE file = iseq->body->location.path; + VALUE err = err_info; + va_list args; + + va_start(args, fmt); + err = rb_syntax_error_append(err, file, line, -1, NULL, fmt, args); + va_end(args); + if (NIL_P(err_info)) { + RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, err); + rb_set_errinfo(err); + } +} + +static void +compile_bug(rb_iseq_t *iseq, int line, const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + rb_report_bug_valist(iseq->body->location.path, line, fmt, args); + va_end(args); + abort(); } -#define ERROR_ARGS ruby_sourcefile, nd_line(node), +NOINLINE(static compile_error_func prepare_compile_error(rb_iseq_t *iseq)); + +static compile_error_func +prepare_compile_error(rb_iseq_t *iseq) +{ + if (compile_debug) return &compile_bug; + return &append_compile_error; +} + +#define COMPILE_ERROR prepare_compile_error(iseq) + +#define ERROR_ARGS_AT(n) iseq, nd_line(n), +#define ERROR_ARGS ERROR_ARGS_AT(node) + +#define EXPECT_NODE(prefix, node, ndtype) \ +do { \ + NODE *error_node = (node); \ + enum node_type error_type = nd_type(error_node); \ + if (error_type != (ndtype)) { \ + compile_bug(ERROR_ARGS_AT(error_node) \ + prefix ": " #ndtype " is expected, but %s", \ + ruby_node_name(error_type)); \ + } \ +} while (0) + +#define EXPECT_NODE_NONULL(prefix, parent, ndtype) \ +do { \ + compile_bug(ERROR_ARGS_AT(parent) \ + prefix ": must be " #ndtype ", but 0"); \ +} while (0) +#define UNKNOWN_NODE(prefix, node) \ +do { \ + NODE *error_node = (node); \ + compile_bug(ERROR_ARGS_AT(error_node) prefix ": unknown node (%s)", \ + ruby_node_name(nd_type(error_node))); \ +} while (0) #define COMPILE_OK 1 #define COMPILE_NG 0 @@ -310,7 +408,13 @@ r_value(VALUE value) #define INIT_ANCHOR(name) \ (name##_body__.last = &name##_body__.anchor, name = &name##_body__) -#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC_CLEAR_CLASS(obj);} while (0) +static inline VALUE +freeze_hide_obj(VALUE obj) +{ + OBJ_FREEZE(obj); + RBASIC_CLEAR_CLASS(obj); + return obj; +} #include "optinsn.inc" #if OPT_INSTRUCTIONS_UNIFICATION @@ -327,7 +431,7 @@ r_value(VALUE value) #endif #if CPDEBUG -#define gl_node_level iseq->compile_data->node_level +#define gl_node_level ISEQ_COMPILE_DATA(iseq)->node_level #endif static void dump_disasm_list(LINK_ELEMENT *elem); @@ -416,11 +520,11 @@ APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *before, LINK_ELE } #if CPDEBUG < 0 #define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, (anchor), (elem)) -#define APPEND_ELEM(anchor, before, elem) ADD_ELEM(iseq, (anchor), (before), (elem)) +#define APPEND_ELEM(anchor, before, elem) APPEND_ELEM(iseq, (anchor), (before), (elem)) #endif static int -iseq_add_mark_object(rb_iseq_t *iseq, VALUE v) +iseq_add_mark_object(const rb_iseq_t *iseq, VALUE v) { if (!SPECIAL_CONST_P(v)) { rb_iseq_add_mark_object(iseq, v); @@ -428,13 +532,13 @@ iseq_add_mark_object(rb_iseq_t *iseq, VALUE v) return COMPILE_OK; } -#define ruby_sourcefile RSTRING_PTR(iseq->location.path) +#define ruby_sourcefile RSTRING_PTR(iseq->body->location.path) static int -iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v) +iseq_add_mark_object_compile_time(const rb_iseq_t *iseq, VALUE v) { if (!SPECIAL_CONST_P(v)) { - rb_ary_push(iseq->compile_data->mark_ary, v); + rb_ary_push(ISEQ_COMPILE_DATA(iseq)->mark_ary, v); } return COMPILE_OK; } @@ -446,11 +550,9 @@ validate_label(st_data_t name, st_data_t label, st_data_t arg) LABEL *lobj = (LABEL *)label; if (!lobj->link.next) { do { - int ret; - COMPILE_ERROR((ruby_sourcefile, lobj->position, - "%"PRIsVALUE": undefined label", - rb_id2str((ID)name))); - if (ret) break; + COMPILE_ERROR(iseq, lobj->position, + "%"PRIsVALUE": undefined label", + rb_id2str((ID)name)); } while (0); } return ST_CONTINUE; @@ -460,18 +562,17 @@ static void validate_labels(rb_iseq_t *iseq, st_table *labels_table) { st_foreach(labels_table, validate_label, (st_data_t)iseq); - if (!NIL_P(iseq->compile_data->err_info)) { - rb_exc_raise(iseq->compile_data->err_info); + st_free_table(labels_table); + if (!NIL_P(ISEQ_COMPILE_DATA(iseq)->err_info)) { + rb_exc_raise(ISEQ_COMPILE_DATA(iseq)->err_info); } } VALUE -rb_iseq_compile_node(VALUE self, NODE *node) +rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node) { DECL_ANCHOR(ret); - rb_iseq_t *iseq; INIT_ANCHOR(ret); - GetISeqPtr(self, iseq); if (node == 0) { COMPILE(ret, "nil", node); @@ -482,13 +583,16 @@ rb_iseq_compile_node(VALUE self, NODE *node) iseq_set_local_table(iseq, node->nd_tbl); iseq_set_arguments(iseq, ret, node->nd_args); - switch (iseq->type) { + switch (iseq->body->type) { case ISEQ_TYPE_BLOCK: { - LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0); - LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0); + LABEL *start = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(0); + LABEL *end = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(0); + + start->rescued = LABEL_RESCUE_BEG; + end->rescued = LABEL_RESCUE_END; - ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_B_CALL); + ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_B_CALL); ADD_LABEL(ret, start); COMPILE(ret, "block body", node->nd_body); ADD_LABEL(ret, end); @@ -501,14 +605,14 @@ rb_iseq_compile_node(VALUE self, NODE *node) } case ISEQ_TYPE_CLASS: { - ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_CLASS); + ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_CLASS); COMPILE(ret, "scoped node", node->nd_body); ADD_TRACE(ret, nd_line(node), RUBY_EVENT_END); break; } case ISEQ_TYPE_METHOD: { - ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_CALL); + ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_CALL); COMPILE(ret, "scoped node", node->nd_body); ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN); break; @@ -519,21 +623,22 @@ rb_iseq_compile_node(VALUE self, NODE *node) } } } - else if (nd_type(node) == NODE_IFUNC) { + else if (RB_TYPE_P((VALUE)node, T_IMEMO)) { + const struct vm_ifunc *ifunc = (struct vm_ifunc *)node; /* user callback */ - (*node->nd_cfnc)(iseq, ret, node->nd_tval); + (*ifunc->func)(iseq, ret, ifunc->data); } else { - switch (iseq->type) { + switch (iseq->body->type) { case ISEQ_TYPE_METHOD: case ISEQ_TYPE_CLASS: case ISEQ_TYPE_BLOCK: case ISEQ_TYPE_EVAL: case ISEQ_TYPE_MAIN: case ISEQ_TYPE_TOP: - rb_compile_error(ERROR_ARGS "compile/should not be reached: %s:%d", - __FILE__, __LINE__); - break; + COMPILE_ERROR(ERROR_ARGS "compile/should not be reached: %s:%d", + __FILE__, __LINE__); + return COMPILE_NG; case ISEQ_TYPE_RESCUE: iseq_set_exception_local_table(iseq); COMPILE(ret, "rescue", node); @@ -543,25 +648,27 @@ rb_iseq_compile_node(VALUE self, NODE *node) COMPILE_POPED(ret, "ensure", node); break; case ISEQ_TYPE_DEFINED_GUARD: - iseq_set_local_table(iseq, 0); + iseq_set_exception_local_table(iseq); COMPILE(ret, "defined guard", node); break; default: - rb_bug("unknown scope"); + compile_bug(ERROR_ARGS "unknown scope"); } } - if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) { - ADD_INSN2(ret, 0, getlocal, INT2FIX(2), INT2FIX(0)); + if (iseq->body->type == ISEQ_TYPE_RESCUE || iseq->body->type == ISEQ_TYPE_ENSURE) { + ADD_GETLOCAL(ret, 0, LVAR_ERRINFO, 0); ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ ); } else { - ADD_INSN(ret, iseq->compile_data->last_line, leave); + ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave); } #if SUPPORT_JOKE - if (iseq->compile_data->labels_table) { - validate_labels(iseq, iseq->compile_data->labels_table); + if (ISEQ_COMPILE_DATA(iseq)->labels_table) { + st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table; + ISEQ_COMPILE_DATA(iseq)->labels_table = 0; + validate_labels(iseq, labels_table); } #endif return iseq_setup(iseq, ret); @@ -573,11 +680,12 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq) #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE const void * const *table = rb_vm_get_insns_address_table(); unsigned int i; + VALUE *encoded = (VALUE *)iseq->body->iseq_encoded; - for (i = 0; i < iseq->iseq_size; /* */ ) { - int insn = (int)iseq->iseq_encoded[i]; + for (i = 0; i < iseq->body->iseq_size; /* */ ) { + int insn = (int)iseq->body->iseq_encoded[i]; int len = insn_len(insn); - iseq->iseq_encoded[i] = (VALUE)table[insn]; + encoded[i] = (VALUE)table[insn]; i += len; } #endif @@ -601,28 +709,28 @@ rb_vm_insn_addr2insn(const void *addr) /* cold path */ #endif VALUE * -rb_iseq_original_iseq(rb_iseq_t *iseq) /* cold path */ +rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */ { - if (iseq->iseq) return iseq->iseq; - - iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size); + VALUE *original_code; - MEMCPY(iseq->iseq, iseq->iseq_encoded, VALUE, iseq->iseq_size); + if (ISEQ_ORIGINAL_ISEQ(iseq)) return ISEQ_ORIGINAL_ISEQ(iseq); + original_code = ISEQ_ORIGINAL_ISEQ_ALLOC(iseq, iseq->body->iseq_size); + MEMCPY(original_code, iseq->body->iseq_encoded, VALUE, iseq->body->iseq_size); #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE { unsigned int i; - for (i = 0; i < iseq->iseq_size; /* */ ) { - const void *addr = (const void *)iseq->iseq[i]; + for (i = 0; i < iseq->body->iseq_size; /* */ ) { + const void *addr = (const void *)original_code[i]; const int insn = rb_vm_insn_addr2insn(addr); - iseq->iseq[i] = insn; + original_code[i] = insn; i += insn_len(insn); } } #endif - return iseq->iseq; + return original_code; } /*********************************************/ @@ -632,7 +740,7 @@ rb_iseq_original_iseq(rb_iseq_t *iseq) /* cold path */ /* * On 32-bit SPARC, GCC by default generates SPARC V7 code that may require * 8-byte word alignment. On the other hand, Oracle Solaris Studio seems to - * generate SPARCV8PLUS code with unaligned memory accesss instructions. + * generate SPARCV8PLUS code with unaligned memory access instructions. * That is why the STRICT_ALIGNMENT is defined only with GCC. */ #if defined(__sparc) && SIZEOF_VOIDP == 4 && defined(__GNUC__) @@ -683,7 +791,7 @@ compile_data_alloc(rb_iseq_t *iseq, size_t size) { void *ptr = 0; struct iseq_compile_data_storage *storage = - iseq->compile_data->storage_current; + ISEQ_COMPILE_DATA(iseq)->storage_current; #ifdef STRICT_ALIGNMENT size_t padding = calc_padding((void *)&storage->buff[storage->pos], size); #else @@ -700,7 +808,7 @@ compile_data_alloc(rb_iseq_t *iseq, size_t size) } storage->next = (void *)ALLOC_N(char, alloc_size + SIZEOF_ISEQ_COMPILE_DATA_STORAGE); - storage = iseq->compile_data->storage_current = storage->next; + storage = ISEQ_COMPILE_DATA(iseq)->storage_current = storage->next; storage->next = 0; storage->pos = 0; storage->size = alloc_size; @@ -751,6 +859,21 @@ INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2) } /* + * elem1, elemX => elemX, elem2, elem1 + */ +static void +INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2) +{ + elem2->prev = elem1->prev; + elem2->next = elem1; + elem1->prev = elem2; + if (elem2->prev) { + elem2->prev->next = elem2; + } +} + +#if 0 +/* * elemX, elem1, elemY => elemX, elem2, elemY */ static void @@ -765,6 +888,7 @@ REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2) elem1->next->prev = elem2; } } +#endif static void REMOVE_ELEM(LINK_ELEMENT *elem) @@ -782,6 +906,12 @@ FIRST_ELEMENT(LINK_ANCHOR *anchor) } static LINK_ELEMENT * +LAST_ELEMENT(LINK_ANCHOR *anchor) +{ + return anchor->last; +} + +static LINK_ELEMENT * POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor) { LINK_ELEMENT *elem = anchor->last; @@ -886,9 +1016,12 @@ new_label_body(rb_iseq_t *iseq, long line) labelobj->link.type = ISEQ_ELEMENT_LABEL; labelobj->link.next = 0; - labelobj->label_no = iseq->compile_data->label_no++; + labelobj->label_no = ISEQ_COMPILE_DATA(iseq)->label_no++; labelobj->sc_state = 0; labelobj->sp = -1; + labelobj->refcnt = 0; + labelobj->set = 0; + labelobj->rescued = LABEL_RESCUE_NONE; return labelobj; } @@ -900,6 +1033,7 @@ new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line) adjust->link.next = 0; adjust->label = label; adjust->line_no = line; + if (label) LABEL_REF(label); return adjust; } @@ -938,66 +1072,57 @@ new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int a return new_insn_core(iseq, line_no, insn_id, argc, operands); } -static rb_call_info_t * -new_callinfo(rb_iseq_t *iseq, ID mid, int argc, VALUE block, unsigned int flag, rb_call_info_kw_arg_t *kw_arg) +static struct rb_call_info * +new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_call_info_kw_arg *kw_arg, int has_blockiseq) { - rb_call_info_t *ci = (rb_call_info_t *)compile_data_alloc(iseq, sizeof(rb_call_info_t)); + size_t size = kw_arg != NULL ? sizeof(struct rb_call_info_with_kwarg) : sizeof(struct rb_call_info); + struct rb_call_info *ci = (struct rb_call_info *)compile_data_alloc(iseq, size); + struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci; ci->mid = mid; ci->flag = flag; ci->orig_argc = argc; - ci->argc = argc; - ci->kw_arg = kw_arg; if (kw_arg) { - ci->argc += kw_arg->keyword_len; + ci->flag |= VM_CALL_KWARG; + ci_kw->kw_arg = kw_arg; ci->orig_argc += kw_arg->keyword_len; - } - - if (block) { - GetISeqPtr(block, ci->blockiseq); + iseq->body->ci_kw_size++; } else { - ci->blockiseq = 0; + iseq->body->ci_size++; } if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG)) && - ci->blockiseq == NULL && ci->kw_arg == NULL) { + kw_arg == NULL && !has_blockiseq) { ci->flag |= VM_CALL_ARGS_SIMPLE; } - - ci->method_state = 0; - ci->class_serial = 0; - ci->blockptr = 0; - ci->recv = Qundef; - ci->call = 0; /* TODO: should set default function? */ - - ci->aux.index = iseq->callinfo_size++; - return ci; } static INSN * -new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, VALUE block, VALUE flag, rb_call_info_kw_arg_t *keywords) +new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_call_info_kw_arg *keywords) { - VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 1); - operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), block, FIX2INT(flag), keywords); - return new_insn_core(iseq, line_no, BIN(send), 1, operands); + VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 3); + operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), FIX2INT(flag), keywords, blockiseq != NULL); + operands[1] = Qfalse; /* cache */ + operands[2] = (VALUE)blockiseq; + return new_insn_core(iseq, line_no, BIN(send), 3, operands); } -static VALUE +static rb_iseq_t * new_child_iseq(rb_iseq_t *iseq, NODE *node, - VALUE name, VALUE parent, enum iseq_type type, int line_no) + VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no) { - VALUE ret; + rb_iseq_t *ret_iseq; debugs("[new_child_iseq]> ---------------------------------------\n"); - ret = rb_iseq_new_with_opt(node, name, - iseq_path(iseq->self), iseq_absolute_path(iseq->self), - INT2FIX(line_no), parent, type, iseq->compile_data->option); + ret_iseq = rb_iseq_new_with_opt(node, name, + iseq_path(iseq), iseq_absolute_path(iseq), + INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option); debugs("[new_child_iseq]< ---------------------------------------\n"); - iseq_add_mark_object(iseq, ret); - return ret; + iseq_add_mark_object(iseq, (VALUE)ret_iseq); + return ret_iseq; } static int @@ -1014,14 +1139,14 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor) if (compile_debug > 5) dump_disasm_list(FIRST_ELEMENT(anchor)); - if (iseq->compile_data->option->instructions_unification) { + if (ISEQ_COMPILE_DATA(iseq)->option->instructions_unification) { debugs("[compile step 3.2 (iseq_insns_unification)]\n"); iseq_insns_unification(iseq, anchor); if (compile_debug > 5) dump_disasm_list(FIRST_ELEMENT(anchor)); } - if (iseq->compile_data->option->stack_caching) { + if (ISEQ_COMPILE_DATA(iseq)->option->stack_caching) { debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n"); iseq_set_sequence_stackcaching(iseq, anchor); if (compile_debug > 5) @@ -1029,70 +1154,72 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor) } debugs("[compile step 4.1 (iseq_set_sequence)]\n"); - iseq_set_sequence(iseq, anchor); + if (!iseq_set_sequence(iseq, anchor)) return COMPILE_NG; if (compile_debug > 5) dump_disasm_list(FIRST_ELEMENT(anchor)); debugs("[compile step 4.2 (iseq_set_exception_table)]\n"); - iseq_set_exception_table(iseq); + if (!iseq_set_exception_table(iseq)) return COMPILE_NG; debugs("[compile step 4.3 (set_optargs_table)] \n"); - iseq_set_optargs_table(iseq); + if (!iseq_set_optargs_table(iseq)) return COMPILE_NG; debugs("[compile step 5 (iseq_translate_threaded_code)] \n"); - rb_iseq_translate_threaded_code(iseq); + if (!rb_iseq_translate_threaded_code(iseq)) return COMPILE_NG; if (compile_debug > 1) { - VALUE str = rb_iseq_disasm(iseq->self); + VALUE str = rb_iseq_disasm(iseq); printf("%s\n", StringValueCStr(str)); - fflush(stdout); } debugs("[compile step: finish]\n"); - return 0; + return COMPILE_OK; } static int iseq_set_exception_local_table(rb_iseq_t *iseq) { + /* TODO: every id table is same -> share it. + * Current problem is iseq_free(). + */ ID id_dollar_bang; + ID *ids = (ID *)ALLOC_N(ID, 1); CONST_ID(id_dollar_bang, "#$!"); - iseq->local_table = (ID *)ALLOC_N(ID, 1); - iseq->local_table_size = 1; - iseq->local_size = iseq->local_table_size + 1; - iseq->local_table[0] = id_dollar_bang; + iseq->body->local_table_size = 1; + ids[0] = id_dollar_bang; + iseq->body->local_table = ids; return COMPILE_OK; } static int -get_lvar_level(rb_iseq_t *iseq) +get_lvar_level(const rb_iseq_t *iseq) { int lev = 0; - while (iseq != iseq->local_iseq) { + while (iseq != iseq->body->local_iseq) { lev++; - iseq = iseq->parent_iseq; + iseq = iseq->body->parent_iseq; } return lev; } static int -get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id) +get_dyna_var_idx_at_raw(const rb_iseq_t *iseq, ID id) { - int i; + unsigned int i; - for (i = 0; i < iseq->local_table_size; i++) { - if (iseq->local_table[i] == id) { - return i; + for (i = 0; i < iseq->body->local_table_size; i++) { + if (iseq->body->local_table[i] == id) { + return (int)i; } } return -1; } static int -get_local_var_idx(rb_iseq_t *iseq, ID id) +get_local_var_idx(const rb_iseq_t *iseq, ID id) { - int idx = get_dyna_var_idx_at_raw(iseq->local_iseq, id); + int idx = get_dyna_var_idx_at_raw(iseq->body->local_iseq, id); if (idx < 0) { rb_bug("get_local_var_idx: %d", idx); @@ -1102,7 +1229,7 @@ get_local_var_idx(rb_iseq_t *iseq, ID id) } static int -get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls) +get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls) { int lv = 0, idx = -1; @@ -1111,7 +1238,7 @@ get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls) if (idx >= 0) { break; } - iseq = iseq->parent_iseq; + iseq = iseq->body->parent_iseq; lv++; } @@ -1120,44 +1247,114 @@ get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls) } *level = lv; - *ls = iseq->local_size; + *ls = iseq->body->local_table_size; return idx; } static void iseq_calc_param_size(rb_iseq_t *iseq) { - if (iseq->param.flags.has_opt || - iseq->param.flags.has_post || - iseq->param.flags.has_rest || - iseq->param.flags.has_block || - iseq->param.flags.has_kw || - iseq->param.flags.has_kwrest) { + if (iseq->body->param.flags.has_opt || + iseq->body->param.flags.has_post || + iseq->body->param.flags.has_rest || + iseq->body->param.flags.has_block || + iseq->body->param.flags.has_kw || + iseq->body->param.flags.has_kwrest) { - if (iseq->param.flags.has_block) { - iseq->param.size = iseq->param.block_start + 1; + if (iseq->body->param.flags.has_block) { + iseq->body->param.size = iseq->body->param.block_start + 1; } - else if (iseq->param.flags.has_kwrest) { - iseq->param.size = iseq->param.keyword->rest_start + 1; + else if (iseq->body->param.flags.has_kwrest) { + iseq->body->param.size = iseq->body->param.keyword->rest_start + 1; } - else if (iseq->param.flags.has_kw) { - iseq->param.size = iseq->param.keyword->bits_start + 1; + else if (iseq->body->param.flags.has_kw) { + iseq->body->param.size = iseq->body->param.keyword->bits_start + 1; } - else if (iseq->param.flags.has_post) { - iseq->param.size = iseq->param.post_start + iseq->param.post_num; + else if (iseq->body->param.flags.has_post) { + iseq->body->param.size = iseq->body->param.post_start + iseq->body->param.post_num; } - else if (iseq->param.flags.has_rest) { - iseq->param.size = iseq->param.rest_start + 1; + else if (iseq->body->param.flags.has_rest) { + iseq->body->param.size = iseq->body->param.rest_start + 1; } - else if (iseq->param.flags.has_opt) { - iseq->param.size = iseq->param.lead_num + iseq->param.opt_num; + else if (iseq->body->param.flags.has_opt) { + iseq->body->param.size = iseq->body->param.lead_num + iseq->body->param.opt_num; } else { rb_bug("unreachable"); } } else { - iseq->param.size = iseq->param.lead_num; + iseq->body->param.size = iseq->body->param.lead_num; + } +} + +static void +iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *optargs, const struct rb_args_info *args) +{ + NODE *node = args->kw_args; + struct rb_iseq_param_keyword *keyword; + const VALUE default_values = rb_ary_tmp_new(1); + const VALUE complex_mark = rb_str_tmp_new(0); + int kw = 0, rkw = 0, di = 0, i; + + iseq->body->param.flags.has_kw = TRUE; + iseq->body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1); + keyword->bits_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid); + + while (node) { + NODE *val_node = node->nd_body->nd_value; + VALUE dv; + + if (val_node == (NODE *)-1) { + ++rkw; + } + else { + switch (nd_type(val_node)) { + case NODE_LIT: + dv = val_node->nd_lit; + iseq_add_mark_object(iseq, dv); + break; + case NODE_NIL: + dv = Qnil; + break; + case NODE_TRUE: + dv = Qtrue; + break; + case NODE_FALSE: + dv = Qfalse; + break; + default: + COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */ + dv = complex_mark; + } + + keyword->num = ++di; + rb_ary_push(default_values, dv); + } + + kw++; + node = node->nd_next; + } + + keyword->num = kw; + + if (args->kw_rest_arg->nd_cflag != 0) { + keyword->rest_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_cflag); + iseq->body->param.flags.has_kwrest = TRUE; + } + keyword->required_num = rkw; + keyword->table = &iseq->body->local_table[keyword->bits_start - keyword->num]; + + { + VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values)); + + for (i = 0; i < RARRAY_LEN(default_values); i++) { + VALUE dv = RARRAY_AREF(default_values, i); + if (dv == complex_mark) dv = Qundef; + dvs[i] = dv; + } + + keyword->default_values = dvs; } } @@ -1172,15 +1369,11 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args) int last_comma = 0; ID block_id = 0; - if (nd_type(node_args) != NODE_ARGS) { - rb_bug("iseq_set_arguments: NODE_ARGS is expected, but %s", - ruby_node_name(nd_type(node_args))); - } - + EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS); - iseq->param.lead_num = (int)args->pre_args_num; - if (iseq->param.lead_num > 0) iseq->param.flags.has_lead = TRUE; - debugs(" - argc: %d\n", iseq->param.lead_num); + iseq->body->param.lead_num = (int)args->pre_args_num; + if (iseq->body->param.lead_num > 0) iseq->body->param.flags.has_lead = TRUE; + debugs(" - argc: %d\n", iseq->body->param.lead_num); rest_id = args->rest_arg; if (rest_id == 1) { @@ -1190,15 +1383,16 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args) block_id = args->block_arg; if (args->first_post_arg) { - iseq->param.post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg); - iseq->param.post_num = args->post_args_num; - iseq->param.flags.has_post = TRUE; + iseq->body->param.post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg); + iseq->body->param.post_num = args->post_args_num; + iseq->body->param.flags.has_post = TRUE; } if (args->opt_args) { NODE *node = args->opt_args; LABEL *label; VALUE labels = rb_ary_tmp_new(1); + VALUE *opt_table; int i = 0, j; while (node) { @@ -1215,82 +1409,27 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args) rb_ary_push(labels, (VALUE)label | 1); ADD_LABEL(optargs, label); - iseq->param.opt_num = i; - iseq->param.opt_table = ALLOC_N(VALUE, i+1); - MEMCPY(iseq->param.opt_table, RARRAY_CONST_PTR(labels), VALUE, i+1); + opt_table = ALLOC_N(VALUE, i+1); + + MEMCPY(opt_table, RARRAY_CONST_PTR(labels), VALUE, i+1); for (j = 0; j < i+1; j++) { - iseq->param.opt_table[j] &= ~1; + opt_table[j] &= ~1; } rb_ary_clear(labels); - iseq->param.flags.has_opt = TRUE; + iseq->body->param.flags.has_opt = TRUE; + iseq->body->param.opt_num = i; + iseq->body->param.opt_table = opt_table; } if (args->kw_args) { - NODE *node = args->kw_args; - const VALUE default_values = rb_ary_tmp_new(1); - const VALUE complex_mark = rb_str_tmp_new(0); - int kw = 0, rkw = 0, di = 0, i; - - iseq->param.flags.has_kw = TRUE; - iseq->param.keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1); - iseq->param.keyword->bits_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid); - - while (node) { - NODE *val_node = node->nd_body->nd_value; - VALUE dv; - - if (val_node == (NODE *)-1) { - ++rkw; - } - else { - switch (nd_type(val_node)) { - case NODE_LIT: - dv = val_node->nd_lit; - iseq_add_mark_object(iseq, dv); - break; - case NODE_NIL: - dv = Qnil; - break; - case NODE_TRUE: - dv = Qtrue; - break; - case NODE_FALSE: - dv = Qfalse; - break; - default: - COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */ - dv = complex_mark; - } - - iseq->param.keyword->num = ++di; - rb_ary_push(default_values, dv); - } - - kw++; - node = node->nd_next; - } - - iseq->param.keyword->num = kw; - - if (args->kw_rest_arg->nd_cflag != 0) { - iseq->param.keyword->rest_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_cflag); - iseq->param.flags.has_kwrest = TRUE; - } - iseq->param.keyword->required_num = rkw; - iseq->param.keyword->table = &iseq->local_table[iseq->param.keyword->bits_start - iseq->param.keyword->num]; - iseq->param.keyword->default_values = ALLOC_N(VALUE, RARRAY_LEN(default_values)); - - for (i = 0; i < RARRAY_LEN(default_values); i++) { - VALUE dv = RARRAY_AREF(default_values, i); - if (dv == complex_mark) dv = Qundef; - iseq->param.keyword->default_values[i] = dv; - } + iseq_set_arguments_keywords(iseq, optargs, args); } else if (args->kw_rest_arg) { - iseq->param.flags.has_kwrest = TRUE; - iseq->param.keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1); - iseq->param.keyword->rest_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid); + struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1); + keyword->rest_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid); + iseq->body->param.keyword = keyword; + iseq->body->param.flags.has_kwrest = TRUE; } if (args->pre_init) { /* m_init */ @@ -1301,32 +1440,32 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args) } if (rest_id) { - iseq->param.rest_start = get_dyna_var_idx_at_raw(iseq, rest_id); - iseq->param.flags.has_rest = TRUE; - assert(iseq->param.rest_start != -1); + iseq->body->param.rest_start = get_dyna_var_idx_at_raw(iseq, rest_id); + iseq->body->param.flags.has_rest = TRUE; + assert(iseq->body->param.rest_start != -1); - if (iseq->param.post_start == 0) { /* TODO: why that? */ - iseq->param.post_start = iseq->param.rest_start + 1; + if (iseq->body->param.post_start == 0) { /* TODO: why that? */ + iseq->body->param.post_start = iseq->body->param.rest_start + 1; } } if (block_id) { - iseq->param.block_start = get_dyna_var_idx_at_raw(iseq, block_id); - iseq->param.flags.has_block = TRUE; + iseq->body->param.block_start = get_dyna_var_idx_at_raw(iseq, block_id); + iseq->body->param.flags.has_block = TRUE; } iseq_calc_param_size(iseq); - if (iseq->type == ISEQ_TYPE_BLOCK) { - if (iseq->param.flags.has_opt == FALSE && - iseq->param.flags.has_post == FALSE && - iseq->param.flags.has_rest == FALSE && - iseq->param.flags.has_kw == FALSE && - iseq->param.flags.has_kwrest == FALSE) { + if (iseq->body->type == ISEQ_TYPE_BLOCK) { + if (iseq->body->param.flags.has_opt == FALSE && + iseq->body->param.flags.has_post == FALSE && + iseq->body->param.flags.has_rest == FALSE && + iseq->body->param.flags.has_kw == FALSE && + iseq->body->param.flags.has_kwrest == FALSE) { - if (iseq->param.lead_num == 1 && last_comma == 0) { + if (iseq->body->param.lead_num == 1 && last_comma == 0) { /* {|a|} */ - iseq->param.flags.ambiguous_param0 = TRUE; + iseq->body->param.flags.ambiguous_param0 = TRUE; } } } @@ -1338,10 +1477,10 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args) static int iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl) { - int size; + unsigned int size; if (tbl) { - size = (int)*tbl; + size = (unsigned int)*tbl; tbl++; } else { @@ -1349,21 +1488,13 @@ iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl) } if (size > 0) { - iseq->local_table = (ID *)ALLOC_N(ID, size); - MEMCPY(iseq->local_table, tbl, ID, size); + ID *ids = (ID *)ALLOC_N(ID, size); + MEMCPY(ids, tbl, ID, size); + iseq->body->local_table = ids; } + iseq->body->local_table_size = size; - iseq->local_size = iseq->local_table_size = size; - iseq->local_size += 1; - /* - if (lfp == dfp ) { // top, class, method - dfp[-1]: svar - else { // block - dfp[-1]: cref - } - */ - - debugs("iseq_set_local_table: %d, %d\n", iseq->local_size, iseq->local_table_size); + debugs("iseq_set_local_table: %u\n", iseq->body->local_table_size); return COMPILE_OK; } @@ -1414,38 +1545,56 @@ cdhash_set_label_i(VALUE key, VALUE val, void *ptr) return ST_CONTINUE; } + +static inline VALUE +get_ivar_ic_value(rb_iseq_t *iseq,ID id) +{ + VALUE val; + struct rb_id_table *tbl = ISEQ_COMPILE_DATA(iseq)->ivar_cache_table; + if (tbl) { + if (rb_id_table_lookup(tbl,id,&val)) { + return val; + } + } + else { + tbl = rb_id_table_create(1); + ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = tbl; + } + val = INT2FIX(iseq->body->is_size++); + rb_id_table_insert(tbl,id,val); + return val; +} + /** ruby insn object list -> raw instruction sequence */ static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) { - LABEL *lobj; - INSN *iobj; struct iseq_line_info_entry *line_info_table; unsigned int last_line = 0; LINK_ELEMENT *list; VALUE *generated_iseq; - int k, pos, sp, stack_max = 0, line = 0; + int insn_num, code_index, line_info_index, sp, stack_max = 0, line = 0; - /* set label position */ + /* fix label position */ list = FIRST_ELEMENT(anchor); - k = pos = 0; + insn_num = code_index = 0; while (list) { switch (list->type) { case ISEQ_ELEMENT_INSN: { - iobj = (INSN *)list; + INSN *iobj = (INSN *)list; line = iobj->line_no; - pos += insn_data_length(iobj); - k++; + code_index += insn_data_length(iobj); + insn_num++; break; } case ISEQ_ELEMENT_LABEL: { - lobj = (LABEL *)list; - lobj->position = pos; + LABEL *lobj = (LABEL *)list; + lobj->position = code_index; lobj->set = TRUE; break; } @@ -1458,30 +1607,32 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) { ADJUST *adjust = (ADJUST *)list; if (adjust->line_no != -1) { - pos += 2 /* insn + 1 operand */; - k++; + code_index += 2 /* insn + 1 operand */; + insn_num++; } break; } default: dump_disasm_list(FIRST_ELEMENT(anchor)); dump_disasm_list(list); - rb_compile_error(RSTRING_PTR(iseq->location.path), line, - "error: set_sequence"); - break; + COMPILE_ERROR(iseq, line, "error: set_sequence"); + return COMPILE_NG; } list = list->next; } /* make instruction sequence */ - generated_iseq = ALLOC_N(VALUE, pos); - line_info_table = ALLOC_N(struct iseq_line_info_entry, k); - iseq->is_entries = ZALLOC_N(union iseq_inline_storage_entry, iseq->is_size); - iseq->callinfo_entries = ALLOC_N(rb_call_info_t, iseq->callinfo_size); - /* MEMZERO(iseq->callinfo_entries, rb_call_info_t, iseq->callinfo_size); */ + generated_iseq = ALLOC_N(VALUE, code_index); + line_info_table = ALLOC_N(struct iseq_line_info_entry, insn_num); + iseq->body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, iseq->body->is_size); + iseq->body->ci_entries = (struct rb_call_info *)ruby_xmalloc(sizeof(struct rb_call_info) * iseq->body->ci_size + + sizeof(struct rb_call_info_with_kwarg) * iseq->body->ci_kw_size); + iseq->body->cc_entries = ZALLOC_N(struct rb_call_cache, iseq->body->ci_size + iseq->body->ci_kw_size); + + ISEQ_COMPILE_DATA(iseq)->ci_index = ISEQ_COMPILE_DATA(iseq)->ci_kw_index = 0; list = FIRST_ELEMENT(anchor); - k = pos = sp = 0; + line_info_index = code_index = sp = 0; while (list) { switch (list->type) { @@ -1490,8 +1641,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) int j, len, insn; const char *types; VALUE *operands; - - iobj = (INSN *)list; + INSN *iobj = (INSN *)list; /* update sp */ sp = calc_sp_depth(sp, iobj); @@ -1502,7 +1652,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) /* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */ operands = iobj->operands; insn = iobj->insn_id; - generated_iseq[pos] = insn; + generated_iseq[code_index] = insn; types = insn_op_types(insn); len = insn_len(insn); @@ -1510,12 +1660,12 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) if (iobj->operand_size != len - 1) { /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */ dump_disasm_list(list); - rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no, - "operand size miss! (%d for %d)", - iobj->operand_size, len - 1); xfree(generated_iseq); xfree(line_info_table); - return 0; + COMPILE_ERROR(iseq, iobj->line_no, + "operand size miss! (%d for %d)", + iobj->operand_size, len - 1); + return COMPILE_NG; } for (j = 0; types[j]; j++) { @@ -1525,15 +1675,16 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) case TS_OFFSET: { /* label(destination position) */ - lobj = (LABEL *)operands[j]; + LABEL *lobj = (LABEL *)operands[j]; if (!lobj->set) { - rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no, - "unknown label"); + COMPILE_ERROR(iseq, iobj->line_no, + "unknown label"); + return COMPILE_NG; } if (lobj->sp == -1) { lobj->sp = sp; } - generated_iseq[pos + 1 + j] = lobj->position - (pos + len); + generated_iseq[code_index + 1 + j] = lobj->position - (code_index + len); break; } case TS_CDHASH: @@ -1541,90 +1692,102 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) VALUE map = operands[j]; struct cdhash_set_label_struct data; data.hash = map; - data.pos = pos; + data.pos = code_index; data.len = len; rb_hash_foreach(map, cdhash_set_label_i, (VALUE)&data); - hide_obj(map); - generated_iseq[pos + 1 + j] = map; + rb_hash_rehash(map); + freeze_hide_obj(map); + generated_iseq[code_index + 1 + j] = map; break; } case TS_LINDEX: case TS_NUM: /* ulong */ - generated_iseq[pos + 1 + j] = FIX2INT(operands[j]); + generated_iseq[code_index + 1 + j] = FIX2INT(operands[j]); break; case TS_ISEQ: /* iseq */ { VALUE v = operands[j]; - rb_iseq_t *block = 0; - if (v) { - GetISeqPtr(v, block); - } - generated_iseq[pos + 1 + j] = (VALUE)block; + generated_iseq[code_index + 1 + j] = v; break; } case TS_VALUE: /* VALUE */ { VALUE v = operands[j]; - generated_iseq[pos + 1 + j] = v; + generated_iseq[code_index + 1 + j] = v; /* to mark ruby object */ iseq_add_mark_object(iseq, v); break; } case TS_IC: /* inline cache */ { - int ic_index = FIX2INT(operands[j]); - IC ic = (IC)&iseq->is_entries[ic_index]; - if (UNLIKELY(ic_index >= iseq->is_size)) { - rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->is_size); + unsigned int ic_index = FIX2UINT(operands[j]); + IC ic = (IC)&iseq->body->is_entries[ic_index]; + if (UNLIKELY(ic_index >= iseq->body->is_size)) { + rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->body->is_size); } - generated_iseq[pos + 1 + j] = (VALUE)ic; + generated_iseq[code_index + 1 + j] = (VALUE)ic; break; } case TS_CALLINFO: /* call info */ { - rb_call_info_t *base_ci = (rb_call_info_t *)operands[j]; - rb_call_info_t *ci = &iseq->callinfo_entries[base_ci->aux.index]; - *ci = *base_ci; - - if (UNLIKELY(base_ci->aux.index >= iseq->callinfo_size)) { - rb_bug("iseq_set_sequence: ci_index overflow: index: %d, size: %d", base_ci->argc, iseq->callinfo_size); + struct rb_call_info *base_ci = (struct rb_call_info *)operands[j]; + struct rb_call_info *ci; + + if (base_ci->flag & VM_CALL_KWARG) { + struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&iseq->body->ci_entries[iseq->body->ci_size]; + struct rb_call_info_with_kwarg *ci_kw = &ci_kw_entries[ISEQ_COMPILE_DATA(iseq)->ci_kw_index++]; + *ci_kw = *((struct rb_call_info_with_kwarg *)base_ci); + ci = (struct rb_call_info *)ci_kw; + assert(ISEQ_COMPILE_DATA(iseq)->ci_kw_index <= iseq->body->ci_kw_size); + } + else { + ci = &iseq->body->ci_entries[ISEQ_COMPILE_DATA(iseq)->ci_index++]; + *ci = *base_ci; + assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= iseq->body->ci_size); } - generated_iseq[pos + 1 + j] = (VALUE)ci; + + generated_iseq[code_index + 1 + j] = (VALUE)ci; + break; + } + case TS_CALLCACHE: + { + struct rb_call_cache *cc = &iseq->body->cc_entries[ISEQ_COMPILE_DATA(iseq)->ci_index + ISEQ_COMPILE_DATA(iseq)->ci_kw_index - 1]; + generated_iseq[code_index + 1 + j] = (VALUE)cc; break; } case TS_ID: /* ID */ - generated_iseq[pos + 1 + j] = SYM2ID(operands[j]); + generated_iseq[code_index + 1 + j] = SYM2ID(operands[j]); break; case TS_GENTRY: { struct rb_global_entry *entry = (struct rb_global_entry *)(operands[j] & (~1)); - generated_iseq[pos + 1 + j] = (VALUE)entry; + generated_iseq[code_index + 1 + j] = (VALUE)entry; } break; case TS_FUNCPTR: - generated_iseq[pos + 1 + j] = operands[j]; + generated_iseq[code_index + 1 + j] = operands[j]; break; default: - rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no, - "unknown operand type: %c", type); xfree(generated_iseq); xfree(line_info_table); - return 0; + COMPILE_ERROR(iseq, iobj->line_no, + "unknown operand type: %c", type); + return COMPILE_NG; } } if (last_line != iobj->line_no) { - line_info_table[k].line_no = last_line = iobj->line_no; - line_info_table[k].position = pos; - k++; + line_info_table[line_info_index].line_no = last_line = iobj->line_no; + line_info_table[line_info_index].position = code_index; + line_info_index++; } - pos += len; + code_index += len; break; } case ISEQ_ELEMENT_LABEL: { - lobj = (LABEL *)list; + LABEL *lobj = (LABEL *)list; if (lobj->sp == -1) { lobj->sp = sp; } @@ -1648,25 +1811,27 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) if (adjust->line_no != -1) { if (orig_sp - sp > 0) { if (last_line != (unsigned int)adjust->line_no) { - line_info_table[k].line_no = last_line = adjust->line_no; - line_info_table[k].position = pos; - k++; + line_info_table[line_info_index].line_no = last_line = adjust->line_no; + line_info_table[line_info_index].position = code_index; + line_info_index++; } - generated_iseq[pos++] = BIN(adjuststack); - generated_iseq[pos++] = orig_sp - sp; + generated_iseq[code_index++] = BIN(adjuststack); + generated_iseq[code_index++] = orig_sp - sp; } else if (orig_sp - sp == 0) { /* jump to next insn */ if (last_line != (unsigned int)adjust->line_no) { - line_info_table[k].line_no = last_line = adjust->line_no; - line_info_table[k].position = pos; - k++; + line_info_table[line_info_index].line_no = last_line = adjust->line_no; + line_info_table[line_info_index].position = code_index; + line_info_index++; } - generated_iseq[pos++] = BIN(nop); - generated_iseq[pos++] = BIN(nop); + generated_iseq[code_index++] = BIN(nop); + generated_iseq[code_index++] = BIN(nop); } else { - rb_bug("iseq_set_sequence: adjust bug"); + compile_bug(iseq, adjust->line_no, + "iseq_set_sequence: adjust bug %d < %d", + orig_sp, sp); } } break; @@ -1678,13 +1843,13 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor) list = list->next; } - iseq->iseq_encoded = (void *)generated_iseq; - iseq->iseq_size = pos; - iseq->stack_max = stack_max; + iseq->body->iseq_encoded = (void *)generated_iseq; + iseq->body->iseq_size = code_index; + iseq->body->stack_max = stack_max; - REALLOC_N(line_info_table, struct iseq_line_info_entry, k); - iseq->line_info_table = line_info_table; - iseq->line_info_size = k; + REALLOC_N(line_info_table, struct iseq_line_info_entry, line_info_index); + iseq->body->line_info_table = line_info_table; + iseq->body->line_info_size = line_info_index; return COMPILE_OK; } @@ -1705,50 +1870,53 @@ static int iseq_set_exception_table(rb_iseq_t *iseq) { const VALUE *tptr, *ptr; - int tlen, i; + unsigned int tlen, i; struct iseq_catch_table_entry *entry; - tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary); - tptr = RARRAY_CONST_PTR(iseq->compile_data->catch_table_ary); + tlen = (int)RARRAY_LEN(ISEQ_COMPILE_DATA(iseq)->catch_table_ary); + tptr = RARRAY_CONST_PTR(ISEQ_COMPILE_DATA(iseq)->catch_table_ary); - iseq->catch_table = 0; if (tlen > 0) { - iseq->catch_table = xmalloc(iseq_catch_table_bytes(tlen)); - iseq->catch_table->size = tlen; - } - - if (iseq->catch_table) for (i = 0; i < iseq->catch_table->size; i++) { - ptr = RARRAY_CONST_PTR(tptr[i]); - entry = &iseq->catch_table->entries[i]; - entry->type = (enum catch_type)(ptr[0] & 0xffff); - entry->start = label_get_position((LABEL *)(ptr[1] & ~1)); - entry->end = label_get_position((LABEL *)(ptr[2] & ~1)); - entry->iseq = ptr[3]; - - /* register iseq as mark object */ - if (entry->iseq != 0) { - iseq_add_mark_object(iseq, entry->iseq); - } - - /* stack depth */ - if (ptr[4]) { - LABEL *lobj = (LABEL *)(ptr[4] & ~1); - entry->cont = label_get_position(lobj); - entry->sp = label_get_sp(lobj); - - /* TODO: Dirty Hack! Fix me */ - if (entry->type == CATCH_TYPE_RESCUE || - entry->type == CATCH_TYPE_BREAK || - entry->type == CATCH_TYPE_NEXT) { - entry->sp--; + struct iseq_catch_table *table = xmalloc(iseq_catch_table_bytes(tlen)); + table->size = tlen; + + for (i = 0; i < table->size; i++) { + ptr = RARRAY_CONST_PTR(tptr[i]); + entry = &table->entries[i]; + entry->type = (enum catch_type)(ptr[0] & 0xffff); + entry->start = label_get_position((LABEL *)(ptr[1] & ~1)); + entry->end = label_get_position((LABEL *)(ptr[2] & ~1)); + entry->iseq = (rb_iseq_t *)ptr[3]; + + /* register iseq as mark object */ + if (entry->iseq != 0) { + iseq_add_mark_object(iseq, (VALUE)entry->iseq); + } + + /* stack depth */ + if (ptr[4]) { + LABEL *lobj = (LABEL *)(ptr[4] & ~1); + entry->cont = label_get_position(lobj); + entry->sp = label_get_sp(lobj); + + /* TODO: Dirty Hack! Fix me */ + if (entry->type == CATCH_TYPE_RESCUE || + entry->type == CATCH_TYPE_BREAK || + entry->type == CATCH_TYPE_NEXT) { + entry->sp--; + } + } + else { + entry->cont = 0; } } - else { - entry->cont = 0; - } + iseq->body->catch_table = table; + RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */ + } + else { + iseq->body->catch_table = NULL; } - RB_OBJ_WRITE(iseq->self, &iseq->compile_data->catch_table_ary, 0); /* free */ return COMPILE_OK; } @@ -1765,10 +1933,11 @@ static int iseq_set_optargs_table(rb_iseq_t *iseq) { int i; + VALUE *opt_table = (VALUE *)iseq->body->param.opt_table; - if (iseq->param.flags.has_opt) { - for (i = 0; i < iseq->param.opt_num + 1; i++) { - iseq->param.opt_table[i] = label_get_position((LABEL *)iseq->param.opt_table[i]); + if (iseq->body->param.flags.has_opt) { + for (i = 0; i < iseq->body->param.opt_num + 1; i++) { + opt_table[i] = label_get_position((LABEL *)opt_table[i]); } } return COMPILE_OK; @@ -1782,7 +1951,7 @@ get_destination_insn(INSN *iobj) list = lobj->link.next; while (list) { - if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) { + if (IS_INSN(list) || IS_ADJUST(list)) { break; } list = list->next; @@ -1796,7 +1965,7 @@ get_next_insn(INSN *iobj) LINK_ELEMENT *list = iobj->link.next; while (list) { - if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) { + if (IS_INSN(list) || IS_ADJUST(list)) { return list; } list = list->next; @@ -1810,7 +1979,7 @@ get_prev_insn(INSN *iobj) LINK_ELEMENT *list = iobj->link.prev; while (list) { - if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) { + if (IS_INSN(list) || IS_ADJUST(list)) { return list; } list = list->prev; @@ -1818,12 +1987,66 @@ get_prev_insn(INSN *iobj) return 0; } +static void +unref_destination(INSN *iobj, int pos) +{ + LABEL *lobj = (LABEL *)OPERAND_AT(iobj, pos); + --lobj->refcnt; + if (!lobj->refcnt) REMOVE_ELEM(&lobj->link); +} + +static void +replace_destination(INSN *dobj, INSN *nobj) +{ + VALUE n = OPERAND_AT(nobj, 0); + LABEL *dl = (LABEL *)OPERAND_AT(dobj, 0); + LABEL *nl = (LABEL *)n; + --dl->refcnt; + ++nl->refcnt; + OPERAND_AT(dobj, 0) = n; + if (!dl->refcnt) REMOVE_ELEM(&dl->link); +} + +static int +remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i) +{ + int removed = 0; + while (i) { + if (IS_INSN(i)) { + struct rb_iseq_constant_body *body = iseq->body; + VALUE insn = INSN_OF(i); + int pos, len = insn_len(insn); + for (pos = 0; pos < len; ++pos) { + switch (insn_op_types(insn)[pos]) { + case TS_OFFSET: + unref_destination((INSN *)i, pos); + break; + case TS_CALLINFO: + if (((struct rb_call_info *)OPERAND_AT(i, pos))->flag & VM_CALL_KWARG) + --(body->ci_kw_size); + else + --(body->ci_size); + break; + } + } + } + else if (IS_LABEL(i)) { + if (((LABEL *)i)->refcnt > 0) break; + } + else break; + REMOVE_ELEM(i); + removed = 1; + i = i->next; + } + return removed; +} + static int iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt) { INSN *iobj = (INSN *)list; again: - if (iobj->insn_id == BIN(jump)) { + if (IS_INSN_ID(iobj, jump)) { INSN *niobj, *diobj, *piobj; /* * useless jump elimination: @@ -1845,15 +2068,16 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal * => * LABEL: */ + unref_destination(iobj, 0); REMOVE_ELEM(&iobj->link); } - else if (iobj != diobj && diobj->insn_id == BIN(jump)) { - if (OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) { - OPERAND_AT(iobj, 0) = OPERAND_AT(diobj, 0); - goto again; - } + else if (iobj != diobj && IS_INSN_ID(diobj, jump) && + OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) { + replace_destination(iobj, diobj); + remove_unreachable_chunk(iseq, iobj->link.next); + goto again; } - else if (diobj->insn_id == BIN(leave)) { + else if (IS_INSN_ID(diobj, leave)) { /* * jump LABEL * ... @@ -1865,14 +2089,14 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal * LABEL: * leave */ - INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave), - diobj->operand_size, diobj->operands); INSN *popiobj = new_insn_core(iseq, iobj->line_no, BIN(pop), 0, 0); /* replace */ - REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj); - INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj); - iobj = popiobj; + unref_destination(iobj, 0); + iobj->insn_id = BIN(leave); + iobj->operand_size = 0; + INSERT_ELEM_NEXT(&iobj->link, &popiobj->link); + goto again; } /* * useless jump elimination (if/unless destination): @@ -1889,19 +2113,27 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal * L2: */ else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 && - (piobj->insn_id == BIN(branchif) || - piobj->insn_id == BIN(branchunless))) { + (IS_INSN_ID(piobj, branchif) || + IS_INSN_ID(piobj, branchunless))) { if (niobj == (INSN *)get_destination_insn(piobj)) { - piobj->insn_id = (piobj->insn_id == BIN(branchif)) + piobj->insn_id = (IS_INSN_ID(piobj, branchif)) ? BIN(branchunless) : BIN(branchif); - OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0); + replace_destination(piobj, iobj); REMOVE_ELEM(&iobj->link); } } + else if (remove_unreachable_chunk(iseq, iobj->link.next)) { + goto again; + } + } + + if (IS_INSN_ID(iobj, leave)) { + remove_unreachable_chunk(iseq, iobj->link.next); } - if (iobj->insn_id == BIN(branchif) || - iobj->insn_id == BIN(branchunless)) { + if (IS_INSN_ID(iobj, branchif) || + IS_INSN_ID(iobj, branchnil) || + IS_INSN_ID(iobj, branchunless)) { /* * if L1 * ... @@ -1911,12 +2143,124 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal * if L2 */ INSN *nobj = (INSN *)get_destination_insn(iobj); - if (nobj->insn_id == BIN(jump)) { - OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0); + INSN *pobj = (INSN *)iobj->link.prev; + int prev_dup = 0; + if (pobj) { + if (!IS_INSN(&pobj->link)) + pobj = 0; + else if (IS_INSN_ID(pobj, dup)) + prev_dup = 1; + } + + for (;;) { + if (IS_INSN_ID(nobj, jump)) { + replace_destination(iobj, nobj); + } + else if (prev_dup && IS_INSN_ID(nobj, dup) && + !!(nobj = (INSN *)nobj->link.next) && + /* basic blocks, with no labels in the middle */ + nobj->insn_id == iobj->insn_id) { + /* + * dup + * if L1 + * ... + * L1: + * dup + * if L2 + * => + * dup + * if L2 + * ... + * L1: + * dup + * if L2 + */ + replace_destination(iobj, nobj); + } + else if (pobj) { + /* + * putnil + * if L1 + * => + * # nothing + * + * putobject true + * if L1 + * => + * jump L1 + * + * putstring ".." + * if L1 + * => + * jump L1 + * + * putstring ".." + * dup + * if L1 + * => + * putstring ".." + * jump L1 + * + */ + int cond; + if (prev_dup && IS_INSN(pobj->link.prev)) { + pobj = (INSN *)pobj->link.prev; + } + if (IS_INSN_ID(pobj, putobject)) { + cond = (IS_INSN_ID(iobj, branchif) ? + OPERAND_AT(pobj, 0) != Qfalse : + IS_INSN_ID(iobj, branchunless) ? + OPERAND_AT(pobj, 0) == Qfalse : + FALSE); + } + else if (IS_INSN_ID(pobj, putstring)) { + cond = IS_INSN_ID(iobj, branchif); + } + else if (IS_INSN_ID(pobj, putnil)) { + cond = !IS_INSN_ID(iobj, branchif); + } + else break; + REMOVE_ELEM(iobj->link.prev); + if (cond) { + iobj->insn_id = BIN(jump); + goto again; + } + else { + unref_destination(iobj, 0); + REMOVE_ELEM(&iobj->link); + } + break; + } + else break; + nobj = (INSN *)get_destination_insn(nobj); } } - if (do_tailcallopt && iobj->insn_id == BIN(leave)) { + if (IS_INSN_ID(iobj, pop)) { + /* + * putself / putnil / putobject obj / putstring "..." + * pop + * => + * # do nothing + */ + LINK_ELEMENT *prev = iobj->link.prev; + if (IS_INSN(prev)) { + enum ruby_vminsn_type previ = ((INSN *)prev)->insn_id; + if (previ == BIN(putobject) || previ == BIN(putnil) || + previ == BIN(putself) || previ == BIN(putstring)) { + /* just push operand or static value and pop soon, no + * side effects */ + REMOVE_ELEM(prev); + REMOVE_ELEM(&iobj->link); + } + } + } + + if (do_tailcallopt && + (IS_INSN_ID(iobj, send) || + IS_INSN_ID(iobj, opt_aref_with) || + IS_INSN_ID(iobj, opt_aset_with) || + IS_INSN_ID(iobj, invokesuper))) { /* * send ... * leave @@ -1924,34 +2268,68 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal * send ..., ... | VM_CALL_TAILCALL, ... * leave # unreachable */ - INSN *piobj = (INSN *)get_prev_insn((INSN *)list); - enum ruby_vminsn_type previ = piobj->insn_id; + INSN *piobj = NULL; + if (iobj->link.next) { + LINK_ELEMENT *next = iobj->link.next; + do { + if (!IS_INSN(next)) { + next = next->next; + continue; + } + switch (INSN_OF(next)) { + case BIN(nop): + /*case BIN(trace):*/ + next = next->next; + break; + case BIN(leave): + piobj = iobj; + default: + next = NULL; + break; + } + } while (next); + } - if (previ == BIN(send) || previ == BIN(opt_send_without_block) || previ == BIN(invokesuper)) { - rb_call_info_t *ci = (rb_call_info_t *)piobj->operands[0]; - if (ci->blockiseq == 0) { + if (piobj) { + struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0]; + if (IS_INSN_ID(piobj, send) || IS_INSN_ID(piobj, invokesuper)) { + if (piobj->operands[2] == 0) { /* no blockiseq */ + ci->flag |= VM_CALL_TAILCALL; + } + } + else { ci->flag |= VM_CALL_TAILCALL; } } } + + #define IS_TRACE_LINE(insn) \ + (IS_INSN_ID(insn, trace) && \ + OPERAND_AT(insn, 0) == INT2FIX(RUBY_EVENT_LINE)) + if (IS_TRACE_LINE(iobj) && iobj->link.prev && IS_INSN(iobj->link.prev)) { + INSN *piobj = (INSN *)iobj->link.prev; + if (IS_TRACE_LINE(piobj)) { + REMOVE_ELEM(iobj->link.prev); + } + } + return COMPILE_OK; } static int insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id) { - int old_opsize = iobj->operand_size; iobj->insn_id = insn_id; iobj->operand_size = insn_len(insn_id) - 1; - if (iobj->operand_size > old_opsize) { + if (insn_id == BIN(opt_neq)) { VALUE *old_operands = iobj->operands; - if (insn_id != BIN(opt_neq)) { - rb_bug("insn_set_specialized_instruction: unknown insn: %d", insn_id); - } + iobj->operand_size = 4; iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size * sizeof(VALUE)); iobj->operands[0] = old_operands[0]; - iobj->operands[1] = (VALUE)new_callinfo(iseq, idEq, 1, 0, 0, NULL); + iobj->operands[1] = Qfalse; /* CALL_CACHE */ + iobj->operands[2] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE); + iobj->operands[3] = Qfalse; /* CALL_CACHE */ } return COMPILE_OK; @@ -1960,8 +2338,32 @@ insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id) static int iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) { - if (iobj->insn_id == BIN(send)) { - rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, 0); + if (IS_INSN_ID(iobj, newarray) && iobj->link.next && + IS_INSN(iobj->link.next)) { + /* + * [a, b, ...].max/min -> a, b, c, opt_newarray_max/min + */ + INSN *niobj = (INSN *)iobj->link.next; + if (IS_INSN_ID(niobj, send)) { + struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0); + if ((ci->flag & VM_CALL_ARGS_SIMPLE) && ci->orig_argc == 0) { + switch (ci->mid) { + case idMax: + iobj->insn_id = BIN(opt_newarray_max); + REMOVE_ELEM(&niobj->link); + return COMPILE_OK; + case idMin: + iobj->insn_id = BIN(opt_newarray_min); + REMOVE_ELEM(&niobj->link); + return COMPILE_OK; + } + } + } + } + + if (IS_INSN_ID(iobj, send)) { + struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, 0); + const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 2); #define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt)) if (ci->flag & VM_CALL_ARGS_SIMPLE) { @@ -2000,8 +2402,9 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) } } - if ((ci->flag & VM_CALL_ARGS_BLOCKARG) == 0 && ci->blockiseq == NULL) { + if ((ci->flag & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) { iobj->insn_id = BIN(opt_send_without_block); + iobj->operand_size = insn_len(iobj->insn_id) - 1; } } #undef SP_INSN @@ -2009,20 +2412,37 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj) return COMPILE_OK; } +static inline int +tailcallable_p(rb_iseq_t *iseq) +{ + switch (iseq->body->type) { + case ISEQ_TYPE_RESCUE: + case ISEQ_TYPE_ENSURE: + /* rescue block can't tail call because of errinfo */ + return FALSE; + default: + return TRUE; + } +} + static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor) { LINK_ELEMENT *list; - const int do_peepholeopt = iseq->compile_data->option->peephole_optimization; - const int do_tailcallopt = iseq->compile_data->option->tailcall_optimization; - const int do_si = iseq->compile_data->option->specialized_instruction; - const int do_ou = iseq->compile_data->option->operands_unification; + const int do_peepholeopt = ISEQ_COMPILE_DATA(iseq)->option->peephole_optimization; + const int do_tailcallopt = tailcallable_p(iseq) && + ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization; + const int do_si = ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction; + const int do_ou = ISEQ_COMPILE_DATA(iseq)->option->operands_unification; + int rescue_level = 0; + int tailcallopt = do_tailcallopt; + list = FIRST_ELEMENT(anchor); while (list) { - if (list->type == ISEQ_ELEMENT_INSN) { + if (IS_INSN(list)) { if (do_peepholeopt) { - iseq_peephole_optimize(iseq, list, do_tailcallopt); + iseq_peephole_optimize(iseq, list, tailcallopt); } if (do_si) { iseq_specialized_instruction(iseq, (INSN *)list); @@ -2031,6 +2451,17 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor) insn_operands_unification((INSN *)list); } } + if (IS_LABEL(list)) { + switch (((LABEL *)list)->rescued) { + case LABEL_RESCUE_BEG: + rescue_level++; + tailcallopt = FALSE; + break; + case LABEL_RESCUE_END: + if (!--rescue_level) tailcallopt = do_tailcallopt; + break; + } + } list = list->next; } return COMPILE_OK; @@ -2088,7 +2519,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor) list = FIRST_ELEMENT(anchor); while (list) { - if (list->type == ISEQ_ELEMENT_INSN) { + if (IS_INSN(list)) { iobj = (INSN *)list; id = iobj->insn_id; if (unified_insns_data[id] != 0) { @@ -2097,7 +2528,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor) const int *unified = entry[j]; LINK_ELEMENT *li = list->next; for (k = 2; k < unified[1]; k++) { - if (li->type != ISEQ_ELEMENT_INSN || + if (!IS_INSN(li) || ((INSN *)li)->insn_id != unified[k]) { goto miss; } @@ -2154,9 +2585,9 @@ insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state) dump_disasm_list((LINK_ELEMENT *)iobj); dump_disasm_list((LINK_ELEMENT *)lobj); printf("\n-- %d, %d\n", lobj->sc_state, nstate); - rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no, - "insn_set_sc_state error\n"); - return 0; + COMPILE_ERROR(iseq, iobj->line_no, + "insn_set_sc_state error\n"); + return COMPILE_NG; } } else { @@ -2256,8 +2687,9 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor) case SCS_XX: goto normal_insn; default: - rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no, - "unreachable"); + COMPILE_ERROR(iseq, iobj->line_no, + "unreachable"); + return COMPILE_NG; } /* remove useless pop */ REMOVE_ELEM(list); @@ -2292,14 +2724,19 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp) { NODE *list = node->nd_next; VALUE lit = node->nd_lit; + LINK_ELEMENT *first_lit = 0; int cnt = 0; debugp_param("nd_lit", lit); if (!NIL_P(lit)) { cnt++; - if (RB_TYPE_P(lit, T_STRING)) - lit = node->nd_lit = rb_fstring(node->nd_lit); + if (!RB_TYPE_P(lit, T_STRING)) { + compile_bug(ERROR_ARGS "dstr: must be string: %s", + rb_builtin_type_name(TYPE(lit))); + } + lit = node->nd_lit = rb_fstring(lit); ADD_INSN1(ret, nd_line(node), putobject, lit); + if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret); } while (list) { @@ -2307,6 +2744,7 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp) if (nd_type(node) == NODE_STR) { node->nd_lit = rb_fstring(node->nd_lit); ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit); + lit = Qnil; } else { COMPILE(ret, "each string", node); @@ -2314,6 +2752,10 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp) cnt++; list = list->nd_next; } + if (NIL_P(lit) && first_lit) { + REMOVE_ELEM(first_lit); + --cnt; + } *cntp = cnt; return COMPILE_OK; @@ -2365,6 +2807,18 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond, case NODE_LIT: /* NODE_LIT is always not true */ case NODE_TRUE: case NODE_STR: + case NODE_DSTR: + case NODE_XSTR: + case NODE_DXSTR: + case NODE_DREGX: + case NODE_DREGX_ONCE: + case NODE_DSYM: + case NODE_ARRAY: + case NODE_ZARRAY: + case NODE_HASH: + case NODE_LAMBDA: + case NODE_DEFN: + case NODE_DEFS: /* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */ ADD_INSNL(ret, nd_line(cond), jump, then_label); break; @@ -2383,7 +2837,7 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond, } static int -compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const root_node, rb_call_info_kw_arg_t ** const kw_arg_ptr) +compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const root_node, struct rb_call_info_kw_arg ** const kw_arg_ptr) { if (kw_arg_ptr == NULL) return FALSE; @@ -2408,7 +2862,7 @@ compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const node = root_node->nd_head; { int len = (int)node->nd_alen / 2; - rb_call_info_kw_arg_t *kw_arg = (rb_call_info_kw_arg_t *)ruby_xmalloc(sizeof(rb_call_info_kw_arg_t) + sizeof(VALUE) * (len - 1)); + struct rb_call_info_kw_arg *kw_arg = (struct rb_call_info_kw_arg *)ruby_xmalloc(sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (len - 1)); VALUE *keywords = kw_arg->keywords; int i = 0; kw_arg->keyword_len = len; @@ -2436,7 +2890,7 @@ enum compile_array_type_t { static int compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, - enum compile_array_type_t type, rb_call_info_kw_arg_t **keywords_ptr, int poped) + enum compile_array_type_t type, struct rb_call_info_kw_arg **keywords_ptr, int poped) { NODE *node = node_root; int line = (int)nd_line(node); @@ -2463,8 +2917,8 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, INIT_ANCHOR(anchor); for (i=0; i<max && node; i++, len++, node = node->nd_next) { - if (CPDEBUG > 0 && nd_type(node) != NODE_ARRAY) { - rb_bug("compile_array: This node is not NODE_ARRAY, but %s", ruby_node_name(nd_type(node))); + if (CPDEBUG > 0) { + EXPECT_NODE("compile_array", node, NODE_ARRAY); } if (type != COMPILE_ARRAY_TYPE_ARRAY && !node->nd_head) { @@ -2612,6 +3066,12 @@ case_when_optimizable_literal(NODE * node) } break; } + case NODE_NIL: + return Qnil; + case NODE_TRUE: + return Qtrue; + case NODE_FALSE: + return Qfalse; case NODE_STR: return node->nd_lit = rb_fstring(node->nd_lit); } @@ -2630,7 +3090,8 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, int onl } else { if (rb_hash_lookup(literals, lit) != Qnil) { - rb_compile_warning(RSTRING_PTR(iseq->location.path), nd_line(val), "duplicated when clause is ignored"); + rb_compile_warning(ruby_sourcefile, nd_line(val), + "duplicated when clause is ignored"); } else { rb_hash_aset(literals, lit, (VALUE)(l1) | 1); @@ -2661,21 +3122,24 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node) switch (nd_type(node)) { case NODE_ATTRASGN: { INSN *iobj; - rb_call_info_t *ci; + struct rb_call_info *ci; VALUE dupidx; + int line = nd_line(node); COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node); - POP_ELEMENT(ret); /* pop pop insn */ - iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */ - ci = (rb_call_info_t *)iobj->operands[0]; - ci->orig_argc += 1; ci->argc = ci->orig_argc; + iobj = (INSN *)get_prev_insn((INSN *)LAST_ELEMENT(ret)); /* send insn */ + ci = (struct rb_call_info *)iobj->operands[0]; + ci->orig_argc += 1; dupidx = INT2FIX(ci->orig_argc); - ADD_INSN1(ret, nd_line(node), topn, dupidx); - ADD_ELEM(ret, (LINK_ELEMENT *)iobj); - ADD_INSN(ret, nd_line(node), pop); /* result */ - ADD_INSN(ret, nd_line(node), pop); /* rhs */ + INSERT_BEFORE_INSN1(iobj, line, topn, dupidx); + if (ci->flag & VM_CALL_ARGS_SPLAT) { + --ci->orig_argc; + INSERT_BEFORE_INSN1(iobj, line, newarray, INT2FIX(1)); + INSERT_BEFORE_INSN(iobj, line, concatarray); + } + ADD_INSN(ret, line, pop); /* result */ break; } case NODE_MASGN: { @@ -2772,6 +3236,17 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret, return 1; } +static void +adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *ret, int line, int rlen, int llen) +{ + if (rlen < llen) { + do {ADD_INSN(ret, line, putnil);} while (++rlen < llen); + } + else if (rlen > llen) { + do {ADD_INSN(ret, line, pop);} while (--rlen > llen); + } +} + static int compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped) { @@ -2782,6 +3257,7 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped) if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) { int llen = 0; + int expand = 1; DECL_ANCHOR(lhsseq); INIT_ANCHOR(lhsseq); @@ -2797,9 +3273,35 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped) if (!poped) { ADD_INSN(ret, nd_line(node), dup); } - - ADD_INSN2(ret, nd_line(node), expandarray, - INT2FIX(llen), INT2FIX(lhs_splat)); + else if (!lhs_splat) { + INSN *last = (INSN*)ret->last; + if (IS_INSN(&last->link) && + IS_INSN_ID(last, newarray) && + last->operand_size == 1) { + int rlen = FIX2INT(OPERAND_AT(last, 0)); + /* special case: assign to aset or attrset */ + if (llen == 2) { + POP_ELEMENT(ret); + adjust_stack(iseq, ret, nd_line(node), rlen, llen); + ADD_INSN(ret, nd_line(node), swap); + expand = 0; + } + else if (llen > 2 && llen != rlen) { + POP_ELEMENT(ret); + adjust_stack(iseq, ret, nd_line(node), rlen, llen); + ADD_INSN1(ret, nd_line(node), reverse, INT2FIX(llen)); + expand = 0; + } + else if (llen > 2) { + last->insn_id = BIN(reverse); + expand = 0; + } + } + } + if (expand) { + ADD_INSN2(ret, nd_line(node), expandarray, + INT2FIX(llen), INT2FIX(lhs_splat)); + } ADD_SEQ(ret, lhsseq); if (lhs_splat) { @@ -3071,11 +3573,13 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret, int line = nd_line(node); LABEL *lstart = NEW_LABEL(line); LABEL *lend = NEW_LABEL(line); - VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(), - rb_str_concat(rb_str_new2 - ("defined guard in "), - iseq->location.label), - ISEQ_TYPE_DEFINED_GUARD, 0); + const rb_iseq_t *rescue = NEW_CHILD_ISEQ(NEW_NIL(), + rb_str_concat(rb_str_new2 + ("defined guard in "), + iseq->body->location.label), + ISEQ_TYPE_DEFINED_GUARD, 0); + lstart->rescued = LABEL_RESCUE_BEG; + lend->rescued = LABEL_RESCUE_END; APPEND_LABEL(ret, lcur, lstart); ADD_LABEL(ret, lend); ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]); @@ -3084,25 +3588,25 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret, } static VALUE -make_name_for_block(rb_iseq_t *iseq) +make_name_for_block(const rb_iseq_t *orig_iseq) { int level = 1; - rb_iseq_t *ip = iseq; + const rb_iseq_t *iseq = orig_iseq; - if (iseq->parent_iseq != 0) { - while (ip->local_iseq != ip) { - if (ip->type == ISEQ_TYPE_BLOCK) { + if (orig_iseq->body->parent_iseq != 0) { + while (orig_iseq->body->local_iseq != iseq) { + if (iseq->body->type == ISEQ_TYPE_BLOCK) { level++; } - ip = ip->parent_iseq; + iseq = iseq->body->parent_iseq; } } if (level == 1) { - return rb_sprintf("block in %"PRIsVALUE, ip->location.label); + return rb_sprintf("block in %"PRIsVALUE, iseq->body->location.label); } else { - return rb_sprintf("block (%d levels) in %"PRIsVALUE, level, ip->location.label); + return rb_sprintf("block (%d levels) in %"PRIsVALUE, level, iseq->body->location.label); } } @@ -3112,9 +3616,9 @@ push_ensure_entry(rb_iseq_t *iseq, struct ensure_range *er, NODE *node) { enl->ensure_node = node; - enl->prev = iseq->compile_data->ensure_node_stack; /* prev */ + enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack; /* prev */ enl->erange = er; - iseq->compile_data->ensure_node_stack = enl; + ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl; } static void @@ -3139,7 +3643,7 @@ static void add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return) { struct iseq_compile_data_ensure_node_stack *enlp = - iseq->compile_data->ensure_node_stack; + ISEQ_COMPILE_DATA(iseq)->ensure_node_stack; struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp; DECL_ANCHOR(ensure); @@ -3153,7 +3657,7 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return) add_ensure_range(iseq, enlp->erange, lstart, lend); - iseq->compile_data->ensure_node_stack = enlp->prev; + ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev; ADD_LABEL(ensure_part, lstart); COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node); ADD_LABEL(ensure_part, lend); @@ -3166,12 +3670,12 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return) } enlp = enlp->prev; } - iseq->compile_data->ensure_node_stack = prev_enlp; + ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = prev_enlp; ADD_SEQ(ret, ensure); } static VALUE -setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, rb_call_info_kw_arg_t **keywords) +setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, struct rb_call_info_kw_arg **keywords) { VALUE argc = INT2FIX(0); int nsplat = 0; @@ -3229,7 +3733,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, r break; } default: { - rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn))); + UNKNOWN_NODE("setup_arg", argn); } } } @@ -3256,13 +3760,73 @@ build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *body) { int line = nd_line(body); VALUE argc = INT2FIX(0); - VALUE block = NEW_CHILD_ISEQVAL(body, make_name_for_block(iseq->parent_iseq), ISEQ_TYPE_BLOCK, line); + const rb_iseq_t *block = NEW_CHILD_ISEQ(body, make_name_for_block(iseq->body->parent_iseq), ISEQ_TYPE_BLOCK, line); + ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); ADD_CALL_WITH_BLOCK(ret, line, id_core_set_postexe, argc, block); iseq_set_local_table(iseq, 0); return Qnil; } +static void +compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node) +{ + NODE *vars; + LINK_ELEMENT *last; + int line = nd_line(node); + LABEL *fail_label = NEW_LABEL(line), *end_label = NEW_LABEL(line); + +#if !(defined(NAMED_CAPTURE_BY_SVAR) && NAMED_CAPTURE_BY_SVAR-0) + ADD_INSN1(ret, line, getglobal, ((VALUE)rb_global_entry(idBACKREF) | 1)); +#else + ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */, INT2FIX(0)); +#endif + ADD_INSN(ret, line, dup); + ADD_INSNL(ret, line, branchunless, fail_label); + + for (vars = node; vars; vars = vars->nd_next) { + INSN *cap; + if (vars->nd_next) { + ADD_INSN(ret, line, dup); + } + last = ret->last; + COMPILE_POPED(ret, "capture", vars->nd_head); + last = last->next; /* putobject :var */ + cap = new_insn_send(iseq, line, idAREF, INT2FIX(1), + NULL, INT2FIX(0), NULL); + INSERT_ELEM_PREV(last->next, (LINK_ELEMENT *)cap); +#if !defined(NAMED_CAPTURE_SINGLE_OPT) || NAMED_CAPTURE_SINGLE_OPT-0 + if (!vars->nd_next && vars == node) { + /* only one name */ + DECL_ANCHOR(nom); + + INIT_ANCHOR(nom); + ADD_INSNL(nom, line, jump, end_label); + ADD_LABEL(nom, fail_label); +# if 0 /* $~ must be MatchData or nil */ + ADD_INSN(nom, line, pop); + ADD_INSN(nom, line, putnil); +# endif + ADD_LABEL(nom, end_label); + (nom->last->next = cap->link.next)->prev = nom->last; + (cap->link.next = nom->anchor.next)->prev = &cap->link; + return; + } +#endif + } + ADD_INSNL(ret, line, jump, end_label); + ADD_LABEL(ret, fail_label); + ADD_INSN(ret, line, pop); + for (vars = node; vars; vars = vars->nd_next) { + last = ret->last; + COMPILE_POPED(ret, "capture", vars->nd_head); + last = last->next; /* putobject :var */ + ((INSN*)last)->insn_id = BIN(putnil); + ((INSN*)last)->operand_size = 0; + } + ADD_LABEL(ret, end_label); +} + /** compile each node @@ -3280,19 +3844,19 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (node == 0) { if (!poped) { debugs("node: NODE_NIL(implicit)\n"); - ADD_INSN(ret, iseq->compile_data->last_line, putnil); + ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, putnil); } return COMPILE_OK; } line = (int)nd_line(node); - if (iseq->compile_data->last_line == line) { + if (ISEQ_COMPILE_DATA(iseq)->last_line == line) { /* ignore */ } else { if (node->flags & NODE_FL_NEWLINE) { - iseq->compile_data->last_line = line; + ISEQ_COMPILE_DATA(iseq)->last_line = line; ADD_TRACE(ret, line, RUBY_EVENT_LINE); saved_last_element = ret->last; } @@ -3372,7 +3936,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) line = nd_line(node); if (type != NODE_WHEN) { - COMPILE_ERROR((ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type))); + COMPILE_ERROR(ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type)); + debug_node_end(); + return COMPILE_NG; } endlabel = NEW_LABEL(line); @@ -3405,12 +3971,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSNL(cond_seq, nd_line(vals), branchif, l1); break; default: - rb_bug("NODE_CASE: unknown node (%s)", - ruby_node_name(nd_type(vals))); + UNKNOWN_NODE("NODE_CASE", vals); } } else { - rb_bug("NODE_CASE: must be NODE_ARRAY, but 0"); + EXPECT_NODE_NONULL("NODE_CASE", node, NODE_ARRAY); } node = node->nd_next; @@ -3442,6 +4007,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSN(ret, nd_line(tempnode), dup); ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch, literals, elselabel); + LABEL_REF(elselabel); } ADD_SEQ(ret, cond_seq); @@ -3467,7 +4033,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) vals = node->nd_head; if (!vals) { - rb_bug("NODE_WHEN: must be NODE_ARRAY, but 0"); + compile_bug(ERROR_ARGS "NODE_WHEN: must be NODE_ARRAY, but 0"); } switch (nd_type(vals)) { case NODE_ARRAY: @@ -3487,8 +4053,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSNL(ret, nd_line(vals), branchif, l1); break; default: - rb_bug("NODE_WHEN: unknown node (%s)", - ruby_node_name(nd_type(vals))); + UNKNOWN_NODE("NODE_WHEN", vals); } node = node->nd_next; } @@ -3504,22 +4069,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) case NODE_OPT_N: case NODE_WHILE: case NODE_UNTIL:{ - LABEL *prev_start_label = iseq->compile_data->start_label; - LABEL *prev_end_label = iseq->compile_data->end_label; - LABEL *prev_redo_label = iseq->compile_data->redo_label; - int prev_loopval_popped = iseq->compile_data->loopval_popped; + LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label; + LABEL *prev_end_label = ISEQ_COMPILE_DATA(iseq)->end_label; + LABEL *prev_redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label; + int prev_loopval_popped = ISEQ_COMPILE_DATA(iseq)->loopval_popped; struct iseq_compile_data_ensure_node_stack enl; - LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(line); /* next */ - LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(line); /* redo */ - LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(line); /* break */ + LABEL *next_label = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(line); /* next */ + LABEL *redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label = NEW_LABEL(line); /* redo */ + LABEL *break_label = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(line); /* break */ LABEL *end_label = NEW_LABEL(line); + LABEL *adjust_label = NEW_LABEL(line); LABEL *next_catch_label = NEW_LABEL(line); LABEL *tmp_label = NULL; - iseq->compile_data->loopval_popped = 0; + ISEQ_COMPILE_DATA(iseq)->loopval_popped = 0; push_ensure_entry(iseq, &enl, 0, 0); if (type == NODE_OPT_N || node->nd_state == 1) { @@ -3529,6 +4095,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) tmp_label = NEW_LABEL(line); ADD_INSNL(ret, line, jump, tmp_label); } + ADD_LABEL(ret, adjust_label); ADD_INSN(ret, line, putnil); ADD_LABEL(ret, next_catch_label); ADD_INSN(ret, line, pop); @@ -3556,10 +4123,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } ADD_LABEL(ret, end_label); + ADD_ADJUST_RESTORE(ret, adjust_label); if (node->nd_state == Qundef) { /* ADD_INSN(ret, line, putundef); */ - rb_bug("unsupported: putundef"); + compile_bug(ERROR_ARGS "unsupported: putundef"); } else { ADD_INSN(ret, line, putnil); @@ -3576,18 +4144,44 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, 0, next_catch_label); ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, 0, - iseq->compile_data->redo_label); + ISEQ_COMPILE_DATA(iseq)->redo_label); - iseq->compile_data->start_label = prev_start_label; - iseq->compile_data->end_label = prev_end_label; - iseq->compile_data->redo_label = prev_redo_label; - iseq->compile_data->loopval_popped = prev_loopval_popped; - iseq->compile_data->ensure_node_stack = iseq->compile_data->ensure_node_stack->prev; + ISEQ_COMPILE_DATA(iseq)->start_label = prev_start_label; + ISEQ_COMPILE_DATA(iseq)->end_label = prev_end_label; + ISEQ_COMPILE_DATA(iseq)->redo_label = prev_redo_label; + ISEQ_COMPILE_DATA(iseq)->loopval_popped = prev_loopval_popped; + ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->prev; break; } - case NODE_ITER: - case NODE_FOR:{ - VALUE prevblock = iseq->compile_data->current_block; + case NODE_FOR: + if (node->nd_var) { + /* massign to var in "for" + * args.length == 1 && Array === (tmp = args[0]) ? tmp : args + */ + NODE *var = node->nd_var; + LABEL *not_single = NEW_LABEL(nd_line(var)); + LABEL *not_ary = NEW_LABEL(nd_line(var)); + COMPILE(ret, "for var", var); + ADD_INSN(ret, line, dup); + ADD_CALL(ret, line, idLength, INT2FIX(0)); + ADD_INSN1(ret, line, putobject, INT2FIX(1)); + ADD_CALL(ret, line, idEq, INT2FIX(1)); + ADD_INSNL(ret, line, branchunless, not_single); + ADD_INSN(ret, line, dup); + ADD_INSN1(ret, line, putobject, INT2FIX(0)); + ADD_CALL(ret, line, idAREF, INT2FIX(1)); + ADD_INSN1(ret, line, putobject, rb_cArray); + ADD_INSN1(ret, line, topn, INT2FIX(1)); + ADD_CALL(ret, line, idEqq, INT2FIX(1)); + ADD_INSNL(ret, line, branchunless, not_ary); + ADD_INSN(ret, line, swap); + ADD_LABEL(ret, not_ary); + ADD_INSN(ret, line, pop); + ADD_LABEL(ret, not_single); + break; + } + case NODE_ITER:{ + const rb_iseq_t *prevblock = ISEQ_COMPILE_DATA(iseq)->current_block; LABEL *retry_label = NEW_LABEL(line); LABEL *retry_end_l = NEW_LABEL(line); @@ -3595,16 +4189,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (nd_type(node) == NODE_FOR) { COMPILE(ret, "iter caller (for)", node->nd_iter); - iseq->compile_data->current_block = - NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), - ISEQ_TYPE_BLOCK, line); - - ADD_SEND_WITH_BLOCK(ret, line, idEach, INT2FIX(0), iseq->compile_data->current_block); + ISEQ_COMPILE_DATA(iseq)->current_block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), + ISEQ_TYPE_BLOCK, line); + ADD_SEND_WITH_BLOCK(ret, line, idEach, INT2FIX(0), ISEQ_COMPILE_DATA(iseq)->current_block); } else { - iseq->compile_data->current_block = - NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), - ISEQ_TYPE_BLOCK, line); + ISEQ_COMPILE_DATA(iseq)->current_block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), + ISEQ_TYPE_BLOCK, line); COMPILE(ret, "iter caller", node->nd_iter); } ADD_LABEL(ret, retry_end_l); @@ -3613,7 +4204,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSN(ret, line, pop); } - iseq->compile_data->current_block = prevblock; + ISEQ_COMPILE_DATA(iseq)->current_block = prevblock; ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l); @@ -3622,160 +4213,161 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) case NODE_BREAK:{ unsigned long level = 0; - if (iseq->compile_data->redo_label != 0) { + if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) { /* while/until */ LABEL *splabel = NEW_LABEL(0); ADD_LABEL(ret, splabel); - ADD_ADJUST(ret, line, iseq->compile_data->redo_label); - COMPILE_(ret, "break val (while/until)", node->nd_stts, iseq->compile_data->loopval_popped); + ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label); + COMPILE_(ret, "break val (while/until)", node->nd_stts, ISEQ_COMPILE_DATA(iseq)->loopval_popped); add_ensure_iseq(ret, iseq, 0); - ADD_INSNL(ret, line, jump, iseq->compile_data->end_label); + ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label); ADD_ADJUST_RESTORE(ret, splabel); if (!poped) { ADD_INSN(ret, line, putnil); } } - else if (iseq->type == ISEQ_TYPE_BLOCK) { + else if (iseq->body->type == ISEQ_TYPE_BLOCK) { break_by_insn: /* escape from block */ COMPILE(ret, "break val (block)", node->nd_stts); - ADD_INSN1(ret, line, throw, INT2FIX(level | 0x02) /* TAG_BREAK */ ); + ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_BREAK)); if (poped) { ADD_INSN(ret, line, pop); } } - else if (iseq->type == ISEQ_TYPE_EVAL) { + else if (iseq->body->type == ISEQ_TYPE_EVAL) { break_in_eval: - COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with break")); + COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with break"); + debug_node_end(); + return COMPILE_NG; } else { - rb_iseq_t *ip = iseq->parent_iseq; + const rb_iseq_t *ip = iseq->body->parent_iseq; + while (ip) { - if (!ip->compile_data) { + if (!ISEQ_COMPILE_DATA(ip)) { ip = 0; break; } level++; - if (ip->compile_data->redo_label != 0) { - level = 0x8000; - if (ip->compile_data->loopval_popped == 0) { - /* need value */ - level |= 0x4000; - } + if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) { + level = VM_THROW_NO_ESCAPE_FLAG; goto break_by_insn; } - else if (ip->type == ISEQ_TYPE_BLOCK) { - level <<= 16; + else if (ip->body->type == ISEQ_TYPE_BLOCK) { + level <<= VM_THROW_LEVEL_SHIFT; goto break_by_insn; } - else if (ip->type == ISEQ_TYPE_EVAL) { + else if (ip->body->type == ISEQ_TYPE_EVAL) { goto break_in_eval; } - ip = ip->parent_iseq; + ip = ip->body->parent_iseq; } - COMPILE_ERROR((ERROR_ARGS "Invalid break")); + COMPILE_ERROR(ERROR_ARGS "Invalid break"); + debug_node_end(); + return COMPILE_NG; } break; } case NODE_NEXT:{ unsigned long level = 0; - if (iseq->compile_data->redo_label != 0) { + if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) { LABEL *splabel = NEW_LABEL(0); debugs("next in while loop\n"); ADD_LABEL(ret, splabel); COMPILE(ret, "next val/valid syntax?", node->nd_stts); add_ensure_iseq(ret, iseq, 0); - ADD_ADJUST(ret, line, iseq->compile_data->redo_label); - ADD_INSNL(ret, line, jump, iseq->compile_data->start_label); + ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label); + ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label); ADD_ADJUST_RESTORE(ret, splabel); if (!poped) { ADD_INSN(ret, line, putnil); } } - else if (iseq->compile_data->end_label) { + else if (ISEQ_COMPILE_DATA(iseq)->end_label) { LABEL *splabel = NEW_LABEL(0); debugs("next in block\n"); ADD_LABEL(ret, splabel); - ADD_ADJUST(ret, line, iseq->compile_data->start_label); + ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->start_label); COMPILE(ret, "next val", node->nd_stts); add_ensure_iseq(ret, iseq, 0); - ADD_INSNL(ret, line, jump, iseq->compile_data->end_label); + ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label); ADD_ADJUST_RESTORE(ret, splabel); if (!poped) { ADD_INSN(ret, line, putnil); } } - else if (iseq->type == ISEQ_TYPE_EVAL) { + else if (iseq->body->type == ISEQ_TYPE_EVAL) { next_in_eval: - COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with next")); + COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next"); } else { - rb_iseq_t *ip; - ip = iseq; + const rb_iseq_t *ip = iseq; + while (ip) { - if (!ip->compile_data) { + if (!ISEQ_COMPILE_DATA(ip)) { ip = 0; break; } - level = 0x8000 | 0x4000; - if (ip->compile_data->redo_label != 0) { + level = VM_THROW_NO_ESCAPE_FLAG; + if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) { /* while loop */ break; } - else if (ip->type == ISEQ_TYPE_BLOCK) { + else if (ip->body->type == ISEQ_TYPE_BLOCK) { break; } - else if (ip->type == ISEQ_TYPE_EVAL) { + else if (ip->body->type == ISEQ_TYPE_EVAL) { goto next_in_eval; } - ip = ip->parent_iseq; + ip = ip->body->parent_iseq; } if (ip != 0) { COMPILE(ret, "next val", node->nd_stts); - ADD_INSN1(ret, line, throw, INT2FIX(level | 0x03) /* TAG_NEXT */ ); + ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_NEXT)); if (poped) { ADD_INSN(ret, line, pop); } } else { - COMPILE_ERROR((ERROR_ARGS "Invalid next")); + COMPILE_ERROR(ERROR_ARGS "Invalid next"); } } break; } case NODE_REDO:{ - if (iseq->compile_data->redo_label) { + if (ISEQ_COMPILE_DATA(iseq)->redo_label) { LABEL *splabel = NEW_LABEL(0); debugs("redo in while"); ADD_LABEL(ret, splabel); - ADD_ADJUST(ret, line, iseq->compile_data->redo_label); + ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label); add_ensure_iseq(ret, iseq, 0); - ADD_INSNL(ret, line, jump, iseq->compile_data->redo_label); + ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->redo_label); ADD_ADJUST_RESTORE(ret, splabel); if (!poped) { ADD_INSN(ret, line, putnil); } } - else if (iseq->type == ISEQ_TYPE_EVAL) { + else if (iseq->body->type == ISEQ_TYPE_EVAL) { redo_in_eval: - COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with redo")); + COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo"); } - else if (iseq->compile_data->start_label) { + else if (ISEQ_COMPILE_DATA(iseq)->start_label) { LABEL *splabel = NEW_LABEL(0); debugs("redo in block"); ADD_LABEL(ret, splabel); add_ensure_iseq(ret, iseq, 0); - ADD_ADJUST(ret, line, iseq->compile_data->start_label); - ADD_INSNL(ret, line, jump, iseq->compile_data->start_label); + ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->start_label); + ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label); ADD_ADJUST_RESTORE(ret, splabel); if (!poped) { @@ -3783,53 +4375,52 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } } else { - rb_iseq_t *ip; - unsigned long level; - level = 0x8000 | 0x4000; - ip = iseq; + const rb_iseq_t *ip = iseq; + const unsigned long level = VM_THROW_NO_ESCAPE_FLAG; + while (ip) { - if (!ip->compile_data) { + if (!ISEQ_COMPILE_DATA(ip)) { ip = 0; break; } - if (ip->compile_data->redo_label != 0) { + if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) { break; } - else if (ip->type == ISEQ_TYPE_BLOCK) { + else if (ip->body->type == ISEQ_TYPE_BLOCK) { break; } - else if (ip->type == ISEQ_TYPE_EVAL) { + else if (ip->body->type == ISEQ_TYPE_EVAL) { goto redo_in_eval; } - ip = ip->parent_iseq; + ip = ip->body->parent_iseq; } if (ip != 0) { ADD_INSN(ret, line, putnil); - ADD_INSN1(ret, line, throw, INT2FIX(level | 0x05) /* TAG_REDO */ ); + ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_REDO)); if (poped) { ADD_INSN(ret, line, pop); } } else { - COMPILE_ERROR((ERROR_ARGS "Invalid redo")); + COMPILE_ERROR(ERROR_ARGS "Invalid redo"); } } break; } case NODE_RETRY:{ - if (iseq->type == ISEQ_TYPE_RESCUE) { + if (iseq->body->type == ISEQ_TYPE_RESCUE) { ADD_INSN(ret, line, putnil); - ADD_INSN1(ret, line, throw, INT2FIX(0x04) /* TAG_RETRY */ ); + ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETRY)); if (poped) { ADD_INSN(ret, line, pop); } } else { - COMPILE_ERROR((ERROR_ARGS "Invalid retry")); + COMPILE_ERROR(ERROR_ARGS "Invalid retry"); } break; } @@ -3841,11 +4432,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) LABEL *lstart = NEW_LABEL(line); LABEL *lend = NEW_LABEL(line); LABEL *lcont = NEW_LABEL(line); - VALUE rescue = NEW_CHILD_ISEQVAL( - node->nd_resq, - rb_str_concat(rb_str_new2("rescue in "), iseq->location.label), - ISEQ_TYPE_RESCUE, line); + const rb_iseq_t *rescue = NEW_CHILD_ISEQ(node->nd_resq, + rb_str_concat(rb_str_new2("rescue in "), iseq->body->location.label), + ISEQ_TYPE_RESCUE, line); + lstart->rescued = LABEL_RESCUE_BEG; + lend->rescued = LABEL_RESCUE_END; ADD_LABEL(ret, lstart); COMPILE(ret, "rescue head", node->nd_head); ADD_LABEL(ret, lend); @@ -3879,7 +4471,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) switch (nd_type(narg)) { case NODE_ARRAY: while (narg) { - ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0)); + ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0); COMPILE(ret, "rescue arg", narg->nd_head); ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE)); ADD_INSNL(ret, line, branchif, label_hit); @@ -3889,18 +4481,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) case NODE_SPLAT: case NODE_ARGSCAT: case NODE_ARGSPUSH: - ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0)); + ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0); COMPILE(ret, "rescue/cond splat", narg); ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY)); ADD_INSNL(ret, line, branchif, label_hit); break; default: - rb_bug("NODE_RESBODY: unknown node (%s)", - ruby_node_name(nd_type(narg))); + UNKNOWN_NODE("NODE_RESBODY", narg); } } else { - ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0)); + ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0); ADD_INSN1(ret, line, putobject, rb_eStandardError); ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE)); ADD_INSNL(ret, line, branchif, label_hit); @@ -3908,7 +4499,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSNL(ret, line, jump, label_miss); ADD_LABEL(ret, label_hit); COMPILE(ret, "resbody body", resq->nd_body); - if (iseq->compile_data->option->tailcall_optimization) { + if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) { ADD_INSN(ret, line, nop); } ADD_INSN(ret, line, leave); @@ -3919,11 +4510,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } case NODE_ENSURE:{ DECL_ANCHOR(ensr); - VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr, - rb_str_concat(rb_str_new2 - ("ensure in "), - iseq->location.label), - ISEQ_TYPE_ENSURE, line); + const rb_iseq_t *ensure = NEW_CHILD_ISEQ(node->nd_ensr, + rb_str_concat(rb_str_new2 ("ensure in "), iseq->body->location.label), + ISEQ_TYPE_ENSURE, line); LABEL *lstart = NEW_LABEL(line); LABEL *lend = NEW_LABEL(line); LABEL *lcont = NEW_LABEL(line); @@ -3950,14 +4539,14 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } ADD_LABEL(ret, lcont); - erange = iseq->compile_data->ensure_node_stack->erange; + erange = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->erange; while (erange) { ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end, ensure, lcont); erange = erange->next; } - iseq->compile_data->ensure_node_stack = enl.prev; + ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl.prev; break; } @@ -3989,7 +4578,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) case NODE_LASGN:{ ID id = node->nd_vid; - int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id); + int idx = iseq->body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id); debugs("lvar: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx); COMPILE(ret, "rvalue", node->nd_value); @@ -3997,8 +4586,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (!poped) { ADD_INSN(ret, line, dup); } - ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq))); - + ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq)); break; } case NODE_DASGN: @@ -4014,10 +4602,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls); if (idx < 0) { - rb_bug("NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")", rb_id2str(node->nd_vid)); + compile_bug(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")", + rb_id2str(node->nd_vid)); } - - ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv)); + ADD_SETLOCAL(ret, line, ls - idx, lv); break; } case NODE_GASGN:{ @@ -4037,7 +4625,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSN(ret, line, dup); } ADD_INSN2(ret, line, setinstancevariable, - ID2SYM(node->nd_vid), INT2FIX(iseq->is_size++)); + ID2SYM(node->nd_vid), + get_ivar_ic_value(iseq,node->nd_vid)); break; } case NODE_CDECL:{ @@ -4114,8 +4703,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_SEQ(ret, args); } ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff)); - flag |= asgnflag; ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag)); + flag |= asgnflag; if (id == 0 || id == 1) { /* 0: or, 1: and @@ -4207,9 +4796,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } case NODE_OP_ASGN2:{ ID atype = node->nd_next->nd_mid; + ID vid = node->nd_next->nd_vid, aid = rb_id_attrset(vid); VALUE asgnflag; LABEL *lfin = NEW_LABEL(line); LABEL *lcfin = NEW_LABEL(line); + LABEL *lskip = 0; /* class C; attr_accessor :c; end r = C.new @@ -4253,8 +4844,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) */ asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node); + if (node->nd_next->nd_aid) { + lskip = NEW_LABEL(line); + ADD_INSN(ret, line, dup); + ADD_INSNL(ret, line, branchnil, lskip); + } ADD_INSN(ret, line, dup); - ADD_SEND_WITH_FLAG(ret, line, node->nd_next->nd_vid, INT2FIX(0), INT2FIX(asgnflag)); + ADD_SEND(ret, line, vid, INT2FIX(0)); if (atype == 0 || atype == 1) { /* 0: OR or 1: AND */ ADD_INSN(ret, line, dup); @@ -4268,7 +4864,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); ADD_INSN(ret, line, swap); ADD_INSN1(ret, line, topn, INT2FIX(1)); - ADD_SEND_WITH_FLAG(ret, line, node->nd_next->nd_aid, INT2FIX(1), INT2FIX(asgnflag)); + ADD_SEND_WITH_FLAG(ret, line, aid, INT2FIX(1), INT2FIX(asgnflag)); ADD_INSNL(ret, line, jump, lfin); ADD_LABEL(ret, lcfin); @@ -4276,6 +4872,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_LABEL(ret, lfin); ADD_INSN(ret, line, pop); + if (lskip) { + ADD_LABEL(ret, lskip); + } if (poped) { /* we can apply more optimize */ ADD_INSN(ret, line, pop); @@ -4283,14 +4882,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } else { COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value); - ADD_SEND(ret, line, node->nd_next->nd_mid, - INT2FIX(1)); + ADD_SEND(ret, line, atype, INT2FIX(1)); if (!poped) { ADD_INSN(ret, line, swap); ADD_INSN1(ret, line, topn, INT2FIX(1)); } - ADD_SEND_WITH_FLAG(ret, line, node->nd_next->nd_aid, INT2FIX(1), INT2FIX(asgnflag)); + ADD_SEND_WITH_FLAG(ret, line, aid, INT2FIX(1), INT2FIX(asgnflag)); ADD_INSN(ret, line, pop); + if (lskip) { + ADD_LABEL(ret, lskip); + } } break; } @@ -4307,10 +4908,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head); break; default: - do { - COMPILE_ERROR((ERROR_ARGS "%s: invalid node in NODE_OP_CDECL", - ruby_node_name(nd_type(node->nd_head)))); - } while (0); + COMPILE_ERROR(ERROR_ARGS "%s: invalid node in NODE_OP_CDECL", + ruby_node_name(nd_type(node->nd_head))); + debug_node_end(); return COMPILE_NG; } mid = node->nd_head->nd_mid; @@ -4409,8 +5009,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) */ if (node->nd_recv && nd_type(node->nd_recv) == NODE_STR && node->nd_mid == idFreeze && node->nd_args == NULL && - iseq->compile_data->current_block == Qfalse && - iseq->compile_data->option->specialized_instruction) { + ISEQ_COMPILE_DATA(iseq)->current_block == NULL && + ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) { VALUE str = rb_fstring(node->nd_recv->nd_lit); iseq_add_mark_object(iseq, str); ADD_INSN1(ret, line, opt_str_freeze, str); @@ -4425,18 +5025,20 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (node->nd_mid == idAREF && !private_recv_p(node) && node->nd_args && nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 1 && nd_type(node->nd_args->nd_head) == NODE_STR && - iseq->compile_data->current_block == Qfalse && - iseq->compile_data->option->specialized_instruction) { + ISEQ_COMPILE_DATA(iseq)->current_block == NULL && + ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) { VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit); node->nd_args->nd_head->nd_lit = str; COMPILE(ret, "recv", node->nd_recv); - ADD_INSN2(ret, line, opt_aref_with, - new_callinfo(iseq, idAREF, 1, 0, 0, NULL), str); + ADD_INSN3(ret, line, opt_aref_with, + new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE), + NULL/* CALL_CACHE */, str); if (poped) { ADD_INSN(ret, line, pop); } break; } + case NODE_QCALL: case NODE_FCALL: case NODE_VCALL:{ /* VCALL: variable or call */ /* @@ -4446,12 +5048,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) */ DECL_ANCHOR(recv); DECL_ANCHOR(args); + LABEL *lskip = 0; ID mid = node->nd_mid; VALUE argc; unsigned int flag = 0; - rb_call_info_kw_arg_t *keywords = NULL; - VALUE parent_block = iseq->compile_data->current_block; - iseq->compile_data->current_block = Qfalse; + struct rb_call_info_kw_arg *keywords = NULL; + const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block; + ISEQ_COMPILE_DATA(iseq)->current_block = NULL; INIT_ANCHOR(recv); INIT_ANCHOR(args); @@ -4484,12 +5087,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) (mid == goto_id || mid == label_id)) { LABEL *label; st_data_t data; - st_table *labels_table = iseq->compile_data->labels_table; + st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table; ID label_name; if (!labels_table) { labels_table = st_init_numtable(); - iseq->compile_data->labels_table = labels_table; + ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table; } if (nd_type(node->nd_args->nd_head) == NODE_LIT && SYMBOL_P(node->nd_args->nd_head->nd_lit)) { @@ -4505,7 +5108,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } } else { - COMPILE_ERROR((ERROR_ARGS "invalid goto/label format")); + COMPILE_ERROR(ERROR_ARGS "invalid goto/label format"); } @@ -4520,8 +5123,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } #endif /* receiver */ - if (type == NODE_CALL) { + if (type == NODE_CALL || type == NODE_QCALL) { COMPILE(recv, "recv", node->nd_recv); + if (type == NODE_QCALL) { + lskip = NEW_LABEL(line); + ADD_INSN(recv, line, dup); + ADD_INSNL(recv, line, branchnil, lskip); + } } else if (type == NODE_FCALL || type == NODE_VCALL) { ADD_CALL_RECEIVER(recv, line); @@ -4551,6 +5159,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords); + if (lskip) { + ADD_LABEL(ret, lskip); + } if (poped) { ADD_INSN(ret, line, pop); } @@ -4561,11 +5172,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) DECL_ANCHOR(args); int argc; unsigned int flag = 0; - rb_call_info_kw_arg_t *keywords = NULL; - VALUE parent_block = iseq->compile_data->current_block; + struct rb_call_info_kw_arg *keywords = NULL; + const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block; INIT_ANCHOR(args); - iseq->compile_data->current_block = Qfalse; + ISEQ_COMPILE_DATA(iseq)->current_block = NULL; if (nd_type(node) == NODE_SUPER) { VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords); argc = FIX2INT(vargc); @@ -4573,44 +5184,45 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) else { /* NODE_ZSUPER */ int i; - rb_iseq_t *liseq = iseq->local_iseq; + const rb_iseq_t *liseq = iseq->body->local_iseq; int lvar_level = get_lvar_level(iseq); - argc = liseq->param.lead_num; + argc = liseq->body->param.lead_num; /* normal arguments */ - for (i = 0; i < liseq->param.lead_num; i++) { - int idx = liseq->local_size - i; - ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level)); + for (i = 0; i < liseq->body->param.lead_num; i++) { + int idx = liseq->body->local_table_size - i; + ADD_GETLOCAL(args, line, idx, lvar_level); } - if (liseq->param.flags.has_opt) { + if (liseq->body->param.flags.has_opt) { /* optional arguments */ int j; - for (j = 0; j < liseq->param.opt_num; j++) { - int idx = liseq->local_size - (i + j); - ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level)); + for (j = 0; j < liseq->body->param.opt_num; j++) { + int idx = liseq->body->local_table_size - (i + j); + ADD_GETLOCAL(args, line, idx, lvar_level); } i += j; argc = i; } - if (liseq->param.flags.has_rest) { + if (liseq->body->param.flags.has_rest) { /* rest argument */ - int idx = liseq->local_size - liseq->param.rest_start; - ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level)); - argc = liseq->param.rest_start + 1; + int idx = liseq->body->local_table_size - liseq->body->param.rest_start; + ADD_GETLOCAL(args, line, idx, lvar_level); + + argc = liseq->body->param.rest_start + 1; flag |= VM_CALL_ARGS_SPLAT; } - if (liseq->param.flags.has_post) { + if (liseq->body->param.flags.has_post) { /* post arguments */ - int post_len = liseq->param.post_num; - int post_start = liseq->param.post_start; + int post_len = liseq->body->param.post_num; + int post_start = liseq->body->param.post_start; - if (liseq->param.flags.has_rest) { + if (liseq->body->param.flags.has_rest) { int j; for (j=0; j<post_len; j++) { - int idx = liseq->local_size - (post_start + j); - ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level)); + int idx = liseq->body->local_table_size - (post_start + j); + ADD_GETLOCAL(args, line, idx, lvar_level); } ADD_INSN1(args, line, newarray, INT2FIX(j)); ADD_INSN (args, line, concatarray); @@ -4619,43 +5231,46 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) else { int j; for (j=0; j<post_len; j++) { - int idx = liseq->local_size - (post_start + j); - ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level)); + int idx = liseq->body->local_table_size - (post_start + j); + ADD_GETLOCAL(args, line, idx, lvar_level); } argc = post_len + post_start; } } - if (liseq->param.flags.has_kw) { /* TODO: support keywords */ - int local_size = liseq->local_size; + if (liseq->body->param.flags.has_kw) { /* TODO: support keywords */ + int local_size = liseq->body->local_table_size; argc++; ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); - if (liseq->param.flags.has_kwrest) { - ADD_INSN2(args, line, getlocal, INT2FIX(liseq->local_size - liseq->param.keyword->rest_start), INT2FIX(lvar_level)); + if (liseq->body->param.flags.has_kwrest) { + int idx = liseq->body->local_table_size - liseq->body->param.keyword->rest_start; + ADD_GETLOCAL(args, line, idx, lvar_level); ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0)); } else { ADD_INSN1(args, line, newhash, INT2FIX(0)); } - for (i = 0; i < liseq->param.keyword->num; ++i) { - ID id = liseq->param.keyword->table[i]; + for (i = 0; i < liseq->body->param.keyword->num; ++i) { + ID id = liseq->body->param.keyword->table[i]; int idx = local_size - get_local_var_idx(liseq, id); ADD_INSN1(args, line, putobject, ID2SYM(id)); - ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level)); + ADD_GETLOCAL(args, line, idx, lvar_level); } ADD_SEND(args, line, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1)); - if (liseq->param.flags.has_rest) { + if (liseq->body->param.flags.has_rest) { ADD_INSN1(args, line, newarray, INT2FIX(1)); ADD_INSN (args, line, concatarray); --argc; } } - else if (liseq->param.flags.has_kwrest) { - ADD_INSN2(args, line, getlocal, INT2FIX(liseq->local_size - liseq->param.keyword->rest_start), INT2FIX(lvar_level)); + else if (liseq->body->param.flags.has_kwrest) { + int idx = liseq->body->local_table_size - liseq->body->param.keyword->rest_start; + ADD_GETLOCAL(args, line, idx, lvar_level); + ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0)); - if (liseq->param.flags.has_rest) { + if (liseq->body->param.flags.has_rest) { ADD_INSN1(args, line, newarray, INT2FIX(1)); ADD_INSN (args, line, concatarray); } @@ -4668,8 +5283,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) /* dummy receiver */ ADD_INSN1(ret, line, putobject, nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue); ADD_SEQ(ret, args); - ADD_INSN1(ret, line, invokesuper, new_callinfo(iseq, 0, argc, parent_block, - flag | VM_CALL_SUPER | VM_CALL_FCALL, keywords)); + ADD_INSN3(ret, line, invokesuper, + new_callinfo(iseq, 0, argc, flag | VM_CALL_SUPER | VM_CALL_FCALL, keywords, parent_block != NULL), + Qnil, /* CALL_CACHE */ + parent_block); if (poped) { ADD_INSN(ret, line, pop); @@ -4714,7 +5331,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; default: - rb_bug("can't make hash with this node: %s", ruby_node_name(type)); + compile_bug(ERROR_ARGS_AT(node->nd_head) "can't make hash with this node: %s", + ruby_node_name(type)); } if (poped) { @@ -4726,13 +5344,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) rb_iseq_t *is = iseq; if (is) { - if (is->type == ISEQ_TYPE_TOP) { - COMPILE_ERROR((ERROR_ARGS "Invalid return")); + if (is->body->type == ISEQ_TYPE_TOP) { + COMPILE_ERROR(ERROR_ARGS "Invalid return"); } else { LABEL *splabel = 0; - if (is->type == ISEQ_TYPE_METHOD) { + if (is->body->type == ISEQ_TYPE_METHOD) { splabel = NEW_LABEL(0); ADD_LABEL(ret, splabel); ADD_ADJUST(ret, line, 0); @@ -4740,7 +5358,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) COMPILE(ret, "return nd_stts (return val)", node->nd_stts); - if (is->type == ISEQ_TYPE_METHOD) { + if (is->body->type == ISEQ_TYPE_METHOD) { add_ensure_iseq(ret, iseq, 1); ADD_TRACE(ret, line, RUBY_EVENT_RETURN); ADD_INSN(ret, line, leave); @@ -4751,7 +5369,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } } else { - ADD_INSN1(ret, line, throw, INT2FIX(0x01) /* TAG_RETURN */ ); + ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN)); if (poped) { ADD_INSN(ret, line, pop); } @@ -4764,11 +5382,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) DECL_ANCHOR(args); VALUE argc; unsigned int flag = 0; - rb_call_info_kw_arg_t *keywords = NULL; + struct rb_call_info_kw_arg *keywords = NULL; INIT_ANCHOR(args); - if (iseq->type == ISEQ_TYPE_TOP) { - COMPILE_ERROR((ERROR_ARGS "Invalid yield")); + if (iseq->body->type == ISEQ_TYPE_TOP) { + COMPILE_ERROR(ERROR_ARGS "Invalid yield"); + debug_node_end(); + return COMPILE_NG; } if (node->nd_head) { @@ -4779,7 +5399,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } ADD_SEQ(ret, args); - ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), 0, flag, keywords)); + ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE)); if (poped) { ADD_INSN(ret, line, pop); @@ -4789,10 +5409,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) case NODE_LVAR:{ if (!poped) { ID id = node->nd_vid; - int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id); + int idx = iseq->body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id); debugs("id: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx); - ADD_INSN2(ret, line, getlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq))); + ADD_GETLOCAL(ret, line, idx, get_lvar_level(iseq)); } break; } @@ -4802,9 +5422,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (!poped) { idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls); if (idx < 0) { - rb_bug("unknown dvar (%"PRIsVALUE")", rb_id2str(node->nd_vid)); + compile_bug(ERROR_ARGS "unknown dvar (%"PRIsVALUE")", + rb_id2str(node->nd_vid)); } - ADD_INSN2(ret, line, getlocal, INT2FIX(ls - idx), INT2FIX(lv)); + ADD_GETLOCAL(ret, line, ls - idx, lv); } break; } @@ -4820,16 +5441,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) debugi("nd_vid", node->nd_vid); if (!poped) { ADD_INSN2(ret, line, getinstancevariable, - ID2SYM(node->nd_vid), INT2FIX(iseq->is_size++)); + ID2SYM(node->nd_vid), + get_ivar_ic_value(iseq,node->nd_vid)); } break; } case NODE_CONST:{ debugi("nd_vid", node->nd_vid); - if (iseq->compile_data->option->inline_const_cache) { + if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { LABEL *lend = NEW_LABEL(line); - int ic_index = iseq->is_size++; + int ic_index = iseq->body->is_size++; ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index)); ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid)); @@ -4895,7 +5517,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; } - if (iseq->compile_data->option->specialized_instruction) { + if (ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) { /* TODO: detect by node */ if (recv->last == recv->anchor.next && INSN_OF(recv->last) == BIN(putobject) && @@ -4907,7 +5529,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) else { ADD_SEQ(ret, recv); ADD_SEQ(ret, val); - ADD_INSN1(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, 0, NULL)); + ADD_INSN2(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, NULL, FALSE), Qnil); } } else { @@ -4916,6 +5538,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_SEND(ret, line, idEqTilde, INT2FIX(1)); } + if (node->nd_args) { + compile_named_capture_assign(iseq, ret, node->nd_args); + } + if (poped) { ADD_INSN(ret, line, pop); } @@ -4929,10 +5555,24 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; } case NODE_STR:{ - node->nd_lit = rb_fstring(node->nd_lit); debugp_param("nd_lit", node->nd_lit); if (!poped) { - ADD_INSN1(ret, line, putstring, node->nd_lit); + node->nd_lit = rb_fstring(node->nd_lit); + if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) { + ADD_INSN1(ret, line, putstring, node->nd_lit); + } + else { + if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) { + VALUE debug_info = rb_ary_new_from_args(2, iseq->body->location.path, INT2FIX(line)); + VALUE str = rb_str_dup(node->nd_lit); + rb_ivar_set(str, id_debug_created_info, rb_obj_freeze(debug_info)); + ADD_INSN1(ret, line, putobject, rb_obj_freeze(str)); + iseq_add_mark_object_compile_time(iseq, str); + } + else { + ADD_INSN1(ret, line, putobject, node->nd_lit); + } + } } break; } @@ -4942,6 +5582,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (poped) { ADD_INSN(ret, line, pop); } + else { + if (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) { + VALUE debug_info = Qnil; + if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) { + debug_info = rb_ary_new_from_args(2, iseq->body->location.path, INT2FIX(line)); + iseq_add_mark_object_compile_time(iseq, rb_obj_freeze(debug_info)); + } + ADD_INSN1(ret, line, freezestring, debug_info); + } + } break; } case NODE_XSTR:{ @@ -4985,10 +5635,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; } case NODE_DREGX_ONCE:{ - int ic_index = iseq->is_size++; + int ic_index = iseq->body->is_size++; NODE *dregx_node = NEW_NODE(NODE_DREGX, node->u1.value, node->u2.value, node->u3.value); NODE *block_node = NEW_NODE(NODE_SCOPE, 0, dregx_node, 0); - VALUE block_iseq = NEW_CHILD_ISEQVAL(block_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); + const rb_iseq_t * block_iseq = NEW_CHILD_ISEQ(block_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); ADD_INSN2(ret, line, once, block_iseq, INT2FIX(ic_index)); @@ -5038,36 +5688,34 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; } case NODE_DEFN:{ - VALUE iseqval = NEW_ISEQVAL(node->nd_defn, - rb_id2str(node->nd_mid), - ISEQ_TYPE_METHOD, line); + const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn, + rb_id2str(node->nd_mid), + ISEQ_TYPE_METHOD, line); - debugp_param("defn/iseq", iseqval); + debugp_param("defn/iseq", rb_iseqw_new(method_iseq)); ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); - ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE)); ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid)); - ADD_INSN1(ret, line, putiseq, iseqval); - ADD_SEND (ret, line, id_core_define_method, INT2FIX(3)); + ADD_INSN1(ret, line, putiseq, method_iseq); + ADD_SEND (ret, line, id_core_define_method, INT2FIX(2)); if (poped) { ADD_INSN(ret, line, pop); } - debugp_param("defn", iseqval); break; } case NODE_DEFS:{ - VALUE iseqval = NEW_ISEQVAL(node->nd_defn, - rb_id2str(node->nd_mid), - ISEQ_TYPE_METHOD, line); + const rb_iseq_t * singleton_method = NEW_ISEQ(node->nd_defn, + rb_id2str(node->nd_mid), + ISEQ_TYPE_METHOD, line); - debugp_param("defs/iseq", iseqval); + debugp_param("defs/iseq", rb_iseqw_new(singleton_method)); ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); COMPILE(ret, "defs: recv", node->nd_recv); ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid)); - ADD_INSN1(ret, line, putiseq, iseqval); + ADD_INSN1(ret, line, putiseq, singleton_method); ADD_SEND (ret, line, id_core_define_singleton_method, INT2FIX(3)); if (poped) { @@ -5110,18 +5758,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; } case NODE_CLASS:{ - VALUE iseqval = - NEW_CHILD_ISEQVAL( - node->nd_body, - rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)), - ISEQ_TYPE_CLASS, line); + const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(node->nd_body, + rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)), + ISEQ_TYPE_CLASS, line); VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath); int flags = VM_DEFINECLASS_TYPE_CLASS; + if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED; if (node->nd_super) flags |= VM_DEFINECLASS_FLAG_HAS_SUPERCLASS; COMPILE(ret, "super", node->nd_super); - ADD_INSN3(ret, line, defineclass, - ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags)); + ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags)); if (poped) { ADD_INSN(ret, line, pop); @@ -5129,17 +5775,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; } case NODE_MODULE:{ - VALUE iseqval = NEW_CHILD_ISEQVAL( - node->nd_body, - rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)), - ISEQ_TYPE_CLASS, line); - + const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(node->nd_body, + rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)), + ISEQ_TYPE_CLASS, line); VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath); int flags = VM_DEFINECLASS_TYPE_MODULE; + if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED; ADD_INSN (ret, line, putnil); /* dummy */ - ADD_INSN3(ret, line, defineclass, - ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags)); + ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags)); + if (poped) { ADD_INSN(ret, line, pop); } @@ -5147,15 +5792,14 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } case NODE_SCLASS:{ ID singletonclass; - VALUE iseqval = - NEW_ISEQVAL(node->nd_body, rb_str_new2("singleton class"), - ISEQ_TYPE_CLASS, line); + const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_str_new2("singleton class"), + ISEQ_TYPE_CLASS, line); COMPILE(ret, "sclass#recv", node->nd_recv); ADD_INSN (ret, line, putnil); CONST_ID(singletonclass, "singletonclass"); ADD_INSN3(ret, line, defineclass, - ID2SYM(singletonclass), iseqval, + ID2SYM(singletonclass), singleton_class, INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS)); if (poped) { @@ -5167,7 +5811,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (rb_is_const_id(node->nd_mid)) { /* constant */ LABEL *lend = NEW_LABEL(line); - int ic_index = iseq->is_size++; + int ic_index = iseq->body->is_size++; DECL_ANCHOR(pref); DECL_ANCHOR(body); @@ -5176,7 +5820,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) INIT_ANCHOR(body); compile_colon2(iseq, node, pref, body); if (LIST_SIZE_ZERO(pref)) { - if (iseq->compile_data->option->inline_const_cache) { + if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index)); } else { @@ -5185,7 +5829,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_SEQ(ret, body); - if (iseq->compile_data->option->inline_const_cache) { + if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index)); ADD_LABEL(ret, lend); } @@ -5208,12 +5852,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } case NODE_COLON3:{ LABEL *lend = NEW_LABEL(line); - int ic_index = iseq->is_size++; + int ic_index = iseq->body->is_size++; debugi("colon3#nd_mid", node->nd_mid); /* add cache insn */ - if (iseq->compile_data->option->inline_const_cache) { + if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index)); ADD_INSN(ret, line, pop); } @@ -5221,7 +5865,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSN1(ret, line, putobject, rb_cObject); ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid)); - if (iseq->compile_data->option->inline_const_cache) { + if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index)); ADD_LABEL(ret, lend); } @@ -5250,11 +5894,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) LABEL *lend = NEW_LABEL(line); LABEL *lfin = NEW_LABEL(line); LABEL *ltrue = NEW_LABEL(line); - rb_iseq_t *local_iseq = iseq->local_iseq; + rb_iseq_t *local_iseq = iseq->body->local_iseq; rb_num_t cnt; VALUE key; - cnt = local_iseq->flip_cnt++ + DEFAULT_SPECIAL_VAR_COUNT; + cnt = ISEQ_FLIP_CNT_INCREMENT(local_iseq) + VM_SVAR_FLIPFLOP_START; key = INT2FIX(cnt); ADD_INSN2(ret, line, getspecial, key, INT2FIX(0)); @@ -5312,21 +5956,21 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) } case NODE_ERRINFO:{ if (!poped) { - if (iseq->type == ISEQ_TYPE_RESCUE) { - ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0)); + if (iseq->body->type == ISEQ_TYPE_RESCUE) { + ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0); } else { - rb_iseq_t *ip = iseq; + const rb_iseq_t *ip = iseq; int level = 0; while (ip) { - if (ip->type == ISEQ_TYPE_RESCUE) { + if (ip->body->type == ISEQ_TYPE_RESCUE) { break; } - ip = ip->parent_iseq; + ip = ip->body->parent_iseq; level++; } if (ip) { - ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(level)); + ADD_GETLOCAL(ret, line, LVAR_ERRINFO, level); } else { ADD_INSN(ret, line, putnil); @@ -5360,10 +6004,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) /* compiled to: * ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } } */ - int is_index = iseq->is_size++; - VALUE once_iseq = NEW_CHILD_ISEQVAL( - NEW_IFUNC(build_postexe_iseq, node->nd_body), - make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); + int is_index = iseq->body->is_size++; + const rb_iseq_t *once_iseq = NEW_CHILD_ISEQ((NODE *)IFUNC_NEW(build_postexe_iseq, node->nd_body, 0), + make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); ADD_INSN2(ret, line, once, once_iseq, INT2FIX(is_index)); @@ -5379,23 +6022,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) if (default_value == (NODE *)-1) { /* required argument. do nothing */ - rb_bug("unreachable"); + compile_bug(ERROR_ARGS "unreachable"); } else if (nd_type(default_value) == NODE_LIT || nd_type(default_value) == NODE_NIL || nd_type(default_value) == NODE_TRUE || nd_type(default_value) == NODE_FALSE) { - rb_bug("unreachable"); + compile_bug(ERROR_ARGS "unreachable"); } else { /* if keywordcheck(_kw_bits, nth_keyword) * kw = default_value * end */ - int kw_bits_idx = iseq->local_size - iseq->param.keyword->bits_start; - int keyword_idx = iseq->param.keyword->num; + int kw_bits_idx = iseq->body->local_table_size - iseq->body->param.keyword->bits_start; + int keyword_idx = iseq->body->param.keyword->num; - ADD_INSN2(ret, line, checkkeyword, INT2FIX(kw_bits_idx), INT2FIX(keyword_idx)); + ADD_INSN2(ret, line, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx)); ADD_INSNL(ret, line, branchif, end_label); COMPILE_POPED(ret, "keyword default argument", node->nd_body); ADD_LABEL(ret, end_label); @@ -5417,17 +6060,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) DECL_ANCHOR(recv); DECL_ANCHOR(args); unsigned int flag = 0; + ID mid = node->nd_mid; + LABEL *lskip = 0; VALUE argc; - int asgnflag; /* optimization shortcut * obj["literal"] = value -> opt_aset_with(obj, "literal", value) */ - if (node->nd_mid == idASET && !private_recv_p(node) && node->nd_args && + if (mid == idASET && !private_recv_p(node) && node->nd_args && nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 2 && nd_type(node->nd_args->nd_head) == NODE_STR && - iseq->compile_data->current_block == Qfalse && - iseq->compile_data->option->specialized_instruction) + ISEQ_COMPILE_DATA(iseq)->current_block == NULL && + ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) { VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit); node->nd_args->nd_head->nd_lit = str; @@ -5438,8 +6082,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSN(ret, line, swap); ADD_INSN1(ret, line, topn, INT2FIX(1)); } - ADD_INSN2(ret, line, opt_aset_with, - new_callinfo(iseq, idASET, 2, 0, 0, NULL), str); + ADD_INSN3(ret, line, opt_aset_with, + new_callinfo(iseq, idASET, 2, 0, NULL, FALSE), + NULL/* CALL_CACHE */, str); ADD_INSN(ret, line, pop); break; } @@ -5448,11 +6093,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) INIT_ANCHOR(args); argc = setup_args(iseq, args, node->nd_args, &flag, NULL); - flag |= (asgnflag = COMPILE_RECV(recv, "recv", node)); + flag |= COMPILE_RECV(recv, "recv", node); debugp_param("argc", argc); - debugp_param("nd_mid", ID2SYM(node->nd_mid)); + debugp_param("nd_mid", ID2SYM(mid)); + if (!rb_is_attrset_id(mid)) { + /* safe nav attr */ + mid = rb_id_attrset(mid); + ADD_INSN(recv, line, dup); + lskip = NEW_LABEL(line); + ADD_INSNL(recv, line, branchnil, lskip); + } if (!poped) { ADD_INSN(ret, line, putnil); ADD_SEQ(ret, recv); @@ -5462,7 +6114,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_INSN1(ret, line, topn, INT2FIX(1)); if (flag & VM_CALL_ARGS_SPLAT) { ADD_INSN1(ret, line, putobject, INT2FIX(-1)); - ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag)); + ADD_SEND(ret, line, idAREF, INT2FIX(1)); } ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3)); ADD_INSN (ret, line, pop); @@ -5470,7 +6122,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) else if (flag & VM_CALL_ARGS_SPLAT) { ADD_INSN(ret, line, dup); ADD_INSN1(ret, line, putobject, INT2FIX(-1)); - ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag)); + ADD_SEND(ret, line, idAREF, INT2FIX(1)); ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2)); ADD_INSN (ret, line, pop); } @@ -5482,20 +6134,29 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) ADD_SEQ(ret, recv); ADD_SEQ(ret, args); } - ADD_SEND_WITH_FLAG(ret, line, node->nd_mid, argc, INT2FIX(flag)); + ADD_SEND_WITH_FLAG(ret, line, mid, argc, INT2FIX(flag)); + if (lskip) ADD_LABEL(ret, lskip); ADD_INSN(ret, line, pop); break; } case NODE_PRELUDE:{ + const rb_compile_option_t *orig_opt = ISEQ_COMPILE_DATA(iseq)->option; + if (node->nd_orig) { + rb_compile_option_t new_opt = *orig_opt; + rb_iseq_make_compile_option(&new_opt, node->nd_orig); + ISEQ_COMPILE_DATA(iseq)->option = &new_opt; + } COMPILE_POPED(ret, "prelude", node->nd_head); COMPILE_(ret, "body", node->nd_body, poped); + ISEQ_COMPILE_DATA(iseq)->option = orig_opt; break; } case NODE_LAMBDA:{ /* compile same as lambda{...} */ - VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); + const rb_iseq_t *block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line); VALUE argc = INT2FIX(0); + ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE)); ADD_CALL_WITH_BLOCK(ret, line, idLambda, argc, block); @@ -5505,7 +6166,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) break; } default: - rb_bug("iseq_compile_each: unknown node: %s", ruby_node_name(type)); + UNKNOWN_NODE("iseq_compile_each", node); return COMPILE_NG; } @@ -5580,7 +6241,7 @@ insn_data_to_s_detail(INSN *iobj) rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j); VALUE val = Qnil; if (0 && iseq) { /* TODO: invalidate now */ - val = iseq->self; + val = (VALUE)iseq; } rb_str_concat(str, opobj_inspect(val)); } @@ -5608,13 +6269,17 @@ insn_data_to_s_detail(INSN *iobj) break; case TS_CALLINFO: /* call info */ { - rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, j); + struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, j); rb_str_cat2(str, "<callinfo:"); - if (ci->mid) - rb_str_catf(str, "%"PRIsVALUE, rb_id2str(ci->mid)); + if (ci->mid) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(ci->mid)); rb_str_catf(str, ", %d>", ci->orig_argc); break; } + case TS_CALLCACHE: /* call cache */ + { + rb_str_catf(str, "<call cache>"); + break; + } case TS_CDHASH: /* case/when condition cache */ rb_str_cat2(str, "<ch>"); break; @@ -5659,7 +6324,7 @@ dump_disasm_list(struct iseq_link_element *link) { iobj = (INSN *)link; str = insn_data_to_s_detail(iobj); - printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str), iobj->line_no); + printf("%04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->line_no); pos += insn_data_length(iobj); break; } @@ -5687,6 +6352,7 @@ dump_disasm_list(struct iseq_link_element *link) link = link->next; } printf("---------------------\n"); + fflush(stdout); } const char * @@ -5720,6 +6386,7 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj) else { label = (LABEL *)tmp; } + LABEL_REF(label); return label; } @@ -5728,7 +6395,6 @@ get_exception_sym2type(VALUE sym) { #undef rb_intern #define rb_intern(str) rb_intern_const(str) - VALUE sym_inspect; static VALUE symRescue, symEnsure, symRetry; static VALUE symBreak, symRedo, symNext; @@ -5747,9 +6413,7 @@ get_exception_sym2type(VALUE sym) if (sym == symBreak) return CATCH_TYPE_BREAK; if (sym == symRedo) return CATCH_TYPE_REDO; if (sym == symNext) return CATCH_TYPE_NEXT; - sym_inspect = rb_inspect(sym); - rb_raise(rb_eSyntaxError, "invalid exception symbol: %s", - StringValuePtr(sym_inspect)); + rb_raise(rb_eSyntaxError, "invalid exception symbol: %+"PRIsVALUE, sym); return 0; } @@ -5760,7 +6424,8 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table, int i; for (i=0; i<RARRAY_LEN(exception); i++) { - VALUE v, type, eiseqval; + const rb_iseq_t *eiseq; + VALUE v, type; const VALUE *ptr; LABEL *lstart, *lend, *lcont; unsigned int sp; @@ -5773,10 +6438,10 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table, ptr = RARRAY_CONST_PTR(v); type = get_exception_sym2type(ptr[0]); if (ptr[1] == Qnil) { - eiseqval = 0; + eiseq = NULL; } else { - eiseqval = rb_iseq_load(ptr[1], iseq->self, Qnil); + eiseq = rb_iseqw_to_iseq(rb_iseq_load(ptr[1], (VALUE)iseq, Qnil)); } lstart = register_label(iseq, labels_table, ptr[2]); @@ -5786,7 +6451,7 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table, (void)sp; - ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont); + ADD_CATCH_ENTRY(type, lstart, lend, eiseq, lcont); RB_GC_GUARD(v); } @@ -5807,21 +6472,25 @@ insn_make_insn_table(void) return table; } -static VALUE -iseq_build_load_iseq(rb_iseq_t *iseq, VALUE op) +static const rb_iseq_t * +iseq_build_load_iseq(const rb_iseq_t *iseq, VALUE op) { - VALUE iseqval; + VALUE iseqw; + const rb_iseq_t *loaded_iseq; + if (RB_TYPE_P(op, T_ARRAY)) { - iseqval = rb_iseq_load(op, iseq->self, Qnil); + iseqw = rb_iseq_load(op, (VALUE)iseq, Qnil); } else if (CLASS_OF(op) == rb_cISeq) { - iseqval = op; + iseqw = op; } else { rb_raise(rb_eSyntaxError, "ISEQ is required"); } - iseq_add_mark_object(iseq, iseqval); - return iseqval; + + loaded_iseq = rb_iseqw_to_iseq(iseqw); + iseq_add_mark_object(iseq, (VALUE)loaded_iseq); + return loaded_iseq; } static VALUE @@ -5829,26 +6498,23 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op) { ID mid = 0; int orig_argc = 0; - VALUE block = 0; unsigned int flag = 0; - rb_call_info_kw_arg_t *kw_arg = 0; + struct rb_call_info_kw_arg *kw_arg = 0; if (!NIL_P(op)) { VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid"))); VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag"))); VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc"))); - VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("blockptr"))); VALUE vkw_arg = rb_hash_aref(op, ID2SYM(rb_intern("kw_arg"))); if (!NIL_P(vmid)) mid = SYM2ID(vmid); if (!NIL_P(vflag)) flag = NUM2UINT(vflag); if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc); - if (!NIL_P(vblock)) block = iseq_build_load_iseq(iseq, vblock); if (!NIL_P(vkw_arg)) { int i; int len = RARRAY_LENINT(vkw_arg); - size_t n = sizeof(rb_call_info_kw_arg_t) + sizeof(VALUE) * (len - 1); + size_t n = rb_call_info_kw_arg_bytes(len); kw_arg = xmalloc(n); kw_arg->keyword_len = len; @@ -5860,17 +6526,20 @@ iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op) } } - return (VALUE)new_callinfo(iseq, mid, orig_argc, block, flag, kw_arg); + return (VALUE)new_callinfo(iseq, mid, orig_argc, flag, kw_arg, (flag & VM_CALL_ARGS_SIMPLE) == 0); } + static int iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, - VALUE body, struct st_table *labels_table) + VALUE body, VALUE labels_wrapper) { /* TODO: body should be frozen */ const VALUE *ptr = RARRAY_CONST_PTR(body); long i, len = RARRAY_LEN(body); + struct st_table *labels_table = DATA_PTR(labels_wrapper); int j; int line_no = 0; + int ret = COMPILE_OK; /* * index -> LABEL *label @@ -5900,14 +6569,17 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, insn = (argc < 0) ? Qnil : RARRAY_AREF(obj, 0); if (st_lookup(insn_table, (st_data_t)insn, &insn_id) == 0) { /* TODO: exception */ - rb_compile_error(RSTRING_PTR(iseq->location.path), line_no, - "unknown instruction: %"PRIsVALUE, - rb_inspect(insn)); + COMPILE_ERROR(iseq, line_no, + "unknown instruction: %+"PRIsVALUE, insn); + ret = COMPILE_NG; + break; } if (argc != insn_len((VALUE)insn_id)-1) { - rb_compile_error(RSTRING_PTR(iseq->location.path), line_no, - "operand size mismatch"); + COMPILE_ERROR(iseq, line_no, + "operand size mismatch"); + ret = COMPILE_NG; + break; } if (argc > 0) { @@ -5932,7 +6604,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, case TS_ISEQ: { if (op != Qnil) { - argv[j] = iseq_build_load_iseq(iseq, op); + argv[j] = (VALUE)iseq_build_load_iseq(iseq, op); } else { argv[j] = 0; @@ -5945,13 +6617,16 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, break; case TS_IC: argv[j] = op; - if (NUM2INT(op) >= iseq->is_size) { - iseq->is_size = NUM2INT(op) + 1; + if (NUM2UINT(op) >= iseq->body->is_size) { + iseq->body->is_size = NUM2INT(op) + 1; } break; case TS_CALLINFO: argv[j] = iseq_build_callinfo_from_hash(iseq, op); break; + case TS_CALLCACHE: + argv[j] = Qfalse; + break; case TS_ID: argv[j] = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym"); @@ -5963,7 +6638,6 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, rb_hash_tbl_raw(map)->type = &cdhash_type; op = rb_convert_type(op, T_ARRAY, "Array", "to_ary"); - op = rb_ary_dup(op); for (i=0; i<RARRAY_LEN(op); i+=2) { VALUE key = RARRAY_AREF(op, i); VALUE sym = RARRAY_AREF(op, i+1); @@ -5973,7 +6647,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, } RB_GC_GUARD(op); argv[j] = map; - iseq_add_mark_object_compile_time(iseq, map); + rb_iseq_add_mark_object(iseq, map); } break; case TS_FUNCPTR: @@ -5999,10 +6673,10 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor, rb_raise(rb_eTypeError, "unexpected object for instruction"); } } + DATA_PTR(labels_wrapper) = 0; validate_labels(iseq, labels_table); - st_free_table(labels_table); - iseq_setup(iseq, anchor); - return COMPILE_OK; + if (!ret) return ret; + return iseq_setup(iseq, anchor); } #define CHECK_ARRAY(v) rb_convert_type((v), T_ARRAY, "Array", "to_ary") @@ -6025,22 +6699,24 @@ int_param(int *dst, VALUE param, VALUE sym) return FALSE; } -static void +static const struct rb_iseq_param_keyword * iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords) { int i, j; int len = RARRAY_LENINT(keywords); int default_len; VALUE key, sym, default_val; + VALUE *dvs; + ID *ids; + struct rb_iseq_param_keyword *keyword = ZALLOC(struct rb_iseq_param_keyword); - iseq->param.flags.has_kw = TRUE; + iseq->body->param.flags.has_kw = TRUE; - iseq->param.keyword = ZALLOC(struct rb_iseq_param_keyword); - iseq->param.keyword->num = len; + keyword->num = len; #define SYM(s) ID2SYM(rb_intern(#s)) - (void)int_param(&iseq->param.keyword->bits_start, params, SYM(kwbits)); - i = iseq->param.keyword->bits_start - iseq->param.keyword->num; - iseq->param.keyword->table = &iseq->local_table[i]; + (void)int_param(&keyword->bits_start, params, SYM(kwbits)); + i = keyword->bits_start - keyword->num; + ids = (VALUE *)&iseq->body->local_table[i]; #undef SYM /* required args */ @@ -6050,17 +6726,17 @@ iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords) if (!SYMBOL_P(val)) { goto default_values; } - iseq->param.keyword->table[i] = SYM2ID(val); - iseq->param.keyword->required_num++; + ids[i] = SYM2ID(val); + keyword->required_num++; } -default_values: /* note: we intentionally preserve `i' from previous loop */ + default_values: /* note: we intentionally preserve `i' from previous loop */ default_len = len - i; if (default_len == 0) { - return; + return keyword; } - iseq->param.keyword->default_values = ALLOC_N(VALUE, default_len); + dvs = ALLOC_N(VALUE, default_len); for (j = 0; i < len; i++, j++) { key = RARRAY_AREF(keywords, i); @@ -6076,16 +6752,19 @@ default_values: /* note: we intentionally preserve `i' from previous loop */ default_val = RARRAY_AREF(key, 1); break; default: - rb_raise(rb_eTypeError, - "keyword default has unsupported len %+"PRIsVALUE, - key); + rb_raise(rb_eTypeError, "keyword default has unsupported len %+"PRIsVALUE, key); } - iseq->param.keyword->table[i] = SYM2ID(sym); - iseq->param.keyword->default_values[j] = default_val; + ids[i] = SYM2ID(sym); + dvs[j] = default_val; } + + keyword->table = ids; + keyword->default_values = dvs; + + return keyword; } -VALUE +void rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params, VALUE exception, VALUE body) { @@ -6093,6 +6772,7 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params, int i, len; ID *tbl; struct st_table *labels_table = st_init_numtable(); + VALUE labels_wrapper = Data_Wrap_Struct(0, 0, st_free_table, labels_table); VALUE arg_opt_labels = rb_hash_aref(params, SYM(opt)); VALUE keywords = rb_hash_aref(params, SYM(keyword)); VALUE sym_arg_rest = ID2SYM(rb_intern("#arg_rest")); @@ -6100,9 +6780,8 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params, INIT_ANCHOR(anchor); len = RARRAY_LENINT(locals); - iseq->local_table_size = len; - iseq->local_table = tbl = (ID *)ALLOC_N(ID, iseq->local_table_size); - iseq->local_size = iseq->local_table_size + 1; + iseq->body->local_table_size = len; + iseq->body->local_table = tbl = len > 0 ? (ID *)ALLOC_N(ID, iseq->body->local_table_size) : NULL; for (i = 0; i < len; i++) { VALUE lv = RARRAY_AREF(locals, i); @@ -6120,31 +6799,32 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params, * local_size, stack_size and param.size are all calculated */ -#define INT_PARAM(F) int_param(&iseq->param.F, params, SYM(F)) +#define INT_PARAM(F) int_param(&iseq->body->param.F, params, SYM(F)) if (INT_PARAM(lead_num)) { - iseq->param.flags.has_lead = TRUE; + iseq->body->param.flags.has_lead = TRUE; } - if (INT_PARAM(post_num)) iseq->param.flags.has_post = TRUE; - if (INT_PARAM(post_start)) iseq->param.flags.has_post = TRUE; - if (INT_PARAM(rest_start)) iseq->param.flags.has_rest = TRUE; - if (INT_PARAM(block_start)) iseq->param.flags.has_block = TRUE; + if (INT_PARAM(post_num)) iseq->body->param.flags.has_post = TRUE; + if (INT_PARAM(post_start)) iseq->body->param.flags.has_post = TRUE; + if (INT_PARAM(rest_start)) iseq->body->param.flags.has_rest = TRUE; + if (INT_PARAM(block_start)) iseq->body->param.flags.has_block = TRUE; #undef INT_PARAM switch (TYPE(arg_opt_labels)) { case T_ARRAY: len = RARRAY_LENINT(arg_opt_labels); - iseq->param.flags.has_opt = !!(len - 1 >= 0); + iseq->body->param.flags.has_opt = !!(len - 1 >= 0); - if (iseq->param.flags.has_opt) { - iseq->param.opt_num = len - 1; - iseq->param.opt_table = (VALUE *)ALLOC_N(VALUE, len); + if (iseq->body->param.flags.has_opt) { + VALUE *opt_table = ALLOC_N(VALUE, len); for (i = 0; i < len; i++) { VALUE ent = RARRAY_AREF(arg_opt_labels, i); LABEL *label = register_label(iseq, labels_table, ent); - - iseq->param.opt_table[i] = (VALUE)label; + opt_table[i] = (VALUE)label; } + + iseq->body->param.opt_num = len - 1; + iseq->body->param.opt_table = opt_table; } case T_NIL: break; @@ -6155,7 +6835,7 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params, switch (TYPE(keywords)) { case T_ARRAY: - iseq_build_kw(iseq, params, keywords); + iseq->body->param.keyword = iseq_build_kw(iseq, params, keywords); case T_NIL: break; default: @@ -6164,16 +6844,16 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params, } if (Qtrue == rb_hash_aref(params, SYM(ambiguous_param0))) { - iseq->param.flags.ambiguous_param0 = TRUE; + iseq->body->param.flags.ambiguous_param0 = TRUE; } if (int_param(&i, params, SYM(kwrest))) { - if (!iseq->param.keyword) { - iseq->param.keyword = ZALLOC(struct rb_iseq_param_keyword); - } - iseq->param.keyword->rest_start = i; - iseq->param.flags.has_kwrest = TRUE; - + struct rb_iseq_param_keyword *keyword = (struct rb_iseq_param_keyword *)iseq->body->param.keyword; + if (keyword == NULL) { + iseq->body->param.keyword = keyword = ZALLOC(struct rb_iseq_param_keyword); + } + keyword->rest_start = i; + iseq->body->param.flags.has_kwrest = TRUE; } #undef SYM iseq_calc_param_size(iseq); @@ -6182,49 +6862,47 @@ rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params, iseq_build_from_ary_exception(iseq, labels_table, exception); /* body */ - iseq_build_from_ary_body(iseq, anchor, body, labels_table); - return iseq->self; + iseq_build_from_ary_body(iseq, anchor, body, labels_wrapper); } /* for parser */ int -rb_dvar_defined(ID id) +rb_dvar_defined(ID id, const struct rb_block *base_block) { - rb_thread_t *th = GET_THREAD(); - rb_iseq_t *iseq; - if (th->base_block && (iseq = th->base_block->iseq)) { - while (iseq->type == ISEQ_TYPE_BLOCK || - iseq->type == ISEQ_TYPE_RESCUE || - iseq->type == ISEQ_TYPE_ENSURE || - iseq->type == ISEQ_TYPE_EVAL || - iseq->type == ISEQ_TYPE_MAIN + const rb_iseq_t *iseq; + + if (base_block && (iseq = vm_block_iseq(base_block)) != NULL) { + while (iseq->body->type == ISEQ_TYPE_BLOCK || + iseq->body->type == ISEQ_TYPE_RESCUE || + iseq->body->type == ISEQ_TYPE_ENSURE || + iseq->body->type == ISEQ_TYPE_EVAL || + iseq->body->type == ISEQ_TYPE_MAIN ) { - int i; + unsigned int i; - for (i = 0; i < iseq->local_table_size; i++) { - if (iseq->local_table[i] == id) { + for (i = 0; i < iseq->body->local_table_size; i++) { + if (iseq->body->local_table[i] == id) { return 1; } } - iseq = iseq->parent_iseq; + iseq = iseq->body->parent_iseq; } } return 0; } int -rb_local_defined(ID id) +rb_local_defined(ID id, const struct rb_block *base_block) { - rb_thread_t *th = GET_THREAD(); - rb_iseq_t *iseq; + const rb_iseq_t *iseq; - if (th->base_block && th->base_block->iseq) { - int i; - iseq = th->base_block->iseq->local_iseq; + if (base_block && (iseq = vm_block_iseq(base_block)) != NULL) { + unsigned int i; + iseq = iseq->body->local_iseq; - for (i=0; i<iseq->local_table_size; i++) { - if (iseq->local_table[i] == id) { + for (i=0; i<iseq->body->local_table_size; i++) { + if (iseq->body->local_table[i] == id) { return 1; } } @@ -6232,18 +6910,6 @@ rb_local_defined(ID id) return 0; } -int -rb_parse_in_eval(void) -{ - return GET_THREAD()->parse_in_eval > 0; -} - -int -rb_parse_in_main(void) -{ - return GET_THREAD()->parse_in_eval < 0; -} - static int caller_location(VALUE *path, VALUE *absolute_path) { @@ -6253,12 +6919,12 @@ caller_location(VALUE *path, VALUE *absolute_path) if (cfp) { int line = rb_vm_get_sourceline(cfp); - *path = cfp->iseq->location.path; - *absolute_path = cfp->iseq->location.absolute_path; + *path = cfp->iseq->body->location.path; + *absolute_path = cfp->iseq->body->location.absolute_path; return line; } else { - *path = rb_str_new2("<compiled>"); + *path = rb_fstring_cstr("<compiled>"); *absolute_path = *path; return 1; } @@ -6270,7 +6936,7 @@ typedef struct { int line; } accessor_args; -static VALUE +static const rb_iseq_t * method_for_self(VALUE name, VALUE arg, rb_insn_func_t func, VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *, VALUE)) { @@ -6280,7 +6946,7 @@ method_for_self(VALUE name, VALUE arg, rb_insn_func_t func, acc.arg = arg; acc.func = func; acc.line = caller_location(&path, &absolute_path); - return rb_iseq_new_with_opt(NEW_IFUNC(build, (VALUE)&acc), + return rb_iseq_new_with_opt((NODE *)IFUNC_NEW(build, (VALUE)&acc, 0), rb_sym2str(name), path, absolute_path, INT2FIX(acc.line), 0, ISEQ_TYPE_METHOD, 0); } @@ -6292,8 +6958,8 @@ for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE a) const int line = args->line; iseq_set_local_table(iseq, 0); - iseq->param.lead_num = 0; - iseq->param.size = 0; + iseq->body->param.lead_num = 0; + iseq->body->param.size = 0; ADD_INSN1(ret, line, putobject, args->arg); ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func); @@ -6308,10 +6974,10 @@ for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE a) static const ID vars[] = {1, idUScore}; iseq_set_local_table(iseq, vars); - iseq->param.lead_num = 1; - iseq->param.size = 1; + iseq->body->param.lead_num = 1; + iseq->body->param.size = 1; - ADD_INSN2(ret, line, getlocal, INT2FIX(numberof(vars)-0), INT2FIX(0)); + ADD_GETLOCAL(ret, line, numberof(vars)-1, 0); ADD_INSN1(ret, line, putobject, args->arg); ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func); ADD_INSN(ret, line, pop); @@ -6321,7 +6987,7 @@ for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE a) /* * func (index) -> (value) */ -VALUE +const rb_iseq_t * rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func) { return method_for_self(name, arg, func, for_self_aref); @@ -6330,8 +6996,1506 @@ rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func) /* * func (index, value) -> (index, value) */ -VALUE +const rb_iseq_t * rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func) { return method_for_self(name, arg, func, for_self_aset); } + +/* ISeq binary format */ + +typedef unsigned int ibf_offset_t; +#define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr)) + +struct ibf_header { + char magic[4]; /* YARB */ + unsigned int major_version; + unsigned int minor_version; + unsigned int size; + unsigned int extra_size; + + unsigned int iseq_list_size; + unsigned int id_list_size; + unsigned int object_list_size; + + ibf_offset_t iseq_list_offset; + ibf_offset_t id_list_offset; + ibf_offset_t object_list_offset; +}; + +struct ibf_id_entry { + enum { + ibf_id_enc_ascii, + ibf_id_enc_utf8, + ibf_id_enc_other + } enc : 2; + char body[1]; +}; + +struct ibf_dump { + VALUE str; + VALUE iseq_list; /* [iseq0 offset, ...] */ + VALUE obj_list; /* [objs] */ + st_table *iseq_table; /* iseq -> iseq number */ + st_table *id_table; /* id -> id number */ +}; + +rb_iseq_t * iseq_alloc(void); + +struct ibf_load { + const char *buff; + const struct ibf_header *header; + ID *id_list; /* [id0, ...] */ + VALUE iseq_list; /* [iseq0, ...] */ + VALUE obj_list; /* [obj0, ...] */ + VALUE loader_obj; + VALUE str; + rb_iseq_t *iseq; +}; + +static ibf_offset_t +ibf_dump_pos(struct ibf_dump *dump) +{ + return (unsigned int)rb_str_strlen(dump->str); +} + +static ibf_offset_t +ibf_dump_write(struct ibf_dump *dump, const void *buff, unsigned long size) +{ + ibf_offset_t pos = ibf_dump_pos(dump); + rb_str_cat(dump->str, (const char *)buff, size); + /* TODO: overflow check */ + return pos; +} + +static void +ibf_dump_overwrite(struct ibf_dump *dump, void *buff, unsigned int size, long offset) +{ + VALUE str = dump->str; + char *ptr = RSTRING_PTR(str); + if ((unsigned long)(size + offset) > (unsigned long)RSTRING_LEN(str)) + rb_bug("ibf_dump_overwrite: overflow"); + memcpy(ptr + offset, buff, size); +} + +static void * +ibf_load_alloc(const struct ibf_load *load, ibf_offset_t offset, int size) +{ + void *buff = ruby_xmalloc(size); + memcpy(buff, load->buff + offset, size); + return buff; +} + +#define IBF_W(b, type, n) (type *)(VALUE)ibf_dump_write(dump, (b), sizeof(type) * (n)) +#define IBF_WV(variable) ibf_dump_write(dump, &(variable), sizeof(variable)) +#define IBF_WP(b, type, n) ibf_dump_write(dump, (b), sizeof(type) * (n)) +#define IBF_R(val, type, n) (type *)ibf_load_alloc(load, IBF_OFFSET(val), sizeof(type) * (n)) + +static int +ibf_table_lookup(struct st_table *table, st_data_t key) +{ + st_data_t val; + + if (st_lookup(table, key, &val)) { + return (int)val; + } + else { + return -1; + } +} + +static int +ibf_table_index(struct st_table *table, st_data_t key) +{ + int index = ibf_table_lookup(table, key); + + if (index < 0) { /* not found */ + index = (int)table->num_entries; + st_insert(table, key, (st_data_t)index); + } + + return index; +} + +/* dump/load generic */ + +static VALUE ibf_load_object(const struct ibf_load *load, VALUE object_index); +static rb_iseq_t *ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq); + +static VALUE +ibf_dump_object(struct ibf_dump *dump, VALUE obj) +{ + long index = RARRAY_LEN(dump->obj_list); + long i; + for (i=0; i<index; i++) { + if (RARRAY_AREF(dump->obj_list, i) == obj) return (VALUE)i; /* dedup */ + } + rb_ary_push(dump->obj_list, obj); + return (VALUE)index; +} + +static VALUE +ibf_dump_id(struct ibf_dump *dump, ID id) +{ + return (VALUE)ibf_table_index(dump->id_table, (st_data_t)id); +} + +static ID +ibf_load_id(const struct ibf_load *load, const ID id_index) +{ + ID id; + + if (id_index == 0) { + id = 0; + } + else { + id = load->id_list[(long)id_index]; + + if (id == 0) { + long *indices = (long *)(load->buff + load->header->id_list_offset); + VALUE str = ibf_load_object(load, indices[id_index]); + id = NIL_P(str) ? 0 : rb_intern_str(str); /* str == nil -> internal junk id */ + load->id_list[(long)id_index] = id; + } + } + + return id; +} + +/* dump/load: code */ + +static VALUE +ibf_dump_callinfo(struct ibf_dump *dump, const struct rb_call_info *ci) +{ + return (ci->flag & VM_CALL_KWARG) ? Qtrue : Qfalse; +} + +static ibf_offset_t ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq); + +static rb_iseq_t * +ibf_dump_iseq(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + if (iseq == NULL) { + return (rb_iseq_t *)-1; + } + else { + int iseq_index = ibf_table_lookup(dump->iseq_table, (st_data_t)iseq); + if (iseq_index < 0) { + iseq_index = ibf_table_index(dump->iseq_table, (st_data_t)iseq); + rb_ary_store(dump->iseq_list, iseq_index, LONG2NUM(ibf_dump_iseq_each(dump, rb_iseq_check(iseq)))); + } + return (rb_iseq_t *)(VALUE)iseq_index; + } +} + +static VALUE +ibf_dump_gentry(struct ibf_dump *dump, const struct rb_global_entry *entry) +{ + return (VALUE)ibf_dump_id(dump, entry->id); +} + +static VALUE +ibf_load_gentry(const struct ibf_load *load, const struct rb_global_entry *entry) +{ + ID gid = ibf_load_id(load, (ID)(VALUE)entry); + return (VALUE)rb_global_entry(gid); +} + +static VALUE * +ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + const int iseq_size = iseq->body->iseq_size; + int code_index; + VALUE *code; + const VALUE *orig_code = rb_iseq_original_iseq(iseq); + + code = ALLOCA_N(VALUE, iseq_size); + + for (code_index=0; code_index<iseq_size;) { + const VALUE insn = orig_code[code_index]; + const char *types = insn_op_types(insn); + int op_index; + + code[code_index++] = (VALUE)insn; + + for (op_index=0; types[op_index]; op_index++, code_index++) { + VALUE op = orig_code[code_index]; + switch (types[op_index]) { + case TS_CDHASH: + case TS_VALUE: + code[code_index] = ibf_dump_object(dump, op); + break; + case TS_ISEQ: + code[code_index] = (VALUE)ibf_dump_iseq(dump, (const rb_iseq_t *)op); + break; + case TS_IC: + { + unsigned int i; + for (i=0; i<iseq->body->is_size; i++) { + if (op == (VALUE)&iseq->body->is_entries[i]) { + break; + } + } + code[code_index] = i; + } + break; + case TS_CALLINFO: + code[code_index] = ibf_dump_callinfo(dump, (const struct rb_call_info *)op); + break; + case TS_CALLCACHE: + code[code_index] = 0; + break; + case TS_ID: + code[code_index] = ibf_dump_id(dump, (ID)op); + break; + case TS_GENTRY: + code[code_index] = ibf_dump_gentry(dump, (const struct rb_global_entry *)op); + break; + case TS_FUNCPTR: + rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported"); + break; + default: + code[code_index] = op; + break; + } + } + assert(insn_len(insn) == op_index+1); + } + + return IBF_W(code, VALUE, iseq_size); +} + +static VALUE * +ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, const struct rb_iseq_constant_body *body) +{ + const int iseq_size = body->iseq_size; + int code_index; + VALUE *code = IBF_R(body->iseq_encoded, VALUE, iseq_size); + + struct rb_call_info *ci_entries = iseq->body->ci_entries; + struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&iseq->body->ci_entries[iseq->body->ci_size]; + struct rb_call_cache *cc_entries = iseq->body->cc_entries; + union iseq_inline_storage_entry *is_entries = iseq->body->is_entries; + + for (code_index=0; code_index<iseq_size;) { + const VALUE insn = code[code_index++]; + const char *types = insn_op_types(insn); + int op_index; + + for (op_index=0; types[op_index]; op_index++, code_index++) { + VALUE op = code[code_index]; + + switch (types[op_index]) { + case TS_CDHASH: + case TS_VALUE: + code[code_index] = ibf_load_object(load, op); + break; + case TS_ISEQ: + code[code_index] = (VALUE)ibf_load_iseq(load, (const rb_iseq_t *)op); + break; + case TS_IC: + code[code_index] = (VALUE)&is_entries[(int)op]; + break; + case TS_CALLINFO: + code[code_index] = op ? (VALUE)ci_kw_entries++ : (VALUE)ci_entries++; /* op is Qtrue (kw) or Qfalse (!kw) */ + break; + case TS_CALLCACHE: + code[code_index] = (VALUE)cc_entries++; + break; + case TS_ID: + code[code_index] = ibf_load_id(load, (ID)op); + break; + case TS_GENTRY: + code[code_index] = ibf_load_gentry(load, (const struct rb_global_entry *)op); + break; + case TS_FUNCPTR: + rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported"); + break; + default: + /* code[code_index] = op; */ + break; + } + } + assert(insn_len(insn) == op_index+1); + }; + + + return code; +} + +static VALUE * +ibf_dump_param_opt_table(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + int opt_num = iseq->body->param.opt_num; + + if (opt_num > 0) { + return IBF_W(iseq->body->param.opt_table, VALUE, opt_num + 1); + } + else { + return NULL; + } +} + +static VALUE * +ibf_load_param_opt_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body) +{ + int opt_num = body->param.opt_num; + + if (opt_num > 0) { + ibf_offset_t offset = IBF_OFFSET(body->param.opt_table); + VALUE *table = ALLOC_N(VALUE, opt_num+1); + MEMCPY(table, load->buff + offset, VALUE, opt_num+1); + return table; + } + else { + return NULL; + } +} + +static struct rb_iseq_param_keyword * +ibf_dump_param_keyword(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + const struct rb_iseq_param_keyword *kw = iseq->body->param.keyword; + + if (kw) { + struct rb_iseq_param_keyword dump_kw = *kw; + int dv_num = kw->num - kw->required_num; + ID *ids = kw->num > 0 ? ALLOCA_N(ID, kw->num) : NULL; + VALUE *dvs = dv_num > 0 ? ALLOCA_N(VALUE, dv_num) : NULL; + int i; + + for (i=0; i<kw->num; i++) ids[i] = (ID)ibf_dump_id(dump, kw->table[i]); + for (i=0; i<dv_num; i++) dvs[i] = (VALUE)ibf_dump_object(dump, kw->default_values[i]); + + dump_kw.table = IBF_W(ids, ID, kw->num); + dump_kw.default_values = IBF_W(dvs, VALUE, dv_num); + return IBF_W(&dump_kw, struct rb_iseq_param_keyword, 1); + } + else { + return NULL; + } +} + +static const struct rb_iseq_param_keyword * +ibf_load_param_keyword(const struct ibf_load *load, const struct rb_iseq_constant_body *body) +{ + if (body->param.keyword) { + struct rb_iseq_param_keyword *kw = IBF_R(body->param.keyword, struct rb_iseq_param_keyword, 1); + ID *ids = IBF_R(kw->table, ID, kw->num); + int dv_num = kw->num - kw->required_num; + VALUE *dvs = IBF_R(kw->default_values, VALUE, dv_num); + int i; + + for (i=0; i<kw->num; i++) { + ids[i] = ibf_load_id(load, ids[i]); + } + for (i=0; i<dv_num; i++) { + dvs[i] = ibf_load_object(load, dvs[i]); + } + + kw->table = ids; + kw->default_values = dvs; + return kw; + } + else { + return NULL; + } +} + +static struct iseq_line_info_entry * +ibf_dump_line_info_table(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + return IBF_W(iseq->body->line_info_table, struct iseq_line_info_entry, iseq->body->line_info_size); +} + +static struct iseq_line_info_entry * +ibf_load_line_info_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body) +{ + return IBF_R(body->line_info_table, struct iseq_line_info_entry, body->line_info_size); +} + +static ID * +ibf_dump_local_table(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + const int size = iseq->body->local_table_size; + ID *table = ALLOCA_N(ID, size); + int i; + + for (i=0; i<size; i++) { + table[i] = ibf_dump_id(dump, iseq->body->local_table[i]); + } + + return IBF_W(table, ID, size); +} + +static ID * +ibf_load_local_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body) +{ + const int size = body->local_table_size; + + if (size > 0) { + ID *table = IBF_R(body->local_table, ID, size); + int i; + + for (i=0; i<size; i++) { + table[i] = ibf_load_id(load, table[i]); + } + return table; + } + else { + return NULL; + } +} + +static struct iseq_catch_table * +ibf_dump_catch_table(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + const struct iseq_catch_table *table = iseq->body->catch_table; + + if (table) { + int byte_size = iseq_catch_table_bytes(iseq->body->catch_table->size); + struct iseq_catch_table *dump_table = (struct iseq_catch_table *)ALLOCA_N(char, byte_size); + unsigned int i; + dump_table->size = table->size; + for (i=0; i<table->size; i++) { + dump_table->entries[i] = table->entries[i]; + dump_table->entries[i].iseq = ibf_dump_iseq(dump, table->entries[i].iseq); + } + return (struct iseq_catch_table *)(VALUE)ibf_dump_write(dump, dump_table, byte_size); + } + else { + return NULL; + } +} + +static struct iseq_catch_table * +ibf_load_catch_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body) +{ + if (body->catch_table) { + struct iseq_catch_table *table; + unsigned int i; + unsigned int size; + size = *(unsigned int *)(load->buff + IBF_OFFSET(body->catch_table)); + table = ibf_load_alloc(load, IBF_OFFSET(body->catch_table), iseq_catch_table_bytes(size)); + for (i=0; i<size; i++) { + table->entries[i].iseq = ibf_load_iseq(load, table->entries[i].iseq); + } + return table; + } + else { + return NULL; + } +} + +static struct rb_call_info * +ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + const unsigned int ci_size = iseq->body->ci_size; + const unsigned int ci_kw_size = iseq->body->ci_kw_size; + const struct rb_call_info *ci_entries = iseq->body->ci_entries; + struct rb_call_info *dump_ci_entries; + struct rb_call_info_with_kwarg *dump_ci_kw_entries; + int byte_size = ci_size * sizeof(struct rb_call_info) + + ci_kw_size * sizeof(struct rb_call_info_with_kwarg); + unsigned int i; + + dump_ci_entries = (struct rb_call_info *)ALLOCA_N(char, byte_size); + dump_ci_kw_entries = (struct rb_call_info_with_kwarg *)&dump_ci_entries[ci_size]; + memcpy(dump_ci_entries, ci_entries, byte_size); + + for (i=0; i<ci_size; i++) { /* conver ID for each ci */ + dump_ci_entries[i].mid = ibf_dump_id(dump, dump_ci_entries[i].mid); + } + for (i=0; i<ci_kw_size; i++) { + const struct rb_call_info_kw_arg *kw_arg = dump_ci_kw_entries[i].kw_arg; + int j; + VALUE *keywords = ALLOCA_N(VALUE, kw_arg->keyword_len); + for (j=0; j<kw_arg->keyword_len; j++) { + keywords[j] = (VALUE)ibf_dump_object(dump, kw_arg->keywords[j]); /* kw_arg->keywords[n] is Symbol */ + } + dump_ci_kw_entries[i].kw_arg = (struct rb_call_info_kw_arg *)(VALUE)ibf_dump_write(dump, &kw_arg->keyword_len, sizeof(int)); + ibf_dump_write(dump, keywords, sizeof(VALUE) * kw_arg->keyword_len); + + dump_ci_kw_entries[i].ci.mid = ibf_dump_id(dump, dump_ci_kw_entries[i].ci.mid); + } + return (struct rb_call_info *)(VALUE)ibf_dump_write(dump, dump_ci_entries, byte_size); +} + +static struct rb_call_info * +ibf_load_ci_entries(const struct ibf_load *load, const struct rb_iseq_constant_body *body) +{ + unsigned int i; + const unsigned int ci_size = body->ci_size; + const unsigned int ci_kw_size = body->ci_kw_size; + struct rb_call_info *ci_entries = ibf_load_alloc(load, IBF_OFFSET(body->ci_entries), + sizeof(struct rb_call_info) * body->ci_size + + sizeof(struct rb_call_info_with_kwarg) * body->ci_kw_size); + struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&ci_entries[ci_size]; + + for (i=0; i<ci_size; i++) { + ci_entries[i].mid = ibf_load_id(load, ci_entries[i].mid); + } + for (i=0; i<ci_kw_size; i++) { + int j; + ibf_offset_t kw_arg_offset = IBF_OFFSET(ci_kw_entries[i].kw_arg); + const int keyword_len = *(int *)(load->buff + kw_arg_offset); + const VALUE *keywords = (VALUE *)(load->buff + kw_arg_offset + sizeof(int)); + struct rb_call_info_kw_arg *kw_arg = ruby_xmalloc(sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (keyword_len - 1)); + kw_arg->keyword_len = keyword_len; + for (j=0; j<kw_arg->keyword_len; j++) { + kw_arg->keywords[j] = (VALUE)ibf_load_object(load, keywords[j]); + } + ci_kw_entries[i].kw_arg = kw_arg; + ci_kw_entries[i].ci.mid = ibf_load_id(load, ci_kw_entries[i].ci.mid); + } + + return ci_entries; +} + +static ibf_offset_t +ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq) +{ + struct rb_iseq_constant_body dump_body; + dump_body = *iseq->body; + + dump_body.location.path = ibf_dump_object(dump, dump_body.location.path); + dump_body.location.absolute_path = ibf_dump_object(dump, dump_body.location.absolute_path); + dump_body.location.base_label = ibf_dump_object(dump, dump_body.location.base_label); + dump_body.location.label = ibf_dump_object(dump, dump_body.location.label); + + dump_body.iseq_encoded = ibf_dump_code(dump, iseq); + dump_body.param.opt_table = ibf_dump_param_opt_table(dump, iseq); + dump_body.param.keyword = ibf_dump_param_keyword(dump, iseq); + dump_body.line_info_table = ibf_dump_line_info_table(dump, iseq); + dump_body.local_table = ibf_dump_local_table(dump, iseq); + dump_body.catch_table = ibf_dump_catch_table(dump, iseq); + dump_body.parent_iseq = ibf_dump_iseq(dump, iseq->body->parent_iseq); + dump_body.local_iseq = ibf_dump_iseq(dump, iseq->body->local_iseq); + dump_body.is_entries = NULL; + dump_body.ci_entries = ibf_dump_ci_entries(dump, iseq); + dump_body.cc_entries = NULL; + dump_body.mark_ary = ISEQ_FLIP_CNT(iseq); + + return ibf_dump_write(dump, &dump_body, sizeof(dump_body)); +} + +static VALUE +ibf_load_location_str(const struct ibf_load *load, VALUE str_index) +{ + VALUE str = ibf_load_object(load, str_index); + if (str != Qnil) { + str = rb_fstring(str); + } + return str; +} + +static void +ibf_load_iseq_each(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset) +{ + struct rb_iseq_constant_body *load_body = iseq->body = ZALLOC(struct rb_iseq_constant_body); + const struct rb_iseq_constant_body *body = (struct rb_iseq_constant_body *)(load->buff + offset); + + /* memcpy(load_body, load->buff + offset, sizeof(*load_body)); */ + load_body->type = body->type; + load_body->stack_max = body->stack_max; + load_body->iseq_size = body->iseq_size; + load_body->param = body->param; + load_body->local_table_size = body->local_table_size; + load_body->is_size = body->is_size; + load_body->ci_size = body->ci_size; + load_body->ci_kw_size = body->ci_kw_size; + load_body->line_info_size = body->line_info_size; + + RB_OBJ_WRITE(iseq, &load_body->mark_ary, iseq_mark_ary_create((int)body->mark_ary)); + + RB_OBJ_WRITE(iseq, &load_body->location.path, ibf_load_location_str(load, body->location.path)); + RB_OBJ_WRITE(iseq, &load_body->location.absolute_path, ibf_load_location_str(load, body->location.absolute_path)); + RB_OBJ_WRITE(iseq, &load_body->location.base_label, ibf_load_location_str(load, body->location.base_label)); + RB_OBJ_WRITE(iseq, &load_body->location.label, ibf_load_location_str(load, body->location.label)); + load_body->location.first_lineno = body->location.first_lineno; + + load_body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, body->is_size); + load_body->ci_entries = ibf_load_ci_entries(load, body); + load_body->cc_entries = ZALLOC_N(struct rb_call_cache, body->ci_size + body->ci_kw_size); + load_body->param.opt_table = ibf_load_param_opt_table(load, body); + load_body->param.keyword = ibf_load_param_keyword(load, body); + load_body->line_info_table = ibf_load_line_info_table(load, body); + load_body->local_table = ibf_load_local_table(load, body); + load_body->catch_table = ibf_load_catch_table(load, body); + load_body->parent_iseq = ibf_load_iseq(load, body->parent_iseq); + load_body->local_iseq = ibf_load_iseq(load, body->local_iseq); + + load_body->iseq_encoded = ibf_load_code(load, iseq, body); + + rb_iseq_translate_threaded_code(iseq); +} + + +static void +ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header) +{ + const long size = RARRAY_LEN(dump->iseq_list); + ibf_offset_t *list = ALLOCA_N(ibf_offset_t, size); + long i; + + for (i=0; i<size; i++) { + list[i] = (ibf_offset_t)NUM2LONG(rb_ary_entry(dump->iseq_list, i)); + } + + header->iseq_list_offset = ibf_dump_write(dump, list, sizeof(ibf_offset_t) * size); + header->iseq_list_size = (unsigned int)size; +} + +struct ibf_dump_id_list_i_arg { + struct ibf_dump *dump; + long *list; + int current_i; +}; + +static int +ibf_dump_id_list_i(st_data_t key, st_data_t val, st_data_t ptr) +{ + struct ibf_dump_id_list_i_arg *arg = (struct ibf_dump_id_list_i_arg *)ptr; + int i = (int)val; + ID id = (ID)key; + assert(arg->current_i == i); + arg->current_i++; + + if (rb_id2name(id)) { + arg->list[i] = (long)ibf_dump_object(arg->dump, rb_id2str(id)); + } + else { + arg->list[i] = 0; + } + + return ST_CONTINUE; +} + +static void +ibf_dump_id_list(struct ibf_dump *dump, struct ibf_header *header) +{ + const long size = dump->id_table->num_entries; + struct ibf_dump_id_list_i_arg arg; + arg.list = ALLOCA_N(long, size); + arg.dump = dump; + arg.current_i = 0; + + st_foreach(dump->id_table, ibf_dump_id_list_i, (st_data_t)&arg); + + header->id_list_offset = ibf_dump_write(dump, arg.list, sizeof(long) * size); + header->id_list_size = (unsigned int)size; +} + +#define IBF_OBJECT_INTERNAL FL_PROMOTED0 + +/* + * Binary format + * - ibf_object_header + * - ibf_object_xxx (xxx is type) + */ + +struct ibf_object_header { + unsigned int type: 5; + unsigned int special_const: 1; + unsigned int frozen: 1; + unsigned int internal: 1; +}; + +enum ibf_object_class_index { + IBF_OBJECT_CLASS_OBJECT, + IBF_OBJECT_CLASS_ARRAY, + IBF_OBJECT_CLASS_STANDARD_ERROR +}; + +struct ibf_object_string { + long encindex; + long len; + char ptr[1]; +}; + +struct ibf_object_regexp { + long srcstr; + char option; +}; + +struct ibf_object_array { + long len; + long ary[1]; +}; + +struct ibf_object_hash { + long len; + long keyval[1]; +}; + +struct ibf_object_struct_range { + long class_index; + long len; + long beg; + long end; + int excl; +}; + +struct ibf_object_bignum { + ssize_t slen; + BDIGIT digits[1]; +}; + +enum ibf_object_data_type { + IBF_OBJECT_DATA_ENCODING +}; + +struct ibf_object_complex_rational { + long a, b; +}; + +struct ibf_object_symbol { + long str; +}; + +#define IBF_OBJHEADER(offset) (struct ibf_object_header *)(load->buff + (offset)) +#define IBF_OBJBODY(type, offset) (type *)(load->buff + sizeof(struct ibf_object_header) + (offset)) + +static void +ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj) +{ + rb_obj_info_dump(obj); + rb_bug("ibf_dump_object_unsupported: unsupported"); +} + +static VALUE +ibf_load_object_unsupported(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + rb_bug("unsupported"); + return Qnil; +} + +static void +ibf_dump_object_class(struct ibf_dump *dump, VALUE obj) +{ + enum ibf_object_class_index cindex; + if (obj == rb_cObject) { + cindex = IBF_OBJECT_CLASS_OBJECT; + } + else if (obj == rb_cArray) { + cindex = IBF_OBJECT_CLASS_ARRAY; + } + else if (obj == rb_eStandardError) { + cindex = IBF_OBJECT_CLASS_STANDARD_ERROR; + } + else { + rb_obj_info_dump(obj); + rb_p(obj); + rb_bug("unsupported class"); + } + ibf_dump_write(dump, &cindex, sizeof(cindex)); +} + +static VALUE +ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + enum ibf_object_class_index *cindexp = IBF_OBJBODY(enum ibf_object_class_index, offset); + enum ibf_object_class_index cindex = *cindexp; + + switch (cindex) { + case IBF_OBJECT_CLASS_OBJECT: + return rb_cObject; + case IBF_OBJECT_CLASS_ARRAY: + return rb_cArray; + case IBF_OBJECT_CLASS_STANDARD_ERROR: + return rb_eStandardError; + } + + rb_bug("ibf_load_object_class: unknown class (%d)", (int)cindex); +} + + +static void +ibf_dump_object_float(struct ibf_dump *dump, VALUE obj) +{ + double dbl = RFLOAT_VALUE(obj); + ibf_dump_write(dump, &dbl, sizeof(dbl)); +} + +static VALUE +ibf_load_object_float(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + double *dblp = IBF_OBJBODY(double, offset); + return DBL2NUM(*dblp); +} + +static void +ibf_dump_object_string(struct ibf_dump *dump, VALUE obj) +{ + long encindex = (long)rb_enc_get_index(obj); + long len = RSTRING_LEN(obj); + const char *ptr = RSTRING_PTR(obj); + + if (encindex > RUBY_ENCINDEX_BUILTIN_MAX) { + rb_encoding *enc = rb_enc_from_index((int)encindex); + const char *enc_name = rb_enc_name(enc); + encindex = RUBY_ENCINDEX_BUILTIN_MAX + ibf_dump_object(dump, rb_str_new2(enc_name)); + } + + IBF_WV(encindex); + IBF_WV(len); + IBF_WP(ptr, char, len); +} + +static VALUE +ibf_load_object_string(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const struct ibf_object_string *string = IBF_OBJBODY(struct ibf_object_string, offset); + VALUE str = rb_str_new(string->ptr, string->len); + int encindex = (int)string->encindex; + + if (encindex > RUBY_ENCINDEX_BUILTIN_MAX) { + VALUE enc_name_str = ibf_load_object(load, encindex - RUBY_ENCINDEX_BUILTIN_MAX); + encindex = rb_enc_find_index(RSTRING_PTR(enc_name_str)); + } + rb_enc_associate_index(str, encindex); + + if (header->internal) rb_obj_hide(str); + if (header->frozen) str = rb_fstring(str); + + return str; +} + +static void +ibf_dump_object_regexp(struct ibf_dump *dump, VALUE obj) +{ + struct ibf_object_regexp regexp; + regexp.srcstr = RREGEXP_SRC(obj); + regexp.option = (char)rb_reg_options(obj); + regexp.srcstr = (long)ibf_dump_object(dump, regexp.srcstr); + IBF_WV(regexp); +} + +static VALUE +ibf_load_object_regexp(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const struct ibf_object_regexp *regexp = IBF_OBJBODY(struct ibf_object_regexp, offset); + VALUE srcstr = ibf_load_object(load, regexp->srcstr); + VALUE reg = rb_reg_compile(srcstr, (int)regexp->option, NULL, 0); + + if (header->internal) rb_obj_hide(reg); + if (header->frozen) rb_obj_freeze(reg); + + return reg; +} + +static void +ibf_dump_object_array(struct ibf_dump *dump, VALUE obj) +{ + long i, len = (int)RARRAY_LEN(obj); + IBF_WV(len); + for (i=0; i<len; i++) { + long index = (long)ibf_dump_object(dump, RARRAY_AREF(obj, i)); + IBF_WV(index); + } +} + +static VALUE +ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const struct ibf_object_array *array = IBF_OBJBODY(struct ibf_object_array, offset); + VALUE ary = rb_ary_new_capa(array->len); + int i; + + for (i=0; i<array->len; i++) { + rb_ary_push(ary, ibf_load_object(load, array->ary[i])); + } + + if (header->internal) rb_obj_hide(ary); + if (header->frozen) rb_obj_freeze(ary); + + return ary; +} + +static int +ibf_dump_object_hash_i(st_data_t key, st_data_t val, st_data_t ptr) +{ + struct ibf_dump *dump = (struct ibf_dump *)ptr; + long key_index = (long)ibf_dump_object(dump, (VALUE)key); + long val_index = (long)ibf_dump_object(dump, (VALUE)val); + IBF_WV(key_index); + IBF_WV(val_index); + return ST_CONTINUE; +} + +static void +ibf_dump_object_hash(struct ibf_dump *dump, VALUE obj) +{ + long len = RHASH_SIZE(obj); + IBF_WV(len); + if (len > 0) st_foreach(RHASH(obj)->ntbl, ibf_dump_object_hash_i, (st_data_t)dump); +} + +static VALUE +ibf_load_object_hash(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const struct ibf_object_hash *hash = IBF_OBJBODY(struct ibf_object_hash, offset); + VALUE obj = rb_hash_new(); + int i; + + for (i=0; i<hash->len; i++) { + VALUE key = ibf_load_object(load, hash->keyval[i*2 ]); + VALUE val = ibf_load_object(load, hash->keyval[i*2+1]); + rb_hash_aset(obj, key, val); + } + rb_hash_rehash(obj); + + if (header->internal) rb_obj_hide(obj); + if (header->frozen) rb_obj_freeze(obj); + + return obj; +} + +static void +ibf_dump_object_struct(struct ibf_dump *dump, VALUE obj) +{ + if (rb_obj_is_kind_of(obj, rb_cRange)) { + struct ibf_object_struct_range range; + VALUE beg, end; + range.len = 3; + range.class_index = 0; + + rb_range_values(obj, &beg, &end, &range.excl); + range.beg = (long)ibf_dump_object(dump, beg); + range.end = (long)ibf_dump_object(dump, end); + + IBF_WV(range); + } + else { + rb_bug("ibf_dump_object_struct: unsupported class"); + } +} + +static VALUE +ibf_load_object_struct(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const struct ibf_object_struct_range *range = IBF_OBJBODY(struct ibf_object_struct_range, offset); + VALUE beg = ibf_load_object(load, range->beg); + VALUE end = ibf_load_object(load, range->end); + VALUE obj = rb_range_new(beg, end, range->excl); + if (header->internal) rb_obj_hide(obj); + if (header->frozen) rb_obj_freeze(obj); + return obj; +} + +static void +ibf_dump_object_bignum(struct ibf_dump *dump, VALUE obj) +{ + ssize_t len = BIGNUM_LEN(obj); + ssize_t slen = BIGNUM_SIGN(obj) > 0 ? len : len * -1; + BDIGIT *d = BIGNUM_DIGITS(obj); + + IBF_WV(slen); + IBF_WP(d, BDIGIT, len); +} + +static VALUE +ibf_load_object_bignum(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const struct ibf_object_bignum *bignum = IBF_OBJBODY(struct ibf_object_bignum, offset); + int sign = bignum->slen > 0; + ssize_t len = sign > 0 ? bignum->slen : -1 * bignum->slen; + VALUE obj = rb_integer_unpack(bignum->digits, len * 2, 2, 0, + INTEGER_PACK_LITTLE_ENDIAN | (sign == 0 ? INTEGER_PACK_NEGATIVE : 0)); + if (header->internal) rb_obj_hide(obj); + if (header->frozen) rb_obj_freeze(obj); + return obj; +} + +static void +ibf_dump_object_data(struct ibf_dump *dump, VALUE obj) +{ + if (rb_data_is_encoding(obj)) { + rb_encoding *enc = rb_to_encoding(obj); + const char *name = rb_enc_name(enc); + enum ibf_object_data_type type = IBF_OBJECT_DATA_ENCODING; + long len = strlen(name) + 1; + IBF_WV(type); + IBF_WV(len); + IBF_WP(name, char, strlen(name) + 1); + } + else { + ibf_dump_object_unsupported(dump, obj); + } +} + +static VALUE +ibf_load_object_data(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const enum ibf_object_data_type *typep = IBF_OBJBODY(enum ibf_object_data_type, offset); + /* const long *lenp = IBF_OBJBODY(long, offset + sizeof(enum ibf_object_data_type)); */ + const char *data = IBF_OBJBODY(char, offset + sizeof(enum ibf_object_data_type) + sizeof(long)); + + switch (*typep) { + case IBF_OBJECT_DATA_ENCODING: + { + VALUE encobj = rb_enc_from_encoding(rb_enc_find(data)); + return encobj; + } + } + + return ibf_load_object_unsupported(load, header, offset); +} + +static void +ibf_dump_object_complex_rational(struct ibf_dump *dump, VALUE obj) +{ + long real = (long)ibf_dump_object(dump, RCOMPLEX(obj)->real); + long imag = (long)ibf_dump_object(dump, RCOMPLEX(obj)->imag); + + IBF_WV(real); + IBF_WV(imag); +} + +static VALUE +ibf_load_object_complex_rational(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + const struct ibf_object_complex_rational *nums = IBF_OBJBODY(struct ibf_object_complex_rational, offset); + VALUE a = ibf_load_object(load, nums->a); + VALUE b = ibf_load_object(load, nums->b); + VALUE obj = header->type == T_COMPLEX ? + rb_complex_new(a, b) : rb_rational_new(a, b); + + if (header->internal) rb_obj_hide(obj); + if (header->frozen) rb_obj_freeze(obj); + return obj; +} + +static void +ibf_dump_object_symbol(struct ibf_dump *dump, VALUE obj) +{ + VALUE str = rb_sym2str(obj); + long str_index = (long)ibf_dump_object(dump, str); + IBF_WV(str_index); +} + +static VALUE +ibf_load_object_symbol(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset) +{ + /* const struct ibf_object_header *header = IBF_OBJHEADER(offset); */ + const struct ibf_object_symbol *symbol = IBF_OBJBODY(struct ibf_object_symbol, offset); + VALUE str = ibf_load_object(load, symbol->str); + ID id = rb_intern_str(str); + return ID2SYM(id); +} + +typedef void (*ibf_dump_object_function)(struct ibf_dump *dump, VALUE obj); +static ibf_dump_object_function dump_object_functions[RUBY_T_MASK+1] = { + ibf_dump_object_unsupported, /* T_NONE */ + ibf_dump_object_unsupported, /* T_OBJECT */ + ibf_dump_object_class, /* T_CLASS */ + ibf_dump_object_unsupported, /* T_MODULE */ + ibf_dump_object_float, /* T_FLOAT */ + ibf_dump_object_string, /* T_STRING */ + ibf_dump_object_regexp, /* T_REGEXP */ + ibf_dump_object_array, /* T_ARRAY */ + ibf_dump_object_hash, /* T_HASH */ + ibf_dump_object_struct, /* T_STRUCT */ + ibf_dump_object_bignum, /* T_BIGNUM */ + ibf_dump_object_unsupported, /* T_FILE */ + ibf_dump_object_data, /* T_DATA */ + ibf_dump_object_unsupported, /* T_MATCH */ + ibf_dump_object_complex_rational, /* T_COMPLEX */ + ibf_dump_object_complex_rational, /* T_RATIONAL */ + ibf_dump_object_unsupported, /* 0x10 */ + ibf_dump_object_unsupported, /* 0x11 T_NIL */ + ibf_dump_object_unsupported, /* 0x12 T_TRUE */ + ibf_dump_object_unsupported, /* 0x13 T_FALSE */ + ibf_dump_object_symbol, /* 0x14 T_SYMBOL */ + ibf_dump_object_unsupported, /* T_FIXNUM */ + ibf_dump_object_unsupported, /* T_UNDEF */ + ibf_dump_object_unsupported, /* 0x17 */ + ibf_dump_object_unsupported, /* 0x18 */ + ibf_dump_object_unsupported, /* 0x19 */ + ibf_dump_object_unsupported, /* T_IMEMO 0x1a */ + ibf_dump_object_unsupported, /* T_NODE 0x1b */ + ibf_dump_object_unsupported, /* T_ICLASS 0x1c */ + ibf_dump_object_unsupported, /* T_ZOMBIE 0x1d */ + ibf_dump_object_unsupported, /* 0x1e */ + ibf_dump_object_unsupported /* 0x1f */ +}; + +static ibf_offset_t +lbf_dump_object_object(struct ibf_dump *dump, VALUE obj) +{ + struct ibf_object_header obj_header; + ibf_offset_t current_offset = ibf_dump_pos(dump); + obj_header.type = TYPE(obj); + + if (SPECIAL_CONST_P(obj)) { + if (RB_TYPE_P(obj, T_SYMBOL) || + RB_TYPE_P(obj, T_FLOAT)) { + obj_header.internal = FALSE; + goto dump_object; + } + obj_header.special_const = TRUE; + obj_header.frozen = TRUE; + obj_header.internal = TRUE; + IBF_WV(obj_header); + IBF_WV(obj); + } + else { + obj_header.internal = (RBASIC_CLASS(obj) == 0) ? TRUE : FALSE; + dump_object: + obj_header.special_const = FALSE; + obj_header.frozen = FL_TEST(obj, FL_FREEZE) ? TRUE : FALSE; + IBF_WV(obj_header); + (*dump_object_functions[obj_header.type])(dump, obj); + } + + return current_offset; +} + +typedef VALUE (*ibf_load_object_function)(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t); +static ibf_load_object_function load_object_functions[RUBY_T_MASK+1] = { + ibf_load_object_unsupported, /* T_NONE */ + ibf_load_object_unsupported, /* T_OBJECT */ + ibf_load_object_class, /* T_CLASS */ + ibf_load_object_unsupported, /* T_MODULE */ + ibf_load_object_float, /* T_FLOAT */ + ibf_load_object_string, /* T_STRING */ + ibf_load_object_regexp, /* T_REGEXP */ + ibf_load_object_array, /* T_ARRAY */ + ibf_load_object_hash, /* T_HASH */ + ibf_load_object_struct, /* T_STRUCT */ + ibf_load_object_bignum, /* T_BIGNUM */ + ibf_load_object_unsupported, /* T_FILE */ + ibf_load_object_data, /* T_DATA */ + ibf_load_object_unsupported, /* T_MATCH */ + ibf_load_object_complex_rational, /* T_COMPLEX */ + ibf_load_object_complex_rational, /* T_RATIONAL */ + ibf_load_object_unsupported, /* 0x10 */ + ibf_load_object_unsupported, /* T_NIL */ + ibf_load_object_unsupported, /* T_TRUE */ + ibf_load_object_unsupported, /* T_FALSE */ + ibf_load_object_symbol, + ibf_load_object_unsupported, /* T_FIXNUM */ + ibf_load_object_unsupported, /* T_UNDEF */ + ibf_load_object_unsupported, /* 0x17 */ + ibf_load_object_unsupported, /* 0x18 */ + ibf_load_object_unsupported, /* 0x19 */ + ibf_load_object_unsupported, /* T_IMEMO 0x1a */ + ibf_load_object_unsupported, /* T_NODE 0x1b */ + ibf_load_object_unsupported, /* T_ICLASS 0x1c */ + ibf_load_object_unsupported, /* T_ZOMBIE 0x1d */ + ibf_load_object_unsupported, /* 0x1e */ + ibf_load_object_unsupported /* 0x1f */ +}; + +static VALUE +ibf_load_object(const struct ibf_load *load, VALUE object_index) +{ + if (object_index == 0) { + return Qnil; + } + else if (object_index >= load->header->object_list_size) { + rb_raise(rb_eIndexError, "object index out of range: %"PRIdVALUE, object_index); + } + else { + VALUE obj = rb_ary_entry(load->obj_list, (long)object_index); + if (obj == Qnil) { /* TODO: avoid multiple Qnil load */ + ibf_offset_t *offsets = (ibf_offset_t *)(load->header->object_list_offset + load->buff); + ibf_offset_t offset = offsets[object_index]; + const struct ibf_object_header *header = IBF_OBJHEADER(offset); + + if (header->special_const) { + VALUE *vp = IBF_OBJBODY(VALUE, offset); + obj = *vp; + } + else { + obj = (*load_object_functions[header->type])(load, header, offset); + } + + rb_ary_store(load->obj_list, (long)object_index, obj); + } + iseq_add_mark_object(load->iseq, obj); + return obj; + } +} + +static void +ibf_dump_object_list(struct ibf_dump *dump, struct ibf_header *header) +{ + VALUE list = rb_ary_tmp_new(RARRAY_LEN(dump->obj_list)); + int i, size; + + for (i=0; i<RARRAY_LEN(dump->obj_list); i++) { + VALUE obj = RARRAY_AREF(dump->obj_list, i); + ibf_offset_t offset = lbf_dump_object_object(dump, obj); + rb_ary_push(list, UINT2NUM(offset)); + } + size = i; + header->object_list_offset = ibf_dump_pos(dump); + + for (i=0; i<size; i++) { + ibf_offset_t offset = NUM2UINT(RARRAY_AREF(list, i)); + IBF_WV(offset); + } + + header->object_list_size = size; +} + +static void +ibf_dump_mark(void *ptr) +{ + struct ibf_dump *dump = (struct ibf_dump *)ptr; + rb_gc_mark(dump->str); + rb_gc_mark(dump->iseq_list); + rb_gc_mark(dump->obj_list); +} + +static void +ibf_dump_free(void *ptr) +{ + struct ibf_dump *dump = (struct ibf_dump *)ptr; + if (dump->iseq_table) { + st_free_table(dump->iseq_table); + dump->iseq_table = 0; + } + if (dump->id_table) { + st_free_table(dump->id_table); + dump->id_table = 0; + } + ruby_xfree(dump); +} + +static size_t +ibf_dump_memsize(const void *ptr) +{ + struct ibf_dump *dump = (struct ibf_dump *)ptr; + size_t size = sizeof(*dump); + if (dump->iseq_table) size += st_memsize(dump->iseq_table); + if (dump->id_table) size += st_memsize(dump->id_table); + return size; +} + +static const rb_data_type_t ibf_dump_type = { + "ibf_dump", + {ibf_dump_mark, ibf_dump_free, ibf_dump_memsize,}, + 0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY +}; + +static void +ibf_dump_setup(struct ibf_dump *dump, VALUE dumper_obj) +{ + RB_OBJ_WRITE(dumper_obj, &dump->str, rb_str_new(0, 0)); + RB_OBJ_WRITE(dumper_obj, &dump->iseq_list, rb_ary_tmp_new(0)); + RB_OBJ_WRITE(dumper_obj, &dump->obj_list, rb_ary_tmp_new(1)); + rb_ary_push(dump->obj_list, Qnil); /* 0th is nil */ + dump->iseq_table = st_init_numtable(); /* need free */ + dump->id_table = st_init_numtable(); /* need free */ + + ibf_table_index(dump->id_table, 0); /* id_index:0 is 0 */ +} + +VALUE +iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt) +{ + struct ibf_dump *dump; + struct ibf_header header = {{0}}; + VALUE dump_obj; + VALUE str; + + if (iseq->body->parent_iseq != NULL || + iseq->body->local_iseq != iseq) { + rb_raise(rb_eRuntimeError, "should be top of iseq"); + } + if (RTEST(ISEQ_COVERAGE(iseq))) { + rb_raise(rb_eRuntimeError, "should not compile with coverage"); + } + + dump_obj = TypedData_Make_Struct(0, struct ibf_dump, &ibf_dump_type, dump); + ibf_dump_setup(dump, dump_obj); + + ibf_dump_write(dump, &header, sizeof(header)); + ibf_dump_write(dump, RUBY_PLATFORM, strlen(RUBY_PLATFORM) + 1); + ibf_dump_iseq(dump, iseq); + + header.magic[0] = 'Y'; /* YARB */ + header.magic[1] = 'A'; + header.magic[2] = 'R'; + header.magic[3] = 'B'; + header.major_version = ISEQ_MAJOR_VERSION; + header.minor_version = ISEQ_MINOR_VERSION; + ibf_dump_iseq_list(dump, &header); + ibf_dump_id_list(dump, &header); + ibf_dump_object_list(dump, &header); + header.size = ibf_dump_pos(dump); + + if (RTEST(opt)) { + VALUE opt_str = opt; + const char *ptr = StringValuePtr(opt_str); + header.extra_size = RSTRING_LENINT(opt_str); + ibf_dump_write(dump, ptr, header.extra_size); + } + else { + header.extra_size = 0; + } + + ibf_dump_overwrite(dump, &header, sizeof(header), 0); + + str = dump->str; + ibf_dump_free(dump); + DATA_PTR(dump_obj) = NULL; + RB_GC_GUARD(dump_obj); + return str; +} + +static const ibf_offset_t * +ibf_iseq_list(const struct ibf_load *load) +{ + return (ibf_offset_t *)(load->buff + load->header->iseq_list_offset); +} + +void +ibf_load_iseq_complete(rb_iseq_t *iseq) +{ + struct ibf_load *load = RTYPEDDATA_DATA(iseq->aux.loader.obj); + rb_iseq_t *prev_src_iseq = load->iseq; + load->iseq = iseq; + ibf_load_iseq_each(load, iseq, ibf_iseq_list(load)[iseq->aux.loader.index]); + ISEQ_COMPILE_DATA(iseq) = NULL; + FL_UNSET(iseq, ISEQ_NOT_LOADED_YET); + load->iseq = prev_src_iseq; +} + +#if USE_LAZY_LOAD +const rb_iseq_t * +rb_iseq_complete(const rb_iseq_t *iseq) +{ + ibf_load_iseq_complete((rb_iseq_t *)iseq); + return iseq; +} +#endif + +static rb_iseq_t * +ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq) +{ + int iseq_index = (int)(VALUE)index_iseq; + + if (iseq_index == -1) { + return NULL; + } + else { + VALUE iseqv = rb_ary_entry(load->iseq_list, iseq_index); + + if (iseqv != Qnil) { + return (rb_iseq_t *)iseqv; + } + else { + rb_iseq_t *iseq = iseq_imemo_alloc(); + FL_SET(iseq, ISEQ_NOT_LOADED_YET); + iseq->aux.loader.obj = load->loader_obj; + iseq->aux.loader.index = iseq_index; + rb_ary_store(load->iseq_list, iseq_index, (VALUE)iseq); + +#if !USE_LAZY_LOAD + ibf_load_iseq_complete(iseq); +#endif /* !USE_LAZY_LOAD */ + + if (load->iseq) { + iseq_add_mark_object(load->iseq, (VALUE)iseq); + } + return iseq; + } + } +} + +static void +ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str) +{ + rb_check_safe_obj(str); + + if (RSTRING_LENINT(str) < (int)sizeof(struct ibf_header)) { + rb_raise(rb_eRuntimeError, "broken binary format"); + } + RB_OBJ_WRITE(loader_obj, &load->str, str); + load->loader_obj = loader_obj; + load->buff = StringValuePtr(str); + load->header = (struct ibf_header *)load->buff; + RB_OBJ_WRITE(loader_obj, &load->iseq_list, rb_ary_tmp_new(0)); + RB_OBJ_WRITE(loader_obj, &load->obj_list, rb_ary_tmp_new(0)); + load->id_list = ZALLOC_N(ID, load->header->id_list_size); + load->iseq = NULL; + + if (RSTRING_LENINT(str) < (int)load->header->size) { + rb_raise(rb_eRuntimeError, "broken binary format"); + } + if (strncmp(load->header->magic, "YARB", 4) != 0) { + rb_raise(rb_eRuntimeError, "unknown binary format"); + } + if (load->header->major_version != ISEQ_MAJOR_VERSION || + load->header->minor_version != ISEQ_MINOR_VERSION) { + rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)", + load->header->major_version, load->header->minor_version, ISEQ_MAJOR_VERSION, ISEQ_MINOR_VERSION); + } + if (strcmp(load->buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) { + rb_raise(rb_eRuntimeError, "unmatched platform"); + } +} + +static void +ibf_loader_mark(void *ptr) +{ + if (ptr) { + struct ibf_load *load = (struct ibf_load *)ptr; + rb_gc_mark(load->str); + rb_gc_mark(load->iseq_list); + rb_gc_mark(load->obj_list); + } +} + +static void +ibf_loader_free(void *ptr) +{ + if (ptr) { + struct ibf_load *load = (struct ibf_load *)ptr; + ruby_xfree(load->id_list); + ruby_xfree(load); + } +} + +static size_t +ibf_loader_memsize(const void *ptr) +{ + struct ibf_load *load = (struct ibf_load *)ptr; + return sizeof(struct ibf_load) + load->header->id_list_size * sizeof(ID); +} + +static const rb_data_type_t ibf_load_type = { + "ibf_loader", + {ibf_loader_mark, ibf_loader_free, ibf_loader_memsize,}, + 0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY +}; + +const rb_iseq_t * +iseq_ibf_load(VALUE str) +{ + struct ibf_load *load; + const rb_iseq_t *iseq; + VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load); + + ibf_load_setup(load, loader_obj, str); + iseq = ibf_load_iseq(load, 0); + + RB_GC_GUARD(loader_obj); + return iseq; +} + +VALUE +iseq_ibf_load_extra_data(VALUE str) +{ + struct ibf_load *load; + VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load); + VALUE extra_str; + + ibf_load_setup(load, loader_obj, str); + extra_str = rb_str_new(load->buff + load->header->size, load->header->extra_size); + RB_GC_GUARD(loader_obj); + return extra_str; +} @@ -5,18 +5,31 @@ which is written in ruby. */ -#include "internal.h" +#include "ruby/config.h" +#if defined _MSC_VER +/* Microsoft Visual C does not define M_PI and others by default */ +# define _USE_MATH_DEFINES 1 +#endif #include <math.h> +#include "internal.h" #define NDEBUG -#include <assert.h> +#include "ruby_assert.h" #define ZERO INT2FIX(0) #define ONE INT2FIX(1) #define TWO INT2FIX(2) +#define RFLOAT_0 DBL2NUM(0) +#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \ + !defined(signbit) +extern int signbit(double); +#endif VALUE rb_cComplex; +static VALUE nucomp_abs(VALUE self); +static VALUE nucomp_arg(VALUE self); + static ID id_abs, id_arg, id_convert, id_denominator, id_eqeq_p, id_expt, id_fdiv, id_negate, id_numerator, id_quo, @@ -97,7 +110,7 @@ f_mul(VALUE x, VALUE y) if (FIXNUM_P(y)) { long iy = FIX2LONG(y); if (iy == 0) { - if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM)) + if (RB_INTEGER_TYPE_P(x)) return ZERO; } else if (iy == 1) @@ -106,7 +119,7 @@ f_mul(VALUE x, VALUE y) else if (FIXNUM_P(x)) { long ix = FIX2LONG(x); if (ix == 0) { - if (FIXNUM_P(y) || RB_TYPE_P(y, T_BIGNUM)) + if (RB_INTEGER_TYPE_P(y)) return ZERO; } else if (ix == 1) @@ -225,13 +238,13 @@ k_numeric_p(VALUE x) inline static VALUE k_fixnum_p(VALUE x) { - return f_kind_of_p(x, rb_cFixnum); + return FIXNUM_P(x); } inline static VALUE k_bignum_p(VALUE x) { - return f_kind_of_p(x, rb_cBignum); + return RB_TYPE_P(x, T_BIGNUM); } inline static VALUE @@ -253,19 +266,14 @@ k_complex_p(VALUE x) } #define k_exact_p(x) (!k_float_p(x)) -#define k_inexact_p(x) k_float_p(x) #define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x)) -#define k_exact_one_p(x) (k_exact_p(x) && f_one_p(x)) #define get_dat1(x) \ - struct RComplex *dat;\ - dat = ((struct RComplex *)(x)) + struct RComplex *dat = RCOMPLEX(x) #define get_dat2(x,y) \ - struct RComplex *adat, *bdat;\ - adat = ((struct RComplex *)(x));\ - bdat = ((struct RComplex *)(y)) + struct RComplex *adat = RCOMPLEX(x), *bdat = RCOMPLEX(y) inline static VALUE nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag) @@ -335,6 +343,8 @@ nucomp_canonicalization(int f) { canonicalization = f; } +#else +#define canonicalization 0 #endif inline static void @@ -458,7 +468,7 @@ f_complex_new2(VALUE klass, VALUE x, VALUE y) static VALUE nucomp_f_complex(int argc, VALUE *argv, VALUE klass) { - return rb_funcall2(rb_cComplex, id_convert, argc, argv); + return rb_funcallv(rb_cComplex, id_convert, argc, argv); } #define imp1(n) \ @@ -525,6 +535,21 @@ m_sin(VALUE x) #if 0 imp1(sqrt) +VALUE +rb_complex_sqrt(VALUE x) +{ + int pos; + VALUE a, re, im; + get_dat1(x); + + pos = f_positive_p(dat->imag); + a = f_abs(x); + re = m_sqrt_bang(f_div(f_add(a, dat->real), TWO)); + im = m_sqrt_bang(f_div(f_sub(a, dat->real), TWO)); + if (!pos) im = f_negate(im); + return f_complex_new2(rb_cComplex, re, im); +} + static VALUE m_sqrt(VALUE x) { @@ -533,26 +558,48 @@ m_sqrt(VALUE x) return m_sqrt_bang(x); return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x))); } - else { - get_dat1(x); - - if (f_negative_p(dat->imag)) - return f_conj(m_sqrt(f_conj(x))); - else { - VALUE a = f_abs(x); - return f_complex_new2(rb_cComplex, - m_sqrt_bang(f_div(f_add(a, dat->real), TWO)), - m_sqrt_bang(f_div(f_sub(a, dat->real), TWO))); - } - } + return rb_complex_sqrt(x); } #endif -inline static VALUE +static VALUE f_complex_polar(VALUE klass, VALUE x, VALUE y) { assert(!k_complex_p(x)); assert(!k_complex_p(y)); + if (f_zero_p(x) || f_zero_p(y)) { + if (canonicalization) return x; + return nucomp_s_new_internal(klass, x, RFLOAT_0); + } + if (RB_FLOAT_TYPE_P(y)) { + const double arg = RFLOAT_VALUE(y); + if (arg == M_PI) { + x = f_negate(x); + if (canonicalization) return x; + y = RFLOAT_0; + } + else if (arg == M_PI_2) { + y = x; + x = RFLOAT_0; + } + else if (arg == M_PI_2+M_PI) { + y = f_negate(x); + x = RFLOAT_0; + } + else if (RB_FLOAT_TYPE_P(x)) { + const double abs = RFLOAT_VALUE(x); + const double real = abs * cos(arg), imag = abs * sin(arg); + x = DBL2NUM(real); + if (canonicalization && imag == 0.0) return x; + y = DBL2NUM(imag); + } + else { + y = f_mul(x, DBL2NUM(sin(arg))); + x = f_mul(x, DBL2NUM(cos(arg))); + if (canonicalization && f_zero_p(y)) return x; + } + return nucomp_s_new_internal(klass, x, y); + } return nucomp_s_canonicalize_internal(klass, f_mul(x, m_cos(y)), f_mul(x, m_sin(y))); @@ -577,8 +624,8 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass) switch (rb_scan_args(argc, argv, "11", &abs, &arg)) { case 1: nucomp_real_check(abs); - arg = ZERO; - break; + if (canonicalization) return abs; + return nucomp_s_new_internal(klass, abs, ZERO); default: nucomp_real_check(abs); nucomp_real_check(arg); @@ -671,11 +718,12 @@ f_addsub(VALUE self, VALUE other, * Complex(9, 8) + 4 #=> (13+8i) * Complex(20, 9) + 9.8 #=> (29.8+9i) */ -static VALUE -nucomp_add(VALUE self, VALUE other) +VALUE +rb_complex_plus(VALUE self, VALUE other) { return f_addsub(self, other, f_add, '+'); } +#define nucomp_add rb_complex_plus /* * call-seq: @@ -695,6 +743,19 @@ nucomp_sub(VALUE self, VALUE other) return f_addsub(self, other, f_sub, '-'); } +static VALUE +safe_mul(VALUE a, VALUE b, int az, int bz) +{ + double v; + if (!az && bz && RB_FLOAT_TYPE_P(a) && (v = RFLOAT_VALUE(a), !isnan(v))) { + a = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0); + } + if (!bz && az && RB_FLOAT_TYPE_P(b) && (v = RFLOAT_VALUE(b), !isnan(v))) { + b = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0); + } + return f_mul(a, b); +} + /* * call-seq: * cmp * numeric -> complex @@ -707,18 +768,24 @@ nucomp_sub(VALUE self, VALUE other) * Complex(9, 8) * 4 #=> (36+32i) * Complex(20, 9) * 9.8 #=> (196.0+88.2i) */ -static VALUE -nucomp_mul(VALUE self, VALUE other) +VALUE +rb_complex_mul(VALUE self, VALUE other) { if (k_complex_p(other)) { VALUE real, imag; + VALUE areal, aimag, breal, bimag; + int arzero, aizero, brzero, bizero; get_dat2(self, other); - real = f_sub(f_mul(adat->real, bdat->real), - f_mul(adat->imag, bdat->imag)); - imag = f_add(f_mul(adat->real, bdat->imag), - f_mul(adat->imag, bdat->real)); + arzero = !!f_zero_p(areal = adat->real); + aizero = !!f_zero_p(aimag = adat->imag); + brzero = !!f_zero_p(breal = bdat->real); + bizero = !!f_zero_p(bimag = bdat->imag); + real = f_sub(safe_mul(areal, breal, arzero, brzero), + safe_mul(aimag, bimag, aizero, bizero)); + imag = f_add(safe_mul(areal, bimag, arzero, bizero), + safe_mul(aimag, breal, aizero, brzero)); return f_complex_new2(CLASS_OF(self), real, imag); } @@ -731,6 +798,7 @@ nucomp_mul(VALUE self, VALUE other) } return rb_num_coerce_bin(self, other, '*'); } +#define nucomp_mul rb_complex_mul inline static VALUE f_divide(VALUE self, VALUE other, @@ -953,8 +1021,8 @@ nucomp_coerce(VALUE self, VALUE other) if (RB_TYPE_P(other, T_COMPLEX)) return rb_assoc_new(other, self); - rb_raise(rb_eTypeError, "%s can't be coerced into %s", - rb_obj_classname(other), rb_obj_classname(self)); + rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE, + rb_obj_class(other), rb_obj_class(self)); return Qnil; } @@ -1188,10 +1256,6 @@ nucomp_eql_p(VALUE self, VALUE other) inline static VALUE f_signbit(VALUE x) { -#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \ - !defined(signbit) - extern int signbit(double); -#endif if (RB_TYPE_P(x, T_FLOAT)) { double f = RFLOAT_VALUE(x); return f_boolcast(!isnan(f) && signbit(f)); @@ -1267,6 +1331,68 @@ nucomp_inspect(VALUE self) return s; } +/* + * call-seq: + * cmp.finite? -> true or false + * + * Returns +true+ if +cmp+'s magnitude is finite number, + * oterwise returns +false+. + */ +static VALUE +rb_complex_finite_p(VALUE self) +{ + VALUE magnitude = nucomp_abs(self); + double f; + + switch (TYPE(magnitude)) { + case T_FIXNUM: case T_BIGNUM: case T_RATIONAL: + return Qtrue; + + case T_FLOAT: + f = RFLOAT_VALUE(magnitude); + return isinf(f) ? Qfalse : Qtrue; + + default: + return rb_funcall(magnitude, rb_intern("finite?"), 0); + } +} + +/* + * call-seq: + * cmp.infinite? -> nil or 1 or -1 + * + * Returns values corresponding to the value of +cmp+'s magnitude: + * + * +finite+:: +nil+ + * ++Infinity+:: ++1+ + * + * For example: + * + * (1+1i).infinite? #=> nil + * (Float::INFINITY + 1i).infinite? #=> 1 + */ +static VALUE +rb_complex_infinite_p(VALUE self) +{ + VALUE magnitude = nucomp_abs(self); + double f; + + switch (TYPE(magnitude)) { + case T_FIXNUM: case T_BIGNUM: case T_RATIONAL: + return Qnil; + + case T_FLOAT: + f = RFLOAT_VALUE(magnitude); + if (isinf(f)) { + return INT2FIX(f < 0 ? -1 : 1); + } + return Qnil; + + default: + return rb_funcall(magnitude, rb_intern("infinite?"), 0); + } +} + /* :nodoc: */ static VALUE nucomp_dumper(VALUE self) @@ -1351,10 +1477,16 @@ rb_complex_set_real(VALUE cmp, VALUE r) VALUE rb_complex_set_imag(VALUE cmp, VALUE i) { - RCOMPLEX_SET_REAL(cmp, i); + RCOMPLEX_SET_IMAG(cmp, i); return cmp; } +VALUE +rb_complex_abs(VALUE cmp) +{ + return nucomp_abs(cmp); +} + /* * call-seq: * cmp.to_i -> integer @@ -1371,7 +1503,7 @@ nucomp_to_i(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer", self); } @@ -1394,7 +1526,7 @@ nucomp_to_f(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float", self); } @@ -1419,7 +1551,7 @@ nucomp_to_r(VALUE self) { get_dat1(self); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational", self); } @@ -1446,11 +1578,11 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "01", NULL); - if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) { + if (!k_exact_zero_p(dat->imag)) { rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational", self); } - return rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv); + return rb_funcallv(dat->real, rb_intern("rationalize"), argc, argv); } /* @@ -2024,9 +2156,10 @@ float_arg(VALUE self) * and i is imaginary unit. Real a equals complex a+0i * mathematically. * - * In ruby, you can create complex object with Complex, Complex::rect, - * Complex::polar or to_c method. + * Complex object can be created as literal, and also by using + * Kernel#Complex, Complex::rect, Complex::polar or to_c method. * + * 2+1i #=> (2+1i) * Complex(1) #=> (1+0i) * Complex(2, 3) #=> (2+3i) * Complex.polar(2, 3) #=> (-1.9799849932008908+0.2822400161197344i) @@ -2112,10 +2245,6 @@ Init_Complex(void) rb_undef_method(rb_cComplex, "truncate"); rb_undef_method(rb_cComplex, "i"); -#if 0 /* NUBY */ - rb_undef_method(rb_cComplex, "//"); -#endif - rb_define_method(rb_cComplex, "real", nucomp_real, 0); rb_define_method(rb_cComplex, "imaginary", nucomp_imag, 0); rb_define_method(rb_cComplex, "imag", nucomp_imag, 0); @@ -2163,6 +2292,12 @@ Init_Complex(void) rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0); rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0); + rb_undef_method(rb_cComplex, "positive?"); + rb_undef_method(rb_cComplex, "negative?"); + + rb_define_method(rb_cComplex, "finite?", rb_complex_finite_p, 0); + rb_define_method(rb_cComplex, "infinite?", rb_complex_infinite_p, 0); + rb_define_private_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0); compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject); /* :nodoc: */ rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1); diff --git a/configure.in b/configure.in index 7330df41ad..da0fc54997 100644 --- a/configure.in +++ b/configure.in @@ -11,6 +11,10 @@ AC_DEFUN([RUBY_PREREQ_AC], AC_DISABLE_OPTION_CHECKING +AC_ARG_VAR([cflags], [additional CFLAGS]) +AC_ARG_VAR([cppflags], [additional CPPFLAGS]) +AC_ARG_VAR([cxxflags], [additional CXXFLAGS]) + AC_DEFUN([RUBY_RM_RECURSIVE], [ m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [ # suppress error messages, rm: cannot remove 'conftest.dSYM', from @@ -39,10 +43,10 @@ AC_ARG_WITH(baseruby, AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)]) ], [ - BASERUBY="ruby" + AC_PATH_PROG([BASERUBY], [ruby], [false]) ]) -if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then - if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'p 42' 2>/dev/null`" = 42; then +if test "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42; then + if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42; then BASERUBY="$BASERUBY --disable=gems" fi $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub @@ -220,16 +224,22 @@ fi GNU_LD=$rb_cv_prog_gnu_ld AC_SUBST(GNU_LD)]) -eval `sed -n 's/^#define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/include/ruby/version.h` +eval `sed -n ['s/^@%:@define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/API_\1=\2/p'] $srcdir/include/ruby/version.h` +RUBY_PROGRAM_VERSION=`sed -n 's/^@%:@define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h` +MAJOR=`echo $RUBY_PROGRAM_VERSION | cut -d. -f1` +MINOR=`echo $RUBY_PROGRAM_VERSION | cut -d. -f2` +TEENY=`echo $RUBY_PROGRAM_VERSION | cut -d. -f3` for v in MAJOR MINOR TEENY; do if eval "test \"\$$v\" = ''"; then AC_MSG_ERROR(could not determine $v number from version.h) fi done +AS_IF([test "$MAJOR.$MINOR" != "$API_MAJOR.$API_MINOR"], [ + AC_MSG_ERROR([API version $API_MAJOR.$API_MINOR differs from program version $MAJOR.$MINOR]) +]) AC_SUBST(MAJOR) AC_SUBST(MINOR) AC_SUBST(TEENY) -RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h` AC_SUBST(RUBY_PROGRAM_VERSION) RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h` AC_DEFINE(CANONICALIZATION_FOR_MATHN) @@ -249,16 +259,7 @@ then AC_MSG_ERROR(cached CC is different -- throw away $cache_file (it is also a good idea to do 'make clean' before compiling)) fi -AS_CASE(["$build_os"], - [darwin1*.*], [ - AS_CASE(["x$CC"], - [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}], - [xgcc|x/usr/bin/gcc], [: ${CXX=g++}], - [xcc|x/usr/bin/cc], [: ${CXX=c++}], - [xclang|x/usr/bin/clang], [: ${CXX=clang++}]) - ]) test -z "$CC" || ac_cv_prog_CC="$CC" -test -z "$CXX" || ac_cv_prog_CXX="$CXX" if test "$program_prefix" = NONE; then program_prefix= @@ -432,8 +433,8 @@ else rb_cv_target_archs=${target_archs} fi if test "x${ARCH_FLAG}" != x; then - CFLAGS="$CFLAGS ${ARCH_FLAG}" - LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}" + CFLAGS="${CFLAGS:+$CFLAGS }${ARCH_FLAG}" + LDFLAGS="${LDFLAGS:+$LDFLAGS }${ARCH_FLAG}" fi # RUBY_UNIVERSAL_ARCH end ]) @@ -485,6 +486,19 @@ if test x"${build}" != x"${host}"; then fi AC_PROG_CC + +dnl Select the appropriate C++ compiler in OS X +AS_CASE(["$build_os"], + [darwin1*.*], [ + AS_CASE(["x$CC"], + [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}], + [xgcc|x/usr/bin/gcc], [: ${CXX=g++}], + [xcc|x/usr/bin/cc], [: ${CXX=c++}], + [xicc], [: ${CXX=icpc}], + [xclang|x/usr/bin/clang], [: ${CXX=clang++}]) + ]) +test -z "$CXX" || ac_cv_prog_CXX="$CXX" + AC_PROG_CXX RUBY_MINGW32 AC_PROG_GCC_TRADITIONAL @@ -510,8 +524,10 @@ RUBY_CPPOUTFILE : ${OUTFLAG='-o '} : ${COUTFLAG=${OUTFLAG}} +: ${CSRCFLAG=''} AC_SUBST(OUTFLAG) AC_SUBST(COUTFLAG) +AC_SUBST(CSRCFLAG) cc_version= for option in --version -v -V -qversion; do @@ -556,6 +572,12 @@ AC_CHECK_TOOL(AR, ar) if test -z "$AR"; then AC_CHECK_PROGS(AR, aal, ar) fi +AC_CACHE_CHECK([for $AR D option], [rb_cv_ar_D_option], [ + AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a], + [rb_cv_ar_D_option=yes], [rb_cv_ar_D_option=no]) +]) +AS_IF([test "$rb_cv_ar_D_option" = yes], [ARFLAGS='rcD '], [ARFLAGS='rcu ']) +AC_SUBST(ARFLAGS) AC_CHECK_TOOL(AS, as) ASFLAGS=$ASFLAGS @@ -617,8 +639,10 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE], [ echo "provider conftest{ probe fire(); };" > conftest_provider.d if $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then - # DTrace is available on the system - rb_cv_dtrace_available=yes + AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [ + # DTrace is available on the system + rb_cv_dtrace_available=yes + ], [rb_cv_dtrace_available=no]) else # DTrace is not available while dtrace command exists # for example FreeBSD 8 or FreeBSD 9 without DTrace build option @@ -631,6 +655,7 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE], AC_DEFUN([RUBY_DTRACE_POSTPROCESS], [AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g, [ + rb_cv_prog_dtrace_g=no if { cat >conftest_provider.d <<_PROBES && provider conftest { @@ -638,18 +663,20 @@ AC_DEFUN([RUBY_DTRACE_POSTPROCESS], }; _PROBES $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null && - cat >conftest.c <<_CONF && - @%:@include "conftest_provider.h" - int main(void){ CONFTEST_FIRE(); return 0; } -_CONF - $CC $CFLAGS $CPPFLAGS -c -o conftest.o conftest.c && - cp -p conftest.o conftest.oo && - $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null + : }; then - rb_cv_prog_dtrace_g=yes - cmp -b conftest.o conftest.oo || rb_cv_prog_dtrace_g=rebuild - else - rb_cv_prog_dtrace_g=no + AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [ + if { + cp -p conftest.${ac_objext} conftest.${ac_objext}.save && + $DTRACE -G -s conftest_provider.d conftest.${ac_objext} 2>/dev/null && + : + }; then + if cmp -s conftest.o conftest.${ac_objext}.save; then + rb_cv_prog_dtrace_g=yes + else + rb_cv_prog_dtrace_g=rebuild + fi + fi]) fi rm -f conftest.[co] conftest_provider.[dho] ]) @@ -738,7 +765,7 @@ RUBY_WERROR_FLAG([ cp ../confdefs.h . && echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist && : - } || AC_MSG_ERROR([faild to make temporary directory]) + } || AC_MSG_ERROR([failed to make temporary directory]) AC_TRY_LINK([], [], [AC_MSG_RESULT(yes)], [ @@ -793,9 +820,18 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then else extra_warning= fi + if test $gcc_major -eq 5; then + extra_warning="$extra_warning -Wno-maybe-uninitialized" + fi for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \ + -diag-disable=2259 \ -Wno-missing-field-initializers \ + -Wno-tautological-compare \ + -Wno-parentheses-equality \ + -Wno-constant-logical-operand \ + -Wno-self-assign \ -Wunused-variable \ + -Werror=implicit-int \ -Werror=pointer-arith \ -Werror=write-strings \ -Werror=declaration-after-statement \ @@ -804,6 +840,8 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then -Werror=division-by-zero \ -Werror=deprecated-declarations \ -Wno-packed-bitfield-compat \ + -Wsuggest-attribute=noreturn \ + -Wsuggest-attribute=format \ $extra_warning \ ; do if test "$particular_werror_flags" != yes; then @@ -831,6 +869,20 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then fi RUBY_TRY_CFLAGS(-Qunused-arguments, [RUBY_APPEND_OPTIONS(rb_cv_wsuppress_flags, -Qunused-arguments)]) +for n in infinity nan; do + m=AS_TR_CPP($n) + AC_CACHE_CHECK([whether $m is available without C99 option], rb_cv_$n, + [AC_COMPILE_IFELSE( + [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([@%:@include <math.h> +@%:@ifndef $m +@%:@error no $m +@%:@endif +]), [1])], [eval rb_cv_$n=yes], [eval rb_cv_$n=no])]) + if eval test '"$rb_cv_'$n'"' = yes; then + AC_DEFINE_UNQUOTED([HAVE_]$m) + fi +done + if test "$GCC" = yes; then # NaCl's glibc build generates undefined references to __memset_chk. # TODO(sbc): Remove this once NaCl's glibc is fixed. @@ -845,7 +897,7 @@ if test "$GCC" = yes; then # -fstack-protector AS_CASE(["$target_os"], - [mingw*|nacl|haiku], [ + [mingw*|nacl], [ stack_protector=no ]) if test -z "${stack_protector+set}"; then @@ -870,14 +922,9 @@ if test "$GCC" = yes; then [cygwin*|darwin*|netbsd*|nacl], [ # need lgamma_r(), finite() ], - [haiku], [ - # Haiku R1/alpha3 uses gcc-4.4.4 which can not handle anonymous union - # with ANSI standard flags. Anonumous union is required to compile - # socket extension where <net/if.h> uses anonymous union. - ], [ # ANSI (no XCFLAGS because this is C only) - for ansi_options in -std=iso9899:1999 "-ansi -std=iso9899:199409"; do + for ansi_options in -std=gnu99; do RUBY_TRY_CFLAGS(${ansi_options}, [ RUBY_APPEND_OPTIONS(warnflags, ${ansi_options}) RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options}) @@ -918,12 +965,19 @@ if test "$GCC" = yes; then AS_CASE(["$target_os"], [mingw*], [ RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"]) + RUBY_TRY_CFLAGS(-static-libgcc, [static_libgcc=yes], [static_libgcc=no]) + if test "$static_libgcc" = yes; then + RUBY_APPEND_OPTION(EXTLDFLAGS, -static-libgcc) + fi ]) # disable fast-math for oflag in -fno-fast-math; do RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)]) done + for oflag in -fexcess-precision=standard -fp-model\ precise; do + RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)]) + done fi AC_ARG_WITH(opt-dir, @@ -1004,6 +1058,13 @@ AS_CASE(["$target_os"], AC_DEFINE(BROKEN_SETREUID, 1) AC_DEFINE(BROKEN_SETREGID, 1) fi + incs=`$CC -v -E -xc - < /dev/null 2>&1 | sed ['1,/^@%:@include </d;s/^ *//;s|[^./][^/]*/\.\./||g;/\/include$/!d;s||/lib|;/\/usr\/lib/d']` + for d in `$CC -print-search-dirs | sed -e '/^libraries: */!d;s///' | tr : '\012' | fgrep -v /../ | sed -n 's|^\(/.*/lib\)/$|\1|p'`; do + incs=`echo "$incs" | fgrep -v "$d"` + done + for d in $incs; do + test -d "$d" && RUBY_APPEND_OPTIONS(LDFLAGS, "-L$d") + done ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage ac_cv_lib_crypt_crypt=no ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync() @@ -1011,38 +1072,51 @@ AS_CASE(["$target_os"], if test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \); then ac_cv_func___builtin_setjmp=no fi - AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt, - [AC_TRY_RUN([ + AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt, + [AC_TRY_RUN([ #include <stdio.h> #include <unistd.h> #include <string.h> +void +broken_crypt(const char *salt, const char *buf1, const char *buf2) +{ +#if 0 + printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1], + buf1+2, buf2+2); +#endif +} + int main() { int i; + char salt[2], buf[256], *s; for (i = 0; i < 128*128; i++) { - char salt[2], buf[256], *s; salt[0] = 0x80 | (i & 0x7f); salt[1] = 0x80 | (i >> 7); strcpy(buf, crypt("", salt)); if (strcmp(buf, s = crypt("", salt))) { -#if 0 - printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1], - buf+2, s+2); -#endif + broken_crypt(salt, buf, s); return 1; } } + salt[0] = salt[1] = ' '; + strcpy(buf, crypt("", salt)); + salt[0] = salt[1] = 0x80 | ' '; + if (strcmp(buf, s = crypt("", salt))) { + broken_crypt(salt, buf, s); + return 1; + } return 0; } ], - rb_cv_broken_crypt=no, - rb_cv_broken_crypt=yes, - rb_cv_broken_crypt=yes)]) - if test "$rb_cv_broken_crypt" = yes; then - AC_DEFINE(BROKEN_CRYPT, 1) - fi + rb_cv_broken_crypt=no, + rb_cv_broken_crypt=yes, + rb_cv_broken_crypt=yes)]) + if test "$rb_cv_broken_crypt" = yes; then + AC_DEFINE(BROKEN_CRYPT, 1) + fi AC_CHECK_PROGS(codesign, codesign) if test -n "$codesign"; then POSTLINK="test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@" @@ -1055,16 +1129,63 @@ main() ], [hpux*], [ LIBS="-lm $LIBS" ac_cv_c_inline=no], -[beos*|haiku*], [ - ac_cv_func_link=no - ac_cv_func_sched_yield=no - ac_cv_func_pthread_attr_setinheritsched=no - AS_CASE(["$target_os"], - [beos*], [ ac_cv_header_net_socket_h=yes], - [haiku*], [ ac_cv_func_shutdown=no]) - LIBS="$LIBS" # m lib is include in root under BeOS/Haiku +[solaris*], [ LIBS="-lm $LIBS" + ac_cv_func_vfork=no + AC_MSG_CHECKING(whether _XOPEN_SOURCE is already given) + AC_TRY_COMPILE([#include <unistd.h> + #ifndef _XOPEN_SOURCE + #error _XOPEN_SOURCE is not defined + #endif + ], [], + [given_xopen_source=yes], [given_xopen_source=no]) + AC_MSG_RESULT($given_xopen_source) + if test $given_xopen_source = no; then + # On Solaris, with gcc, -std=iso9899:1999 in $ansi_options + # is often also needed in CPPFLAGS, because some feature + # definitions vary depending on such standards options. + AS_CASE(["${ansi_options}"], + [*-std=iso9899:1999*], [ + RUBY_APPEND_OPTIONS(CPPFLAGS, ${ansi_options}) + ]) + AC_MSG_CHECKING(appropriate _XOPEN_SOURCE value to define) + define_xopen_source="" + for tmp_xpg in 7 6 5; do + if test x"$define_xopen_source" != x; then + break + fi + # Both AC_TRY_CPP and AC_TRY_COMPILE should pass + # because some options may not be set to CPPFLAGS. + AC_TRY_CPP([ + #define _XOPEN_SOURCE ${tmp_xpg}00 + #include <unistd.h> + #ifndef _XPG${tmp_xpg} + #error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00 + #endif + ], [ + AC_TRY_COMPILE([ + #define _XOPEN_SOURCE ${tmp_xpg}00 + #include <unistd.h> + #ifndef _XPG${tmp_xpg} + #error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00 + #endif + ], [], + [define_xopen_source=${tmp_xpg}00], []) + ], []) + done + if test x"$define_xopen_source" = x; then + define_xopen_source=no + fi + AC_MSG_RESULT($define_xopen_source) + if test x"$define_xopen_source" != xno; then + RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source) + fi + fi + ], +[haiku*], [ + LIBS="$LIBS" # m lib is include in root ], [cygwin*], [ ac_cv_header_langinfo_h=yes + RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_GNU_SOURCE) AC_CHECK_FUNCS(cygwin_conv_path) AC_LIBOBJ([langinfo]) ], @@ -1079,6 +1200,7 @@ main() ac_cv_header_sys_time_h=no ac_cv_header_sys_times_h=no ac_cv_header_sys_socket_h=no + ac_cv_func_lstat=yes ac_cv_func_times=yes ac_cv_func_waitpid=yes ac_cv_func_fsync=yes @@ -1087,7 +1209,10 @@ main() ac_cv_func_isinf=yes ac_cv_func_isnan=yes ac_cv_func_finite=yes + ac_cv_func_lchown=yes ac_cv_func_link=yes + ac_cv_func_readlink=yes + ac_cv_func_symlink=yes ac_cv_lib_crypt_crypt=no ac_cv_func_getpgrp_void=no ac_cv_func_memcmp_working=yes @@ -1110,10 +1235,9 @@ main() AC_DEFINE(HAVE_TYPE_NET_LUID, 1) fi AC_CHECK_FUNCS(_gmtime64_s) + AC_CHECK_FUNCS(_wfreopen_s) AC_LIBOBJ([langinfo]) ], -[os2-emx*], [ LIBS="-lm $LIBS" - ac_cv_lib_dir_opendir=no], [bsdi*], [ LIBS="-lm $LIBS" AC_DEFINE(BROKEN_SETREUID, 1) AC_DEFINE(BROKEN_SETREGID, 1) @@ -1131,6 +1255,9 @@ main() ac_cv_func_isinf=yes ac_cv_func_isnan=yes ], +[aix*],[ LIBS="-lm $LIBS" + ac_cv_func_round=no + ], [nacl], [ LIBS="-lm $LIBS" if test "${nacl_cv_build_variant}" = "newlib"; then @@ -1151,47 +1278,46 @@ AC_HEADER_DIRENT dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS AC_HEADER_STDBOOL AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS( \ - limits.h \ - sys/file.h \ - sys/ioctl.h \ - sys/syscall.h \ - fcntl.h \ - sys/fcntl.h \ - sys/param.h \ - sys/select.h \ - sys/time.h \ - sys/times.h \ - syscall.h \ - pwd.h \ - grp.h \ - a.out.h \ - utime.h \ - direct.h \ - sys/resource.h \ - sys/mkdev.h \ - sys/utime.h \ - float.h \ - ieeefp.h \ - ucontext.h \ - intrinsics.h \ - langinfo.h \ - locale.h \ - sys/sendfile.h \ - time.h \ - net/socket.h \ - sys/socket.h \ - process.h \ - sys/prctl.h \ - sys/uio.h \ - atomic.h \ - malloc.h \ - malloc_np.h \ - malloc/malloc.h \ - setjmpex.h \ - sys/attr.h \ - sys/id.h -) + +AC_CHECK_HEADERS(a.out.h) +AC_CHECK_HEADERS(atomic.h) +AC_CHECK_HEADERS(direct.h) +AC_CHECK_HEADERS(grp.h) +AC_CHECK_HEADERS(fcntl.h) +AC_CHECK_HEADERS(float.h) +AC_CHECK_HEADERS(ieeefp.h) +AC_CHECK_HEADERS(intrinsics.h) +AC_CHECK_HEADERS(langinfo.h) +AC_CHECK_HEADERS(limits.h) +AC_CHECK_HEADERS(locale.h) +AC_CHECK_HEADERS(malloc.h) +AC_CHECK_HEADERS(malloc/malloc.h) +AC_CHECK_HEADERS(malloc_np.h) +AC_CHECK_HEADERS(net/socket.h) +AC_CHECK_HEADERS(process.h) +AC_CHECK_HEADERS(pwd.h) +AC_CHECK_HEADERS(setjmpex.h) +AC_CHECK_HEADERS(sys/attr.h) +AC_CHECK_HEADERS(sys/fcntl.h) +AC_CHECK_HEADERS(sys/file.h) +AC_CHECK_HEADERS(sys/id.h) +AC_CHECK_HEADERS(sys/ioctl.h) +AC_CHECK_HEADERS(sys/mkdev.h) +AC_CHECK_HEADERS(sys/param.h) +AC_CHECK_HEADERS(sys/prctl.h) +AC_CHECK_HEADERS(sys/resource.h) +AC_CHECK_HEADERS(sys/select.h) +AC_CHECK_HEADERS(sys/sendfile.h) +AC_CHECK_HEADERS(sys/socket.h) +AC_CHECK_HEADERS(sys/syscall.h) +AC_CHECK_HEADERS(sys/time.h) +AC_CHECK_HEADERS(sys/times.h) +AC_CHECK_HEADERS(sys/uio.h) +AC_CHECK_HEADERS(sys/utime.h) +AC_CHECK_HEADERS(syscall.h) +AC_CHECK_HEADERS(time.h) +AC_CHECK_HEADERS(ucontext.h) +AC_CHECK_HEADERS(utime.h) AC_ARG_WITH([gmp], [AS_HELP_STRING([--without-gmp], @@ -1241,6 +1367,24 @@ dnl check for large file stuff mv confdefs.h confdefs1.h : > confdefs.h AC_SYS_LARGEFILE +# On 32-bit Solaris, it is safe to define _LARGEFILE_SOURCE +# which is not added by AC_SYS_LARGEFILE. +if test x"$enable_largefile" != xno; then + AS_CASE(["$target_os"], [solaris*], [ + AC_MSG_CHECKING([wheather _LARGEFILE_SOURCE should be defined]) + AS_CASE(["${ac_cv_sys_file_offset_bits}:${ac_cv_sys_large_files}"], + ["64:"|"64:no"|"64:unknown"], [ + # insert _LARGEFILE_SOURCE before _FILE_OFFSET_BITS line + # that is the same order as "getconf LFS_CFLAGS" output + mv confdefs.h largefile0.h + : > confdefs.h + AC_DEFINE(_LARGEFILE_SOURCE) + cat largefile0.h >> confdefs.h + rm largefile0.h + AC_MSG_RESULT([yes]) + ], [AC_MSG_RESULT([no])]) + ]) +fi mv confdefs.h largefile.h mv confdefs1.h confdefs.h cat largefile.h >> confdefs.h @@ -1278,6 +1422,12 @@ AC_CACHE_CHECK([char bit], [rb_cv_char_bit], dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include] AC_DEFUN([RUBY_CHECK_SIZEOF], +[dnl +AS_VAR_PUSHDEF([rbcv_var], [rbcv_sizeof_var])dnl +AS_VAR_PUSHDEF([cond], [rbcv_sizeof_cond])dnl +AS_VAR_PUSHDEF([t], [rbcv_sizeof_type])dnl +AS_VAR_PUSHDEF([s], [rbcv_sizeof_size])dnl +] [m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then]) AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [ unset AS_TR_SH(ac_cv_sizeof_$1) @@ -1295,7 +1445,12 @@ static ac__type_sizeof_ *rbcv_ptr; AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t) break]) done - }]) + }], [ + AC_COMPUTE_INT([AS_TR_SH(ac_cv_sizeof_$1)], [AS_TR_CPP(SIZEOF_$1)], + [AC_INCLUDES_DEFAULT([$4]) +$rbcv_var], + [AS_TR_SH(ac_cv_sizeof_$1)=]) + ]) unset cond m4_ifval([$3], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && { for s in 32 64 128; do @@ -1311,11 +1466,22 @@ static ac__type_sizeof_ *rbcv_ptr; AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr], [!AS_TR_CPP(HAVE_$1)])], [continue]) AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr] [$rbcv_var], - [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ([$[s / rb_cv_char_bit]]))])], - [AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"]) + [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ($s / $rb_cv_char_bit))])], + [AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"; continue]) + AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr] +[ +@%:@if AS_TR_CPP(HAVE_$1) +$rbcv_var +@%:@else +@%:@define AS_TR_CPP(SIZEOF_$1) 0 +@%:@endif +], + [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == (m4_bmatch([$2], [^[0-9][0-9]*$], [$2], [($s / $rb_cv_char_bit)])))])], + [AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}m4_bmatch([$2], [^[0-9][0-9]*$], [:$2])"]) done done }]) + test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@@<:@1-9@:>@}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" && m4_ifval([$2][$3], [test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@SIZEOF_}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" && ]){ test "$universal_binary" = yes && cross_compiling=yes @@ -1340,13 +1506,14 @@ ${cond+@%:@endif} AS_CASE(["$t"], [[[0-9]*|SIZEOF_*]], [ ${cond+echo "@%:@else"} - echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]" + echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) $t" break ], [ s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']` + AS_CASE([$t], [*:*], [t="${t%:*}"], [s=`expr $s / $rb_cv_char_bit`]) echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)" - echo "@%:@define AS_TR_CPP(SIZEOF_$1) [$[s / rb_cv_char_bit]]" + echo "@%:@define AS_TR_CPP(SIZEOF_$1) $s" cond=1 ]) done @@ -1355,14 +1522,18 @@ ${cond+@%:@endif} m4_bmatch([$1], [\.], [], [else AC_CHECK_SIZEOF([$1], 0, [$4]) fi]) +AS_VAR_POPDEF([rbcv_var])dnl +AS_VAR_POPDEF([cond])dnl +AS_VAR_POPDEF([t])dnl +AS_VAR_POPDEF([s])dnl ]) RUBY_CHECK_SIZEOF(int, [], [ILP]) RUBY_CHECK_SIZEOF(short) RUBY_CHECK_SIZEOF(long, [int], [ILP LP]) RUBY_CHECK_SIZEOF(long long) -RUBY_CHECK_SIZEOF(__int64) -RUBY_CHECK_SIZEOF(__int128) +RUBY_CHECK_SIZEOF(__int64, [8], [ILP LP]) +RUBY_CHECK_SIZEOF(__int128, [16], [ILP LP]) RUBY_CHECK_SIZEOF(off_t) RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP]) RUBY_CHECK_SIZEOF(float) @@ -1419,7 +1590,7 @@ elif test "x$ac_cv_type___int64" = xyes; then RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL) fi -dnl RUBY_CHECK_SIZEOF [typename] [if-signed] [if-unsigned] [included] +dnl RUBY_CHECK_SIGNEDNESS [typename] [if-signed] [if-unsigned] [included] AC_DEFUN([RUBY_CHECK_SIGNEDNESS], [dnl AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])], [($1)-1 > 0])], [$3], [$2])]) @@ -1460,7 +1631,16 @@ AC_DEFUN([RUBY_REPLACE_TYPE], [dnl [ t=INT]) rb_cv_[$1]_convertible=${u}${t}]) - test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes" && n="$1" + if test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes"; then + n="$1" + else + AS_CASE(["${rb_cv_[$1]_convertible}"], + [*LL], [n="long long"], + [*LONG], [n="long"], + [n="int"]) + AS_CASE(["${rb_cv_[$1]_convertible}"], + [U*], [n="unsigned $n"]) + fi AS_CASE("${rb_cv_[$1]_convertible}", [U*], [u=+1], [u=-1]) AC_DEFINE_UNQUOTED(rb_[$1], $n) AC_DEFINE_UNQUOTED([SIGNEDNESS_OF_]AS_TR_CPP($1), $u) @@ -1582,19 +1762,20 @@ EOH ])dnl ])dnl -dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition) -AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl +dnl RUBY_DECL_ATTRIBUTE(attrib, macroname, cachevar, condition, type, code) +AC_DEFUN([RUBY_DECL_ATTRIBUTE], [dnl m4_ifval([$2], dnl - [AS_VAR_PUSHDEF([attrib],[$2])], dnl - [AS_VAR_PUSHDEF([attrib],[FUNC_]AS_TR_CPP($1))] dnl + [AS_VAR_PUSHDEF([attrib], m4_bpatsubst([$2], [(.*)], []))], dnl + [AS_VAR_PUSHDEF([attrib], m4_toupper(m4_format(%.4s, [$5]))[_]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 + [AS_VAR_PUSHDEF([rbcv],[rb_cv_]m4_format(%.4s, [$5])[_][$1])]dnl )dnl -m4_pushdef([attrib_code],[m4_bpatsubst([$1],["],[\\"])]) +m4_pushdef([attrib_code],[m4_bpatsubst([$1],["],[\\"])])dnl +m4_pushdef([attrib_params],[m4_bpatsubst([$2(x)],[^[^()]*(\([^()]*\)).*],[\1])])dnl m4_ifval([$4], [rbcv_cond=["$4"]; test "$rbcv_cond" || unset rbcv_cond]) -AC_CACHE_CHECK(for m4_ifval([$2],[$2],[$1]) function attribute, rbcv, +AC_CACHE_CHECK(for m4_ifval([$2],[m4_bpatsubst([$2], [(.*)], [])],[$1]) [$5] attribute, rbcv, dnl [rbcv=x RUBY_WERROR_FLAG([ for mac in \ @@ -1605,31 +1786,62 @@ for mac in \ m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"}) AC_TRY_COMPILE( m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond}) -[@%:@define ]attrib[(x) $mac] +[@%:@define ]attrib[](attrib_params)[ $mac] m4_ifval([$4],${rbcv_cond+[@%:@else]} -${rbcv_cond+[@%:@define ]attrib[(x) x]} +${rbcv_cond+[@%:@define ]attrib[](attrib_params)[ x]} ${rbcv_cond+[@%:@endif]}) - attrib[(void conftest_attribute_check(void));], [], +$6 +@%:@define mesg ("") + attrib[](attrib_params)[;], [], [rbcv="$mac"; break]) done ])]) if test "$rbcv" != x; then - RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[(x)], $rbcv) + RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[](attrib_params)[], $rbcv) fi m4_ifval([$4], [unset rbcv_cond]) dnl +m4_popdef([attrib_params])dnl +m4_popdef([attrib_code])dnl AS_VAR_POPDEF([attrib])dnl AS_VAR_POPDEF([rbcv])dnl ]) -RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN) -RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED) -RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE) +dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition) +AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl + RUBY_DECL_ATTRIBUTE([$1], [$2], [$3], [$4], + [function], [@%:@define x void conftest_attribute_check(void)] + ) +]) + +dnl RUBY_TYPE_ATTRIBUTE(attrib, macroname, cachevar, condition) +AC_DEFUN([RUBY_TYPE_ATTRIBUTE], [dnl + RUBY_DECL_ATTRIBUTE([$1], [$2], [$3], [$4], + [type], [ +@%:@define x struct conftest_attribute_check {int i;} +]) +]) + +RUBY_FUNC_ATTRIBUTE(__const__, CONSTFUNC) +RUBY_FUNC_ATTRIBUTE(__pure__, PUREFUNC) +RUBY_FUNC_ATTRIBUTE(__noreturn__, NORETURN) +RUBY_FUNC_ATTRIBUTE(__deprecated__, DEPRECATED) +RUBY_FUNC_ATTRIBUTE(__deprecated__("by "@%:@n), DEPRECATED_BY(n,x), rb_cv_func_deprecated_by) +RUBY_TYPE_ATTRIBUTE(__deprecated__ mesg, DEPRECATED_TYPE(mesg,x), rb_cv_type_deprecated) +RUBY_FUNC_ATTRIBUTE(__noinline__, NOINLINE) +RUBY_FUNC_ATTRIBUTE(__always_inline__, ALWAYS_INLINE) +RUBY_FUNC_ATTRIBUTE(__error__ mesg, ERRORFUNC(mesg,x), rb_cv_func___error__) +RUBY_FUNC_ATTRIBUTE(__warning__ mesg, WARNINGFUNC(mesg,x), rb_cv_func___warning__) +RUBY_FUNC_ATTRIBUTE(__weak__, WEAK, rb_cv_func_weak) +if test "$rb_cv_func_weak" != x; then + AC_DEFINE(HAVE_FUNC_WEAK) +fi if_i386=${universal_binary+[defined __i386__]} -RUBY_FUNC_ATTRIBUTE(stdcall, [], [], ${if_i386}) -RUBY_FUNC_ATTRIBUTE(cdecl, [], [], ${if_i386}) -RUBY_FUNC_ATTRIBUTE(fastcall, [], [], ${if_i386}) -RUBY_FUNC_ATTRIBUTE(optimize("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized) +RUBY_FUNC_ATTRIBUTE(__stdcall__, FUNC_STDCALL, rb_cv_func_stdcall, ${if_i386}) +RUBY_FUNC_ATTRIBUTE(__cdecl__, FUNC_CDECL, rb_cv_func_cdecl, ${if_i386}) +RUBY_FUNC_ATTRIBUTE(__fastcall__, FUNC_FASTCALL, rb_cv_func_fastcall, ${if_i386}) +RUBY_FUNC_ATTRIBUTE(__optimize__("O0"), FUNC_UNOPTIMIZED, rb_cv_func_unoptimized) +RUBY_FUNC_ATTRIBUTE(__optimize__("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized) if test "$GCC" = yes; then AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias], @@ -1694,7 +1906,7 @@ fi AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [ rb_cv_func_exported=no RUBY_WERROR_FLAG([ -for mac in '__attribute__ ((visibility("default")))' '__declspec(dllexport)'; do +for mac in '__attribute__ ((__visibility__("default")))' '__declspec(dllexport)'; do AC_TRY_COMPILE([@%:@define RUBY_FUNC_EXPORTED $mac extern RUBY_FUNC_EXPORTED void conftest_attribute_check(void);], [], [rb_cv_func_exported="$mac"; break]) @@ -1722,6 +1934,32 @@ if test "$rb_cv_function_name_string" != no; then AC_DEFINE_UNQUOTED(RUBY_FUNCTION_NAME_STRING, [$rb_cv_function_name_string]) fi +AC_CACHE_CHECK(if enum over int is allowed, rb_cv_enum_over_int, [ + rb_cv_enum_over_int=no + if test "x$ac_cv_type_long_long" = xyes; then + type="unsigned long long" max="ULLONG_MAX" + else + type="unsigned long" max="ULONG_MAX" + fi + RUBY_WERROR_FLAG([ + AC_COMPILE_IFELSE([ + AC_LANG_BOOL_COMPILE_TRY([ + @%:@include <limits.h> + enum {conftest_max = $max}; + ], [ + (conftest_max == $max) && + (sizeof(conftest_max) == sizeof($type)) + ] + )], + [rb_cv_enum_over_int=yes], + [rb_cv_enum_over_int=no] + ) + ]) +]) +if test $rb_cv_enum_over_int = yes; then + AC_DEFINE(ENUM_OVER_INT, 1) +fi + dnl Check whether we need to define sys_nerr locally AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default @%:@include <errno.h>]) @@ -1823,8 +2061,10 @@ if test "$rb_cv_large_fd_select" = yes; then AC_DEFINE(HAVE_RB_FD_INIT, 1) fi -dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES] +dnl RUBY_DEFINT TYPENAME, SIZE, [UNSIGNED], [INCLUDES = DEFAULT-INCLUDES] AC_DEFUN([RUBY_DEFINT], [dnl +AS_VAR_PUSHDEF([cond], [rb_defint_cond])dnl +AS_VAR_PUSHDEF([type], [rb_defint_type])dnl AC_CACHE_CHECK([for $1], [rb_cv_type_$1], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4]) typedef $1 t; int s = sizeof(t) == 42;])], @@ -1835,19 +2075,30 @@ typedef $1 t; int s = sizeof(t) == 42;])], ["$ac_cv_sizeof_int"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])int"], ["$ac_cv_sizeof_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long"], ["$ac_cv_sizeof_long_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long long"], - ["$ac_cv_sizeof___int64"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64"], - ["$ac_cv_sizeof___int128"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int128"], + ["${ac_cv_sizeof___int64@%:@*:}"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64"], + ["${ac_cv_sizeof___int128@%:@*:}"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int128"], [ rb_cv_type_$1=no])])]) if test "${rb_cv_type_$1}" != no; then + type="${rb_cv_type_$1@%:@@%:@unsigned }" + AS_IF([test "$type" != yes && eval 'test -n "${ac_cv_sizeof_'$type'+set}"'], [ + eval cond='"${ac_cv_sizeof_'$type'}"' + AS_CASE([$cond], [*:*], [ + cond=AS_TR_CPP($type) + echo "@%:@if defined SIZEOF_"$cond" && SIZEOF_"$cond" > 0" >> confdefs.h + ], [cond=]) + ], [cond=]) AC_DEFINE([HAVE_]AS_TR_CPP($1), 1) if test "${rb_cv_type_$1}" = yes; then m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [AC_INCLUDES_DEFAULT([$4])])], [RUBY_CHECK_SIZEOF([$1], [$2], [], [AC_INCLUDES_DEFAULT([$4])])]) else AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1]) - AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1])) + AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$type])) fi + test -n "$cond" && echo "@%:@endif /* $cond */" >> confdefs.h fi +AS_VAR_POPDEF([cond])dnl +AS_VAR_POPDEF([type])dnl ]) RUBY_DEFINT(int8_t, 1) @@ -1975,6 +2226,7 @@ AC_REPLACE_FUNCS(cbrt) AC_REPLACE_FUNCS(crypt) AC_REPLACE_FUNCS(dup2) AC_REPLACE_FUNCS(erf) +AC_REPLACE_FUNCS(explicit_bzero) AC_REPLACE_FUNCS(ffs) AC_REPLACE_FUNCS(finite) AC_REPLACE_FUNCS(flock) @@ -2012,17 +2264,46 @@ else AC_LIBOBJ([signbit]) fi +AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [ + AC_TRY_RUN([ +@%:@include <string.h> + +int +main(int argc, char **argv) +{ + const char *str = "hogefugafoobar"; + const char *rs = "foo"; + const char *empty = ""; + char *p; + + p = memmem(str, strlen(str), rs, strlen(rs)); + if (p == str+8) { + p = memmem(str, strlen(str), empty, strlen(empty)); + if (p == str) + return 0; + } + return 1; +} + ], + rb_cv_broken_memmem=no, + rb_cv_broken_memmem=yes, + rb_cv_broken_memmem=yes) +]) +test x"$rb_cv_broken_memmem" = xyes && ac_cv_func_memmem=no + AC_FUNC_FORK AC_CHECK_FUNCS(__syscall) AC_CHECK_FUNCS(_longjmp) # used for AC_ARG_WITH(setjmp-type) -AC_CHECK_FUNCS(_setjmp) # used for AC_ARG_WITH(setjmp-type) -AC_CHECK_FUNCS(_setjmpex) # used for AC_ARG_WITH(setjmp-type) +# we don't use _setjmp if _longjmp doesn't exist. +test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no +AC_CHECK_FUNCS(arc4random_buf) AC_CHECK_FUNCS(atan2l atan2f) AC_CHECK_FUNCS(chroot) AC_CHECK_FUNCS(chsize) AC_CHECK_FUNCS(clock_gettime) AC_CHECK_FUNCS(cosh) +AC_CHECK_FUNCS(crypt_r) AC_CHECK_FUNCS(daemon) AC_CHECK_FUNCS(dirfd) AC_CHECK_FUNCS(dl_iterate_phdr) @@ -2074,9 +2355,12 @@ AC_CHECK_FUNCS(malloc_usable_size) AC_CHECK_FUNCS(malloc_size) AC_CHECK_FUNCS(mblen) AC_CHECK_FUNCS(memalign) +AC_CHECK_FUNCS(memset_s) AC_CHECK_FUNCS(writev) AC_CHECK_FUNCS(memrchr) AC_CHECK_FUNCS(memmem) +AC_CHECK_FUNCS(mkfifo) +AC_CHECK_FUNCS(mknod) AC_CHECK_FUNCS(mktime) AC_CHECK_FUNCS(pipe2) AC_CHECK_FUNCS(poll) @@ -2085,6 +2369,7 @@ AC_CHECK_FUNCS(posix_memalign) AC_CHECK_FUNCS(ppoll) AC_CHECK_FUNCS(pread) AC_CHECK_FUNCS(qsort_r) +AC_CHECK_FUNCS(qsort_s) AC_CHECK_FUNCS(readlink) AC_CHECK_FUNCS(round) AC_CHECK_FUNCS(sched_getaffinity) @@ -2128,6 +2413,9 @@ AC_CHECK_FUNCS(utimes) AC_CHECK_FUNCS(wait4) AC_CHECK_FUNCS(waitpid) +AS_IF([test "$ac_cv_func_memset_s" = yes], + [RUBY_DEFINE_IF([!defined __STDC_WANT_LIB_EXT1__], [__STDC_WANT_LIB_EXT1__], 1)]) + AS_IF([test "$ac_cv_func_getcwd" = yes], [ AC_CACHE_CHECK(if getcwd allocates buffer if NULL is given, [rb_cv_getcwd_malloc], [AC_TRY_RUN([ @@ -2159,6 +2447,10 @@ main(int argc, char **argv) AS_IF([test "$rb_cv_getcwd_malloc" = no], [AC_DEFINE(NO_GETCWD_MALLOC, 1)]) ]) +AS_IF([test "$ac_cv_func_crypt_r" = yes], + [AC_CHECK_MEMBERS([struct crypt_data.initialized], [], [], + [AC_INCLUDES_DEFAULT([@%:@include <crypt.h>])])]) + AC_DEFUN([RUBY_CHECK_BUILTIN_FUNC], [dnl AC_CACHE_CHECK([for $1], AS_TR_SH(rb_cv_builtin_$1), [AC_LINK_IFELSE( @@ -2171,11 +2463,24 @@ fi]) RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap16, [__builtin_bswap16(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap32, [__builtin_bswap32(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap64, [__builtin_bswap64(0)]) +RUBY_CHECK_BUILTIN_FUNC(__builtin_popcount, [__builtin_popcount(0)]) +RUBY_CHECK_BUILTIN_FUNC(__builtin_popcountll, [__builtin_popcountll(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clz, [__builtin_clz(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)]) RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)]) -RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [__builtin_choose_expr(0, 0, 0)]) -RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [__builtin_choose_expr(__builtin_constant_p(foo), 0, 0)]) +RUBY_CHECK_BUILTIN_FUNC(__builtin_ctz, [__builtin_ctz(0)]) +RUBY_CHECK_BUILTIN_FUNC(__builtin_ctzll, [__builtin_ctzll(0)]) +RUBY_CHECK_BUILTIN_FUNC(__builtin_constant_p, [__builtin_constant_p(0)]) +RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [ + [int x[__extension__(__builtin_choose_expr(1, 1, -1))]]; + [int y[__extension__(__builtin_choose_expr(0, -1, 1))]]; + ]) +if test x$rb_cv_builtin___builtin_choose_expr = xyes; then + RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [ + [int x[__extension__(__builtin_choose_expr(__builtin_constant_p(1), 1, -1))]]; + [int y[__extension__(__builtin_choose_expr(__builtin_constant_p(foo), -1, 1))]]; + ]) +fi RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)]) if test "$ac_cv_func_qsort_r" != no; then @@ -2201,6 +2506,9 @@ void qsort_r(void *base, size_t nmemb, size_t size, AS_CASE("$rb_cv_gnu_qsort_r:$rb_cv_bsd_qsort_r", [yes:no], [ AC_DEFINE(HAVE_GNU_QSORT_R, 1) + ], + [no:yes], [ + AC_DEFINE(HAVE_BSD_QSORT_R, 1) ]) fi @@ -2233,6 +2541,47 @@ main(int argc, char **argv) ]) AS_IF([test "x$rb_cv_atan2_inf_c99" = xyes], [AC_DEFINE(ATAN2_INF_C99)]) +AS_IF([test "x$ac_cv_func_lgamma_r" = xyes], [ + AC_CACHE_CHECK(whether lgamma_r handles +0.0 and -0.0, rb_cv_lgamma_r_pm0, [ + AC_TRY_RUN([ +@%:@include <math.h> +@%:@ifdef HAVE_UNISTD_H +@%:@include <unistd.h> +@%:@endif +@%:@ifndef EXIT_SUCCESS +@%:@define EXIT_SUCCESS 0 +@%:@endif +@%:@ifndef EXIT_FAILURE +@%:@define EXIT_FAILURE 1 +@%:@endif + +int +main(int argc, char **argv) +{ + int sign = 0; + double x = lgamma_r(-0.0, &sign); + + /* should be [+inf, -1] */ + if (x <= 0) return EXIT_FAILURE; + if (!isinf(x)) return EXIT_FAILURE; + if (sign != -1) return EXIT_FAILURE; + + /* should be [+inf, 1] */ + x = lgamma_r(+0.0, &sign); + if (x <= 0) return EXIT_FAILURE; + if (!isinf(x)) return EXIT_FAILURE; + if (sign != 1) return EXIT_FAILURE; + return EXIT_SUCCESS; +} +], + [rb_cv_lgamma_r_pm0=yes], + [rb_cv_lgamma_r_pm0=no], + [rb_cv_lgamma_r_pm0=yes] + ) + ]) + AS_IF([test "x$rb_cv_lgamma_r_pm0" = xno], [AC_DEFINE(LGAMMA_R_PM0_FIX)]) +]) + # Some platform need -lrt for clock_gettime, but the other don't. if test x"$ac_cv_func_clock_gettime" != xyes; then # glibc 2.17 moves clock_* functions from librt to the main C library. @@ -2255,12 +2604,21 @@ if test "$rb_cv_unsetenv_return_value" = no; then fi # used for AC_ARG_WITH(setjmp-type) -AC_CACHE_CHECK(for sigsetjmp as a macro or function, ac_cv_func_sigsetjmp, +AC_DEFUN([RUBY_CHECK_SETJMP], [ +AC_CACHE_CHECK([for ]$1[ as a macro or function], ac_cv_func_$1, [AC_TRY_COMPILE([ -#include <setjmp.h> -], [sigjmp_buf env; sigsetjmp(env,1);], - ac_cv_func_sigsetjmp=yes, - ac_cv_func_sigsetjmp=no)]) +@%:@include <setjmp.h> +]AC_INCLUDES_DEFAULT([$3])[ +@%:@define JMPARGS_1 env +@%:@define JMPARGS_2 env,1 +@%:@define JMPARGS JMPARGS_]m4_ifval($2,2,1)[ +], + m4_ifval($2,$2,jmp_buf)[ env; $1(JMPARGS);], + ac_cv_func_$1=yes, + ac_cv_func_$1=no)] +) +AS_IF([test "$ac_cv_func_]$1[" = yes], [AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)]) +]) AC_DEFUN([RUBY_CHECK_BUILTIN_SETJMP], [ if test x"${ac_cv_func___builtin_setjmp}" = xyes; then @@ -2274,6 +2632,9 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp, [AC_TRY_LINK([@%:@include <setjmp.h> @%:@include <stdio.h> jmp_buf jb; + @%:@ifdef NORETURN + NORETURN(void t(void)); + @%:@endif void t(void) {__builtin_longjmp($cast jb, 1);} int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}], [ @@ -2286,11 +2647,11 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp, done]) ]) -# we don't use _setjmp if _longjmp doesn't exist. -test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no - AC_DEFUN([RUBY_SETJMP_TYPE], [ RUBY_CHECK_BUILTIN_SETJMP +RUBY_CHECK_SETJMP(_setjmpex, [], [@%:@include <setjmpex.h>]) +RUBY_CHECK_SETJMP(_setjmp) +RUBY_CHECK_SETJMP(sigsetjmp, [sigjmp_buf]) AC_MSG_CHECKING(for setjmp type) setjmp_suffix= AC_ARG_WITH(setjmp-type, @@ -2335,6 +2696,7 @@ AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cas AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})]) AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)]) AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf) +AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)]) ]) # End of setjmp check. @@ -2347,7 +2709,11 @@ if test "$use_setreuid" = yes; then fi AC_STRUCT_TIMEZONE AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff, - [AC_TRY_COMPILE([@%:@include <time.h>], + [AC_TRY_COMPILE([ +@%:@define _BSD_SOURCE +@%:@define _DEFAULT_SOURCE +@%:@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])]) @@ -2519,6 +2885,8 @@ main() fi fi +AC_CHECK_TYPES([sig_t],[],[],[@%:@include <signal.h>]) + if test "$ac_cv_func_getpgid" = no; then # AC_FUNC_GETPGRP fails when cross-compiling with old autoconf. # autoconf is changed between 2.52d and 2.52f? @@ -2533,6 +2901,14 @@ if test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes; then AC_FUNC_SETPGRP fi +if test x"$ac_cv_func_dirfd" = xno; then + AS_CASE(["$target_os"],[solaris*], + [AC_CHECK_MEMBERS([DIR.d_fd, DIR.dd_fd],,,[ +#include <sys/types.h> +#include <dirent.h> +])]) +fi + if test x"$target_cpu" = xia64; then AC_LIBOBJ([ia64]) AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base, @@ -2674,16 +3050,18 @@ if test x"$enable_pthread" = xyes; then AC_DEFINE(NON_SCALAR_THREAD_ID) fi AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \ - pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\ + pthread_attr_get_np pthread_attr_getstack\ pthread_get_stackaddr_np pthread_get_stacksize_np \ thr_stksegment pthread_stackseg_np pthread_getthrds_np \ pthread_cond_init pthread_condattr_setclock pthread_condattr_init \ - pthread_sigmask pthread_setname_np) + pthread_sigmask pthread_setname_np pthread_set_name_np) + AS_CASE(["$target_os"],[aix*],[ac_cv_func_pthread_getattr_np=no],[AC_CHECK_FUNCS(pthread_getattr_np)]) if test "${host_os}" = "nacl"; then ac_cv_func_pthread_attr_init=no else AC_CHECK_FUNCS(pthread_attr_init) fi + set_current_thread_name= if test "$ac_cv_func_pthread_setname_np" = yes; then AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments], [rb_cv_func_pthread_setname_np_arguments= @@ -2709,16 +3087,38 @@ if test x"$enable_pthread" = xyes; then ] ) if test -n "${rb_cv_func_pthread_setname_np_arguments}"; then - AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}) - else - AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), (void)0) + set_current_thread_name="pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}" fi + elif test "$ac_cv_func_pthread_set_name_np" = yes; then + set_current_thread_name="pthread_set_name_np(pthread_self(), name)" + fi + AS_IF([test -n "$set_current_thread_name"], [ + AC_DEFINE_UNQUOTED(SET_CURRENT_THREAD_NAME(name), $set_current_thread_name) + AS_CASE([$set_current_thread_name], + [*'pthread_self()'*], [ + set_another_thread_name=`echo "$set_current_thread_name" | sed 's/pthread_self()/thid/'` + AC_DEFINE_UNQUOTED(SET_ANOTHER_THREAD_NAME(thid,name), $set_another_thread_name) + ]) + ]) +fi + +if test x"$ac_cv_header_ucontext_h" = xno; then + AC_CACHE_CHECK([if signal.h defines ucontext_t], [rb_cv_ucontext_in_signal_h], + [AC_TRY_COMPILE([@%:@include <signal.h>], + [size_t size = sizeof(ucontext_t);], + [rb_cv_ucontext_in_signal_h=yes], [rb_cv_ucontext_in_signal_h=no])]) + if test x"$rb_cv_ucontext_in_signal_h" = xyes; then + AC_DEFINE_UNQUOTED(UCONTEXT_IN_SIGNAL_H, 1) fi fi -if test x"$ac_cv_header_ucontext_h" = xyes; then +if test x"$ac_cv_header_ucontext_h" = xyes -o x"$rb_cv_ucontext_in_signal_h" = xyes; then AC_CACHE_CHECK([if mcontext_t is a pointer], [rb_cv_mcontext_t_ptr], - [AC_TRY_COMPILE([@%:@include <ucontext.h> - mcontext_t test(mcontext_t mc) {return mc+1;} + [AC_TRY_COMPILE([ + @%:@include <signal.h> + @%:@ifdef HAVE_UCONTEXT_H + @%:@include <ucontext.h> + @%:@endif + mcontext_t test(mcontext_t mc) {return mc+1;} ], [test(0);], [rb_cv_mcontext_t_ptr=yes], [rb_cv_mcontext_t_ptr=no])]) @@ -2869,7 +3269,7 @@ if test "$with_dln_a_out" != yes; then # mkmf.rb's have_header() to fail if the desired resource happens to be # installed in the /usr/local tree. RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)], - [bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*], [ ], + [bsdi*|cygwin*|mingw*|aix*|interix*], [ ], [ RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)]) else @@ -2906,6 +3306,10 @@ if test "$with_dln_a_out" != yes; then fi if test "$ac_cv_sizeof_voidp" = 8; then : ${LIBPATHENV=LD_LIBRARY_PATH_64} + : ${PRELOADENV=LD_PRELOAD_64} + else + : ${LIBPATHENV=LD_LIBRARY_PATH_32} + : ${PRELOADENV=LD_PRELOAD_32} fi rb_cv_dlopen=yes], [sunos*], [ : ${LDSHARED='$(LD) -assert nodefinitions'} @@ -2923,7 +3327,7 @@ if test "$with_dln_a_out" != yes; then [bsdi3*], [ AS_CASE(["$CC"], [*shlicc*], [ : ${LDSHARED='$(CC) -r'} rb_cv_dlopen=yes])], - [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [ + [linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [ : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" @@ -2950,14 +3354,7 @@ if test "$with_dln_a_out" != yes; then [darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'} : ${LDFLAGS=""} : ${LIBPATHENV=DYLD_LIBRARY_PATH} - # /usr/local/include is always searched for - # some reason, but /usr/local/lib is not. - hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'` - if test -n "$hdr" && $CC -E -include "$hdr" -xc - </dev/null 2>/dev/null | fgrep -q "$hdr"; then - $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' || - echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' || - LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib" - fi + : ${PRELOADENV=DYLD_INSERT_LIBRARIES} rb_cv_dlopen=yes], [aix*], [ : ${LDSHARED='$(CC)'} LDSHARED="$LDSHARED ${linker_flag}-G" @@ -2970,31 +3367,6 @@ if test "$with_dln_a_out" != yes; then : ${LIBPATHENV=LIBPATH} RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}" rb_cv_dlopen=yes], - [beos*], [ AS_CASE(["$target_cpu"], - [powerpc*], [ - : ${LDSHARED='$(LD) -xms'} - EXTDLDFLAGS='-export $(TARGET_ENTRY)' - DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o" - LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot" - ], - [i586*], [ - : ${LDSHARED='$(LD) -shared'} - DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lroot" - LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lroot" - ]) - : ${LIBPATHENV=LIBRARY_PATH} - rb_cv_dlopen=yes], - [haiku*], [ AS_CASE(["$target_cpu"], - [powerpc*], [ - : ${LDSHARED='$(LD) -xms'} - EXTDLDFLAGS='-export $(TARGET_ENTRY)' - DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o" - ], - [i586*], [ - : ${LDSHARED='$(CC) -shared'} - ]) - : ${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" @@ -3004,12 +3376,11 @@ if test "$with_dln_a_out" != yes; then XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import" DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import" : ${LIBPATHENV=""} + : ${PRELOADENV=""} rb_cv_dlopen=yes], [hiuxmpp], [ : ${LDSHARED='$(LD) -r'}], [atheos*], [ : ${LDSHARED='$(CC) -shared'} rb_cv_dlopen=yes], - [os2-emx*], [ LDFLAGS="$LDFLAGS -Zomf" - ], [nacl], [ LDSHARED='$(CC) -shared' ], [ : ${LDSHARED='$(LD)'}]) AC_MSG_RESULT($rb_cv_dlopen) @@ -3066,6 +3437,7 @@ AC_SUBST(LINK_SO) AC_SUBST(LIBPATHFLAG) AC_SUBST(RPATHFLAG) AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}") +AC_SUBST(PRELOADENV, "${PRELOADENV-LD_PRELOAD}") AC_SUBST(TRY_LINK) if test "x$OPT_DIR" != x; then @@ -3075,11 +3447,13 @@ if test "x$OPT_DIR" != x; then for dir in $OPT_DIR; do echo x ${LIBPATHFLAG} ${RPATHFLAG} | sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g" - done | tr '\012' ' '` - test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS " - LDFLAGS="$LDFLAGS$val" - test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS " - DLDFLAGS="$DLDFLAGS$val" + done | tr '\012' ' ' | sed 's/ *$//'` + if test x"$val" != x; then + test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS " + LDFLAGS="$LDFLAGS$val" + test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS " + DLDFLAGS="$DLDFLAGS$val" + fi LDFLAGS_OPTDIR="$val" fi @@ -3095,6 +3469,7 @@ AS_CASE(["$target_cpu-$target_os"], AC_CHECK_HEADERS([execinfo.h]) if test "x$ac_cv_header_execinfo_h" = xyes; then AC_CHECK_LIB([execinfo], [backtrace]) + AC_CHECK_HEADERS([libunwind.h]) fi], [*-freebsd*|x86_64-netbsd*], [ AC_CHECK_HEADERS([execinfo.h]) @@ -3202,9 +3577,6 @@ else [darwin*], [ RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend]) DLEXT=bundle], - [os2-emx*], [ - LOAD_RELATIVE=1 - DLEXT=dll], [cygwin*|mingw*|*djgpp*], [ LOAD_RELATIVE=1 DLEXT=so], @@ -3326,6 +3698,7 @@ if test x"$cross_compiling" = xyes; then RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`' RUNRUBY='$(RUNRUBY_COMMAND)' XRUBY='$(MINIRUBY)' + BOOTSTRAPRUBY='$(BASERUBY)' TEST_RUNNABLE=no CROSS_COMPILING=yes @@ -3349,6 +3722,7 @@ else RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)' RUNRUBY='$(RUNRUBY_COMMAND) --' XRUBY='$(RUNRUBY)' + BOOTSTRAPRUBY='$(MINIRUBY)' TEST_RUNNABLE=yes CROSS_COMPILING=no fi @@ -3360,6 +3734,7 @@ AC_SUBST(PREP) AC_SUBST(RUNRUBY_COMMAND) AC_SUBST(RUNRUBY) AC_SUBST(XRUBY) +AC_SUBST(BOOTSTRAPRUBY) AC_SUBST(EXTOUT, [${EXTOUT=.ext}]) FIRSTMAKEFILE="" @@ -3370,7 +3745,7 @@ LIBRUBYARG='$(LIBRUBYARG_STATIC)' SOLIBS= AS_CASE(["$target_os"], - [cygwin*|mingw*|beos*|haiku*|darwin*|os2-emx*], [ + [cygwin*|mingw*|haiku*|darwin*], [ : ${DLDLIBS=""} ], [ @@ -3395,7 +3770,7 @@ AC_ARG_WITH(soname, LIBRUBY_LDSHARED=$LDSHARED LIBRUBY_DLDFLAGS=$DLDFLAGS -LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)' +LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(RUBY_PROGRAM_VERSION)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so' ENABLE_SHARED=no @@ -3438,7 +3813,7 @@ AS_CASE("$enable_shared", [yes], [ [sunos4*], [ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' ], - [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [ + [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR" LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' if test "$load_relative" = yes; then @@ -3472,7 +3847,7 @@ AS_CASE("$enable_shared", [yes], [ [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' + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(RUBY_PROGRAM_VERSION) lib$(RUBY_SO_NAME).so' if test "$GCC" = yes; then LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)' else @@ -3482,7 +3857,7 @@ AS_CASE("$enable_shared", [yes], [ ], [hpux*], [ XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)' - LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(RUBY_PROGRAM_VERSION)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl' ], [aix*], [ @@ -3490,24 +3865,19 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}' SOLIBS='-lm -lc' ], - [beos*], [ - AS_CASE(["$target_cpu"], - [powerpc*], [ - LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR" - ]) - ], [darwin*], [ - RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)' + RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)' LIBRUBY_LDSHARED='$(CC) -dynamiclib' if test "$load_relative" = yes; then libprefix="@executable_path/../${libdir_basename}" LIBRUBY_RELATIVE=yes fi LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)' - LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)' - LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)' + LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR)' + LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(RUBY_PROGRAM_VERSION)' if test "$visibility_option" = ld; then LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*' + LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_ruby_static_id_*' LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*' fi LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)' @@ -3529,10 +3899,6 @@ AS_CASE("$enable_shared", [yes], [ AS_HELP_STRING([--disable-pie], [disable PIE feature]), [pie=$enableval], [pie=]) AS_CASE(["$target_os"], - [haiku], [ - # gcc supports PIE, but doesn't work correctly in Haiku - pie=no - ], [nacl], [ # -pie implies -shared for NaCl. pie=no @@ -3582,6 +3948,15 @@ if test "$EXEEXT" = .exe; then AC_SUBST(EXECUTABLE_EXTS) fi +AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [ + AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed) + AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null], + [AC_MSG_RESULT(no)], + [PREP="$PREP"' ruby-runner$(EXEEXT)' + AC_MSG_RESULT(yes)] + ) +]) + AC_ARG_ENABLE(dtrace, AS_HELP_STRING([--enable-dtrace], [enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]), @@ -3639,7 +4014,7 @@ dnl build rdoc index if requested RDOCTARGET="" CAPITARGET="" AC_ARG_ENABLE(install-doc, - AS_HELP_STRING([--disable-install-doc], [do not install neither rdoc indexes nor C API documents during install]), + AS_HELP_STRING([--disable-install-doc], [do not install either rdoc indexes or C API documents during install]), [install_doc=$enableval], [install_doc=yes]) AC_ARG_ENABLE(install-rdoc, AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]), @@ -3701,13 +4076,6 @@ AS_CASE(["$target_os"], RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation]) RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework CoreFoundation]) ], - [os2-emx], [ - AC_LIBOBJ([os2]) - CFLAGS="$CFLAGS -DOS2" - LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'` - LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'` - LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'` - ], [osf*], [ if test "$GCC" != "yes" ; then # compile something small: taint.c is fine for this. @@ -3723,12 +4091,8 @@ AS_CASE(["$target_os"], CFLAGS="$CFLAGS -std" fi ], - [beos*], [ - AS_CASE(["$target_cpu"],[powerpc*], [CFLAGS="$CFLAGS -relax_pointers"]) - CPPFLAGS="$CPPFLAGS -I/boot/home/config/include" - ], [cygwin*|mingw*], [ - RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)' + RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)0' LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' AS_CASE(["$target_os"], [cygwin*], [ @@ -3866,40 +4230,6 @@ if test "${universal_binary-no}" = yes ; then [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no])) fi -if test "$ac_cv_func_memmem" = yes; then - AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [ - AC_TRY_RUN([ -#include <string.h> - -int -main() -{ - char *str = "hogefugafoobar"; - char *rs = "foo"; - char *empty = ""; - char *p; - - p = memmem(str, strlen(str), rs, strlen(rs)); - if (p == str+8) { - p = memmem(str, strlen(str), empty, strlen(empty)); - if (p == str) - return 0; - else - return 1; - } - else { - return 1; - } -} - ], - rb_cv_broken_memmem=no, - rb_cv_broken_memmem=yes, - rb_cv_broken_memmem=yes) - ]) - test x"$rb_cv_broken_memmem" = xyes && ac_cv_func_memmem=no -fi - - CPPFLAGS="$CPPFLAGS "'$(DEFS)' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' if test -n "${cflags+set}"; then @@ -3918,8 +4248,8 @@ if test "${ARCH_FLAG}"; then fi warnflags="$rb_cv_warnflags" AC_SUBST(cppflags)dnl -AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl -AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl +AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl +AC_SUBST(cxxflags, ["${orig_cxxflags:+$orig_cxxflags }"'${optflags} ${debugflags} ${warnflags}'])dnl AC_SUBST(optflags)dnl AC_SUBST(debugflags)dnl AC_SUBST(warnflags)dnl @@ -4014,11 +4344,9 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE" echo '#define STRINGIZE(x) x' test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0' - echo '#include "verconf.h"' echo '#include "version.h"' echo 'ruby_version=RUBY_LIB_VERSION' } > conftest.c - test -f verconf.h || > verconf.h ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" eval $ruby_version elif test -z "${ruby_version}"; then @@ -4077,6 +4405,7 @@ AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl +AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl if test "${universal_binary-no}" = yes ; then @@ -4158,7 +4487,7 @@ AC_ARG_WITH(mantype, AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]), [ AS_CASE(["$withval"], - [man|doc], [MANTYPE=$withval], + [man|man.gz|man.bz2|doc|doc.gz|doc.bz2], [MANTYPE=$withval], [AC_MSG_ERROR(invalid man type: $withval)]) ]) if test -z "$MANTYPE"; then @@ -4192,7 +4521,10 @@ guard=INCLUDE_RUBY_CONFIG_H grep -v "^#define PACKAGE_" confdefs.h echo "#endif /* $guard */" } | tr -d '\015' | -${srcdir}/tool/ifchange "${config_h}" - +( + if test "x$CONFIGURE_TTY" = xyes; then color=--color; else color=; fi + exec ${srcdir}/tool/ifchange $color "${config_h}" - +) || AC_MSG_ERROR([failed to create ${config_h}]) tr -d '\015' < largefile.h > confdefs.h rm largefile.h @@ -4200,7 +4532,7 @@ BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ ]*=/{' \ -e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \ -e '}' "${srcdir}/enc/Makefile.in"`"] BUILTIN_ENCOBJS= -for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done +for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS "`echo $e | sed 's/\.c$/.$(OBJEXT)/'`; done AC_SUBST(BUILTIN_ENCOBJS) BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ ]*=/{' \ @@ -4209,15 +4541,15 @@ BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ ]*=/{' \ BUILTIN_TRANSSRCS= BUILTIN_TRANSOBJS= for e in $BUILTIN_TRANSES; do - BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS `basename $e .trans`"'.c'; - BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS `basename $e .trans`"'.$(OBJEXT)'; + BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS "`echo $e | sed 's/\.trans$/.c/'` + BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS "`echo $e | sed 's/\.trans$/.$(OBJEXT)/'` done AC_SUBST(BUILTIN_TRANSSRCS) AC_SUBST(BUILTIN_TRANSOBJS) PACKAGE=$RUBY_BASE_NAME AC_SUBST(PACKAGE) -AC_MSG_RESULT($PACKAGE library version = $ruby_version) +AS_MESSAGE([$PACKAGE library version = $ruby_version]) AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/ *$//'`]) @@ -4231,10 +4563,12 @@ AC_CONFIG_FILES(Makefile, [ : elif svn info "$srcdir" > /dev/null 2>&1; then VCS='svn' - elif test -d "$srcdir/.git/svn"; then - VCS='git svn' - elif test -d "$srcdir/.git"; then - VCS='git' + elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then + if test -d "$git_dir/svn"; then + VCS='git svn' + else + VCS='git' + fi else VCS='echo cannot' fi @@ -4243,7 +4577,12 @@ AC_CONFIG_FILES(Makefile, [ ["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'], [git], [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'], [VCSUP='$(VCS)']) - sed -n 's/^@%:@define \(RUBY_RELEASE_DATE\) "\(.*\)"/\1 = \2/p' "$srcdir/version.h" + sed -n \ + -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \ + -e 's//\1 = \2/' \ + -e '[s/ \([0-9]\)$/ 0\1/]' \ + -e p \ + -e '}' "$srcdir/version.h" sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' if test "$gnumake" != yes; then @@ -4269,7 +4608,7 @@ AC_CONFIG_FILES(Makefile, [ [EXEEXT='$EXEEXT' gnumake='$gnumake']) AC_ARG_WITH([ruby-pc], - AC_HELP_STRING([pc file basename]), + AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]), [ruby_pc="$withval"], [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"]) AC_SUBST(ruby_pc) @@ -4298,3 +4637,48 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in, AC_OUTPUT } } + +AS_IF([${FOLD+:} false], [], [ +AS_IF([test "`echo abcdefg hijklmno | fold -s -w10 | sed 1d`" = hijklmno], [FOLD="fold"], [FOLD=]) +]) +AS_REQUIRE_SHELL_FN([config_summary], + [AS_FUNCTION_DESCRIBE([config_summary], [NAME, VAL], [configuration summary])], + [AS_IF([test -z "$2"], [], [ + AS_ECHO_N([" * $1: "]) | head -c26 + AS_IF([test "$FOLD"], [ + echo "$2" | fold -s -w50 | + sed '1!s/^/ /;$!s/$/\\/' + ], [echo "$2"]) + ])] +) + +echo "---" +echo "Configuration summary for $RUBY_BASE_NAME version $RUBY_PROGRAM_VERSION" +echo "" +config_summary "Installation prefix" "$prefix" +config_summary "exec prefix" "$exec_prefix" +config_summary "arch" "$arch" +config_summary "site arch" "$sitearch" +config_summary "RUBY_BASE_NAME" "$RUBY_BASE_NAME" +config_summary "enable shared" "$enable_shared" +config_summary "ruby lib prefix" "$rubylibprefix" +config_summary "site libraries path" "$rubysitearchprefix" +config_summary "vendor path" "$vendordir" +config_summary "target OS" "$target_os" +config_summary "compiler" "$CC" +config_summary "with pthread" "$enable_pthread" +config_summary "enable shared libs" "$ENABLE_SHARED" +config_summary "dynamic library ext" "$DLEXT" +config_summary "CFLAGS" "$cflags" +config_summary "CPPFLAGS" "$cppflags" +config_summary "LDFLAGS" "$LDFLAGS" +config_summary "optflags" "$optflags" +config_summary "debugflags" "$debugflags" +config_summary "warnflags" "$warnflags" +config_summary "strip command" "$STRIP" +config_summary "install doc" "$install_doc" +config_summary "man page type" "$MANTYPE" +config_summary "search path" "$search_path" +config_summary "static-linked-ext" ${EXTSTATIC:+"yes"} +echo "" +echo "---" diff --git a/constant.h b/constant.h index c7de5da533..76b59fa047 100644 --- a/constant.h +++ b/constant.h @@ -12,15 +12,21 @@ #define CONSTANT_H typedef enum { + CONST_DEPRECATED = 0x100, + + CONST_VISIBILITY_MASK = 0xff, CONST_PUBLIC = 0x00, CONST_PRIVATE, CONST_VISIBILITY_MAX } rb_const_flag_t; #define RB_CONST_PRIVATE_P(ce) \ - ((ce)->flag == CONST_PRIVATE) + (((ce)->flag & CONST_VISIBILITY_MASK) == CONST_PRIVATE) #define RB_CONST_PUBLIC_P(ce) \ - ((ce)->flag == CONST_PUBLIC) + (((ce)->flag & CONST_VISIBILITY_MASK) == CONST_PUBLIC) + +#define RB_CONST_DEPRECATED_P(ce) \ + ((ce)->flag & CONST_DEPRECATED) typedef struct rb_const_entry_struct { rb_const_flag_t flag; @@ -31,7 +37,8 @@ typedef struct rb_const_entry_struct { VALUE rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj); VALUE rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj); -void rb_free_const_table(st_table *tbl); +VALUE rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj); +void rb_free_const_table(struct rb_id_table *tbl); VALUE rb_public_const_get(VALUE klass, ID id); VALUE rb_public_const_get_at(VALUE klass, ID id); VALUE rb_public_const_get_from(VALUE klass, ID id); @@ -54,13 +54,7 @@ # define FIBER_USE_NATIVE 1 # endif # elif defined(_WIN32) -# if _WIN32_WINNT >= 0x0400 -/* only when _WIN32_WINNT >= 0x0400 on Windows because Fiber APIs are - * supported only such building (and running) environments. - * [ruby-dev:41192] - */ -# define FIBER_USE_NATIVE 1 -# endif +# define FIBER_USE_NATIVE 1 # endif #endif #if !defined(FIBER_USE_NATIVE) @@ -137,7 +131,7 @@ struct rb_fiber_struct { * then this fiber can't "resume" any more after that. * You shouldn't mix "transfer" and "resume". */ - int transfered; + int transferred; #if FIBER_USE_NATIVE #ifdef _WIN32 @@ -180,6 +174,7 @@ cont_mark(void *ptr) if (ptr) { rb_context_t *cont = ptr; rb_gc_mark(cont->value); + rb_thread_mark(&cont->saved_thread); rb_gc_mark(cont->saved_thread.self); @@ -226,7 +221,7 @@ cont_free(void *ptr) RUBY_FREE_ENTER("cont"); if (ptr) { rb_context_t *cont = ptr; - RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); fflush(stdout); + RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); #if FIBER_USE_NATIVE if (cont->type == CONTINUATION_CONTEXT) { /* cont */ @@ -236,17 +231,16 @@ cont_free(void *ptr) else { /* fiber */ rb_fiber_t *fib = (rb_fiber_t*)cont; + const rb_thread_t *const th = GET_THREAD(); #ifdef _WIN32 - if (GET_THREAD()->fiber != fib && cont->type != ROOT_FIBER_CONTEXT) { + if (th && th->fiber != fib && cont->type != ROOT_FIBER_CONTEXT) { /* don't delete root fiber handle */ - rb_fiber_t *fib = (rb_fiber_t*)cont; if (fib->fib_handle) { DeleteFiber(fib->fib_handle); } } #else /* not WIN32 */ - if (GET_THREAD()->fiber != fib) { - rb_fiber_t *fib = (rb_fiber_t*)cont; + if (th && th->fiber != fib) { if (fib->ss_sp) { if (cont->type == ROOT_FIBER_CONTEXT) { rb_bug("Illegal root fiber parameter"); @@ -281,26 +275,25 @@ cont_memsize(const void *ptr) { const rb_context_t *cont = ptr; size_t size = 0; - if (cont) { - size = sizeof(*cont); - if (cont->vm_stack) { + + size = sizeof(*cont); + if (cont->vm_stack) { #ifdef CAPTURE_JUST_VALID_VM_STACK - size_t n = (cont->vm_stack_slen + cont->vm_stack_clen); + size_t n = (cont->vm_stack_slen + cont->vm_stack_clen); #else - size_t n = cont->saved_thread.stack_size; + size_t n = cont->saved_thread.stack_size; #endif - size += n * sizeof(*cont->vm_stack); - } + size += n * sizeof(*cont->vm_stack); + } - if (cont->machine.stack) { - size += cont->machine.stack_size * sizeof(*cont->machine.stack); - } + if (cont->machine.stack) { + size += cont->machine.stack_size * sizeof(*cont->machine.stack); + } #ifdef __ia64 - if (cont->machine.register_stack) { - size += cont->machine.register_stack_size * sizeof(*cont->machine.register_stack); - } -#endif + if (cont->machine.register_stack) { + size += cont->machine.register_stack_size * sizeof(*cont->machine.register_stack); } +#endif return size; } @@ -344,14 +337,13 @@ fiber_memsize(const void *ptr) { const rb_fiber_t *fib = ptr; size_t size = 0; - if (ptr) { - size = sizeof(*fib); - if (fib->cont.type != ROOT_FIBER_CONTEXT && - fib->cont.saved_thread.local_storage != NULL) { - size += st_memsize(fib->cont.saved_thread.local_storage); - } - size += cont_memsize(&fib->cont); + + size = sizeof(*fib); + if (fib->cont.type != ROOT_FIBER_CONTEXT && + fib->cont.saved_thread.local_storage != NULL) { + size += st_memsize(fib->cont.saved_thread.local_storage); } + size += cont_memsize(&fib->cont); return size; } @@ -499,7 +491,7 @@ cont_capture(volatile int *stat) cont->vm_stack = ALLOC_N(VALUE, th->stack_size); MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size); #endif - cont->saved_thread.stack = 0; + cont->saved_thread.stack = NULL; cont_save_machine_stack(th, cont); @@ -520,7 +512,7 @@ cont_capture(volatile int *stat) } if (ruby_setjmp(cont->jmpbuf)) { - volatile VALUE value; + VALUE value; VAR_INITIALIZED(cont); value = cont->value; @@ -548,7 +540,7 @@ cont_restore_thread(rb_context_t *cont) th->fiber = sth->fiber; fib = th->fiber ? th->fiber : th->root_fiber; - if (fib) { + if (fib && fib->cont.saved_thread.stack) { th->stack_size = fib->cont.saved_thread.stack_size; th->stack = fib->cont.saved_thread.stack; } @@ -563,6 +555,7 @@ cont_restore_thread(rb_context_t *cont) else { /* fiber */ th->stack = sth->stack; + sth->stack = NULL; th->stack_size = sth->stack_size; th->local_storage = sth->local_storage; th->local_storage_recursive_hash = sth->local_storage_recursive_hash; @@ -582,7 +575,6 @@ cont_restore_thread(rb_context_t *cont) th->root_lep = sth->root_lep; th->root_svar = sth->root_svar; th->ensure_list = sth->ensure_list; - } #if FIBER_USE_NATIVE @@ -660,6 +652,10 @@ fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size) rb_thread_t *sth = &fib->cont.saved_thread; #ifdef _WIN32 +# if defined(_MSC_VER) && _MSC_VER <= 1200 +# define CreateFiberEx(cs, stacksize, flags, entry, param) \ + CreateFiber((stacksize), (entry), (param)) +# endif fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL); if (!fib->fib_handle) { /* try to release unnecessary fibers & retry to create */ @@ -732,7 +728,6 @@ fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib) rb_bug("non_root_fiber->context.uc_stac.ss_sp should not be NULL"); } #endif - /* swap machine context */ #ifdef _WIN32 SwitchToFiber(newfib->fib_handle); @@ -890,6 +885,24 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame) * Ron * Max * + * Also you can call callcc in other methods: + * + * require "continuation" + * + * def g + * arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ] + * cc = callcc { |cc| cc } + * puts arr.shift + * return cc, arr.size + * end + * + * def f + * c, size = g + * c.call(c) if size > 1 + * end + * + * f + * * This (somewhat contrived) example allows the inner loop to abandon * processing early: * @@ -1071,7 +1084,6 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval) /* restore `tracing' context. see [Feature #4347] */ th->trace_arg = cont->saved_thread.trace_arg; - cont_restore_0(cont, &contval); return Qnil; /* unreachable */ } @@ -1093,7 +1105,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval) * comes with a small 4KB stack. This enables the fiber to be paused from deeply * nested function calls within the fiber block. * - * When a fiber is created it will not run automatically. Rather it must be + * When a fiber is created it will not run automatically. Rather it must * be explicitly asked to run using the <code>Fiber#resume</code> method. * The code running inside the fiber can give up control by calling * <code>Fiber.yield</code> in which case it yields control back to caller @@ -1177,6 +1189,18 @@ fiber_t_alloc(VALUE fibval) return fib; } +rb_control_frame_t * +rb_vm_push_frame(rb_thread_t *th, + const rb_iseq_t *iseq, + VALUE type, + VALUE self, + VALUE specval, + VALUE cref_or_me, + const VALUE *pc, + VALUE *sp, + int local_size, + int stack_max); + static VALUE fiber_init(VALUE fibval, VALUE proc) { @@ -1188,28 +1212,24 @@ fiber_init(VALUE fibval, VALUE proc) /* initialize cont */ cont->vm_stack = 0; - th->stack = 0; + th->stack = NULL; th->stack_size = 0; th->stack_size = cth->vm->default_params.fiber_vm_stack_size / sizeof(VALUE); th->stack = ALLOC_N(VALUE, th->stack_size); - th->cfp = (void *)(th->stack + th->stack_size); - th->cfp--; - th->cfp->pc = 0; - th->cfp->sp = th->stack + 1; -#if VM_DEBUG_BP_CHECK - th->cfp->bp_check = 0; -#endif - th->cfp->ep = th->stack; - *th->cfp->ep = VM_ENVVAL_BLOCK_PTR(0); - th->cfp->self = Qnil; - th->cfp->klass = Qnil; - th->cfp->flag = 0; - th->cfp->iseq = 0; - th->cfp->proc = 0; - th->cfp->block_iseq = 0; - th->cfp->me = 0; + + rb_vm_push_frame(th, + NULL, + VM_FRAME_MAGIC_DUMMY | VM_ENV_FLAG_LOCAL | VM_FRAME_FLAG_FINISH | VM_FRAME_FLAG_CFRAME, + Qnil, /* self */ + VM_BLOCK_HANDLER_NONE, + 0, /* specval */ + NULL, /* pc */ + th->stack, /* sp */ + 0, /* local_size */ + 0); + th->tag = 0; th->local_storage = st_init_numtable(); th->local_storage_recursive_hash = Qnil; @@ -1256,11 +1276,12 @@ rb_fiber_start(void) argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args; cont->value = Qnil; th->errinfo = Qnil; - th->root_lep = rb_vm_ep_local_ep(proc->block.ep); - th->root_svar = Qnil; - + th->root_lep = rb_vm_ep_local_ep(vm_block_ep(&proc->block)); + th->root_svar = Qfalse; fib->status = RUNNING; - cont->value = rb_vm_invoke_proc(th, proc, argc, argv, 0); + + EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, Qnil); + cont->value = rb_vm_invoke_proc(th, proc, argc, argv, VM_BLOCK_HANDLER_NONE); } TH_POP_TAG(); @@ -1449,6 +1470,8 @@ fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume) value = fiber_store(fib, th); RUBY_VM_CHECK_INTS(th); + EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, Qnil); + return value; } @@ -1486,7 +1509,7 @@ rb_fiber_resume(VALUE fibval, int argc, const VALUE *argv) if (fib->prev != 0 || fib->cont.type == ROOT_FIBER_CONTEXT) { rb_raise(rb_eFiberError, "double resume"); } - if (fib->transfered != 0) { + if (fib->transferred != 0) { rb_raise(rb_eFiberError, "cannot resume transferred Fiber"); } @@ -1598,7 +1621,7 @@ rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fibval) { rb_fiber_t *fib; GetFiberPtr(fibval, fib); - fib->transfered = 1; + fib->transferred = 1; return fiber_switch(fib, argc, argv, 0); } diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 768a1b6b7f..2f93102efe 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -1,8 +1,11 @@ +override MFLAGS := $(filter-out -j%,$(MFLAGS)) +override MAKEFLAGS := $(filter-out -j%,$(MAKEFLAGS)) include Makefile ENABLE_SHARED=@ENABLE_SHARED@ DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)" WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED +STRIP = @STRIP@ ifeq (@target_os@,cygwin) DLL_BASE_NAME := $(LIBRUBY_SO:.dll=) @@ -10,9 +13,6 @@ else DLL_BASE_NAME := $(RUBY_SO_NAME) DLLWRAP += -mno-cygwin VPATH := $(VPATH):$(srcdir)/win32 - STUBPROGRAM = rubystub$(EXEEXT) - IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\# - SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*)))) endif ifneq ($(ENABLE_SHARED),yes) @@ -32,6 +32,8 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) -include uncommon.mk +include $(srcdir)/defs/gmake.mk + SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS) override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT) RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc @@ -39,13 +41,6 @@ RUBYDEF = $(DLL_BASE_NAME).def ruby: $(PROGRAM) rubyw: $(WPROGRAM) -stub: $(STUBPROGRAM) -scriptbin: $(SCRIPTPROGRAMS) - -%$(EXEEXT): bin/% $(STUBPROGRAM) - $(ECHO) generating $@ - $(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@ - $(Q) chmod +x $@ $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO) $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ @@ -54,11 +49,11 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ $(ECHO) compiling $@ $(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ -$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb +%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb $(ECHO) generating $@ $(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ - -so_name=$(DLL_BASE_NAME) \ + -so_name=$(DLL_BASE_NAME) -output=$(*F) \ . $(icondirs) $(srcdir)/win32 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ @@ -67,11 +62,7 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@ $(ECHO) linking $@ $(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \ $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ -$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@ - @rm -f $@ - $(ECHO) linking $@ - $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \ - stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ +$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ $(RUBY_EXP): $(LIBRUBY_A) $(ECHO) creating $@ @@ -86,7 +77,15 @@ GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in ifeq (@target_os@,mingw32) $(OBJS) $(MAINOBJ): win32.h -dir.$(OBJEXT) win32.$(OBJEXT): win32/dir.h +dir.$(OBJEXT) win32/win32.$(OBJEXT): win32/dir.h +file.$(OBJEXT) win32/win32.$(OBJEXT): win32/file.h + +MSYS2_ARG_CONV_EXCL_PARAM = --exclude=;--name= + +yes-test-ruby: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) +yes-test-all: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) +yes-test-almost: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) + endif $(LIBRUBY_SO): $(RUBYDEF) @@ -99,7 +98,7 @@ clean-local:: @$(RM) $(RUBYDEF) ifeq (@target_os@,cygwin) -cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF) +cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF) $(ECHO) generating $@ $(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@ endif @@ -25,42 +25,11 @@ const union { enum node_type node_type; enum ruby_method_ids method_ids; enum ruby_id_types id_types; + enum ruby_fl_type fl_types; + enum ruby_encoding_consts encoding_consts; + enum ruby_coderange_type enc_coderange_types; + enum ruby_econv_flag_type econv_flag_types; enum { - RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX, - RUBY_ENCODING_SHIFT = ENCODING_SHIFT, - RUBY_ENC_CODERANGE_MASK = ENC_CODERANGE_MASK, - RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN, - RUBY_ENC_CODERANGE_7BIT = ENC_CODERANGE_7BIT, - RUBY_ENC_CODERANGE_VALID = ENC_CODERANGE_VALID, - RUBY_ENC_CODERANGE_BROKEN = ENC_CODERANGE_BROKEN, - RUBY_FL_PROMOTED0 = FL_PROMOTED0, - RUBY_FL_PROMOTED1 = FL_PROMOTED1, - RUBY_FL_PROMOTED = FL_PROMOTED0|FL_PROMOTED1, - RUBY_FL_FINALIZE = FL_FINALIZE, - RUBY_FL_TAINT = FL_TAINT, - RUBY_FL_EXIVAR = FL_EXIVAR, - RUBY_FL_FREEZE = FL_FREEZE, - RUBY_FL_SINGLETON = FL_SINGLETON, - RUBY_FL_USER0 = FL_USER0, - RUBY_FL_USER1 = FL_USER1, - RUBY_FL_USER2 = FL_USER2, - RUBY_FL_USER3 = FL_USER3, - RUBY_FL_USER4 = FL_USER4, - RUBY_FL_USER5 = FL_USER5, - RUBY_FL_USER6 = FL_USER6, - RUBY_FL_USER7 = FL_USER7, - RUBY_FL_USER8 = FL_USER8, - RUBY_FL_USER9 = FL_USER9, - RUBY_FL_USER10 = FL_USER10, - RUBY_FL_USER11 = FL_USER11, - RUBY_FL_USER12 = FL_USER12, - RUBY_FL_USER13 = FL_USER13, - RUBY_FL_USER14 = FL_USER14, - RUBY_FL_USER15 = FL_USER15, - RUBY_FL_USER16 = FL_USER16, - RUBY_FL_USER17 = FL_USER17, - RUBY_FL_USER18 = FL_USER18, - RUBY_FL_USHIFT = FL_USHIFT, RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT, RUBY_NODE_TYPEMASK = NODE_TYPEMASK, RUBY_NODE_LSHIFT = NODE_LSHIFT, @@ -68,9 +37,7 @@ const union { } various; } ruby_dummy_gdb_enums; -const VALUE RUBY_FL_USER19 = FL_USER19; const SIGNED_VALUE RUBY_NODE_LMASK = NODE_LMASK; -const VALUE RUBY_ENCODING_MASK = ENCODING_MASK; int ruby_debug_print_indent(int level, int debug_level, int indent_level) @@ -92,14 +59,16 @@ ruby_debug_printf(const char *format, ...) va_end(ap); } +#include "gc.h" + VALUE ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj) { if (level < debug_level) { - VALUE str; - str = rb_inspect(obj); - fprintf(stderr, "DBG> %s: %s\n", header, - obj == (VALUE)(SIGNED_VALUE)-1 ? "" : StringValueCStr(str)); + char buff[0x100]; + rb_raw_obj_info(buff, 0x100, obj); + + fprintf(stderr, "DBG> %s: %s\n", header, buff); fflush(stderr); } return obj; @@ -115,7 +84,7 @@ ID ruby_debug_print_id(int level, int debug_level, const char *header, ID id) { if (level < debug_level) { - fprintf(stderr, "DBG> %s: %"PRIsVALUE"\n", header, rb_id2str(id)); + fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id)); fflush(stderr); } return id; diff --git a/defs/default_gems b/defs/default_gems deleted file mode 100644 index ce9010910a..0000000000 --- a/defs/default_gems +++ /dev/null @@ -1,4 +0,0 @@ -# gem base directory versioning file [executable files under bin] -rake lib/rake lib/rake.rb [rake] -rdoc lib/rdoc lib/rdoc.rb [rdoc ri] -json ext/json ext/json/lib/json/version.rb diff --git a/defs/gmake.mk b/defs/gmake.mk index f5033b2245..2233627f8c 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -1,17 +1,26 @@ # -*- makefile-gmake -*- gnumake = yes +CHECK_TARGETS := exam love check% TEST_TARGETS := $(filter check test check% test% btest%,$(MAKECMDGOALS)) TEST_TARGETS += $(subst check,test-all,$(patsubst check-%,test-%,$(TEST_TARGETS))) TEST_TARGETS := $(patsubst test-%,yes-test-%,$(patsubst btest-%,yes-btest-%,$(TEST_TARGETS))) TEST_DEPENDS := $(if $(TEST_TARGETS),$(filter all main exts,$(MAKECMDGOALS))) -TEST_DEPENDS += $(TEST_DEPENDS) $(if $(filter check%,$(MAKECMDGOALS)),main) -TEST_DEPENDS += $(if $(filter all,$(INSTALLDOC)),docs) +TEST_DEPENDS += $(if $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)),main) +TEST_DEPENDS += $(if $(filter main,$(TEST_DEPENDS)),$(if $(filter all,$(INSTALLDOC)),docs)) ifneq ($(filter -O0 -Od,$(optflags)),) override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS)) endif +ifeq ($(if $(filter all main exts enc trans libencs libenc libtrans \ + prog program ruby ruby$(EXEEXT) \ + wprogram rubyw rubyw$(EXEEXT) \ + miniruby$(EXEEXT) mini,\ + $(MAKECMDGOALS)),,$(MAKECMDGOALS)),) +-include $(SHOWFLAGS) +endif + ifneq ($(filter universal-%,$(arch)),) define archcmd %.$(1).S: %.c @@ -31,16 +40,18 @@ $(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\ $(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch))))) endif -ifneq ($(filter love check% test,$(MAKECMDGOALS)),) +ifneq ($(filter $(CHECK_TARGETS) test,$(MAKECMDGOALS)),) +yes-test-basic: $(TEST_DEPENDS) yes-test-knownbug yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby -yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample -yes-test-sample: $(TEST_DEPENDS) +yes-btest-ruby: $(TEST_DEPENDS) endif -ifneq ($(filter love check%,$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),) -yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) +ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter yes-test-all,$(TEST_TARGETS)),) +yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) \ + yes-test-basic endif -ifneq ($(filter love check%,$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),) -yes-test-all yes-test-ruby: yes-test-knownbug +ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),) +yes-test-testframework yes-test-almost yes-test-ruby: yes-test-knownbug +yes-test-almost: yes-test-testframework endif $(TEST_TARGETS): $(TEST_DEPENDS) @@ -55,9 +66,62 @@ install-prereq: uninstall uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs) endif +ifneq ($(filter exam,$(MAKECMDGOALS)),) +test-rubyspec: check +yes-test-all no-test-all: test +endif + ifneq ($(filter love,$(MAKECMDGOALS)),) showflags: up -sudo-precheck: test +sudo-precheck: test yes-test-testframework no-test-testframework install-prereq: sudo-precheck yes-test-all no-test-all: install +yes-test-almost no-test-almost: install +endif + +$(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c +ifeq ($(if $(filter yes,$(CROSS_COMPILING)),,$(CC)),) + touch $@ +else + @$(ECHO) building make_des_table + $(CC) $(CPPFLAGS) -DDUMP $(LDFLAGS) $(XLDFLAGS) $(LIBS) -omake_des_table $(srcdir)/missing/crypt.c + @[ -x ./make_des_table ] + @$(ECHO) generating $@ + $(Q) $(MAKEDIRS) $(@D) + $(Q) ./make_des_table > $@.new + $(Q) mv $@.new $@ + $(Q) $(RMALL) make_des_table* +endif + +STUBPROGRAM = rubystub$(EXEEXT) +IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\# +SCRIPTBINDIR := $(if $(EXEEXT),,exec/) +SCRIPTPROGRAMS = $(addprefix $(SCRIPTBINDIR),$(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*))))) + +stub: $(STUBPROGRAM) +scriptbin: $(SCRIPTPROGRAMS) +ifneq ($(STUBPROGRAM),rubystub) +rubystub: $(STUBPROGRAM) endif + +$(SCRIPTPROGRAMS): $(STUBPROGRAM) + +$(STUBPROGRAM): rubystub.$(OBJEXT) $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) + +rubystub$(EXEEXT): + @rm -f $@ + $(ECHO) linking $@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) rubystub.$(OBJEXT) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@ + $(Q) $(POSTLINK) + $(if $(STRIP),$(Q) $(STRIP) $@) + +$(SCRIPTBINDIR)%$(EXEEXT): bin/% $(STUBPROGRAM) \ + $(if $(SCRIPTBINDIR),$(TIMESTAMPDIR)/.exec.time) + $(ECHO) generating $@ + $(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@ + $(Q) chmod +x $@ + $(Q) $(POSTLINK) + +$(TIMESTAMPDIR)/.exec.time: + $(Q) mkdir exec + $(Q) exit > $@ diff --git a/defs/id.def b/defs/id.def index d4cd5e77de..4fe9d3ccd8 100644 --- a/defs/id.def +++ b/defs/id.def @@ -1,5 +1,7 @@ # -*- mode: ruby; coding: us-ascii -*- firstline, predefined = __LINE__+1, %[\ + max + min freeze inspect intern @@ -60,6 +62,47 @@ firstline, predefined = __LINE__+1, %[\ core#hash_merge_ary core#hash_merge_ptr core#hash_merge_kwd + + - debug#created_info + + $_ LASTLINE + $~ BACKREF +] + +# VM ID OP Parser Token +token_ops = %[\ + Dot2 .. DOT2 + Dot3 ... DOT3 + UPlus +@ UPLUS + UMinus -@ UMINUS + Pow ** POW + DSTAR ** + Cmp <=> CMP + PLUS + + MINUS - + MULT * + DIV / + MOD % + LTLT << LSHFT + GTGT >> RSHFT + LT < + LE <= LEQ + GT > + GE >= GEQ + Eq == EQ + Eqq === EQQ + Neq != NEQ + Not ! + Backquote ` + EqTilde =~ MATCH + NeqTilde !~ NMATCH + AREF [] + ASET []= + COLON2 :: + COLON3 :: + ANDOP && + OROP || + ANDDOT &. ] class KeywordError < RuntimeError @@ -76,6 +119,7 @@ global_ids = [] const_ids = [] class_ids = [] attrset_ids = [] +token_op_ids = [] names = {} predefined.split(/^/).each_with_index do |line, num| next if /^#/ =~ line @@ -92,6 +136,10 @@ predefined.split(/^/).each_with_index do |line, num| token.sub!(/\A@/, "_I_") token.gsub!(/\W+/, "") end + if name == '-' + preserved_ids << token + next + end if prev = names[name] KeywordError.raise("#{name} is already registered at line #{prev+firstline}", firstline+num) end @@ -102,7 +150,7 @@ predefined.split(/^/).each_with_index do |line, num| case name when /\A[A-Z]\w*\z/; const_ids when /\A(?!\d)\w+\z/; local_ids - when /\A\$(?:\d+|(?!\d)\w+)\z/; global_ids + when /\A\$(?:\d+|(?!\d)\w+|\W)\z/; global_ids when /\A@@(?!\d)\w+\z/; class_ids when /\A@(?!\d)\w+\z/; instance_ids when /\A((?!\d)\w+)=\z/; attrset_ids @@ -110,6 +158,14 @@ predefined.split(/^/).each_with_index do |line, num| end << token predefined_ids[token] = name end +token_ops.split(/^/).each do |line| + next if /^#/ =~ line + line.sub!(/\s+#.*/, '') + id, op, token = line.split + next unless id and op + token ||= (id unless /\A\W\z/ =~ op) + token_op_ids << [id, op, token] +end { "LOCAL" => local_ids, "INSTANCE" => instance_ids, @@ -119,4 +175,5 @@ end "ATTRSET" => attrset_ids, :preserved => preserved_ids, :predefined => predefined_ids, + :token_op => token_op_ids, } diff --git a/defs/keywords b/defs/keywords index 1b5719aa85..e0d931cd1f 100644 --- a/defs/keywords +++ b/defs/keywords @@ -1,5 +1,5 @@ %{ -struct kwtable {const char *name; int id[2]; enum lex_state_e state;}; +struct kwtable {int name, id[2], state;}; const struct kwtable *rb_reserved_word(const char *, unsigned int); #ifndef RIPPER static const struct kwtable *reserved_word(const char *, unsigned int); @@ -13,7 +13,7 @@ __LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END __FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END END, {keyword_END, keyword_END}, EXPR_END -alias, {keyword_alias, keyword_alias}, EXPR_FNAME +alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM and, {keyword_and, keyword_and}, EXPR_VALUE begin, {keyword_begin, keyword_begin}, EXPR_BEG break, {keyword_break, keyword_break}, EXPR_MID @@ -43,7 +43,7 @@ self, {keyword_self, keyword_self}, EXPR_END super, {keyword_super, keyword_super}, EXPR_ARG then, {keyword_then, keyword_then}, EXPR_BEG true, {keyword_true, keyword_true}, EXPR_END -undef, {keyword_undef, keyword_undef}, EXPR_FNAME +undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM unless, {keyword_unless, modifier_unless}, EXPR_VALUE until, {keyword_until, modifier_until}, EXPR_VALUE when, {keyword_when, keyword_when}, EXPR_VALUE diff --git a/defs/lex.c.src b/defs/lex.c.src index 1b5719aa85..e0d931cd1f 100644 --- a/defs/lex.c.src +++ b/defs/lex.c.src @@ -1,5 +1,5 @@ %{ -struct kwtable {const char *name; int id[2]; enum lex_state_e state;}; +struct kwtable {int name, id[2], state;}; const struct kwtable *rb_reserved_word(const char *, unsigned int); #ifndef RIPPER static const struct kwtable *reserved_word(const char *, unsigned int); @@ -13,7 +13,7 @@ __LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END __FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END END, {keyword_END, keyword_END}, EXPR_END -alias, {keyword_alias, keyword_alias}, EXPR_FNAME +alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM and, {keyword_and, keyword_and}, EXPR_VALUE begin, {keyword_begin, keyword_begin}, EXPR_BEG break, {keyword_break, keyword_break}, EXPR_MID @@ -43,7 +43,7 @@ self, {keyword_self, keyword_self}, EXPR_END super, {keyword_super, keyword_super}, EXPR_ARG then, {keyword_then, keyword_then}, EXPR_BEG true, {keyword_true, keyword_true}, EXPR_END -undef, {keyword_undef, keyword_undef}, EXPR_FNAME +undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM unless, {keyword_unless, modifier_unless}, EXPR_VALUE until, {keyword_until, modifier_until}, EXPR_VALUE when, {keyword_when, keyword_when}, EXPR_VALUE diff --git a/defs/opt_insn_unif.def b/defs/opt_insn_unif.def index 1ac613dbea..31ae2eb6a1 100644 --- a/defs/opt_insn_unif.def +++ b/defs/opt_insn_unif.def @@ -8,12 +8,10 @@ __END__ putobject putobject putobject putstring putobject setlocal -putobject setdynamic putstring putstring putstring putobject putstring setlocal -putstring setdynamic # putnil end @@ -12,6 +12,7 @@ **********************************************************************/ #include "internal.h" +#include "encindex.h" #include <sys/types.h> #include <sys/stat.h> @@ -20,6 +21,7 @@ #include <unistd.h> #endif +#undef HAVE_DIRENT_NAMLEN #if defined HAVE_DIRENT_H && !defined _WIN32 # include <dirent.h> # define NAMLEN(dirent) strlen((dirent)->d_name) @@ -29,6 +31,7 @@ #else # define dirent direct # define NAMLEN(dirent) (dirent)->d_namlen +# define HAVE_DIRENT_NAMLEN 1 # if HAVE_SYS_NDIR_H # include <sys/ndir.h> # endif @@ -80,14 +83,19 @@ char *strchr(char*,char); #include <sys/attr.h> #endif +#define USE_NAME_ON_FS_REAL_BASENAME 1 /* platform dependent APIs to + * get real basenames */ +#define USE_NAME_ON_FS_BY_FNMATCH 2 /* select the matching + * basename by fnmatch */ + #ifdef HAVE_GETATTRLIST -# define USE_NAME_ON_FS 1 +# define USE_NAME_ON_FS USE_NAME_ON_FS_REAL_BASENAME # define RUP32(size) ((size)+3/4) # define SIZEUP32(type) RUP32(sizeof(type)) #elif defined _WIN32 -# define USE_NAME_ON_FS 1 +# define USE_NAME_ON_FS USE_NAME_ON_FS_REAL_BASENAME #elif defined DOSISH -# define USE_NAME_ON_FS 2 /* by fnmatch */ +# define USE_NAME_ON_FS USE_NAME_ON_FS_BY_FNMATCH #else # define USE_NAME_ON_FS 0 #endif @@ -147,6 +155,26 @@ has_nonascii(const char *ptr, size_t len) # define IF_NORMALIZE_UTF8PATH(something) /* nothing */ #endif +#ifndef IFTODT +# define IFTODT(m) (((m) & S_IFMT) / ((~S_IFMT & S_IFMT-1) + 1)) +#endif + +typedef enum { +#ifdef DT_UNKNOWN + path_exist = DT_UNKNOWN, + path_directory = DT_DIR, + path_regular = DT_REG, + path_symlink = DT_LNK, +#else + path_exist, + path_directory = IFTODT(S_IFDIR), + path_regular = IFTODT(S_IFREG), + path_symlink = IFTODT(S_IFLNK), +#endif + path_noent = -1, + path_unknown = -2 +} rb_pathtype_t; + #define FNM_NOESCAPE 0x01 #define FNM_PATHNAME 0x02 #define FNM_DOTMATCH 0x04 @@ -157,6 +185,11 @@ has_nonascii(const char *ptr, size_t len) #else #define FNM_SYSCASE 0 #endif +#if _WIN32 +#define FNM_SHORTNAME 0x20 +#else +#define FNM_SHORTNAME 0 +#endif #define FNM_NOMATCH 1 #define FNM_ERROR 2 @@ -233,7 +266,7 @@ bracket( return ok == not ? NULL : (char *)p + 1; } -/* If FNM_PATHNAME is set, only path element will be matched. (upto '/' or '\0') +/* If FNM_PATHNAME is set, only path element will be matched. (up to '/' or '\0') Otherwise, entire string will be matched. End marker itself won't be compared. And if function succeeds, *pcur reaches end marker. @@ -412,7 +445,7 @@ dir_free(void *ptr) static size_t dir_memsize(const void *ptr) { - return ptr ? sizeof(struct dir_data) : 0; + return sizeof(struct dir_data); } static const rb_data_type_t dir_data_type = { @@ -465,7 +498,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir) const char *path; if (!keyword_ids[0]) { - keyword_ids[0] = rb_intern("encoding"); + keyword_ids[0] = rb_id_encoding(); } fsenc = rb_filesystem_encoding(); @@ -493,8 +526,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir) path = RSTRING_PTR(dirname); dp->dir = opendir(path); if (dp->dir == NULL) { - if (errno == EMFILE || errno == ENFILE) { - rb_gc(); + if (rb_gc_for_fd(errno)) { dp->dir = opendir(path); } #ifdef HAVE_GETATTRLIST @@ -553,11 +585,16 @@ dir_closed(void) } static struct dir_data * -dir_check(VALUE dir) +dir_get(VALUE dir) { - struct dir_data *dirp; rb_check_frozen(dir); - dirp = rb_check_typeddata(dir, &dir_data_type); + return rb_check_typeddata(dir, &dir_data_type); +} + +static struct dir_data * +dir_check(VALUE dir) +{ + struct dir_data *dirp = dir_get(dir); if (!dirp->dir) dir_closed(); return dirp; } @@ -585,9 +622,22 @@ dir_inspect(VALUE dir) rb_str_cat2(str, ">"); return str; } - return rb_funcall(dir, rb_intern("to_s"), 0, 0); + return rb_funcallv(dir, rb_intern("to_s"), 0, 0); } +/* Workaround for Solaris 10 that does not have dirfd. + Note: Solaris 11 (POSIX.1-2008 compliant) has dirfd(3C). + */ +#if defined(__sun) && !defined(HAVE_DIRFD) +# if defined(HAVE_DIR_D_FD) +# define dirfd(x) ((x)->d_fd) +# define HAVE_DIRFD 1 +# elif defined(HAVE_DIR_DD_FD) +# define dirfd(x) ((x)->dd_fd) +# define HAVE_DIRFD 1 +# endif +#endif + #ifdef HAVE_DIRFD /* * call-seq: @@ -640,10 +690,43 @@ dir_path(VALUE dir) } #if defined _WIN32 +static int +fundamental_encoding_p(rb_encoding *enc) +{ + switch (rb_enc_to_index(enc)) { + case ENCINDEX_ASCII: + case ENCINDEX_US_ASCII: + case ENCINDEX_UTF_8: + return TRUE; + default: + return FALSE; + } +} # define READDIR(dir, enc) rb_w32_readdir((dir), (enc)) #else # define READDIR(dir, enc) readdir((dir)) #endif +static int +to_be_skipped(const struct dirent *dp) +{ + const char *name = dp->d_name; + if (name[0] != '.') return FALSE; +#ifdef HAVE_DIRENT_NAMLEN + switch (NAMLEN(dp)) { + case 2: + if (name[1] != '.') return FALSE; + case 1: + return TRUE; + default: + break; + } +#else + if (!name[1]) return TRUE; + if (name[1] != '.') return FALSE; + if (!name[2]) return TRUE; +#endif + return FALSE; +} /* * call-seq: @@ -830,8 +913,8 @@ dir_rewind(VALUE dir) * call-seq: * dir.close -> nil * - * Closes the directory stream. Any further attempts to access - * <em>dir</em> will raise an <code>IOError</code>. + * Closes the directory stream. + * Calling this method on closed Dir object is ignored since Ruby 2.3. * * d = Dir.new("testdir") * d.close #=> nil @@ -841,7 +924,8 @@ dir_close(VALUE dir) { struct dir_data *dirp; - GetDIR(dir, dirp); + dirp = dir_get(dir); + if (!dirp->dir) return Qnil; closedir(dirp->dir); dirp->dir = NULL; @@ -930,7 +1014,6 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj) { VALUE path = Qnil; - rb_secure(2); if (rb_scan_args(argc, argv, "01", &path) == 1) { FilePathValue(path); path = rb_str_encode_ospath(path); @@ -967,10 +1050,17 @@ rb_dir_getwd(void) { char *path; VALUE cwd; + int fsenc = rb_enc_to_index(rb_filesystem_encoding()); + if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII; path = my_getcwd(); +#ifdef __APPLE__ + cwd = rb_str_normalize_ospath(path, strlen(path)); + OBJ_TAINT(cwd); +#else cwd = rb_tainted_str_new2(path); - rb_enc_associate(cwd, rb_filesystem_encoding()); +#endif + rb_enc_associate_index(cwd, fsenc); xfree(path); return cwd; @@ -994,15 +1084,14 @@ dir_s_getwd(VALUE dir) return rb_dir_getwd(); } -static void -check_dirname(volatile VALUE *dir) +static VALUE +check_dirname(VALUE dir) { - VALUE d = *dir; + VALUE d = dir; char *path, *pend; long len; rb_encoding *enc; - rb_secure(2); FilePathValue(d); enc = rb_enc_get(d); RSTRING_GETMEM(d, path, len); @@ -1010,8 +1099,9 @@ check_dirname(volatile VALUE *dir) pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc); if (pend - path < len) { d = rb_str_subseq(d, 0, pend - path); + StringValueCStr(d); } - *dir = rb_str_encode_ospath(d); + return rb_str_encode_ospath(d); } #if defined(HAVE_CHROOT) @@ -1027,7 +1117,7 @@ check_dirname(volatile VALUE *dir) static VALUE dir_s_chroot(VALUE dir, VALUE path) { - check_dirname(&path); + path = check_dirname(path); if (chroot(RSTRING_PTR(path)) == -1) rb_sys_fail_path(path); @@ -1065,7 +1155,7 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj) mode = 0777; } - check_dirname(&path); + path = check_dirname(path); if (mkdir(RSTRING_PTR(path), mode) == -1) rb_sys_fail_path(path); @@ -1084,7 +1174,7 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj) static VALUE dir_s_rmdir(VALUE obj, VALUE dir) { - check_dirname(&dir); + dir = check_dirname(dir); if (rmdir(RSTRING_PTR(dir)) < 0) rb_sys_fail_path(dir); @@ -1145,6 +1235,8 @@ sys_enc_warning_in(const char *func, const char *mesg, rb_encoding *enc) #ifdef _WIN32 #define STAT(p, s) rb_w32_ustati64((p), (s)) +#undef lstat +#define lstat(p, s) rb_w32_ulstati64((p), (s)) #else #define STAT(p, s) stat((p), (s)) #endif @@ -1180,9 +1272,7 @@ do_opendir(const char *path, int flags, rb_encoding *enc) DIR *dirp; #ifdef _WIN32 VALUE tmp = 0; - if (enc != rb_usascii_encoding() && - enc != rb_ascii8bit_encoding() && - enc != rb_utf8_encoding()) { + if (!fundamental_encoding_p(enc)) { tmp = rb_enc_str_new(path, strlen(path), enc); tmp = rb_str_encode_ospath(tmp); path = RSTRING_PTR(tmp); @@ -1411,15 +1501,16 @@ join_path(const char *path, long len, int dirsep, const char *name, size_t namle static int is_case_sensitive(DIR *dirp) { - u_int32_t attrbuf[SIZEUP32(vol_capabilities_attr_t) + 1]; + struct { + u_int32_t length; + vol_capabilities_attr_t cap[1]; + } __attribute__((aligned(4), packed)) attrbuf[1]; struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, 0, ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES}; - const vol_capabilities_attr_t *cap = (void *)(attrbuf+1); + const vol_capabilities_attr_t *const cap = attrbuf[0].cap; const int idx = VOL_CAPABILITIES_FORMAT; const uint32_t mask = VOL_CAP_FMT_CASE_SENSITIVE; - struct statfs sf; - if (fstatfs(dirfd(dirp), &sf)) return -1; - if (getattrlist(sf.f_mntonname, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) + if (fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) return -1; if (!(cap->valid[idx] & mask)) return -1; @@ -1427,19 +1518,34 @@ is_case_sensitive(DIR *dirp) } static char * -replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p) -{ - u_int32_t attrbuf[SIZEUP32(attrreference_t) + RUP32(MAXPATHLEN * 3) + 1]; - struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_NAME}; - const attrreference_t *ar = (void *)(attrbuf+1); +replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int flags, rb_pathtype_t *type) +{ + struct { + u_int32_t length; + attrreference_t ref[1]; + fsobj_type_t objtype; + char path[MAXPATHLEN * 3]; + } __attribute__((aligned(4), packed)) attrbuf[1]; + struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_NAME|ATTR_CMN_OBJTYPE}; + const attrreference_t *const ar = attrbuf[0].ref; const char *name; long len; char *tmp; IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil); - if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) + *type = path_noent; + if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) { + if (!to_be_ignored(errno)) + sys_warning(path, enc); return path; + } + switch (attrbuf[0].objtype) { + case VREG: *type = path_regular; break; + case VDIR: *type = path_directory; break; + case VLNK: *type = path_symlink; break; + default: *type = path_exist; break; + } name = (char *)ar + ar->attr_dataoffset; len = (long)ar->attr_length - 1; if (name + len > (char *)attrbuf + sizeof(attrbuf)) @@ -1464,9 +1570,10 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p) } #elif defined _WIN32 VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc); +int rb_w32_reparse_symlink_p(const WCHAR *path); static char * -replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p) +replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int flags, rb_pathtype_t *type) { char *plainname = path; volatile VALUE tmp = 0; @@ -1475,10 +1582,8 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p) WCHAR *wplain; HANDLE h = INVALID_HANDLE_VALUE; long wlen; - if (enc && - enc != rb_usascii_encoding() && - enc != rb_ascii8bit_encoding() && - enc != rb_utf8_encoding()) { + int e = 0; + if (!fundamental_encoding_p(enc)) { tmp = rb_enc_str_new_cstr(plainname, enc); tmp = rb_str_encode_ospath(tmp); plainname = RSTRING_PTR(tmp); @@ -1486,11 +1591,28 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p) wplain = rb_w32_mbstr_to_wstr(CP_UTF8, plainname, -1, &wlen); if (tmp) rb_str_resize(tmp, 0); if (!wplain) return path; - if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa)) + if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa)) { h = FindFirstFileW(wplain, &fd); + e = rb_w32_map_errno(GetLastError()); + } + if (fa.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) { + if (!rb_w32_reparse_symlink_p(wplain)) + fa.dwFileAttributes &= ~FILE_ATTRIBUTE_REPARSE_POINT; + } free(wplain); - if (h == INVALID_HANDLE_VALUE) return path; + if (h == INVALID_HANDLE_VALUE) { + *type = path_noent; + if (e && !to_be_ignored(e)) { + errno = e; + sys_warning(path, enc); + } + return path; + } FindClose(h); + *type = + (fa.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ? path_symlink : + (fa.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? path_directory : + path_regular; if (tmp) { char *buf; tmp = rb_w32_conv_from_wchar(fd.cFileName, enc); @@ -1521,12 +1643,10 @@ replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p) } return path; } -#elif USE_NAME_ON_FS == 1 +#elif USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME # error not implemented #endif -enum answer {UNKNOWN = -1, NO, YES}; - #ifndef S_ISDIR # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif @@ -1557,12 +1677,24 @@ glob_func_caller(VALUE val) return Qnil; } +static inline int +dirent_match(const char *pat, rb_encoding *enc, const char *name, const struct dirent *dp, int flags) +{ + if (fnmatch(pat, enc, name, flags) == 0) return 1; +#ifdef _WIN32 + if (dp->d_altname && (flags & FNM_SHORTNAME)) { + if (fnmatch(pat, enc, dp->d_altname, flags) == 0) return 1; + } +#endif + return 0; +} + static int glob_helper( const char *path, + long pathlen, 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? */ + rb_pathtype_t pathtype, /* type of 'path' */ struct glob_pattern **beg, struct glob_pattern **end, int flags, @@ -1575,7 +1707,6 @@ glob_helper( 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); - long pathlen; for (cur = beg; cur < end; ++cur) { struct glob_pattern *p = *cur; @@ -1588,7 +1719,7 @@ glob_helper( plain = 1; break; case ALPHA: -#if USE_NAME_ON_FS == 1 +#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME plain = 1; #else magical = 1; @@ -1608,33 +1739,28 @@ glob_helper( } } - pathlen = strlen(path); if (*path) { - if (match_all && exist == UNKNOWN) { + if (match_all && pathtype == path_unknown) { if (do_lstat(path, &st, flags, enc) == 0) { - exist = YES; - isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO; + pathtype = IFTODT(st.st_mode); } else { - exist = NO; - isdir = NO; + pathtype = path_noent; } } - if (match_dir && isdir == UNKNOWN) { + if (match_dir && pathtype == path_unknown) { if (do_stat(path, &st, flags, enc) == 0) { - exist = YES; - isdir = S_ISDIR(st.st_mode) ? YES : NO; + pathtype = IFTODT(st.st_mode); } else { - exist = NO; - isdir = NO; + pathtype = path_noent; } } - if (match_all && exist == YES) { + if (match_all && pathtype > path_noent) { status = glob_call_func(func, path, arg, enc); if (status) return status; } - if (match_dir && isdir == YES) { + if (match_dir && pathtype == path_directory) { char *tmp = join_path(path, pathlen, dirsep, "", 0); if (!tmp) return -1; status = glob_call_func(func, tmp, arg, enc); @@ -1643,16 +1769,16 @@ glob_helper( } } - if (exist == NO || isdir == NO) return 0; + if (pathtype == path_noent) return 0; if (magical || recursive) { struct dirent *dp; DIR *dirp; -# if USE_NAME_ON_FS == 2 +# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH char *plainname = 0; # endif IF_NORMALIZE_UTF8PATH(int norm_p); -# if USE_NAME_ON_FS == 2 +# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH if (cur + 1 == end && (*cur)->type <= ALPHA) { plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str)); if (!plainname) return -1; @@ -1685,7 +1811,7 @@ glob_helper( # endif while ((dp = READDIR(dirp, enc)) != NULL) { char *buf; - enum answer new_isdir = UNKNOWN; + rb_pathtype_t new_pathtype = path_unknown; const char *name; size_t namlen; int dotfile = 0; @@ -1721,15 +1847,18 @@ glob_helper( } name = buf + pathlen + (dirsep != 0); if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) { +#ifdef DT_UNKNOWN + if ((new_pathtype = dp->d_type) != (rb_pathtype_t)DT_UNKNOWN) + /* Got it. We need nothing more. */ + ; + else + /* fall back to call lstat(2) */ +#endif /* RECURSIVE never match dot files unless FNM_DOTMATCH is set */ -#ifndef _WIN32 if (do_lstat(buf, &st, flags, enc) == 0) - new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO; + new_pathtype = IFTODT(st.st_mode); else - new_isdir = NO; -#else - new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO; -#endif + new_pathtype = path_noent; } new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2); @@ -1742,13 +1871,14 @@ glob_helper( for (cur = beg; cur < end; ++cur) { struct glob_pattern *p = *cur; if (p->type == RECURSIVE) { - if (new_isdir == YES) /* not symlink but real directory */ + if (new_pathtype == path_directory || /* not symlink but real directory */ + new_pathtype == path_exist) *new_end++ = p; /* append recursive pattern */ p = p->next; /* 0 times recursion */ } switch (p->type) { case ALPHA: -# if USE_NAME_ON_FS == 2 +# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH if (plainname) { *new_end++ = p->next; break; @@ -1756,14 +1886,15 @@ glob_helper( # endif case PLAIN: case MAGICAL: - if (fnmatch(p->str, enc, name, flags) == 0) + if (dirent_match(p->str, enc, name, dp, flags)) *new_end++ = p->next; default: break; } } - status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end, + status = glob_helper(buf, name - buf + namlen, 1, + new_pathtype, new_beg, new_end, flags, func, arg, enc); GLOB_FREE(buf); GLOB_FREE(new_beg); @@ -1785,6 +1916,7 @@ glob_helper( for (cur = copy_beg; cur < copy_end; ++cur) { if (*cur) { + rb_pathtype_t new_pathtype = path_unknown; char *buf; char *name; size_t len = strlen((*cur)->str) + 1; @@ -1818,14 +1950,16 @@ glob_helper( status = -1; break; } -#if USE_NAME_ON_FS == 1 +#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME if ((*cur)->type == ALPHA) { long base = pathlen + (dirsep != 0); - buf = replace_real_basename(buf, base, enc, IF_NORMALIZE_UTF8PATH(1)+0); + buf = replace_real_basename(buf, base, enc, IF_NORMALIZE_UTF8PATH(1)+0, + flags, &new_pathtype); } #endif - status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg, - new_end, flags, func, arg, enc); + status = glob_helper(buf, pathlen + strlen(buf + pathlen), 1, + new_pathtype, new_beg, new_end, + flags, func, arg, enc); GLOB_FREE(buf); GLOB_FREE(new_beg); if (status) break; @@ -1853,7 +1987,7 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco root = rb_enc_path_skip_prefix(root, root + strlen(root), enc); #endif - if (root && *root == '/') root++; + if (*root == '/') root++; n = root - start; buf = GLOB_ALLOC_N(char, n + 1); @@ -1866,7 +2000,8 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco GLOB_FREE(buf); return -1; } - status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc); + status = glob_helper(buf, n, 0, path_unknown, &list, &list + 1, + flags, func, arg, enc); glob_free_pattern(list); GLOB_FREE(buf); @@ -1920,7 +2055,15 @@ rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg) static void push_pattern(const char *path, VALUE ary, void *enc) { - rb_ary_push(ary, rb_external_str_new_with_enc(path, strlen(path), enc)); +#if defined _WIN32 || defined __APPLE__ + VALUE name = rb_utf8_str_new_cstr(path); + rb_encoding *eenc = rb_default_internal_encoding(); + OBJ_TAINT(name); + name = rb_str_conv_enc(name, NULL, eenc ? eenc : enc); +#else + VALUE name = rb_external_str_new_with_enc(path, strlen(path), enc); +#endif + rb_ary_push(ary, name); } static int @@ -1938,7 +2081,7 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg, if (*p == '{' && nest++ == 0) { lbrace = p; } - if (*p == '}' && --nest <= 0) { + if (*p == '}' && lbrace && --nest == 0) { rbrace = p; break; } @@ -1996,12 +2139,12 @@ glob_brace(const char *path, VALUE val, void *enc) return ruby_glob0(path, arg->flags, arg->func, arg->value, enc); } -static int -ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg, - rb_encoding* enc) +int +ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc) { struct brace_args args; + flags &= ~GLOB_VERBOSE; args.func = func; args.value = arg; args.flags = flags; @@ -2011,37 +2154,47 @@ ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg, int ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg) { - return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg, - rb_ascii8bit_encoding()); + return ruby_brace_glob_with_enc(str, flags, func, arg, rb_ascii8bit_encoding()); } -int -ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc) +struct push_glob_args { + struct glob_args glob; + int flags; +}; + +static int +push_caller(const char *path, VALUE val, void *enc) { - return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg, enc); + struct push_glob_args *arg = (struct push_glob_args *)val; + + return ruby_glob0(path, arg->flags, rb_glob_caller, (VALUE)&arg->glob, enc); } static int push_glob(VALUE ary, VALUE str, int flags) { - struct glob_args args; -#ifdef __APPLE__ - rb_encoding *enc = rb_utf8_encoding(); - - str = rb_str_encode_ospath(str); -#else + struct push_glob_args args; rb_encoding *enc = rb_enc_get(str); - if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding(); - if (enc == rb_usascii_encoding()) enc = rb_ascii8bit_encoding(); +#if defined _WIN32 || defined __APPLE__ + str = rb_str_encode_ospath(str); +#endif + if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII) + enc = rb_filesystem_encoding(); + if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII) + enc = rb_ascii8bit_encoding(); + flags |= GLOB_VERBOSE; + args.glob.func = push_pattern; + args.glob.value = ary; + args.glob.enc = enc; + args.flags = flags; +#if defined _WIN32 || defined __APPLE__ + enc = rb_utf8_encoding(); #endif - args.func = push_pattern; - args.value = ary; - args.enc = enc; RB_GC_GUARD(str); - return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE, - rb_glob_caller, (VALUE)&args, enc); + return ruby_brace_expand(RSTRING_PTR(str), flags, + push_caller, (VALUE)&args, enc); } static VALUE @@ -2211,7 +2364,7 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj) static VALUE dir_open_dir(int argc, VALUE *argv) { - VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv); + VALUE dir = rb_funcallv(rb_cDir, rb_intern("open"), argc, argv); rb_check_typeddata(dir, &dir_data_type); return dir; @@ -2486,6 +2639,73 @@ rb_dir_exists_p(VALUE obj, VALUE fname) } /* + * call-seq: + * Dir.empty?(path_name) -> true or false + * + * Returns <code>true</code> if the named file is an empty directory, + * <code>false</code> if it is not a directory or non-empty. + */ +static VALUE +rb_dir_s_empty_p(VALUE obj, VALUE dirname) +{ + DIR *dir; + struct dirent *dp; + VALUE result = Qtrue, orig; + const char *path; + enum {false_on_notdir = 1}; + + GlobPathValue(dirname, FALSE); + orig = rb_str_dup_frozen(dirname); + dirname = rb_str_encode_ospath(dirname); + dirname = rb_str_dup_frozen(dirname); + path = RSTRING_PTR(dirname); + +#if defined HAVE_GETATTRLIST && defined ATTR_DIR_ENTRYCOUNT + { + u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)]; + struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,}; + if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) != 0) + rb_sys_fail_path(orig); + if (*(const fsobj_tag_t *)(attrbuf+1) == VT_HFS) { + al.commonattr = 0; + al.dirattr = ATTR_DIR_ENTRYCOUNT; + if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) == 0) { + if (attrbuf[0] >= 2 * sizeof(u_int32_t)) + return attrbuf[1] ? Qfalse : Qtrue; + if (false_on_notdir) return Qfalse; + } + rb_sys_fail_path(orig); + } + } +#endif + + dir = opendir(path); + if (!dir) { + int e = errno; + switch (e) { + case EMFILE: case ENFILE: + rb_gc(); + dir = opendir(path); + if (dir) break; + e = errno; + /* fall through */ + default: + if (false_on_notdir && e == ENOTDIR) return Qfalse; + rb_syserr_fail_path(e, orig); + } + } + errno = 0; + while ((dp = READDIR(dir, NULL)) != NULL) { + if (!to_be_skipped(dp)) { + result = Qfalse; + break; + } + } + closedir(dir); + return result; +} + +/* * 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 @@ -2536,6 +2756,7 @@ Init_Dir(void) rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1); rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1); rb_define_singleton_method(rb_cDir,"exists?", rb_dir_exists_p, 1); + rb_define_singleton_method(rb_cDir,"empty?", rb_dir_s_empty_p, 1); rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1); rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1); @@ -2579,4 +2800,11 @@ Init_Dir(void) * 0. */ rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE)); + + /* Document-const: File::Constants::FNM_SHORTNAME + * + * Makes patterns to match short names if existing. Valid only + * on Microsoft Windows. + */ + rb_file_const("FNM_SHORTNAME", INT2FIX(FNM_SHORTNAME)); } @@ -85,10 +85,6 @@ char *getenv(); # endif #endif -#if defined(__BEOS__) || defined(__HAIKU__) -# include <image.h> -#endif - #ifndef dln_loaderror static void dln_loaderror(const char *format, ...) @@ -106,7 +102,7 @@ dln_loaderror(const char *format, ...) # define USE_DLN_DLOPEN #endif -#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD) +#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(NeXT) || defined(MACOSX_DYLD) # define EXTERNAL_PREFIX "_" #else # define EXTERNAL_PREFIX "" @@ -1117,12 +1113,12 @@ dln_sym(const char *name) #endif #endif -#if defined _WIN32 && !defined __CYGWIN__ +#ifdef _WIN32 #include <windows.h> #include <imagehlp.h> #endif -#if defined _WIN32 && !defined __CYGWIN__ +#ifdef _WIN32 static const char * dln_strerror(char *message, size_t size) { @@ -1249,12 +1245,15 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine) void* dln_load(const char *file) { +#if (defined _WIN32 || defined USE_DLN_DLOPEN) && defined RUBY_EXPORT + static const char incompatible[] = "incompatible library version"; +#endif #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__ +#if defined _WIN32 HINSTANCE handle; WCHAR *winfile; char message[1024]; @@ -1282,7 +1281,7 @@ dln_load(const char *file) #if defined _WIN32 && defined RUBY_EXPORT if (!rb_w32_check_imported(handle, rb_libruby_handle())) { FreeLibrary(handle); - error = "incompatible library version"; + error = incompatible; goto failed; } #endif @@ -1331,7 +1330,6 @@ dln_load(const char *file) } # if defined RUBY_EXPORT { - static const char incompatible[] = "incompatible library version"; void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc"); if (ex && ex != ruby_xmalloc) { @@ -1442,54 +1440,6 @@ dln_load(const char *file) } #endif -#if defined(__BEOS__) || defined(__HAIKU__) -# define DLN_DEFINED - { - status_t err_stat; /* BeOS error status code */ - image_id img_id; /* extension module unique id */ - void (*init_fct)(); /* initialize function for extension module */ - - /* load extension module */ - img_id = load_add_on(file); - if (img_id <= 0) { - dln_loaderror("Failed to load add_on %.200s error_code=%x", - file, img_id); - } - - /* find symbol for module initialize function. */ - /* The Be Book KernelKit Images section described to use - B_SYMBOL_TYPE_TEXT for symbol of function, not - B_SYMBOL_TYPE_CODE. Why ? */ - /* strcat(init_fct_symname, "__Fv"); */ /* parameter nothing. */ - /* "__Fv" dont need! The Be Book Bug ? */ - err_stat = get_image_symbol(img_id, buf, - B_SYMBOL_TYPE_TEXT, (void **)&init_fct); - - if (err_stat != B_NO_ERROR) { - char real_name[MAXPATHLEN]; - - strlcpy(real_name, buf, MAXPATHLEN); - strlcat(real_name, "__Fv", MAXPATHLEN); - err_stat = get_image_symbol(img_id, real_name, - B_SYMBOL_TYPE_TEXT, (void **)&init_fct); - } - - if ((B_BAD_IMAGE_ID == err_stat) || (B_BAD_INDEX == err_stat)) { - unload_add_on(img_id); - dln_loaderror("Failed to lookup Init function %.200s", file); - } - else if (B_NO_ERROR != err_stat) { - char errmsg[] = "Internal of BeOS version. %.200s (symbol_name = %s)"; - unload_add_on(img_id); - dln_loaderror(errmsg, strerror(err_stat), buf); - } - - /* call module initialize function. */ - (*init_fct)(); - return (void*)img_id; - } -#endif /* __BEOS__ || __HAIKU__ */ - #ifndef DLN_DEFINED dln_notimplement(); #endif diff --git a/dln_find.c b/dln_find.c index 56a19818cf..b08612764e 100644 --- a/dln_find.c +++ b/dln_find.c @@ -48,13 +48,6 @@ char *dln_argv0; # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif -#ifdef HAVE_SYS_PARAM_H -# include <sys/param.h> -#endif -#ifndef MAXPATHLEN -# define MAXPATHLEN 1024 -#endif - #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -276,13 +269,15 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size, } goto next; } -#endif /* _WIN32 or __EMX__ */ +#endif - if (stat(fbuf, &st) == 0) { +#ifndef S_ISREG +# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + if (stat(fbuf, &st) == 0 && S_ISREG(st.st_mode)) { 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; } next: /* if not, and no other alternatives, life is bleak */ @@ -1,5 +1,6 @@ #include "ruby/ruby.h" +NORETURN(void *dln_load(const char *)); void* dln_load(const char *file) { diff --git a/doc/ChangeLog-0.06_to_0.52 b/doc/ChangeLog-0.06_to_0.52 new file mode 100644 index 0000000000..63826081b3 --- /dev/null +++ b/doc/ChangeLog-0.06_to_0.52 @@ -0,0 +1,1147 @@ +Fri Oct 14 13:22:18 1994 Yukihiro Matsumoto (matz@ix-02) + + * version 0.52: ……ãªã‚“ã¦ã“ã£ãŸã„. + + * eval.c(rb_call): returnã®å‡¦ç†ãŒé–“é•ã£ã¦ã„ãŸã®ã§, マシンã«ã‚ˆã£ã¦ + ã¯returnã§é–¢æ•°ã‚’終了ã™ã‚‹ã ã‘ã§ãªãtoplevelã¾ã§ã¤ã抜ã‘ã¦ã„ãŸ. + + * object.c: Builtinクラスを新è¨. 組ã¿è¾¼ã¿é–¢æ•°ã‚’Kernelã‹ã‚‰ç§»ã—ãŸ. + nilãŒçµ„ã¿è¾¼ã¿é–¢æ•°ã‚’ç†è§£ã™ã‚‹ã¨ãƒˆãƒ©ãƒ–ルã®å…ƒã§ã‚ã‚‹. + + * dbm.c: Dictã¨åŒæ§˜ã«eachãŒ[key,value]ã‚’è¿”ã™ã‚ˆã†ã«. + + * version 0.51 + +Thu Oct 13 12:13:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(SETUP_ARGS): ä»˜åŠ æ¼”ç®—åãŒé…列ã§ãªã„時ã«ã¯é…列ã«å¤‰æ›ã™ã‚‹. + + * parse.y: 括弧ãªã—ã®ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã§ã‚‚`*'ã«ã‚ˆã‚‹ä»˜åŠ 引数ãŒä½¿ãˆã‚‹ + よã†ã«ã—ãŸ. ãŸã ã—, 通常引数ãŒä¸€ã¤ã‚‚ãªã„å ´åˆã¯ä¹—算演算åã¨åŒºåˆ¥ãŒ + ã¤ã‹ãªã„ã®ã§, å¿…ãšæ‹¬å¼§ãŒå¿…è¦. + +Wed Oct 12 10:09:07 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(rb_call): ã‚ャッシュã®è¨ˆç®—ã‚’inline化. ã‚ャッシュミスãŒã‚ + ã‚Œã°é–¢æ•°å‘¼ã³å‡ºã—ã§ãƒ¡ã‚½ãƒƒãƒ‰ã‚’検索ã™ã‚‹. methods.cã¯ãªããªã£ãŸ. + + * eval.c(rb_eval): ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ç”¨ã®é ˜åŸŸã‚’alloca()ã™ã‚‹ã‚ˆã†ã«å¤‰æ›´. + サイズã®å¤‰æ›´ãŒå¿…è¦ã«ãªã‚Œã°æ”¹ã‚ã¦malloc()ã™ã‚‹ã‚ˆã†ã«. + + * parse.y: error recoveryã®éš›ã«lex_stateã‚’æ›´æ–°ã—ã¦ãŠãよã†ã«. + +Tue Oct 11 17:10:46 1994 Yukihiro Matsumoto (matz@ix-02) + + * socket.c(for_fd): ファイル記述å(Fixnum)ã‹ã‚‰ã‚½ã‚±ãƒƒãƒˆã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ + を得るメソッド. ãŸã¨ãˆã°inetdã‹ã‚‰èµ·å‹•ã•ã‚ŒãŸã‚µãƒ¼ãƒã§æ¨™æº–入出力㫠+ ソケットæ“作を行ãªã†ãŸã‚ã«ä½¿ã†. ã¤ã¾ã‚ŠSocket.for_fd($stdin)ã§æ¨™ + 準入力ã«å¯¾å¿œã™ã‚‹ã‚½ã‚±ãƒƒãƒˆã‚ªãƒ–ジェクトãŒå¾—られる. + + * io.c(to_i): IOクラスã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’æ•´æ•°ã«å¤‰æ›ã™ã‚‹ã¨ãã®ãƒ•ã‚¡ã‚¤ãƒ« + 記述åã‚’è¿”ã™ã‚ˆã†ã«. + + * numeric.c(num2int): to_iメソッドを使ã£ã¦ã§ãã‚‹é™ã‚Šæ•´æ•°ã«å¤‰æ›ã™ã‚‹. + 以å‰ã¯num2fixã ã‘ãŒå…¨ã¦ã®ã‚ªãƒ–ジェクトã«å¯¾ã—ã¦to_iメソッドをé©ç”¨ + ã—ã¦ã„ãŸ. + + * sprintf.c(Fsprintf): 整数表示ã®éš›, オブジェクトをã§ãã‚‹é™ã‚Šæ•´æ•° + ã«å¤‰æ›ã™ã‚‹ã‚ˆã†ã«(to_iメソッドを使ã†). + +Fri Oct 7 14:06:32 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(Fcaller): å¿…è¦æ€§ãŒã‚ˆã分ã‹ã‚‰ãªã„ã®ã§ãƒ‰ã‚ュメントã‹ã‚‰å‰Šé™¤. + å°†æ¥ãƒ‡ãƒãƒƒã‚¬ã‚’作る時ã«å¾©æ´»ã•ã›ã‚ˆã†. + + * eval.c(rb_call): Cã§è¨˜è¿°ã•ã‚ŒãŸãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã§ã¯ç’°å¢ƒã‚’スタック + ã«ã‚»ãƒ¼ãƒ–ã—ãªã„ã“ã¨ã«ã‚ˆã£ã¦é«˜é€ŸåŒ–. + +Wed Oct 5 15:00:58 1994 Yukihiro Matsumoto (matz@ix-02) + + * ruby.h: 一時env.hã«ç§»å‹•ã—ã¦ãŸQselfã®å®šç¾©ã‚’復活. ãŸã ã—今回ã¯é–¢æ•° + ã¨ã—ã¦å®Ÿç¾(env.hã§ã¯å¤‰æ•°ã¨ã—ã¦å†å®šç¾©ã—ã¦ã‚ã‚‹). + + * ruby.h: TRUEã§syntax errorã«ãªã‚‰ãªã„よã†#undefã‚’è¿½åŠ . + + * eval.c(rb_eval): thread化ã«æŒ‘戦ã—ãŸãŒ, 失敗(速ããªã‚‰ãªã‹ã£ãŸ). + ãŒ, Scopingãªã©ã®ç„¡é§„ãªã‚³ãƒ¼ãƒ‰ã®å‰Šé™¤ã¨ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã®å¼•æ•°ã‚»ãƒƒ + トã®inline化ã§è‹¥å¹²ã®é«˜é€ŸåŒ–を実ç¾ã—ãŸ. 副作用ã¨ã—ã¦, argc, argvå½¢ + å¼ã®é–¢æ•°å‘¼ã³å‡ºã—ã®ä»•æ§˜ãŒå¤‰åŒ–ã—ãŸ(argvã«selfã‚’å«ã¾ãªããªã£ãŸ). + + * eval.c(rb_call): メソッド呼ã³å‡ºã—ã®é«˜é€ŸåŒ–. + +Tue Oct 4 11:40:53 1994 Yukihiro Matsumoto (matz@ix-02) + + * ruby-mode.el: 修飾åã«å¯¾å¿œã—ãŸ. + + * parse.y: 多é‡ä»£å…¥ã«restã‚’ã¤ã‘ãŸ. ã“ã®æ©Ÿèƒ½ã‚’使ãˆã°optional引数㮠+ 解æžãŒç°¡å˜ã«ã§ãã‚‹(ã¯ãš). + + * pack.c(unpack): uuencodeå½¢å¼ã®decodeã®éš›ã«æ–‡å—列ã®é•·ã•ãŒé–“é•ã£ã¦ + ã„ãŸ. + +Mon Oct 3 15:58:41 1994 Yukihiro Matsumoto (matz@ix-02) + + * file.c(type): ファイルタイプを文å—列ã§è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰. + +Fri Sep 30 11:36:07 1994 Yukihiro Matsumoto (matz@ix-02) + + * object.c: デフォルトã®çœŸã®å€¤ã§ã‚ã‚‹%TRUEã®å€¤ã‚’1(Fixnum)ã‹ã‚‰tã«å¤‰ + æ›´ã—ãŸ. to_sã§æ–‡å—列ã«å¤‰æ›ã—ãŸæ™‚ã«ã‚‚`t'ã¨è¡¨ç¤ºã•ã‚Œã‚‹. æ›´ã«è¸ã¿è¾¼ + ã‚“ã§`t'を予約語ã«ã—ã¦lispã®ã‚ˆã†ã«ã—よã†ã‹ã¨ã‚‚æ€ã£ãŸãŒ, ãã“ã¾ã§ + ã¯æ±ºå¿ƒã§ããªã‹ã£ãŸ. 一文å—ã®ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¯ã‹ãªã‚Šä½¿ã„ãã†ãªæ°—ãŒã™ + ã‚‹ã®ã§â€¦. + + * array.c,dict.c: equalã‚’å†å®šç¾©ã—ã¦ã„るクラスã§, hashã‚’æ£ã—ã定義 + ã—ãŸ. + +Wed Sep 28 23:30:28 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c(Ffail): 今ã¾ã§failã¯ã‚«ãƒ¼ãƒãƒ«ã‚¯ãƒ©ã‚¹ã®ãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚ã£ãŸãŒ, + 構文ã«çµ„ã¿è¾¼ã‚“ã . ã“ã®å¤‰æ›´ã«ã‚ˆã£ã¦, 1)`fail'ã¯äºˆç´„語ã¨ãªã‚Š, ãƒãƒ¼ + カル変数ã«ç”¨ã„ã‚‹ã“ã¨ãŒã§ããªããªã£ãŸ. 2)`fail'å˜ä½“ã§ä¾‹å¤–を発生㙠+ るよã†ã«ãªã£ãŸ. 3)failã¯ãƒ¡ã‚½ãƒƒãƒ‰ã§ã¯ãªããªã£ãŸã®ã§å†å®šç¾©ã•ã‚Œã‚‹å¯ + 能性ãŒãªããªã£ãŸ. + + * dic.c, dbm.c(indexes): Arrayã®indexesã¨åŒæ§˜ã®æ©Ÿèƒ½ã‚’æŒã¤ãƒ¡ã‚½ãƒƒãƒ‰ + ã‚’è¿½åŠ . + + * array.c(indexes): 引数をインデックスã¨ã™ã‚‹è¦ç´ ã®é…列を返ã™. æ•´æ•° + ã®é…列を引数ã¨ã™ã‚‹æ™‚ã«ã¯å¼•æ•°ã®è¦ç´ をインデックスã¨ã™ã‚‹è¦ç´ ã®é…列 + ã‚’è¿”ã™. + +Mon Sep 19 13:42:31 1994 Yukihiro Matsumoto (matz@ix-02) + + * array.c(aset): 部分é…列ã«å¯¾ã™ã‚‹ä»£å…¥ã§é…列以外ã®ã‚ªãƒ–ジェクトãŒæŒ‡ + 定ã•ã‚ŒãŸå ´åˆã«å¤šé‡ä»£å…¥ã¨åŒã˜ãƒ«ãƒ¼ãƒ«ã§é…列化ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * io.c(print): 引数ã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸå„オブジェクトã«print_onメッセー + ジを与ãˆã‚‹ã‚ˆã†ã«. 実行速度ã¯è½ã¡ã‚‹ãŒæŸ”軟性ã¯å¢—ã™. + +Fri Sep 16 14:59:18 1994 Yukihiro Matsumoto (matz@ix-02) + + * glob.c: ワイルドカードã®å°Žå…¥. bashã«ä½¿ã‚ã‚Œã¦ã„ã‚‹GNUã®globルーム+ ンをæµç”¨ã—ãŸ. + +Mon Sep 12 18:36:58 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(value_expr): å¼ãŒnilã®æ™‚ã«å¯¾å¿œ. + + * class.c: ICLASSã®classãŒå¿…ãšClass/Moduleを指ã™ã‚ˆã†ã«. + +Tue Sep 6 16:23:28 1994 Yukihiro Matsumoto (matz@ix-02) + + * re.c: æ£è¦è¡¨ç¾å†…ã§ã€Œ\æ•°å—ã€å½¢å¼ãŒæŒ‡å®šã§ãるよã†ã«. + + * parse.y:「do expr using var ... endã€å½¢å¼ã¯ãªããªã£ãŸ. 寂ã—ã„æ°— + ã‚‚ã™ã‚‹. *BACKWARD INCOMPATIBILITY* + +Mon Sep 5 10:59:01 1994 Yukihiro Matsumoto (matz@ix-02) + + * numeric.c(next): Numericクラスã«ã‚‚nextã‚’æä¾›. + + * string.c(upto): uptoã‚’æä¾›. + + * range.c(each): nextを使ã£ãŸã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã‹ã‚‰uptoを使ã†ã‚ˆã†ã«å¤‰ + æ›´ã—ãŸ. ã“ã®æ–¹ãŒä¸€ã¤ã®ãƒ¡ã‚½ãƒƒãƒ‰ã§å‡¦ç†ã‚’ã¾ã¨ã‚ã§è¡Œãªã†ã“ã¨ãŒã§ãã‚‹. + +Fri Sep 2 15:25:39 1994 Yukihiro Matsumoto (matz@ix-02) + + * dict.c(each): 戻り値を[key, value]ã®ãƒšã‚¢ã«å¤‰æ›´. 今ã¾ã§ã®each㯠+ each_valueã¨ã—ã¦æ®‹ã‚‹. *BACKWARD INCOMPATIBILITY* + +Thu Sep 1 10:49:04 1994 Yukihiro Matsumoto (matz@ix-02) + + * æˆåŠŸã—ãŸ(特別ãªæˆ»ã‚Šå€¤ã‚’æŒãŸãªã„)システムコールã¯`0'ã‚’è¿”ã™ã‚ˆã†ã«. + +Wed Aug 31 00:26:51 1994 Yukihiro Matsumoto (matz@dyna) + + * string.c: ãƒã‚§ãƒƒã‚¯ã‚µãƒ を得るメソッド`sum'を作ã£ãŸ. + + * class.c(include_class_new): ICLASSã®classã‚’ã‚‚ã¨ã®ã‚¯ãƒ©ã‚¹ã«ã—ãŸ. + gcã®éš›ã«å…ƒã‚¯ãƒ©ã‚¹ã‚’マークã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã®ãŒ, フィールドを増やã™ä½™ + 地ãŒç„¡ã„ã®ã§, classフィールドをæµç”¨ã—ãŸ. ç§ã®è¦‹ç©ã‚ŠãŒé–“é•ã£ã¦ã„ + ã¦, ICLASSã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹äº‹ãŒã‚ã‚Œã°, ãŠã‹ã—ãªå‹• + 作をã™ã‚‹ã ã‚ã†. + + * eval.c(masign): å¼(a,b = nil)ã®å€¤ã‚’[nil]ã‹ã‚‰nilã«å¤‰æ›´ã—ãŸ. + +Mon Aug 29 11:56:09 1994 Yukihiro Matsumoto (matz@ix-02) + + * class.c: rb_define_mfuncã‚’ç„¡ãã—ã¦, メタクラスã«ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’イン + クルードã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * error.c(yyerror): åŒã˜è¡Œã§è¤‡æ•°ã®syntax errorをリãƒãƒ¼ãƒˆã—ãªã„よㆠ+ ã«ã—ãŸ. + + * file.c: FileTestモジュールã«ãƒ•ã‚¡ã‚¤ãƒ«ãƒ†ã‚¹ãƒˆãƒ¡ã‚½ãƒƒãƒ‰ã‚’分離ã—ãŸ. + + * parse.y: 演算åを指定ã™ã‚‹æ™‚ã®lex_stateã‚’æ£ã—ãè¨å®šã—ãŸ. + +Sat Aug 27 01:23:34 1994 Yukihiro Matsumoto (matz@dyna) + + * parse.y: if/whileãªã©ã®è¤‡åˆå¼ã‚’primaryã«ç§»å‹•ã—ãŸ. ã“ã‚Œã«ã‚ˆã£ã¦ä¾‹ + ãˆã°ã€Œif cond then a else b end.message()ã€ã®ã‚ˆã†ãªå¼ãŒæ›¸ã‘るよ + ã†ã«ãªã£ãŸ. + +Fri Aug 26 10:46:30 1994 Yukihiro Matsumoto (matz@ix-02) + + * spec: æ•´ç†ã•ã‚ŒãŸæ–‡æ³•ã«ã—ãŸãŒã£ã¦æ›¸ãç›´ã—ãŸ. + + * parse.y: ã“ã“æ•°æ—¥ã§æ··ä¹±ã—ã¦ã„ãŸæ–‡æ³•ã‚’æ•´ç†ã—ãŸ. 括弧をçœç•¥ã—ãŸãƒ¡ + ソッド呼ã³å‡ºã—ãŒã§ãるよã†ã«ãªã£ãŸã“ã¨, modifierãŒä»˜ã‘られるよㆠ+ ã«ãªã£ãŸã“ã¨, returnã«ãƒªã‚¹ãƒˆãŒæ¸¡ã›ã‚‹ã‚ˆã†ã«ãªã£ãŸã“ã¨ãŒä¸»ãªå¤‰æ›´ç‚¹ + ã§ã‚ã‚‹. + + * process周りãŒæ€ªã—ã„ãŒã¨ã«ã‹ãSolaris 2.3ã§å‹•ãよã†ã«. + + * parse.y: 曖昧性ãŒãªã„å ´åˆã«ã¯ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã®å¼•æ•°ã®æ‹¬å¼§ã‚’çœç•¥ + ã§ãるよã†ã«. çœç•¥ã§ãるメソッド呼ã³å‡ºã—ã®æ¡ä»¶ã¯, 1)ã‹ãªã‚‰ãš1個 + 以上ã®å¼•æ•°ã‚’å¿…è¦ã¨ã™ã‚‹ã“ã¨, 2)第1引数ãŒ`+', `-', `(', `[', `{', + `/'ãªã©, å¼ã®å§‹ã¾ã‚Šã«ç½®ã‹ã‚ŒãŸæ™‚ã¨é€”ä¸ã«ç¾ã‚ŒãŸæ™‚ã¨ã§è§£é‡ˆãŒé•ã†è¨˜ + å·ã§å§‹ã¾ã‚‰ãªã„ã“ã¨, ã§ã‚ã‚‹. + +Thu Aug 25 13:54:58 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(cond): æ¡ä»¶å¼ã®å±•é–‹éƒ¨ã«bugãŒã‚ã£ãŸ. + +Wed Aug 24 00:01:15 1994 Yukihiro Matsumoto (matz@dyna) + + * parse.y: returnã¯ã‚³ãƒ³ãƒžã§åŒºåˆ‡ã£ãŸãƒªã‚¹ãƒˆã‚‚å—ã‘å–るよã†ã«. ã¤ã¾ã‚Š, + return a, b, cã¯return [a, b, c]ã¨åŒã˜æ„味ã«ãªã‚‹. + + * parse.y: yield以外ã®å¤§åŸŸè„±å‡ºåˆ¶å¾¡å¼ã‚’exprã‹ã‚‰expr0ã«ç§»ã—ãŸ. よ㣠+ ã¦ãƒ¡ã‚½ãƒƒãƒ‰ã®å¼•æ•°ã«åˆ¶å¾¡å¼ã‚’使ãˆãªããªã‚‹(ã“ã‚Œã§å›°ã‚‹äººã¯ã„ãªã„ã¯ãš). + + * parse.y: `+'ã®å®šæ•°å±•é–‹ã®éš›ã«æ¼”ç®—åã®å„ªå…ˆé †ä½ã‚’忘れã¦ã„ãŸ. + + * eval.c: untilã®æˆ»ã‚Šå€¤ã¯nilã«ãªã£ãŸ. + + * parse.y: modifierã¨ã—ã¦ã®if/unless/while/untilã‚’è¿½åŠ . + + * parse.y: 文法ã‹ã‚‰endã®å¾Œã‚ã«ã¤ã‘ã‚‹ã‚ーワードを削除. ã»ã¨ã‚“ã©ä½¿ã‚ + ãªã‹ã£ãŸä¸Šã«, emacsã§ã¯ruby-modeãŒã‚ã‚Œã°å¯¾å¿œã®ãƒã‚§ãƒƒã‚¯ãŒæ©Ÿæ¢°çš„ã« + 出æ¥ã‚‹ãŸã‚. + +Tue Aug 23 18:08:33 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: スクリプト実行開始å‰ã«ä¾‹å¤–ãŒç™ºç”Ÿã—ãŸæ™‚ã«core dumpã—ãŸ. + 組ã¿è¾¼ã¿ç”¨ã«ã‚³ãƒ¼ãƒ‰ã‚’変更ã—ãŸæ™‚ã«enbugã—ã¦ã—ã¾ã£ãŸ. + +Tue Aug 23 00:07:17 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c: doã®æˆ»ã‚Šå€¤ãŒã„ã¤ã‚‚nilã«ãªã£ã¦ã„ãŸ. + + * parse.y: loop制御変数ã®å¤šé‡ä»£å…¥åŒ–ã«bugãŒã‚ã£ãŸ. + + * parse.y(expand_op): æ–‡å—列も畳ã¿è¾¼ã¿ã®å¯¾è±¡ã«. + +Mon Aug 22 10:50:01 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(expand_op): `+'ã«é–¢ã—ã¦ã¯çµåˆå‰‡ã‚’使ã£ã¦, より多ã定数畳 + ã¿è¾¼ã¿ã‚’è¡Œãªã†ã‚ˆã†ã«. + + * ruby.c(proc_options): argcãŒ0ã®æ™‚ã«ã‚‚対応. + + * parse.y: forãªã©ã®åˆ¶å¾¡å¤‰æ•°ã«å¤šé‡ä»£å…¥ã‚‚使ãˆã‚‹ã‚ˆã†ã«. + +Sat Aug 20 00:59:40 1994 Yukihiro Matsumoto (matz@dyna) + + * parse.y(call_op): 演算å`~'ã®å–り扱ã„をルール部ã¸ç§»å‹•. + +Fri Aug 19 11:44:13 1994 Yukihiro Matsumoto (matz@ix-02) + + * main.c: rubyã‚’ã»ã‹ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«çµ„ã¿è¾¼ã‚るよã†ã«main()を分割ã—ãŸ. + ãã‚Œã«ã¨ã‚‚ãªã„, プãƒã‚°ãƒ©ãƒ ã®å‘¼ã³å‡ºã—æ§‹é€ ã‚’ä¿®æ£ã—ãŸ. + + * parse.y: æ¡ä»¶å¼ã®å®šç¾©ã‚’変更. ifãªã©ã®æ¡ä»¶å¼ã®ä¸ã§ã ã‘`&&'ã‚„`||' + ãŠã‚ˆã³`!'ã®å¼•æ•°ãŒæ¡ä»¶å¼ã«ãªã‚‹ã‚ˆã†ã«. ã“ã®å¤‰æ›´ã«ã‚ˆã‚Šæ¡ä»¶å¼ä»¥å¤–ã® + å ´æ‰€ã§ã® `&&', `||', `!'演算åã®å‹•ä½œãŒç›´è¦³ã«ä¸€è‡´ã™ã‚‹. + + * parse.y: 実引数ã®`*'ã®å¾Œã«ç¶šã引数ã¯exprã«åˆ¶é™ã—ãŸ. 今ã¾ã§ã¯å…¨ã¦ + ã®æ–‡ãŒæœ‰åŠ¹ã§ã‚ã£ãŸãŒ, ã“ã“ã§å®šç¾©æ–‡ãŒã‚ã£ã¦ã‚‚ã—ょã†ãŒãªã„. + +Thu Aug 18 10:21:45 1994 Yukihiro Matsumoto (matz@ix-02) + + * re.c: æ£è¦è¡¨ç¾ãƒ«ãƒ¼ãƒãƒ³ã®åˆæœŸåŒ–部分を削除ã—ã¦ã—ã¾ã£ã¦ã„ãŸ. ã“れ㧠+ ã¯emacsã®æ£è¦è¡¨ç¾ã«ãªã£ã¦ã—ã¾ã†. + + * version.c: copyrightè¡¨ç¤ºã‚’è¿½åŠ . + + * version.c: ãƒãƒ¼ã‚¸ãƒ§ãƒ³è¡¨ç¤ºã‚’stderrã«. + + * configure.in: gccãŒãªã„å ´åˆtestã«å¤±æ•—ã—ã¦ã„ãŸ. + +Fri Aug 12 14:12:23 1994 Yukihiro Matsumoto (matz@ix-02) + + * array.c(astore): é…列ã®æ‹¡å¤§ã™ã‚‹æ™‚ã«ã‚る程度ã®å¤§ãã•ã‚’ã¾ã¨ã‚ã¦æ‹¡ + 大ã™ã‚‹ã‚ˆã†ã«. + + * io.c(Fprint): é…列ã«å¯¾ã—ã¦ã¯ä¸€åº¦æ–‡å—列ã«å¤‰æ›ã™ã‚‹ã“ã¨ãªã, 直接内 + 容を出力ã™ã‚‹ã‚ˆã†ã«. + + * string.c(str_new): memmoveã‹ã‚‰memcpyã¸ç½®ãæ›ãˆãŸ. ã“ã‚Œã§ã‚‚ã‹ãªã‚Š + 速度ãŒé•ã†. + + * ruby.h: データメンãƒã®å–り出ã—ã§åå‰ã‚’æ–‡å—列ã‹ã‚‰IDã§æŒ‡å®šã™ã‚‹ã‚ˆã† + ã«ã—ãŸ. ã‹ãªã‚Šã®é«˜é€ŸåŒ–ã«ãªã‚‹. + + * io.c: $ARGFã¨ã„ã†å¤‰æ•°ã§å¼•æ•°åˆ—ã‹ã‚‰ãªã‚‹ä»®æƒ³ãƒ•ã‚¡ã‚¤ãƒ«ã‚’オブジェクト + ã¨ã—ã¦æ‰±ãˆã‚‹ã‚ˆã†ã«ã—ãŸ. 今ã¾ã§ã¯ãƒˆãƒƒãƒ—レベルã®gets()ãªã©ã‚’使ã£ã¦ + アクセスã—ã¦ã„ãŸãŒ, ã©ã†ã‚‚オブジェクト指å‘çš„ã§ã¯ãªã‹ã£ãŸ. + +Thu Aug 11 11:43:15 1994 Yukihiro Matsumoto (matz@ix-02) + + * gc.c: mark_location()ã®é–“é•ã£ãŸå‘¼ã³å‡ºã—æ–¹ã®è¡ŒãŒæ®‹ã£ã¦ã„ãŸ. + + * method.c: プãƒãƒˆã‚¿ã‚¤ãƒ—宣言ãŒè¶³ã‚Šãªã‹ã£ãŸ. + +Wed Aug 10 15:54:46 1994 Yukihiro Matsumoto (matz@ix-02) + + * variable.c: -vオプションãŒæŒ‡å®šã•ã‚Œã¦ã„る時ã¯åˆæœŸåŒ–ã•ã‚Œã¦ã„ãªã„, + 大域変数, インスタンス変数, ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã‚’å‚ç…§ã—ãŸæ™‚点ã§warning + を出ã™ã‚ˆã†ã«ã—ãŸ. + +Tue Aug 9 11:50:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * bignum.c: 冪乗ã«é–¢ã—ã¦ã‚‚多å€é•·æ¼”ç®—ã‚’è¡Œãªã†ã‚ˆã†ã«. 特ã«æµ®å‹•å°æ•°ç‚¹ + æ•°ã®ç¯„囲を越ãˆãŸæ™‚ã®å‡¦ç†ã‚’的確ã«è¡Œãªã†ã‚ˆã†ã«. + + * eval.c: メソッド定義後ã¯æ§‹æ–‡æœ¨ã‹ã‚‰, メソッド定義部分を外ã™. 無駄 + ãªå†å®šç¾©ãŒèµ·ã“らãªã„よã†ã«ã™ã‚‹ãŸã‚ã¨2é‡ã«free()ã•ã‚Œãªã„ãŸã‚. + + * array.c(Fary_aref): 引数ãŒ1ã¤ã§Fixnumã®æ™‚, Range checkã‚’è¡Œãªã‚㪠+ ã„よã†ã«ä¿®æ£. + + * eval.c: メソッドã®å¼•æ•°ã®æ•°ã‚’コンパイル時ã«è¨ˆç®—ã—ã¦è‹¥å¹²ã®é«˜é€ŸåŒ–. + +Mon Aug 8 13:06:24 1994 Yukihiro Matsumoto (matz@ix-02) + + * object.c: nilã«ã‚ˆã‚‹æ¯”較連鎖をãªãã—ãŸ. + + * parse.y: bit演算åã®å„ªå…ˆé †ä½ã‚’比較演算åよりも強ãã—ãŸ. Cã¨ã¯ç•° + ãªã‚‹ã“ã¨ã«ãªã‚‹ãŒ, 直観ã«ã¯åˆè‡´ã™ã‚‹. + + * gc.c: クラスを解放ã™ã‚‹æ™‚, 個々ã®ãƒ¡ã‚½ãƒƒãƒ‰æ¯Žã«ã‚ャッシュをクリア㙠+ ã‚‹ã®ã§ã¯ãªã, クラスå˜ä½ã§ã‚¯ãƒªã‚¢ã™ã‚‹ã‚ˆã†ã«. + +Thu Aug 4 18:45:09 1994 Yukihiro Matsumoto (matz@ix-02) + + * methods.c(method_free): 解放ã•ã‚ŒãŸãƒ¡ã‚½ãƒƒãƒ‰ã«é–¢ã—ã¦ã‚ャッシュをク + リアã—ã¦ãŠãå¿…è¦ãŒã‚ã£ãŸ. + + * gc.c: Dataクラスã®ãƒ‡ãƒ¼ã‚¿éƒ¨åˆ†ã‚’free()ã—忘れã¦ã„ãŸ. + +Wed Aug 3 09:58:14 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: def func .. endå½¢å¼ã«ã‚ˆã‚‹é–¢æ•°ãƒ¡ã‚½ãƒƒãƒ‰ã®å®šç¾©ã¯ãªããªã£ãŸ. + + * methods.c: funcå½¢å¼ã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚’ãªãã—ãŸ. ã‚ã£ã¦ã‚‚, ã‚ã¾ã‚Šæ„味㌠+ ãªã„ã®ã§. + + * eval.c: $0ã¸ã®ä»£å…¥ã§ps(1)ã®å‡ºåŠ›ãŒå¤‰åŒ–ã™ã‚‹ã‚ˆã†ã«. + + * io.c(Fsyscall): syscall()を実ç¾. + +Mon Aug 1 13:41:11 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: ダブルクォートã§å›²ã¾ã‚ŒãŸæ–‡å—列やæ£è¦è¡¨ç¾ä¸ã§"#{変数å}" + ã¾ãŸã¯"#変数å"ã¨ã„ã†å½¢å¼ã§å¤‰æ•°ã®å†…容を埋ã‚込むã“ã¨ãŒã§ãるよㆠ+ ã«ãªã£ãŸ. + + * io.c: 関数メソッドsystem2()ã¯ãªããªã£ãŸ. 今ã¯ãƒãƒƒã‚¯ã‚¯ã‚©ãƒ¼ãƒˆãŒã‚ + ã‚‹ã‹ã‚‰ã. + + * parse.y: `cmd`ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ã‚’æ–‡å—列ã«å±•é–‹ã™ã‚‹ã“ã¨ãŒã§ãるよㆠ+ ã«ãªã£ãŸ. + + * parse.y: __FILE__, __LINE__ã‚’è¿½åŠ . ãã‚Œãžã‚Œãƒ•ã‚¡ã‚¤ãƒ«å(æ–‡å—列), + 行番å·(æ•´æ•°)を値ã¨ã™ã‚‹ç–‘似変数. + +Fri Jul 29 13:16:07 1994 Yukihiro Matsumoto (matz@ix-02) + + * methods.h: メソッドをオブジェクトã¨ã—ã¦æ‰±ã†ã®ã‚’ã‚„ã‚ã‚‹. メソッド + ã®ãƒ¡ãƒ¢ãƒªç®¡ç†ã«ã¯ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã‚«ã‚¦ãƒ³ãƒˆã‚’使ã†ã“ã¨ã«ã—ãŸ. ã“ã‚Œã§ã‚ªãƒ– + ジェクトã®æ•°ãŒæ¸›ã£ã¦ã»ã‚“ã®å°‘ã—ã ã‘GCãŒé€Ÿããªã‚‹(ã‹ãª). + + * purifyã«ã‚ˆã£ã¦ãƒ¡ãƒ¢ãƒªé–¢ä¿‚ã®ãƒã‚°ã‚’検査ã—ãŸ(見ã¤ã‹ã‚‹,見ã¤ã‹ã‚‹â€¦). + + * gc.c: GCをプãƒã‚°ãƒ©ãƒžãŒå¤‰æ•°ã‚’マークã™ã‚‹å½¢å¼ã‹ã‚‰, スタックã¨ãƒ¬ã‚¸ã‚¹ + ã‚¿ã‹ã‚‰ãƒžãƒ¼ã‚¯ã™ã‚‹æ–¹æ³•ã«å¤‰æ›´. 移æ¤æ€§ãŒä¸‹ãŒã‚‹ã‚ˆã†ãªæ°—ã‚‚ã™ã‚‹ãŒ, siod + ã‚„scmã§ã‚‚採用ã•ã‚Œã¦ã„ã‚‹ã‹ã‚‰å¤šåˆ†å¤§ä¸ˆå¤«ã ã‚ã†. Linux on i486ã§ã‚‚å‹• + 作を確èªã—ãŸ. + +Wed Jul 27 16:13:13 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(Eval): トップレベルã§ã¯æ§‹é€ 木をfreeã—ãªã„よã†ã«. ã©ã†ã›è§£ + 放ã•ã‚Œã‚‹ã‹ã‚‰æ™‚é–“ã®ç„¡é§„ã§ã‚ã‚‹. + + * array.c, dict.c: "=="ã‚’æ§‹é€ ä¸€è‡´ã«å¤‰æ›´. + +Fri Jul 22 10:14:09 1994 Yukihiro Matsumoto (matz@ix-02) + + * error.c: 組ã¿è¾¼ã¿ã‚¿ã‚¤ãƒ—ã®åå‰ã‚’登録ã—忘れã¦ã„ãŸ. + +Thu Jul 21 14:06:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(freenode),eval.c(Eval): 解æžæœ¨ã‚’解放ã—忘れã¦ã„ãŸ. + +Mon Jul 18 10:19:15 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: 多é‡ä»£å…¥ã‚’処ç†ã™ã‚‹ãƒ«ãƒ¼ãƒ«ã«ãƒã‚°ãŒã‚ã£ã¦, 3è¦ç´ 以上ã®å¤šé‡ + 代入ã«å¤±æ•—ã—ã¦ã„ãŸ. + + * eval.c(rb_eval): 多é‡ä»£å…¥ã§, å³è¾ºãŒé…列ã§ãªã„時ã«ã¯`to_a'メソッ + ドã§é…列ã«å¤‰æ›ã—ã¦ä»£å…¥ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. 今ã¾ã§ã®ä»•æ§˜ã ã¨å³è¾ºå€¤ãŒç¬¬ + 1è¦ç´ ã«ãã®ã¾ã¾ä»£å…¥ã•ã‚Œã¦ã„ãŸãŒ, structãªã©é…列ã«å¤‰æ›ã§ãã‚‹ã‚‚ã® + ã¯å¤‰æ›ã—ãŸæ–¹ãŒå¬‰ã—ã„æ°—ãŒã™ã‚‹. + + * dbm.c,dict.c(delete_if): ãƒ¡ã‚½ãƒƒãƒ‰è¿½åŠ . + + * process.c(wait,waitpid): システムコールwaitpidã¾ãŸã¯wait4ãŒã‚ã‚‹ + 時ã¯ãã¡ã‚‰ã‚’使ã†ã‚ˆã†ã«. configureã‚‚ãれらをãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«å¤‰æ›´. + + * dbm.c, dict.c(clear): ãƒ¡ã‚½ãƒƒãƒ‰è¿½åŠ . + +Fri Jul 15 10:54:45 1994 Yukihiro Matsumoto (matz@ix-02) + + * array.c(Fary_fill,Fary_clear): ãƒ¡ã‚½ãƒƒãƒ‰ã‚’è¿½åŠ . + + * string.c(Fstr_split): $;ã®å€¤ãŒé•·ã•1ã®æ–‡å—列ã§ã‚る時, ã“れをæ£è¦ + 表ç¾åŒ–ã—ãªã„ã§, å˜ãªã‚‹æ–‡å—ã¨ã—ã¦åˆ†å‰²ã™ã‚‹. + + * string.c(Fstr_aset/Fstr_aref): インデックスãŒæ–‡å—列ã®ç¯„囲外ã 㣠+ ãŸæ™‚ã®å‹•ä½œã‚’Arrayã‚’å‚考ã«ä¿®æ£ã—ãŸ. + + * array.c(astore,Fary_aset): é ˜åŸŸã‚’reallocã—ãŸå¾Œ, ゼãƒã§ã‚¯ãƒªã‚¢ã™ã‚‹ + よã†ã«. 今ã¾ã§é…列ã«ã‚´ãƒŸãŒå…¥ã£ã¦ã„ãŸ. + + * array.c: []/[]=ã§ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹é–¢ä¿‚ã‚’æ•´ç†. 基本的ã«è² ã®ã‚¤ãƒ³ãƒ‡ãƒƒ + クスã«ä»£å…¥ã—ãªã„é™ã‚Šä¾‹å¤–ã¯èµ·ããªã„よã†ã«å¤‰æ›´ã—ãŸ. å¿…è¦ã«å¿œã˜ã¦é© + 当ã«è§£é‡ˆã—ã¦, å¿…è¦ãªã‚‰ã°é ˜åŸŸã‚’æ‹¡å¼µã™ã‚‹ã‚ˆã†ã«. + +Thu Jul 14 11:18:07 1994 Yukihiro Matsumoto (matz@ix-02) + + * autoexec.c: 削除. autoload関係ã®æ©Ÿèƒ½ã¯ä»Šå¾Œæ¤œè¨Žã—よã†. + + * dict.c: 辞書クラスã®æ£å¼å称をDictã«å¤‰æ›´ã—ãŸ. 別åã¨ã—ã¦Hashを用 + æ„ã—ãŸ. 今ã¾ã§Dictionaryãªã©ã¨é•·ã„åå‰ã«ã—ã¦ã„ãŸãŒèª°ã‚‚使ã£ã¦ã„㪠+ ã‹ã£ãŸã—ã. *BACKWARD INCOMPATIBILITY* + + * parse.y: Dictを生æˆã™ã‚‹æ§‹æ–‡ã‚’è¿½åŠ . ã“ã¡ã‚‰ã‚’{..}ã«ã—ãŸ. + + * parse.y: é…列を生æˆã™ã‚‹æ§‹æ–‡ã‚’[..]ã«å¤‰æ›´ã—ãŸ. éŽåŽ»ã®Rubyスクリプ + トã¨ã®äº’æ›æ€§ãŒä¿ã¦ãªã„ãŒ, Dictを生æˆã™ã‚‹æ§‹æ–‡ã‚’å°Žå…¥ã™ã‚‹ã«å½“ãŸã‚Š, + perl5ã«åˆã‚ã›ã¦(æ„è˜ã—ã¦), 変更ã™ã‚‹æ™‚期ã¯ä»Šã—ã‹ãªã„ã¨è€ƒãˆãŸ. + *BACKWARD INCOMPATIBILITY* + + * eval.c(Feval): eval()ã§ãƒ¡ã‚½ãƒƒãƒ‰ã‚’定義ã™ã‚‹æ™‚, 定義ã•ã‚Œã‚‹ã‚¯ãƒ©ã‚¹ã‚’ + メソッドã®æ‰€å±žã™ã‚‹ã‚¯ãƒ©ã‚¹ã«ã—ãŸ. 今ã¾ã§ã¯Objectクラスã«å®šç¾©ã•ã‚Œã¦ + ã„ãŸ. + + * parse.y: ãƒãƒ¼ã‚«ãƒ«å¼•æ•°ãŒãªã„時ã®eval()ã§è½ã¡ã¦ã„ãŸ. + +Tue Jul 12 09:41:28 1994 Yukihiro Matsumoto (matz@ix-02) + + * pack.c: uuencodeå½¢å¼ã®ã‚µãƒãƒ¼ãƒˆ. + + * `-0'ã‚’`-R'ã«. 出力レコードセパレータをコマンドラインã‹ã‚‰æŒ‡å®šã™ã‚‹ + 方法ã¯ãªããªã£ãŸ. ã©ã†ã‚‚, 仕様ãŒã‚†ã‚Œã‚‹ãªã‚. + +Mon Jul 11 09:51:24 1994 Yukihiro Matsumoto (matz@ix-02) + + * ruby.c: `-r'オプションã¯`-0'オプションã«ãªã£ãŸ. 当é¢ã¯`-r'も有効 + ã ãŒå¤‰æ›´ã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚‹. `-R'ã¯å½“é¢ã¯ãã®ã¾ã¾. + + * version.c: version表示ã«æ—¥ä»˜ã‚’å«ã‚ãŸ. + + * parse.y: private methodã®å¾©æ´». Rubyã®privateメソッドã¯C++ã«ãŠã‘ + ã‚‹protected methodã«è©²å½“ã™ã‚‹ã‚‚ã®ã§, `@'ã§å§‹ã¾ã‚‹åå‰ã‚’æŒã¤. + + * env.h: struct ENVIRONã®å®šç¾©ã‚’分離. + + * parse.y: `\$var', `\@var', `%var'も許ã™ã‚ˆã†ã«. + + * variable.c(Fdefined): idも引数ã¨ã—ã¦å—ã‘付ã‘るよã†ã«. + + * parse.y: ifæ–‡/unlessæ–‡ã«ã‚ーワードthenã‚’è¿½åŠ . thenãªã—ã¨ã„ã†ã®ã¯, + æ„外ã¨é–“é•ã„ãŒå¤šã„ã®ã§. ã‚‚ã¡ã‚ã‚“çœç•¥ã§ãã‚‹. + +Sat Jul 9 02:16:04 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c(rb_eval): class/moduleã®è©•ä¾¡ã§æ–°ã—ã„スコープを割り当ã¦ã¦ + ã„ãªã‹ã£ãŸ. スコープ割り当ã¦éƒ¨åˆ†ã‚’rb_call()ã‹ã‚‰rb_eval()ã«ç§»ã—ãŸ. + + * eval.c(rb_call): realloc()ã«æ¸¡ã•ã‚Œã‚‹äº‹ã®ã‚ã‚‹, ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ç”¨ã®é ˜ + 域をalloca()ã—ã¦ã„ãŸ. ãŸã¾ã«è½ã¡ã‚‹ã‚ã‘ã . + + * string.c(Fstr_times): 割り当ã¦ãŸé ˜åŸŸã‚’越ãˆãŸéƒ¨åˆ†ã‚’変更ã—ã¦ã„ãŸ. + +Wed Jul 6 15:52:42 1994 Yukihiro Matsumoto (matz@ix-02) + + * socket.c: Socket -> BasicSocket, RawSocket -> Socket ã«æ”¹å. + + * string.c(ucfirst,lcfirst): 最åˆã®1æ–‡å—ã ã‘ã®å¤§æ–‡å—/å°æ–‡å—変æ›. + + * numeric.c(chr): æ•´æ•°ã®æ–‡å—列化メソッド. + + * inits.c, dbm.c: DBMãŒä½¿ãˆãªã„時ã¯ã‚¯ãƒ©ã‚¹ãã®ã‚‚ã®ã‚’定義ã—ãªã„よㆠ+ ã«ã—ãŸ. 利用ã§ããªã„クラスã¯nilã¨ã™ã‚‹ã“ã¨ã‚’今後ã®ãƒãƒªã‚·ãƒ¼ã¨ã—よ + ã†(ã„ã¾ã¾ã§ã¯ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸæ™‚点ã§ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¦ã„ãŸ). autoexec() + ã®ã‚り方も検討ãŒå¿…è¦ã«ãªã‚Šãã†ã . + + * bignum.c(bigadd): ãƒã‚°ä¿®æ£. + +Thu Jul 7 11:12:18 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(Fload,Feval): eval_treeをクリアã—忘れã¦ã„ãŸ. + + * _inspect: オブジェクトをå¯èªå½¢å¼ã®æ–‡å—列ã«å¤‰æ›ã™ã‚‹(主ã«ãƒ‡ãƒãƒƒã‚° + 出力用). + +Wed Jul 6 00:57:18 1994 Yukihiro Matsumoto (matz@dyna) + + * numeric.c, bignum.c: æ•´æ•°ã«å¯¾ã™ã‚‹`[]'演算å. nビット目ãŒã‚»ãƒƒãƒˆã• + ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã‚’è¿”ã™. + +Tue Jul 5 12:48:39 1994 Yukihiro Matsumoto (matz@ix-02) + + * io.c(Feof): è¿½åŠ . コマンドラインã‹ã‚‰ãªã‚‹ä»®æƒ³ãƒ•ã‚¡ã‚¤ãƒ«ã«ã¤ã„ã¦ã‚‚ + EOFãŒæ¤œå‡ºã§ãるよã†ã«. + + * ruby.c: -l/-r/-R/-Xオプションã®è¿½åŠ . + + * ruby.c: -n/-pオプションã®loopã®ä»˜åŠ ãªã©ã‚’メインルーãƒãƒ³ã«ç§»å‹•ã— + ãŸ. ã“ã‚Œã§, オプションã®è§£æžé€”ä¸ã§(`-c'オプションã®ã›ã„ã§)終了㪠+ ã©ã¨ã„ã£ãŸã“ã¨ã¯ãªã„. + + * io.c(Fgets): 高速化. å‡ã£ãŸã“ã¨ã‚’ã—ãªã„æ–¹ãŒé€Ÿã‹ã£ãŸ. 虚ã—ã„. + +Mon Jul 4 15:55:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * Socket:getsockname/getpeername - よã†ã‚„ã仕様ãŒå®‰å®šã—ãŸ. + + * io.c(Fgets): eachã§getsを記述ã™ã‚‹ã®ã§ã¯ãªã, getsã§eachを記述㙠+ るよã†ã«ã—ãŸ. + +Fri Jul 1 10:35:49 1994 Yukihiro Matsumoto (matz@ix-02) + + * $ENV[env] = nil/$ENV.delete(env)ã§ç’°å¢ƒå¤‰æ•°ã‚’削除ã§ãるよã†ã«ãªã£ + ãŸ. $ENV.deleteã¯ç’°å¢ƒå¤‰æ•°ã®ä»¥å‰ã®å€¤ã‚’è¿”ã™. + + * !~ã®å®šç¾©ãŒé–“é•ã£ã¦ã„ãŸ. + + * Dict,DBM:[]= - nilã®ä»£å…¥ã«ã‚ˆã£ã¦è¦ç´ を削除ã§ãるよã†ã«ãªã£ãŸ. ã“ + ã‚Œã«ã¨ã‚‚ãªã„nilã¯Dictã®è¦ç´ ã«ãªã‚Œãªããªã£ãŸ. + + * ソースã®æ•´ç†. 盲腸ã®ã‚ˆã†ãªä½¿ã‚ã‚Œã¦ã„ãªã„コードをãªãã—ãŸã‚Š, 変数 + åを付ã‘変ãˆãŸã‚Šã—ãŸ. + +Fri Jul 1 00:21:29 1994 Yukihiro Matsumoto (matz@dyna) + + * Array:join() - è¦ç´ æ•°0ã®é…列ã«å¯¾ã—ã¦ç©ºæ–‡å—列を返ã™. + + * RawSocket:open(),socketpair() - æ–‡å—列ã§æŒ‡å®šã§ãるドメインã¨ã‚¿ã‚¤ + プをã„ãã¤ã‹è¿½åŠ ã—ãŸ. + +Thu Jun 30 13:51:29 1994 Yukihiro Matsumoto (matz@ix-02) + + * -fオプションをãªãã—ãŸ. 昔(loadã®ãªã‹ã£ãŸé ƒ)ã®å残ãªã®ã§, 今ã¨ãªã£ + ã¦ã¯å¿…è¦ãªã„ã ã‚ã†. + + * -sã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ . perlã®-sオプションã¨åŒã˜å‹•ãã‚’ã™ã‚‹. + + * RawSocketクラスをæä¾›ã™ã‚‹. Socketã«å¯¾ã™ã‚‹ã‚·ã‚¹ãƒ†ãƒ コールレベル㮠+ アクセスãŒå¯èƒ½ã«ãªã£ãŸ. + +Thu Jun 30 00:27:19 1994 Yukihiro Matsumoto (matz@dyna) + + * Socket - bug fixes. + + * linuxã§ã¯syscall(SYS_select)ãŒæ£å¸¸ã«å‹•ä½œã—ãªã„. + + * Socket:addr,peeraddr - é…列ã¨ã—ã¦sockaddrã®æƒ…å ±ã‚’è¿”ã™. + +Wed Jun 29 00:14:20 1994 Yukihiro Matsumoto (matz@dyna) + + * Socket:setopt,getopt - setsockopt(2), getsockopt(2)ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ + を実ç¾. + + * sprintf() - rubyã«ã¯unsignedã¯ç„¡ã„ã®ã§, %uã‚’å–り除ã„ãŸ. + + * sprintf() - %b, %x, %oã§ã¯2ã®è£œæ•°è¡¨ç¾, %B, %X, %Oã§ã¯ç¬¦å·ä»˜ã表 + ç¾ã§å‡ºåŠ›ã™ã‚‹ã‚ˆã†ã«. ã“ã“æ•°æ—¥ã§sprintf()ã®ä»•æ§˜ãŒã‚†ã‚‰ã„ã§ã„ãŸãŒ, + ã“ã‚Œã§è½ã¡ç€ããã†ã . + +Tue Jun 28 14:42:03 1994 Yukihiro Matsumoto (matz@ix-02) + + * Bignum:<<,>> - 2ã®è£œæ•°ã‚’ã¨ã‚‹å‡¦ç†ã‚’除ã„ãŸ. シフト演算ã«ã¯é–¢ä¿‚ãªã„ + 処ç†ã ã£ãŸ. + + * Bignum:^ - bug fix. 符åˆãŒå対ã ã£ãŸ. + + * sprintf() - 2進出力å"%b"ã‚’è¿½åŠ . + + * sprintf() - %x, %oã§Fixnumを出力ã™ã‚‹æ™‚, 2ã®è£œæ•°è¡¨ç¤ºã‚’è¡Œãªã‚ãªã„. + + * sprintf() - %x, %oã¯ã‚„ã¯ã‚Šè² ã®æ•°ã®æ™‚ã¯`-'を出力ã™ã‚‹ã‚ˆã†ã«. + +Mon Jun 27 14:56:13 1994 Yukihiro Matsumoto (matz@ix-02) + + * sprintf() - Bignumã«ã¤ã„ã¦ã‚‚%d, %oã¯(2ã®è£œæ•°è¡¨ç¾ã«å¤‰æ›ã—ã¦)æ£ã® + 整数を表示ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * Bignumã«å¯¾ã™ã‚‹è«–ç†æ¼”ç®—ã®å®šç¾©ã‚’ä¿®æ£ã—ãŸ. è² ã®æ•°ã¯2ã®è£œæ•°è¡¨ç¾ã§ã‚ + ã‚‹ã¨ã¿ãªã—, ã‹ã¤ä»®æƒ³çš„ã«å·¦å´ã«ç„¡é™ã«1ãŒé€£ç¶šã—ã¦ã„るよã†ãªæ¼”ç®—çµ + 果を得る. + + * Fixnum:<<,>> - 符åˆä»˜ã‚·ãƒ•ãƒˆã«å¤‰æ›´. + + * Bignum:>> - è² ã®æ•´æ•°ã®ã‚·ãƒ•ãƒˆã«å¯¾å¿œã—ãŸ. + + * __END__, ^D, ^Zã§ã‚¹ã‚¯ãƒªãƒ—トを終了ã§ãã‚‹. + + * -xã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ . #! ..rubyãªã‚‹è¡Œã¾ã§èªã¿é£›ã°ã™. + + * -cã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ . コンパイルã®ã¿ã‚’è¡Œã†. + +Sat Jun 25 01:37:21 1994 Yukihiro Matsumoto (matz@dyna) + + * Fixnum:<< - å¿…è¦ã«å¿œã˜ã¦Bignumã«æ‹¡å¼µã—ã¦å·¦ã‚·ãƒ•ãƒˆã™ã‚‹ã‚ˆã†ã«. よ㣠+ ã¦, シフト幅ãŒ32を越ãˆã‚‹ã¨Cã‚„Perlã¨ã¯é•ã£ãŸå€¤ã‚’è¿”ã™. + +Fri Jun 24 10:01:28 1994 Yukihiro Matsumoto (matz@ix-02) + + * ioctl()/fcntl() - システムコールを呼ã³å‡ºã™å‰ã«ãƒãƒƒãƒ•ã‚¡ã®å¤§ãã•ã‚’ + 調節ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * String:toupper/tolower - æ–‡å—列を置ãæ›ãˆãŸã‚³ãƒ”ーを作るã®ã§ã¯ãª + ã, å…ƒã®æ–‡å—列ã®å†…容を変更ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * inplace editを実ç¾ã—ãŸ. perlã¨åŒã˜ã‚ˆã†ã«`-i'オプションã§æŒ‡å®šã™ã‚‹. + ã‚‚ã£ã¨ã‚‚, ã“ã¡ã‚‰ã¯MS-DOSã®ã“ã¨ã¨ã‹è€ƒãˆã¦ãªã„ã‘ã©. + + * デフォルトã®å‡ºåŠ›å…ˆã‚’è¿½åŠ ã—ãŸ. 今ã¾ã§ã¯$stdoutã«ä»£å…¥ã™ã‚‹ã—ã‹æ–¹æ³• + ã¯ãªã‹ã£ãŸ. + +Fri Jun 17 10:55:08 1994 Yukihiro Matsumoto (matz@ix-02) + + * 環境変数ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹æ–¹æ³•ã¨ã—ã¦getenv()/setenv()以外ã«$ENVを用 + æ„ã—ãŸ. $ENVã¯æ–‡å—列-æ–‡å—列ã®è¾žæ›¸ã§ã‚ã‚‹ã‹ã®ã‚ˆã†ã«å‹•ä½œã™ã‚‹EnvDict + オブジェクトãŒä»£å…¥ã•ã‚Œã¦ã„ã‚‹(eachã¯assocを与ãˆã‚‹). + + * nilã«ä»£å…¥ã™ã‚‹ã¨core dumpã—ãŸ. コンパイル時ã®ãƒã‚§ãƒƒã‚¯ã‚’強化. + + * Struct: struct_new()ã®å¼•æ•°ã‚’GCプãƒãƒ†ã‚¯ãƒˆã™ã‚‹å¿…è¦ãŒã‚ã‚‹. ã›ã‚ã¦ã‚¹ + ã‚¿ãƒƒã‚¯é ˜åŸŸã ã‘ã§ã‚‚スã‚ャンã§ãるよã†ã«ã—ãªã‘ã‚Œã°ã„ã‘ãªã„ã‚“ã ã‚ㆠ+ ã‹? ã§ã‚‚, 移æ¤æ€§ãŒãªã‚. + +Fri Jun 17 01:01:46 1994 Yukihiro Matsumoto (matz@dyna) + + * Time::asctime() - 日付ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã§æ—¥ãŒè½ã¡ã¦ã„ãŸ. + + * Stat: Statã¯Etcãªã©ã¨åŒæ§˜ã«Structã§å®Ÿç¾ã—ãŸã®ã§, Statクラスã¯ç„¡ + ããªã£ãŸ. + +Thu Jun 16 10:32:23 1994 Yukihiro Matsumoto (matz@ix-02) + + * bignum.c: ã„ãã¤ã‹ã®ãƒã‚°ã‚’ä¿®æ£ã—ãŸ. Fixnumを渡ã™ã¹ãã¨ã“ã‚ã§æ™®é€š + ã®intを渡ã—ã¦ã„ãŸ. 失敗. + + * big2str() - 1æ¡ãšã¤baseã§å‰²ã‚‹ä»£ã‚ã‚Šã«, 4æ¡ãšã¤å‰²ç®—ã‚’è¡Œãªã†ã‚ˆã†ã« + ã—ãŸ. ã“ã‚Œã§å¤šå€é•·å‰²ç®—ã®å›žæ•°ãŒ1/4ã«ãªã‚‹. ã•ã‚‰ã«æ•´æ•°->æ•°(æ–‡å—)㸠+ ã®å¤‰æ›ã‚’テーブルを用ã„るよã†ã«ã—ãŸ. + + * rb_ivar_get_1() - ã™ã§ã«ä½•ã‚‰ã‹ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã‚’æŒã¤ã‚ªãƒ–ジェク + トã§ã¯, 未定義ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã®å€¤ãŒä¸å®šå€¤ã«ãªã£ã¦ã„ãŸ. + + * yylex() - インスタンス変数ã®èªè˜ã«å¤±æ•—ã—ã¦ã„ãŸ. attr()ã¯æ£ã—ãå‹• + 作ã—ã¦ã„ãŸã®ã§, 混用ã™ã‚‹ã¨å‹•ä½œã—ãªã‹ã£ãŸ. 全部é•ã£ã¦ã„ãŸã‹ã‚‰å‹•ã„ + ã¦ã„ãŸã®ã. + + * Object:attr() - ã™ã§ã«ã‚¢ã‚¯ã‚»ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ãŒå®šç¾©ã•ã‚Œã¦ã„る時ã«ã¯ãƒ‡ãƒ•ã‚© + ルトã®ã‚¢ã‚¯ã‚»ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã‚’定義ã—ãªã„よã†ã«ã—ãŸ. ã‚‚ã£ã¨ã‚‚アクセスメ + ソッドã¨åŒåã®ãƒ¡ã‚½ãƒƒãƒ‰ã®åŒºåˆ¥ã¯Rubyã«ã¯å˜åœ¨ã—ãªã„ã‘ã©, ãã‚Œã¯ä»•æ–¹ + ãŒãªã„よã. + + * pack.c: エンディアンをautoconfã§åˆ¤å®šã™ã‚‹ã‚ˆã†ã«ã—ãŸã®ã§, v/VãŒä½¿ + ãˆã‚‹ã‚ˆã†ã«ãªã£ãŸ. ã¾ãŸntoh?()/hton?()も自å‰ã§ç”¨æ„ã—ãŸ. + + * Stat: st_rdevをアクセスã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ã‚’è¿½åŠ . ã•ã‚‰ã«ã‚·ã‚¹ãƒ†ãƒ ãŒstat + æ§‹é€ ä½“ã«st_blksize, st_blockã‚’æŒã£ã¦ã„ã‚‹ã‹ã‚’autoconfã§ãƒã‚§ãƒƒã‚¯ã™ + るよã†ã«ã—ãŸ. + + * ドã‚ュメントを少ã—æ•´å‚™ã—ãŸ. + + * INT2FIX()ã®ã†ã¡, 31bitå¹…ãŒä¿è¨¼ã§ããªã„ã‚‚ã®ã¯, int2inum()ã«ç½®ãæ› + ãˆãŸ. + +Wed Jun 15 10:18:27 1994 Yukihiro Matsumoto (matz@ix-02) + + * sprintf() - bignumã®å‡ºåŠ›ã®æ™‚, 出力幅をæ£ã—ã計算ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * str2inum() - baseãŒ0ã®æ™‚, baseを自動判定ã™ã‚‹ã‚ˆã†ã«(0xã§å§‹ã¾ã‚‹æ™‚ + 16 進, 0ã§å§‹ã¾ã‚‹æ™‚8進). + +Tue Jun 14 16:08:42 1994 Yukihiro Matsumoto (matz@ix-02) + + * gc.c: Bignumåž‹ã‚’è¿½åŠ ã™ã‚‹ã®ã‚’忘れã¦ã„ãŸ. 組ã¿è¾¼ã¿åž‹ã‚’è¿½åŠ ã—ãŸæ™‚ã« + ã¯å¿…ãšmark()ã¨sweep()ã«ãã®åž‹ã«é–¢ã™ã‚‹å‡¦ç†ã‚’è¿½åŠ ã™ã‚‹å¿…è¦ãŒã‚ã‚‹. + + * bignum: 割算も動ã„ãŸã‚ˆã†ãªæ°—ãŒã™ã‚‹. アルゴリズムをç†è§£ã—ã¦ã„ãªã„ + ã®ã§, 自信ãŒãªã„. + +Mon Jun 13 14:36:55 1994 Yukihiro Matsumoto (matz@ix-02) + + * ã¾ã サãƒãƒ¼ãƒˆã—ã¦ã„ãªã„メソッドãªã©ãŒã‚ã‚‹ãŒ, 曲ãŒã‚Šãªã‚Šã«ã‚‚Bignum + ãŒä½¿ãˆã‚‹ã‚ˆã†ã«ãªã‚‹. ã“ã‚Œã§ioctlも使ãˆã‚‹. + +Fri Jun 10 17:26:42 1994 Yukihiro Matsumoto (matz@ix-02) + + * Comparable: 基礎ã¨ãªã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ã‚’`=='ã¨`>'ã‹ã‚‰`<=>'ã«å¤‰æ›´ã—ãŸ. 今 + 後Comparableã®ã‚µãƒ–クラスã¯`<=>'ã ã‘ã‚’å†å®šç¾©ã™ã‚‹å¿…è¦ãŒã‚ã‚‹. + +Wed Jun 8 13:12:18 1994 Yukihiro Matsumoto (matz@ix-02) + + * Need_Fixnum()ã‚’ã»ã¨ã‚“ã©ãªãã—ã¦, NUM2INT()ã§ç›´æŽ¥intã«å¤‰æ›ã™ã‚‹ã“ + ã¨ã«ã—ãŸ. ã“ã‚Œã§31bitã«ä¸¸ã‚ã¦æ¡è½ã¡ã‚’ãŠã“ã™å•é¡ŒãŒãªããªã‚‹. + +Tue Jun 7 09:45:31 1994 Yukihiro Matsumoto (matz@ix-02) + + * ruby.h: マクãƒFIXABLE(n)ã‚’è¿½åŠ . ã¤ã„ã§ã«FIXNUM周りã®å®šç¾©ã‚’変更㗠+ ã¦, 移æ¤æ€§ã‚’高ã‚ãŸ(ã¤ã‚‚ã‚Š). + + * C++ã®äºˆç´„語ã§ã‚ã‚‹newを削除ã—ãŸ. ã—ã‹ã—, ã‚‚ã†ã²ã¨ã¤ã®äºˆç´„語ã§ã‚ã‚‹ + classã«é–¢ã—ã¦ã¯, ç½®ãæ›ãˆã‚‹å˜èªžãŒæ€ã„ã¤ã‹ãªã„ã“ã¨ã‚‚ã‚ã£ã¦ãã®ã¾ + ã¾ã«ãªã£ã¦ã„ã‚‹. + + * 31bitを越ãˆãã†ãªINT2FIX()を関数呼ã³å‡ºã—ã«å¤‰ãˆãŸ. å°†æ¥bignumãŒå°Ž + å…¥ã•ã‚ŒãŸæ™‚ã«ã¯è‡ªå‹•çš„ã«bignumã‚’è¿”ã™ã‚ˆã†ã«ã™ã‚‹. + + * readline() - 引数ã®`-'ã¯æ¨™æº–入力をæ„味ã™ã‚‹ã‚ˆã†ã«ãªã£ãŸ. + + * ruby.h: å³ã‚·ãƒ•ãƒˆãŒè«–ç†ã‚·ãƒ•ãƒˆã‹ç®—術シフトã‹ã¯å‡¦ç†ç³»ä¾å˜ã®ã‚ˆã†ãªã® + ã§, ruby.hã§cppを使ã£ã¦ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. ã“ã‚Œã§ã†ã¾ãã„ã + ã¨æ€ã†ã®ã ãŒ, 手元ã«ç¬¦åˆä»˜intã‚’è«–ç†ã‚·ãƒ•ãƒˆã™ã‚‹å‡¦ç†ç³»ãŒãªã„ã®ã§ç¢º + èªã§ããªã„. NEWS-OSã®CCã¯ç¢ºã‹å³ã‚·ãƒ•ãƒˆã¯ã„ã¤ã‚‚è«–ç†ã‚·ãƒ•ãƒˆã ã£ãŸã‚ˆ + ã†ãªæ°—ãŒã™ã‚‹ã‚“ã ã‘ã©â€¦. + +Mon Jun 6 10:10:22 1994 Yukihiro Matsumoto (matz@ix-02) + + * FIX2INT()ã®å®šç¾©ã‚’変更ã—ãŸ. ã©ã†ã—ã¦æ˜”ã¯ã†ã¾ãå‹•ã‹ãªã‹ã£ãŸã‚“ã ã‚ + ã†ã‹? ã‚‚ã—ã‹ã—ã¦, å³ã‚·ãƒ•ãƒˆã®ç¬¦å·æ‹¡å¼µã¯å‡¦ç†ç³»ä¾å˜? + + * FIX2INT()ã¨FIX2UINT()を使ã„分ã‘るよã†ã«ã—ãŸ. ã‚‚ã£ã¨ã‚‚fixnumã¯31 + ビットã—ã‹ãªã„ã®ã§, 本質的ãªè§£æ±ºã«ã¯ãªã‚‰ãªã„ã®ã ãŒ(ioctlãŒçµ„ã¿è¾¼ + ã¿ãŸã‹ã£ãŸ). + + * printを関数的メソッドã‹ã‚‰é€šå¸¸ãƒ¡ã‚½ãƒƒãƒ‰ã«å¤‰æ›´. 引数ãŒä¸Žãˆã‚‰ã‚Œãªã„ + 時ã«ã¯ãƒ¬ã‚·ãƒ¼ãƒã‚’プリントã™ã‚‹ã‚ˆã†ã«ã—ãŸ. ã“ã‚Œã§printをメッセージ + å½¢å¼ã§ã‚‚実行ã§ãるよã†ã«ãªã£ãŸ. 例: + + ruby -e 'readlines().sort.print' + + 上ã®ã‚¹ã‚¯ãƒªãƒ—トã¯, 引数ã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸ(ã‚ã‚‹ã„ã¯æ¨™æº–入力ã‹ã‚‰èªã¿ + è¾¼ã¾ã‚ŒãŸ)æ–‡å—列をå„行毎ã«ã‚½ãƒ¼ãƒˆã—ã¦è¡¨ç¤ºã™ã‚‹. + + * eval.c: argc,argvパターンã§å¼•æ•°ã‚’å—ã‘るメソッドã«å¼•æ•°ãŒä¸€ã¤ã‚‚与 + ãˆã‚‰ã‚Œãªã„時, argvãŒnilã«ãªã£ã¦ã„ãŸ(argv[0]ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã¨è½ã¡ + ã¦ã—ã¾ã†). + + * _exit()ã‚’è¿½åŠ . ã“ã¡ã‚‰ã¯ä¾‹å¤–処ç†ãªã©è¡Œãªã‚ãªã„. + + * dbmクラス: クラスå称をDBM(大文å—)ã«çµ±ä¸€ã—ãŸ. + +Sat Jun 4 00:51:04 1994 Yukihiro Matsumoto (matz@dyna) + + * ループ変数ã«ã‚‚属性やé…列è¦ç´ を指定ã§ãるよã†ã«ã—ãŸ. + +Fri Jun 3 09:49:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * 多é‡ä»£å…¥ã«ãŠã„ã¦, 属性代入, é…列è¦ç´ ã¸ã®ä»£å…¥ã‚‚è¡Œãªãˆã‚‹ã‚ˆã†ã«ã—ãŸ. + + * Need_Fixnum(): nilã‚’0ã«å¤‰æ›ã™ã‚‹ã‚ˆã†ã«. + + * Enumerable:min, max, index, includes - è¿½åŠ . min, maxã¯è¦ç´ ㌠+ `<=>'メソッドをæŒã¤ã“ã¨ã‚’仮定ã—ã¦ã„ã‚‹. + + * Dict/Dbm:length - è¦ç´ æ•°ã‚’è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰. + + * Dbmクラスã«to_aãƒ¡ã‚½ãƒƒãƒ‰ã‚’è¿½åŠ . + + * Sunã«ãŠã‘ã‚‹sortã®èª¤å‹•ä½œã®ä»¶, 昨日ã®ä¿®æ£ã§fixã•ã‚ŒãŸ. ã—ã‹ã—, ãã‚Œ + ã§ãªãœå‹•ã‹ãªã‹ã£ãŸã®ã‹ã¯æ˜Žã‚‰ã‹ã§ã¯ãªã„ãŒâ€¦. 比較関数ãŒã©ã‚“ãªå€¤ã‚’ + è¿”ã—ã¦ã‚‚指定ã—ãŸé ˜åŸŸå¤–をアクセスã™ã‚‹ã®ã¯ãƒã‚°ã§ã¯ãªã„ã‹. + + * ファイルã®å…¨å†…容をèªã‚“ã§, å„行をé…列ã¨ã—ã¦è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰ã¯pythonã‚’ + å‚考ã«ã—ã¦`readlines'ã¨ã„ã†åå‰ã«ã—ãŸ. ãã‚Œã«ã¨ã‚‚ãªã„getsã«å¯¾ã— + ã¦readlineã¨ã„ã†åˆ¥åを用æ„ã—ãŸ. + +Fri Jun 3 00:08:38 1994 Yukihiro Matsumoto (matz@dyna) + + * Array:sort - 判別関数ã®æˆ»ã‚Šå€¤ã¯Fixnumã§ã¯ãªã, Intã§ã‚ã‚‹ã¹ãã 㣠+ ãŸ. é–“é•ã„. Sunã§å‹•ä½œãŒãŠã‹ã—ã‹ã£ãŸã®ã¯ã“ã®ã›ã„ã‹ã‚‚知れãªã„. + +Thu Jun 2 11:48:37 1994 Yukihiro Matsumoto (matz@ix-02) + + * IO:read_all() - ストリームã®æœ€å¾Œã¾ã§å…¥åŠ›ã—ã¦, å„行をè¦ç´ ã¨ã™ã‚‹é… + 列を返ã™ãƒ¡ã‚½ãƒƒãƒ‰ã‚’è¿½åŠ . ã¾ãŸé–¢æ•°ãƒ¡ã‚½ãƒƒãƒ‰ read_all()ã‚‚è¿½åŠ ã—ãŸ. + ã“ã‚Œã¯å¼•æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰èªã¿è¾¼ã‚“ã§å„行をè¦ç´ ã¨ã™ã‚‹é…列を返ã™. æ„ + 味的ã«ã¯ + + def read_all() + ary = {} + while gets() + ary.push($_) + end + end + + ã¨ã»ã¼ç‰ä¾¡ã§ã‚ã‚‹. + + * String:atoiメソッドを削除. to_aメソッドã‹ã‚‰aãŒé…列ã§ã‚ã‚‹ã¨ã®é€£æƒ³ + を呼んã§, 混乱を招ã‹ãªã„ãŸã‚. 代ã‚ã‚Šã«to_iメソッドを使ã†ã“ã¨. + + * é…列ã¸ã®å¤‰æ›ãƒ¡ã‚½ãƒƒãƒ‰to_aã‚’å°Žå…¥ã—ãŸ. 通常ã®ã‚ªãƒ–ジェクトã¯è‡ªåˆ†è‡ªèº« + を唯一ã®è¦ç´ ã¨ã™ã‚‹é•·ã•1ã®é…列を返ã™. é…列ã¯è‡ªåˆ†è‡ªèº«ã‚’, 辞書ã¯ã‚ー + ã¨å€¤ã®ãƒšã‚¢ã®é…列を返ã™. Enumeratedã‚’includeã—ãŸã‚¯ãƒ©ã‚¹ã¯, each㌠+ è¿”ã™å„è¦ç´ ã‚’å«ã‚€é…列を返ã™. + + * file.c: ä¸å®šå€‹ã®å¼•æ•°ã‚’å—ã‘ã¨ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰(chmod,chown,utimes)を書ã + æ›ãˆã¦, æ•´ç†ã—ãŸ. ãã‚Œã«ä¼´ã„, 最åˆã«å…¨ã¦ã®å¼•æ•°ã®åž‹ãƒã‚§ãƒƒã‚¯ã‚’行㪠+ ã†ã‚ˆã†ã«ã—ãŸ. åž‹ãƒã‚§ãƒƒã‚¯ã«å¤±æ•—ã™ã‚‹ã¨å‡¦ç†ã‚’è¡Œãªã‚ãšã«ä¾‹å¤–を発生㕠+ ã›ã‚‹. + + * configure.in: ä¸å¿…è¦ãªãƒ†ã‚¹ãƒˆã‚’è¡Œãªã‚ãªã„よã†ã«ä¿®æ£ã—ãŸ. + +Tue May 31 10:41:08 1994 Yukihiro Matsumoto (matz@ix-02) + + * String:pack(): 2進数ã®æ–‡å—列変æ›(B,b)ã§0ã¨1ãŒé€†ã ã£ãŸ. + + * Math.c: 実数系ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«å¼•æ•°ã¨ã—ã¦æ•´æ•°ãŒæ¸¡ã•ã‚ŒãŸæ™‚ã«è‡ªå‹•çš„ã«å¤‰ + æ›ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * toupper(), tolower(): æ–‡å—列ã®åˆ¤å®šãƒŸã‚¹ã§å¤‰æ›ã•ã‚Œã¦ã„ãªã‹ã£ãŸ. + + * getopt_long()ã®ä»•æ§˜ã«ã‚ˆã£ã¦, スクリプトã¸ã®å¼•æ•°ãŒã‚¤ãƒ³ã‚¿ãƒ—リタ㮠+ 引数ã ã¨è§£é‡ˆã•ã‚Œã¦ã„ãŸ. 引数パターン文å—列ã®å…ˆé ã«`+'ã‚’è¿½åŠ . + + * config.hを削除ã—ãŸ. DEFINEã¯Makefileã§ä¸Žãˆã‚‰ã‚Œã‚‹. + + * sprintf(): "%d"ã«æ–‡å—列ãŒä¸Žãˆã‚‰ã‚ŒãŸæ™‚ã«ã¯ã‚¢ãƒ‰ãƒ¬ã‚¹ã§ã¯ãªã内容を + æ•´æ•°ã«å¤‰æ›ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. ã¤ã„ã§ã«æµ®å‹•å°æ•°ç‚¹æ•°ã‚‚変æ›ã™ã‚‹ã‚ˆã†ã«å¤‰ + æ›´ã—ãŸ. + + * regexp.c: rubyã®æ‹¡å¼µæ£è¦è¡¨ç¾(\d, \D, \s, \S)ã®å‡¦ç†ã§å‰²ã‚Šå½“ã¦ãŸé ˜ + 域を越ãˆã¦ãƒãƒƒãƒ•ã‚¡ã«æ›¸ã込んã§ã„ãŸ. 処ç†å‰ã«ãƒãƒƒãƒ•ã‚¡ã‚’ãã¡ã‚“ã¨æ‹¡ + å¼µã™ã‚‹ã‚ˆã†ã«ã—ãŸ. ã“ã‚Œã§æ˜¨æ—¥å•é¡Œã«ã—ã¦ã„ãŸãƒ¡ãƒ¢ãƒªã®å•é¡Œã¯è§£æ±ºã§ã + ãŸã¨æ€ã†. + + * yylex(): ダブルクォート文å—列ä¸ã§ãƒ€ãƒ–ルクォートを表ç¾ã™ã‚‹ãŸã‚ + ã®ãƒãƒƒã‚¯ã‚¹ãƒ©ãƒƒã‚·ãƒ¥è¡¨ç¾ãŒã§ããªã‹ã£ãŸ. + +Mon May 30 10:07:42 1994 Yukihiro Matsumoto (matz@ix-02) + + * 演算å`!'ã®å³è¾ºã‚‚æ¡ä»¶å¼ã§ã‚ã‚‹ã¨ã—ãŸ. ã“ã‚Œã«ã‚ˆã£ã¦, ã“ã®æ¼”ç®—åã‚’ + å†å®šç¾©ã™ã‚‹äººã¯æ··ä¹±ã™ã‚‹ã‹ã‚‚知れãªã„ãŒ, 大多数ã®ã“ã®æ¼”ç®—åを使ã†äºº + ã¯æ··ä¹±ã‚’é¿ã‘ã‚‹ã“ã¨ãŒã§ãã‚‹ã¨æ€ã†. + + * autoconfを使ã£ã¦, 自動的ã«Makefile, config.hを生æˆã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + ã“ã‚Œã§, 多ãã®ãƒžã‚·ãƒ³ã§ã¯`configure'を実行ã—ãŸå¾Œ, `make'一発ã§ã‚³ + ンパイルã§ãã‚‹ã¨æ€ã†. + + * clone: サブクラスã«å¯¾ã—ã¦ç”¨ã„られãŸå ´åˆ, å…ƒã®ã‚ªãƒ–ジェクトã¨åŒã˜ + クラスã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’è¿”ã™ã‚ˆã†ã«(以å‰ã¯ãƒ“ルトインクラスã®å ´åˆã‚’ + 考ãˆã¦ãªã‹ã£ãŸ). + + * ビルトインクラスã®ã‚µãƒ–クラスも作れるよã†ã«, リテラルã®ã‚るクラス + ã«ã‚‚newãƒ¡ã‚½ãƒƒãƒ‰ã‚’è¿½åŠ ã—ãŸ. + + * malloc()ã§è½ã¡ã‚‹. purifyãŒå¿…è¦ã‹ã‚‚知れãªã„. + + * re.c: rb_global_variable()ã®å‘¼ã³ã ã—å½¢å¼ã®é–“é•ã„. 変数ã¸ã®ãƒã‚¤ãƒ³ + タを渡ã•ãªã‘ã‚Œã°ã„ã‘ãªã„. + + * parse.y: ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã®æ‰±ã„ã«å¼•æ•°ã®è©•ä¾¡é †ã«ä¾å˜ã™ã‚‹ç§»æ¤æ€§ã®ãªã„ + 部分ãŒã‚ã£ãŸ. + + * attr(): 属性è¨å®šã®ãƒã‚°ã‚’ç›´ã—ãŸ. ã„ã¤å†…部仕様ãŒå¤‰ã‚ã£ãŸã‚“ã ã‚ã†â€¦? + +Sat May 28 23:08:18 1994 Yukihiro Matsumoto (matz@dyna) + + * æ£è¦è¡¨ç¾ã‚ャッシュã®æ–‡å—列一致判定をãƒã‚¤ãƒ³ã‚¿ä¸€è‡´ã‹ã‚‰å†…容一致ã«å¤‰ + æ›´ã—ãŸ. ãã†ã„ãˆã°æ–‡å—列リテラルã¯ä¸€å›žæ¯Žã«æ–°ã—ãオブジェクトãŒç”Ÿ + æˆã•ã‚Œã‚‹ã®ã ã£ãŸ. + +Fri May 27 11:42:00 1994 Yukihiro Matsumoto (matz@ix-02) + + * trã‹ã‚‰æ–‡å—削除(delete), æ–‡å—圧縮(squeeze)を分離ã—ãŸ. ãã‚Œã«ã¨ã‚‚ + ãªã„trã®ã‚ªãƒ—ション引数ã¯ãªããªã£ãŸ. + +Thu May 26 10:32:55 1994 Yukihiro Matsumoto (matz@ix-02) + + * スクリプトèªã¿è¾¼ã¿ãƒ«ãƒ¼ãƒãƒ³ã‚’書ãç›´ã—ã¦, 通常ファイル以外ã®ãƒ•ã‚¡ã‚¤ + ルåや空文å—列ãŒã‚¹ã‚¯ãƒªãƒ—トã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸå ´åˆã«å¯¾å¿œã—ãŸ. ã¾ãŸ, + 標準入力ã‹ã‚‰ã‚¹ã‚¯ãƒªãƒ—トをèªã¿è¾¼ã‚€æ™‚ã«, 一時ファイルãŒ/tmpã«æ®‹ã‚‰ãª + ã„よã†ã«ã—ãŸ. + + * Fixnum:id2name - IDã‹ã‚‰æ–‡å—列ã«æˆ»ã™é–¢æ•°. String:internã®é€†. + + * Array: é…列ã®ç¯„囲外ã®è¦ç´ をアクセスã—ãŸæ™‚ã«ä¾‹å¤–を発生ã•ã›ãšã«, + nilã‚’è¿”ã™ã‚ˆã†ã«ã—ãŸ. é…列ã¯è‡ªå‹•çš„ã«æ‹¡å¼µã•ã‚Œã‚‹. + + * string:stripã‚’è¿½åŠ . + + * -nオプションãŒ-eオプションを複数指定ã—ãŸæ™‚も動作ã™ã‚‹ã‚ˆã†ã«. + + * parse.yã§<sys/types.h>もインクルードã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * fname周りã®ç´°ã‹ã„bugã‚’ä¿®æ£. + +Wed May 26 11:45:10 1994 Yukihiro Matsumoto (matz@dyna) + + * 定数をã‚ャッシュã™ã‚‹ã‚ˆã†ã«ã—ãŸ. ç¹°ã‚Šè¿”ã—ãŒå¤šã„å ´åˆã«ã¯æœ‰åŠ¹ã®ã¯ãš + ã ãŒ, 一度ã—ã‹ã‚¢ã‚¯ã‚»ã‚¹ã—ãªã„å ´åˆã¯é…ããªã‚‹ãªã‚. + +Wed May 25 00:42:24 1994 Yukihiro Matsumoto (matz@dyna) + + * 多é‡ä»£å…¥æ–‡(foo, bar = 1, 2)ã®æŽ¡ç”¨. + + * æ¡ä»¶å¼éƒ¨ã«æ–‡å—列ã‚ã‚‹ã„ã¯æ£è¦è¡¨ç¾ãƒªãƒ†ãƒ©ãƒ«ã‚’ãŠãã¨`=~'演算åã«ã‚ˆã£ + ã¦`$_'ã¨æ¯”較ã•ã‚Œã‚‹. æ›´ã«`...'ã®ä¸¡è¾ºã§ã¯æ•´æ•°ãƒªãƒ†ãƒ©ãƒ«ãŒ`$.'ã¨æ¯”較 + ã•ã‚Œã‚‹. + +Mon May 23 23:27:03 1994 Yukihiro Matsumoto (matz@dyna) + + * &å¼ å½¢å¼ã¯ãªããªã£ãŸ. 代ã‚ã‚Šã«kernel:apply(id, args..)ã‚’å°Žå…¥. + + * def op () ..å½¢å¼ã®å°Žå…¥. opã¯å†å®šç¾©å¯èƒ½ãªæ¼”ç®—å. + + * constantã®ä»£å…¥æ™‚ãƒã‚§ãƒƒã‚¯. æ—¢ã«åˆæœŸåŒ–ã•ã‚Œã¦ã„る定数ã«ä»£å…¥ã—ãŸå ´åˆ + ã¯ä¾‹å¤–ãŒç™ºç”Ÿã™ã‚‹. + + * 多é‡ä»£å…¥æ–‡. + +Thu May 19 22:57:07 1994 Yukihiro Matsumoto (matz@dyna) + + * 複åˆæ–‡ã§ã‚‚void valueã®ãƒã‚§ãƒƒã‚¯ã‚’è¡Œã†ã‚ˆã†ã«ã—ãŸ. + + * untilã®å‹•ä½œã®ä¿®æ£(do..untilåž‹ã ã£ãŸ). + +Wed May 18 01:06:25 1994 Yukihiro Matsumoto (matz@dyna) + + * 移æ¤ã«é–¢ã™ã‚‹è‹¥å¹²ã®å•é¡Œã‚’ä¿®æ£. + + * 別åã®æ§‹æ–‡ã‚’「def a bã€ã«ã—ãŸ. + + * until/unless: 演算åã‹ã‚‰åˆ¶å¾¡æ–‡ã¸. 例外をæ•æ‰ã™ã‚‹æ©Ÿèƒ½ã¯ãã®ã¾ã¾. + + * é¸æŠžå¯èƒ½ãªæ©Ÿèƒ½ã‚’config.hã‹ã‚‰defines.hã«ç§»å‹•. + +Fri May 13 23:20:21 1994 Yukihiro Matsumoto (matz@dyna) + + * -yオプションを新è¨. -dオプションã‹ã‚‰ã‚³ãƒ³ãƒ‘イラã®ãƒ‡ãƒãƒƒã‚°éƒ¨åˆ†ã‚’分 + 離ã—ãŸ. + +Tue Apr 25 20:17:33 1994 Yukihiro Matsumoto (matz@dyna) + + * マルãƒãƒã‚¤ãƒˆæ–‡å—列をè˜åˆ¥åã«ä½¿ãˆã‚‹ã‚ˆã†ã«. 個人的ã«ã¯ä½¿ã„ãŸãã¯ç„¡ + ã„ã‘ã©ãªã‚. + + * `-v'フラグã®çŠ¶æ…‹ã‚’$verboseã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãるよã†ã«. + + * CVSã®å°Žå…¥ã«ä¼´ã„, ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã®æ–¹æ³•ã‚’変更. + + * 真é¢ç›®ã«ChangeLogã‚’ã¤ã‘る事ã«ã—ãŸ. + +Tue Mar 8 10:09:25 1994 Yukihiro Matsumoto (matz at nws119) + + * %変数å ã«ã‚ˆã‚‹ã‚¯ãƒ©ã‚¹å®šæ•°ã‚’å°Žå…¥. + + * undef メソッド ã«ã‚ˆã‚‹ãƒ¡ã‚½ãƒƒãƒ‰å®šç¾©ã®å–り消ã—ã‚’å°Žå…¥. + + * rb_get_method_bodyã§ã¯the_envを変更ã›ãš, rb_call()ã§æ˜Žç¤ºçš„ã«å¤‰æ›´ + ã™ã‚‹ã‚ˆã†ã«. ã“ã‚Œã§responds_toãªã©ã§ç’°å¢ƒãŒç ´å£Šã•ã‚Œãªã„. + +Mon Mar 7 17:46:15 1994 Yukihiro Matsumoto (matz at nws119) + + * 「&æ–‡å—列ã€å½¢å¼. 「å¼.æ–‡å—列ã€åž‹ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚»ãƒ³ãƒ‰ã¯ãªããªã£ãŸ. + + * 自己代入形å¼(+=. -=, ...) + + * obj.attr = exprå½¢å¼ã®æŽ¡ç”¨. + +Thu Feb 24 16:23:28 1994 Yukihiro Matsumoto (matz at nws119) + + * toint, tofloat, print_stringã‚’ãã‚Œãžã‚Œto_i, to_f, to_sã«å¤‰æ›´. + + * String:clone - Copy on Writeã®å®Ÿç¾. + +Tue Feb 22 11:11:44 1994 Yukihiro Matsumoto (matz at nws119) + + * re.c: マッãƒã—ãŸæ–‡å—列ã®ä¿å˜ã«å¤±æ•—ã—ã¦ã„ãŸ. + + * trap: å¯èƒ½ãªã‚‰ã°å‡¦ç†ã«æ™‚é–“ã®ã‹ã‹ã‚‹ã‚·ã‚¹ãƒ†ãƒ コール(read, wait, + sigpause, select)をフックã—ã¦å‰²ã‚Šè¾¼ã¿å‡¦ç†ã®å³ç”性を高ã‚ã‚‹(DOS㪠+ ã©ã§ã¯ç„¡ç†ã ãªã‚). + + * trap: 割り込ã¿ã‚’ãã®å ´ã§å‡¦ç†ã™ã‚‹ã‹(迅速ã ãŒå±é™º), 安全ãªã‚¿ã‚¤ãƒŸãƒ³ + ã‚°ã§å‡¦ç†ã™ã‚‹ã‹ã‚’é¸æŠžã§ãるよã†ã«. + +Tue Feb 17 11:11:12 1994 Yukihiro Matsumoto (matz at nws119) + + * trap: 割り込ã¿ãƒãƒ³ãƒ‰ãƒ©. + +Wed Feb 16 12:29:12 1994 Yukihiro Matsumoto (matz at nws119) + + * String:crypt: æš—å·åŒ–ルーãƒãƒ³ + + * "::"演算åã®è¿½åŠ . a::b 㯠{a, b}ã¨åŒç¾©. a::b::c 㯠{a, {b, c}}㨠+ åŒç¾©(å³çµåˆ). åŒç¾©ã¨ã¯ã„ã†ã‚‚ã®ã®, "::"演算åを使ã£ãŸæ–¹ãŒå°‘ã—ã ã‘ + メモリ効率ãŒè‰¯ã„. + + * Dir.rmdir(), File.unlink(), File.utime() -- å„システムコールã¸ã® + インタフェース. + + * kill -- kill(2) I/F + + * select(): readã®ãƒã‚§ãƒƒã‚¯ã§ã¯stdioã«ãƒãƒƒãƒ•ã‚¡ãƒªãƒ³ã‚°ã•ã‚Œã¦ã„ã‚‹ã‹ã© + ã†ã‹ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«. + +Tue Feb 15 15:08:31 1994 Yukihiro Matsumoto (matz at nws119) + + * file.c: statã‚’ã‚ャッシュã™ã‚‹ã‚ˆã†ã«. + + * File:utime()ã‚’è¿½åŠ . + + * unliteralize(): ãƒ•ãƒ©ã‚°ã‚’ç ´å£Šã—ã¦ã„ãŸ. + + * Bug(): coreã‚’åãよã†ã«. + + * String:tr -- tr(1)互æ›. 引数パターンãŒã¡ã‚‡ã£ã¨é•ã†ã‘ã©â€¦. + +Mon Feb 14 18:24:13 1994 Yukihiro Matsumoto (matz at nws119) + + * unless, untilãŒä¾‹å¤–ã‚‚å½ã¨è¦‹ãªã™ã‚ˆã†ã«. + + * select() -- select(2) I/F + + * Array:pack, String:unpack: perlã®pack/unpackã®åŒç‰å“ + +Tue Feb 8 17:11:10 1994 Yukihiro Matsumoto (matz at nws119) + + * setenv()ã®ãªã„システムã®ãŸã‚ã«putenv()を使ã£ãŸã‚³ãƒ¼ãƒ‰ã‚‚用æ„ã—ãŸ. + +Mon Feb 7 09:52:44 1994 Yukihiro Matsumoto (matz at nws119) + + * 引数ã®ä¸€ç•ªæœ€å¾Œã«`*'ã‚’ç½®ã‘るよã†ã«ã—ãŸ. ã“ã‚Œã§rest引数ã®ãƒªã‚¹ãƒˆã‚’ + æ“作ã™ã‚‹å¿…è¦ãŒå°‘ãªããªã‚‹. + +Fri Feb 4 18:23:26 1994 Yukihiro Matsumoto (matz at nws119) + + * ruby-mode.elを書ãç›´ã™. ãšã„ã¶ã‚“ã¾ã—ã«ãªã£ãŸã¨æ€ã†. + + * æ–‡å—列リテラルã®Copy on Writeを実ç¾. ã“ã‚Œã§æ–‡å—列ãŒãƒªãƒ†ãƒ©ãƒ«ã§ã‚ + ã‚‹ã‹ã‚‰ã¨ã„ã£ã¦ã„ã¡ã„ã¡cloneã—ãªãã¦ã‚‚済む. + +Tue Feb 1 09:21:09 1994 Yukihiro Matsumoto (matz at nws119) + + * sub(), gsub()ã§, マッãƒã—ãŸæ–‡å—列を$&, $1..$9ã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãるよ + ã†ã«ã—ãŸ. åŒæ™‚ã«ãƒžãƒƒãƒã—ãŸéƒ¨åˆ†æ–‡å—列をコピーã—ã¦ãŠãよã†ã«(元㮠+ æ–‡å—列ãŒå¤‰æ›´ã•ã‚Œã¦ã‚‚状態をä¿å˜ã™ã‚‹ãŸã‚). + +Mon Jan 31 15:16:58 1994 Yukihiro Matsumoto (matz at nws119) + + * プライベートメソッドã®ä»•æ§˜ã‚’変更. 今ã¾ã§ã¯åŒã˜ã‚¯ãƒ©ã‚¹ã®ãƒ¡ã‚½ãƒƒãƒ‰ã‹ + らã—ã‹ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã‹ã£ãŸãŒ, サブクラスã®ãƒ¡ã‚½ãƒƒãƒ‰ã‹ã‚‰ã‚‚アクセス + ã§ãるよã†ã«ã—ãŸ(C++ã«ãŠã‘ã‚‹protected メンãƒé–¢æ•°). + + * メソッドサーãƒã®ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ を改善ã—, 10%程度ã®é«˜é€ŸåŒ–ã‚’è¡Œãªã£ãŸ. + + * 高速化. Cã§è¨˜è¿°ã•ã‚ŒãŸãƒ¡ã‚½ãƒƒãƒ‰ã‚’呼ã³å‡ºã™æ™‚ã«ã¯setjmpを呼ã°ãªã„よ + ã†ã«ã—ãŸ. ã“ã‚Œã§Cメソッドを多用ã™ã‚‹å ´åˆã«ã¯3å€ç¨‹åº¦é«˜é€Ÿã«ãªã£ãŸ. + +Fri Jan 28 15:44:04 1994 Yukihiro Matsumoto (matz at nws119) + + * sh-modeã‚’å…ƒã«ruby-mode.elを作る. 演算åã§çµ‚ã‚‹, 2è¡Œã«æ¸¡ã‚‹æ–‡ã«ã¯å¯¾ + å¿œã—ã¦ã„ãªã„ã‘ã©â€¦. + +Thu Jan 27 11:35:19 1994 Yukihiro Matsumoto (matz at nws119) + + * freenode(): NODE_NILã®è§£æ”¾å¿˜ã‚Œ. + + * å—å¥è§£æžéƒ¨ã®ãƒã‚°ä¿®æ£(コメントã®å¾Œã®çŠ¶æ…‹ã‚’戻ã—忘れ). + + * protect .. endã®ãƒã‚°ä¿®æ£. GC_LINKã®ãƒã‚¹ãƒˆãŒä¸æ£ã ã£ãŸ. + + * joinã®ãƒã‚°ä¿®æ£(使ã£ã¦ã„るオブジェクトをfreeã—ã¦ã„ãŸ). + + * splitã®ãƒã‚°ä¿®æ£(アルゴリズムãŒãŠã‹ã—ã‹ã£ãŸ). + + * fork()ã‚’è¿½åŠ . + +Wed Jan 26 17:09:56 1994 Yukihiro Matsumoto (matz at nws119) + + * ファイルテストメソッドã®è¿½åŠ . + + * rb_autoexec(): クラスをåˆã‚ã¦ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸæ™‚ã®æŒ™å‹•ã‚’制御ã§ãるよ + ã†ã«ã—ãŸ. ã“ã‚Œã§autoloadも実ç¾ã§ãã‚‹. ã“ã‚Œã«ã¨ã‚‚ãªã„メソッド + unknownã¯ãªããªã£ãŸ. + +Tue Jan 25 15:51:36 1994 Yukihiro Matsumoto (matz at nws119) + + * Dbmクラス, Mathモジュールを作æˆ. + + * -Iオプションã§ã‚µãƒ¼ãƒãƒ‘スã«è¿½åŠ ã§ãるよã†ã«. + + * サーãƒãƒ‘スを変数$load_pathã«è¨å®šã§ãるよã†ã«. + + * load(): ダイナミックãƒãƒ¼ãƒ‰ã‚’使ãˆã‚‹ã‚ˆã†ã«ã—ãŸ. + +Tue Jan 18 14:14:01 1994 Yukihiro Matsumoto (matz at nws119) + + * Comparable:"<=>" + + * Float,Fixnum:"**" + + * Array:sort + +Fri Jan 14 16:53:37 1994 Yukihiro Matsumoto (matz at nws119) + + * version 0.07 + + * メソッドã«é–¢ã™ã‚‹ãƒ‰ã‚ュメントを充実ã•ã›ãŸ. + + * String:index(): 引数positionを増やã—ãŸ. + +Thu Jan 13 15:13:52 1994 Yukihiro Matsumoto (matz at nws119) + + * 未åˆæœŸåŒ–ã®å¤‰æ•°ã‚¢ã‚¯ã‚»ã‚¹ã‚’ãªãã—ãŸ. + + * 無駄ãªhash tableã®ã‚¢ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã‚’削除. + + * Purify'd(on Sun) + + * ~RE 㨠~STRã®ã‚³ãƒ³ãƒ‘イル時展開ã®æŠ‘制. + + * Sunã¸ç§»æ¤. signal()ã®æˆ»ã‚Šå€¤. RDataã®bugä¿®æ£. + + * parse.y: nlsルールを削除. + + * yylex(): 改行ã¨ç¬¦åˆã®è§£æžéƒ¨åˆ†ã‚’変更. + + * missing/strftime.c: 移æ¤ç”¨. + + * Time:strftime: ãã®ä»–ã®ãƒ¡ã‚½ãƒƒãƒ‰ã‚‚strftimeを利用ã™ã‚‹ã‚ˆã†ã«. + + * メソッドå†å®šç¾©æ™‚ã«ãƒ¡ã‚½ãƒƒãƒ‰ã‚ャッシュをクリアã™ã‚‹. + +Fri Jan 7 15:23:20 1994 Yukihiro Matsumoto (matz at nws119) + + * Float:coerce(): Fixnumã¨Float以外ã®å¼•æ•°ã‚’与ãˆã‚‰ã‚Œã‚‹ãŸæ™‚ã«ã¯ä¾‹å¤– + を発生ã™ã‚‹ã‚ˆã†ã«. + + * Stat: statæ§‹é€ ä½“ã®å…¨ã¦ã®ãƒ¡ãƒ³ãƒã«å¯¾ã™ã‚‹ã‚¢ã‚¯ã‚»ã‚¹ãƒ¡ã‚½ãƒƒãƒ‰ã‚’用æ„. + + * 未定義ã®ã‚¯ãƒ©ã‚¹/モジュールã¸ã®å‚ç…§ãŒunknownメソッドを呼ã³å‡ºã™ã‚ˆã† + ã«ã—ãŸ. + + * baseline - version 0.06. diff --git a/doc/ChangeLog-0.50_to_0.60 b/doc/ChangeLog-0.50_to_0.60 new file mode 100644 index 0000000000..5f5b03ff40 --- /dev/null +++ b/doc/ChangeLog-0.50_to_0.60 @@ -0,0 +1,462 @@ +Thu Dec 8 00:32:21 1994 Yukihiro Matsumoto (matz@dyna) + + * io.c($<.file,$<.filename): ãã¡ã‚“ã¨åˆæœŸåŒ–． + + * parse.y(rb_class2name): includeã—ã¦ã„るクラスåã‚’æ£å¸¸ã«è¡¨ç¤ºã§ã + ãªã‹ã£ãŸï¼Ž + +Wed Dec 7 15:40:36 1994 Yukihiro Matsumoto (matz@ix-02) + + * dln.c: config.hã‚’includeã—ã¦ã„ãªã‹ã£ãŸï¼Ž + + * missing/strdup.c: 忘れã¦ã„ãŸï¼Ž + +Fri Dec 2 15:21:44 1994 Yukihiro Matsumoto (matz@ix-02) + + * 関数ã®å‘½åルールを変ãˆãŸ(クラスメソッド: Sxxx_xxx，ユーティリティ + メソッドxxx_xxxãªã©)． + + * re.c(casefold): 個々ã®æ£è¦è¡¨ç¾ã‚ªãƒ–ジェクトãŒå¤§æ–‡å—å°æ–‡å—を無視㙠+ ã‚‹ã‹ã©ã†ã‹ã‚’è¨å®šã§ãるよã†ã«ã—ãŸï¼Ž + +Thu Dec 1 01:44:51 1994 Yukihiro Matsumoto (matz@dyna) + + * missing.c: システムã§æä¾›ã•ã‚Œãªã„ファイルã®æ‰±ã„を変更ã—ãŸï¼Ž + + * io.c($<): 変数`$<'ãŒæŒ‡ã—ã¦ã„ã‚‹ã‚‚ã®ã‚’ç¾åœ¨èªã¿è¾¼ã¿ä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«åã‹ + ら仮想ファイル($ARGF)ã«å¤‰æ›´ã—ãŸï¼Žã¾ãŸï¼Œç¾åœ¨èªã¿è¾¼ã¿ä¸ã®ãƒ•ã‚¡ã‚¤ãƒ« + åã¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚ªãƒ–ジェクトã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ã‚‚用æ„ã—ãŸï¼Ž + + * ruby.h(data_new): Dataオブジェクトã®å‰²ã‚Šå½“ã¦æ–¹æ³•ã‚’改善ã—ãŸï¼Ž + +Wed Nov 30 15:36:13 1994 Yukihiro Matsumoto (matz@ix-02) + + * Makefile: ルールを整ç†ã—ãŸï¼Ž + +Tue Nov 29 00:09:26 1994 Yukihiro Matsumoto (matz@dyna) + + * array.c(`|'): 引数ãŒé…列ã§ãªã，ã‹ã¤ãã®ã‚ªãƒ–ジェクトãŒè¦ç´ ã¨ã—㦠+ å«ã¾ã‚Œã¦ã„ãªã„時，ãã®ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’è¿½åŠ ã™ã‚‹ï¼Žã‚ã‚Œã°ãªã«ã‚‚ã—ãªã„． + + * process.c(gid,egid): GIDをアクセスã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ï¼Ž + + * io.c(print): æ–‡å—列ã¨é…列ã«å¯¾ã™ã‚‹å‡¦ç†ã‚’組ã¿è¾¼ã‚“ã§è‹¥å¹²ã®é«˜é€ŸåŒ–ã‚’ + 図ã£ãŸï¼Žå‡ºåŠ›ãŒå¤šã„å ´åˆã«åŠ¹ã„ã¦ãるよã†ã ． + + * parse.y(parse_string): ""ã§å›²ã¾ã‚ŒãŸæ–‡å—列内ã§ã¯å¯¾å¿œã™ã‚‹ã‚¨ã‚¹ã‚±ãƒ¼ + プãŒãªã„`\'を残ã•ãªã„よã†ã«ï¼Žã¤ã¾ã‚Šï¼Œä»Šå¾Œã¯"\k" -> "k"ã§ã‚ã‚‹(以 + å‰ã¯"\k"ã ã£ãŸ)． + +Mon Nov 28 18:02:31 1994 Yukihiro Matsumoto (matz@ix-02) + + * re.c(re_regsub): ç½®æ›æ–‡å—列ã®ç½®æ›ãˆãŒä¸å®Œå…¨ã ã£ãŸï¼Ž + + * 一時オブジェクトã®è§£æ”¾ã‚’ã™ã¹ã¦GCã«ä»»ã›ãŸï¼Žä»Šã®ã¾ã¾ã§ã¯ã¾ãšã„タイ + ミングã§ã‚ªãƒ–ジェクトを解放ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã£ãŸï¼Žæ˜”ã®GCã®æ™‚ã«ã¯ã“ã‚Œ + ã§ã‚‚良ã‹ã£ãŸã®ã ãŒï¼Ž + +Tue Nov 22 00:15:24 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c($"): æ—¢ã«ãƒãƒ¼ãƒ‰ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«åã®é…列． + +Mon Nov 21 01:09:50 1994 Yukihiro Matsumoto (matz@dyna) + + * array.c(&,|): 集åˆã¨ã—ã¦ã®ç©æ¼”ç®—ã¨å’Œæ¼”算． + + * io.c($<): æ–‡å—列を代入ã—ãŸæ™‚ã«ã¯è‡ªå‹•çš„ã«openã™ã‚‹ã‚ˆã†ã«ï¼ŽIOã®ã‚µãƒ– + クラスã‹ã©ã†ã‹ã®ãƒã‚§ãƒƒã‚¯ã‚‚è¡Œã†ï¼Ž + +Sun Nov 19 23:02:27 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c($:): $LOAD_PATHã®åˆ¥å． + + * io.c($>): デフォルト出力先．IO.defaultã¯ç„¡ããªã£ãŸï¼Ž + + * io.c($<): $FILENAMEã®åˆ¥å + + * glob.c(each): ワイルドカードã«ãƒžãƒƒãƒã™ã‚‹ã‚‚ã®ãŒãªã„å ´åˆï¼Œãƒ‘ターン + ãã®ã‚‚ã®ã‚’与ãˆã‚‹ã‚ˆã†ã«ï¼Ž + + * file.c(chmod,chown,unlink,utime): `\'ã§ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã‚’エスケー + プã§ãるよã†ã«ï¼Ž + +Fri Nov 18 00:20:42 1994 Yukihiro Matsumoto (matz@ix-02) + + * version 0.55 released + + * file.c(chmod,chown,unlink,utime): 引数ã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸæ–‡å—列ã«ãƒ¯ + イルドカードãŒå«ã¾ã‚Œã¦ã„ã‚‹å ´åˆã«ã¯Globオブジェクトã«å¤‰æ›ã™ã‚‹. + +Wed Nov 16 17:33:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * file.c(chmod,chown,unlink,utime): 引数ã¨ã—ã¦ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã‚‚å—ã‘ + 付ã‘るよã†ã«. ãã®å ´åˆã¯ãƒžãƒƒãƒã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å…¨ä½“ã«é©ç”¨ã•ã‚Œã‚‹. + +Fri Nov 11 00:07:28 1994 Yukihiro Matsumoto (matz@dyna) + + * string.c(strip): æ–‡å—列ãã®ã‚‚ã®ã‚’変更ã™ã‚‹ã‚ˆã†ã«. + + * eval.c(rb_cal): 環境をスタックã«ç©ã‚€ã‚¿ã‚¤ãƒŸãƒ³ã‚°ãŒé–“é•ã£ã¦ã„ãŸã®ã§ï¼Œ + ä¸é©åˆ‡ãªã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå‡ºã‚‹æ™‚ãŒã‚ã£ãŸï¼Ž + + * eval.c(rb_undefined): メソッドãŒç„¡ã„時ã¨ãƒ¡ã‚½ãƒƒãƒ‰ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ã㪠+ ã„時ã¨ã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’替ãˆãŸï¼Ž + + * string.c: toupper/tolowerã¯upcase/downcaseを使ã£ã¦å®Ÿç¾ï¼Ž + + * string.c: lcfirst/ucfirstã¯å‰Šé™¤ï¼Ž + +Thu Nov 10 16:15:16 1994 Yukihiro Matsumoto (matz@ix-02) + + * string.c: sub/gsubã¯ç½®æ›å¾Œã®æ–‡å—列を返ã™ã‚ˆã†ã«ã—ãŸ. + + * string.c: toupper/tolower/lcfirstãªã©ã‚’æ–‡å—列を変更ã™ã‚‹ã‚‚ã®ã¨ã— + ãªã„ã‚‚ã®ã®2 種類をæä¾›ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + +Tue Nov 1 17:52:09 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: 変数展開ã«ãƒã‚°ãŒã‚ã£ã¦å…ƒã®æ–‡å—åˆ—ã‚’ç ´å£Šã—ã¦ã„ãŸ. + +Thu Oct 27 09:56:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: rest引数ã®å‡¦ç†ãŒé–“é•ã£ã¦ã„ãŸ. + + * env.c(rb_yield): ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã®è¨å®šãŒé–“é•ã£ã¦ã„ãŸ. + +Wed Oct 26 19:01:43 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: 引数セットã®é«˜é€ŸåŒ–. + + * process.c: sleepã®ãƒã‚°. + + * parse.y, gnuglob.c: Sunã®ccã§ã‚‚コンパイルã§ãるよã†ã«. + +Tue Oct 25 00:36:16 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: 若干ã®é«˜é€ŸåŒ–. スタックã®å‡¦ç†ã«ã‚ˆã£ã¦rb_call()ãŒå°‘ã—é…ã + ãªã£ãŸåˆ†ã®ç©´åŸ‹ã‚ãらã„ã‹. + + * eval.c: blockã‚’envã‹ã‚‰å¤–ã™ãªã©ã—ã¦ã‚¹ã‚¿ãƒƒã‚¯ã‚’軽ãã—ãŸ. + +Mon Oct 24 11:47:54 1994 Yukihiro Matsumoto (matz@ix-02) + + * re.c: æ£è¦è¡¨ç¾ã‚¢ã‚¯ã‚»ã‚¹ç”¨ã®å¤‰æ•°($`, $', $+)ã‚’è¿½åŠ . + + * re.c($KANJI): 処ç†ã™ã‚‹æ¼¢å—コードをrubyプãƒã‚°ãƒ©ãƒ 内ã‹ã‚‰è¨å®šã§ãã‚‹ + よã†ã«ã—ãŸ. + +Sat Oct 22 00:42:41 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c: イテレータ内ã®redoã¨retryã®å‡¦ç†ã«ãƒã‚°ãŒã‚ã£ãŸï¼Ž + +Fri Oct 21 00:53:21 1994 Yukihiro Matsumoto (matz@dyna) + + * string.c(swapcase): æ–‡å—列ã®å¤§æ–‡å—å°æ–‡å—ã‚’ç½®ãæ›ãˆã‚‹. + + * string.c(ljust,rjust,center): æ–‡å—列ã®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆç”¨ãƒ¡ã‚½ãƒƒãƒ‰. + sprintf()ã§ã‚‚åŒã˜ã‚ˆã†ãªã“ã¨ã¯ã§ãã‚‹ãŒ. + + * socket.c(recv,recvfrom): flags引数をçœç•¥å¯èƒ½ã«ã—ãŸ. çœç•¥æ™‚ã®å€¤ã¯ + 0ã§ã‚ã‚‹. + + * socket.c(recvfrom): recvã¨åŒæ§˜ã ãŒ, データã¨ç›¸æ‰‹ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ãƒšã‚¢ã‚’ + è¿”ã™. + + * socket.c(accept): 戻り値をã¤ãªãŒã£ãŸã‚½ã‚±ãƒƒãƒˆã‹ã‚‰, ソケットã¨ã‚¢ãƒ‰ + レスã®ãƒšã‚¢ã«å¤‰æ›´ã—ãŸ. + + * eval.c(eval): the_classをセットã™ã‚‹æ™‚ã«, last_moduleãŒincludeã• + ã‚Œã¦ã„るモジュール(T_ICLASS)ã§ã‚ã‚Œã°, 定義元ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®æ–¹ã‚’セッ + トã™ã‚‹ã‚ˆã†ã«. ã“ã®ä¿®æ£ãŒãªã„ã¨ICLASSã«å¯¾ã—ã¦ãƒ¡ã‚½ãƒƒãƒ‰ãŒå‘¼ã°ã‚Œã‚‹å¯ + 能性ãŒã‚ã‚Š, ä¸å¯©ãªå‹•ä½œã‚’ã™ã‚‹(ã¯ãš). + + * class.c: オブジェクトã®cloneã®éš›ã«ç‰¹ç•°ã‚¯ãƒ©ã‚¹(特異メソッド用ã®ã‚¯ + ラス)ã‚’ãã¡ã‚“ã¨ã‚³ãƒ”ーã™ã‚‹ã‚ˆã†ã«ã—ãŸ. 今ã¾ã§ã¯å€‹ã€…ã®ãƒ¡ã‚½ãƒƒãƒ‰ã®ã‚³ + ピーを忘れã¦ã„ãŸ. + + * numeric.c: Numericã®newã¨cloneã‚’undefã—ãŸ. + +Thu Oct 20 11:30:00 1994 Yukihiro Matsumoto (matz@ix-02) + + * version 0.53 released. + + * parse.y: TopLevelã®defæ–‡ã¯é–¢æ•°ãƒ¡ã‚½ãƒƒãƒ‰ã‚’定義ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * parse.y: defæ–‡ã®private指定ã¯ãªããªã£ãŸ. export/noexportメソッド + を使ã£ã¦ã‚‚らã†ã“ã¨ã«ã—ãŸ. + + * parse.y: caseæ–‡ã«thenã‚’å«ã‚€ã“ã¨ãŒã§ãるよã†ã«ãªã£ãŸ. + +Wed Oct 19 13:09:58 1994 Yukihiro Matsumoto (matz@ix-02) + + * object.c(export,unexport): 関数メソッドã®è¨å®šç”¨ãƒ¡ã‚½ãƒƒãƒ‰. + + * eval.c, class.c: 関数的メソッドを復活ã•ã›(ã¾ãŸã‹â€¦), `@'ã«ã‚ˆã‚‹ + privateメソッドをãªãã—ãŸ. ã‚„ã¯ã‚Š, 関数的ãªã‚‚ã®ã¯é–¢æ•°çš„ã«å‘¼ã³ãŸ + ã„æ°—ãŒã—ã¦ããŸ. ã“ã†ä»•æ§˜ãŒå¤‰å‹•ã—ã¦ã¦ã¯ã„ã‘ãªã„よã†ãªæ°—ã‚‚ã™ã‚‹ãªã‚. + *BACKWARD INCOMPATIBILITY* + + * eval.c: メソッドã®æ§‹æˆã‚’変更ã—, 別å管ç†ã¨é–¢æ•°ãƒ¡ã‚½ãƒƒãƒ‰ã®ç®¡ç†ã‚’分 + 離ã—ãŸ. + + * eval.c: the_env->last_funcã‚’Cメソッドã®æ™‚ã«ã‚‚æ›´æ–°ã™ã‚‹. ã“ã‚ŒãŒãª + ã„ã¨Structã®ã‚¢ã‚¯ã‚»ã‚¹ãŒå‹•ä½œã—ãªã„. + +Fri Oct 14 13:22:18 1994 Yukihiro Matsumoto (matz@ix-02) + + * version 0.52 released: ……ãªã‚“ã¦ã“ã£ãŸã„. + + * eval.c(rb_call): returnã®å‡¦ç†ãŒé–“é•ã£ã¦ã„ãŸã®ã§, マシンã«ã‚ˆã£ã¦ + ã¯returnã§é–¢æ•°ã‚’終了ã™ã‚‹ã ã‘ã§ãªãtoplevelã¾ã§ã¤ã抜ã‘ã¦ã„ãŸ. + + * dbm.c: Dictã¨åŒæ§˜ã«eachãŒ[key,value]ã‚’è¿”ã™ã‚ˆã†ã«. + + * version 0.51 released + +Thu Oct 13 12:13:48 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(SETUP_ARGS): ä»˜åŠ å¼•æ•°ãŒé…列ã§ãªã„時ã«ã¯é…列ã«å¤‰æ›ã™ã‚‹. + + * parse.y: 括弧ãªã—ã®ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã§ã‚‚`*'ã«ã‚ˆã‚‹ä»˜åŠ 引数ãŒä½¿ãˆã‚‹ + よã†ã«ã—ãŸ. ãŸã ã—, 通常引数ãŒä¸€ã¤ã‚‚ãªã„å ´åˆã¯ä¹—算演算åã¨åŒºåˆ¥ãŒ + ã¤ã‹ãªã„ã®ã§, å¿…ãšæ‹¬å¼§ãŒå¿…è¦. + +Wed Oct 12 10:09:07 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(rb_call): ã‚ャッシュã®è¨ˆç®—ã‚’inline化. ã‚ャッシュミスãŒã‚ + ã‚Œã°é–¢æ•°å‘¼ã³å‡ºã—ã§ãƒ¡ã‚½ãƒƒãƒ‰ã‚’検索ã™ã‚‹. methods.cã¯ãªããªã£ãŸ. + + * eval.c(rb_eval): ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ç”¨ã®é ˜åŸŸã‚’alloca()ã™ã‚‹ã‚ˆã†ã«å¤‰æ›´. + サイズã®å¤‰æ›´ãŒå¿…è¦ã«ãªã‚Œã°æ”¹ã‚ã¦malloc()ã™ã‚‹ã‚ˆã†ã«. + + * parse.y: error recoveryã®éš›ã«lex_stateã‚’æ›´æ–°ã—ã¦ãŠãよã†ã«. + +Tue Oct 11 17:10:46 1994 Yukihiro Matsumoto (matz@ix-02) + + * socket.c(for_fd): ファイル記述å(Fixnum)ã‹ã‚‰ã‚½ã‚±ãƒƒãƒˆã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ + を得るメソッド. ãŸã¨ãˆã°inetdã‹ã‚‰èµ·å‹•ã•ã‚ŒãŸã‚µãƒ¼ãƒã§æ¨™æº–入出力㫠+ ソケットæ“作を行ãªã†ãŸã‚ã«ä½¿ã†. ã¤ã¾ã‚ŠSocket.for_fd($stdin)ã§æ¨™ + 準入力ã«å¯¾å¿œã™ã‚‹ã‚½ã‚±ãƒƒãƒˆã‚ªãƒ–ジェクトãŒå¾—られる. + + * io.c(to_i): IOクラスã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’æ•´æ•°ã«å¤‰æ›ã™ã‚‹ã¨ãã®ãƒ•ã‚¡ã‚¤ãƒ« + 記述åã‚’è¿”ã™ã‚ˆã†ã«. + + * numeric.c(num2int): to_iメソッドを使ã£ã¦ã§ãã‚‹é™ã‚Šæ•´æ•°ã«å¤‰æ›ã™ã‚‹. + 以å‰ã¯num2fixã ã‘ãŒå…¨ã¦ã®ã‚ªãƒ–ジェクトã«å¯¾ã—ã¦to_iメソッドをé©ç”¨ + ã—ã¦ã„ãŸ. + + * sprintf.c(Fsprintf): 整数表示ã®éš›, オブジェクトをã§ãã‚‹é™ã‚Šæ•´æ•° + ã«å¤‰æ›ã™ã‚‹ã‚ˆã†ã«(to_iメソッドを使ã†). + +Fri Oct 7 14:06:32 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(Fcaller): å¿…è¦æ€§ãŒã‚ˆã分ã‹ã‚‰ãªã„ã®ã§ãƒ‰ã‚ュメントã‹ã‚‰å‰Šé™¤. + å°†æ¥ãƒ‡ãƒãƒƒã‚¬ã‚’作る時ã«å¾©æ´»ã•ã›ã‚ˆã†. + + * eval.c(rb_call): Cã§è¨˜è¿°ã•ã‚ŒãŸãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã§ã¯ç’°å¢ƒã‚’スタック + ã«ã‚»ãƒ¼ãƒ–ã—ãªã„ã“ã¨ã«ã‚ˆã£ã¦é«˜é€ŸåŒ–. + +Wed Oct 5 15:00:58 1994 Yukihiro Matsumoto (matz@ix-02) + + * ruby.h: 一時env.hã«ç§»å‹•ã—ã¦ãŸQselfã®å®šç¾©ã‚’復活. ãŸã ã—今回ã¯é–¢æ•° + ã¨ã—ã¦å®Ÿç¾(env.hã§ã¯å¤‰æ•°ã¨ã—ã¦å†å®šç¾©ã—ã¦ã‚ã‚‹). + + * ruby.h: TRUEã§syntax errorã«ãªã‚‰ãªã„よã†#undefã‚’è¿½åŠ . + + * eval.c(rb_eval): thread化ã«æŒ‘戦ã—ãŸãŒ, 失敗(速ããªã‚‰ãªã‹ã£ãŸ). + ãŒ, Scopingãªã©ã®ç„¡é§„ãªã‚³ãƒ¼ãƒ‰ã®å‰Šé™¤ã¨ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã®å¼•æ•°ã‚»ãƒƒ + トã®inline化ã§è‹¥å¹²ã®é«˜é€ŸåŒ–を実ç¾ã—ãŸ. 副作用ã¨ã—ã¦, argc, argvå½¢ + å¼ã®é–¢æ•°å‘¼ã³å‡ºã—ã®ä»•æ§˜ãŒå¤‰åŒ–ã—ãŸ(argvã«selfã‚’å«ã¾ãªããªã£ãŸ). + + * eval.c(rb_call): メソッド呼ã³å‡ºã—ã®é«˜é€ŸåŒ–. + +Tue Oct 4 11:40:53 1994 Yukihiro Matsumoto (matz@ix-02) + + * ruby-mode.el: 修飾åã«å¯¾å¿œã—ãŸ. + + * parse.y: 多é‡ä»£å…¥ã«restã‚’ã¤ã‘ãŸ. ã“ã®æ©Ÿèƒ½ã‚’使ãˆã°optional引数㮠+ 解æžãŒç°¡å˜ã«ã§ãã‚‹(ã¯ãš). + + * pack.c(unpack): uuencodeå½¢å¼ã®decodeã®éš›ã«æ–‡å—列ã®é•·ã•ãŒé–“é•ã£ã¦ + ã„ãŸ. + +Mon Oct 3 15:58:41 1994 Yukihiro Matsumoto (matz@ix-02) + + * file.c(type): ファイルタイプを文å—列ã§è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰. + +Fri Sep 30 11:36:07 1994 Yukihiro Matsumoto (matz@ix-02) + + * object.c: デフォルトã®çœŸã®å€¤ã§ã‚ã‚‹%TRUEã®å€¤ã‚’1(Fixnum)ã‹ã‚‰tã«å¤‰ + æ›´ã—ãŸ. to_sã§æ–‡å—列ã«å¤‰æ›ã—ãŸæ™‚ã«ã‚‚`t'ã¨è¡¨ç¤ºã•ã‚Œã‚‹. æ›´ã«è¸ã¿è¾¼ + ã‚“ã§`t'を予約語ã«ã—ã¦lispã®ã‚ˆã†ã«ã—よã†ã‹ã¨ã‚‚æ€ã£ãŸãŒ, ãã“ã¾ã§ + ã¯æ±ºå¿ƒã§ããªã‹ã£ãŸ. 一文å—ã®ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¯ã‹ãªã‚Šä½¿ã„ãã†ãªæ°—ãŒã™ + ã‚‹ã®ã§â€¦. + + * array.c,dict.c: equalã‚’å†å®šç¾©ã—ã¦ã„るクラスã§, hashã‚’æ£ã—ã定義 + ã—ãŸ. + +Wed Sep 28 23:30:28 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c(Ffail): 今ã¾ã§failã¯ã‚«ãƒ¼ãƒãƒ«ã‚¯ãƒ©ã‚¹ã®ãƒ¡ã‚½ãƒƒãƒ‰ã§ã‚ã£ãŸãŒ, + 構文ã«çµ„ã¿è¾¼ã‚“ã . ã“ã®å¤‰æ›´ã«ã‚ˆã£ã¦, 1)`fail'ã¯äºˆç´„語ã¨ãªã‚Š, ãƒãƒ¼ + カル変数ã«ç”¨ã„ã‚‹ã“ã¨ãŒã§ããªããªã£ãŸ. 2)`fail'å˜ä½“ã§ä¾‹å¤–を発生㙠+ るよã†ã«ãªã£ãŸ. 3)failã¯ãƒ¡ã‚½ãƒƒãƒ‰ã§ã¯ãªããªã£ãŸã®ã§å†å®šç¾©ã•ã‚Œã‚‹å¯ + 能性ãŒãªããªã£ãŸ. + + * dic.c, dbm.c(indexes): Arrayã®indexesã¨åŒæ§˜ã®æ©Ÿèƒ½ã‚’æŒã¤ãƒ¡ã‚½ãƒƒãƒ‰ + ã‚’è¿½åŠ . + + * array.c(indexes): 引数をインデックスã¨ã™ã‚‹è¦ç´ ã®é…列を返ã™. æ•´æ•° + ã®é…列を引数ã¨ã™ã‚‹æ™‚ã«ã¯å¼•æ•°ã®è¦ç´ をインデックスã¨ã™ã‚‹è¦ç´ ã®é…列 + ã‚’è¿”ã™. + +Mon Sep 19 13:42:31 1994 Yukihiro Matsumoto (matz@ix-02) + + * array.c(aset): 部分é…列ã«å¯¾ã™ã‚‹ä»£å…¥ã§é…列以外ã®ã‚ªãƒ–ジェクトãŒæŒ‡ + 定ã•ã‚ŒãŸå ´åˆã«å¤šé‡ä»£å…¥ã¨åŒã˜ãƒ«ãƒ¼ãƒ«ã§é…列化ã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * io.c(print): 引数ã¨ã—ã¦ä¸Žãˆã‚‰ã‚ŒãŸå„オブジェクトã«print_onメッセー + ジを与ãˆã‚‹ã‚ˆã†ã«. 実行速度ã¯è½ã¡ã‚‹ãŒæŸ”軟性ã¯å¢—ã™. + +Fri Sep 16 14:59:18 1994 Yukihiro Matsumoto (matz@ix-02) + + * glob.c: ワイルドカードã®å°Žå…¥. bashã«ä½¿ã‚ã‚Œã¦ã„ã‚‹GNUã®globルーム+ ンをæµç”¨ã—ãŸ. + +Mon Sep 12 18:36:58 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(value_expr): å¼ãŒnilã®æ™‚ã«å¯¾å¿œ. + + * class.c: ICLASSã®classãŒå¿…ãšClass/Moduleを指ã™ã‚ˆã†ã«. + +Tue Sep 6 16:23:28 1994 Yukihiro Matsumoto (matz@ix-02) + + * re.c: æ£è¦è¡¨ç¾å†…ã§ã€Œ\æ•°å—ã€å½¢å¼ãŒæŒ‡å®šã§ãるよã†ã«. + + * parse.y:「do expr using var ... endã€å½¢å¼ã¯ãªããªã£ãŸ. 寂ã—ã„æ°— + ã‚‚ã™ã‚‹. *BACKWARD INCOMPATIBILITY* + +Mon Sep 5 10:59:01 1994 Yukihiro Matsumoto (matz@ix-02) + + * numeric.c(next): Numericクラスã«ã‚‚nextã‚’æä¾›. + + * string.c(upto): uptoã‚’æä¾›. + + * range.c(each): nextを使ã£ãŸã‚¤ãƒ³ã‚¿ãƒ•ã‚§ãƒ¼ã‚¹ã‹ã‚‰uptoを使ã†ã‚ˆã†ã«å¤‰ + æ›´ã—ãŸ. ã“ã®æ–¹ãŒä¸€ã¤ã®ãƒ¡ã‚½ãƒƒãƒ‰ã§å‡¦ç†ã‚’ã¾ã¨ã‚ã§è¡Œãªã†ã“ã¨ãŒã§ãã‚‹. + +Fri Sep 2 15:25:39 1994 Yukihiro Matsumoto (matz@ix-02) + + * dict.c(each): 戻り値を[key, value]ã®ãƒšã‚¢ã«å¤‰æ›´. 今ã¾ã§ã®each㯠+ each_valueã¨ã—ã¦æ®‹ã‚‹. *BACKWARD INCOMPATIBILITY* + +Thu Sep 1 10:49:04 1994 Yukihiro Matsumoto (matz@ix-02) + + * æˆåŠŸã—ãŸ(特別ãªæˆ»ã‚Šå€¤ã‚’æŒãŸãªã„)システムコールã¯`0'ã‚’è¿”ã™ã‚ˆã†ã«. + +Wed Aug 31 00:26:51 1994 Yukihiro Matsumoto (matz@dyna) + + * string.c: ãƒã‚§ãƒƒã‚¯ã‚µãƒ を得るメソッド`sum'を作ã£ãŸ. + + * class.c(include_class_new): ICLASSã®classã‚’ã‚‚ã¨ã®ã‚¯ãƒ©ã‚¹ã«ã—ãŸ. + gcã®éš›ã«å…ƒã‚¯ãƒ©ã‚¹ã‚’マークã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã®ãŒ, フィールドを増やã™ä½™ + 地ãŒç„¡ã„ã®ã§, classフィールドをæµç”¨ã—ãŸ. ç§ã®è¦‹ç©ã‚ŠãŒé–“é•ã£ã¦ã„ + ã¦, ICLASSã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’é€ã‚‹äº‹ãŒã‚ã‚Œã°, ãŠã‹ã—ãªå‹• + 作をã™ã‚‹ã ã‚ã†. + + * eval.c(masign): å¼(a,b = nil)ã®å€¤ã‚’[nil]ã‹ã‚‰nilã«å¤‰æ›´ã—ãŸ. + +Mon Aug 29 11:56:09 1994 Yukihiro Matsumoto (matz@ix-02) + + * class.c: rb_define_mfuncã‚’ç„¡ãã—ã¦, メタクラスã«ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’イン + クルードã™ã‚‹ã‚ˆã†ã«ã—ãŸ. + + * error.c(yyerror): åŒã˜è¡Œã§è¤‡æ•°ã®syntax errorをリãƒãƒ¼ãƒˆã—ãªã„よㆠ+ ã«ã—ãŸ. + + * file.c: FileTestモジュールã«ãƒ•ã‚¡ã‚¤ãƒ«ãƒ†ã‚¹ãƒˆãƒ¡ã‚½ãƒƒãƒ‰ã‚’分離ã—ãŸ. + + * parse.y: 演算åを指定ã™ã‚‹æ™‚ã®lex_stateã‚’æ£ã—ãè¨å®šã—ãŸ. + +Sat Aug 27 01:23:34 1994 Yukihiro Matsumoto (matz@dyna) + + * parse.y: if/whileãªã©ã®è¤‡åˆå¼ã‚’primaryã«ç§»å‹•ã—ãŸ. ã“ã‚Œã«ã‚ˆã£ã¦ä¾‹ + ãˆã°ã€Œif cond then a else b end.message()ã€ã®ã‚ˆã†ãªå¼ãŒæ›¸ã‘るよ + ã†ã«ãªã£ãŸ. + +Fri Aug 26 10:46:30 1994 Yukihiro Matsumoto (matz@ix-02) + + * spec: æ•´ç†ã•ã‚ŒãŸæ–‡æ³•ã«ã—ãŸãŒã£ã¦æ›¸ãç›´ã—ãŸ. + + * parse.y: ã“ã“æ•°æ—¥ã§æ··ä¹±ã—ã¦ã„ãŸæ–‡æ³•ã‚’æ•´ç†ã—ãŸ. 括弧をçœç•¥ã—ãŸãƒ¡ + ソッド呼ã³å‡ºã—ãŒã§ãるよã†ã«ãªã£ãŸã“ã¨, modifierãŒä»˜ã‘られるよㆠ+ ã«ãªã£ãŸã“ã¨, returnã«ãƒªã‚¹ãƒˆãŒæ¸¡ã›ã‚‹ã‚ˆã†ã«ãªã£ãŸã“ã¨ãŒä¸»ãªå¤‰æ›´ç‚¹ + ã§ã‚ã‚‹. + + * process周りãŒæ€ªã—ã„ãŒã¨ã«ã‹ãSolaris 2.3ã§å‹•ãよã†ã«. + + * parse.y: 曖昧性ãŒãªã„å ´åˆã«ã¯ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã®å¼•æ•°ã®æ‹¬å¼§ã‚’çœç•¥ + ã§ãるよã†ã«. çœç•¥ã§ãるメソッド呼ã³å‡ºã—ã®æ¡ä»¶ã¯, 1)ã‹ãªã‚‰ãš1個 + 以上ã®å¼•æ•°ã‚’å¿…è¦ã¨ã™ã‚‹ã“ã¨, 2)第1引数ãŒ`+', `-', `(', `[', `{', + `/'ãªã©, å¼ã®å§‹ã¾ã‚Šã«ç½®ã‹ã‚ŒãŸæ™‚ã¨é€”ä¸ã«ç¾ã‚ŒãŸæ™‚ã¨ã§è§£é‡ˆãŒé•ã†è¨˜ + å·ã§å§‹ã¾ã‚‰ãªã„ã“ã¨, ã§ã‚ã‚‹. + +Thu Aug 25 13:54:58 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(cond): æ¡ä»¶å¼ã®å±•é–‹éƒ¨ã«bugãŒã‚ã£ãŸ. + +Wed Aug 24 00:01:15 1994 Yukihiro Matsumoto (matz@dyna) + + * parse.y: returnã¯ã‚³ãƒ³ãƒžã§åŒºåˆ‡ã£ãŸãƒªã‚¹ãƒˆã‚‚å—ã‘å–るよã†ã«. ã¤ã¾ã‚Š, + return a, b, cã¯return [a, b, c]ã¨åŒã˜æ„味ã«ãªã‚‹. + + * parse.y: yield以外ã®å¤§åŸŸè„±å‡ºåˆ¶å¾¡å¼ã‚’exprã‹ã‚‰expr0ã«ç§»ã—ãŸ. よ㣠+ ã¦ãƒ¡ã‚½ãƒƒãƒ‰ã®å¼•æ•°ã«åˆ¶å¾¡å¼ã‚’使ãˆãªããªã‚‹(ã“ã‚Œã§å›°ã‚‹äººã¯ã„ãªã„ã¯ãš). + + * parse.y: `+'ã®å®šæ•°å±•é–‹ã®éš›ã«æ¼”ç®—åã®å„ªå…ˆé †ä½ã‚’忘れã¦ã„ãŸ. + + * eval.c: untilã®æˆ»ã‚Šå€¤ã¯nilã«ãªã£ãŸ. + + * parse.y: modifierã¨ã—ã¦ã®if/unless/while/untilã‚’è¿½åŠ . + + * parse.y: 文法ã‹ã‚‰endã®å¾Œã‚ã«ã¤ã‘ã‚‹ã‚ーワードを削除. ã»ã¨ã‚“ã©ä½¿ã‚ + ãªã‹ã£ãŸä¸Šã«, emacsã§ã¯ruby-modeãŒã‚ã‚Œã°å¯¾å¿œã®ãƒã‚§ãƒƒã‚¯ãŒæ©Ÿæ¢°çš„ã« + 出æ¥ã‚‹ãŸã‚. + +Tue Aug 23 18:08:33 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: スクリプト実行開始å‰ã«ä¾‹å¤–ãŒç™ºç”Ÿã—ãŸæ™‚ã«core dumpã—ãŸ. + 組ã¿è¾¼ã¿ç”¨ã«ã‚³ãƒ¼ãƒ‰ã‚’変更ã—ãŸæ™‚ã«enbugã—ã¦ã—ã¾ã£ãŸ. + +Tue Aug 23 00:07:17 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c: doã®æˆ»ã‚Šå€¤ãŒã„ã¤ã‚‚nilã«ãªã£ã¦ã„ãŸ. + + * parse.y: loop制御変数ã®å¤šé‡ä»£å…¥åŒ–ã«bugãŒã‚ã£ãŸ. + + * parse.y(expand_op): æ–‡å—列も畳ã¿è¾¼ã¿ã®å¯¾è±¡ã«. + +Mon Aug 22 10:50:01 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(expand_op): `+'ã«é–¢ã—ã¦ã¯çµåˆå‰‡ã‚’使ã£ã¦, より多ã定数畳 + ã¿è¾¼ã¿ã‚’è¡Œãªã†ã‚ˆã†ã«. + + * ruby.c(proc_options): argcãŒ0ã®æ™‚ã«ã‚‚対応. + + * parse.y: forãªã©ã®åˆ¶å¾¡å¤‰æ•°ã«å¤šé‡ä»£å…¥ã‚‚使ãˆã‚‹ã‚ˆã†ã«. + +Sat Aug 20 00:59:40 1994 Yukihiro Matsumoto (matz@dyna) + + * parse.y(call_op): 演算å`~'ã®å–り扱ã„をルール部ã¸ç§»å‹•. + +Fri Aug 19 11:44:13 1994 Yukihiro Matsumoto (matz@ix-02) + + * main.c: rubyã‚’ã»ã‹ã®ãƒ—ãƒã‚°ãƒ©ãƒ ã«çµ„ã¿è¾¼ã‚るよã†ã«main()を分割ã—ãŸ. + ãã‚Œã«ã¨ã‚‚ãªã„, プãƒã‚°ãƒ©ãƒ ã®å‘¼ã³å‡ºã—æ§‹é€ ã‚’ä¿®æ£ã—ãŸ. + + * parse.y: æ¡ä»¶å¼ã®å®šç¾©ã‚’変更. ifãªã©ã®æ¡ä»¶å¼ã®ä¸ã§ã ã‘`&&'ã‚„`||' + ãŠã‚ˆã³`!'ã®å¼•æ•°ãŒæ¡ä»¶å¼ã«ãªã‚‹ã‚ˆã†ã«. ã“ã®å¤‰æ›´ã«ã‚ˆã‚Šæ¡ä»¶å¼ä»¥å¤–ã® + å ´æ‰€ã§ã® `&&', `||', `!'演算åã®å‹•ä½œãŒç›´è¦³ã«ä¸€è‡´ã™ã‚‹. + + * parse.y: 実引数ã®`*'ã®å¾Œã«ç¶šã引数ã¯exprã«åˆ¶é™ã—ãŸ. 今ã¾ã§ã¯å…¨ã¦ + ã®æ–‡ãŒæœ‰åŠ¹ diff --git a/doc/ChangeLog-0.60_to_1.1 b/doc/ChangeLog-0.60_to_1.1 new file mode 100644 index 0000000000..33b0326892 --- /dev/null +++ b/doc/ChangeLog-0.60_to_1.1 @@ -0,0 +1,3955 @@ +Tue Aug 12 16:02:18 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * variable.c: option variables: $-0, $-p(readonly), $-v, + $-I(load_path), $-a(readonly), $-K, $-d, $-F, $-i, $-l. + + * parse.y (yylex): ignore rd (ruby document) in the code. + +Mon Aug 11 12:37:58 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * re.c (Init_Regexp): $-K as alias to the $KCODE. + + * io.c (Init_IO): new virtual variable $-i for the value of -i + option. + + * enum.c (Init_Enumerable): include? as alias of member? + +Fri Aug 8 11:16:50 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * io.c (io_foreach): now the record separator can be specified. + + * io.c (io_s_readlines): new method to read in whole file (or + command output) from path. + + * ext/socket/socket.c (Init_socket): recvfrom did not work. + + * ext/socket/socket.c (sock_send): forgot to check nil for false + value. + +Thu Aug 7 11:40:01 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * variable.c (mod_constants): lists constants defiend in the + modules/classes. + + * variable.c (rb_const_set): no longer warns about constant + overriding by subclasses. + + * eval.c (mod_eval): does eval() on module's context. local + variables are shared with outer scope. + + * object.c (Init_Object): remove private_attr/public_attr. + +Wed Aug 6 14:21:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * object.c (mod_attr): forgot to check nil for false value. + +Mon Aug 4 11:50:28 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * object.c (class_s_new): need not to specify names to create + classes (or modules) dynamically. + + * variable.c (rb_class_path): scan class constants for anonymous + classes/modules to make up pathes. + +Wed Jul 30 08:45:12 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * eval.c (rb_eval): stop to cache const value in nodes. + +Sat Jul 26 03:17:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * numeric.c (flo_to_s): wrong .0 at end. + +Sat Jul 26 00:36:36 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * eval.c (error_print): always print exception type in the + toplevel exception handler. + + * string.c (str_hash): wrong hash value. + +Thu Jul 24 11:05:51 1997 Yukihiro Matsumoto <matz@netlab.co.jp> + + * string.c (uscore_get): proper error message for unset $_. + +Wed Jul 23 09:56:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (obj_methods): returns list of method names of the + specified object. + + * class.c (mod_instance_methods): returns list of method names of + the class instnace. + +Fri Jul 11 22:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (class_superclass): returns class's superclass + itself. (1.1) + + * object.c (obj_type): returns object's class itself. (1.1) + + * class.c (mod_included_modules): list included modules. + + * object.c (class_superclass): raises error for Object. + +Thu Jul 3 09:54:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (SETUP_ARGS): save source position, remove nd_line(). + + * eval.c (rb_call): replace modulo by bit-masking. + + * eval.c (POP_SCOPE): force recycle scope object to reduce gc rate. + + * gc.c (obj_free): aboid calling run_final() when no finalizer is set. + + * eval.c (PUSH_VARS): do not allocate the dynamic scope's end-mark + object. + +Wed Jul 2 14:25:07 1997 KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp> + + * Native mswin32 support. + +Tue Jul 1 09:59:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970701 + + * parse.y (mrhs): allow rest-star(*) in right hand side. + +Tue Jun 24 19:04:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970624 + +Sat Jun 20 22:22:51 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp> + + * eval.c: freebsd 3.0 <sys/select.h> support. + +Fri Jun 20 01:24:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970620 + + * gc.c: eliminate uninitilalized field of Hash, Array etc., to + avoid dumping core. + +Thu Jun 19 01:29:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970619 + + * string.c (str_split_method): wrong limit. + +Sat Jun 14 01:54:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * class.c (rb_singleton_class): no singleton for special + constants (now raises exception). + + * eval.c (ruby_init): cbase in TOPLEVEL_BINDING need to be + initialized. + +Sat Jun 14 01:01:16 1997 maeda shugo <shugo@po.aianet.ne.jp> + + * array.c (sort_2): wrong comparison. + +Sat Jun 14 00:53:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * hash.c (hash_foreach): safe iteration. + +Fri Jun 13 14:04:56 1997 Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp> + + * configure.in: -Bshareable option for netbsd. + +Fri Jun 13 01:16:22 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * io.c (pipe_open): call io_unbuffered() only for writable pipes. + +Thu Jun 12 01:14:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970612 + + * ext/socket/socket.c (sock_new): use io_unbuffered(). + + * ext/marshal/marshal.c (w_long): compact long format, which + supports 64 bit architectures (unless longs are >32 bit size). + + * ext/marshal/marshal.c: allows recursive data for marshaling. + + * parse.y (rb_intern): raise exception for non-internable string. + + * ext/marshal/marshal.c (marshal_load): allows direct loading from + strings. + + * ext/marshal/marshal.c (marshal_dump): allows direct dump to strings. + + * ext/marshal/marshal.c (marshal_dump): interface changed. + +Wed Jun 11 18:26:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * gc.c (rb_newobj): remove needless memset(). + +Mon Jun 9 13:03:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): reduce condition checks from while/until loop. + + * eval.c (rb_eval): wrong jump point for `next'. + +Fri Jun 6 11:47:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.c (ruby_set_argv): initialize dln_argv0 for dln_a_out. + + * ext/socket/socket.c (open_unix): display path name for exceptions. + + * ruby.c (proc_options): option -S did not work well. + +Fri May 30 02:14:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970530 + + * eval.c (eval): set $! properly if exception raised in eval(). + + * io.c (io_write): now handles non T_FILE object. + + * io.c (io_defset): $< can be anything which has `write' method. + +Thu May 29 15:40:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (eval): $@ is always an array (not string). + + * pack.c (pack_unpack): avoid corrupting memory for unexpected + input strings. + +Wed May 28 12:46:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970528 + + * process.c (rb_waitpid): do not block other threads. + +Tue May 27 12:02:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (ruby_init): split initialize and processing command line + options. + + * ruby.c (ruby_options): ruby_init(0, 0, envp) dumps core. + +Tue May 20 18:59:45 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * variable.c (rb_ivar_set): invalid instance variable access for + built-in object raises TypeError. + +Fri May 16 17:32:21 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970516 + + * dir.c (push_globs): was freeing non heap pointer. + + * gc.c: remove some duplicated prototypes. + + * ext/kconv/kconv.c: fix prototypes. + +Fri May 9 11:38:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970509 + + * gc.c (obj_free): avoid free(NULL). + + * eval.c (rb_check_safe_str): argument missing for TypeError(). + +Thu May 8 01:14:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (file_s_dirname): need to return "." for path without + slashes. + +Wed May 7 19:18:48 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * process.c (f_fork): child processe does not inherit parent's + itimer setting on linux. call setitimer() again in the child + process. + +Sat May 3 02:49:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/curses/curses.c: modified for portability and add to the + standard distribution. + +Wed Apr 30 00:34:00 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (file_s_size): returns 0 for empty files (not FALSE). + +Fri Apr 25 02:17:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970425 + + * eval.c (f_load): free unused name-table. + + * eval.c (f_load): copy local variable name-table. + + * gc.c (obj_free): avoid free(NULL). + + * eval.c (rb_eval): forgot to make link from the scope object to + NODE_SCOPE. It may crash the interpreter. + +Thu Apr 24 00:35:09 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * random.c (f_srand): save old seed anyway. srand() returns no + value on some systems. + + * gc.c (obj_free): avoid double free of the local variable name + table. + + * parse.y (top_local_setup): modify realloc to handle offset. + +Tue Apr 22 12:58:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970422 + +Thu Apr 17 00:40:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * configure.in (rb_cv_bsdpgrp): proper check for BSD + setpgrp/setpgrp. + +Wed Apr 16 16:14:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (proc_call): proc called in other thread must be orphan. + +Tue Apr 15 10:46:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970415 + + * gc.c (obj_free): NODE_SCOPE marked from SCOPE object. + + * gc.c (gc_mark): some nodes marked wrong. + + * process.c (proc_getpgrp): wrong argument + +Fri Apr 14 18:32:42 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970414 + +Fri Apr 12 01:20:12 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.h: String pointer changed to unsigned char. + +Fri Apr 11 10:27:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970411 + + * Makefile.in: create libruby.a before linking ruby. + + * string.c (str_strip_bang): >0x80 characters for isspace(). + + * eval.c (proc_call): set safe-level temporally + + * eval.c (proc_s_new): save safe-level in the proc context. + + * eval.c (rb_eval): no class/module extension in safe mode. + +Thu Apr 10 02:10:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * gc.c (gc_mark): remove some pointer checks for speeding up. + + * ruby.c (ruby_options): set $0 temporally for -r option. + + * eval.c: built-in security feature. + + * gc.c (gc_sweep): do not free nodes during compile. + + * parse.y (yycompile): set flag when compiling. + +Wed Apr 9 10:19:02 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.c: forgot to include <ctype.h> for isspace(). + + * file.c: provide S_ISREG for some platforms. + + * io.c (Init_IO): added some $< operations. + + * lib/ping.rb: check host upness using TCP echo. + +Tue Apr 8 00:10:15 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (arg_read): bug with 0 length input. + +Mon Apr 7 11:36:16 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/fcntl/fcntl.c: module for fcntl constants. + + * eval.c (rb_alias): bug when original was an alias. + + * parse.y (primary): syntax to access singleton class. + + * eval.c (mod_public_method): method's to specify visibitily of + the class methods. make_method_{public,private} removed. + +Fri Apr 4 21:43:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970404 + + * gc.c (obj_free): finalizer added for experiment. + +Thu Apr 3 02:12:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_schedule): make Fatal rise on main_thread on + deadlocks. + + * eval.c (thread_join): raise ThreadError instead of Fatal, in + case of deadlock. + + * regex.c (re_compile_fastmap): uninitialized local variable. + + * parse.y (parse_regx): new option //[nes] to specify character + code for regexp literals. Last specified code option is valid. + + * re.c (reg_s_new): additional 3rd argument to specify compiled + regexp's character code. + + * re.c (reg_new_1): regexp character code can be specified for + each regexp object. + +Wed Apr 2 14:51:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_create): handle uncaught throw. + + * eval.c (thread_create): halt on some deadlock conditions. + + * regex.c (is_in_list): wrong result for non-mbc higher-byte + characters. + + * regex.c (re_match): wrong skip for multi-byte characters. + + * regex.c (re_compile_fastmap): wrong fastmap in non-mbc mode. + + * hash.c (Init_Hash): hash compatible features added to ENV. + +Tue Apr 1 15:24:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (obj_extend): remove Object#extend as an iterator which + is in experimental state, since it unveils internal singleton + classes. + +Mon Mar 31 14:29:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970331 + +Sun Mar 30 19:40:57 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * parse.y (terms): avoided win32 gcc's optimization bug. + +Sat Mar 29 11:21:58 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * struct.c (make_struct): St[val,..] creates new structure. + +Fri Mar 28 11:24:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (obj_make_private): new method make_method_{public,private} + to change visibility of singleton methods. + + * regex.c (re_compile_pattern): enables numeric literal >= 0x80 in + the character class. + + * regex.c (re_compile_pattern): enabled numeric literal >= 0x80, + in multibyte mode. + + * regex.c (re_compile_fastmap): modified exantn and charset(_not) + to set fastmap for higher bytes properly. + + * regex.c (is_in_list): now matches numeric literals. + +Thu Mar 27 13:34:20 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * pack.c (pack_unpack): extra null byte after unpacked string. + +Wed Mar 26 15:20:34 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * regex.c (re_compile_pattern): register numbers must be fit in a + byte (0 <= regnum <= 0xff). + + * regex.c (re_compile_fastmap): forgot to set mbchar map for + charset_not if RE_MBCTYPE is on. + + * regex.c (re_compile_pattern): set list bits for multi-byte + characters for \W, \S, \D in range expression. + + * object.c (obj_is_kind_of): defined that nil itself is kind of + nil. TRUE is kind of TRUE, FALSE is kind of FALSE likewise. + This change makes `obj.kind_of?(eval(obj.type))' always true. + +Tue Mar 25 14:08:43 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * lib/English.rb: provides nicer English alias for the variables. + + * parse.y (expr): alias $var1 $var2 makes alias of the global + variable. + +Mon Mar 24 18:23:20 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970324 + +Thu Mar 20 22:04:59 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (mod_modfunc): forget to clear method cache. + +Wed Mar 19 17:06:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (program): set methods' default private/public status + correctly under eval(). + + * eval.c (eval): set the_class correctly while evaluating string. + +Tue Mar 18 12:23:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (eval): yield can be called from eval(). + + * version 1.0-970318 + + * parse.y (program): regexp in condition expression should do + matching operation with $_. + + * re.c (reg_regsub): wrong substitution. + +Fri Mar 14 14:36:28 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * hash.c (hash_invert): returns value to key mapping of the + associative array. + + * ext/socket/extconf.rb: set environment variable SOCKS_SERVER to + compile with libsocks.a. + + * ext/socket/socket.c (socks_s_open): SOCKSsocket class to access + internet via SOCKS library. + + * sprintf.c (f_sprintf): unsigned formats display leading double + dots for imaginary sequence of signed bit to the left. + + * sprintf.c (f_sprintf): correct width and precision formatting + for big integers. + + * parse.y (yylex): enables negative hex/octal numbers and `_' in + non-decimal numbers. + + * sprintf.c (f_sprintf): %u added for unsigned decimal format. + +Thu Mar 13 10:24:27 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sprintf.c (f_sprintf): wrong output for bignums. + + * array.c (ary_reverse_each): iterates in reverse order. + + * pack.c (pack_unpack): L unpacked signed long. + + * io.c (f_backquote): now returns an empty string for no output. + +Wed Mar 12 10:20:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/socks/socks.c: socket module with socks library. + +Mon Mar 10 20:44:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * re.c (reg_regsub): \& for substitution. \`, \', and \+ are + avaiable also. + +Thu Mar 6 01:47:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970306 + + * sample/rubydb.el (gud): ruby debugger emacs interface + + * lib/debug.rb: ruby debugger + + * parse.y (exprs): more accurate line number display. + +Wed Mar 5 21:31:46 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970305 + +Tue Mar 4 12:28:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.c (proc_options): search through RUBYPATH and PATH for + option -S. + +Mon Mar 3 22:44:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_status): returns nil for exception terminated + threads. + + * eval.c (thread_value): re-raise exceptions. + +Sat Mar 1 00:59:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): restore $! value after rescue clause, to + re-raise exceptions correctly. + +Fri Feb 28 16:43:38 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970228 + +Thu Feb 27 11:23:41 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_yield_0): redo raises exception + + * eval.c (thread_schedule): bug in interrupt handling by rescue. + +Wed Feb 26 00:55:36 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (eval): forgot to restore dynamic local variable + bindings. + +Tue Feb 25 11:22:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/aix_ld.rb: AIX dynamic load support (not tested). + + * eval.c (rb_eval): wrong return value for defined? super. + + * error.c (exception): more error check. + + * re.c (reg_regsub): wrong substitution when sub expanded to null + string. + +Fri Feb 21 13:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970221 + + * eval.c (f_require): volatile added. register variable was + recycled, so that GC did not mark that variable. + + * object.c (Init_Object): forget to mark main object (was mostly + ok, but made trouble with early GC.) + +Thu Feb 20 11:50:50 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970220 + +Thu Feb 20 11:25:50 1997 Yasuo OHBA <jammy@shljapan.co.jp> + + * lib/date.rb: update + +Thu Feb 20 08:25:57 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (yylex): forgot tokfix() before rb_intern(). + + * lib/tk.rb (TkVariable): give up using trace_var. + +Wed Feb 19 00:24:35 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970219 + + * pack.c (pack_pack): packed by null for A specifier. must be + space filled. + + * pack.c (pack_unpack): bug in skipping spaces + + * gc.c (xmalloc): garbage collect for every 4 Meg. allocation. + + * string.c (str_split_method): limit worked wrong way. + + * io.c (io_gets_method): misunderstand 0xff in binary files when + $/ == nil. + + * re.c (reg_regsub): re-implement. + + * ext/socket/socket.c (thread_connect): remove O_NONBLOCK, which + is not defined on some platform like NeXT. + +Mon Feb 17 13:08:30 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970217 + + * object.c (mod_eqq): === extended for subclass check (to use case + as typecase). + +Sat Feb 15 02:07:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * regex.c (re_compile_pattern): wrong match backref at end of pattern. + + * io.c (arg_read): now works beyond end of file. + +Thu Feb 13 16:21:24 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (expr): return/yield now accept normal argument format. + + * parse.y (yylex): a star in `yield *x' must not be multiplication + operator. + +Wed Feb 12 15:06:44 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * time.c (time_plus): bug in simple addition. + + * eval.c (thread_raise): raise exceptions from outside. + + * eval.c (Init_Thread): Thread#alive? -- alias for Thread#status. + +Mon Feb 10 00:38:55 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.h (Data_Make_Struct): rename macros. + +Sun Feb 8 11:48:13 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (f_syscall): argument offset was wrong. + +Fri Feb 7 18:01:17 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970207 + + * eval.c: add volatiles to avoid variable crobbering by longjmp(). + + * eval.c (f_raise): 1st argument can be the GlobalExit object now. + + * array.c (ary_unshift): no longer accept more than 2 args. + + * eval.c (f_raise): bug if 2nd argument is the exception. + +Tue Feb 4 00:37:29 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970204 + + * eval.c (eval): check compile errors by nerrs. + + * eval.c (rb_eval): check syntax error by nerrs, not by the return + value, which may be NULL. + + * eval.c (compile): Do not clear errinfo. + +Mon Feb 3 10:13:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (obj_extend): move real inclusion to Module#extend_object + to allow redfinition. + + * object.c (Init_Object): Kernel class is now Module. Object class + became the true root class. + + * object.c (obj_inspect): remove useless buffer. + + * hash.c (any_cmp): disable interrupts and context switching. + + * st.c: remove ALLOW_INTS to disable interrupt during operations. + +Fri Jan 31 22:10:08 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * hash.c (hash_rehash): re-register all key-value. + +Thu Jan 30 02:14:49 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (io_reopen): re-implement according to clone() way. + + * io.c (io_clone): copy IO object. + + * struct.c (struct_eql): compare elements by eql?. + + * io.c (io_mode_flags): detect "rb", "wb" etc. + + * io.h (FMODE_BINMODE): added. + + * ext/socket/socket.c (Init_socket): undef BasicSocket.new + + * file.c (Init_File): File.new(path[,mode]) + + * io.c (Init_IO): IO.new(fd[,mode]) + + * eval.c (rb_method_boundp): forgot to enable priv argument. + + * object.c (Init_Object): remove `=~' from Kernel class. + + * ext/socket/socket.c (open_inet): initialize sockaddr before + calling bind(2). + + * sample/ruby-mode.el (ruby-calculate-indent): skip comment lines + +Wed Jan 29 18:43:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (Init_Thread): DEFER_INTS during initializing threads. + + * hash.c (Init_Hash): Hash#eql? checks for object identity. + + * eval.c (thread_set_critical): wrong value assigned. + +Mon Jan 27 16:10:51 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (io_print): remove print_on(). + + * eval.c (f_missing): proper error message for undefined method + without argument + +Sat Jan 25 23:32:32 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_sub_s): false alert - sub() does not modify string. + + * array.c (ary_times): negative multiplication detected + + * string.c (str_times): negative multiplication detected + +Fri Jan 24 10:51:39 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * time.c (time_arg): month -> 0 == "jan" == "1" == "01", little bit + confusing but wanted to conform japanese style. + + * version 1.0-970124 + +Fri Jan 24 09:52:49 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * util.c (_fixpath): supports SJIS filenames on DJGPP. + +Thu Jan 23 16:52:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * README.EXT: update. partially translated into English. + + * ext/extmk.rb.in: inherit $LDFLAGS to the final link. + + * ext/socket/socket.c (Init_socket): add various constants. + +Mon Jan 23 11:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * eval.c (Init_Thread): allocate main_thread first to avoid crash. + +Thu Jan 23 02:09:26 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * gc.c (ObjectSpace): API modified. each_object method will do all + the iteration. + + * eval.c (proc_call): wrong return from nested lambda. + + * ext/GD/GD.c: debugged. + +Wed Jan 22 16:12:25 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970122 + + * gc.c (gc_mark): forgot to mark match->str. + + * ext/GD/GD.c: GD interface module. + + * eval.c (PUSH_BLOCK): wrong value pushed as the block level. + +Mon Jan 20 14:01:31 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_run): no context switch in the critical section. + +Mon Jan 20 09:40:59 1997 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * utils.c: supports 8+3 filenames + +Sat Jan 18 01:23:03 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970118 + + * regex.c (PATFETCH): need cast to unsigned char. + + * io.c (io_ctl): bug in case when arg is not a string. + + * lib/tk.rb: forgot that Kernel#type returns the class name now. + + * regex.c (re_search): "abc\n" =~ "^$" should not match. + +Fri Jan 17 12:31:37 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970117 + + * ruby.c (ruby_options): constant PLATFORM, which is in the {cpu}-{os} + form, defined. + + * configure.in: platform information embedded in the interpreter. + + * regex.c (re_search): /^$/ did not match to "" by wrong exit condition. + + * lib/thread.rb: re-write Mutex/Queue based on Thread.critical. + + * eval.c (thread_set_critical): remove Thread.exclusive, add + Thread.critical = TRUE/FALSE instead. + + * re.c (reg_search): re-compile pattern if needed + + * regex.c (PATFETCH): do translate at compile time + +Thu Jan 16 00:49:10 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * gc.c (gc_mark_frame): forgot to mark frame->cbase. + + * regex.c (re_compile_pattern): /a$|b)/ causes error. + + * regex.c (re_compile_pattern): /(^|b)/ causes error. + + * version 1.0-970116 + + * re.c (Init_Regexp): set RE_CONTEXTUAL_INVALID_OPS flag. + +Tue Jan 14 02:09:06 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (proc_call): Proc#callをイテレータã¨ã—ã¦å‘¼ã‚“ã 時ã«å¯¾å¿œ + + * configure.in: nextstep対応？ + + * eval.c (rb_eval): a[b]=cã§ç„¡é§„ãªé…列を割り当ã¦ãªã„ + + * eval.c (f_send): イテレータã¨ã—ã¦å‘¼ã°ã‚ŒãŸã‚‰ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã¨ã—ã¦ãƒ¡ã‚½ãƒƒ + ドを呼ã¶ï¼Ž + + * string.c (str_new4): match共有用ã®ç”Ÿæˆé–¢æ•° + + * re.c (reg_search): matchã®å®Ÿä½“(æ–‡å—列)をマッãƒã‚’è¡Œã£ãŸæ–‡å—列㨠+ copy-on-writeã§å…±æœ‰ + + * string.c (str_hash): toupperã‚’ã‹ã‘ã‚‹æ¡ä»¶ãŒé•ã£ã¦ã„㟠+ + * array.c (sort_2): Fixnumã¨Stringを特別扱ã„ã—ã¦é«˜é€ŸåŒ– + +Mon Jan 13 11:03:53 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_create): threadãŒç”Ÿæˆã•ã‚Œã‚‹ã¾ã§å‰²è¾¼ã¿ã‚’è¨å®šã—ãªã„ + + * eval.c (Init_Thread): 割込ã¿ã‚¿ã‚¤ãƒŸãƒ³ã‚°ã‚’100msecã« + +Sat Jan 11 00:17:05 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * regex.c (re_search): マッãƒã«å¤±æ•—ã™ã‚‹å ´åˆãŒã‚ã£ãŸ(本当ã«ç›´ã£ãŸã‹ï¼Ÿ) + + * io.c (io_ioctl,io_fcntl): 第2引数をçœç•¥å¯èƒ½ã« + + * io.c (io_ioctl,io_fcntl): 戻り値ãŒIOã ã£ãŸï¼Žæ•´æ•°(システムコール + ã®æˆ»ã‚Šå€¤)ã‚’è¿”ã™ã‚ˆã†ã«ã—ãŸï¼Ž + + * io.c (io_ctl): 引数ãŒæ•´æ•°ã®æ™‚ã«å¯¾å¿œ + + * io.c (io_fcntl): file.cã‹ã‚‰ç§»å‹• + +Fri Jan 10 17:01:47 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-970110 + + * ext/socket/socket.c (thread_connect): open(connect(2))ã§ä»–ã® + threadをブãƒãƒƒã‚¯ã—ãªã„よã†ã« + + * eval.c (thread_create): exitã§ãªã„ã¨ãã«exitã ã¨æ€ã„込む + +Mon Jan 6 17:42:22 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_sub_s): æ–‡å—列長より長ã„offsetã®æ¤œå‡º + + * regex.c (re_search): 空ã«ãƒžãƒƒãƒã™ã‚‹ãƒ‘ターン後ã®$ã§å¤±æ•— + +Thu Jan 2 16:36:23 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (file_reopen): Fileã®reopen(pathã¾ãŸã¯IOã§æŒ‡å®š)． + + * io.c (io_reopen): IOã®reopen(IOã§æŒ‡å®š) -- change classã¤ã + +Wed Jan 1 11:09:01 1997 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (f_select): timeoutã§nilを返㙠+ +Fri Dec 27 13:06:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (file_s_open): サブクラスã§ã¯ãã®ã‚¯ãƒ©ã‚¹ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’è¿” + ã™ã‚ˆã†ã«ï¼Ž + +Fri Dec 27 08:58:27 1996 <ono@isl.nara.sharp.co.jp> + + * numeric.c (flo_to_s): index()を使ã‚ãªã„．strstr()ã«ï¼Ž + +Thu Dec 26 01:34:17 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * lib/tk.rb: placeãŒä½¿ãˆã‚‹ã‚ˆã†ã« + + * pack.c (endian): マクãƒDYNAMIC_ENDIANを指定ã™ã‚‹ã¨å®Ÿè¡Œæ™‚ã«endian + を判定ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * eval.c (thread_alloc): åˆæœŸåŒ–忘れã®ãƒ¡ãƒ³ãƒãŒã‚ã£ãŸï¼Ž + +Wed Dec 25 00:33:19 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 1.0-961225 + + * io.c (Init_IO): newを無効化 + + * lib/tkthcore.rb: tk_call "global $foo; set foo 5"ãªã©ã‚‚ã§ãるよã†ã« + + * eval.c (thread_restore_context): $~, $_ã§ã‚¹ã‚¿ãƒƒã‚¯ã‚’壊ã—ã¦ã„㟠+ + * process.c (rb_waitpid): threadã«ä¸€å¿œå¯¾å¿œ + +Tue Dec 24 15:20:58 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.4-961224 + + * configure.in: charãŒunsignedã‹ã©ã†ã‹ã‚‚ãƒã‚§ãƒƒã‚¯ + + * regex.c (SIGN_EXTEND_CHAR): __CHAR_UNSIGNED__ã«ã‚‚対応 + + * pack.c (pack_unpack): 明示的ã«signed charを指定． + +Mon Dec 23 14:41:23 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.c (load_file): 標準入力ã‹ã‚‰ã®ã‚¹ã‚¯ãƒªãƒ—トã§ä¸€æ™‚ファイルを使゠+ ãªã„よã†ã« + + * object.c (f_integer): `0x', `0'ãªã©ã§baseを解釈ã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Fri Dec 20 01:44:39 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * Makefile.in (flock.o): flockã«å¯¾å¿œ + +Thu Dec 19 20:13:32 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.4-961219 + +Wed Dec 18 00:06:48 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * glob.c (glob_filename): strrchrãŒãƒžã‚¯ãƒã®å ´åˆã«å¯¾å¿œ + + * configure.in: <sys/select.h>ã‚’ãƒã‚§ãƒƒã‚¯ + + * ext/kconv/kconv.c: 1.62ベース㫠+ + * ext/kconv/kconv.c: Kconvモジュール + + * string.c (str_substr): lenãŒå…ƒã®æ–‡å—列より長ã„時ã«å¯¾å¿œ + + * parse.y (iterator): 「$bar do .. endã€ãªã©ã¯è¨±ã•ãªã„よã†ã« + + * parse.y (iterator): FID(foo!,foo?)ã‚’doå½¢å¼ã®ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã«ã§ãる． + + * missing/flock.c (flock): lockf()を使ã£ã¦ä»£æ›¿ + + * file.c (file_flock): flockを実装 + +Tue Dec 17 12:13:38 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.4-961217 + +Fri Dec 13 02:05:03 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * configure.in: RUBYLIBã®ã‚«ãƒ¬ãƒ³ãƒˆã‚’後回ã—(@mix/awk offline) + + * dln.c: AIXã«å¯¾å¿œã—ãŸï¼Ÿ(@mix/awk offline) + + * eval.c (thread_schedule): critical sectionã§ã‚‚明示的ãªã‚³ãƒ³ãƒ†ã‚ス + トスイッãƒã¯èµ·ããªã„ã¨ã¾ãšã„ + + * re.c (reg_search): matchã«å¤±æ•—ã—ãŸæ™‚ã«$~ã‚’nilã«ï¼Ž + + * re.c (reg_search): 毎回matchを生æˆã™ã‚‹ã‚ˆã†ã« + +Thu Dec 12 17:03:30 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * numeric.c (flo_to_s): 2.0.to_s -> 2.0ã« + + * eval.c (thread_save_context): $_, $~ã‚’thread毎ã«ä¿å˜ + + * eval.c (thread_kill): main threadã§ã¯exit(0) + + * string.c (str_split_method): é–“é•ã£ãŸçµæžœã‚’è¿”ã—ã¦ã„㟠+ +Thu Dec 12 15:32:48 1996 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * dir.c: CYGWIN32対応 + + * ext/socket/socket.c: CYGWIN32対応 + + * io.c: CYGWIN32対応 + +Thu Dec 12 14:43:51 1996 Jun Kuroda <j_kuro@pluto.ai.kutech.ac.jp> + + * lib/tk.rb: wish4.2も探索候補ã«å«ã‚ã‚‹ + + * config.guess: JCC対応 + +Thu Dec 12 00:41:17 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.4-961212 + + * parse.y (parse_string): """..."""ã¯ã‚„ã¯ã‚Šç„¡ãã™ã“ã¨ã«ã—㟠+ + * parse.y (parse_regx): %r|...|ã§terminatorã‚’ \ ã§ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—ã§ãã‚‹ + よã†ã« + + * signal.c (posix_signal): sigactionを使ã†signal + + * configure.in: posix signal/bsd signalã®æ¤œå‡º + +Wed Dec 11 17:47:35 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_schedule): critical sectionã§ã¯ã‚³ãƒ³ãƒ†ã‚ストスイッ + ãƒãŒèµ·ããªã„よã†ã« + + * lib/thread.rb: SharedMutexクラス + + * lib/jcode.rb: String#scanを使ã†ã‚ˆã†ã« + +Tue Dec 10 12:21:28 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961210 + + * string.c (str_split_method): æ£è¦è¡¨ç¾ã«()ã‚’å«ã‚€æ™‚ã«ãƒã‚° + + * lib/jcode.rb: ã¡ã‚‡ã£ã¨ã¾ã—ã«ãªã£ãŸ + + * string.c (tr_setup_table): ç½®æ›æ–‡å—ãŒçŸã™ãŽã‚‹(2æ–‡å—)ã®ã¨ãã®ãƒã‚° + +Mon Dec 9 11:38:04 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_scan): æ–‡å—列ã®ãƒžãƒƒãƒã‚’è¡Œã†ï¼Žã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã¨ã—ã¦ã‚‚å‹• + 作ã™ã‚‹ + + * regex.c (re_copy_registers): allocatedãŒåˆæœŸåŒ–ã•ã‚Œã¦ã„ãªã‹ã£ãŸ + + * re.c (match_to_s): $~ã®æ–‡å—列化 + + * re.c (match_to_a): $~ã‚’é…列化ã§ãるよã†ã« + + * re.c (match_getter): レジスタãŒåˆæœŸåŒ–ã•ã‚Œã¦ã„ãªã‹ã£ãŸ + +Thu Dec 5 11:06:10 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_split_method): マッãƒã—ãªã‹ã£ãŸæ‹¬å¼§ã¯ç©ºæ–‡å—列を + pushã™ã‚‹ã¹ãã§ã¯ãªã„ + + * string.c (str_succ): アルファベットをå«ã¾ãªã„æ–‡å—ã«å¯¾å¿œ + +Wed Dec 4 10:48:09 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961204 + + * io.c (io_binmode): DJGPPã§ã®binmode対応 + + * sprintf.c (f_sprintf): intã®ç¯„囲ã®æ•°å€¤ã¯ç›´æŽ¥sprintfã§å¤‰æ›ã™ã‚‹ + + * sprintf.c (f_sprintf): "%02s"ã«é ¼ã‚‰ãªã„ + + * re.c (reg_search): indexã§SEGV + +Tue Dec 3 10:09:36 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961203 + + * ext/extmk.rb.in (install): INSTALL_DATAã‹ã‚‰INSTALLã«å¤‰æ›´ + + * dln.c: hpux対応 + + * string.c (str_aset_method): è² ã®å€¤ã‚’å«ã‚€ç¯„囲ã§ã‚‚例外を起ã“ã•ãªã„ + + * array.c (ary_replace): è² ã®å€¤ã‚’å«ã‚€ç¯„囲ã§ã‚‚例外を起ã“ã•ãªã„ + + * array.c (beg_len): beg==endã®æ™‚，長ã•0ã« + +Mon Dec 2 14:07:12 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * configure.in: HP shl対応 + + * string.c (str_upto): beg > endã®æ™‚ç„¡é™ãƒ«ãƒ¼ãƒ—ã«è½ã¡ã‚‹ã®ã‚’æ¢ã‚㟠+ + * range.c (range_each): String#uptoãŒå†å®šç¾©ã•ã‚ŒãŸå ´åˆã«å¯¾å¿œ + + * string.c (str_split_method): "ABC".split(/(B)/)ãŒèª¤å‹•ä½œ + +Sat Nov 30 01:43:52 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): undefã§SEGV + +Fri Nov 29 12:17:59 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-parse-region): %Q#..#ãªã©ã«å¯¾å¿œï¼Žã—ã‹ + ã—，区切り文å—ãŒæ¼”ç®—åã§è¡Œæœ«ã«ã‚ã‚‹å ´åˆã«ã¯å¯¾å¿œã§ããªã‹ã£ãŸï¼Ž + + * re.c (reg_raise): 例外ã§ã‚‚スラッシュをエスケープ + + * re.c (reg_inspect): スラッシュをエスケープ + + * parse.y (parse_string): `%[QqXxRr](.)..\1'ãªã‚‹æ–‡å—列形å¼(テスト + 採用) + + * parse.y (parse_qstring): '''...'''ã®å½¢å¼ + + * ext/dbm/dbm.c (Init_dbm): 述語key?,value?ã®è¿½åŠ + + * ext/dbm/dbm.c (Init_dbm): includes->include? + + * hash.c (Init_Hash): 述語key?,value?,include?ã®è¿½åŠ + + * eval.c (rb_eval): unlessã§else節ãŒå®Ÿè¡Œã•ã‚Œãªã„(ã†ãƒ¼ã‚“) + + * string.c (str_sub_iter_s): イテレータブãƒãƒƒã‚¯å†…ã§ãƒžãƒƒãƒãŒè¡Œã‚ã‚Œ + ã‚‹ã¨ä½ç½®ãŒãšã‚Œã‚‹(時ã«ç„¡é™ãƒ«ãƒ¼ãƒ—ã«è½ã¡ã‚‹) + + * string.c (str_resize): lenãŒ0ã®æ™‚sizeã®èª¿æ•´ãŒè¡Œã‚ã‚Œãªã‹ã£ãŸ + +Thu Nov 28 00:59:54 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961128 + + * parse.y (parse_string): 3-quote styleã®æ–‡å—列(例:"""abc"d"e""") + + * configure.in (EXTSTATIC): extã‚’é™çš„ã«ãƒªãƒ³ã‚¯ã™ã‚‹æ™‚ã«ã¯rubyã¯dllã‚’ + 使ã†ã‚ˆã†ã« + + * io.c (Init_IO): getsã®å¼•æ•°ãŒé–“é•ã£ã¦ã„㟠+ + * string.c (str_each_line): RSを明示的ã«æŒ‡å®šã§ãるよã†ã« + +Wed Nov 27 12:37:46 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961127 + + * eval.c (rb_eval): iver defined? ã§selfを指定ã™ã‚‹ã®ã‚’忘れ㟠+ + * io.c: getsç‰ã§RSを明示的ã«æŒ‡å®šã§ãるよã†ã« + + * ext/extmk.rb.in (install): static linkã«å¤±æ•— + +Tue Nov 26 10:33:04 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961126 + + * string.c (str_sub_s): ç½®æ›å¾Œã®æ–‡å—列長ã•ãŒé–“é•ã£ã¦ã„㟠+ +Mon Nov 25 09:11:22 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * numeric.c (fix_rshift): 32以上ã®å³ã‚·ãƒ•ãƒˆã§0ã‚’è¿”ã™ã‚ˆã†ã«(Cã® + rshiftã¯(x>>(y%32))ã‚’è¿”ã—ã¦ã„ãŸ)． + + * string.c (str_gsub): ç½®æ›ãŒè¡Œã‚ã‚Œãªã„å ´åˆãŒã‚ã£ãŸ + + * string.c (str_resize): 本当ã«å¿…è¦ãªæ™‚ã ã‘realloc + +Thu Nov 21 04:13:21 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * configure.in (EXTSTATIC): --with-static-linked-extã§å…¨ã¦ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ + ルをé™çš„リンクã™ã‚‹ã‚ˆã†ã« + + * pack.c (pack_unpack): 行末ã®æ”¹è¡ŒãŒãªã„時ã«ã‚‚ãƒã‚§ãƒƒã‚¯ã‚µãƒ をスã‚ッ + プã™ã‚‹ã‚ˆã†ã« + +Wed Nov 20 21:42:51 1996 Yasuo OHBA <jammy@shljapan.co.jp> + + * configure.in: freebsd対応 + +Wed Nov 20 10:24:24 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/extmk.rb.in (install): 通常リンク用ã®LDFLAGSã¨ãƒ€ã‚¤ãƒŠãƒŸãƒƒã‚¯ãƒª + ンク用ã®DLDFALGSを分離 + + * ext/extmk.rb.in (install): コンパイルã®æˆåŠŸã—ãŸã‚‚ã®ã‚’é™çš„リンク + ã®ãƒªã‚¹ãƒˆã«è¿½åŠ ã™ã‚‹ + + * eval.c (f_missing): オブジェクトã®æ–‡å—列表ç¾ãŒé•·ã™ãŽã‚‹æ™‚ãƒãƒƒãƒ•ã‚¡ + を書ãæ½°ã—ã¦ã„㟠+ + * process.c (proc_exec_v): forkã—ãŸå¾Œä¾‹å¤–を発生ã•ã›ã¦ã¯ã„ã‘ãªã„ + +Tue Nov 19 13:28:15 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961119 + + * eval.c (mod_method_defined): Module#method_defined? ã®è¿½åŠ + + * parse.y (call_args): 引数ãŒå”¯ä¸€ã®ã‚³ãƒžãƒ³ãƒ‰ã‚³ãƒ¼ãƒ«ã§ã‚る時ã®ãƒã‚°(戻 + り値ãŒå±•é–‹ã•ã‚Œã¦ã—ã¾ã†) + +Mon Nov 18 13:28:18 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_sub): 失敗ã—ãŸæ™‚ã«nilã‚’è¿”ã—ã¦ã„㟠+ + * string.c (str_split_method): 検索開始ä½ç½®ãŒç§»å‹•ã—ã¦ãªã‹ã£ãŸ + + * ext/socket/socket.c (sock_s_getservbyaname): ã¾ã é–“é•ã£ã¦ã„㟠+ + * version 0.99.3-961118 + + * string.c (str_sub_s): å…ƒã®æ–‡å—列を置æ›ã™ã‚‹ã®ã‚’æ¢ã‚㟠+ + * pack.c (encodes): é ˜åŸŸå¤–ã‚’ã‚¢ã‚¯ã‚»ã‚¹ã—ã¦ã„㟠+ +Fri Nov 15 17:10:35 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * bignum.c (big_divmod): BignumãŒå¼•æ•°ã®å ´åˆã®å¯¾å¿œå¿˜ã‚Œ + + * sample/ruby-mode.el (ruby-expr-beg): word?å½¢å¼ã¸ã®å¯¾å¿œãŒä¸å®Œå…¨ + +Wed Nov 13 15:42:40 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_tr_s_bang): tr_sã§trãŒè¡Œã‚ã‚Œã¦ã„ãªã‹ã£ãŸ + + * eval.c (rb_eval): autoloadクラスã®ãƒã‚§ãƒƒã‚¯ + + * string.c (f_sub): subãŒsub!ã¨åŒã˜å‹•ä½œã«ãªã£ã¦ã„㟠+ + * eval.c (thread_sleep): stopã¨sleepã®åˆ†é›¢ + +Mon Nov 11 13:53:19 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961111 + + * numeric.c (fix_step): to, stepãŒæ•´æ•°ä»¥å¤–ã®å ´åˆã«å¯¾å¿œ + + * eval.c (rb_call): dynamic varãŒdynamic scopingã«ãªã£ã¦ã„ãŸ(ã“ã‚Œ + ã¯ã¾ãšã„) + + * string.c (str_chop_bang): é•·ã•0ã®æ–‡å—列ã®chopã§ï¼Œé ˜åŸŸå¤–ã®ã‚¢ã‚¯ã‚» + スãŒç™ºç”Ÿã—ã¦ã„ãŸï¼Ž + + * parse.y (yyerror): 割り当ã¦ãŸé ˜åŸŸå¤–をアクセスã—ã¦ã„㟠+ +Fri Nov 8 11:54:46 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_yield): scopeã‚’heapã«ã‚³ãƒ”ー + +Thu Nov 7 09:56:53 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * numeric.c (num_coerce): ã¨ã‚Šã‚ãˆãšä¸¡è¾ºã‚’Floatã«å¤‰æ›ã™ã‚‹ã“ã¨ã« + +Wed Nov 6 10:45:13 1996 Yasuo OHBA <jammy@shljapan.co.jp> + + * lib/parsearg.rb: 第2引数を変更． + +Tue Nov 5 14:21:09 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961105 + +Sat Nov 2 01:11:40 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * bignum.c (big_pow): typo (dy -> dx) + + * bignum.c (big_divmod): 知らãªã„åž‹ã¯floatã«å¤‰æ›ã—ã¦ã¿ã‚‹ + + * numeric.c (fix_lshift): 境界æ¡ä»¶ã®ãƒã‚°(è² ã«ãªã£ã¦ã„ãŸ) + + * bignum.c (big_pow): 無駄ãªfloatã¸ã®å¤‰æ›ã‚’ãªãã—㟠+ + * math.c (math_atan2): typo(x -> y) + +Fri Nov 1 15:30:59 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/socket/socket.c (sock_gethostname): gethostnameãŒãªã„時ã«ã¯ + unameを使ã£ã¦ãƒ›ã‚¹ãƒˆåã‚’å¾—ã‚‹ + + * ext/etc/etc.c (etc_getlogin): getloginãŒNULLã‚’è¿”ã—ã¦ã‚‚環境変数を + 調ã¹ã‚‹ã‚ˆã†ã« + + * object.c (krn_clone): オブジェクトã®ãƒ•ãƒ©ã‚°ã‚‚コピー + + * hash.c (rb_cmp): ãƒãƒƒã‚·ãƒ¥ã®æ¯”較を`=='ã§ãªã`eql?'ã«å¤‰æ›´ + + * math.c (Need_Float): Float()を使ã£ã¦å¤‰æ›ã™ã‚‹ + + * compar.c (cmp_gt): 以å‰ã®å³è¾ºã‚’è¿”ã™ä»•æ§˜ã®å残ãŒæ®‹ã£ã¦ã„㟠+ +Thu Oct 31 12:55:51 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961031 + + * numeric.c (Init_Numeric): typo + + * eval.c (error_print): é•·ã™ãŽã‚‹trace backを途ä¸çœç•¥ã™ã‚‹ + + * regex.c (re_compile_pattern): 全角ã®rangeã«å¯¾å¿œ + +Wed Oct 30 03:03:18 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.3-961030 + + * io.c (f_ungetc): é–¢æ•°ã‚’è¿½åŠ + + * eval.c (dyna_var_asgn): return値忘れ + +Tue Oct 29 10:05:28 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (f_split): 関数splitã‚’è¿½åŠ + + * eval.c (rb_call): ãƒã‚¹ãƒˆã—ãŸå¤–å´ã®ã‚¯ãƒ©ã‚¹/モジュールã®å®šæ•°ã‚’å‚ç…§ + ã§ãるよã†ã« + +Mon Oct 28 09:51:03 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_sub): offsetãŒæ–‡å—ã®æœ«å°¾ã«ã‚る時ã®ãƒã‚§ãƒƒã‚¯ + + * regex.c (re_match): 割り当ã¦ã‚‹ãƒ¬ã‚¸ã‚¹ã‚¿ã®æ•°ãŒ1多ã‹ã£ãŸ + + * io.c (io_gets): $/ = ""ã®å‹•ä½œã‚’perlã«åˆã‚ã›ã‚‹(awkã¨ã¯ã¡ã‚‡ã£ã¨é• + ã†ã‚‰ã—ã„) + + * io.c (io_gets): $/ = nilã®æ™‚å°‘ã—高速化 + + * string.c (str_split_method): 括弧ãŒnullã«ãƒžãƒƒãƒã—ãŸæ™‚ã«ã‚‚無視㗠+ ãªã„よã†ã« + + * string.c (str_split_method): 括弧ã«ãƒžãƒƒãƒã—ãŸåˆ†ã¯limitã®æ•°ã«å«ã‚ + ãªã„よã†ã«ï¼Ž + + * numeric.c (num_coerce_bin): coerceã®å®šç¾©ã‚’変更，2è¦ç´ ã®é…列 + [x,y]ã‚’è¿”ã™ã‚ˆã†ã« + + * sample/ruby-mode.el (ruby-calculate-indent): "do |aa|"ã®å¯¾å¿œã‚’改 + å–„ã—ãŸï¼Ž + +Sat Oct 26 01:43:51 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/marshal/marshal.c (w_object): ビルトインクラスã®ã‚µãƒ–クラスを + æ£ã—ã復旧ã§ãるよã†ã« + + * ext/marshal/marshal.c (w_object): ユーザ定義dumpã®å„ªå…ˆ + + * numeric.c (flo_coerce): Float()を使ã£ã¦å®šç¾© + + * numeric.c (Init_Numeric): Numericã®newã®undefã¯ã¾ãšã„ + + * ext/marshal/marshal.c (w_symbol): シンボルã®å†…容(æ–‡å—列)ã¯ä¸€åº¦ã— + ã‹ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ã出ã•ãªã„． + + * sample/ruby-mode.el (ruby-parse-region): if/while修飾åã«å¯¾å¿œã— + ãªããªã£ã¦ã„㟠+ + * bignum.c (Init_Bignum): Bignum.newを除ã + + * eval.c (rb_eval): 引数評価後ã«ãƒ•ã‚¡ã‚¤ãƒ«åã¨è¡Œç•ªå·ã‚’å†è¨å®š + + * numeric.c (flo_div): typo + + * sample/ruby-mode.el (ruby-parse-region): def /, def `ã«å¯¾å¿œ + +Fri Oct 25 09:26:29 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-calculate-indent): "do |aa|"ã«å¯¾å¿œ + + * array.c (ary_aset): indexãŒfixnumã®å ´åˆã¡ã‚‡ã£ã¨é«˜é€ŸåŒ– + + * eval.c (thread_fd_writable): 書ãè¾¼ã¿å‰ã®selectãƒã‚§ãƒƒã‚¯ + + * array.c (ary_assoc): ç„¡é™ãƒ«ãƒ¼ãƒ—ã«è½ã¡ãŸ + + * eval.c (thread_wait_for): selectãŒã‚¨ãƒ©ãƒ¼çµ‚了ã—ãŸæ™‚，linux以外㧠+ ã®å‹•ä½œãŒæ£ã—ããªã‹ã£ãŸï¼Ž + +Thu Oct 24 08:26:48 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (backtrace): `$@'ã‚’æ–‡å—列ã‹ã‚‰é…列ã«å¤‰æ›´ã—ãŸï¼Ž + + * eval.c (eval): evalä¸ã®ä¾‹å¤–発生ä½ç½®ã‚’ä¿å˜ã™ã‚‹ + + * bignum.c (bigsub): オペランドã®å¤§å°æ¯”較ã®å¤±æ•— + + * re.c (reg_search): 直接å‚ç…§ãŒãªã„時ã«ã‚‚`$~'ãŒã‚»ãƒƒãƒˆã•ã‚Œã‚‹ã‚ˆã†ã« + +Wed Oct 23 10:40:10 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-961023 + + * ext/marshal/marshal.c (r_bytes): mallocã‚’ã‚„ã‚，allocaを使ㆠ+ + * sample/ruby-mode.el (ruby-calculate-indent): 括弧ã®å¯¾å¿œã‚’変更． + ()内ã§ã¯ã‚¤ãƒ³ãƒ‡ãƒ³ãƒˆã‚’レベルをåˆã‚ã›ã‚‹ã‚ˆã†ã« + +Tue Oct 22 12:59:11 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * hash.c (hash_s_new): sizeを指定ã§ãるよã†ã« + + * ext/marshal/marshal.c (w_object): dumpã™ã‚‹æ·±ã•åˆ¶é™ã‚’指定ã§ãるよ + ã†ã« + + * array.c (ary_s_new): sizeを指定ã—ãŸæ™‚ã®åˆæœŸåŒ–忘れ + + * object.c (f_float): big2dblã®å®£è¨€å¿˜ã‚Œï¼Ž + + * bignum.c (bigsub): 大ãã•ã®è¿‘ã„BignumåŒå£«ã®æ¼”ç®—ã§çµæžœãŒè² ã«ãªã‚‹ + å ´åˆã«é–“é•ã„ãŒã‚ã£ãŸï¼Ž + + * array.c (ary_aset): ç½®æ›å…ˆã¨ç½®æ›å…ƒãŒåŒã˜é•·ã•ã®æ™‚内容を + shift(memmove)ã—ãªã„よã†ã«ï¼Ž + + * ext/marshal/marshal.c (marshal_dump): ファイルフォーマットã«ãƒãƒ¼ + ジョンを埋ã‚込むよã†ã« + + * ext/marshal/marshal.c (tmpnam): linux-aout-dln用ã«å®šç¾© + +Mon Oct 21 08:40:20 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/socket/socket.c (sock_s_gethostbyname): hostentæ§‹é€ ä½“ã®æƒ…å ± + を返㙠+ (sock_s_gethostbyaddr): IPアドレスã‹ã‚‰hostentæ§‹é€ ä½“ã‚’å¾—ã‚‹ + (sock_s_getservbyaname): getservbyname(3) + +Fri Oct 18 10:37:36 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-indent-to): 移動先カラムãŒè² ã«ãªã‚‹ãƒã‚° + + * eval.c (compile): evalã§å…ƒã‚½ãƒ¼ã‚¹ã®è¡Œç•ªå·ã§ã‚¨ãƒ©ãƒ¼ã‚’表示ã™ã‚‹ + +Thu Oct 17 09:52:28 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (eval): evalã§æ–‡æ³•ã‚¨ãƒ©ãƒ¼ãŒã‚ã£ãŸæ™‚ã«SEGV + + * lib/safe.rb: Restricted.evalã®ä¸ã ã‘制é™ã‚’åŠ ãˆã‚‹ï¼Ž + + * eval.c (error_print): ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã®å‡ºåŠ›ï¼Žcallerã§ä¾‹å¤–発生ä½ç½® + を調整ã—ãŸæ™‚ã«å•é¡ŒãŒå‡ºã‚‹(ãã‚“ãªã“ã¨ã‚’ã—ãªã‘ã‚Œã°è‰¯ã„ã®ã ãŒâ€¦) + + * eval.c (make_backtrace): ãƒãƒƒã‚¯ãƒˆãƒ¬ãƒ¼ã‚¹ã®ç”Ÿæˆ + +Wed Oct 16 12:56:22 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby-man-0.99.2-jp/index.html: 日本語版ドã‚ュメントã®å®Œæˆ(é•·ã‹ã£ãŸâ€¦) + + * re.c (reg_regcomp): $=ãŒnilã®æ™‚ã®å‡¦ç† + + * string.c (f_chop): $_ã«å¯¾ã™ã‚‹chop + +Tue Oct 15 11:04:23 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-961015 + +Mon Oct 14 18:22:38 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_schedule): BOW対応．selectãŒ-1ã‚’è¿”ã—ãŸæ™‚ã«ãƒã‚°(実 + ã¯do .. whileãŒcontinueã§å…ˆé ã«ã‚¸ãƒ£ãƒ³ãƒ—ã™ã‚‹ã¨æ€ã„込んã§ã„ãŸï¼Žæ¡ + 件ã®ç›´å‰ã ã£ãŸã®ã ^^);;;;; + + * sample/ruby-mode.el (ruby-mode-syntax-table): ?ã®syntaxãŒ"/"ã§ã¯ + ã¾ãšã„らã—ã„ + + * hash.c (rb_hash): name conflict + +Fri Oct 11 00:23:05 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-961011 + + * ext/marshal/marshal.c (w_object): çµå±€å‹•ã„ã¦ã„ãªã‹ã£ãŸå¾ªç’°ã‚ªãƒ–ジェ + クト対応を外ã—ãŸï¼Ž + + * hash.c (rb_hash): Fixnumã¨æ–‡å—列ã®é«˜é€ŸåŒ– + + * ext/marshal/marshal.c (w_object): 無駄ãªãƒ‡ãƒ¼ã‚¿ã®å‰Šé™¤(フォーマッ + トã®éžäº’æ›æ€§) + + * io.c (io_readline): 戻り値ã®ä¸å‚™ + + * ext/marshal/marshal.c (marshal_dumps): MSDOS対応 + + * ruby.c (load_file): MSDOS対応 + +Wed Oct 9 17:46:27 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/extmk.rb.in (install): 無駄ãªã‚³ãƒ”ーをé¿ã‘ã‚‹ + + * string.c (str_sub_method): マッãƒãŒãªã‹ã£ãŸæ™‚ã®String#subã®å€¤ãŒ + é•ã£ã¦ã„ãŸï¼Ž + + * eval.c (obj_extend): extendã—ãŸæ™‚ã«object_extendedを呼ã¶ã‚ˆã†ã« + +Tue Oct 8 00:55:38 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_alloc): 割当ã®å¹³å‡åŒ– + + * eval.c (thread_schedule): joinã®ãƒã‚°ã‚’ä¿®æ£ + + * eval.c (thread_wait_for): selectã¸ã®å‰²è¾¼ã¿ãªã©ã«å¯¾å¿œ + + * eval.c (thread_select): linuxã®selectã®æŒ™å‹•ã«å¯¾å¿œ(timeoutãŒå¤‰åŒ– + ã™ã‚‹) + +Mon Oct 7 09:47:19 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-961007 + + * eval.c (PUSH_BLOCK): the_classã®ä¿å˜ã‚’忘れã¦ã„ãŸï¼Ž + + * ext/dbm/dbm.c (fdbm_store): sizeã®ä¿å˜ã™ã‚‹å ´æ‰€ãŒé–“é•ã£ã¦ã„㟠+ + * ext/socket/socket.c (s_accept): thread対応ã—ã¦ã„ãªã‹ã£ãŸ + +Sat Oct 5 01:32:27 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (io_readchar): EOFã§ä¾‹å¤–を発生ã•ã›ã‚‹ + +Fri Oct 4 11:59:54 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/marshal/marshal.c (w_object): Hashã¨Objectã®å¾©æ—§ã«å¿…è¦ãªãƒãƒƒ + シュテーブルãŒæ¸¡ã•ã‚Œã¦ã„ãªã‹ã£ãŸï¼Ž + + * variable.c (rb_path2class): ユーザ定義クラスã®å¾©æ—§ã«å¤±æ•—ã—ã¦ã„㟠+ + * variable.c (rb_path2class): クラスãŒå˜åœ¨ã—ãªã„時ã®ã‚¨ãƒ©ãƒ¼ã‚’Fatal + ã‹ã‚‰NameErrorã¸ï¼Ž + + * range.c (range_s_new): first,lastãŒä¸¡æ–¹Numericã®æ™‚エラーã«ãªã£ã¦ + ã„ãŸï¼Ž + + * range.c: start->first, end->last + +Wed Oct 2 02:02:46 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c: DJGPPã§chmod,chownを使ãˆã‚‹ã‚ˆã†ã«(ã£ã¦DOSã«chownãŒã‚ã‚‹ã®ã‹?) + + * class.c (rb_singleton_class): ビルトインクラスもextendã—ãŸã‚Šç‰¹ç•° + ãƒ¡ã‚½ãƒƒãƒ‰ã‚’è¿½åŠ ã—ãŸã‚Šã§ãるよã†ã« + + * variable.c (rb_set_class_path): ユーザ定義ã®ãƒˆãƒƒãƒ—レベルクラス㫠+ pathã‚’è¨å®šã—ãªã„ + + * eval.c (eval): 例外ãŒRuntimeErrorã«åŒ–ã‘ã¦ã„㟠+ + * eval.c (eval): evalä¸ã®ä¾‹å¤–ã®è¡¨ç¾ã®æ”¹å–„ + + * eval.c (eval): eval_with_bindingã¨ã®ä¸€æœ¬åŒ– + + * eval.c (rb_eval): クラス/モジュール定義ã®ä¸ã‹ã‚‰å®šç¾©ä¸ã®ã‚¯ãƒ©ã‚¹/モ + ジュールãŒå‚ç…§ã§ãるよã†ã« + +Tue Oct 1 01:40:09 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-961001 + + * parse.y: cur_crefãŒ2度宣言ã•ã‚Œã¦ã„㟠+ + * signal.c (trap): SIGSEGV，SIGBUSã®ãªã„機種ã«å¯¾å¿œ + + * io.c (Init_IO): 引数タイプã®æŒ‡å®šé–“é•ã„ + +Mon Sep 30 15:28:00 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-960930 + + * config.guess,config.sub: $host_osãŒæ£ã—ãè¨å®šã•ã‚Œãªã„ + + * eval.c (rb_eval): yieldã§æ£ã—ããªã„selfãŒè¨å®šã•ã‚Œã¦ã„㟠+ + * eval.c (ruby_run): toplevelã®ä¾‹å¤–処ç†ã®ãƒã‚° + +Mon Sep 30 09:13:26 1996 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * djgpp対応 + +Sat Sep 28 02:45:10 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-960928 + + * sample/ruby-mode.el (ruby-beginning-of-block): ブãƒãƒƒã‚¯ã®å…ˆé ã« + 移動(æ£ã—ãインデントã—ã¦ã„ãªã„ã¨å‹•ä½œã—ãªã„) + (ruby-end-of-block): åŒä¸Š + + * eval.c (class_s_new): Class#newãŒã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã¨ã—ã¦å‘¼ã°ã‚ŒãŸæ™‚㯠+ initializeもイテレータã¨ã—ã¦å‘¼ã°ã‚Œã‚‹ã‚ˆã†ã« + + * signal.c (sigsegv): SEGVã§backtraceを表示ã™ã‚‹ã‚ˆã†ã« + +Fri Sep 27 09:51:07 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-960927 + + * eval.c (error_print): 引数ã®ãªã„raiseã§ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒæ£ã—ã表示㕠+ れるよã†ã«ï¼Ž + + * eval.c (rb_longjmp): mesgãŒnilã®æ™‚RuntimeErrorを生æˆã™ã‚‹ï¼Ž + + * eval.c (f_raise): 引数ãŒãªã„時ã«å¯¾å¿œ + + * eval.c (thread_mark): stack上ã«ãªã„データã®ã‚¢ãƒ‰ãƒ¬ã‚¹å¤‰æ›ã‚’è¡Œã£ã¦ + ã„ãŸï¼Ž + + * eval.c (Init_Thread): 割込ã¿ã®é–“éš”ãŒ1秒ã¨é•·ã™ãŽãŸï¼Ž + +Thu Sep 26 16:02:45 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_schedule): 一度ペンディングã«ãªã‚‹ã¨ãƒ•ãƒ©ã‚°ãŒã‚¯ãƒªã‚¢ + ã•ã‚Œã¦ã„ãªã‹ã£ãŸï¼Ž + + * process.c (rb_proc_exec): system/execã®å¼•æ•°ãŒç©ºæ–‡å—列ã§ã‚ã£ãŸå ´ + åˆï¼Œä¾‹å¤–を発生ã™ã¹ãã ã£ãŸï¼Ž + + * config.sub/config.guess: æ–°ã—ã„ã‚‚ã®ã«ç½®ãæ›ãˆ + +Thu Sep 26 15:41:35 1996 WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp> + + * io.c (next_argv): -i.bakã‚’BOWã¨DOSã«å¯¾å¿œï¼Ž + +Thu Sep 26 01:31:43 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (io_sysread): EOFã§ä¾‹å¤– + + * io.c (f_readline): EOFã§ä¾‹å¤–を発生ã™ã‚‹ã‚ˆã†ã«ï¼Žgetsã¯äº’æ›æ€§ã®ãŸã‚ + nilã‚’è¿”ã™ã¾ã¾ã«ã™ã‚‹ + + * eval.c (proc_call): lambdaã‹ã‚‰ã®returnã§IN_BLOCKフラグãŒç«‹ã£ãŸã¾ + ã¾ã ã£ãŸ + + * eval.c (PUSH_BLOCK2): threadã«å¯¾å¿œã™ã‚‹ãŸã‚Blockを一度stackã«ã‚³ãƒ”ー + +Wed Sep 25 11:54:11 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (method_call): Const::method()å½¢å¼ã‚’使ãˆã‚‹ã‚ˆã†ã«ã—ã¦ã¿ãŸï¼Ž + 引数括弧ã¯çœç•¥ã§ããªã„． + + * sample/test.rb: Process.killã®å˜åœ¨ã‚’確ã‹ã‚ã¦ã‹ã‚‰ãƒ†ã‚¹ãƒˆã‚’行ㆠ+ + * eval.c (eval_with_binding): 第2引数ã¨ã—ã¦binding(ã¾ãŸã¯lambda)ã‚’ + 与ãˆã‚‹ã¨ãã®ç’°å¢ƒã§evalを実行ã™ã‚‹ã‚ˆã†ã«ã—㟠+ + * eval.c (f_binding): ç¾åœ¨ã®bindingã‚’è¿”ã™é–¢æ•° + + * eval.c: blockæ§‹é€ ä½“ã«the_classã‚’ä¿å˜ã™ã‚‹ãƒ¡ãƒ³ãƒã‚’è¿½åŠ + + * process.c (Init_process): kill,wait,waitpidã‚’Processã«ç§»å‹• + +Tue Sep 24 02:44:43 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el: ã„ã‚ã„ã‚å•é¡ŒãŒå¤šã„ã®ã§ä»¥å‰ã®é«˜é€ŸåŒ–ã¯ç ´æ£„． + 別ã®ã‚¢ãƒ—ãƒãƒ¼ãƒã‚’使ã£ãŸï¼Ž + + * lib/tk.rb (Tk.pack): 複数ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’å—ã‘付ã‘ã‚‹pack + +Sat Sep 21 11:08:09 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (exprs): 空文もå—ã‘付ã‘るよã†ã«æ–‡æ³•ã‚’変更．今ã¾ã§ã¯æ”¹è¡Œ + ã®é€£ç¶šã ã‘ãŒè¨±ã•ã‚Œã¦ã„ãŸï¼Ž + +Fri Sep 20 11:39:18 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * Failã®å¤§åŠã‚’åå‰ã¤ã例外ã«å¤‰æ›´ï¼Ž + + * re.c (Init_Regexp): åå‰ã¤ã例外を導入． + + * eval.c (f_missing): Objectã¯inspectã—ãªã„． + + * object.c (inspect_i): Object#inspectã§loopã«å¯¾å¿œï¼Ž + + * regex.c (re_search): /^$/ãŒ""ã«ãƒžãƒƒãƒã—ãªã‹ã£ãŸï¼Ž + +Thu Sep 19 19:25:12 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * regex.c (re_search): /^$/ãŒéžç©ºè¡Œã«ãƒžãƒƒãƒã—ã¦ã„ãŸï¼Ž + +Tue Sep 17 10:28:11 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-960917 + +Mon Sep 16 10:47:56 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-calculate-indent): 演算å継続ã®å ´åˆã® + æ–‡å—列ã®åˆ¤å®šã®ãƒã‚° + + * sample/ruby-mode.el (ruby-calculate-indent): elseãªã©ã®æ¬¡ã®è¡Œã® + インデント計算をæ£ã—ã． + +Sat Sep 14 08:37:19 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.2-960914 + +Fri Sep 13 08:06:03 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/socket/socket.c (tcpaddr): port番å·ã«ntohsã‚’ã¤ã‘忘れ + + * dln.c (link_undef): テーブルã®ç¨®é¡žãŒé–“é•ã£ã¦ã„ãŸï¼Ž + + * bignum.c (bigadd): 引ãç®—ãŒç™ºç”Ÿã™ã‚‹æ™‚ã«è¨ˆç®—é•ã„ãŒèµ·ãã¦ã„ãŸï¼Ž + + * parse.y (iter_do_block): do..endã§ã‚‚dynamic variableを． + + * bignum.c (big_pow): よりæ£ç¢ºãªè¨ˆç®—ã‚’(æ•´æ•°åŒå£«ã§ã¯floatã«å¤‰æ›ã—㪠+ ã„)． + +Thu Sep 12 13:11:55 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * variable.c (rb_set_class_path): StringクラスãŒåˆæœŸåŒ–ã•ã‚Œã‚‹å‰ã« + Stringを作ã£ã¦ã„ãŸï¼Žçµ„è¾¼ã¿ã‚¯ãƒ©ã‚¹ã«ã¯pathã¯ã„らãªã„ + + * parse.y (yylex): 0.1ãŒ0ã«ãªã£ã¦ã„㟠+ + * parse.y (yylex): 行番å·ã®ä¸æ•´åˆ + + * gc.c (oblist_live_obj): 今「生ãã¦ã„ã‚‹ã€å…¨éƒ¨ã®ã‚ªãƒ–ジェクトを返㙠+ イテレータ．ãã®ã‚¯ãƒ©ã‚¹(ã¾ãŸã¯ã‚µãƒ–クラス)ã®å…¨éƒ¨ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’è¿” + ã™each_object_ofも定義ã—ãŸï¼Ž + + * class.c (rb_define_class_id): 無駄ãªã‚¯ãƒ©ã‚¹ã‚’割り当ã¦ã¦ã„ãŸï¼Žçµæžœ + ã¨ã—ã¦æœªåˆæœŸåŒ–ã®ã‚¯ãƒ©ã‚¹ã‚ªãƒ–ジェクトãŒå˜åœ¨ã—ã¦ã„ãŸï¼Ž + +Wed Sep 11 00:56:23 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (yylex): octalã®å®šæ•°ã®æ¤œå‡ºã‚’よりæ£ç¢ºã«(090ã¯ã‚¨ãƒ©ãƒ¼ã¨ã‹)． + + * bignum.c (big_minus): yãŒxより大ãã„å ´åˆã«ã‚¨ãƒ©ãƒ¼ï¼Ž + + * parse.y (yylex): エラー行番å·ã®è¡¨ç¤ºã‚’よりæ£ç¢ºã« + + * sample/ruby-mode.el (ruby-expr-beg): 変数åãŒ1æ–‡å—ã®æ™‚誤動作ã—㦠+ ã„ãŸï¼Ž + + * sample/ruby-mode.el (ruby-calculate-indent): ?/ã§ãƒ«ãƒ¼ãƒ—ã«è½ã¡ã„ + ãŸãƒã‚°ã‚’ä¿®æ£ï¼Ž + + * enum.c (enum_min,enum_max): sortã®ã‚ˆã†ã«ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã¨ã—ã¦ã‚‚動作㙠+ るよã†ã«ï¼Ž + + * enum.c (enum_find_all): typo + +Tue Sep 10 12:07:12 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * node.h (nd_line): NODEã®lineã‚’flagsã«æŠ¼ã—è¾¼ã‚ã¦ã‚ªãƒ–ジェクトサイ + ズをå°ã•ãã—ãŸï¼Žåˆ¶é™:32bit intã®ãƒžã‚·ãƒ³ã®å ´åˆï¼Œãƒ•ã‚¡ã‚¤ãƒ«ã®è¡Œæ•°ãŒ + 32767を越ãˆã‚‹ã¨æ£å¸¸ã«è¡¨ç¤ºã•ã‚Œãªã„． + + * st.c: hashã¨compareã®é–¢æ•°ãƒ¡ãƒ³ãƒã‚’æ§‹é€ ä½“ã«ãƒ‘ック，クラス的ãªä½¿ã„ + 方を行ã†ï¼Ž1 tableã‚ãŸã‚Š4 byteã®ç¯€ç´„． + +Mon Sep 9 16:35:54 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (file_truncate): æä¾›ã•ã‚Œãªã„時ã«ã¯ç‰¹åˆ¥ãªä¾‹å¤–を発生ã™ã‚‹ã‚ˆ + ã†ã«ï¼Ž + + * eval.c (Init_Proc): ä¸é©åˆ‡ãªä½ç½®ã®local-jumpを例外ã«ï¼Ž + +Sat Sep 7 17:06:15 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (proc_call): ã¾ã スコープãŒã‚¹ã‚¿ãƒƒã‚¯ä¸Šã«ã‚る時ã«ã¯å±€æ‰€è„±å‡º + を有効ã«ã™ã‚‹ï¼Žã“ã‚Œã§ï¼Œprocを生æˆã—ã¦callã™ã‚‹ã“ã¨ã¯ï¼Œã‚¹ã‚³ãƒ¼ãƒ—を脱 + 出ã—ãªã„é™ã‚Šï¼Œyieldã¨åŒã˜æ„味をæŒã¤ã“ã¨ã«ãªã‚‹ï¼Ž + +Fri Sep 6 13:30:59 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-indent-to): インデントãŒå¤‰ã‚らãªã„時㫠+ ã¯ãƒãƒƒãƒ•ã‚¡ã‚’変更ã—ãªã„． + (ruby-calculate-indent): ã¾ãšæ–‡å—列ã®å†…部ã‹åˆ¤æ–ã—ã¦ã‹ã‚‰ï¼Œå‰ã®è¡Œ + ã‹ã‚‰ãƒ‘ーズを行ã†ï¼ŽdefunãŒå¤§ãããªã£ãŸæ™‚ã®é«˜é€ŸåŒ–． + (ruby-in-string-p): æ–‡å—列ã®å†…部ã‹ã©ã†ã‹ã‚’判æ–ã™ã‚‹é–¢æ•°(以å‰ã® + parseã‹ã‚‰åˆ†é›¢) + (ruby-parse-region): æ–‡å—列ã«å¯¾ã™ã‚‹å‡¦ç†ã‚’ã¯ãšã™ï¼Ž + (ruby-beginning-of-block): ブãƒãƒƒã‚¯ã®å…ˆé ã« + (ruby-end-of-block): ブãƒãƒƒã‚¯ã®æœ«å°¾ã«(é…ã„…) + +Thu Sep 5 14:23:07 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (file_s_split): [dirname,basename]ã«splitã™ã‚‹ï¼Ž + + * eval.c (rb_eval): evalã®ä¸ã§ã‚‚定数ã®å€¤ãŒæ£ã—ããªã‚‹ã‚ˆã†ã«ï¼Žã“れ㧠+ 定数ã«é–¢ã—ã¦ã¯é™çš„ãªã‚¹ã‚³ãƒ¼ãƒ—ãŒä¿è¨¼ã•ã‚Œã‚‹ã‚ˆã†ã«ãªã£ãŸï¼Ž + + * st.c (rehash): ãƒãƒƒã‚·ãƒ¥æ‹¡å¤§ã®ç³»æ•°ã‚’2ã‹ã‚‰1.79ã«ï¼Žå‰²ç®—ãŒã‚ˆã‚Šè‰¯ã„値 + ã‚’è¿”ã™ã‚ˆã†ã«ï¼Ž + +Thu Sep 5 00:32:07 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (class_superclass) クラスã®ã‚¹ãƒ¼ãƒ‘ークラスを返ã™ãƒ¡ã‚½ãƒƒãƒ‰ï¼Ž + +Wed Sep 4 16:54:56 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * random.c (f_rand): Bignumã‚„longã®ç¯„囲を越ãˆã‚‹Floatã«å¯¾ã™ã‚‹ä¹±æ•°ã‚‚ + 発生ã§ãるよã†ã«ï¼Ž + + * struct.c (struct_alloc): Fatalã§ã¯ãªã例外を発生ã•ã›ã‚‹ã‚ˆã†ã«(通 + 常ã®ä½¿ç”¨ã§ç™ºç”Ÿã—ã†ã‚‹)． + + * struct.c (struct_s_members): Structã®ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ã§ã¯ãªãï¼Œç”Ÿæˆ + ã•ã‚ŒãŸStructクラスã®ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ã«ã—ãŸï¼Ž + + * st.c (st_init_table): ruby専用ã«ãƒ‘ラメタを固定ã«ã—ãŸ(サイ + ズãŒæ¸›ã£ãŸ) + +Mon Sep 2 11:37:59 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * array.c (ary_shift): capaãŒã‚ã¾ã‚Šã«ã‚‚大ãã„時ã«ã¯é ˜åŸŸã‚’REALLOC + (ary_pop): åŒä¸Š + + * string.c (str_inspect): multibyte character 対応ã«ãƒŸã‚¹ï¼Ž + (str_inspect): unsigned charã«ã—ãªã„ã¨ç¬¦å·å±•é–‹ã•ã‚Œã¦ã—ã¾ã† + + * parse.y (primary): `::'ã‚’primaryã«ç§»å‹• Foo::Bar.BazãŒã‚¨ãƒ©ãƒ¼ã«ãª + らãªã„よã†ã«ï¼Ž + + * parse.y (primary): オペレータ形å¼ã®ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ãŒå®šç¾©ã§ããªã„ + + * random.c (f_rand): maxãŒ0ã®æ™‚ã«å¯¾å¿œ + + * io.c (io_printf): 関数を定義ã—ã¦ã„ãŸãŒã‚¤ãƒ³ã‚¿ãƒ—リタã«ç™»éŒ²ã—ã¦ã„㪠+ ã‹ã£ãŸï¼Ž + + * file.c (file_s_basename): 第2引数ãŒç„¡ã„時ã«ã‚¨ãƒ©ãƒ¼ï¼Ž + +Thu Aug 29 10:49:40 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (expr): イテレータã®æ–°å½¢å¼ã«ã€Œmethod do .. endã€å½¢å¼ã‚’採 + 用ã—ãŸï¼Žã‚‚ã¡ã‚ん昔ã®å½¢å¼ã‚‚有効． + + * sample/ruby-mode.el (ruby-calculate-indent): endã®æ•°ã®æ–¹ãŒå¤šã„å ´ + åˆã«ã‚‚エラーを起ã“ã•ãªã„よã†ã«ï¼Ž + +Wed Aug 28 09:41:36 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * numeric.c (upto,downto,step,times): 対象ãŒfixnumã®ç¯„囲を越ãˆã¦ã‚‚ + 動作ã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Mon Aug 26 10:04:37 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * missing/setenv.c (envix): typo(missing `== 0' for memcmp) + + * dir.c (dir_foreach): foreach(dir open -> read loop -> closeã¾ã§) + + * io.c (io_foreach): foreach(file open -> read loop -> closeã¾ã§) + + * Fatalã®ã†ã¡æ•æ‰å¯èƒ½ãªã„ãã¤ã‹ã‚’例外ã«ï¼Ž + +Sat Aug 24 23:56:37 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * bignum.c (bigdivmod): FIX2INT -> INT2FIX 大間é•ã„ + +Fri Aug 23 18:13:03 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * regex.c (re_free_registers): allocateã—ã¦ã„ãªã„時ã«ã¯å½“然 free + ã—ã¦ã¯ã„ã‘ãªã„． + +Thu Aug 22 01:20:35 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_create): 外å´ã‹ã‚‰å¼·åˆ¶çµ‚了ã•ã›ã‚‰ã‚ŒãŸthread㯠+ cleanupã™ã‚‹å¿…è¦ãŒç„¡ã„． + +Wed Aug 21 09:57:28 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_create): threadを終了ã•ã›ãŸå¤§åŸŸè„±å‡ºã®æƒ…å ±ã‚’ + main_threadã«æ¸¡ã™ã‚ˆã†ã«ï¼Ž + + * parse.y (call_args): 最終引数ã«æ‹¬å¼§ã‚’çœç•¥ã—ãŸãƒ¡ã‚½ãƒƒãƒ‰å‘¼å‡ºã—ã‚’ç½® + ã‘るよã†ã«(例: print foo bar, baz == print(foo(bar,baz))) + +Tue Aug 20 13:37:16 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (masign): 多é‡ä»£å…¥ã¨rest引数ã®å‹•ä½œã‚’åˆã‚ã›ã¦ç©ºã®é…列を代 + å…¥ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * parse.y (arg): defined?ã®å¼·åº¦ã‚’ã‚‚ã†ã¡ã‚‡ã£ã¨å¼·ã + + * eval.c (error_print): -wã§ä¾‹å¤–åも表示ã™ã‚‹ã‚ˆã†ã« + + * eval.c (rb_eval): 新構文ã«å¯¾å¿œ + (handle_rescue): æ•æ‰ã™ã‚‹ä¾‹å¤–ã‚’ kind_of? ã§åŒå®š + + * parse.y (primary): rescueã®æ§‹æ–‡ã‚’変更(åŒå®šå¼•æ•°ã®è¿½åŠ ，複数rescue) + + * Fail()ã®ã‹ãªã‚Šã‚’é©å½“ãªä¾‹å¤–を使ã†ã‚ˆã†ã« + + * eval.c (thread_interrupt): Interrupt(今ã¯non-local jump)㯠+ main-threadã«é€ã‚‰ã‚Œã‚‹ã‚ˆã†ã«ï¼Ž + + * eval.c (rb_longjmp): $! ã®å†…容を文å—列ã‹ã‚‰ä¾‹å¤–クラスã«å¤‰æ›´ + (rb_raise): rb_fail ã‹ã‚‰å称変更 + (rb_interrupt): 例外化 + (rb_exit): 例外化 + + * error.c (Init_Exception): 例外クラスã®æ–°è¨(æ–‡å—列ã®ã‚µãƒ–クラス) + +Mon Aug 19 19:40:52 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * signal.c (trap): å¤ã„ãƒãƒ³ãƒ‰ãƒ©ã‚’è¿”ã™ã‚ˆã†ã«ï¼Ž + +Wed Aug 14 00:07:18 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_trap_eval): ãƒãƒ³ãƒ‰ãƒ©ã®ãŸã‚ã«threadã‚’forkã™ã‚‹ã“ã¨ã‚’æ¢ + ã‚ãŸï¼Ž + + * eval.c (thread_mark): thread毎㮠$!, $@ をマークã—忘れ + + * ext/dbm/dbm.c (fdbm_delete): イテレータã¨ã—ã¦å‘¼ã°ã‚ŒãŸå ´åˆï¼Œè¦ç´ + ãŒç„¡ã‘ã‚Œã°ãƒ–ãƒãƒƒã‚¯ã‚’評価ã™ã‚‹ï¼Ž + + * hash.c (hash_delete): イテレータã¨ã—ã¦å‘¼ã°ã‚ŒãŸå ´åˆï¼Œè¦ç´ ãŒç„¡ã‘ã‚Œ + ã°ãƒ–ãƒãƒƒã‚¯ã‚’評価ã™ã‚‹ï¼Ž + + * array.c (ary_delete): イテレータã¨ã—ã¦å‘¼ã°ã‚ŒãŸå ´åˆï¼Œè¦ç´ ãŒç„¡ã‘ã‚Œ + ã°ãƒ–ãƒãƒƒã‚¯ã‚’評価ã™ã‚‹ï¼Ž + + * eval.c (rb_interrupt): SIGINTã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚’exitã‹ã‚‰ç‰¹åˆ¥ãªå¤§åŸŸè„± + 出ã«ï¼Žã‚„ã¯ã‚Šå‰²ã‚Šè¾¼ã¾ã‚ŒãŸä½ç½®ã®è¡¨ç¤ºãŒç„¡ã„ã®ã¯å¯‚ã—ã„ã®ã§ï¼Ž + +Tue Aug 13 01:34:00 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_exit): sub-thread内ã§ã®exitã‚‚statusã‚’ä¿å˜ã™ã‚‹ã‚ˆã†ã« + (thread_create): 自thread内ã®exitã«å¯¾å¿œ + + * signal.c (sighandle): SIGINTã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒãƒ³ãƒ‰ãƒ©ã¯exitã™ã‚‹ã‚ˆã†ã« + (以å‰ã¯ä¾‹å¤–を発生ã—ã¦ã„ãŸ)． + + * 例外ã®ä¸€éƒ¨ã‚’Fatalã«ï¼Ž + + * string.c (str_aset): æ–‡å—列ã®ç½®æ›ã®å¯¾è±¡ãŒéƒ¨åˆ†æ–‡å—列ã§ãªã‹ã£ãŸæ™‚， + 例外を発生ã•ã›ãªã„よã†ã« + + * eval.c (proc_call): Procã®ä¸ã‹ã‚‰break/nextã¯é€šã—，他ã®ã‚‚ã®ã¯é€šã• + ãªã„よã†ã« + +Mon Aug 12 14:15:09 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (krn_type): æ–‡å—列を返㙠+ + * eval.c (thread_create): sub-thread内ã§ã®exitã«å¯¾å¿œ + + * numeric.c (fix_type): æ–‡å—列を返㙠+ + * io.c (f_p): デãƒãƒƒã‚°ç”¨ãƒ‡ãƒ¼ã‚¿è¡¨ç¤ºãƒ¡ã‚½ãƒƒãƒ‰ + + * eval.c (f_missing): nil/TRUE/FALSEを特別扱ㄠ+ + * string.c (str_inspect): é•·ã„æ–‡å—列をçŸç¸®è¡¨ç¤ºï¼Žinspectã®åƒãã‚’ + human readable stringã®ç”Ÿæˆã«çµ±ä¸€(re-generatable string ã¯æ£å¼ã« + ç„¡ããªã£ãŸ)． + +Sat Aug 10 16:54:21 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (Init_Object): kernel/nil/false/trueã®ã‚¯ãƒ©ã‚¹åを変更(å° + æ–‡å—ã«)，rubyスクリプトã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã§ããªã„よã†ã«ï¼Ž + + * eval.c (rb_eval): CONSTANTã®ã‚¢ã‚¯ã‚»ã‚¹å…ˆã‚’å˜ç´”化．crefを使ã‚ãªã„． + + * eval.c (f_eval): 特異メソッド内ã§ã‚‚定数ã®å€¤ãŒæ£ã—ããªã‚‹ã‚ˆã†ã« + +Fri Aug 9 12:23:17 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * array.c (ary_concat): append -> concat Stringã«åˆã‚ã›ãŸ + + * parse.y (yylex): `$;'ãŒä½¿ãˆãªã‹ã£ãŸï¼Ž + + * array.c (ary_push_method): 複数引数をå—ã‘付ã‘るよã†ã«ï¼Ž + (ary_unshift): 複数引数をå—ã‘付ã‘るよã†ã«ï¼Ž + + * io.c (io_popen): IO.popenã§command pipeãŒé–‹ã‘るよã†ã«ï¼Ž + + * object.c (Init_Object): Kernelã¨Nilã‚’ruby scriptã‹ã‚‰ã‚¢ã‚¯ã‚»ã‚¹ã§ã + ãªã„よã†ã«ï¼Ž + +Thu Aug 8 01:21:47 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (f_integer): æ•´æ•°ã¸ã®å¤‰æ›é–¢æ•° + (f_float): 実数ã¸ã®å¤‰æ›é–¢æ•° + (f_string): æ–‡å—列ã¸ã®å¤‰æ›é–¢æ•° + (f_array): é…列ã¸ã®å¤‰æ›é–¢æ•° + + * bignum.c (big_to_i): FIXNUMã®ç¯„囲ã§ãªã„時ã¯Bignumã®ã¾ã¾è¿”ã™ã‚ˆã† + ã«å¤‰æ›´ï¼Ž + +Wed Aug 7 09:28:38 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99.1-960807 + + * parse.y (mlhs): 「*foo = 1,2,3ã€ã‚¿ã‚¤ãƒ—ã®å¤šé‡ä»£å…¥ã‚‚å¯èƒ½ã«ï¼Ž + + * object.c (Init_Object): クラスTrue/Falseã‚’ruby scriptã‹ã‚‰ã‚¢ã‚¯ã‚» + スã§ããªã„よã†ã«ï¼Ž + + * object.c (nil_inspect): inspect表ç¾ã¯"nil"ã« + + * io.c (io_print): nilã®printã‚’nilã«ï¼Ž + + * object.c (nil_to_s): nilã®æ–‡å—列表ç¾ã‚’""ã«ï¼Ž + +Tue Aug 6 01:12:32 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * dir.c (dir_s_open): file descripterãŒè¶³ã‚Šãªã„時ã«ã¯gcã—ã¦ã‹ã‚‰ã‚‚ + ã†ä¸€åº¦openã—ã¦ã¿ã‚‹ï¼Ž + + * io.c (rb_fopen): ã™ã¹ã¦ã®fopen()ã«ã¤ã„ã¦file descripterãŒè¶³ã‚Šãª + ã„時ã«ã¯gcã—ã¦ã‹ã‚‰ã‚‚ã†ä¸€åº¦openã—ã¦ã¿ã‚‹ï¼Ž + + * ext/socket/socket.c (Init_socket): 定数ã®è¿½åŠ ． + + * sample/ruby-mode.el (ruby-indent-to): インデント後ã®ã‚«ãƒ¼ã‚½ãƒ«ä½ç½® + ã®èª¿æ•´ã‚’æ£ã—ã． + + * gc.c (gc): 割込ã¿ãƒã‚§ãƒƒã‚¯ã‚’è¡Œã‚ãªã„(Cコードã®ä¸ã§å®‰å¿ƒã—㦠+ malloc()ãŒä½¿ãˆãªããªã‚‹ã®ã§)． + + * st.c (call_hash_func): signalã¨threadã«ã‚ˆã‚‹å‰²è¾¼ã¿ã«å¯¾å¿œï¼Ž + + * sig.h (DEFER_INTS): 割込ã¿ç¦æ¢åŒºé–“ã®æŒ‡å®š + + * eval.c (f_require): threadã«ã‚ˆã‚‹requireã®ç«¶åˆã«å¯¾å¿œ(最åˆã® + requireãŒçµ‚了ã™ã‚‹ã¾ã§ä»–ã®threadã¯å¾…ã¤)． + + * bignum.c (str2inum): 0x80000000ã®å€¤ãŒè² ã«ãªã£ã¦ã„㟠+ + * sprintf.c (f_sprintf): æ–‡å—列末尾，行末ã®å˜ç‹¬ã®`%'ã«å¯¾å¿œ + + * bignum.c (big_cmp): 比較ã®çµæžœãŒé€†ã«ãªã‚‹æ™‚ãŒã‚ã£ãŸï¼Ž + +Mon Aug 5 10:58:13 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * process.c (proc_exec_v): 例外ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’分ã‹ã‚Šã‚„ã™ã． + + * ext/dbm/dbm.c (fdbm_store): nilã‚’æ ¼ç´ã™ã‚‹ã¨è¦ç´ ã®å‰Šé™¤ã«ãªã‚‹ + + * ext/dbm/dbm.c: サイズをã‚ャッシュ． + +Sat Aug 3 01:52:52 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_fail): `fail'ãŒå¼•æ•°ç„¡ã—ã§å‘¼ã°ã‚ŒãŸæ™‚ã ã‘以å‰ã®`$@'ã‚’ä¿ + å˜ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * eval.c (f_fail): frameã®èª¿æ•´ + +Fri Aug 2 11:26:21 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/socket/socket.c (bsock_setopt): valã¨ã—ã¦TRUE/FALSE/Fixnumã‚‚ + å—ã‘付ã‘るよã†ã«ï¼Ž + + * ext/socket/socket.c (Init_socket): SO_REUSEADDRç‰ã®å®šæ•°ã®è¿½åŠ + + * ext/md5/md5init.c: md5モジュール(åˆã®è¤‡æ•°ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ãªã‚‹ãƒ¢ã‚¸ãƒ¥ãƒ¼ + ルã§ã‚‚ã‚ã‚‹) + + * ruby.h (Make_Data_Struct): Data: objectã®instance変数ã«æ ¼ç´ -> + Dataåž‹ã®Objectã«(Dir,Time,Proc,Thread,DBM) + +Thu Aug 1 11:38:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/dbm/dbm.c (fdbm_store): valueãŒæ–‡å—ã§ç„¡ã„時ã«å¯¾å¿œ + +Wed Jul 31 10:53:42 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/socket/socket.c (open_inet): htonsãŒå¿…è¦ã§ã‚ã£ãŸ + (tcpaddr): ntohlã§å¤‰æ›ã—㟠+ + * process.c (rb_proc_exec): execvp -> execv + +Tue Jul 30 17:48:33 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c: `$?'ã‚’thread localã« + + * Makefile.in (install): install時ã«stripを行ㆠ+ + * configure.in: install時ã®stripã®æ¤œå‡º + + * configure.in: NEXTSTEP対応 + + * version 0.99.1-960730 + +Tue Jul 30 16:40:35 1996 SHIROYAMA Takayuki <psi@fortune.nest.or.jp> + + * dln.c (dln_load): NeXT dln(mach-o)対応．configureã¯æœªå¯¾å¿œ + +Tue Jul 30 09:46:51 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * process.c (f_system): 複数引数もã¨ã‚Œã‚‹ã‚ˆã†ã« + + * process.c (f_exec): 複数引数もã¨ã‚Œã‚‹ã‚ˆã†ã« + + * array.c (ary_append): é…列(ã¾ãŸã¯Enum)ã®è¦ç´ ã‚’ç ´å£Šçš„ã«è¿½åŠ + + * array.c (ary_plus): Enumã¯ãã®è¦ç´ ã‚’è¿½åŠ + + * file.c (file_s_open): File.openã‚’è¿½åŠ + + * struct.c (struct_new): FIX2INTを忘れã¦ã„㟠+ + * file.c (Init_File): exists? -> exist? + + * object.c (obj_is_kind_of): is_kind_of? -> kind_of?, is_a? + + * object.c (obj_is_instance_of): is_instance_of? -> instance_of? + +Mon Jul 29 16:40:02 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (parse_regx): å¼å±•é–‹ã‚’è¡Œã£ãŸå ´åˆï¼Œcasefoldã®è¨å®šãŒã§ã㦠+ ã„ãªã‹ã£ãŸï¼Ž + + * object.c (true_type): TRUE/FALSEã«typeを実装． + + * parse.y (read_escape): 3æ–‡å—以内ã®octalã«å¯¾å¿œ(\0ã¨ã‹) + +Fri Jul 26 00:31:45 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * array.c (ary_reverse_bang): in-placeã§é…列をå転ã•ã›ã‚‹ + (ary_sort_bang): in-placeã§sortã™ã‚‹ + (ary_sort): sortã—ãŸé…列を返ã™ã‚ˆã†ã« + (ary_delete_at): 指定ã—ãŸä½ç½®ã®è¦ç´ を削除ã™ã‚‹ + + * eval.c (rb_call): stackæ·±ã•ãƒã‚§ãƒƒã‚¯ã‚’毎回ã¯è¡Œã‚ãªã„よã†ã« + + * error.c (Warning): 実行ä¸ã®warningãŒè¡¨ç¤ºã•ã‚Œã¦ã„ãªã‹ã£ãŸ + + * eval.c (compile): 例外発生を分離． + + * eval.c (f_eval): 変数rb_in_evalã‚’æ£ã—ã管ç†ã™ã‚‹ã‚ˆã†ã« + + * ext/dbm/dbm.c (fdbm_store): æ ¼ç´ã™ã‚‹keyã‚’æ–‡å—列ã«å¤‰æ› + + * eval.c (rb_call): ç„¡é™å†å¸°ã®ãƒã‚§ãƒƒã‚¯ã‚’大域脱出を行ã†C methodã«ã‚‚ + 対応ã•ã›ãŸï¼Žthreadã®stackæ·±ã•ãƒã‚§ãƒƒã‚¯ãƒ«ãƒ¼ãƒãƒ³ã‚’æµç”¨ï¼Ž + + * parse.y (yylex): 第1引数ã®unary -/+ã®åˆ¤å®šãŒé–“é•ã£ã¦ã„ãŸï¼Ž + + * parse.y (yylex): unary +ã§æ•°å—を余計ã«èªã‚“ã§ã„ãŸ(ex. +5 -> 55) + +Thu Jul 25 12:15:04 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (yylex): 曖昧ã§ãªã„引数ã«å¯¾ã—ã¦è¦å‘Šã‚’出ã—ã¦ã„ãŸï¼Ž + + * eval.c (iterator_p): 引数ã§å‘¼ã‚“ã§ã‚‚æ£ã—ã„çµæžœã‚’è¿”ã™ã‚ˆã†ã«ï¼Ž + + * parse.y: break/next/redo/retryã®ãƒ¡ã‚½ãƒƒãƒ‰åŒ–． + + * sample/ruby-mode.el (ruby-calculate-indent): nestã®ãƒã‚§ãƒƒã‚¯ãƒŸã‚¹ + + * sample/ruby-mode.el (ruby-parse-region): 予約語ã®ãƒã‚§ãƒƒã‚¯ã‚’強化 + + * parse.y (primary): unless/untilã®å¾©æ´» + +Tue Jul 23 18:50:10 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * array.c (Array#empty?), Hash.c (Hash#empty?), ext/dbm/dbm.c (DBM#empty?): + 空ã®åˆ¤å®šè¿°èªž + + * eval.c (f_unless): ifã®é€†ã‚’ã™ã‚‹ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ + + * eval.c (f_until): whileã®é€†ã‚’ã™ã‚‹ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ + + * parse.y: notã®å„ªå…ˆé †ä½ã‚’and/orより高ã + + * parse.y (expr): `!'を引数括弧をçœç•¥ã—ãŸcallã§ã‚‚有効㫠+ +Mon Jul 22 10:15:38 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99-960722 + + * array.c (ary_print_on): OFSã®NILãƒã‚§ãƒƒã‚¯ãŒä¸å®Œå…¨ + + * ruby.c (load_file): 標準入力ã‹ã‚‰ã®ã‚¹ã‚¯ãƒªãƒ—トãŒç©ºã®æ™‚ã«å¯¾å¿œï¼Ž + + * ruby.c (proc_options): -wã§ã¯å¼•æ•°ç„¡ã—ã®æ™‚ã«ã¯æ¨™æº–入力ã‹ã‚‰ã‚¹ã‚¯ãƒª + プトをã¨ã‚‹(-vã§ã¯ãŸã‚“ã«çµ‚了ã™ã‚‹)． + + * array.c (ary_compact): nilã®è¦ç´ ã‚’å–り除ãメソッド + + * array.c (ary_nitems): nilã§ãªã„è¦ç´ ã‚’æ•°ãˆã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ + +Sun Jul 20 00:51:53 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.c (proc_options): -w optionã‚’è¿½åŠ + + * parse.y: {}ãŒé–‰ã˜ã¦ã„ãªã„時ã«ã¯å±•é–‹ã—ãªã„æ–‡å—列を + +Fri Jul 19 16:16:05 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99-960719 + + * lib/find.rb: 石塚版(pruneã®æ‹¡å¼µä»˜ã) + + * file.c (test_l): lstatã§èª¿ã¹ãªã„ã¨ã． + + * eval.c (f_throw): 第2引数をçœç•¥å¯èƒ½ã«ï¼Ž + + * parse.y (str_extend): {}ã®ãƒã‚¹ãƒˆã«å¯¾å¿œ + +Thu Jul 18 18:25:46 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99-960718 + + * parse.y (str_extend): æ–‡å—列ä¸ã®å¼å±•é–‹ã« \" ' ` / ã‚’å«ã‚€äº‹ãŒã§ã + るよã†ã«ï¼Ž + +Tue Jul 16 15:55:31 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-parse-region): æ£è¦è¡¨ç¾å†…ã®ã‚¨ã‚¹ã‚±ãƒ¼ãƒ— + ã«å¯¾å¿œ + + * version 0.99-960716 + +Fri Jul 12 10:06:19 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (f_select): 引数ã®close check. + + * ruby.c (load_file): #!è¡Œã®å¼•æ•°ãƒã‚§ãƒƒã‚¯ã‚’第1引数ã«é™å®š(実をã„ã†ã¨ + DOS改行対ç–) + +Wed Jul 10 17:18:35 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99-960710 + + * time.c (time_s_timegm/time_s_timelocal): 時間を生æˆã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ + +Mon Jun 17 15:59:20 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99-960617 + + * parse.y (yyerror): エラー表示ã®ç°¡ç•¥åŒ–． + +Wed Jun 12 14:11:01 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * signal.c (rb_trap_exit): trap 0ã¯threadを生æˆã›ãšã«å‡¦ç†ã™ã‚‹ï¼Ž + +Fri Jun 7 10:17:01 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * array.c/hash.c (indexes): é…列1引数ã®ãƒ‘ターンを無ãã—ãŸï¼Žé…列㮠+ å ´åˆã¯`*ary'を使ã£ã¦ã‚‚らãŠã†ï¼Ž + + * eval.c (thread_wait_threads): main_threadãŒçµ‚了ã™ã‚‹å‰ã«ä»–ã® + threadã‚’å¾…ã¤(強制的ã«ã¯çµ‚了ã•ã›ãªã„)． + (ruby_run): ä»–ã®threadã‚’å¾…ã£ã¦ã„ã‚‹é–“ã«ã‚·ã‚°ãƒŠãƒ«ãŒæ¥ãŸã‚‰ï¼Œå…¨thread + を強制終了ã•ã›ã‚‹ï¼Ž + + * eval.c (rb_fail): メソッドåã‚’`$!'ã«åŸ‹ã‚込む． + + * eval.c (thread_create): main_threadã®ã‚³ãƒ³ãƒ†ã‚¯ã‚¹ãƒˆãŒã‚»ãƒ¼ãƒ–ã•ã‚Œãª + ã„å ´åˆãŒã‚ã£ãŸï¼Ž + + * process.c (f_sleep): 時間を指定ã›ãšï¼ŒthreadãŒã²ã¨ã¤ã—ã‹ãªã„çŠ¶æ³ + ã«ã‚‚対応． + + * eval.c (thread_create): create後，fnを呼ã³å‡ºã™å‰ã«context switch + ãŒèµ·ãã‚‹ã¨é•ã†contextã§fnãŒå®Ÿè¡Œã•ã‚Œã¦ã—ã¾ã†ãƒã‚°ï¼Ž + +Mon Jun 3 08:03:17 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * struct.c (struct_s_def): メンãƒã®æŒ‡å®šã‚’æ–‡å—列，シンボル(FIXNUM) + åŒæ–¹ã§å¯èƒ½ã«ã—ãŸï¼Ž + + * ext/etc/etc.c (Init_etc): æ§‹é€ ä½“ã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’GCã‹ã‚‰ä¿è·ã—ãŸï¼Ž + + * error.c (rb_sys_fail): nil/FALSEを引数ã¨ã—ã¦å—ã‘付ã‘るよã†ã«ï¼Ž + +Thu May 30 16:19:08 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_select): EINTRã«å¯¾å¿œï¼Ž + +Wed May 29 11:04:51 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (f_catch): catch/throwを実装ã—ãŸï¼Ž + +Tue May 28 13:30:52 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99-960528 + + * eval.c (thread_cleanup): main threadãŒçµ‚了ã™ã‚‹ã¨ä»–ã®threadも終了 + ã™ã‚‹ã“ã¨ã®æ˜Žç¢ºåŒ–． + + * signal.c (trap): SIGINTã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®è¨å®šãƒŸã‚¹(本当ã«SIG_DFLã§ã¯ + ã¾ãšã‹ã£ãŸ)．rubyã§ã¯ã¡ã‚ƒã‚“ã¨ãƒãƒ³ãƒ‰ãƒ«ã—ãªã„ã¨ï¼Ž + + * eval.c (thread_interrupt): SIGINTã¯main_threadã«ä¾‹å¤–を発生ã•ã›ã‚‹ + よã†ã«ï¼Ž + +Mon May 27 15:13:31 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_status): threadã®çŠ¶æ…‹ã‚’è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰ï¼Žthreadã®çµ‚了 + ã‚’å¾…ãŸãªã„． + + * eval.c (thread_value): 一種ã®promiseを実装ã™ã‚‹ãŸã‚ã®ãƒ¡ã‚½ãƒƒãƒ‰ï¼Ž + + * eval.c (thread_join): å¾…ã£ã¦ã„ã‚‹threadãŒä¾‹å¤–ã‚’èµ·ã“ã—ãŸæ™‚ã«ã¯ï¼Œ + joinãŒãã®ä¾‹å¤–を発生ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * eval.c (thread_create): threadã§ã®ä¾‹å¤–ã‚’propagateã—ãªã„よã†ã«ï¼Ž + +Fri May 24 10:47:53 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * enum.c (Init_Enumerable): `size' as alias to the `length' + + * eval.c (thread_save_context): `$@', `$!'をスレッド毎ã«ã‚»ãƒ¼ãƒ–． + + * eval.c (superclass): エラー表示をより親切ã«ï¼Ž + +Thu May 23 10:38:41 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.99-960523 + + * eval.c (superclass): エラー時ã«ã‚¹ãƒ¼ãƒ‘ークラスåã‚’(分ã‹ã‚Œã°)表示 + ã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Wed May 22 19:48:42 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (superclass): スーパークラスã®æŒ‡å®šåã‚’`:'ã‹ã‚‰`<'ã«å¤‰æ›´ï¼Ž + +Tue May 21 09:27:59 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * lib/thread.rb: threadをサãƒãƒ¼ãƒˆã™ã‚‹ã‚¯ãƒ©ã‚¹(Mutex, Queue)． + +Mon May 20 09:39:49 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * time.c (time_cmp): 浮動å°æ•°ç‚¹æ•°ã‚‚扱ãˆã‚‹ã‚ˆã†ã«ï¼Ž + (time_minus): Time - TimeãŒæµ®å‹•å°æ•°ç‚¹æ•°ã‚’è¿”ã™ã‚ˆã†ã«ï¼Ž + +Fri May 17 15:40:10 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * process.c (rb_proc_exec): Thread対応時ã«execã®ç›´å‰ã« + ITIMER_VIRTUALをリセットã™ã‚‹ï¼Ž + +Tue May 14 02:12:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * signal.c (sighandle): SIGINTã«å¯¾ã—ã¦ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ä¾‹å¤–を発生ã•ã›ã‚‹ + ã®ã‚’ã‚„ã‚，status 130ã§exitã™ã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž + + * eval.c (thread_schedule): Threadã®ãƒã‚°ã¯ã»ã¨ã‚“ã©ã¨ã‚ŒãŸã‚ˆã†ã ． + +Fri May 10 11:21:08 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (thread_schedule): ユーザレベルThread機能．効率ã¯ã¨ã‚‚ã‹ã + 移æ¤æ€§ã¯ã‚る．今後，threadé–“ã®é€šä¿¡æ©Ÿèƒ½ã‚’実装ã™ã‚‹äºˆå®šï¼Ž + +Thu May 2 21:22:31 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * time.c (time_timeval): struct timevalを直接返ã™ã‚ˆã†ã«(static変数 + を使ã‚ãªã„)． + +Wed May 1 17:27:32 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * process.c (f_sleep): 整数以外ã®timeを指定ã§ãるよã†ã«ï¼Ž + +Thu Apr 25 08:19:15 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (file_s_dirname): ファイルåãŒ"/"ã‚’å«ã¾ãªã„時，"."を返㙠+ よã†ã«(GNU dirnameã®ä»•æ§˜)． + + * file.c (file_s_basename): ã¾ã nilã¨0ã‚’æ··åŒã—ã¦ã„るソースãŒæ®‹ã£ã¦ + ã„ãŸï¼Ž + + * parse.y (exprs): エラーリカãƒãƒªã‚’è¿½åŠ ï¼Ž + +Wed Apr 24 15:51:05 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_chop_bang): CRLFã®å ´åˆ2 bytesã‚’chop!ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * ext/socket/socket.c (tcp_svr_s_open): ã¾ã nilã¨0ã‚’æ··åŒã—ã¦ã„るソー + スãŒæ®‹ã£ã¦ã„ãŸï¼Ž + +Tue Apr 23 18:14:25 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * pack.c (pack_pack): "A/a"ã®ãƒã‚°ï¼Žä½™è¨ˆãªpaddingãŒå…¥ã£ã¦ã„ãŸï¼Ž + +Thu Apr 18 13:02:11 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * configure.in: アーã‚テクãƒãƒ£ä¾å˜éƒ¨ã‚’別ディレクトリã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ« + ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * parse.y (yyerror): エラー発生時ã«ã‚¨ãƒ©ãƒ¼è¡Œã¨ãã®ä½ç½®ã‚’表示ã™ã‚‹ã‚ˆ + ã†ã«ï¼Ž + +Wed Apr 17 14:22:42 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * defines.h: SAFE_SIGHANDLEã‚’ç„¡ãã—，å±é™ºãªé¸æŠžã¯ã§ããªã„よã†ã«ï¼Ž + + * io.c (io_ungetc): 新機能． + + * ruby.c (load_file): ファイルã‹ã‚‰ã®èªã¿è¾¼ã¿æ–¹å¼ãŒå¤‰ã‚ã£ãŸã®ã«å¯¾å¿œï¼Ž + + * parse.y (compile_file): ファイルã‹ã‚‰ã®å…¥åŠ›ã‚’一度全部èªã¿è¾¼ã‚€ã®ã‚’ + æ¢ã‚ã¦ï¼Œgetsを使ã†ã“ã¨ã«ã—ãŸï¼Ž + +Wed Apr 10 17:40:11 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.98 + +Tue Apr 9 09:54:30 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (iter_block): イテレータブãƒãƒƒã‚¯ã®æŒ‡å®šã‚’メソッド呼ã³å‡ºã— + ã«é™å®šï¼Žæ–‡æ³•ã®æ˜Žç¢ºåŒ–． + + * eval.c (rb_eval): æ¡ä»¶å¼ã®æ£è¦è¡¨ç¾ã®æ¯”較をinline化． + + * eval.c (rb_eval): defined? ã® å®šç¾©æƒ…å ±(種別)ã‚’æ–‡å—列ã§è¿”ã™ï¼Ž + + * node.h: NODE_BEGIN -> NODE_RESCUE, NODE_ENSUREã«åˆ†é›¢ï¼Ž + + * eval.c (rb_eval): option -n/-pã®ãƒˆãƒƒãƒ—レベルループã®inline展開． + + * parse.y (cond0): æ¡ä»¶å¼ä¸ã®æ–‡å—列ã¯æ¯”較ã®å¯¾è±¡ã¨ã—ãªã„ + +Wed Mar 27 12:33:54 1996 Tairo Nomura <tairo@hucom.tp.titech.ac.jp> + + * defines.h: NeXT対応 + +Wed Mar 27 10:02:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y: 予約語ã®å¤‰æ›´ continue -> next + +Mon Mar 25 07:34:37 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (parse_regx): o(once)ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ ï¼Ž + +Fri Mar 22 14:25:35 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.97d + + * eval.c (dyna_var_defined): å‹•çš„ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã®å®šç¾©ãƒã‚§ãƒƒã‚¯ç”¨ãƒ«ãƒ¼ + ãƒãƒ³ï¼Ž + + * parse.y (gettable): eval()ã®ä¸ã§ã®å‹•çš„ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°(æ—¢ã«å€¤ã‚’æŒã£ + ã¦ã„ã‚‹ã‚‚ã®)ã®æ¤œå‡ºã«å¤±æ•—ã—ã¦ã„ãŸï¼Ž + +Tue Mar 19 10:46:47 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.97c + + * re.c (reg_s_new): compile時ã«segmentation fault． + + * parse.y (str_extend): ã„ã¤ã‚‚evalã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Wed Mar 13 11:00:42 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (str_extend): æ–‡å—列ä¸ã®å¼å±•é–‹ã®ä¸å‚™ã‚’ç„¡ãã—ãŸï¼Ž + + * parse.y: 下手ãªã‚¨ãƒ©ãƒ¼ãƒªã‚«ãƒãƒªã‚’外ã—ãŸï¼Ž + +Tue Mar 12 12:30:20 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rescue): é–“é•ã£ã¦ensureã§ã‚‚例外をæ•æ‰ã—ã¦ã„ãŸï¼Ž + +Wed Mar 6 12:11:03 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (var_extend): 変数展開"#{}"ã§ï¼Œä»»æ„ã®å¼ã‚’書ã‘るよã†ã«ã— + ãŸï¼Œã“ã‚Œã§ã€Œå¤‰æ•°ã€å±•é–‹ã§ã¯ç„¡ããªã£ã¡ã‚ƒã£ãŸãªã‚． + + * regex.c (init_syntax_once): `_'ã‚’wordã«è¿½åŠ ． + + * regex.c (re_compile_pattern): `\w',`\W'ã®åˆ¤å®šã‚’syntax tableを使 + ã†ã‚ˆã†ã«ï¼Ž + +Tue Feb 27 10:15:32 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (obj_inspect): 表示ã™ã‚‹ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ãŒç„¡ã„時ã«ã¯ï¼Œ + to_sを使ã†ï¼Ž + + * configure.in: dlnã®æ¤œå‡ºã‚’自動的ã«ï¼Ž + +Mon Feb 26 19:55:33 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.c (readin): read(2)ã§ä¸€åº¦ã«ãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã‚ãªã„å ´åˆã«å¯¾å¿œï¼Ž + +Sat Feb 24 14:47:18 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.97b + +Fri Feb 23 11:26:02 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * class.c (rb_define_module): C言語ã§å®šç¾©ã•ã‚ŒãŸãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®PATHã® + è¨å®šå¿˜ã‚Œï¼Žæ–‡å—列化ã§core dump． + + * eval.c (mod_include): 戻り値をnilã«ï¼Ž + + * version 0.97a + +Thu Feb 22 21:03:42 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * array.c (ary_times): 「é…列*æ–‡å—列ã€ãŒjoinã¨åŒã˜åƒãã‚’ã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Wed Feb 21 11:18:09 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * configure.in : fileCountã‚’cache． + + * configure.in : Linuxã§ELF環境を自動的ã«æ¤œå‡ºã§ãるよã†ï¼Ž + +Tue Feb 20 11:18:09 1996 Mitsuhide Satou <mit-sato@aries.bekkoame.or.jp> + + * FreeBSD dynamic link対応． + +Fri Feb 16 08:50:01 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (obj_inspect): インスタンス変数をæŒãŸãªã„オブジェクトも + æ£ã—ã表示ã•ã‚Œã‚‹ã‚ˆã†ã«ï¼Ž + +Wed Feb 14 16:56:44 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): æ¡ä»¶å¼ã®`2..2'ãªã©å·¦è¾ºæˆç«‹ç›´å¾Œã«å³è¾ºãŒæˆç«‹ã™ã‚‹ + パターンã«ãƒã‚°ï¼Ž + +Tue Feb 13 18:22:22 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.97 + +Fri Feb 9 21:32:55 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * lib/tkscrollbox.rb: スクãƒãƒ¼ãƒ«ã§tclã®è¨å®šã‚’è¡Œã„，ruby<->wishã®ä¸ + è¦ãªé€šä¿¡ã‚’ç„¡ãã—ãŸï¼Ž + +Wed Feb 7 10:26:52 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_aref): indexã‚’unsigned intã§ã¨ã£ã¦ã„ãŸï¼Ž + + * string.c (str_aref): 範囲外ã®indexã«å¯¾ã—ã¦nilã‚’è¿”ã™ï¼Ž + + * parse.y (special_local_set): `$_'ãŒå®£è¨€ç„¡ã—ã«ä½¿ã‚ã‚ŒãŸå ´åˆã«å¯¾å¿œï¼Ž + 関数をvariable.cã‹ã‚‰ç§»å‹•ï¼Ž + + * string.c (str_sub): ç½®æ›é–‹å§‹ä½ç½®ãŒé–“é•ã£ã¦ã„ãŸï¼Ž + +Tue Feb 6 16:17:31 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-parse-region): コメントã®èªã¿é£›ã°ã—ã® + ãƒã‚°ï¼Ž + +Fri Feb 2 18:35:28 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * variable.c (lastline_get): `$_'ã‚’`$~'ã¨åŒã˜ã‚ˆã†ã«SCOPEãƒãƒ¼ã‚«ãƒ«ãª + 変数ã«ã—ãŸï¼Ž + +Thu Feb 1 14:14:07 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c: statã®cacheã‚’ã‚„ã‚ãŸï¼Ž + +Wed Jan 31 07:13:08 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (proc_s_new): procã®ä¸ã§yieldを呼ã°ã‚ŒãŸæ™‚ã«core dumpã—㦠+ ã„ãŸï¼Žã¨ã‚Šã‚ãˆãšä¾‹å¤–を発生ã•ã›ã‚‹ï¼Ž + + * variable.c (rb_class2path): singleton classã«å¯¾å¿œï¼Ž + + * ext/etc/etc.c (Init_etc): struct_defineã®ã‚¿ãƒ¼ãƒŸãƒãƒ¼ã‚¿ãŒnilã ã£ãŸ + (0ã§ãªã‘ã‚Œã°ãªã‚‰ãªã„)． + + * ext/marshal/marshal.c: TRUE/FALSEã‚’åã出ã›ã‚‹ã‚ˆã†ã«ï¼Ž + + * eval.c (rb_get_method_body): ã‚ャッシュã®alias対応，ã„ã¾ã¾ã§ã¯ + aliasã¯ã‚ャッシュã«å…¥ã£ã¦ã„ãªã‹ã£ãŸï¼Ž + +Tue Jan 30 09:55:13 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): NODE_BLOCK - tail recursive(ã¨ã„ã†ã»ã©ã§ã‚‚ãªã„ + ãŒ)． + + * io.c (io_pipe): pipe(2)を実装ã—ãŸï¼Ž + + * eval.c (rb_eval): Qselfã‚’ãªãã—ãŸï¼Žthread対応ã¸ã®ç¬¬ä¸€æ©ï¼Žå…ˆã¯é + ã„ãŒâ€¦ï¼Ž + + * eval.c (proc_call): procã®ä¸ã§ã®returnã¯procã®çµ‚了をæ„味ã™ã‚‹ã‚ˆã† + ã«ï¼ŽãŸã ã—，procã‹ã‚‰ã®yieldã®ä¸ã§ã®returnã¯ä¾‹å¤–を発生ã™ã‚‹ï¼Ž + +Wed Jan 24 11:33:48 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.96a + + * dir.c (dir_each): `$_'ã®å€¤ã‚’変更ã™ã‚‹ã®ã‚’ã‚„ã‚ãŸï¼Ž + + * io.c (f_readlines): nilã¨FALSEã®åˆ†é›¢ã®ã‚ãŠã‚Šã§ç„¡é™ãƒ«ãƒ¼ãƒ—ã«è½ã¡ã¦ + ã„ãŸï¼Ž + + * ruby.c (ruby_options): $0ã®è¨å®šãƒŸã‚¹ï¼Ž + +Tue Jan 23 15:28:21 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): ``ã¯æ–‡å—列を引数ã¨ã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰(`)呼ã³å‡ºã—ã®ã‚· + ンタックスシュガーã§ã‚ã‚‹ã¨ã—ãŸï¼Ž + + * ruby.c (addpath): `-I'オプションã§ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒã€Œå‰ã«ã€è¿½åŠ ã•ã‚Œ + るよã†ã«å¤‰æ›´ï¼Ž + +Fri Jan 19 11:23:12 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * dln.c (load_1): N_INDR対応(出æ¥ãŸã‚ˆã†ãªæ°—ãŒã™ã‚‹)． + +Thu Jan 18 18:14:20 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.texi: FALSEã¨nilã®åˆ†é›¢ã‚’åæ˜ ã—ãŸï¼Ž + +Tue Jan 16 17:39:23 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.96 - ã¨ã‚Šã‚ãˆãšnilã¨FALSEを区別ã™ã‚‹ç‰ˆ + +Wed Jan 10 15:31:48 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * re.c (reg_match): マッãƒã—ãªã‹ã£ãŸæ™‚ã®æˆ»ã‚Šå€¤ã¯FALSE． + + * object.c (rb_equal): `0 == nil'ãŒTRUEã«ãªã‚‹ãƒã‚°ï¼Ž + +Tue Jan 9 00:44:58 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * nilã¨FALSEãŒåˆ†é›¢å¯èƒ½ã«å¤‰æ›´ï¼Ž + + * nilã¨FALSEã¨0ã®åŒºåˆ¥ã‚’厳密ã«ï¼Ž + + * struct.c (struct_new): 引数を0ã§çµ‚ã‚‹å¿…è¦ãŒç„¡ããªã£ãŸï¼Ž + + * object.c (inspect_i): オブジェクトã®ãƒã‚§ãƒƒã‚¯ã®ãƒã‚°(Fixnumã§core + dumpã—ã¦ã„ãŸ)． + + * range.c (range_to_s): Rangeã®è¡¨ç¤ºã‚’改善． + + * object.c (true_inspect): TRUEã®è¡¨ç¤ºã‚’`TRUE'ã«ï¼Ž + +Mon Jan 8 15:02:33 1996 Yukihiro Matsumoto <matz@caelum.co.jp> + + * numeric.c (fix_mul): divide by zero errorãŒç™ºç”Ÿã—ãŸ(オーãƒãƒ¼ãƒ•ãƒãƒ¼ + 検出ã®ãƒã‚°) + + * texinfo.texをパッケージã«å«ã‚ãŸï¼Ž + +Sun Dec 31 00:08:49 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): `::'ã§ã¯ï¼Œãã®ã‚¯ãƒ©ã‚¹ã§å®šç¾©ã•ã‚ŒãŸå®šæ•°ã‚’å‚ç…§ã™ã‚‹ + よã†ã«å¤‰æ›´ï¼Ž + + * string.c (Init_String): eachã‚’each_lineã«æˆ»ã—ãŸï¼Ž + +Thu Dec 28 12:31:55 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): caseã®æ¼”ç®—åã‚’`=~'ã‹ã‚‰`==='ã«ï¼Ž + + * variable.c (rb_const_set): クラス定数ã®å†å®šç¾©ã‚’許ã™(åŒã˜ã‚¯ãƒ©ã‚¹ã§ + ã¯ä¸å¯)．è¦å‘Šã¯å‡ºã™ï¼Ž + +Wed Dec 27 13:27:52 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.95c + + * ext/tkutil/tkutil.c: wishãŒã‚ã£ã¦ã‚‚ãªãã¦ã‚‚一応コンパイルã ã‘㯠+ ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * lib/tk.rb: 環境変数PATHã‹ã‚‰{wish|wish4.0}を探ã™ã‚ˆã†ã«ï¼Ž + +Tue Dec 26 01:03:42 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-parse-region): æ£è¦è¡¨ç¾ã®æ¤œå‡ºå¼·åŒ–． + + * numeric.c (fix_mul): ä¹—ç®—ã®ã‚ªãƒ¼ãƒãƒ¼ãƒ•ãƒãƒ¼æ¤œå‡ºã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ ã®ãƒã‚°ï¼Ž + + * ext/extmk.rb.in: ./install-shを使ã†å ´åˆã®PATHを調整． + + * Makefile.in (install): lib/*.rbを一ã¤ãšã¤ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ï¼Ž + + * io.c (io_each_line): イテレータã®æˆ»ã‚Šå€¤ã‚’nilã§çµ±ä¸€ï¼Ž + +Fri Dec 22 10:34:32 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.95b + + * variable.c (f_untrace_var): 第2引数を指定ã™ã‚‹ã¨ç‰¹å®šã®traceを削除 + ã§ãるよã†ã«ï¼Ž + + * variable.c (f_trace_var): 第2引数ãŒnilã®æ™‚，traceを削除ã™ã‚‹ï¼Ž + + * lib/tk.rb (file_readable/file_writable): 第2引数をnilã«ã™ã‚‹ã“㨠+ ã«ã‚ˆã‚‹event handlerã®å‰Šé™¤ï¼Ž + + * parse.y (variable): ドã‚ュメントã«`__FILE__'ã¨`__LINE__'ãŒæ®‹ã£ã¦ + ã„ãŸï¼Ž`caller(0)'ã§ä»£ç”¨ã—ãŸã¯ãšã ã£ãŸã®ã«ï¼Ž + + * eval.c (f_eval): $!ã®ãƒªã‚»ãƒƒãƒˆï¼Ž + + * error.c (err_sprintf): å‹æ‰‹ã«"\n"ã‚’ä»˜åŠ ã™ã‚‹ã®ã‚’æ¢ã‚ãŸï¼Ž + + * parse.y (f_arglist): 引数リスト直後ã®if/whileã®èªã¿é–“é•ã„． + lex_stateã®å€¤ãŒè¨å®šã•ã‚Œã¦ã„ãªã‹ã£ãŸï¼Ž + +Thu Dec 21 00:56:57 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.95a - ^^;;; + + * lib/tkscrollbox.rb: パッケージã«å…¥ã£ã¦ãªã‹ã£ãŸï¼Ž + + * configure.in: FILE structureã®ãƒã‚§ãƒƒã‚¯ã«ãƒã‚°ï¼Ž + + * Makefile.in (clean): ext以下をinstallã—ã¦ã„ãŸï¼Ž + + * ext/socket/extconf.rb: Solarisã«ãŠã‘ã‚‹-lnlsã®ãƒã‚§ãƒƒã‚¯ï¼Ž + + * array.c (beg_len): ãƒã‚°ãŒã‚ã£ãŸâ€¦ï¼Žæ‚²ã—ã„． + + * version 0.95 - fj.sourcesã« + + * eval.c (rb_eval): rescueã®ãƒã‚¸ãƒƒã‚¯ã‚’rb_rescue()ã«ä¸€å…ƒåŒ–． + +Wed Dec 20 19:30:58 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * Makefile.in: ä¸è¦ãªã‚³ãƒ³ãƒ‘イルã®å›žé¿(より完全ã«)． + + * class.c (singleton_class_new): `single'->`singleton' + +Tue Dec 19 07:14:33 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * io.c (closed?): IOãŒcloseã•ã‚Œã¦ã„ã‚‹ã‹ã©ã†ã‹ã‚’知る述語． + + * parse.y (primary): 特異メソッドã®å¼•æ•°ã®lex_stateãŒä¸é©åˆ‡ï¼Ž + + * lib/tk.rb: tcl->rubyã®å¤‰æ›é–¢æ•°ã®ç”¨æ„． + + * ext/extmk.rb.in (install): installã®2é‡ã‚³ãƒ³ãƒ‘イルã®å›žé¿ï¼Ž + + * array.c (range_beg_len): range指定ã®ä¸é©åˆ‡ãªã‚¨ãƒ©ãƒ¼ã‚’訂æ£ï¼Ž + + * string.c (str_aref): range指定ã®ãƒã‚°ã‚’削除． + + * lib/tk.rb (tk_split_list): Tclã®ãƒªã‚¹ãƒˆã«å¯¾å¿œï¼Ž + +Mon Dec 18 09:58:12 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.94 + + * dln.c (dln_load): HP対応(未確èª) + + * eval.c (Init_Proc): Blockã‚’Procã«æ”¹å． + +Sat Dec 16 13:46:14 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): retryã§ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã®å†å®Ÿè¡ŒãŒã§ãるよã†ã«ï¼Ž + +Fri Dec 15 17:14:30 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c: proc:lambdaã®è¦ªã—ã¿ã‚„ã™ã„別å + +Thu Dec 14 17:21:55 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (dyna_var_asgn): イテレータブãƒãƒƒã‚¯å†…ã§æœ€åˆã«åˆæœŸåŒ–ã•ã‚ŒãŸ + ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã®æœ‰åŠ¹ç¯„囲をãã®ãƒ–ãƒãƒƒã‚¯å†…ã«é™å®šï¼Žã“ã‚Œã§lambdaã¨å‘¼ã¹ + ãªã„ã“ã¨ã¯ãªã„． + +Wed Dec 13 02:30:58 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * gc.c: autoloadã®ãƒžãƒ¼ã‚¯ãƒŸã‚¹ï¼Ž + + * lib/tk.rb: wishã‹ã‚‰ã®è¤‡æ•°è¡Œã®æˆ»ã‚Šå€¤ã«å¯¾å¿œ + + * lib/tkcomposite.rb: 複åˆwidget + + * variable.c (rb_class2path): ICLASSã«å¯¾å¿œã—ã¦ãªã‹ã£ãŸï¼Ž + + * eval.c (ruby_run): exit(0)ã®ãƒã‚° + +Sat Dec 9 01:21:24 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/marshal/marshal.c (dumps|load): æ–‡å—列ã«å¯¾ã™ã‚‹å…¥å‡ºåŠ›ã‚’å¯èƒ½ã« + ã—ãŸ(ãŸã ã—実ã¯ãƒ•ã‚¡ã‚¤ãƒ«çµŒç”±ãªã®ã )． + +Fri Dec 8 18:29:11 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/marshal/marshal.c: シンボルを一度ã ã‘åˆæœŸåŒ–ã™ã‚‹ï¼Ž + +Thu Dec 7 07:58:50 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (yylex): 第1引数ã®æ£è¦è¡¨ç¾ã®èªè˜ã«ã‚¨ãƒ©ãƒ¼ãŒã‚ã£ãŸï¼ŽåŒæ™‚ã« + 状態数を減らã—ãŸï¼Ž + + * string.c (str_sub): ç½®æ›ã§ã‚¹ã‚ップ幅ãŒå¤§ãã™ãŽãŸï¼Ž + +Wed Dec 6 15:14:23 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_sub_method): sub/gsub(!ãªã—)ã¯ç½®æ›ãŒè¡Œãªã‚ã‚Œãªã‹ã£ + ãŸæ™‚，置æ›å‰ã®æ–‡å—列を返ã™ï¼Ž + +Tue Dec 5 00:55:15 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (yylex): 括弧をçœç•¥ã—ãŸæ™‚ã®å¼•æ•°å±•é–‹ã®`*'ã«å¯¾å¿œï¼Ž + + * eval.c (ruby_run): EXITãƒãƒ³ãƒ‰ãƒ©å†…ã§ã®ä¾‹å¤–ã«å¯¾å¿œï¼Ž + + * bignum.c (big_cmp): Bignumã¨Fixnumã®æ¯”較ã§è½ã¡ã‚‹ï¼Ž + +Mon Dec 4 14:21:18 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (call_op): コンパイル時ã®å®šæ•°å¼ã®å±•é–‹ã‚’ã‚„ã‚ãŸï¼ŽåŠ´å¤šãã— + ã¦ç›Šå°‘ãªã„ã¨åˆ¤æ–ã—ãŸã®ã§ï¼Ž + +Thu Nov 30 01:35:15 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * lib/tk.rb: {Radio,Check}Buttonã®variableã®å®Ÿè£…． + + * eval.c (rb_yield_0): Block.callãŒãƒã‚¹ãƒˆã—ãŸæ™‚ã®ãƒã‚°ï¼Ž + + * io.c (f_select): 常ã«é…列3ã¤ã‚’ãµãã‚€é…列を返ã™ã‚ˆã†ã« + + * lib/tk.rb: fileeventã‚’rubyå´ã§å®Ÿè£…． + +Wed Nov 29 17:53:23 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * variable.c (rb_ivar_get): selfを常ã«æŒ‡å®šã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Tue Nov 14 00:07:29 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * lib/tk.rb: Tk4.0対応 + +Mon Nov 13 16:23:32 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.93 + +Thu Nov 9 23:26:01 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * gc.c (gc_mark): モジュールã®Mixinã®ãƒžãƒ¼ã‚¯å¿˜ã‚Œï¼Ž + + * parse.y (f_arglist): メソッド定義ã®å¼•æ•°ã‚’括弧ã§æ‹¬ã‚‰ãªãã¦ã‚‚良ㄠ+ よã†ã«ã—ãŸï¼Ž + +Wed Nov 8 00:17:51 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_yield_0): 未åˆæœŸåŒ–ã®ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ãŒã‚ã£ãŸï¼Ž + + * eval.c (rb_eval): pendig signalã®ãƒã‚§ãƒƒã‚¯ã‚’eval実行後ã«è¡Œã†ã‚ˆã† + ã«ã—ãŸï¼Žã§ãªã„ã¨ã‚·ã‚°ãƒŠãƒ«ã®ç™ºç”Ÿã¨æ¤œå‡ºãŒé ã離れã¦ã—ã¾ã†äº‹ãŒã‚る． + + * parse.y: classæ–‡ã®superclass部を定数ã‹ã‚‰å¼ã«æ‹¡å¼µã—ãŸï¼Ž + + * lib/tk.rb: Tkã®ã»ã¼å…¨ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚¯ãƒ©ã‚¹ã«å¯¾å¿œï¼Žã‚ャンãƒã‚¹ã¨ãƒ†ã‚ス + ト上ã®ã‚ªãƒ–ジェクトãŒæ®‹ã£ã¦ã„る． + +Tue Nov 7 08:18:37 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * signal.c (trap): ブãƒãƒƒã‚¯ã‚’指定ã§ãるよã†ã«ï¼Ž + +Mon Nov 6 16:44:00 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (f_caller): 呼出元ã®æƒ…å ±ã‚’å¾—ã‚‹ï¼Ž + + * ext/tkutil/tkutil.c: wishã®stderr出力を監視ã™ã‚‹ã“ã¨ã§ï¼Œã‚¨ãƒ©ãƒ¼å‡¦ + ç†ã‚’è¡Œã†ï¼Ž + + * ext/tkutil/tkutil.c: wishã¨ã®é€šä¿¡éƒ¨ã‚’Cã§è¨˜è¿°ï¼Ž + +Sat Nov 4 01:12:59 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el (ruby-calculate-indent): インデントã®è¨ˆç®—ã‚’ + ã‚‚ã†å°‘ã—スマートã«ã—ãŸ(æ£è¦è¡¨ç¾ã®ãƒã‚§ãƒƒã‚¯ï¼Œç¶™ç¶šè¡Œã®ãƒã‚§ãƒƒã‚¯)． + + * eval.c (rb_call): ç„¡é™å†å¸°ã‚’é¿ã‘ã‚‹ãŸã‚，関数ã®ãƒã‚¹ãƒˆãƒ¬ãƒ™ãƒ«ã®åˆ¶é™ + ã‚’è¡Œãªã†ï¼Ž + + * lib/tk.rb: Tkインターフェース．ã¾ã ä¸å®Œå…¨ã ãŒï¼Ž + + * eval.c (rb_yield_0): 空ã®Blockã®ãƒã‚°ï¼Ž + + * sample/ruby-mode.el (ruby-calculate-indent): 行末ã®æ¼”ç®—åã«ã‚ˆã‚‹ + 行継続ã«å¯¾å¿œï¼Ž + +Fri Nov 3 12:56:21 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_call): 本体ãŒç©ºã®é–¢æ•°ã®å®Ÿè¡Œã«ãƒã‚°ï¼Ž + + * parse.y (var_extend): æ–‡å—列ã®æœ«å°¾ã®å¤‰æ•°å±•é–‹ã®ãƒã‚°ï¼Ž + + * variable.c (rb_gvar_set): traceã®è©•ä¾¡æ™‚ã«ã«å¤‰æ•°å€¤ã‚’与ãˆã‚‹ã‚ˆã†ã«ï¼Ž + + * eval.c (f_require): ruby scriptã®requireã«bug． + + * variable.c (rb_const_get): モジュールã®include対ç–． + +Thu Oct 19 13:56:06 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * dln.c (dln_load): HP対応ã§ã®typo. + +Wed Oct 18 17:39:39 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.92 + + * object.c (krn_type): オブジェクトã®å‹•çš„ãªåž‹ã‚’è¿”ã™ãƒ¡ã‚½ãƒƒãƒ‰ï¼Ž + +Tue Oct 17 00:48:18 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.c (proc_options): -X オプション．chdirã ã‘ã‚’è¡Œã†ï¼Ž + + * re.c (reg_search): æ¼¢å—コードを途ä¸ã§å¤‰æ›´ã§ãるよã†ã«ï¼Žã‚³ãƒ³ãƒ‘イ + ル時ã®ã‚³ãƒ¼ãƒ‰ãŒå¤‰æ›´ã•ã‚ŒãŸæ™‚ã«ã¯ãƒžãƒƒãƒã®ç›´å‰ã«æ£è¦è¡¨ç¾ã®å†ã‚³ãƒ³ãƒ‘イ + ルを行ã†ï¼Žå®šæ•°KCODEã‹ã‚‰å¤‰æ•°$KCODEã¸ï¼Ž + + * parse.y: ()ã®ãªã‹ã«compexprを許ã™ï¼Ž + + * re.c (reg_search): メモリリークを直ã—ãŸï¼Ž + +Fri Oct 13 13:19:19 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (str_sub): æ–‡å—列置æ›ã«ãƒã‚°ï¼Ž + + * string.c (str_strip_bang): æ–‡å—列ã®å¾Œã‚ã®é•·ã•ã®èª¿æ•´ãŒè¡Œã‚ã‚Œã¦ã„ + ãªã‹ã£ãŸï¼Ž + + * re.c (reg_search): $&, $1...ã¯ãƒãƒ¼ã‚«ãƒ«ã«æŸç¸›ã™ã‚‹ã‚ˆã†ã«ãªã£ãŸï¼Žå‘¼ + ã³å‡ºã—ãŸãƒ¡ã‚½ãƒƒãƒ‰ã§ã®ãƒžãƒƒãƒã¯ç¾ã‚¹ã‚³ãƒ¼ãƒ—ã®$&ãªã©ã®å€¤ã«å½±éŸ¿ã—ãªã„． + マッãƒã®æƒ…å ±ã‚’ã‚¹ã‚³ãƒ¼ãƒ—å¤–ã§å¾—ãŸã„ã¨ãã«ã¯$~を使ã£ã¦æŸç¸›æƒ…å ±ã‚’æŒã¡ + 出ã™å¿…è¦ãŒã‚る． + +Thu Oct 12 00:33:33 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * re.c (reg_search): String:split, String:indexã§ã¯$&, $1...ãŒå¤‰åŒ– + ã—ãªã„よã†ã«ã—ãŸï¼Ž + + * io.c (rb_str_setter): setterã®ä»•æ§˜ãŒå¤‰æ›´ã«ãªã£ã¦ã„ãŸï¼Ž + + * variable.c (f_trace_var): 第2引数をçœç•¥ã—ã¦ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã¨ã—ã¦å‘¼ã¹ + るよã†ã«ï¼Ž + +Wed Oct 11 11:50:59 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.91 + + * variable.c (var_setter): 引数ãŒé–“é•ã£ã¦ã„ãŸï¼Žè‡´å‘½çš„ãƒã‚°ï¼Ž + + * io.c (pipe_open): $stderrã®å€¤ãŒå¤‰æ›´ã•ã‚Œã¦ã„る時ã«ã¯ãã¡ã‚‰ã‚’ + åプãƒã‚»ã‚¹ã®stderrã«è¨å®šã™ã‚‹ï¼Ž + +Mon Oct 9 13:06:33 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (mod_to_s): モジュール内ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã¯`::'を使ã£ãŸè¡¨ç¾ + ã§è¡¨ç¤ºã•ã‚Œã‚‹ã‚ˆã†ã«ï¼Ž + + * variable.c (rb_gvar_set): 代入ã«ã‚ˆã‚‹ãƒ«ãƒ¼ãƒ—ãŒç™ºç”Ÿã—ãªã„よã†ã«ï¼Œ + trace内ã§ã®ä»£å…¥ã§ã¯traceを評価ã—ãªã„． + + * struct.c (struct_equal): structã®equal判定ã«ã‚¯ãƒ©ã‚¹ã®ä¸€è‡´ã‚’å«ã‚ãŸï¼Ž + +Sat Oct 7 00:18:32 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_eval): defined?ã®æ©Ÿèƒ½ã‚’æ‹¡å¼µ(yieldã®ãƒã‚§ãƒƒã‚¯ï¼Œsuperã® + å˜åœ¨ãªã©)． + +Fri Oct 6 12:06:47 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.90 + + * st.c (st_foreach): è¦ç´ を削除ã—ãŸæ™‚ã«è¦ç´ æ•°ãŒå¤‰åŒ–ã—ã¦ã„ãªã‹ã£ãŸï¼Ž + + * hash.c (hash_values): ãƒã‚°ä¿®æ£ï¼Žkeysã‚’è¿”ã—ã¦ã„ãŸâ€¦ï¼Ž + + * parse.y (call_op): defined? ã®å¼•æ•°ã§ã¯å®šæ•°ã®ç•³ã¿è¾¼ã¿ã‚’è¡Œã‚ãªã„ + (ãƒã‚§ãƒƒã‚¯ã™ã‚‹å‰ã«ã‚³ãƒ³ãƒ‘イルエラーã«ãªã£ã¦ã¯å›°ã‚‹)． + + * スコープ生æˆã®ä¸€éƒ¨è¦‹ç›´ã—． + +Thu Oct 5 00:29:43 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * 関数ã¨ã‚¯ãƒ©ã‚¹ã®å‘½åè¦å‰‡ã‚’変更ã—ãŸï¼Žé–¢æ•°å，変数åã®å…¨é¢æ›¸ãæ›ãˆï¼Ž + + * gc.c (looks_pointerp): ヒープãƒã‚§ãƒƒã‚¯ã®é«˜é€ŸåŒ–． + + * struct.c (Fstruct_aset): æ§‹é€ ä½“ã«å¯¾ã™ã‚‹`[]='． + (struct_set): æ§‹é€ ä½“ãƒ¡ãƒ³ãƒã«å¯¾ã™ã‚‹ä»£å…¥ï¼Ž + +Wed Oct 4 09:54:07 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.89 + + * eval.c (Frequire): ダイナミックãƒãƒ¼ãƒ‰ã®ã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ã‚’厳ã—ã． + + * struct.c: structã®æ§‹é€ を完全ã«æ›¸ãæ›ãˆãŸï¼Žä»¥å‰ã¯é †åºä»˜ãã® + id->valueã®é€£æƒ³é…列ã§ã‚ã£ãŸãŒï¼Œä»Šåº¦ã¯æ§‹é€ 体毎ã«æ–°ã—ã„クラスを生 + æˆã™ã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž + + * parse.y: `::'ã®æ„味をAssocã®ç”Ÿæˆã‹ã‚‰ã‚¯ãƒ©ã‚¹(モジュール)内ã®å®šæ•°ã‚¢ + クセスã¸å¤‰æ›´ï¼Ž + + * assoc.c: ãªãã™ï¼Ž + +Tue Oct 3 13:31:08 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * variable.c (Ftrace_var): trace_var, 大域変数ã¸ã®æ›¸ãè¾¼ã¿hookã‚’è¨ + 定ã™ã‚‹ï¼Ž + + * variable.c: global_entryã®æ§‹æˆã‚’書ãæ›ãˆãŸï¼Žã“ã‚Œã§trace_varを実 + 装ã§ãる． + + * file.c (Ffile_stat): "&"ã§ç›´å‰ã®fstatã®çµæžœã‚‚å‚ç…§ã§ãるよã†ã«ï¼Ž + +Fri Sep 29 14:15:13 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.88 + + * dln.c (dln_load): AIXã¨HPã«å¯¾å¿œã—ãŸã‚³ãƒ¼ãƒ‰ã‚’入れãŸ(動作ã¯æœªç¢ºèª)． + + * ext/extmk.rb.in: å¿…è¦ã«å¿œã˜ã¦ï¼Œå®šæ•°EXTLIBを定義ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * dln.c (dln_load): dln独立ã«æ›¸ãæ›ãˆã‚‹ï¼Žå°†æ¥ã®æ‹¡å¼µç”¨ï¼Ž + (load_1): dln_a_outã«ãŠã„ã¦ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰ã§ãƒ©ã‚¤ãƒ–ラリを明示的ã«ãƒãƒ¼ + ドã™ã‚‹å¿…è¦ãŒãªã„よã†ã«å¤‰æ›´ã—ãŸï¼Ž + +Thu Sep 28 13:31:37 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/ruby-mode.el: ã‚‚ã£ã¨ã¾ã—ãªhilit19対応(æ£è¦è¡¨ç¾)． + +Wed Sep 27 04:12:44 1995 Takahasi Mamoru <taka@soum.co.jp> + + * sample/test.rb: echoã§-nを使ã‚ãªã„よã†ã«(SysV対ç–)． + + * ext/extmk.rb.in: sub -> sub! + +Tue Sep 26 19:12:42 1995 Yasuo OHBA <jammy@csg.mes.co.jp> + + * dln.c (dln_find_1): `.', `..'ã‹ã‚‰å§‹ã¾ã‚‹ãƒ‘スã«å¯¾å¿œã—ãŸ. + +Mon Sep 25 12:33:03 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.87 + +Sat Sep 23 10:00:18 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (Fmod_modfunc): メソッドをprivateã«ã—，åŒæ™‚ã«ç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ + も定義ã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ï¼Žãƒ‘ッケージ的使ã„æ–¹ã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ç”¨ï¼Ž + +Fri Sep 22 11:02:44 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * lib/find.rb: findã‚’æä¾›ã™ã‚‹ãƒ©ã‚¤ãƒ–ラリ + + * variable.c (rb_define_variable): hookã®è¨å®šã‚’分離． + (add_hook): 1変数ã«å¯¾ã—ã¦è¤‡æ•°ã®hookã‚’è¨å®šã§ãるよã†ã«ï¼Ž + +Thu Sep 21 00:22:11 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (Fstr_frozen): æ–‡å—列ãŒæ›´æ–°ä¸å¯ã‹ã©ã†ã‹ã‚’ãƒã‚§ãƒƒã‚¯ã™ã‚‹è¿° + 語メソッド． + + * hash.c (Fhash_aset): keyãŒæ–‡å—列ã®æ™‚，ã‚ーã®å†…容ãŒå¤‰åŒ–ã—ãªã„よㆠ+ ã«ï¼Œdupã—ã¦freezeã™ã‚‹ï¼Ž + +Wed Sep 20 16:12:44 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.86 + + * ext/extmk.rb.in (have_header): ã‚ャッシュã«ãƒã‚°ï¼Ž + + * ext/extmk.rb.in (have_library): 引数ã®é †åºãŒå¤‰ã‚ã£ãŸï¼Ž + +Thu Sep 14 18:00:59 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * object.c (obj_is_instance_of): is_member_ofã‹ã‚‰å称変更． + + Wed Sep 13 15:44:35 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (Fstr_tr_bang): 範囲外ã®æ–‡å—ã«å¯¾ã™ã‚‹å¤‰æ›ãƒã‚°ï¼Ž + +Tue Sep 12 14:27:58 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (Sfile_expand_path): expand_file_name -> expand_pathã«å + 称変更． + + * enum.c (Fenum_member): includes? -> member? ã«å称変更． + + * string.c (Fstr_each_byte): Stringã¯ByteArrayã§ã‚ã‚‹ã¨ã„ã†åŸºæœ¬ã«æˆ»ã£ + ã¦ï¼Œeachã®å®šç¾©ã‚’each_byteã«å¤‰æ›´ã—ãŸï¼Žä»Šã¾ã§ã®eachã¯each_lineã§ã‚¢ + クセスã§ãる． + +Mon Sep 11 18:31:17 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (cache_stat): ファイルåã¨ã—ã¦"&"を指定ã™ã‚‹ã¨ç›´å‰ã® + stat(2)ã®çµæžœã‚’å†åˆ©ç”¨ã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Fri Sep 8 14:18:51 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ruby.texi: `!', `?'ã«å¯¾å¿œã—ã¦ã‚¢ãƒƒãƒ—デート． + + * parse.y: defined -> defined? + + * file.c: FileOpã®ä¸€æ–‡å—メソッドをãªãã™ï¼Žä¸€æ–‡å—テストã¯testメソッ + ドã«ã¾ã‹ã›ã‚‹ï¼Ž + + * parse.y (yylex): 変数åã®å¾Œã‚ã«`?'も許ã™ï¼Žè¿°èªžãƒ¡ã‚½ãƒƒãƒ‰ã®å¾Œã‚ã« + `?'ã‚’è¿½åŠ ã™ã‚‹ï¼Ž + +Thu Sep 7 20:01:33 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c: æ–‡å—列ã®ä¸èº«ã‚’æ›´æ–°ã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ã®åå‰ã®çµ‚ã‚Šã«`!'ã‚’ä»˜åŠ ï¼Ž + `!'ã®ç„¡ã„ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚‚用æ„ã—ãŸï¼Ž + + * parse.y: 変数åã®å¾Œã‚ã«`!'を許ã™ï¼Ž + +Wed Sep 6 14:12:19 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.85 + + * string.c (Fstr_dup): æ–‡å—列ã®è¤‡è£½ã‚’作る + (Fstr_freeze): æ–‡å—列ã®æ›´æ–°ä¸å¯å±žæ€§ã‚’è¨å®šã§ãるよã†ã«ï¼Ž + (Fsub/Fgsub): $_ã®å†…容をdupã—ã¦ã‹ã‚‰ç½®æ›ã‚’è¡Œã†ã‚ˆã†ã«ï¼Ž + + * ruby.h (CLONESETUP): flagsã®çŠ¶æ…‹ã‚‚コピー + +Tue Sep 5 01:27:50 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * sample/test.rb: 失敗ã®æ¤œå‡ºã‚’厳ã—ã． + +Fri Aug 25 14:31:02 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * process.c (Ffork): イテレータã¨ã—ã¦ã‚‚動作ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * version 0.84 + + * signal.c (sig_beg): ãƒãƒ³ãƒ‰ãƒ©ãŒè¨å®šã•ã‚Œã¦ã„る時ã«ã¯å†è¨å®šã—ãªã„． + + * ext/extmk.rb.in (create_makefile): shared objectã®ãƒªãƒ³ã‚¯ã®éš›ã« + `-l'オプションを指定ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * signal.c (trap): `EXIT'ã§çµ‚了処ç†ã‚’è¡Œã†è¨å®šãŒå‡ºæ¥ã‚‹ï¼Ž + +Wed Aug 16 00:13:22 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * signal.c (sig_beg): デフォルトã§ã¯begin節ã®ä¸ã§ã ã‘SIGINTã‚’æ•æ‰ + ã™ã‚‹ã‚ˆã†ã«å¤‰æ›´ï¼Ž + + * io.c (io_ctl): fcntlã‚’æŒãŸãªã„システムã«ã‚‚対応． + + * å„ディレクトリã«åˆ†æ•£ã—ã¦ã„ãŸMANIFESTã‚’ã¾ã¨ã‚ãŸï¼Žæ‹¡å¼µãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«æ¯Ž + ã«ã¯å¿…è¦ï¼Ž + + * string.c (Sstr_new,str_sub,Fstr_crypt): 引数を自動的ã«æ–‡å—列ã«å¤‰ + æ›ã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Sat Aug 12 00:44:02 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * string.c (Fstr_crypt): PD cryptを用æ„ã—ãŸï¼Ž + +Fri Aug 11 14:37:03 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * assoc.c (Fassoc_clone): assocã‚‚cloneã§ãるよã†ã«ï¼Ž + + * io.c: マクãƒREAD_DATA_PENDINGã®å®šç¾©ã‚’変更(Linux対応) + + * io.c (io_fptr_finalize): fptrã®é–‹æ”¾æ™‚ã®å‡¦ç†ã‚’指定ã§ãるよã†ã«ï¼Ž + +Wed Aug 9 16:52:41 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * eval.c (rb_provided): 複数ã®featureã‚’ãƒãƒ¼ãƒ‰ã™ã‚‹ã¨ç„¡é™ãƒ«ãƒ¼ãƒ—ã«è½ + ã¡ã‚‹ã¨ã„ã†å˜ç´”ãª(ã—ã‹ã—凶悪ãª)ミス． + + * ext/extmk.rb.in (install): dlopen対応を行ã£ãŸï¼Žä»Šã¾ã§dlnã«ã—ã‹å + 分ã«å¯¾å¿œã—ã¦ã„ãªã‹ã£ãŸï¼Ž + +Tue Aug 8 14:17:06 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.83 + +Mon Aug 7 12:47:41 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y: resque -> rescue．æ¥ãšã‹ã—ã„ãŒtypoを残ã—ã¦ãŠãã‚ã‘ã«ã¯ + ã„ã‹ãªã„よãªã‚．ãªã‚“ã§ä»Šã¾ã§æ°—ãŒã¤ã‹ãªã‹ã£ãŸã®ã‹â€¦ï¼Ž + +Thu Aug 3 18:18:05 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * missing/nt.c: NT移æ¤ç”¨ã®é–¢æ•°ç¾¤ã‚’ã¾ã¨ã‚ãŸï¼Ž + + * variable.c (rb_const_get): ã¾ãŸä¾‹å¤–を発生ã™ã‚‹ã‚ˆã†ã«ã—ãŸï¼Ždefined + ãŒã‚る以上例外を発生ã•ã›ãªã„ç†ç”±ãŒãªã„ã®ã§(例外ãŒç™ºç”Ÿã—ãŸæ–¹ãŒã‚¿ + イプミスã®æ¤œå‡ºãªã©ã®ç‚¹ã§æœ‰åˆ©)． + + * variable.c (Fautoload): autoloadを実装．今度ã¯ä½¿ãˆã‚‹ã‹ï¼Ž + +Mon Jul 31 15:44:21 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (arg_ambiguous): 第1引数ã®ã‚ã„ã¾ã„ã•ã‚’è¦å‘Š(-vオプション + ã§æœ‰åŠ¹)． + + * eval.c (rb_eval): `-v'オプションをã¤ã‘ã¦`def'ãŒå‘¼ã°ã‚Œã‚‹ã¨ä¸å¿…è¦ + ãªã‚¨ãƒ©ãƒ¼ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå‡ºãŸï¼Ž + + * parse.y (yylex): メソッドã®ç¬¬1引数ã®åˆ¤å®šã‚’ã‚‚ã†ã¡ã‚‡ã£ã¨è³¢ãã—ãŸï¼Ž + +Fri Jul 28 19:04:43 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (yylex): `+/-/['ã®ç›´å‰ã«ç©ºç™½ãŒæ¥ã‚‹ã‹ã©ã†ã‹ã§å‹•ä½œã‚’変更㗠+ ãŸ(æ··ä¹±ã®ã‚‚ã¨ã‹?) + +Wed Jul 26 09:21:23 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.82a + + * sprintf.c (Fsprintf): `%s'ã§'\0'ã‚’å«ã‚€æ–‡å—列ã«å¯¾å¿œï¼Ž + + * pack.c (Fpck_pack): packã®è¦ç´ 確ä¿ã®ãƒã‚°ï¼Ž + + * eval.c (Floop): ç„¡é™ãƒ«ãƒ¼ãƒ—ã®ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ï¼Ž + + * io.c (next_argv): å˜åœ¨ã—ãªã„ファイルåãŒæŒ‡å®šã•ã‚ŒãŸæ™‚ã®ã‚¨ãƒ©ãƒ¼å‡¦ç† + ãŒè¡Œã‚ã‚Œã¦ã„ãªã‹ã£ãŸï¼Ž + +Mon Jul 24 17:37:34 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.82 + + * ext/extmk.rb.in (install): 拡張モジュールをstatic linkã™ã‚‹å ´åˆã¯ + ãã®ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒæ—¢ã«requireã•ã‚ŒãŸã®ã¨åŒã˜ã‚ˆã†ã«featureã‚’è¨å®šã™ã‚‹ï¼Ž + ã“ã‚Œã§æ‹¡å¼µãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®æ©Ÿèƒ½ãŒå¿…è¦ãªæ™‚ã«ã¯(static linkã•ã‚Œã¦ã„ã‚‹ã‹ + ã©ã†ã‹ã«ã‹ã‹ã‚らãš)requireã™ã‚Œã°ã‚ˆããªã‚‹ï¼Ž + + * eval.c (Frequire): `$"'ã«æ ¼ç´ã™ã‚‹æ–‡å—列をフルパスã§ãªãフィーãƒãƒ£ + åã¨ã™ã‚‹ï¼Žrubyスクリプトをãƒãƒ¼ãƒ‰ã—ãŸæ™‚ã«ã¯`.rb'，オブジェクトを + ãƒãƒ¼ãƒ‰ã—ãŸæ™‚ã«ã¯`.o'をフィーãƒãƒ£åã«ä»˜åŠ ã™ã‚‹ï¼Žlispã®require㨠+ provideã®åƒãã«(å°‘ã—)è¿‘ã„． + +Thu Jul 20 12:50:05 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * Makefile.in (test): make testãŒã§ãるよã†ã«ï¼Ž + + * struct.c (struct_new): typo. + + * eval.c (rb_eval): `defined'ã‚’è¿½åŠ ï¼Žãƒ¡ã‚½ãƒƒãƒ‰/変数/定数ã®å®šç¾©çŠ¶æ…‹ + を知る事ãŒå‡ºæ¥ã‚‹ï¼Ž + +Wed Jul 19 18:04:01 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.81 + +Mon Jul 17 14:53:51 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * variable.c (rb_const_get): 未åˆæœŸåŒ–ã®CONSTANTã®å€¤ã‚’nilã«ã—ãŸï¼Žã— + ã‹ã—，今後ã¾ãŸä¾‹å¤–ã«æˆ»ã™å¯èƒ½æ€§ã¯ã‚る．è¦ã¯optionalãªã‚¯ãƒ©ã‚¹/モジュー + ルãŒå˜åœ¨ã™ã‚‹ã‹ãƒã‚§ãƒƒã‚¯ã—ãŸã„ã ã‘ãªã‚“ã ãªï¼Ž + + * st.c (int): grow_factorを固定ã«ã—ãŸ(大嶋ã•ã‚“ã®ãƒžã‚·ãƒ³ã«å¯¾å¿œ)． + +Fri Jul 14 00:48:40 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * ext/extmk.rb.in: ã‚ャッシュã®ãƒã‚°ã‚’ä¿®æ£ï¼Ž + + * parse.y (var_extend): #{$æ•°å—}ã«å¯¾å¿œã—ãŸï¼Ž + + * dln.c (dln_load_1): `Init_FILENAME'ã ã‘を有効ã«ï¼Ž`init_*'ã¯ä»Šå¾Œ + 実行ã—ãªã„． + + * ext/etc/etc.c : Etcモジュールを拡張モジュールã¨ã—ã¦åˆ†é›¢ï¼Žå®Ÿã¯NT + 対応ã¸ã®å¸ƒçŸ³ã ã£ãŸã‚Šã™ã‚‹ã‹ã‚‚ã—ã‚Œãªã„． + +Tue Jul 11 17:12:48 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * gcc -Wallã§å‡ºãŸwarningã‚’å…ƒã«ã‚½ãƒ¼ã‚¹ã‚’変更． + + * signal.c (trap): typo. + +Fri Jul 7 10:08:51 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.80 + + * ruby.texi: texinfo documentã‚’æ供．specã¨ruby.1ã¯ç„¡ããªã£ãŸï¼Ž + + * signal.c (Ftrap): 割込ã¿ç¦æ¢ä¸ã®ä¾‹å¤–発生ã«å¯¾å¿œï¼Ž + + * eval.c (Flambda): Blockオブジェクトを返ã™ï¼ŽBlock.newã¨åŒç¾©ï¼Ž + +Thu Jul 6 00:35:03 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * signal.c (Ftrap): SIG_DFLã®å‡¦ç†ã‚’変更．SIGINTã¸ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãƒãƒ³ + ドラを用æ„(例外を発生ã™ã‚‹)． + + * file.c (Sfile_expand_fname): パスåを絶対パスã«å±•é–‹ã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ï¼Ž + (Sfile_basename): basenameを得るメソッド．拡張åも外ã›ã‚‹ï¼Ž + (Sfile_dirname): basenameã®å対． + + * eval.c (rb_call): argument評価ä¸ã®ä¾‹å¤–発生ã«å¯¾å¿œï¼Ž + + * file.c (Ftest): `M', `A', `C'ã‚’è¿½åŠ . + +Tue Jul 4 12:36:33 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * file.c (Ftest): ファイルテスト用メソッド． + + * ruby.c (proc_options): `-r'ã‚ªãƒ—ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ ï¼Ž + + * parse.y (f_args): ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå¼•æ•°ã‚’è¿½åŠ ï¼Ž + + * eval.c (rb_call): 該当ã™ã‚‹å¼•æ•°ãŒç„¡ã„時，rest引数ã®å€¤ã‚’nilã«ï¼Ž + + * numeric.c (num_equal): 数値以外ã¨ã®æ¯”較ã§ä¾‹å¤–ãŒç™ºç”Ÿã—ã¦ã„ãŸï¼Ž + FALSEã‚’è¿”ã™ã‚ˆã†ã«ï¼Ž + + * eval.c (masign): 多é‡ä»£å…¥ã®rest部ã®å‹•ä½œãŒãŠã‹ã—ã‹ã£ãŸï¼Ž + +Sat Jun 17 01:03:16 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * parse.y (gettable): 未åˆæœŸåŒ–ã®ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã®å‚ç…§(独立ã—ãŸè˜åˆ¥å) + ã¯æ£å¼ã«ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã¨ã—ãŸï¼Ž + + * parse.y (read_escape): tokenbufを使ã‚ãªã„よã†ã«ä¿®æ£ï¼Žãã‚Œã«ã¨ã‚‚ + ãªã„，`\C-x',`\M-x'ãªã©ã®ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—表ç¾ã‚’復活．ã“ã‚Œã§ãƒ‰ã‚ュメン + トã¨å®Ÿéš›ã®å‡¦ç†ç³»ãŒä¸€è‡´ã—ãŸï¼Ž + +Thu Jun 15 15:42:00 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * re.c (re_regcomp): cacheã®ãƒã‚§ãƒƒã‚¯ã‚’改善． + +Mon Jun 12 18:50:51 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * version 0.79 + +Sat Jun 10 00:25:01 1995 Yukihiro Matsumoto <matz@caelum.co.jp> + + * re.c (re_regcomp): cache判定ã«`$='ã®å€¤ã‚‚åæ˜ ã•ã›ãŸï¼Ž + + * sample/test.rb: test suite作æˆï¼Ž + +Fri Jun 9 15:58:34 1995 Yukihiro Matsumoto <matz@ix-02> + + * re.c (re_regcomp): cacheã®åˆ¤å®šãŒé–“é•ã£ã¦ã„ãŸï¼Ž + +Fri Jun 9 00:01:35 1995 Yukihiro Matsumoto (matz@dyna) + + * eval.c (rb_yield): blockæ§‹é€ ä½“ã«åˆæœŸåŒ–ã—ã¦ã„ãªã„メンãƒ(iter)ãŒã‚㣠+ ãŸã®ã§ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ã®ãƒã‚¹ãƒˆãŒæ£ã—ã動作ã—ãªã‹ã£ãŸï¼Ž + +Thu Jun 8 00:59:03 1995 Yukihiro Matsumoto (matz@dyna) + + * re.c (=~): String以外ã¨ã®æ¯”較ãŒFALSEã‚’è¿”ã™ã‚ˆã†ã«(例外を発生ã—㦠+ ã„ãŸ)． + + * extmk.rb.in: 判定ã—ãŸå€¤ã‚’ファイルã«ã‚ャッシュã™ã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž + + * assoc.c (to_a): to_aメソッドãŒå†å®šç¾©ã•ã‚Œã¦ã„ãªã‹ã£ãŸï¼Ž + + * eval.c (rb_eval): åˆæœŸåŒ–ã•ã‚Œã¦ã„ãªã„ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã‚’引 + æ•°ã®ç„¡ã„メソッド呼ã³å‡ºã—ã¨è§£é‡ˆã™ã‚‹ï¼ŽãŸã ã—，(ç¾çŠ¶ã§ã¯)メソッド㌠+ 定義ã•ã‚Œã¦ã„ãªã„å ´åˆï¼Œã‚¨ãƒ©ãƒ¼ã«ã›ãšå¤‰æ•°æœªåˆæœŸåŒ–ã®waringを出ã—㦠+ nilã‚’è¿”ã—ã¦ã„る．「ruby -pe printã€ãªã©ãŒå®Ÿè¡Œã§ãã‚‹ã¨ã„ã†æ„味㧠+ ã¯ã‚ã‚ŠãŒãŸã„ã“ã®ä»•æ§˜ã¯ï¼Œã—ã‹ã—今後ã®æ¤œè¨ŽãŒå¿…è¦ã§ã‚る．-- メソッ + ド呼ã³å‡ºã—ã¨ã™ã‚‹ã®ã‚’æ¢ã‚ã‚‹ã‹(以å‰ã®ä»•æ§˜)，ã„ã¤ã‚‚メソッド呼ã³å‡ºã— + ã¨ã™ã‚‹(未定義ãªã‚‰ã°ã‚¨ãƒ©ãƒ¼)ã‹ï¼Œä»Šã®ä»•æ§˜ã§è¡Œãã‹ï¼Ž + + * eval.c (rb_eval): åˆæœŸåŒ–ã•ã‚Œã¦ã„ãªã„ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã§ + (evalãªã©ã§)åˆæœŸåŒ–ã•ã‚ŒãŸäº‹ãŒåˆ†ã‹ã£ãŸæ™‚ã«ã¯ä»¥å¾ŒåˆæœŸåŒ–ã•ã‚ŒãŸãƒãƒ¼ã‚« + ル変数ã¨ã¿ãªã™ï¼Ž + +Wed Jun 7 11:58:12 1995 Yukihiro Matsumoto <matz@ix-02> + + * eval.c (rb_fail): 例外処ç†å¾Œã‚‚`$!'をクリアã—ãªã„よã†ã«ï¼Ž + (rb_fail): `$!'変数ã«æœ€å¾Œã«æ”¹è¡Œã‚’è¿½åŠ ã—ãªã„． + + * io.c (Fprint): privateメソッドã«å¤‰æ›´ï¼Žå¼•æ•°ã‚’å–らãªã„時ã®å‹•ä½œã‚’変 + æ›´(`$_'を出力ã™ã‚‹)． + (Fio_print): 出力先指定ã®printメソッド． + (Fio_printf): 出力先指定ã®printfメソッド． + + * parse.y: not演算åã®è¿½åŠ ï¼Žå„ªå…ˆé †ä½ã®ä½Žã„`!'演算å． + +Mon Jun 5 19:00:55 1995 Yukihiro Matsumoto <matz@ix-02> + + * version 0.78 + +Fri Jun 2 17:52:03 1995 Yukihiro Matsumoto <matz@ix-02> + + * ruby.c (proc_options): -Iオプションã§`$:'ã¸ã®è¿½åŠ ã•ã‚Œã‚‹é †ç•ªã‚’ä¿® + æ£ã—ãŸï¼Ž + +Fri Jun 2 00:36:34 1995 Yukihiro Matsumoto (matz@dyna) + + * parse.y: while修飾åã®å‹•ä½œã‚’通常ã®whileã¨åŒã˜ã«ã—ãŸï¼ŽãŸã ã—， + beginå¼ã¸ã®while修飾åã ã‘ã¯do..whileåž‹ã®ãƒ«ãƒ¼ãƒ—ã¨ãªã‚‹ï¼Ž + +Wed May 31 18:36:30 1995 Yukihiro Matsumoto <matz@ix-02> + + * version 0.77 + +Mon May 29 18:39:37 1995 Yukihiro Matsumoto <matz@ix-02> + + * ext/extmk.rb.in (install): 拡張モジュールもインストールã§ãるよ + ã†ã«ï¼Ž + +Fri May 26 14:43:01 1995 Yukihiro Matsumoto <matz@ix-02> + + * process.c (Fsystem): 戻り値をサブプãƒã‚»ã‚¹ã®å¤±æ•—/æˆåŠŸã‚’表ã™çœŸå½å€¤ + ã«ã—ãŸï¼Žçµ‚了ステータスã¯`$?'ã§å¾—る． + +Tue May 23 10:58:11 1995 Yukihiro Matsumoto <matz@ix-02> + + * string.c (Fstr_upto): ç„¡é™ãƒ«ãƒ¼ãƒ—ã«é™¥ã‚‰ãªã„よã†ã«ï¼Ž + + * parse.y (cond): `||'ãªã©ã®å³è¾ºã«åˆ¶å¾¡å¼ãŒæ›¸ã‘るよã†ã«ï¼Œæ¡ä»¶å¼ãŒã‹ + ãªã‚‰ãšã—も値をæŒãŸãªãã¦ã‚‚良ã„よã†ã«ã—ãŸï¼Ž + + * ext/marshal/marshal.c: オブジェクトã®èªã¿æ›¸ãをメソッドã®å†å®šç¾© + ã§ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã§ãるよã†ã«ï¼Žã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãŒ`_dump_to'ã¨ã„ã†ãƒ¡ã‚½ãƒƒ + ドを定義ã—ã¦ã„る時ã¯ãã¡ã‚‰ã‚’使ã†ã‚ˆã†ã«ï¼Ž + + * ext/extmk.rb.in: static linkã‚‚è¨å®šã§ãるよã†ãªä»•æ§˜ã«ã—ãŸï¼Ž + ext/Setupã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåを記述ã™ã‚‹ã¨ãã®ãƒ‡ã‚£ãƒ¬ã‚¯ + トリã«å˜åœ¨ã™ã‚‹ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã¯static linkã•ã‚Œã‚‹(ã¯ãš)． + + * eval.c (rb_eval): `..'を文法ã«çµ„ã¿è¾¼ã¿ï¼Œ`..'ã¨`...'ã®å‹•ä½œã‚’perl + ã«åˆã‚ã›ãŸï¼Ž + +Sat May 20 01:22:48 1995 Yukihiro Matsumoto (matz@dyna) + + * io.c (select): timeout時ã¨å‰²è¾¼ã¿æ™‚ã®å‹•ä½œã®æ˜Žç¢ºåŒ–． + +Fri May 19 15:33:23 1995 Yukihiro Matsumoto <matz@ix-02> + + * version 0.76 + +Fri May 19 00:48:08 1995 Yukihiro Matsumoto (matz@dyna) + + * string.c (Fstr_each): イテレータブãƒãƒƒã‚¯ä¸ã§æ–‡å—列ã®å¤‰æ›´ãŒè¡Œã‚ã‚Œ + ãŸã‹ã©ã†ã‹ã‚’ãƒã‚§ãƒƒã‚¯ï¼Žãƒã‚¤ãƒ³ã‚¿ã®å€¤ãŒå¤‰ã‚ã£ã¦ã„ã‚Œã°ä¾‹å¤–を発生ã™ã‚‹ï¼Ž + + * ruby-mode.el: ruby-electric-braceã®æ–°è¨ï¼Ž + +Thu May 18 12:27:23 1995 Yukihiro Matsumoto <matz@ix-02> + + * string.c (Fstr_tr): trã®ç½®æ›å¯¾è±¡ã«`\0'ã‚’å«ã‚€æ™‚ã«æ£ã—ãç½®æ›ã‚’行゠+ ãªã„ãƒã‚°ãŒã‚ã£ãŸï¼Žæ›´ã«ç½®æ›æ–‡å—列をASCIIé †ã«æŒ‡å®šã—ãªã„ã¨å‹•ä½œã—㪠+ ã„å•é¡Œã‚‚ã‚ã£ãŸï¼Žçµæžœã¨ã—ã¦trを書ãæ›ãˆãŸã®ã§ï¼Œcopyrightã®å•é¡Œã¯ + ç„¡ããªã£ãŸ(ã¨æ€ã†)． + + * gc.c (gc): the_scopeをマークã—ã¦ã„ãªã‹ã£ãŸã®ã§ï¼Œãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã®æŒ‡ + ã—ã¦ã„るオブジェクトãŒé–“é•ã£ã¦é–‹æ”¾ã•ã‚Œã‚‹å ´åˆãŒã‚ã£ãŸï¼Ž + + * gc.c (mark_locations_array): 若干ã®é«˜é€ŸåŒ–． + +Mon May 15 11:43:49 1995 Yukihiro Matsumoto <matz@ix-02> + + * ext/extmk.rb.in: Dynamic Loadモジュールã®ã‚³ãƒ³ãƒ‘イル用ãƒã‚§ãƒƒã‚¯ã‚’ + è¡Œã†ruby script．autoconfã«è¿‘ã„感覚ã§ä½¿ãˆã‚‹ï¼Žæ–°ã—ã„モジュールを + æä¾›ã—ãŸã„人ã¯extã®ä¸‹ã«ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作るã ã‘ã§è‰¯ã„ï¼Žå¿…é ˆã®ãƒ•ã‚¡ + イルã¯ãƒ•ã‚¡ã‚¤ãƒ«åã®ä¸€è¦§ã‚’記録ã—ãŸ`MANIFEST'ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ï¼Žå¿… + è¦ã«å¿œã˜ã¦`depend'(ファイルã®ä¾å˜é–¢ä¿‚を記述ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ« gcc -MM + ã®å‡ºåŠ›)，`extconf.rb'(コンパイル用ã«ãƒ©ã‚¤ãƒ–ラリã¨é–¢æ•°ã®å˜åœ¨ãƒã‚§ãƒƒ + クã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«)を用æ„ã§ãる． + + * eval.c (rb_call): rubyメソッドã®å¼•æ•°ãƒã‚§ãƒƒã‚¯æ™‚ã«æœªåˆæœŸåŒ–ã® + jmp_bufを使用ã—ã¦ã„ãŸï¼Ž + + * parse.y: `or'ã¨`and'ã®å„ªå…ˆé †ä½ã‚’åŒã˜ã«ã—ãŸï¼Ž + +Wed May 3 18:21:36 1995 Yukihiro Matsumoto (matz@dyna) + + * dln.c: Linuxã§ã¯`__.SYMDEF/'ã§ã‚ã£ãŸï¼Ž + + * dln.c: system callã®ã‚¨ãƒ©ãƒ¼ãƒã‚§ãƒƒã‚¯ã‚’忘れã¦ã„ãŸï¼Ž + +Wed Apr 26 09:50:56 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: イテレータブãƒãƒƒã‚¯ã®å¤‰æ•°å®£è¨€ã‚’`|'ã§æ‹¬ã‚‹ã‚ˆã†ã«ã—ãŸï¼Žã“ã‚Œ + ã§ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿å¤‰æ•°ãŒãªã„時ã¯å®£è¨€ãã®ã‚‚ã®ã‚’çœç•¥ã§ãる．文法ã®å¤‰æ›´ã¯ + ä¹…ã—ã¶ã‚Šã ． + +Tue Apr 25 12:04:17 1995 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(require): loadã‹ã‚‰ãƒ€ã‚¤ãƒŠãƒŸãƒƒã‚¯ãƒãƒ¼ãƒ‰ã®æ©Ÿèƒ½ã‚’移ã—ã¦ããŸï¼Ž + ã•ã‚‰ã«æ‹¡å¼µåã®è£œå®Œæ©Ÿèƒ½ã‚’è¿½åŠ ã—ã¦ãƒ¦ãƒ¼ã‚¶ãŒdln/dlopenã®å·®ã‚’æ„è˜ã™ã‚‹ + å¿…è¦ã®ãªã„よã†ã«ã—ãŸï¼Ž + + * string.c(sub,sub): イテレータã¨ã—ã¦ã‚‚動作ã™ã‚‹ã‚ˆã†ã«ï¼Ž + + * object.c: init_object -> initialize. + +Mon Apr 24 14:22:39 1995 Yukihiro Matsumoto (matz@ix-02) + + * NEWS-OS 3.4対応 + + * io.c: Solarisã®stdioã®å‹•ä½œãŒé•ã†ã‚ˆã†ã ．signalã§EOFã‚’è¿”ã—ã¦ã—ã¾ + ã†â€¦ï¼Žperlã§ã‚‚åŒæ§˜ã®å•é¡ŒãŒã‚る． + +Fri Apr 21 20:04:39 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.75 + + * signal.c: trapãŒãªããªã£ã¦ã„ãŸï¼Žã†ãƒ¼ã‚€ï¼Ž + + * configure: Solaris 2.3対応． + + * io.c: #elifã®ãªã„cppã‚‚ã‚る． + + * dir.c: autoconf 2.xã¸ã®å¯¾å¿œãŒä¸å分 + +Thu Apr 20 12:31:24 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.74 + + * env.h, gc.c, regex.c: IRIXã¸ã®ç§»æ¤å¯¾å¿œ + + * configure: dlopen用ã«picを生æˆã™ã‚‹optionã®æ¤œå‡ºã®ãŸã‚，システムタ + イプをãƒã‚§ãƒƒã‚¯ã™ã‚‹ã‚ˆã†ã«ï¼Ž + +Tue Apr 18 19:08:17 1995 Yukihiro Matsumoto (matz@ix-02) + + * gc.c(xrealloc): ptr=nilã®æ™‚，malloc()ã¨åŒã˜åƒãã‚’ + + * array.c(astore): 空ã®é…列ã®0番目ã®è¦ç´ ã«ä»£å…¥ã™ã‚‹ã¨size=0㧠+ realloc()を呼んã§ã„ãŸï¼Ž + + * configure, glob.c: Solaris 2.xã§ã‚³ãƒ³ãƒ‘イルã§ãるよã†ã« + +Mon Apr 10 18:36:06 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.73 + +Fri Apr 7 13:51:08 1995 Yukihiro Matsumoto (matz@ix-02) + + * cons.c->assoc.c: consã®ä½™è¨ˆãªæ©Ÿèƒ½ã¯å¤–ã—ã¦pairã¨ã—ã¦ã®æ©Ÿèƒ½ã ã‘ã‚’ + 残ã—ãŸï¼ŽEnumerableã‚’includeã™ã‚‹ã®ã‚‚ã‚„ã‚ãŸï¼Ž + + * string.c(esub): æ–‡å—列置æ›ã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿ï¼Žperlã®s///eã®ç›¸å½“ã™ã‚‹ï¼Ž + +Wed Apr 5 11:35:21 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.72 + + * EWS4800対応 + + * file.c: utimesãŒãªã„時ã¯utimeを使ã†ã‚ˆã†ã«ï¼Ž + +Mon Apr 3 15:19:41 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.71 + + * regexp.c(re_match): ãƒã‚°ãŒã‚ã£ãŸï¼Žmatch_2を削除ã—ãŸæ™‚ã«enbugã—㦠+ ã„ãŸã®ã ã£ãŸï¼Ž + +Mon Mar 27 15:41:43 1995 Yukihiro Matsumoto (matz@ix-02) + + * dict.c: Dict->Hashã«å…¨é¢çš„ã«ç§»è¡Œï¼Ž + +Thu Mar 23 20:30:00 1995 Yukihiro Matsumoto (matz@ix-02) + + * dbm.c,socket.c: extディレクトリã«åˆ†é›¢ï¼Ž + + * configure: dln周りã®ãƒã‚§ãƒƒã‚¯ã®å¼·åŒ– + + * dln.c: initã®å‘¼ã³å‡ºã—ã‚’dlopen()版ã«åˆã‚ã›ãŸï¼Ž + +Mon Mar 20 17:45:08 1995 Yukihiro Matsumoto (matz@ix-02) + + * configure: autoconf 2.2ã«å¯¾å¿œ(一部)． + +Fri Mar 17 15:56:44 1995 Yukihiro Matsumoto (matz@ix-02) + + * dln.c: dlopenã®ã‚るマシンã§ã¯ãã¡ã‚‰ã‚’使ã†ã‚ˆã†ã«ï¼ŽãŸã ã—，ã¡ã‚ƒã‚“ + ã¨å‹•ã„ã¦ã„ã‚‹ã‹ã©ã†ã‹ã¯è‡ªä¿¡ãŒãªã„． + + * regex.c: virtual concatinationã‚’ã‚„ã‚ãŸï¼Ž + +Thu Mar 16 11:32:57 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.70 + + * eval.c,regex.c: gccã§ã®ã‚³ãƒ³ãƒ‘イルエラー． + + * io.c: inplace-editã§æ‹¡å¼µåãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆï¼Œã‚‚ã¨ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削 + 除ã™ã‚‹ï¼Ž + +Wed Mar 15 14:59:18 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.69 + + * eval.c(method_missing): unknownã‹ã‚‰å称変更． + + * eval.c(single_method_added): 特異メソッドãŒå®šç¾©ã•ã‚ŒãŸæ™‚ã«å‘¼ã°ã‚Œ + るメソッド．hookã¨ã—ã¦ä½¿ãˆã‚‹ï¼Žå®Ÿéš›ã«å®šç¾©ã•ã‚Œã‚‹ç›´å‰ã«å‘¼ã°ã‚Œã‚‹ï¼Ž + +Tue Mar 14 14:46:44 1995 Yukihiro Matsumoto (matz@ix-02) + + * ruby.c(proc_options): 引数ã®è§£æžã‚’自分ã§ã‚„ã‚‹ã“ã¨ã«ã‚ˆã‚Šå¼•æ•°æŒ‡å®šã® + 方法ãŒperlã«è¿‘付ã„ãŸï¼Žgetopt_longã¯ã‚‚ã†ä½¿ã‚ãªã„． + + * dir.c(glob): `{}'ã®ãƒã‚¹ãƒˆã‚’許ã™ã‚ˆã†ã«ã—ãŸï¼Ž + +Mon Mar 13 17:56:25 1995 Yukihiro Matsumoto (matz@ix-02) + + * glob.c: Glob(ワイルドカードオブジェクト)ã¯ãªããªã£ãŸï¼Žãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ + ドã®å±•é–‹ã¯Dir.glob(æ–‡å—列)を使ã†ï¼Žãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã®ãƒžãƒƒãƒã¯æ£è¦è¡¨ + ç¾ã§ä»£ç”¨ï¼Ž + +Fri Mar 10 18:35:46 1995 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: Mathã®ã‚ˆã†ãªãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã¯è‡ªåˆ†è‡ªèº«ã§extendã™ã‚‹ï¼Ž + + * eval.c: クラスやモジュールを定義ã™ã‚‹æ™‚，既ã«åŒåã®ã‚‚ã®ãŒã‚ã‚Œã°è¿½ + åŠ å®šç¾©ã¨ãªã‚‹ã‚ˆã†ã«ï¼ŽãŸã ã—．superクラスã®é•ã„ãªã©ã¯ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Ž + + * regex.c: debug. + + * math.c: 定数PIã¨Eを定義． + +Thu Mar 9 21:35:12 1995 Yukihiro Matsumoto (matz@ix-02) + + * regex.c: EUC,SJISモードã§ã¯0x80以上ã®8進，16進リテラルをç¦æ¢ï¼Ž + + * regex.c: クラス内ã§ã‚‚数値リテラル・文å—クラスãŒä½¿ãˆã‚‹ã‚ˆã†ã—ãŸï¼Ž + +Wed Mar 8 17:39:05 1995 Yukihiro Matsumoto (matz@ix-02) + + * regex.c: \200ãªã©æ‹¬å¼§ã®æ•°ä»¥ä¸Šã®è¡¨ç¾ã¯8進リテラルã¨è§£é‡ˆã™ã‚‹ï¼ŽãŸã + ã—，\1ã‹ã‚‰\9ã¾ã§ã¯ä¾‹å¤–． + + * regex.c: \9以上ã®ãƒªãƒ•ã‚¡ãƒ¬ãƒ³ã‚¹ã‚‚有効ã«ã—ãŸï¼Ž + +Tue Mar 7 14:26:01 1995 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(public/private): スコープ制御メソッドã®å称変更．é™çš„ãªã‚¢ + クセスも出æ¥ã‚‹ã‚ˆã†ã«ã—ã¦ã¿ãŸãŒï¼Œä¸æŽ¡ç”¨ï¼Ž + +Mon Mar 6 19:34:32 1995 Yukihiro Matsumoto (matz@ix-02) + + * eval.c(inlcude): メソッド化．動的ã«ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’インクルードã§ã + るよã†ã«ï¼Žã•ã‚‰ã«ä»»æ„ã®ã‚ªãƒ–ジェクトã«ã‚‚モジュールをインクルード㧠+ ãるメソッド `extend'も用æ„ã—ãŸï¼Ž + + * parse.y: 文法ã‹ã‚‰includeを削除．メソッド化． + +Tue Feb 28 15:35:10 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: é…列，連想é…列ã®æœ€å¾Œã«`,'ã‚’ãŠã‘るよã†ã«ï¼Ž + +Fri Feb 24 13:15:43 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.68 + +Thu Feb 23 11:19:19 1995 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: resque節ã®selfã®å€¤ãŒé–“é•ã£ã¦ã„ãŸï¼Ž + + * eval.c(rb_clear_cache): ã‚ャッシュã®ã‚¯ãƒªã‚¢ã—忘れãŒã‚ã£ãŸï¼Ž + + * eval.c: 定数ã®ã‚¹ã‚³ãƒ¼ãƒ—をクラス内ã®é™çš„スコープã«å¤‰æ›´ã—ãŸï¼Žã“れ㫠+ よã£ã¦ï¼Œç‰¹ç•°ãƒ¡ã‚½ãƒƒãƒ‰ã‹ã‚‰å‚ç…§ã•ã‚Œã‚‹å®šæ•°ã¯ï¼Œãƒ¬ã‚·ãƒ¼ãƒã®ã‚¯ãƒ©ã‚¹ã§ã¯ãª + ã，定義ã•ã‚ŒãŸã‚¹ã‚³ãƒ¼ãƒ—ã®ã‚¯ãƒ©ã‚¹ã®å®šæ•°ã¨ãªã‚‹ï¼Ž + +Wed Feb 22 00:51:38 1995 Yukihiro Matsumoto (matz@dyna) + + * regex.c: ignorecaseã‚’æ£è¦è¡¨ç¾ã®ã‚³ãƒ³ãƒ‘イルå‰ã«æŒ‡å®šã—ãªã„ã¨æ£ã—ã + 動作ã—ãªã„．修æ£ï¼Ž + + * string.c(toupper,tolower): bug fix. + + * ENV,VERSION: readonly変数ã‹ã‚‰å®šæ•°ã¸ï¼Ž + +Tue Feb 21 18:56:56 1995 Yukihiro Matsumoto (matz@ix-02) + + * io.c(STDIN, STDOUT, STDERR): 定数ã¨ã—ã¦å®šç¾©ï¼Ž + + * io.c(select): bug fix. + + * version 0.67 + +Mon Feb 20 16:10:14 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(yylex): 定数を`%è˜åˆ¥å'ã‹ã‚‰ï¼Œç¬¬1æ–‡å—ãŒå¤§æ–‡å—ã®è˜åˆ¥åã«å¤‰ + 更．ãã‚Œã«ã¨ã‚‚ãªã„クラスã¯å®šæ•°ã¨ãªã£ãŸï¼Ž + + * eval.c: クラス定義内ã®selfãŒã‚¯ãƒ©ã‚¹å®šç¾©å¤–部ã®the_classã ã£ãŸï¼Ž + + * variable.c(rb_name_class): クラスåをインスタンス変数ã«æ ¼ç´ã™ã‚‹ï¼Ž + +Thu Feb 16 15:36:17 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: BLOCKã‚’braceã§è¡¨ç¾ã™ã‚‹æ–‡æ³•ã«å¤‰æ›´ã—ãŸã‚‚ã®ã‚’作ã£ã¦ã¿ã‚‹ï¼Ž + MLã«æ示ã—ã¦ã¿ã‚‹ãŒåå¿œãŒãªã„． + + * object.c(do,forever): ãªãã—ãŸï¼Ž + +Wed Feb 15 13:20:49 1995 Yukihiro Matsumoto (matz@ix-02) + + * re.c(new): 第2引数ãŒä¸Žãˆã‚‰ã‚Œã¦ï¼Œã‹ã¤nilã§ãªã„ã¨ãã ã‘è¨å®šã™ã‚‹ã‚ˆ + ã†ã«(以å‰ã¯nilã®æ™‚ã«ã‚‚è¨å®šã‚’è¡Œãªã£ã¦ã„ãŸ)． + + * parse.y(parse_regexp): æ£è¦è¡¨ç¾ãƒªãƒ†ãƒ©ãƒ«ã§å¤§æ–‡å—å°æ–‡å—を無視ã™ã‚‹ + ã‹ã©ã†ã‹æŒ‡å®šã§ãるよã†ã«ï¼Ž + +Tue Feb 14 00:55:33 1995 Yukihiro Matsumoto (matz@dyna) + + * parse.y: (compexpr) -> (expr). + +Fri Feb 10 16:30:00 1995 Yukihiro Matsumoto (matz@ix-02) + + * ruby.c(load_file): scriptã‚’èªã¿è¾¼ã‚€æ™‚ã ã‘"#!"ã®è§£æžã‚’è¡Œã†ã‚ˆã†ã«ï¼Ž + + * ruby.c(readin): ファイルèªã¿è¾¼ã¿æ™‚ã«å…ˆé ã«"#!"ãŒã‚り，ãã®è¡ŒãŒ + "ruby"ã¨ã„ã†æ–‡å—列をå«ã‚€æ™‚，rubyã«å¼•æ•°ãŒä¸Žãˆã‚‰ã‚Œã¦ã„ã‚Œã°ï¼Œãã®å¼• + 数も有効ã«ãªã‚‹ï¼Ž + + * parse.y(yylex): コメント行ã®çµ‚ã‚ŠãŒ`\'ã§ã‚ã£ãŸæ™‚，次ã®è¡Œã«ç¶™ç¶šã— + ã¦ã„ã‚‹ã¨ã¿ãªã™ã‚ˆã†ã«ã—ãŸï¼Ž + +Thu Feb 9 16:18:37 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.66 + + * parse.y: protectã‚’beginã«å¤‰æ›´ï¼Žbegin..endã¯ä¾‹å¤–処ç†ã ã‘ã§ãªã， + 文括弧ã¨ã—ã¦ã‚‚åƒãã“ã¨ã«ãªã£ãŸï¼Ž + +Wed Feb 1 19:48:24 1995 Yukihiro Matsumoto (matz@ix-02) + + * version 0.65 + + * string.c(str_replace): ç½®ãæ›ãˆã‚‹æ–‡å—列ã®é•·ã•ãŒç‰ã—ã„時メモリコ + ピーをã—ãªã„． + + * string.c(rindex): ãƒã‚°ä¿®æ£ï¼Ž + +Mon Jan 30 11:23:05 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(value_expr): ifã®ãƒã‚§ãƒƒã‚¯ã‚’è¿½åŠ ï¼Ž + + * gc.c(gc_mark): free cellã®æ‰±ã„ã«ãƒã‚°ï¼Ž + + * parse.y: 文法ã®å¤‰æ›´(よりシンプルã«)．例外を減らã—ãŸï¼Ž + +Thu Jan 26 00:52:55 1995 Yukihiro Matsumoto (matz@dyna) + + * parse.y: 引数ã¨ã—ã¦é€£æƒ³é…列を置ãã“ã¨ãŒã§ãるよã†ã«ï¼Žã“ã®å ´åˆï¼Œ + 連想é…列リテラルãŒæœ€çµ‚引数ã¨ãªã‚‹ï¼Ž + + * parse.y: é…列å‚ç…§ã®`[]'内ãŒç©ºã§ã‚‚よã„ã“ã¨ã«ã—ãŸï¼Ž + +Tue Jan 24 14:45:15 1995 Yukihiro Matsumoto (matz@ix-02) + + * class.c(rb_include_module): `-v'を指定ã—ãŸæ™‚ã«ã¯includeã—ãŸãƒ¢ã‚¸ãƒ¥ãƒ¼ + ルã¨ã‚¯ãƒ©ã‚¹å®šæ•°ãŒè¡çªã—ã¦ã„ãªã„ã‹ãƒã‚§ãƒƒã‚¯ã™ã‚‹ï¼Ž + +Mon Jan 23 10:42:09 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(rb_class2name): メタクラスã«é–¢ã™ã‚‹bug fix. + + * dict.c: Dict[..]ã§è¾žæ›¸ã®ç”ŸæˆãŒå‡ºæ¥ã‚‹ã‚ˆã†ã«ï¼Ž + + * array.c: Array[..]ã§é…列ã®ç”ŸæˆãŒå‡ºæ¥ã‚‹ã‚ˆã†ã«ï¼Ž + + * parse.y: 辞書ã®è¡¨ç¾ã¨ã—ã¦{a,b,..}ã¨ã„ã†å½¢å¼ã‚‚許ã™ã‚ˆã†ã«ï¼Ž + +Fri Jan 20 10:28:38 1995 Yukihiro Matsumoto (matz@ix-02) + + * re.c(Regexp.quote): æ£è¦è¡¨ç¾ã‚’エスケープã™ã‚‹ãƒ¡ã‚½ãƒƒãƒ‰ï¼Ž + + * 無駄ãªrb_intern()を減らã—ãŸï¼Ž + + * parse.y: `!', `!=', `!~'を特殊演算åã«ã™ã‚‹ï¼Žã‚ˆã£ã¦ã“れらã¯å†å®šç¾© + ã§ããªããªã£ãŸï¼Ž + +Wed Jan 18 13:20:41 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: 文法ã®æ•´ç†(unless,untilã‚’ãªãã—ãŸ)． + +Tue Jan 17 11:11:27 1995 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: defã§ãƒ¡ã‚½ãƒƒãƒ‰å†å®šç¾©æ™‚ã«ã¯ã‚¹ãƒ¼ãƒ‘ークラスã®ãƒ¡ã‚½ãƒƒãƒ‰ã®å¯è¦– + 性を継承ã™ã‚‹ï¼Žæœ€åˆã®å®šç¾©ã®æ™‚ã¯ä»Šã¾ã§ã¨åŒã˜ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ(トップレベ + ルã§é–¢æ•°çš„，クラス定義内ã§é€šå¸¸ãƒ¡ã‚½ãƒƒãƒ‰)． + + * object.c(Class#new): オブジェクトã®ç”Ÿæˆæ™‚ã«é–¢æ•°çš„メソッド + init_objectãŒå¿…ãšå‘¼ã°ã‚Œã‚‹ã‚ˆã†ã«å¤‰æ›´ï¼Ž + + * eval.c: 未定義ã®ãƒ¡ã‚½ãƒƒãƒ‰ã«å¯¾ã—ã¦unknownメソッドãŒå‘¼ã°ã‚Œã‚‹ã‚ˆã†ã« + ãªã£ãŸï¼Žã‚¨ãƒ©ãƒ¼è¡¨ç¤ºãŒä»Šã¾ã§ã¨åŒã˜ã«ãªã‚‹ã‚ˆã†ã«envを調節ã—ã¦ã„る． + +Fri Jan 13 14:40:30 1995 Yukihiro Matsumoto (matz@ix-02) + + * gc.c: gcを若干書ãæ›ãˆã¦æ•´ç†ã—ãŸï¼ŽãŒï¼Œã‚ã¾ã‚Šå¤‰åŒ–ã¯ãªã‹ã£ãŸã‚ˆã†ã ． + + * parse.y(yylex): symbolã‚’\symã‹ã‚‰:symã«å¤‰æ›´ã—ãŸï¼Ž + +Thu Jan 12 01:39:28 1995 Yukihiro Matsumoto (matz@dyna) + + * eval.c: æ–°è¦é–¢æ•° rb_eval_string()． + + * gc.c: gc_mark()を一部éžå†å¸°åŒ–． + + * variable.c(rb_ivar_{get,set}): インスタンス変数ã®ã‚¢ã‚¯ã‚»ã‚¹å‘¨ã‚Šã§ + ãƒã‚§ãƒƒã‚¯ãŒè¶³ã‚Šãªã‹ã£ãŸï¼Ž + + * variable.c: クラス定数ã¨ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã§ãƒãƒƒã‚·ãƒ¥ãƒ†ãƒ¼ãƒ–ルを共有 + ã™ã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž + + * ruby.h: iv_tblã‚’RBasicã‹ã‚‰RObjectã¨RClassã¸ç§»å‹•ã—ãŸï¼Žã“ã‚Œã«ã‚ˆã‚Šï¼Œ + Objectã¨Class,Moduleã—ã‹ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹å¤‰æ•°ã‚’æŒã¦ãªããªã‚‹ï¼ŽãŒï¼Œãƒ¡ãƒ¢ + リ効率ã¯è‹¥å¹²å‘上ã™ã‚‹ï¼Ž + +Tue Jan 10 00:58:20 1995 Yukihiro Matsumoto (matz@dyna) + + * 0.64 released + + * eval.c: レシーãƒã¨å¼•æ•°ã¯å¸¸ã«iterã§ã¯ãªã„． + + * cons.c(aref,aset): negative offset対応． + +Mon Jan 9 14:40:39 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: foo{..}ã®å½¢å¼ã«ãŠã„ã¦ï¼Œfooã‚’ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ã‚„クラスåã§ã¯ + ãªã，引数ãªã—ã®é–¢æ•°åž‹ãƒ¡ã‚½ãƒƒãƒ‰å‘¼ã³å‡ºã—ã¨ã¿ãªã™ã‚ˆã†ã«ã—ãŸï¼Ž + + * list.c -> cons.c: å称変更(クラスåã‚‚)． + + * list.c: a::b::c::nilをリスト(a b c)ã¨ã¿ãªã™lispå½¢å¼ã‹ã‚‰ï¼Œa::b::c + をリスト(a b c)ã¨ã¿ãªã™rubyå½¢å¼ã«å¤‰æ›´ï¼Ž[], []=, eachã‚‚ãã‚Œã«ä¼šã‚ + ã›ãŸä»•æ§˜ã¨ã™ã‚‹ï¼Ž + + * list.c: consペアã¨ã—ã¦ã®æ©Ÿèƒ½ã‚’強調．仕様変更． + +Sat Jan 7 01:26:26 1995 Yukihiro Matsumoto (matz@dyna) + + * eval.c: 自己代入ã®ä¸å…·åˆä¿®æ£ï¼Ž + + * eval.c(masign): 多é‡ä»£å…¥ãŒé…列もリストもã¨ã‚Œã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž + + * list.c: assocã‚’2è¦ç´ ã®é…列ã‹ã‚‰List(CONSペア)ã«å¤‰æ›´ã—ãŸï¼Ž + +Fri Jan 6 13:42:12 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: a[b]+=cã‚„a.b+=cãªã©ã®è‡ªå·±ä»£å…¥å½¢å¼ã§ï¼Œaã‚„bã‚’2度評価ã—㪠+ ããªã£ãŸï¼Ž + + * eval.c: iteratorè¨å®šã®ãƒã‚°ãƒ•ã‚£ãƒƒã‚¯ã‚¹ï¼Ž + + * list.c: Listクラスを新è¨ï¼Ž + +Thu Jan 5 13:55:00 1995 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: SCOPEã®ãƒ¡ãƒ¢ãƒªãƒªãƒ¼ã‚¯ã‚’ãªãã—ãŸï¼Ž + + * eval.c: built-inメソッドã¸ã®å¼•æ•°ã®å¼•ã渡ã—方を変更ã—ã¦ï¼Œé…列ã®ç”Ÿ + æˆæ•°ã‚’減らã—ãŸï¼Ž + + * re.c: match-dataを毎回生æˆã™ã‚‹ã“ã¨ã‚’ã‚„ã‚ãŸï¼Ž`$~'をアクセスã—ãŸæ™‚ + ã«on-demandã§ç”Ÿæˆã™ã‚‹ï¼Ž + + * string.c etc: ä¸å¿…è¦ãªmemmoveã‚’memcpyã«ç½®æ›ï¼Ž + + * parse.y: =~, !~ã¯å‰¯ä½œç”¨ãŒã‚ã‚‹ã®ã§ã‚³ãƒ³ãƒ‘イル時ã«å±•é–‹ã§ããªã„． + +Tue Jan 3 02:04:36 1995 Yukihiro Matsumoto (matz@dyna) + + * eval.c: rest引数ã®bug fix. + + * eval.c,gc.c: scopeをオブジェクトã«ã—ãŸï¼Ž + + * eval.c: envã¨scopeã®æ‰±ã„を変更ã—ãŸï¼Ž + +Wed Dec 28 09:46:57 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: evalã§ãƒãƒ¼ã‚«ãƒ«å¤‰æ•°ãŒè¿½åŠ ã•ã‚ŒãŸå ´åˆã«å¯¾å¿œã—ãŸï¼Ž + + * parse.y: 演算åã‚’å«ã‚€aliasã®bug fix. + +Tue Dec 27 16:45:20 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: def A Bã‚’alias A Bã«å¤‰æ›´ï¼Ž + + * eval.c: alias関係ã®bugä¿®æ£ï¼Žnodeをオブジェクト化ã—ãŸæ™‚ã«enbugã— + ãŸã‚ˆã†ã ． + + * signal.c: システムコールã®å†å®šç¾©ã‚’æ¢ã‚ãŸï¼Ž + + * io.c(select): write/exceptã®ãƒ•ãƒ©ã‚°è¨å®šã«ãƒã‚°ï¼Ž + + * Makefile.in: static link用オプションをMake変数ã¨ã—ã¦ç‹¬ç«‹ã•ã›ãŸï¼Ž + +Tue Dec 20 00:46:19 1994 Yukihiro Matsumoto (matz@dyna) + + * 0.63 released + + * eval.c(rb_call): superã®å‘¼ã³å‡ºã—ã§è½ã¡ã‚‹ï¼Žargc, argvã®è¨å®šã‚’忘れ + ã¦ã„ãŸï¼Ž + + * parse.y(read_escape): 展開エラー． + + * variable.c: 定義済ã¿ã®å¤‰æ•°ã®hookを変更ã—ãªã„よã†ã«ï¼Ž + +Mon Dec 19 12:01:10 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y(cond): æ¡ä»¶å¼ã«ä»£å…¥å¼ãŒç½®ã‹ã‚ŒãŸå ´åˆï¼Œ`-v'オプションã§è¦ + å‘ŠãŒå‡ºã‚‹ã‚ˆã†ã«ï¼Ž + + * parse.y(**): 冪乗演算å`**'ã®å„ªå…ˆé †ä½ã‚’å˜é …演算åより高ãã—ãŸï¼Ž + + * parse.y(and,or): å„ªå…ˆé †ä½ã®ä½Žã„演算å`and', `or'. + + * 0.62 released. + + * eval.c: ä¸å¿…è¦ã«ãªã£ãŸPUSH_ENV, POP_ENVを減らã—ãŸï¼Ž + + * env.h: ENVIONã‹ã‚‰selfã‚’ã¯ãšã—ãŸï¼ŽPUSH_ENVã¯superã®æº–å‚™ã®ãŸã‚ã ã‘ + ã«ç”¨ã„ã‚‹ã“ã¨ã«ã—ãŸï¼Ž + + * eval.c: 下記ã®ã‚ªãƒ–ジェクト化ã§é…ããªã£ãŸå®Ÿè¡Œé€Ÿåº¦ã‚’ã‚‚ã¨ã«æˆ»ã—ãŸï¼Ž + +Mon Dec 17 23:01:10 1994 Yukihiro Matsumoto (matz@ix-02) + + * eval.c: env.{argv,argc}ã¨scope.local_varsã®ã‚ªãƒ–ジェクト化． + + * eval.c: 1スコープ内ã§è¤‡æ•°Blockを生æˆã—ãŸã¨ãã®ãƒã‚°ã‚’ä¿®æ£ï¼Ž + +Fri Dec 16 15:52:06 1994 Yukihiro Matsumoto (matz@ix-02) + + * parse.y: `&&'ã¨`||'ã®ä¸¡è¾ºã¯ã„ã¤ã§ã‚‚æ¡ä»¶å¼ã¨ã—ãŸï¼Ž + +Thu Dec 15 00:16:04 1994 Yukihiro Matsumoto (matz@dyna) + + * eval.c(Block): Blockオブジェクトを実ç¾ï¼Ž + + * node.h: NODE_QLISTã¯ãªããªã£ãŸï¼Ž + + * eval.c(rb_call): 引数ã¸ã®ä»£å…¥ã‚’åå‰ã§ä¸€ã¤ãšã¤ä»£å…¥ã™ã‚‹ã®ã‚’ã‚„ã‚ã¦ï¼Œ + 一度ã«ã‚³ãƒ”ーã™ã‚‹ã‚ˆã†ã«ã—ãŸï¼Ž + + * eval.c(rb_call): rubyã§è¨˜è¿°ã•ã‚ŒãŸãƒ¡ã‚½ãƒƒãƒ‰ã¸ã®å¼•æ•°æ¸¡ã—ã‚’inline化． + + * eval.c: イテレータ判定処ç†ã®å…¨é¢æ›¸ãæ›ãˆï¼Žä¸é©åˆ‡ãªã‚¤ãƒ†ãƒ¬ãƒ¼ã‚¿å‘¼ã³ + 出ã—ã‚’ãªãã—ãŸï¼Žä¾‹ãˆã°ã€Œ[foo(),bar()]{i|baz(i)}ã€ã§fooã‚‚barもイ + テレータã¨ã—ã¦å‘¼ã³å‡ºã•ã‚Œ*ãªã„*． + + * eval.c(rb_call): SCOPE処ç†ã‚’inline化．メソッド呼ã³å‡ºã—ã®è‹¥å¹²ã®é«˜ + 速化． + +Wed Dec 14 18:09:33 1994 Yukihiro Matsumoto (matz@ix-02) + + * node.h: nodeもオブジェクトã«ã™ã‚‹ï¼Žã‚ˆã£ã¦GCã§å›žåŽã•ã‚Œã‚‹ï¼Ž + +Thu Dec 8 14:17:29 1994 Yukihiro Matsumoto (matz@ix-02) + + * 0.60 released - alpha test baseline. diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0 index 07d7c6b165..0d00266735 100644 --- a/doc/ChangeLog-1.8.0 +++ b/doc/ChangeLog-1.8.0 @@ -1454,7 +1454,7 @@ Fri Jun 27 03:24:54 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> 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(). + argument type mismatch, and inline method_list(). [ruby-core:01198] Wed Jun 25 14:40:33 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> @@ -3361,7 +3361,7 @@ Fri Apr 11 02:41:35 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> Thu Apr 10 21:12:19 2003 Minero Aoki <aamine@loveruby.net> - * lib/net/pop.rb: Exception line was accidentaly removed. + * lib/net/pop.rb: Exception line was accidentally removed. [ruby-dev:19989] Thu Apr 10 18:42:13 2003 Tadayoshi Funaba <tadf@dotrb.org> @@ -5986,7 +5986,7 @@ Thu Nov 7 09:51:37 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> 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. + really a module, whose methods must be safe for receiver's type. * eval.c (rb_eval): nosuper should not be inherited unless the overwritten method is an undef placeholder. diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3 index e9ede641f5..b3deb551b0 100644 --- a/doc/ChangeLog-1.9.3 +++ b/doc/ChangeLog-1.9.3 @@ -3541,7 +3541,7 @@ Sun May 15 23:45:11 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> Sun May 15 22:26:39 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> |