Commit graph

15465 commits

Author SHA1 Message Date
yugui
75b69799dd merges r21282, r21283, r21285 from trunk into ruby_1_9_1.
* enc/trans/euc-cn.c: renemed from gb2312.c because GB2312 is
  the name of a CSS.  it's encoding name is "EUC-CN".
--
* enc/trans/chinese.trans: added for transcoding EUC-CN and GB12345.
* enc/trans/GB/: ditto.
--
change encoding name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 11:53:14 +00:00
yugui
0ed4a138f7 * described the feature change of cref in instance_eval or module_eval.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:35:53 +00:00
yugui
ce35512187 merges r21280 from trunk into ruby_1_9_1.
* common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc,
	  known_errors.inc, miniprelude.c, newline.c): move rules from common.mk
	  to {Makefile.in,win32/Makefile.sub) for nmake.
	  [ruby-core:20993]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:16:14 +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
2db32cd385 merges r21278 from trunk into ruby_1_9_1.
* ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for
  sock_s_getaddrinfo.
  (sock_getaddrinfo): add socktype_hack argument.
  (sock_addrinfo): call sock_getaddrinfo with socktype_hack.
  (sock_s_getaddrinfo): call sock_getaddrinfo without socktype_hack.
  [ruby-dev:37674]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:15:58 +00:00
yugui
e7b1674161 merges r21227 from trunk into ruby_1_9_1.
* include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:15:49 +00:00
yugui
e23b63126e merges r21276 from trunk into ruby_1_9_1.
* lib/singleton.rb: fix documentation. [ruby-core:21038]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:15:40 +00:00
yugui
fe2847b22a merges r21275 from trunk into ruby_1_9_1.
* process.c: use sigaction instead of sigset.  [ruby-core:21021]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21304 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:15:31 +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
17e8f185de merges r21265 from trunk into ruby_1_9_1.
* signal.c (rb_signal_buff_size): defined for check whether signal
  is in the buffer or not.

* thread_pthread.c (thread_timer): don't exit the loop when signal
  is in the buffer. [ruby-dev:37637]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:15:14 +00:00
svn
0f8d7fd51a * 2009-01-04
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:14:59 +00:00
yugui
893be375be merges r21248 from trunk into ruby_1_9_1.
* process.c (before_exec): it makes no sense for a conditional
	  expression to return a void value.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:14:55 +00:00
yugui
09339c9059 * spec/default.mspec: fix for builddir != srcdir
* Makefile.in: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 13:30:25 +00:00
yugui
1241c49c06 * tool/flie2lastrev.rb: supports git repositories which are cloned
from a git-svn gateway.
  Patch by Hongli Lai. [ruby-core:21020]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:43:34 +00:00
yugui
8773751012 merges r21221 from trunk into ruby_1_9_1.
* lib/singleton.rb: fix indentation of RDoc text.  [ruby-core:21029]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:43:27 +00:00
yugui
bf4f43e210 merges r21220 from trunk into ruby_1_9_1.
* Makefile.in (distclean-ext, realclean-ext): use EXTS as default.

* win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext
  directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:43:17 +00:00
yugui
dabea27279 merges r21219 from trunk into ruby_1_9_1.
* tool/file2lastrev.rb: unset PWD.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:43:08 +00:00
yugui
a142847118 merges r21214 from trunk into ruby_1_9_1.
* object.c (rb_to_float): replaced by to_flo definition from
  math.c  [ruby-dev:37668]

* math.c (Need_Float): use rb_to_float().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:42:59 +00:00
yugui
2c8756f2c8 merges r21212 from trunk into ruby_1_9_1.
* spec/README: follows the change of directory structure in rubyspec.

* spec/default.mspec: ditto. Also follows change of mspec command.

* Makefile.in: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:42:51 +00:00
yugui
8ed6868de0 merges r21211 and r21213 from trunk into ruby_1_9_1.
update rdoc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:42:39 +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
d93187e815 merges r21208 from trunk into ruby_1_9_1.
* ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr
  instead of STR2CSTR.

* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
  (ossl_ec_group_initialize): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:42:15 +00:00
svn
d3a86fe6bd * 2009-01-01
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:41:58 +00:00
yugui
f730b66ee2 merges r21202 from trunk into ruby_1_9_1.
* ext/socket/mkconstants.rb: use sock_define_uconst for INADDR_*
  constants because Socket::INADDR_LOOPBACK should be 0x7f000001
  instead of -0xffffff.

