Commit graph

24309 commits

Author SHA1 Message Date
naruse
5e808b6ba3 merge revision(s) 34794,34795:
* dir.c (dir_initialize): keep path in original encoding.

	* error.c (syserr_initialize): prefer the encoding of message over
	  locale.  [ruby-dev:45279][Bug #6071]

	* dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path.
	  [Bug #6072]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-25 12:25:55 +00:00
naruse
1b21d03d76 merge revision(s) 34809:
* lib/fileutils.rb: use chomp(?/) instead of sub to optimize and avoid
	  to regexping invalid string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-25 08:11:07 +00:00
naruse
f7f7f93a03 merge revision(s) 34795:
* dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path.
	  [Bug #6072]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-25 08:10:23 +00:00
naruse
7e2e3dc85d merge revision(s) 34803:
* complex.c (nucomp_marshal_load): raise error on invalid data.
	  reported by John Firebaugh [ruby-core:42860] [Bug #6076]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-25 07:39:32 +00:00
naruse
76dc4b9a24 merge revision(s) 34755:
* lib/ostruct.rb (delete_field): Bug fix so previous value is
	  returned. Patch by Nick Recobra [Bug #6063]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-24 14:49:51 +00:00
nobu
b329509a08 merge revision(s) 34776:
* parse.y (parser_tokadd_string, parser_yylex): insert a backslash
	  if the next character is non-ascii.  [ruby-dev:45278] [Bug #6069]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-23 23:53:39 +00:00
naruse
6cd700f3e9 merge revision(s) 34214:
* lib/uri/common.rb (URI::Parser#initialize_regexp):
	  use \A \z instead of ^ $. [Bug #5843]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-23 05:45:08 +00:00
nobu
9efce27a62 merge revision(s) 33873:
* win32/win32.c (rb_w32_uchmod): typo.  [Bug#5671] [ruby-dev:44898]

	* test/ruby/test_file.rb (TestFile#test_chmod_m17n): test of above bug.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-22 23:10:08 +00:00
svn
0894d6d66a * 2012-02-23
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-22 15:15:22 +00:00
nobu
3e661a7e10 merge revision(s) 34750:
* test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-22 15:15:17 +00:00
nobu
35bf8099d4 merge revision(s) 34735,34736:
* io.c (rb_io_s_foreach): return enumerator including kerword
	  arguments.  [ruby-dev:45267][Bug #6054]

	* io.c (rb_io_s_foreach): argument check before making Enumerator.
	  [ruby-dev:31525]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-22 13:04:38 +00:00
naruse
fa1a2ae158 * configure.in: remove workaround replacement from gcc to gcc-4.2.
[Backport #6043]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-22 12:44:50 +00:00
naruse
e322989bb3 merge revision(s) 34719,34720: [Backport #6059]
* gc.c : remove gc_clear_mark_on_sweep_slots() and use
	  rest_sweep() instead of it, because some dead objects might be
	  marked in next the mark phase by false pointers.
	  [ruby-core:42672]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-22 08:57:21 +00:00
naruse
4103e718f8 merge revision(s) 33326:
warnings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-21 09:27:51 +00:00
svn
80ca7d23f9 * 2012-02-21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-20 23:55:23 +00:00
marcandre
a81a817297 merge revision(s) 34712:
* enumerator.c (enumerator_rewind): update the documentation.
          fixed: #6053

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-20 23:55:19 +00:00
nobu
95c3026f97 merge revision(s) 33327:
* configure.in: ignore all warnings from an arbitrary
	  header in /usr/local/include.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-19 03:29:29 +00:00
naruse
d8168dedef merge revision(s) 34652:
* lib/mkmf.rb (create_header): log the content of header.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 04:24:39 +00:00
naruse
95433b2b42 merge revision(s) 34268:
* test/readline/test_readline.rb (test_completion_proc_empty_result):
	  ensure clearance of Readline's line_buffer after the test.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 03:27:02 +00:00
naruse
c1303fbe8a merge revision(s) 34255: [Backport #6035]
* test/readline/test_readline.rb (test_completion_proc_empty_result): rescue NoMemoryError.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 03:25:38 +00:00
naruse
54209dd172 merge revision(s) 34115:
* test/readline/test_readline.rb (test_line_buffer__point): use
	  lambda not to exit entire method by "return".  or "next" for
	  proc.  [ruby-dev:45042] [Bug #5802]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 02:47:10 +00:00
naruse
c32308780c merge revision(s) 34644:
* ext/dbm/extconf.rb: check _DB_H_ macro unavailable except
	  Berkeley DB library.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 01:16:19 +00:00
naruse
3558675488 merge revision(s) 34646:
* test/dbm/test_dbm.rb: fix skip condition for libgdbm 1.8.0 or prior.
	  reported by Bohuslav Kabrda.
	  [ruby-core:42685] [ruby-trunk - Bug #6036]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 01:14:57 +00:00
naruse
bae9e4a0bc merge revision(s) 34650:
* tool/transcode-tblgen.rb (import_ucm): don't use \h because the
	  script should work with ruby 1.8.

	* tool/enc-unicode.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 00:54:14 +00:00
naruse
a81c766340 Fix debug line of ext/dbm/extconf.rb in r34641. [Backport #6021]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 00:38:04 +00:00
naruse
de889a30d2 * ext/dbm/extconf.rb: merge trunk's ext/dbm/extconf.rb and
related functions of lib/mkmf.rb. [Backport #6021]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-16 08:56:21 +00:00
naruse
4ec9395ba2 merge revision(s) 32730:
* configure.in (enable_pthread): use -pthread on OpenBSD without
	  explicit option. patched by Jeremy Evans. [ruby-core:38572]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-16 00:26:09 +00:00
naruse
4f05bf852b merge revision(s) 32731,32734,32738:
------------------------------------------------------------------------
r32731 | naruse | 2011-07-29 16:17:35 +0900 (Fri, 29 Jul 2011) | 3 lines

Use setrlimit(NOFILE,1) on OpenBSD.

Because on OpenBSD it freezes if limit=0.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-16 00:25:11 +00:00
nagachika
d23a588b22 merge revision(s) r32583:
* ChangeLog: fix typo


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 22:50:46 +00:00
naruse
8cdf5c4179 merge revision(s) 34629,34630:
* cont.c (rb_fiber_reset_root_local_storage): add a new function to
	  restore rb_thread_t::local_storage.

	* cont.c (rb_obj_is_fiber): add a new function to tell finalizer to
	  prevent fibers from destroy.

	* gc.c (rb_objspace_call_finalizer): don't sweep fibers at finalizing
	  objspace.

	* internal.h (rb_fiber_reset_root_local_storage, rb_obj_is_fiber):
	  add prototypes.

	* vm.c (ruby_vm_destruct): reset main thread's local_storage before
	  free main thread. rb_thread_t::local_storage is replaced by fiber's
	  local storage when forked from fiber, and it should be already freed
	  when the fiber was destroyed.

	* test/ruby/test_fiber.rb (test_fork_from_fiber): add test for fork
	  from fiber.
	  when the fiber was destroyed. [ruby-core:41456] [Bug #5700]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 22:34:48 +00:00
naruse
a4debd6ae2 merge revision(s) 34626,34627:
* ext/fiddle/closure.c (callback): same as r34506.

	* ext/fiddle/closure.c (callback): deal with unsinged integers.
	  [ruby-core:42458][Bug #5991][Bug #6022]

	* ext/fiddle/conversions.c (value_to_generic, generic_to_value):
	  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 21:31:16 +00:00
svn
4dc3d30ab5 * 2012-02-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 21:05:05 +00:00
marcandre
95dd735aec merge revision(s) 34619:
* lib/ostruct.rb: Simplify and fix rdoc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 21:05:01 +00:00
nobu
7b7aa9f573 merge revision(s) 34261,34351:
------------------------------------------------------------------------
r34261 | nobu | 2012-01-10 15:52:24 +0900 (Tue, 10 Jan 2012) | 2 lines

* gc.c (HEAP_OBJ_LIMIT): suppress narrowing down warning from gcc 4.2.

------------------------------------------------------------------------

	* include/ruby/ruby.h (FIXNUM_P): simple flag should be int.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 01:36:49 +00:00
nobu
e56eea5e37 merge revision(s) r34564:
* vm_eval.c (check_funcall):  Call respond_to? with matching arity for
	  legacy single-argument implementations.  [ruby-trunk - Bug #6000]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 01:33:56 +00:00
nobu
afcd5562ae merge revision(s) r32855,r32857,r33493,r34554:
* vm_eval.c (check_funcall): try respond_to? first if redefined.
	  [Bug #5158]

	* test/ruby/test_object.rb: tests that respond_to? returns false.

	* vm_eval.c (check_funcall): set array elements one-by-one to fix
	  compile error with Fujitsu C Compiler 5.6 on Solaris 10 on Sparc.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 01:29:34 +00:00
nobu
50a470b853 merge revision(s) 33866,33867:
------------------------------------------------------------------------
r33866 | nobu | 2011-11-27 17:24:29 +0900 (Sun, 27 Nov 2011) | 1 line

* configure.in: whitespace-cleanup.
------------------------------------------------------------------------


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-15 01:10:29 +00:00
naruse
00af7b8f9a merge revision(s) 34555: [Backport #5786]
* compile.c (defined_expr): guard the whole expression.
	  [ruby-dev:45021][Bug#5786]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 22:16:06 +00:00
naruse
35c546104b merge revision(s) 32712,32718,32719: [Backport #6014]
* ext/dl/cfunc.c (dlcfunc_mark), ext/dl/cptr.c (dlptr_mark):
	  workaround to mark wrapped object.  this is not a true fix,
	  because [Bug #4929] is caused by the interface design of DL.

	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition.

	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): fix wrapping condition.

	* ext/dl/cptr.c (rb_dlptr_s_to_ptr): use rb_check_funcall.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 20:09:27 +00:00
naruse
0c8cfb4eab merge revision(s) 32720: [Backport #6015]
* ext/dl/cptr.c (rb_dlptr_aref, rb_dlptr_aset): check NULL pointer
	  dereference.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 20:05:04 +00:00
naruse
44d3cf03fd merge revision(s) 32705,32717: [Backport #6016]
* test/rinda/test_rinda.rb (test_remote_array_and_hash):
	  add local variables to protect objects from GC. [ruby-dev:44253]
	  [Bug #5104]

	* test/rinda/test_rinda.rb: decrease the code that depends on timing.
	  [Bug #372] [Bug #4160]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 20:04:06 +00:00
naruse
dbda1e9ea7 merge revision(s) 32640: [Backport #6017]
* test/win32ole/test_err_in_callback.rb (test_err_in_callback): 
	  skip test if ADODB.connection is not available.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34601 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 20:03:06 +00:00
naruse
5f06da63d6 merge revision(s) 34415:
* parse.y (debug_lines, coverage): set file path encoding for coverage
	  result.  [ruby-dev:44950]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 20:01:09 +00:00
usa
2349592a51 merge revision(s) 33254:
* lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
  open files in binary mode.
  see more details in https://github.com/jimweirich/rake/issues/74


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 07:58:23 +00:00
usa
39432526b6 merge revision(s) 33902:
* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
  on Windows.
  see https://github.com/rdoc/rdoc/issues/87

* test/rdoc/test_rdoc_markup_pre_process.rb
  (TestRDocMarkupPreProcess#test_include_file, 
  TestRDocMarkupPreProcess#test_include_file_encoding_incompatible):
  follow above change.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 07:55:37 +00:00
usa
ac81a6e38d merge revision(s) 33232:
* test/rubygems/test_gem_commands_help_command.rb: Add one
  `require` because if run test-all with test/unit parallel
  running, sometimes this test fails by some constants not found.
  The error reason is some worker doesn't require the file needed by
  this test. This issue is related to [ruby-core:36168].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 07:36:03 +00:00
usa
aa815c5824 merge revision(s) 33500,33501:
* gc.c (rb_gc_set_params): set parameters always.
  [ruby-dev:44648] [Bug #5467]

* gc.c (initial_params): pack in a struct.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 07:09:32 +00:00
usa
1bf61d770a merge revision(s) 34395:
* test/irb/test_completion.rb: skip if cannot load irb/completion
  (maybe readline does not exist).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 06:45:33 +00:00
nobu
83f1aca178 merge revision(s) 34589:
* lib/test/unit/assertions.rb (build_message): skip escaped
	  question marks.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-14 06:07:39 +00:00
naruse
e782ca865b merge revision(s) 33935,33936,33987: [Backport #5702]
* variable.c (set_const_visibility): Module#private_constant has
	  changed the visibility of only the first argument.  Now it changes
	  all of them.  [ruby-list:48558]

	* test/ruby/test_module.rb: add a test for above.

	* variable.c (set_const_visibility): print a warning when no argument
	  is passwd to Module#private_constant.  [ruby-list:48558]

	* vm_method.c (set_method_visibility): ditto for
	  Module#private_class_method.

	* variable.c (set_const_visibility): clear inine-cache when constant's
	  visibility is modified. [ruby-dev:44929]

	* test/ruby/test_module.rb (test_private_constants_clear_inlinecache):
	  add test for it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-13 04:51:21 +00:00