summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorCharles Oliver Nutter <headius@headius.com>2020-07-16 10:21:18 -0500
committerCharles Oliver Nutter <headius@headius.com>2020-07-16 10:21:18 -0500
commitde05cb639dab3d5b6d930eb42065a3d8532a1ce3 (patch)
treecc4889e31e6b65d6d0dd32b2791f937d4f4993fc /ext
parent3b3409aaa64c8d95992b1cfc0d3f9f26a82de832 (diff)
downloadpsych-de05cb639dab3d5b6d930eb42065a3d8532a1ce3.zip
Remove private_iv_get
The only remaining use of this function was to get the internal message object from an exception's hidden `mesg` instance variable to allow it to be dumped wiithout converting to a string. As discussed in #103, this exposes internal implementation details of CRuby, and ultimately does not provide any real utility to the user since they can't directly inspect this hidden variable. The test change here is to reflect CRuby behavior that denies equality if the internal message objects do not match, as is the case after the exception has been loaded and now has a simple String value. The impact to users is that exceptions with special hidden message objects will convert those objects to String during marshaling through YAML. I believe this only affects NameError and its descendants, since users can't set this field directly on their own exception types. Fixes #103.
Diffstat (limited to 'ext')
-rw-r--r--ext/java/org/jruby/ext/psych/PsychYamlTree.java8
-rw-r--r--ext/psych/psych_yaml_tree.c12
2 files changed, 0 insertions, 20 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: */