* ext/socket/socket.c (sock_define_uconst): defined.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:41:54 +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
3dbaf1ebf8 merges r21187 from trunk into ruby_1_9_1.
* transcode.c: Minor fixes and tweaks in documentation.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 11:05:23 +00:00
yugui
80ad668981 merges r21186 from trunk into ruby_1_9_1.
* ext/dl/test/test_import.rb: fix a prototype decl.
  pointed out by Takehiro Kubo [ruby-core:20971].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 11:05:14 +00:00
yugui
a2ba4372c6 merges r21185 from trunk into ruby_1_9_1.
* thread.c (rb_thread_blocking_region): add a comment.
* thread.c (rb_thread_call_without_gvl): added as a alias of
  rb_thread_blocking_region().
* thread.c (rb_thread_call_with_gvl): added.
* vm_core.h (rb_thread_t#blocking_region_buffer): added for
  rb_thread_call_with_gvl().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 11:04:44 +00:00
yugui
3f9171a28a merges r21183 from trunk into ruby_1_9_1.
* properties


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:35:06 +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
e8f6d84936 merges r21177 and r21182 from trunk into ruby_1_9_1.
* ext/dl/test/test_base.rb: add x86_64-linux's case again. #932
--
* ext/dl/test/test_base.rb: add libc search logic.
  this patch is written by Takehiro Kubo.
  [ruby-core:20963] [Bug #932]
* ext/dl/dl.h: Add ",..." as the last argument.
  this patch is written by Takehiro Kubo.
  Bug #633 [ruby-core:19289]
* ext/dl/lib/dl/stack.rb: add add_padding() to calculate
  alignment.  this patch is written by Takehiro Kubo.
  Bug #633 [ruby-core:19289]
* ext/dl/test/test_func.rb: atof()'s return value is double.
  this patch is written by Takehiro Kubo.
  Bug #633 [ruby-core:19289]
* ext/dl/test/test_import.rb:
  - atof()'s return value is double.
  - The types of qsort's second and third argument are size_t.
  - fprintf()'s return value is int.
  this patch is written by Takehiro Kubo.
  Bug #633 [ruby-core:19289]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:32:42 +00:00
yugui
71766c206e merges r21175 from trunk into ruby_1_9_1.
* man/ri.1: new manpage.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:32:34 +00:00
yugui
9d10cc0a6b merges r21174 from trunk into ruby_1_9_1.
arrangement

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:32:23 +00:00
yugui
1bb25b0498 merges r21171 from trunk into ruby_1_9_1.
* bin/erb: accepts options in more flexible styles.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:32:16 +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
svn
067306c100 * 2008-12-30
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:31:55 +00:00
yugui
1453127367 merges r21163 from trunk into ruby_1_9_1.
* vm.c (vm_set_eval_stack, vm_set_main_stack, vm_set_top_stack):
  check stack overflow.  [ruby-dev:37646]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-30 10:31:51 +00:00
yugui
e297c26dca merges r21149 from trunk into ruby_1_9_1.
* Makefile.in (ext-clean): ext-clean always fails.

* ext/dl/ripper/extconf.rb: adds y.output into the clean list.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:19:41 +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
0d546bd1ff merges r21145 from trunk into ruby_1_9_1.
* cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
  in [ruby-core:20921].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:19:18 +00:00
yugui
3562d7bd82 merges r21143 from trunk into ruby_1_9_1.
* ruby.c (process_options): set th->base_block only while
  it is needed. [ruby-dev:37634]
* ruby.c (require_libraries): clear th->base_block before
  require libraries.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:19:11 +00:00
yugui
4cd4eda7bb merges r21115 from trunk into ruby_1_9_1.
* sprintf.c: not force to override snprintf/vsnprintf.
  [ruby-core:20824]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:19:03 +00:00
yugui
2cd1b4412b merges r21139 from trunk into ruby_1_9_1.
* test/ext/dl/test_base.rb : add BSD's case.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:18:55 +00:00
yugui
0278b58415 merges r21138 from trunk into ruby_1_9_1.
* ext/dl/lib/dl/import.rb (DL::Importer#sizeof): follows
  a feature change in 1.9.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:18:47 +00:00
yugui
91cf7698e1 merges r21136 from trunk into ruby_1_9_1.
* win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in
  msvcrt.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:18:39 +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
svn
c299bb42d9 * 2008-12-29
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:18:19 +00:00
yugui
b78fe145f3 merges r21110, r21111 and r21140 from trunk into ruby_1_9_1.
* ext/dl/test/test_dl2.rb: modify strncpy, strcpy, qsort, types.
	  Bug #633 [ruby-core:19289]
	* ext/dl/test/test_base.rb: /lib/libc.so is x86_64 binary in x86_64 architecture.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:18:15 +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