Commit graph

22300 commits

Author SHA1 Message Date
tenderlove
4ed82ae5cb * ext/psych/lib/psych/streaming.rb: refactor streaming methods to a
module.
* ext/psych/lib/psych/stream.rb: extracted streaming specific methods
  to a module.
* ext/psych/lib/psych/json/stream.rb: JSON stream inherits from
  JSONTree and includes streaming methods.
* ext/psych/lib/psych/visitors/json_tree.rb: JSON does not support
  object references, so remove object reference testing when building
  JSON trees.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 18:09:38 +00:00
tenderlove
10ec858f40 should have used anchor, not oid
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 18:09:27 +00:00
svn
88014ea8cf * 2011-02-22
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 17:42:53 +00:00
tenderlove
846b8118df * ext/psych/lib/psych/visitors/yaml_tree.rb (accept): use Hash#key?
when looking up object references to err on the side of cache
  misses.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 17:42:50 +00:00
tenderlove
8b5a3b7d39 * ext/psych/lib/psych/json/yaml_events.rb: refactoring JSON event
handling methods to a module for reuse.
* ext/psych/lib/psych/json/tree_builder.rb: AST builder uses JSON
  event methods.
* ext/psych/lib/psych/json/stream.rb: stream emitter uses JSON event
  methods.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 02:00:43 +00:00
tenderlove
6f37c467d4 * ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
or sequences when emitting JSON.
* ext/psych/lib/psych/json/tree_builder.rb: do not emit custom tags in
  sequences when emitting JSON.
