Commit graph

1966 commits

Author SHA1 Message Date
yugui
ed5b6231df merges r22610 from trunk into ruby_1_9_1.
--
* io.c (rb_io_getline_1): enables limit even if rs is given.
  [ruby-core:22434]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-03 11:40:41 +00:00
yugui
5665cf676f merges r22608 from trunk into ruby_1_9_1.
--
* string.c (rb_str_chomp_bang): coderange may change.
  [ruby-core:22414]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-03 11:40:32 +00:00
yugui
c18695771d merges r22606 from trunk into ruby_1_9_1.
--
* string.c (rb_str_delete_bang): should recalculate coderange.
  [ruby-talk:329267]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-03 11:40:22 +00:00
yugui
f3c363c6f7 merges r22505 and r22547 from trunk into ruby_1_9_1.
--
* string.c (tr_trans): should not be affected by the encoding of
  replacement unless actually modified.  [ruby-talk:328967]
--
* string.c (tr_trans): should recalculate coderange.
  [ruby-core:22326] (reopened at [ruby-core:22328])

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-03 11:39:19 +00:00
yugui
abc40f03ef merges r21917, r21955 and r21974 from trunk into ruby_1_9_1.
* load.c (rb_require_safe): raises when the path to be loaded is
  tainted.  [ruby-dev:37843]
---
* file.c (rb_find_file_ext): should not be infected from other
  load paths.
---
* adds a test case for r21955 and r21917.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-02-22 04:30:22 +00:00
mame
7c6feec335 * parse.y (top_compstmt, top_stmts, top_stmt): prohibit BEGIN {} in
non-toplevel scope.  [ruby-core:21657]

* test/ruby/test_beginendblock.rb (test_begininclass): add a test for
  above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-29 16:51:19 +00:00
yugui
87eb8726e5 merges r21739 from trunk into ruby_1_9_1.
* lib/cgi/core.rb (CGI.parse): generate only key on params hash
  if request have only key uri parameters.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 09:21:49 +00:00
yugui
8a917193c9 merges r21733 from trunk into ruby_1_9_1.
* test/ruby/test_process.rb: mswin specs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 09:21:35 +00:00
yugui
063d6c71ec merges r21728 from trunk into ruby_1_9_1.
* test/ruby/test_process.rb (MANDATORY_ENVS): needs RUBYLIB to run
  tests without install.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 09:21:28 +00:00
yugui
19d4261899 merges r21717 and r21741 from trunk into ruby_1_9_1.
Add test for String#encode.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 09:20:53 +00:00
yugui
1011775a39 introduces r21693 again and merges r21713
* array.c (take_items), enum.c (enum_zip): tries to convert to
  array first.  [ruby-core:21442]
--
* array.c (take_items): to_ary() raises ArgumentError if cannot to
  convert to Array. [ruby-dev:37797]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 09:20:03 +00:00
yugui
a40ca8c047 * reverts r21693.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-20 10:14:18 +00:00
yugui
0c67de6704 * Reverts r21598 and r21599 because the original behavior is
intentional.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-20 09:53:46 +00:00
yugui
07efe466f6 merges r21678 from trunk into ruby_1_9_1.
* array.c (take_items), enum.c (enum_zip): tries to convert to
  array first.  [ruby-core:21442]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-20 09:53:31 +00:00
yugui
5924d8565c * test/minitest/test_mini_test.rb: the number of assertions must be
exactly equal to the number of assertion method calls that the end-user
  would write. [ruby-dev:37703]

* test/minitest/test_mini_spec.rb: ditto.

* lib/minitest/unit.rb: ditto. 
  Patch by David Flanagan <david AT davidflanagan.com>. [ruby-core:21350]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:57:54 +00:00
yugui
739ad75f45 * test/minitest/test_mini_test.rb: the number of assertions must be
exactly equal to the number of assertion method calls that the end-user
  would write. [ruby-dev:37703]

* lib/minitest/unit.rb: ditto.
  Patch by David Flanagan <david AT davidflanagan.com>. [ruby-core:21350]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:57:45 +00:00
yugui
d68854c07f merges r21509 and r21512 from trunk into ruby_1_9_1.
* enc/trans/gb18030.trans, gb18030-tbl.rb:
  new Chinese GB18030 transcoding (from Yoshihiro Kambayashi)

* test/ruby/test_transcode.rb: added tests for the above
  (from Yoshihiro Kambayashi)

* transcode_data.h, transcode.c, tool/transcode_tblgen.rb:
  added support for GB18030-specific 4-byte sequences
  (with Yoshihiro Kambayashi)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:02 +00:00
yugui
d5159ddec8 merges r21496 from trunk into ruby_1_9_1.
* lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check.
  Patch by Kornelius Kalnbach.  [ruby-core:20992].

