summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-11-20* ext/json: merge JSON 1.8.1.naruse
https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3 * Remove Rubinius exception since transcoding should be working now. * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre Lafortune <github_rocks@marc-andre.ca>. Thanks! * Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress warning with -Wchar-subscripts and better validate UTF-8 strings. * Applied patch by ginriki@github to remove unnecessary if. * Add load/dump interface to JSON::GenericObject to make serialize :some_attribute, JSON::GenericObject work in Rails active models for convenient SomeModel#some_attribute.foo.bar access to serialised JSON data. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19eval_jump.c: reuse same tagnobu
* eval_jump.c (rb_exec_end_proc): reduce number of pushing/popping and reuse same tag. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19rdoc/constant.rb: reapply r43006 for workaround of NoMethodErrornobu
* lib/rdoc/constant.rb (RDoc::Constant#documented?): workaround for NoMethodError when the original of alias is not found. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* 2013-11-20svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19delegate.rb: refix r43682nobu
* lib/delegate.rb (Delegator#send): separate from method_missing so that super calls proper method. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19configure.in: --with-os-version-stylenobu
* configure.in (--with-os-version-style): option to transform target OS version string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19test_rdoc_generator_darkfish.rb: ignore nlink is not providednobu
* test/rdoc/test_rdoc_generator_darkfish.rb (assert_hard_link): makes no sense on platforms where link count is not provided. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19rubygems/util.rb: fix Gem::Util.popennobu
* lib/rubygems/util.rb (Gem::Util.popen): should close open pipe to reap the child process, in 1.9 or later. fix deadlock on waiting the child process whose output is bigger than pipe buffer, in 1.8. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19rubygems/source/git.rb: discard outputnobu
* lib/rubygems/source/git.rb (Gem::Source::Git#checkout): discard git output. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19bignum.c: suppress warningnobu
* bignum.c (absint_numwords_generic): suppress false warning in rb_absint_numwords() by gcc 4.4. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* test/net/http/utils.rb (spawn_server): Specify zero for port toakr
avoid reusing an allocated port. * test/net/http/test_http.rb: Don't specify port here. * test/net/http/test_https.rb: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* gc.c (heap_is_swept_object): use heap_page::before_sweep flag.ko1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* gc.c (rb_objspace_reachable_objects_from_root): do major marking.ko1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* gc.c (rb_gc_resurrect): added.ko1
rb_fstring() used rb_gc_mark() to avoid freeing used string. However, rb_gc_mark() set mark bit *and* pushes mark_stack. rb_gc_resurrect() does only set mark bit if it is before sweeping. * string.c (rb_fstring): use rb_gc_resurrect. * internal.h: add decl. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19ext/rbconfig/sizeof/sizes.c: ignorenobu
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* remove trailing spaces.nobu
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* lib/rdoc: Update to RDoc master a1195ce. Changes include:drbrain
Improved accessibility of the main sidebar navigation. Fixed handling of regexp options in HTML source highlighting. * test/rdoc: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-19* lib/rubygems: Update to RubyGems master 6a3d9f9. Changes include:drbrain
Compatibly renamed Gem::DependencyResolver to Gem::Resolver. Added support for git gems in gem.deps.rb and Gemfile. Fixed resolver bugs. * test/rubygems: ditto. * lib/rubygems/LICENSE.txt: Updated to license from RubyGems trunk. [ruby-trunk - Bug #9086] * lib/rubygems/commands/which_command.rb: RubyGems now indicates failure when any file is missing. [ruby-trunk - Bug #9004] * lib/rubygems/ext/builder: Extensions are now installed into the extension install directory and the first directory in the require path from the gem. This allows backwards compatibility with msgpack and other gems that calculate full require paths. [ruby-trunk - Bug #9106] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18* configure.in (LOCALTIME_OVERFLOW_PROBLEM): Define it for crossakr
compiling. [ruby-core:58391] [Bug #9119] Reported by Luis Lavena. Analyzed by Heesob Park. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18* lib/rdoc/rubygems_hook.rb: Remove debugging puts committed bydrbrain
accident. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18* 2013-11-19svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18* test/bigdecimal/test_bigdecimal.rb: incorporate BigMath.logheadius
tests from JRuby by Peter Vandenabeele. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18* properties.nobu
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18ext/rbconfig/sizeof: move to an extension librarynobu
* common.mk, ext/rbconfig/sizeof: move RbConfig::SIZEOF to an extension library to get rid of annoying nmake VPATH rule. * inits.c (rb_call_inits), miniinit.c (Init_sizes): RbConfig::SIZEOF is no loger built-in. * template/sizes.c.tmpl (Init_sizeof): rename initialization function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18eval_intern.h: refine stack overflow detectionnobu
* eval_intern.h (TH_PUSH_TAG, TH_EXEC_TAG): refine stack overflow detection. chain local tag after setjmp() successed on it, because calling setjmp() also can overflow the stack. [ruby-dev:47804] [Bug #9109] * vm_eval.c (rb_catch_obj): now th->tag points previous tag until TH_EXEC_TAG(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18thread_pthread.c: use get_main_stack properlynobu
* thread_pthread.c (ruby_init_stack): set stack_start properly by get_main_stack() if possible. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18eval_jump.c: refix [Bug #9110]nobu
* eval_jump.c (rb_exec_end_proc): unlink and free procs data before calling for each procs. [Bug #9110] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18configure.in: -Werror=division-by-zeronobu
* configure.in (warnflags): make division-by-zero error for RUBY_CONST_ASSERT macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18* 2013-11-18svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43703 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-18vm_core.h: extract VM_STACK_OVERFLOWED_Pnobu
* vm_core.h (VM_STACK_OVERFLOWED_P, WHEN_VM_STACK_OVERFLOWED): extract condition from CHECK_VM_STACK_OVERFLOW. * vm_exec.c (vm_stack_overflow_for_insn): move rb_bug call. * vm_exec.h (CHECK_VM_STACK_OVERFLOW_FOR_INSN): share the condition with CHECK_VM_STACK_OVERFLOW. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-17compile.c: tailcall on supernobu
* compile.c (iseq_peephole_optimize): enable tail call optimization on super too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-17hash.c: static internal functionsnobu
* hash.c (NOINSERT_UPDATE_CALLBACK): make both of noinsert and insert internal functions static. and put semicolons for etags to find the following functions properly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-17string.c: constifynobu
* string.c (tr_find): constify argument table. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-16Explain fix in r43697sorah
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-16* configure.in: Use $LIBS for base of $SOLIBS, also in darwinsorah
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-16* thread_pthread.c (thread_create_core): Ditto.akr
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-16* 2013-11-17svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-16* thread_pthread.c (rb_thread_create_timer_thread): Show errorakr
message instead of error number. * cont.c (fiber_machine_stack_alloc): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-16* lib/rexml/parsers/ultralightparser.rbkou
(REXML::Parsers::UltraLightParser#parse): Fix wrong :start_doctype position. [Bug #9061] [ruby-dev:47778] Patch by Ippei Obayashi. Thanks!!! * test/rexml/parser/test_ultra_light.rb: Add a test for this case. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-16 * test/ruby/test_hash.rb (class TestHash): add tests for [ruby-dev:47803] ↵tarui
[Bug #9105] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15envutil.rb: crash report on Mac OS Xnobu
* test/ruby/envutil.rb (EnvUtil.diagnostic_reports): find crash report on Mac OS X. * test/ruby/envutil.rb (Test::Unit::Assertions::FailDesc): include crash report on Mac OS X. * test/ruby/envutil.rb (Test::Unit::Assertions#assert_in_out_err): remove crash reports if exist. * test/ruby/test_process.rb (TestProcess#test_status_kill): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15test_beginendblock.rb: assert_normal_exitnobu
* test/ruby/test_beginendblock.rb (test_callcc_at_exit): use assert_normal_exit for better message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15ChangeLog typos from r43688zzak
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15 * cont.c : Introdule ensure rollback mechanism. Please see below.tarui
* internal.h (ruby_register_rollback_func_for_ensure): catch up above change. Add rollback mechanism API. * vm_core.h (typedef struct rb_vm_struct): catch up above change. Introdule ensure-rollback relation table. * vm_core.h (typedef struct rb_thread_struct): catch up above change. Introdule ensure stack. * eval.c (rb_ensure): catch up above change. Introdule ensure stack. * hash.c : New function for rollback ensure, and register it to ensure-rollback relation table. [ruby-dev:47803] [Bug #9105] Ensure Rollback Mechanism: A rollback's function is a function to rollback a state before ensure's function execution. When the jump of callcc is across the scope of rb_ensure, ensure's functions and rollback's functions are executed appropriately for keeping consistency. Current API is unstable, and only internal use. ruby_register_rollback_func_for_ensure(ensure_func,rollback_func) This API create relation ensure's function to rollback's function. By registered rollback's function, it is executed When jumpping into corresponding rb_ensure scope. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43688 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15revert r43675 and r43683 without tests for applying rollback patch.tarui
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15* 2013-11-16svn
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15 * eval_jump.c (rb_exec_end_proc): fix double free or corruption errorglass
when reentering by callcc. [ruby-core:58329] [Bug #9110] * test/ruby/test_beginendblock.rb: test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15eval.c: refactor exception causenobu
* eval.c (setup_exception): set up cause after exception to be raised is fixed. [Feature #8257] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15hash.c: iteration level with reenteringnobu
* hash.c (hash_foreach_iter, hash_foreach_ensure, rb_hash_foreach): deal with iteration level when reentering by callcc. temporary measure until rollback of ensure is introduced. [ruby-dev:47807] [Bug #9105] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-15delegate.rb: get rid of global function interferencenobu
* lib/delegate.rb (Delegator#send): override to get rid of global function interference. [Fixes GH-449] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e