Commit graph

15465 commits

Author SHA1 Message Date
yugui
524ec326e2 merges r21105 and r21106 from trunk into ruby_1_9_1.
* thread.c (mutex_free): GC thread (main thread) has failed to unlock
  a mutex that is locked by another thread, which makes the mutex
  dangling in keeping_mutexes and causes [BUG] or stuck finally.
  Now unlocking is performed as locking thread.

* thread.c (mutex_unlock, rb_mutex_unlock, rb_mutex_unlock_all):
  mutex_unlock receives a thread.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:43:02 +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
b87dd67474 merges r21102 from trunk into ruby_1_9_1.
* runruby.rb: refactored to modify ENV as once.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:42:41 +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
a90a01acee merges r21100 and r21107 from trunk into ruby_1_9_1.
* ext/dl/test/test_base.rb: use lib64 when the architecture is x86_64.
       * ext/dl/test/test_base.rb: use libc.dylib when the platform is
       darwin.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:42:17 +00:00
yugui
259ed6176f merges r21099 from trunk into ruby_1_9_1.
* win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
	  is 2, not 0, because it will be converted to "".

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:42:09 +00:00
yugui
a929fd040a merges r21097 from trunk into ruby_1_9_1.
* process.c (after_exec): needs to reset before restart timer
  thread.

* thread.c (thread_start_func_2): stops timer thread if forked in
  the new thread.   [ruby-core:19385]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:42:01 +00:00
yugui
6a0e4079f3 merges r21096 from trunk into ruby_1_9_1.
* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): DRY.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:41:53 +00:00
yugui
61974ea96d merges r21094 from trunk into ruby_1_9_1.
* .gdbinit (dummy_gdb_enums.special_consts): forces to load debug
  info on Mac OS X.

* .gdbinit (rp): added T_ZOMBIE.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:41:44 +00:00
yugui
c7239a7e32 merges r21093 from trunk into ruby_1_9_1.
* eval.c (rb_frame_callee, rb_frame_caller): rb_frame_callee()
  should return method id on current frame.
  add rb_frame_caller() to get method id on parent frame.
  Bug #884 [ruby-dev:37446]
* eval.c (rb_f_method_name): use rb_frame_caller()
  instead of rb_frame_callee().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:41:34 +00:00
yugui
0c0804cf26 merges r21092 from trunk into ruby_1_9_1.
* transcode.c (make_econv_exception): show source and destination
  encoding.  [ruby-dev:37285]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:41:23 +00:00
yugui
678097c6e3 merges r21091 from trunk into ruby_1_9_1.
* vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
  "blockptr" to "blockargptr".

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:41:15 +00:00
yugui
6a1420c308 merges r21090 from trunk into ruby_1_9_1.
* common.mk (revision.h): ignores failure of file2lastrev.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:41:05 +00:00
yugui
f531b26c9a merges r21089 from trunk into ruby_1_9_1.
* ruby.c (process_options): fix to untouch th->mild_compile_error.
  [ruby-dev:37621], [ruby-dev:37620]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:40:56 +00:00
