Commit graph

15465 commits

Author SHA1 Message Date
svn
f8dce92410 * 2009-01-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-20 09:53:00 +00:00
yugui
6106439984 merges r21661 from trunk into ruby_1_9_1.
* ruby.c (require_libraries): reset th->parse_in_eval while
  loading libraries.  fixes [ruby-dev:37780]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-20 09:52:51 +00:00
yugui
9b6c8a5b64 * lib/erb.rb: changes style of the rdoc for suppressing
warning. [ruby-core:21117]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 12:20:08 +00:00
yugui
90ea30a3e9 merges r21628 from trunk into ruby_1_9_1.
* configure.in (darwin): get rid of strange settings issue of
  apple gcc port, which searches /usr/local/include always but
  /usr/local/lib not.

* ext/readline/readline.c (Init_readline): suppress warnings with
  libedit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 12:20:00 +00:00
yugui
83a2a2ac54 merges r21625 from trunk into ruby_1_9_1.
* lib/irb/xmp.rb: multilingualizes XMP::StringInputMethod.
  [ruby-core:21383].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 12:19:53 +00:00
yugui
1b517144e3 merges r21611 from trunk into ruby_1_9_1.
* vm_dump.c (vm_stack_dump_each): initialized at declarations.

* vm_dump.c (rb_vm_bugreport): constified to suppress a warning.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 12:19:45 +00:00
yugui
0962222856 merges r21602, r21603, r21607 and r21630 from trunk into ruby_1_9_1.
* configure.in (Makefile): set VCS and VCSUP to support `git svn'                                      and git.

* Makefile.in, win32/Makefile.sub (up): split from common.mk.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 12:19:36 +00:00
svn
f1211dd405 * 2009-01-17
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 06:39:03 +00:00
yugui
8475b6c3c7 merges r21179 from trunk into ruby_1_9_1.
* pack.c (pack_pack): template f should not accept non float
  values.  [ruby-dev:37656]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 06:38:58 +00:00
yugui
95b0640876 merges r21606 from trunk into ruby_1_9_1.
* tool/make-snapshot (package): includes all rules and expand
  configured values from the environment to create *.inc, sets RM
  for ripper.c, and needs chdir if absolute path is given with
  -exported option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 12:14:24 +00:00
yugui
9790f364fa merges r21521 and r21601 from trunk into ruby_1_9_1.
* LEGAL: Added information for missing/langinfo.c

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 12:14:13 +00:00
yugui
051f55adea * test/minitest/unit.rb: temporarily merges Kouji's patch without
maintainer's permission in order to release 1.9.1 RC2.
  [ruby-core:21364] .
  Patch by Takao Kouji <kouji AT takao7.net>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:58:03 +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
8801fecb82 merges r21592 from trunk into ruby_1_9_1.
* thread.c (thread_start_func_2): call ruby_cleanup() if thread is
  main thread.  [ruby-dev:37624]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:07:31 +00:00
yugui
575e4dfcbb merges r21591 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): if dependencies is newer than targets or
	  targets don't exist, try to create targets with BASERUBY. no need to
	  detect errors there because the absence of BASERUBY is not abnormal.
	  after the try, if the targets still don't exist, copy them from
	  $(srcdir).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:07:23 +00:00
yugui
ba7c2f1e14 merges r21588 from trunk into ruby_1_9_1.
* parse.y (rb_parse_in_main): fixed typo.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:07:16 +00:00
yugui
566072ec8d merges r21582 from trunk into ruby_1_9_1.
* thread.c (rb_thread_execute_interrupts): if signal is already
  buffered, main thread should wait until timer thread delivers it.

* thread.c (timer_thread_function): should defer delivery of a signal
  if main thread does not yet trap a previous one.  [ruby-dev:37676]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:07:04 +00:00
yugui
36c95beb5a merges r21578 from trunk into ruby_1_9_1.
* thread.c (call_trace_proc): as Matz said ([ruby-core:21183]),
  should skip rb_str_new2() if rb_sourcefile() returns NULL.
  rb_sourcefile() returns NULL if frame is toplevel of Fiber.
  [ruby-core:21161] [Bug #985]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:06:54 +00:00
yugui
33d1cbe960 merges r21405 from trunk into ruby_1_9_1.
* common.mk (test-sample), rubytest.rb: use runruby.rb

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 16:33:15 +00:00
yugui
1bf3fe1d60 merges r21571 from trunk into ruby_1_9_1.
* ruby.c (process_options): decrement parse_in_eval to recognize
  parsing main or normal eval script.
* compile.c (rb_parse_in_main): return 1 if parsing main script.
  (if parse_in_eval is negative value, it means main script)
* parse.y (yycompile0): check rb_parse_in_main() to accumulate
  script text.  Bug #848 [ruby-core:20450]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 16:33:06 +00:00
yugui
ed84478215 merges r21570 from trunk into ruby_1_9_1.
* lib/debug.rb: as wanabe-san pointed out,
  set_trace_func should be completely final task in debug.rb.
  Bug #847 [ruby-core:20449]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 16:32:59 +00:00
yugui
c923eaf176 merges r21536 from trunk into ruby_1_9_1.
* vm.c (rb_vm_inc_const_missing_count, ruby_vm_const_missing_count):
  added.
* vm_insnhelper.h: ditto.
* variable.c (rb_const_get_0), insns.def: Constants should not be
  cached if const_missing is called.  [ruby-core:21059] [Bug #967]
* bootstraptest/test_class.rb: add a test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 16:32:49 +00:00
yugui
5c65dc7ae6 merges r21535 from trunk into ruby_1_9_1.
* common.mk: btest-ruby should receive option with OPTS.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 16:32:41 +00:00
yugui
f6edc70d56 merges r21534 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): shoudn't copy when $(srcdir) != ".", too.
	  (this is a workaround.  we need more strict check.)

	* win32/Makefile.sub ($(INSNS)): shound't remove BASERUBY.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 16:32:34 +00:00
yugui
fb117753c5 merges r21533 from trunk into ruby_1_9_1.
* gc.c (gc_with_gvl): suppress warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:40:27 +00:00
yugui
b371ce9d6a merges r21532 from trunk into ruby_1_9_1.
Add rdoc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:40:21 +00:00
yugui
905114d69f merges r21529 from trunk into ruby_1_9_1.
* tool/file2lastrev.rb: RUBY_REVISION must be an integer.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:40:14 +00:00
yugui
e1ccf2699d merges r21528 from trunk into ruby_1_9_1.
* encoding.c (enc_set_default_encoding): should not treat US-ASCII
  special here.  a patch from Yui NARUSE in [ruby-dev:37769].
  [ruby-dev:37699]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:40:06 +00:00
yugui
2f2497ee53 merges r21517 and r21519 from trunk into ruby_1_9_1.
* configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
  and mswin.

* encoding.c (rb_locale_charmap): use environments on mingw and mswin.

* missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese
  environment uses Windows-31J derived from Shift_JIS, not EUC-JP.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:56 +00:00
yugui
2a71b1ca87 merges r21516 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): copy only when $(srcdir) != pwd.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:47 +00:00
yugui
2ea541a8c0 merges r21511 from trunk into ruby_1_9_1.
* encoding.c (rb_locale_charmap): fallback to codepage if no
  locale is found.  [ruby-core:21110]

* missing/langinfo.c (nl_langinfo_codeset): returns NULL if no
  locale is found.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:38 +00:00
yugui
98f510451f merges r21510 from trunk into ruby_1_9_1.
* gc.c (negative_size_allocation_error_with_gvl): abolish a warning.
  (negative_size_allocation_error): ditto.

* ext/openssl/ossl.c (ossl_raise): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:30 +00:00
yugui
cac78c3c4d merges r21518 from trunk into ruby_1_9_1.
* win32/Makefile.sub (COMPILERFLAG): for enc/trans/gb18030.c.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:16 +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
6e6adcca4b merges r21508 from trunk into ruby_1_9_1.
* ext/curses/extconf.rb: check ncursesw earlier than ncurses to
  support UTF-8 strings.   non UTF-8 strings should be converted
  explicitly.   [ruby-core:21094]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:38:51 +00:00
yugui
b7220edcf4 merges r21505 from trunk into ruby_1_9_1.
* ext/socket/extconf.rb (gai_strerror): checks if available and if
  returns const pointer.

* ext/socket/getaddrinfo.c (gai_strerror): defines only if non
  available.  [ruby-core:21328]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:38:42 +00:00
yugui
fea523c18b merges r21504 from trunk into ruby_1_9_1.
* io.c (rb_io_wait_readable, rb_io_wait_writable): need rb_fd_ptr.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:38:31 +00:00
yugui
a0eb50c4d9 merges r21503 from trunk into ruby_1_9_!.
* io.c (appendline): reformed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:38:17 +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
03d1b314b8 merges r21493 from trunk into ruby_1_9_1.
* object.c (rb_obj_not_match): rdoc.
  Patch by Kornelius Kalnbach.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:58 +00:00
yugui
12e5996d83 merges r21492 and r21495 from trunk into ruby_1_9_1.
* io.c (rb_io_close_read): call rb_io_fptr_cleanup() instead of
	  fptr_finalize() because the fptr has special finalizser if it is a
	  pipe.  [ruby-dev:37757] (3)

	* io.c (io_reopen, rb_io_init_copy): should register fptr to
	  pipe_list when copying pipe fptr.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:51 +00:00
yugui
298efbfad6 merges r21491 from trunk into ruby_1_9_1.
* io.c (rb_io_initialize): workaround for Windows. [ruby-dev:37686]
          (also see [ruby-dev:37721])

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:42 +00:00
yugui
9d4b47c6d3 merges r21490 from trunk into ruby_1_9_1.
* template/{encdb,transdb}.h.tmpl: moved enc/make_encdb.rb and
  enc/trans/make_transdb.rb using tool/generic_erb.rb.

* common.mk (encdb.h, transdb.h): generates from avobe template.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:35 +00:00
yugui
d87e1f760f merges r21489 from trunk into ruby_1_9_1.
* enc/trans/make_transdb.rb (converters): should not depend on the
  hash order for cross compile.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:28 +00:00
yugui
6227816910 merges r21487 from trunk into ruby_1_9_1.
* include/ruby/intern.h, thread.c, win32/Makefile.sub (rb_fdset_t,
	  rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr, rb_fd_isset,
	  rb_fd_select, rb_fd_ptr, rb_fd_max, HAVE_RB_FD_INIT): new type,
	  functions, and macros for Windows.

	* win32/win32.c (extract_fd, rb_w32_select): use rb_fdset_t to expand
	  fd_array if needed.  [ruby-core:19946]

	* win32/win32.c (copy_fd): new funcion for rb_w32_select().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:20 +00:00
yugui
d5251e8d25 merges r21488 from trunk into ruby_1_9_1.
Add dummy definition for fake rdoc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:13 +00:00
yugui
ab82062155 merges r21486 from trunk into ruby_1_9_1.
* tool/file2lastrev.rb (get_revisions): fixes problem with
  svn on cygwin. [ruby-dev:37702].
  Patch by Kouhei Sutou.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:06 +00:00
yugui
a597ab25d7 merges r21485 from trunk into ruby_1_9_1.
* lib/irb/input-method.rb: IRB did not prompt for MSwin32.
  [ruby-dev:37686].
  Patch by arton <artonx AT yahoo.co.jp>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:36:57 +00:00
yugui
336f996842 merges r21484 from trunk into ruby_1_9_1.
* ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
	  on Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:36:48 +00:00