Commit graph

34260 commits

Author SHA1 Message Date
naruse
3b36c8da5c merge revision(s) 44327: [Backport #9276]
* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-19 21:24:30 +00:00
naruse
56b6eed323 merge revision(s) 45021,45022,45028: [Backport #9524]
* gc.c: introduce new environment variable
	  "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC
	  frequency.
	  Do full GC when the number of old objects is more than R * N
	  where R is this factor and

	* test/ruby/test_gc.rb: add a test.

	* gc.c (get_envparam_double): fix a warning message.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-19 06:00:46 +00:00
naruse
879ac9dec2 merge revision(s) 44492: [Backport #9351]
* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
	  ipv4_multicast_loop option for portability.  Patch by Jeremy Evans.
	  [ruby-trunk - Bug #9351]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-18 23:07:51 +00:00
naruse
4ee9d27f3a merge revision(s) 44476: [Backport #9317]
* configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after
	  LIBPATHFLAG and RPATHFLAG are set.  [ruby-dev:47868] [Bug #9317]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-16 21:28:55 +00:00
naruse
c83ad9aaed merge revision(s) 44474,44538,44539,44890,44896: [Backport #9495]
* configure.in: use SSE2 instructions for drop unexpected
	  precisions.  [ruby-core:54738] [Bug #8358]

	* configure.in: use SSE2 instructions to drop unexpected precisions on
	  other than mingw.  [ruby-core:59472] [Bug #8358]

	* configure.in: -mstackrealign is necessary for -msse2 working.
	  [ruby-core:54716] [Bug #8349]

	* configure.in: -mstackrealign is necessary for -msse2 working.
	  [ruby-core:54716] [Bug #8349]

	* configure.in: add qouting brackets and append wildcard for the
	  rest after target_cpu, to properly detect platform for SSE2
	  instructions.  [ruby-core:60576] [Bug #8358]

	* configure.in: Fix compilation error.
	  https://bugs.ruby-lang.org/issues/8358#note-16


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-16 00:13:51 +00:00
naruse
22ce47745b merge revision(s) 44579: [Backport #9500]
ext: use PRIsVALUE for rb_raise and rb_warn

	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): use PRIsVALUE for
  rb_raise() and rb_warn().
	* ext/openssl/ossl_cipher.c (ossl_cipher_init): ditto.
	* ext/racc/cparse/cparse.c (extract_user_token): ditto.
	* ext/syslog/syslog.c (mSyslog_log): ditto.

	* ext/openssl/ossl.h (OSSL_Check_Kind, OSSL_Check_Instance): now
  ossl_raise() also accepts PRIsVALUE.
	* ext/openssl/ossl_asn1.c (ossl_asn1_default_tag):

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-10 13:35:07 +00:00
naruse
565d568a45 merge revision(s) 44572,44578,44591,44592: [Backport #9490]
ext: use rb_sprintf() and rb_vsprintf() with PRIsVALUE

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-10 11:45:14 +00:00
naruse
73fc780998 merge revision(s) 44861,44862: [Backport #9493]
* 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.

	* gc.c (get_envparam_double): ditto.

	* gc.c (get_envparam_int): accept a value equals to lowerbound.

	* gc.c (get_envparam_int): correct warning messsages.

	* gc.c (get_envparam_double): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 19:21:40 +00:00
svn
5d0f801aae * 2014-02-07
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 18:11:17 +00:00
naruse
3c00535d1a Add missing file of r44858
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 18:11:13 +00:00
naruse
0de6eef3d2 merge revision(s) 44852: [Backport #9343]
* 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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 07:24:46 +00:00
naruse
9b9d3bac4d * lib/rubygems: RubyGems 2.2.2 which contains the following bug fixes:
http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.2.2+%2F+2014-02-05
  https://bugs.ruby-lang.org/issues/9489


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 02:59:36 +00:00
naruse
39cb784095 merge revision(s) 44853: [Backport #9490]
* 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.

	* gc.c (get_envparam_int): accept a value equals to lowerbounds.

	* gc.c (get_envparam_double): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-06 02:24:40 +00:00
naruse
1f478676c4 merge revision(s) 44555:
test_weakref.rb: find collected weakref

	* test/test_weakref.rb (test_recycled): retry and find a WeakRef
  whose the target is collected, to fix circumstance dependent.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 15:47:37 +00:00
naruse
eef4a3cd72 merge revision(s) 44583: [Backport #9302]
* 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]

	* test/thread/test_queue.rb: add test


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 14:57:11 +00:00
naruse
72d18038d9 merge revision(s) 44525,44534,44537: [Backport #9381]
* hash.c (rb_objid_hash): return hash value from object ID with a
	  salt, extract from rb_any_hash().

	* object.c (rb_obj_hash): return same value as rb_any_hash().
	  fix r44125.  [ruby-core:59638] [Bug #9381]

	* hash.c (rb_any_hash): should treat the return value of rb_objid_hash()
	  as `long', because ruby assumes the object id of an object is `long'.
	  this fixes test failures on mswin64 introduced at r44525.

	* hash.c (rb_objid_hash): should return `long'.  brushup r44534.

	* object.c (rb_obj_hash): follow above change.
	  as `long', because ruby assumes the hash value of the object id of
	  an object is `long'.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 14:53:48 +00:00
naruse
e7a2c4251e merge revision(s) 44527,44552,44553:
* 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]

	* vm_insnhelper.c (vm_search_super_method): allow bound method from a
	  module, yet another method transplanting.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 13:41:03 +00:00
naruse
1b05b4f4ab merge revision(s) 44490,44496: [Backport #9352]
* 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]

	* 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

	* ext/socket/socket.c (rsock_syserr_fail_host_port): add errno
	  argument version anduse rb_syserr_fail_str() instead of
	  rb_sys_fail_str() with restoring errno.

	* ext/socket/socket.c (rsock_syserr_fail_path): ditto, and
	  rb_syserr_fail().

	* ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto, use
	  rsock_syserr_fail_raddrinfo().

	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto.

	* ext/socket/socket.c (setup_domain_and_type): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 13:08:32 +00:00
naruse
c00e288936 merge revision(s) 44517,44518,44519,44523: [Backport #9354]
* 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]

	* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
	  raised ExitException, which should not be thrown.

	* lib/timeout.rb (Timeout::ExitException.catch): set @thread only if
	  it ought to be caught.

	* lib/timeout.rb (Timeout::ExitException.catch): pass arguments
	  for new instance.

	* lib/timeout.rb (Timeout::ExitException#exception): fallback to
	  Timeout::Error if couldn't throw.  [ruby-dev:47872] [Bug #9380]

	* lib/timeout.rb (Timeout#timeout): initialize ExitException with
	  message for the fallback case.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 12:43:19 +00:00
naruse
c0bdb2511d merge revision(s) 44512: [Backport #9340]
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 11:29:40 +00:00
naruse
bda2300c4d merge revision(s) 44501: [Backport #9353]
* struct.c (rb_struct_set): return assigned value from setter method
	  rather than struct object. [Bug #9353] [ruby-core:59509]

	* test/ruby/test_struct.rb (test_setter_method_returns_value): add test


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 04:05:53 +00:00
naruse
673745f799 merge revision(s) 44803: [Backport #9478]
* string.c (rb_str_modify_expand): enable capacity and disable
	  assocation with packed objects when setting capa, so that
	  pack("p") string fails to unpack properly after modified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-05 02:35:13 +00:00
naruse
3da0a0cead merge revision(s) 44630,44631: [Backport #9403]
* lib/delegate.rb (Delegator): keep source information methods
	  which start and end with '__'.  [ruby-core:58572] [Bug #9155]
	  which start and end with '__'.  [ruby-core:59718] [Bug #9403]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44794 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-02 13:46:46 +00:00
naruse
484a6ffb78 merge revision(s) 44373: [Backport #9417]
test_alias.rb: rename duplicate name

	* test/ruby/test_alias.rb (test_alias_wb_miss): rename duplicate
  name to get rid of redefinition.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-01 08:35:30 +00:00
svn
d985425d28 * 2014-02-01
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-01 08:19:15 +00:00
naruse
8f87be4e22 Revert r44778 #9375
It breaks test-all if all tests are in a single process


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-01 08:19:06 +00:00
naruse
3efb494a21 merge revision(s) 44515: [Backport #9375]
* lib/rubygems:  Update to RubyGems master 21e409d / RubyGems 2.2.1.
	  See http://rubygems.rubyforge.org/rubygems-update/History_txt.html
	  for a list of bug fixes.

	* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-31 09:17:42 +00:00
naruse
32e4d034ca merge revision(s) 44455,44458,44510: [Backport #9349]
* vm_insnhelper.c (vm_search_super_method): direct superclass of a
	  module is found when super called in a Method object generated a
	  method defined in a module, call method_missing in that case.
	  [ruby-core:59358] [Bug #9315]

	* proc.c (mnew_from_me): keep iclass as-is, to make inheritance
	  chain consistent.  [ruby-core:59358] [Bug #9315]

	* proc.c (method_owner): return the original defined_class from
	  prepended iclass, instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-31 08:58:59 +00:00
naruse
edacfadad6 merge revision(s) 44406: [Backport #9324]
* configure.in: let mingw do something black-magic, and check if
	  _gmtime64_s() is available actually.

	* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-31 03:07:00 +00:00
naruse
342ed0b857 merge revision(s) 44756:
* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
	  supported by GNU make.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-30 06:03:02 +00:00
naruse
16c8a6d4b4 merge revision(s) 44588: [Backport #9316]
* 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]

	* test/bigdecimal/test_bigdecimal.rb: tests for the above change.

	* ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.4.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-27 07:56:58 +00:00
naruse
2b4becd6bc merge revision(s) 44402: [Backport #9301]
* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-27 07:47:11 +00:00
naruse
ba97a56685 merge revision(s) 44358,44359,44360,44363: [Backport #9275]
hash.c: reword

        * hash.c (HAS_EXTRA_STATES, rb_hash_reject): use words "extra states".
        * hash.c (HAS_EXTRA_STATES): warn extra states only when something
          differ.  [ruby-core:59254] [Bug #9275]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44683 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-23 02:17:40 +00:00
naruse
111cbcb3d9 merge revision(s) 44601:
FreeBSD 10 SEGVs this less than 4M + 12K bytes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-15 02:30:50 +00:00
naruse
b0d69f3c18 merge revision(s) 44598,44599,44600:
/usr/lib/libc.so is not symlink on FreeBSD 10

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-15 02:29:58 +00:00
svn
820b71478b * 2014-01-11
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-11 00:06:27 +00:00
naruse
0957229af7 merge revision(s) 44544:
* doc/NEWS-2.1.0: Add mention for litteral.freeze

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-11 00:06:23 +00:00
naruse
f07223228b merge revision(s) 44440,44444: [Backport #9306]
* 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.

	* win32/{setup.mak,Makefile.sub}: update fake.rb like
	  template/fake.rb.in.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-09 05:06:21 +00:00
naruse
a1d56b18d5 merge revision(s) 44488: [Backport #9341]
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-08 23:21:11 +00:00
naruse
41deb12e9d fix previous commit
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-30 21:16:30 +00:00
naruse
e1536a7424 fix ruby/test_hash.rb [ruby-core:59154] [Bug #9223]
the behavior is under 2.2.0


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-30 21:11:18 +00:00
svn
d77ee13282 * 2013-12-27
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-26 19:59:39 +00:00
naruse
526bc8a2d9 bump version to 2.1.1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-26 19:59:35 +00:00
naruse
ca050a8d57 merge revision(s) 44411: [Backport #9295]
* vm_insnhelper.c (argument_error): insert dummy frame to make
	  a backtrace object intead of modify backtrace string array.
	  [Bug #9295]

	* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 18:28:21 +00:00
naruse
5fd5088052 bump version
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 13:18:28 +00:00
naruse
003e226c67 merge revision(s) 44377: [Backport #9290]
README.EXT.ja: fix probable typo

	* README.EXT.ja (Appendix D): fix probable typo. RHASH_PTR() is
  not defined.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 12:41:21 +00:00
naruse
6ee55bed73 merge revision(s) 44381: [Backport #9296]
test_method.rb: fix test

	* test/ruby/test_method.rb (test_define_method_in_private_scope):
  remove extra *, to get the argument itself.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 11:31:01 +00:00
naruse
18f605a292 merge revision(s) 44380: [Backport #9296]
* 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]

	* vm.c (rb_vm_cref_in_context): return ruby level cref if self is
	  same.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 07:58:38 +00:00
naruse
01bdc85e63 merge revision(s) 44403:
* 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.)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-25 07:38:17 +00:00
svn
ddc1c8f424 * 2013-12-25
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-24 18:31:12 +00:00