aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* * ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hashtenderlove2014-08-293-1/+17
| | | | | | | should merge the hash in to the parent. * test/psych/test_merge_keys.rb: test for change. Fixes GH #202 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2014-08-30svn2014-08-291-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" stringstenderlove2014-08-294-1/+36
| | | | | | | | | 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/net/imap/test_imap_response_parser.rb: removed needless code.hsbt2014-08-292-4/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/rinda/test_rinda.rb: removed useless assignment variables.hsbt2014-08-294-5/+8
| | | | | | | * test/rss/rss-assertions.rb: ditto. * test/rss/test_maker_itunes.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* string.c: remove vm_core.h dependency [ruby-core:64627]normal2014-08-293-8/+21
| | | | | | | * string.c: revert part of r47311, add rb_vm_fstring_table(), remove vm_core.h dependency. [ruby-core:64627] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2014-08-29svn2014-08-291-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* string.c: move frozen_strings table to rb_vm_tnormal2014-08-296-10/+31
| | | | | | | | | | | | | | | | | Cleanup in case MVM development proceeds. * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* io.c: fix uninitialized variablenobu2014-08-281-1/+2
| | | | | | | * io.c (argf_next_argv): fix uninitialized variable in skipping message when inplace edit without backup. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test_io.rb: non UTF-8 patternnobu2014-08-281-1/+1
| | | | | | | * test/ruby/test_io.rb: (test_invalid_advise): fix pattern for non UTF-8 environment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test_io_m17n.rb: leaked FDsnobu2014-08-281-2/+2
| | | | | | | * test/ruby/test_io_m17n.rb (test_ignored_encoding_option): fix leaked file descriptors by r47305. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* io.c: preserve encodingsnobu2014-08-282-10/+18
| | | | | | * io.c (argf_next_argv): preserve encodings in warning messages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* io.c: preserve encodingsnobu2014-08-282-3/+14
| | | | | | | * io.c (rb_io_extract_encoding_option): preserve encodings in warning messages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2014-08-28svn2014-08-281-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* io.c: preserve encodingsnobu2014-08-282-5/+3
| | | | | | * io.c (advice_arg_check): preserve encodings in warning messages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* io.c: preserve encodingsnobu2014-08-282-3/+8
| | | | | | * io.c (rb_io_s_new): preserve encodings in warning messages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/tempfile.rb: remove "require 'thread'". its features are noglass2014-08-272-1/+5
| | | | | | longer used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fix failed conditionkazu2014-08-271-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/drb/acl.rb: Removed meaningless #to_s methods in interpolation.hsbt2014-08-278-7/+18
| | | | | | | | | | | | [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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/drb/drb.rb: use attr_reader instead of Module#attr.hsbt2014-08-276-16/+25
| | | | | | | | | | [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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/win32ole/win32ole.c (vtdate2rbtime): try to convert millisecondsuke2014-08-273-5/+33
| | | | | | | | | | of VT_DATE VARIANT to nsec of Time object. * test/win32ole/test_win32ole_variant.rb (test_conversion_dbl2date_with_msec): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* parse.y: use rb_ary_tmp_new_fillnobu2014-08-271-5/+1
| | | | | | | * parse.y (coverage): use rb_ary_tmp_new_fill() instead of setting internal structure directly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/ruby/test_complex.rb: removed unreachable code.hsbt2014-08-273-182/+85
| | | | | | * test/ruby/test_rational.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* compile.c: assigned in REALLOC_Nnobu2014-08-261-1/+1
| | | | | | | * compile.c (iseq_set_sequence): assigned in REALLOC_N, no further assignment. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2014-08-27svn2014-08-261-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* compile.c (iseq_set_sequence): check for multiplication overflownormal2014-08-262-1/+5
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/ruby/test_complex.rb: cherry-picked working assertions from r47251.hsbt2014-08-263-0/+13
| | | | | | * test/ruby/test_rational.rb: cherry-picked working assertions from r47263. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/mathn.rb: remove built-in methodsnobu2014-08-262-136/+12
| | | | | | | * lib/mathn.rb (Fixnum#**, Bignum#**, Float#**, Rational#**): remove as these are now built-in. [ruby-core:63973] [Bug #10086] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * time.c (rb_time_unmagnify_to_float): Avoid double rounding.akr2014-08-263-1/+16
| | | | | | | | | Reported by Tsuyoshi Sawada. https://bugs.ruby-lang.org/issues/10135#note-1 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* io.c: do not swallow exceptions at end of blocknobu2014-08-263-6/+41
| | | | | | | | * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * template/fake.rb.in: fix failed to make install when srcdir != builddir.kazu2014-08-262-1/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/ruby/test_range.rb: added workaround for VERBOSE message.hsbt2014-08-262-1/+5
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/test_mathn.rb: added workaround for VERBOSE messages.hsbt2014-08-262-7/+13
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/shell/process-controller.rb: removed commented-out code.hsbt2014-08-262-9/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/thwait.rb (ThreadsWait): removed needless constant.hsbt2014-08-262-2/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mathn.rb: mathn library is deprecated on ruby 2.2.hsbt2014-08-263-0/+10
| | | | | | [Feature #10169][ruby-core:64553] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2014-08-26svn2014-08-261-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/mathn.rb: removed commented-out code.hsbt2014-08-262-6/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ChangeLog: fix clang versionnobu2014-08-251-2/+3
| | | | | | | * ChangeLog: fix clang version in r45508, 5.1 is the version by Apple, the upstream version is 3.4. [ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * ext/win32ole/win32ole.c(fole_s_connect, fole_initialize): raise asuke2014-08-255-12/+73
| | | | | | | | | | | 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* uri/common.rb: use negative look-aheadnobu2014-08-252-1/+4
| | | | | | | | * lib/uri/common.rb (URI.decode_www_form_component): use negative look-ahead instead of nested repeat operators, to get rid of backtrack explosion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* logger.rb: simplifynobu2014-08-251-5/+1
| | | | | | | * lib/logger.rb (format_datetime): simplify and freeze the default format so that it can be shared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47272 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/logger.rb: use %Nnobu2014-08-252-1/+6
| | | | | | | * lib/logger.rb (format_datetime): use "%6N" to show microsecond. [Fix GH-704] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2014-08-25svn2014-08-251-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* rb_iseq_location_t: change first_lineno type to VALUEnormal2014-08-253-3/+8
| | | | | | | | | | | Nearly all current uses of iseq->location.first_lineno are as a VALUE, not a size_t. The only exception was the experimental (and currently unused) rb_iseq_build_for_ruby2cext function. * vm_core.h (rb_iseq_location_t): change first_lineno type to VALUE * iseq.c (rb_iseq_build_for_ruby2cext): update based on argument git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * lib/e2mmap.rb: remove needless instance variables.hsbt2014-08-2416-15/+7
| | | | | | | | * lib/irb.rb: ditto. * lib/irb/**/*.rb: ditto. * lib/shell.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/ruby/test_complex.rb: removed needless conditions.hsbt2014-08-243-159/+79
| | | | | | * test/ruby/test_rational.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/ruby/test_rational.rb: fixed indent.hsbt2014-08-242-6/+10
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/ruby/test_rational.rb: remove commented-out code.hsbt2014-08-242-155/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/benchmark.rb (measure): reduce allocations as in r47260normal2014-08-242-10/+14
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e