* test/ostruct/test_ostruct.rb: test for inspect.
  Patch by Kornelius Kalnbach.  [ruby-core:20992].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:38:08 +00:00
yugui
fd705262da merges r21469 from trunk into ruby_1_9_1.
* ext/socket/socket.c (sock_s_unpack_sockaddr_in): check too short
  sockaddr.
  (sock_s_unpack_sockaddr_un): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:35:25 +00:00
yugui
1fbaa2a5af merges r21447 from trunk into ruby_1_9_1.
* win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.

* win32/win32.c (winnt_stat): gets rid of strange behavior of
  GetFileAttributes().  [ruby-core:21269]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-12 13:33:08 +00:00
yugui
fdbfb35c42 merges r21431 from trunk into ruby_1_9_1.
remove PercentScanner. fixed % after %> bug. [ruby-dev:37751] [Bug #997]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-12 13:32:42 +00:00
yugui
9aa12f778f merges r21426 from trunk into ruby_1_9_1.
* test/ruby/test_process.rb (TestProcess#test_wait_and_sigchild):
  Add rescue NotImplementedError.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-12 13:32:36 +00:00
yugui
6889d3d361 merges r21415 and r21417 from trunk into ruby_1_9_1.
* version.h: make version string succinct:
  "ruby 1.9.1p5000 (2009-01-10 trunk 21414) [i686-linux]".

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21458 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-12 13:32:24 +00:00
yugui
396fd88910 merges r21393 from trunk into ruby_1_9_1.
* test/ruby/test_process.rb (TestProcess::MANDATORY_ENVS): some
  platforms need environments for shared objects.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-12 13:31:58 +00:00
yugui
0685db2d96 merges r21315 from trunk into ruby_1_9_1.
* enc/trans/gbk.trans, gbk-tbl.rb:
  new Chinese GBK transcoding (from Yoshihiro Kambayashi)

* test/ruby/test_transcode.rb: added tests for the above
  (from Yoshihiro Kambayashi)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 14:06:14 +00:00
yugui
1a9f125b96 merges r21314 from trunk into ruby_1_9_1.
* test/ruby/test_transcode.rb: added tests for GB2312
  (from Yoshihiro Kambayashi)

* enc/trans/chinese.trans: set valid byte patterns for
  GB2312 and GB12345

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 14:06:05 +00:00
yugui
a2f665a917 merges r21313 from trunk into ruby_1_9_1.
* enc/trans/big5.trans, big5-tbl.rb:
  new Chinese Big5 transcoding (from Yoshihiro Kambayashi)

* test/ruby/test_transcode.rb: added tests for the above
  (from Yoshihiro Kambayashi)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 14:05:56 +00:00
yugui
824d0ec3c6 merges r20850, r17881, r16811, r16763, r16748, r15829, r15794 and r15698
from ruby_1_8 into ruby_1_9_1..

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 11:53:33 +00:00
yugui
d2e44245ff merges r21279 from trunk into ruby_1_9_1.
* test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:16:06 +00:00
yugui
4b2c280df9 merges r21273 from trunk into ruby_1_9_1.
* test/ruby/test_process.rb (test_wait_and_sigchild): remove debug
  output.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:15:22 +00:00
yugui
89c2ab70a4 merges r21209 from trunk into ruby_1_9_1.
* io.c (copy_stream_body): don't check to_io because
  Zlib::GzipWriter#to_io returns the underlying IO.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:42:23 +00:00
yugui
1d08109c23 merges r21188 from trunk into ruby_1_9_1.
Imported minitest 1.3.1 r4506.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 11:05:31 +00:00
yugui
7010dcef9b merges r21181 from trunk into ruby_1_9_1.
* process.c (rb_waitpid): retries waitpid when EINTR.
  [ruby-core:19744].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:32:51 +00:00
yugui
7c74420ddc merges r21170 from trunk into ruby_1_9_1.
* lib/erb.rb (ERB): m17n of ERB. adds rdoc.
  fixes #712. c.f. [ruby-dev:37516].

* lib/erb.rb (ERB::Compiler#compile): recognizes magic comments.
  returns a pair of compiled script and its script encoding.

* lib/erb.rb (ERB#set_eoutvar): make generated scripts return a
  string in correct encoding.

* lib/erb.rb (ERB#def_method): use Kernel#eval for encoding-awareness
  of the evaluated string.

* bin/erb.rb (ERB::Main.run): adds -E and -U options.
  String is no longer Enumerable.

* man/erb.1: new manapage.

* test/erb/test_erb_m17n.rb: new test case for m17n features.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:32:08 +00:00
yugui
a25b3c05e7 merges r21148 from trunk into ruby_1_9_1.
* thread.c (rb_mutex_trylock): return false if Mutex owned
  by current thread.  [ruby-core:20943]
* thread.c (rb_mutex_lock): check dead lock (recursive lock) here.
* test/ruby/test_thread.rb: add a test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:19:32 +00:00
yugui
6494fb46c3 merges r21135 from trunk into ruby_1_9_1.
* test/ruby/test_sprintf.rb (test_invalid): suppress warning.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:18:31 +00:00
yugui
f9deedb3cc * test/rubygems/test_gem_command.rb
(test_add_option_overlapping_common_and_local_options):
  follows r21066.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:43:21 +00:00
yugui
3dd5483f90 merges r21112 from trunk into ruby_1_9_1.
* test/rubygems/test_ext_configure_builder.rb (test_self_build_fail):
  Extends pattern for FreeBSD's error message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:43:12 +00:00
yugui
a389b36398 merges r21104 from trunk into ruby_1_9_1.
* Imported minitest 1.3.1 r4505.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:42:51 +00:00
yugui
6f92f56042 merges r21101 from trunk into ruby_1_9_1.
* test/rdoc/test_rdoc_info_formatting.rb (setup, teadown): uses
  mktmpdir and removes it alfter the test.

* test/cgi/test_cgi_session.rb (setup, teadown): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:42:26 +00:00
yugui
1e8a6745b0 merges r21084 from trunk into ruby_1_9_1.
* vm_insnhelper.c (vm_call_method, vm_call_cfunc): use original id instead of
  calling id when NODE_CFUNC or NODE_BMETHOD.
  fixes Bug #632 [ruby-core:19282].
* vm_eval.c (vm_call0, vm_call_super): ditto.
* vm_method.c (rb_add_method, rb_alias): store original id
  in nd_file field of NODE_METHOD.
* test/stringio/test_stringio.rb: add a test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:39:43 +00:00
yugui
8309a878a9 merges r21066 from trunk into ruby_1_9_1.
* lib/optparse.rb (OptionParser::List#summarize): gives priority
  to latter switches.  [ruby-dev:36692]

* lib/optparse.rb (OptionParser#summarize): do not append
  unnecessary line terminator.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 11:16:16 +00:00
yugui
9fa2c9ea98 merges r20984 from trunk. c.f. [ruby-dev:37240]
* test/ruby/test_eval.rb: add new test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 05:54:48 +00:00
yugui
b7a1cb6251 merges r21047 from trunk into ruby_1_9_1.
* transcode.c (str_transcode0): set encoding when String#encode was
  given explicit but the same destination and source encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 05:54:41 +00:00
yugui
cc0c85e0c0 merges r20530 from trunk into ruby_1_9_1.
* test/ruby/test_process.rb: skip some tests on win32.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:32:46 +00:00
yugui
fb06765feb merges r20089, r20090 and r20091 from trunk into ruby_1_9_1.
* ext/win32ole/win32ole.c (ole_event_free): invoke IConnectionPoint::Unadvise
  before invoking IConnectionPoint::Release.

* test/win32ole/test_win32ole_event.rb, test/win32ole/err_in_callback.rb,
  test/win32ole/test_err_in_callback.rb: Use ActiveX Data Object
  Library instead of InternetExplorer.
--
* test/win32ole/test_err_in_callback.rb: add teardown.
--
* test/win32ole/test_win32ole_event.rb: rename test class.
* test/win32ole/test_win32ole_variant_outarg.rb: add in order
  to use ADO instead of Internet Explorer.
  remove test/win32ole/test_win32ole_variant_with_ie.rb.

* test/win32ole/orig_data.csv: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:32:32 +00:00
yugui
047bcbd519 Revert "trunk r28202 : [ruby-dev:37240]"
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 10:24:17 +00:00
yugui
f1f90757c4 merges r20989 from trunk into ruby_1_9_1.
* io.c (flush_before_seek): check io_fflush result.
  (rb_io_check_readable): ditto.
  (rb_io_flush): ditto.
  (rb_io_fsync): ditto.
  (remain_size): ditto.
  (rb_io_write_nonblock): ditto.
  (finish_writeconv): ditto.
  (fptr_finalize): ditto.
  (io_reopen): ditto.
  (rb_io_reopen): ditto.
  (copy_stream_body): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 09:58:07 +00:00
yugui
1ca642357a trunk r28202 : [ruby-dev:37240]
* test/ruby/test_eval.rb: add new test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21036 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 09:57:21 +00:00
yugui
026cb87d4c merges r20974 from trunk into ruby_1_9_1.
* test/readline/test_readline_history.rb: check the encoding that
  is in the Readline::HISTORY.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 09:56:21 +00:00