merging from ruby

ruby · Nov 1, 2011 · 5a46605 · 5a46605
1 parent 524da34
commit 5a46605
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/ext/psych/parser.c b/ext/psych/parser.c
@@ -61,7 +61,6 @@ static VALUE allocate(VALUE klass)
 
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 {
-    VALUE exception;
     size_t line, column;
 
     line = parser->context_mark.line + 1;

diff --git a/test/psych/test_yamldbm.rb b/test/psych/test_yamldbm.rb
@@ -1,10 +1,14 @@
 # -*- coding: UTF-8 -*-
-require 'test/unit'
-require 'yaml/dbm'
-require 'tmpdir'
-Psych::DBM = YAML::DBM unless defined?(Psych::DBM)
+begin
+  require 'test/unit'
+  require 'yaml/dbm'
+  require 'tmpdir'
+rescue LoadError
+end
 
 module Psych
+  ::Psych::DBM = ::YAML::DBM unless defined?(::Psych::DBM)
+
   class YAMLDBMTest < Test::Unit::TestCase
     def setup
       @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
@@ -187,4 +191,4 @@ def test_selsct_with_block
       assert_equal([], @yamldbm.select {false})
     end
   end
-end
+end if defined?(YAML::DBM)