yugui
7e35c2e2d0 merges r21088 from trunk into ruby_1_(_1.
* iseq.h, iseq.c (rb_iseq_new_main): add a type ISEQ_TYPE_MAIN.
  [ruby-dev:37619]
* compile.c (rb_dvar_defined, ruby_iseq_compile): ditto.
* iseq.c (iseq_data_to_ary, iseq_load): ditto.
* compile.c (iseq_compile_each): fix to check ip->compile_data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:40:46 +00:00
yugui
f54ed7a794 merges r21087 from trunk into ruby_1_9_1.
* lib/open-uri.rb (OpenURI.redirectable?): permit https redirection.
  patch from Roman Shterenzon.  [ruby-core:20485]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:40:37 +00:00
yugui
02e2b50599 merges r21086 from trunk into ruby_1_9_1.
* eval.c (get_errinfo): return th->errinfo value
  if normal errinfo place (dynamic local viriable) is not found.
  fixes Bug #732 [ruby-dev:37046].
* bootstraptest/test_proc.rb: add a test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:40:24 +00:00
svn
6bcc55dc6c * 2008-12-28
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:39:47 +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
c625220671 mistake in merging. reverts r21108.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 07:33:49 +00:00
yugui
c9690a1a4d merges r21098 from trunk into ruby_1_9_1.
* add Doxyfile to svn:ignore.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 07:30:48 +00:00
yugui
ea8ca29676 man/irb.1: adds -v, -h, -E and -U.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-27 04:12:38 +00:00
yugui
846ca98acf merges r21079 from trunk into ruby_1_9_1.
* vm.c (Init_VM): create and define TOPLEVEL_BINDING at first.
* vm.c (vm_set_main_stack, rb_iseq_eval_main): added.
* parse.y (rb_parser_compile_file): fix to check parse_in_eval flag.
* eval.c (ruby_exec_node): use rb_iseq_eval_main()
  instead of rb_iseq_eval().
* iseq.c (rb_iseq_new_main), vm_core.h: added.
  main script (specified by -e or script name) should be run
  under TOPLEVEL_BINDING using Kernel#eval.  Above changes
  simulate Kernel#eval behaviour.  [ruby-dev:37240]
* compile.c (make_name_for_block): skip iseq except block type.
  this fix is needed for [ruby-dev:37240], and also fixes
  [ruby-dev:35392].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-27 02:16:28 +00:00
yugui
63e21a7195 merges r21076 from trunk into ruby_1_9_1.
* process.c (after_fork): ignores a termination request in the
  parent process.  [ruby-dev:37447]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-27 02:16:20 +00:00
yugui
6a1c295da6 merges r21074 from trunk into ruby_1_9_1.
* lib/csv.rb:  Using a more robust transcoding scheme to produce
  ASCII compatible inspect() messages.  [ruby-dev:37591]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-27 02:16:12 +00:00
yugui
2b29e9f40e merges r20956 from trunk into ruby_1_9_1.
* pack.c (pack_pack): encoding of packed string only from 'm',
  'M', and 'u' should be US-ASCII.  [ruby-dev:37284]

* pack.c (pack_pack): encoding of packed string only from 'U'
  should be UTF-8.  also upgrade US-ASCII strings to UTF-8.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-27 02:16:03 +00:00
svn
e5056c5d8c * 2008-12-27
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-27 00:25:55 +00:00
yugui
49ff0f88e1 * cont.c: rdoc for Fiber. patch by Muhammad Ali.
[ruby-core:20894]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-27 00:25:47 +00:00
yugui
90326df926 merges r21068 from trunk into ruby_1_9_1.
* io.c (fptr_finalize): don't allocate objects if noraise.
  (finish_writeconv): add noalloc argument to be able to avoid
  object allocation.
  (finish_writeconv_arg): introduced again.
  (finish_writeconv_sync): follow the above change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 11:16:43 +00:00
yugui
a8b2bda760 merges r20952 from trunk into ruby_1_9_1.
* string.c (rb_external_str_new_with_enc): set ASCII-8BIT if
  encoding is US-ASCII and string contains 8bit characters.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 11:16:35 +00:00
yugui
cad814b548 merges r20905 from trunk into ruby_1_9_1.
* parse.y (gettable_gen): the encoding of __FILE__ should be
  rb_filesystem_encoding().  [ruby-list:45733]

* parse.y (gettable_gen): __FILE__ should be ASCII-8BIT when
  filesystem encoding is US-ASCII and __FILE__ contains non 7bit
  characters.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 11:16:23 +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
d2165fe2bb merges r21059 from trunk into ruby_1_9_1.
* io.c (fptr_finalize): close the IO object even if finish_writeconv or
  flush is failed.
  (finish_writeconv): don't raise.  return errno or exception.
  (finish_writeconv_arg): removed.
  (finish_writeconv_sync): follow finish_writeconv change.

* transcode.c (rb_econv_make_exception): new function.

* include/ruby/encoding.h (rb_econv_make_exception): declared.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 11:16:07 +00:00
yugui
cef98ef8e3 * lib/irb/input-method.rb (IRB::StdioInputMethod#initialize):
removed a 'p' for debugging.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 08:06:33 +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
1f161c1824 merges r21044 from trunk into ruby_1_9_1.
* transcode.c (sym_ignore): remove useless symbol.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 05:54:27 +00:00
yugui
db8fcd41fd merges r20918 from trunk into ruby_1_9_1.
* numeric.c (int_ord): Integer#ord implemented.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 05:54:18 +00:00
yugui
ef1af87ed2 merges r20798 and r20800 from trunk into ruby_1_9_1.
* lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of):
  should assert by instance_of?, not ===.  [ruby-dev:37458]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 05:54:09 +00:00
yugui
ef1374eac9 merges r20941 from trunk into ruby_1_9_1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-26 03:56:45 +00:00
yugui
16161acfed merges r20757 from trunk into ruby_1_9_1. [ruby-dev:37560]
* ext/pty/pty.c (child_info): add slavename.
  (chfunc): use slavename.
  (establishShell): set slavename.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21057 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:33:06 +00:00
yugui
f14ec698b9 merges r20685 from trunk into ruby_1_9_1.
* NEWS

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:33:00 +00:00
yugui
15023618ec merges r20590 from trunk into ruby_1_9_1.
* vm_insnhelper.c (check_cfunc): use function pointer.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:32:53 +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
fa98c208ed merges r20368 from trunk into ruby_1_9_1.
* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should return
  Integer for #div operation.

* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): should raise
  ZeroDivisionError if divisor is zero.  [ruby-dev:37207]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:32:40 +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
svn
db2c8f6eb8 * 2008-12-26
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:32:19 +00:00
yugui
c85ad557c2 merges r20088 from trunk into ruby_1_9_1.
win32/Makefile.sub: add RUNRUBYOPT. [ruby-dev:37009]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:32:15 +00:00
kazu
b07db80589 fix typos.
* Kernel.to_a -> Kernel#to_a
* Errno::ENOERROR -> Errno::NOERROR


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21046 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 11:38:08 +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