Merge pull request #458 from headius/remove_private_iv_get

Remove private_iv_get

4 files changed, 3 insertions, 22 deletions

diff --git a/ext/java/org/jruby/ext/psych/PsychYamlTree.java b/ext/java/org/jruby/ext/psych/PsychYamlTree.java
index fdd16df..139488b 100644
--- a/ext/java/org/jruby/ext/psych/PsychYamlTree.java
+++ b/ext/java/org/jruby/ext/psych/PsychYamlTree.java
@@ -44,12 +44,4 @@ public class PsychYamlTree {
 
         psychYamlTree.defineAnnotatedMethods(PsychYamlTree.class);
     }
-
-    @JRubyMethod(visibility = PRIVATE)
-    public static IRubyObject private_iv_get(ThreadContext context, IRubyObject self, IRubyObject target, IRubyObject prop) {
-        IRubyObject obj = (IRubyObject)target.getInternalVariables().getInternalVariable(prop.asJavaString());
-        if (obj == null) obj = context.nil;
-
-        return obj;
-    }
 }
diff --git a/ext/psych/psych_yaml_tree.c b/ext/psych/psych_yaml_tree.c
index 7aca911..225655d 100644
--- a/ext/psych/psych_yaml_tree.c
+++ b/ext/psych/psych_yaml_tree.c
@@ -2,23 +2,11 @@
 
 VALUE cPsychVisitorsYamlTree;
 
-/*
- * call-seq: private_iv_get(target, prop)
- *
- * Get the private instance variable +prop+ from +target+
- */
-static VALUE private_iv_get(VALUE self, VALUE target, VALUE prop)
-{
-    return rb_attr_get(target, rb_intern(StringValueCStr(prop)));
-}
-
 void Init_psych_yaml_tree(void)
 {
     VALUE psych     = rb_define_module("Psych");
     VALUE visitors  = rb_define_module_under(psych, "Visitors");
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsYamlTree = rb_define_class_under(visitors, "YAMLTree", visitor);
-
-    rb_define_private_method(cPsychVisitorsYamlTree, "private_iv_get", private_iv_get, 2);
 }
 /* vim: set noet sws=4 sw=4: */
diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb
index 79ca129..986c57b 100644
--- a/lib/psych/visitors/yaml_tree.rb
+++ b/lib/psych/visitors/yaml_tree.rb
@@ -181,7 +181,7 @@ module Psych
       end
 
       def visit_Exception o
-        dump_exception o, private_iv_get(o, 'mesg')
+        dump_exception o, o.message.to_s
       end
 
       def visit_NameError o
diff --git a/test/psych/test_exception.rb b/test/psych/test_exception.rb
index e7fc88c..e355c26 100644
--- a/test/psych/test_exception.rb
+++ b/test/psych/test_exception.rb
@@ -154,7 +154,8 @@ module Psych
 
     def test_convert
       w = Psych.load(Psych.dump(@wups))
-      assert_equal @wups, w
+      assert_equal @wups.message, w.message
+      assert_equal @wups.backtrace, w.backtrace
       assert_equal 1, w.foo
       assert_equal 2, w.bar
     end