* test/psych/json/test_stream.rb: tests for custom stream emits.
* test/psych/test_json_tree.rb: tests for JSON emits.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 01:56:10 +00:00
tenderlove
816c7900fd moving autoload to require so that the correct files are required
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 01:49:41 +00:00
tenderlove
73af8137d9 * ext/psych/lib/psych/json/ruby_events.rb: DRY up ruby event handling
for JSON.
* ext/psych/lib/psych/visitors/json_tree.rb: use ruby events module
* ext/psych/lib/psych/json/stream.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 01:06:34 +00:00
tenderlove
6673f4e8af * ext/psych/lib/psych/json/stream.rb: fix JSON stream emits to use
double quotes during stream.
* test/psych/json/test_stream.rb: tests to reflect changes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-21 01:02:41 +00:00
svn
39160bd46d * 2011-02-21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-20 15:39:55 +00:00
kosaki
deeda1ca87 * test/ruby/test_system.rb (TestSystem#test_system_at):
add testcase for bug4396.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-20 15:39:53 +00:00
akr
408a903c99 * ext/openssl/ossl_cipher.c: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-20 10:59:48 +00:00
nobu
c4cc4d31e6 * thread.c (exec_recursive): prevent temporary objects from GC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-20 07:26:48 +00:00
nobu
43055ad266 * property.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-20 07:26:42 +00:00
nobu
e7c0a6e1d7 * prevent temporary objects from GC, and should not use
RSTRING_PTR() for function calls since it evaluates the argument
  a couple of times.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-20 07:23:55 +00:00
nobu
4ab39d2202 * file.c (rb_file_flock): use rb_thread_io_blocking_region for the
time being.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-20 07:22:57 +00:00
ryan
4f00a27fb5 lib/minitest/*.rb: Imported minitest 2.0.2 r6207
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-19 20:44:08 +00:00
kosaki
df52785d30 * signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage
because FreeBSD don't permit it. If it's used, it behave as
  pthread_sigmask(xx, NULL, &mask).

* signal.c (init_sigchld): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-19 18:14:30 +00:00
svn
4250c745ca * 2011-02-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-19 15:47:22 +00:00
akr
1343f8c536 * ext/openssl/ossl_bn.c: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-19 15:47:21 +00:00
nagachika
e3cc834486 * vm_insnhelper.c (vm_check_if_namespace): guard temporary object
from GC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-19 13:41:19 +00:00
naruse
84b96e1be4 Fix tests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-19 12:43:27 +00:00
svn
774eeba60d * 2011-02-19
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18 21:39:11 +00:00
tenderlove
c36abbfd43 * lib/test/unit.rb: partial revert of r30849. [ruby-core:32864]
* test/testunit/test_rake_integration.rb: adding an integration test
  with the rake loader to prevent regressions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18 21:39:09 +00:00
shyouhei
c1afbd39e1 * lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
race condition in the case where the given path is a directory,
  and some other user can move that directory, and create a
  symlink while this method is executing.
  Reported by: Nicholas Jefferson <nicholas at pythonic.com.au>


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-18 10:42:50 +00:00
nagachika
80466e3fc7 * compile.c (get_exception_sym2type): guard temporary object from GC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-17 15:32:55 +00:00
svn
946e37cfeb * 2011-02-18
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-17 15:08:37 +00:00
nagachika
8147a76b23 * iseq.c (prepare_iseq_build): initialize iseq_compile_data::err_info
with nil. this fix exception in rb_iseq_load().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-17 15:08:36 +00:00
nagachika
594f2fcfc0 * test/ruby/test_marshal.rb (test_marshal_dump_extra_iv):
fix a typo of local variable. [Bug #3720] [ruby-dev:42083]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-17 13:37:55 +00:00
svn
1d403c3beb * 2011-02-17
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-17 12:33:09 +00:00
akr
5206119844 * ext/openssl/ossl.h: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-17 12:33:07 +00:00
kosaki
36a0a1a3f3 * eval_jump.c (rb_exec_end_proc): changed at_exit and END proc
evaluation order. [Bug #4400] [ruby-core:35237]
* eval_jump.c (rb_mark_end_proc): ditto.

* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_nested_at_exit):
  added a test for nested at_exit.
* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_beginendblock):
  changed the test to adopt new spec.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-16 11:42:03 +00:00
svn
90b86c51ab * 2011-02-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30887 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-16 11:17:41 +00:00
akr
7bcc7db83b * ext/openssl/openssl_missing.h: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-16 11:17:39 +00:00
akr
85caed4721 * ext/gdbm/gdbm.c: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 12:38:11 +00:00
akr
67b9e488dc * array.c (ary_join_1): fix array size.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 11:35:35 +00:00
kosaki
61a4ee9b68 * configure.in: fix and resubmit r30621. [ruby-dev:43203]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 10:44:58 +00:00
naruse
01e84b104c Fix typo of rdoc. [ruby-core:35016]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 07:24:49 +00:00
naruse
1a492ba17d Add a test for the encoding of str_aset. [ruby-core:35142]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 07:14:00 +00:00
naruse
c7d3b3f1b4 * array.c (array_join): copy the encoding of the first element as
an initial encoding.

* array.c (array_join_0): ditto.

* array.c (array_join_1): ditto.

* array.c (inspect_ary): ditto.

* array.c (array_join_1): add an argument to check the appending is
  first one or not.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 07:08:24 +00:00
naruse
7798b9667e * hash.c (inspect_i): copy the encoding of the first key as
an initial encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 07:08:20 +00:00
naruse
366e1c3884 * array.c (inspect_ary): don't taint the inspected result of a
recursive array.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 07:08:18 +00:00
naruse
a8f5a06a68 * encoding.c (rb_enc_compatible): change the rule for empty strings:
remove the special treatment of the US-ASCII encoded empty string.
  Now Encoding.compatible? usually respect the encoding of the
  receiver.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 07:08:15 +00:00
naruse
443b1517cf * string.c (rb_enc_cr_str_buf_cat): remove special treatment of
ASCII-8BIT receivers.

* string.c (str_gsub): set initial encoding of the buffer as the
  same of the receiver. [ruby-core:35141]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 07:08:12 +00:00
svn
7da18cf1a2 * 2011-02-15
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 00:51:52 +00:00
usa
25a4c79279 * test/ruby/test_system.rb (TestSystem#test_system_at): use findstr
command instead of find command, because the latter is confusing
  another famous Unix command.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-15 00:51:50 +00:00
nagachika
d7feebb4b3 * thread.c (rb_thread_io_blocking_region): reset th->waiting_fd
after blocking region, because remaining waiting_fd might
	  cause unnecessary IOError.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-14 14:13:46 +00:00
shyouhei
fd569ed7ca * configure.in: revert r30621. That revision introduced mkmf test
failures and it turned out to be OK to revert. [ruby-dev:43203]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-14 12:07:14 +00:00
akr
8f59ed795d * ext/fiddle/conversions.h: parenthesize macro arguments.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-14 12:04:28 +00:00
kosaki
c6e6380665 * win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
mswin32 port. If you changed win32/configure.bat, you should change
  setup.mak too.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-14 09:49:56 +00:00