Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

vm_method.c: show respond_to location

* proc.c (rb_method_entry_location, rb_{mod,obj}_method_location): new
  functions to obtain source location of method definition.
* vm_method.c (rb_obj_respond_to): show the location of old style
  respond_to? method.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 6eb76ba664a7ea1dc2b6804a0f2280e1f7531c53 1 parent fe072ce
Nobuyoshi Nakada nobu authored
Showing with 54 additions and 7 deletions.
  1. +8 −0 ChangeLog
  2. +4 −0 method.h
  3. +32 −6 proc.c
  4. +10 −1 vm_method.c
8 ChangeLog
View
@@ -1,3 +1,11 @@
+Wed Feb 6 13:35:20 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * proc.c (rb_method_entry_location, rb_{mod,obj}_method_location): new
+ functions to obtain source location of method definition.
+
+ * vm_method.c (rb_obj_respond_to): show the location of old style
+ respond_to? method.
+
Wed Feb 6 13:03:00 2013 Zachary Scott <zachary@zacharyscott.net>
* doc/security.rdoc: Add link to CVEs on ruby-lang.org/en/security
4 method.h
View
@@ -126,6 +126,10 @@ int rb_method_entry_arity(const rb_method_entry_t *me);
int rb_method_entry_eq(const rb_method_entry_t *m1, const rb_method_entry_t *m2);
st_index_t rb_hash_method_entry(st_index_t hash, const rb_method_entry_t *me);
+VALUE rb_method_entry_location(rb_method_entry_t *me);
+VALUE rb_mod_method_location(VALUE mod, ID id);
+VALUE rb_obj_method_location(VALUE obj, ID id);
+
void rb_mark_method_entry(const rb_method_entry_t *me);
void rb_free_method_entry(rb_method_entry_t *me);
void rb_sweep_method_entry(void *vm);
38 proc.c
View
@@ -1844,6 +1844,37 @@ rb_method_get_iseq(VALUE method)
return method_get_iseq(method_get_def(method));
}
+static VALUE
+method_def_location(rb_method_definition_t *def)
+{
+ if (def->type == VM_METHOD_TYPE_ATTRSET || def->type == VM_METHOD_TYPE_IVAR) {
+ if (!def->body.attr.location)
+ return Qnil;
+ return rb_ary_dup(def->body.attr.location);
+ }
+ return iseq_location(method_get_iseq(def));
+}
+
+VALUE
+rb_method_entry_location(rb_method_entry_t *me)
+{
+ if (!me || !me->def) return Qnil;
+ return method_def_location(me->def);
+}
+
+VALUE
+rb_mod_method_location(VALUE mod, ID id)
+{
+ rb_method_entry_t *me = original_method_entry(mod, id);
+ return rb_method_entry_location(me);
+}
+
+VALUE
+rb_obj_method_location(VALUE obj, ID id)
+{
+ return rb_mod_method_location(CLASS_OF(obj), id);
+}
+
/*
* call-seq:
* meth.source_location -> [String, Fixnum]
@@ -1856,12 +1887,7 @@ VALUE
rb_method_location(VALUE method)
{
rb_method_definition_t *def = method_get_def(method);
- if (def->type == VM_METHOD_TYPE_ATTRSET || def->type == VM_METHOD_TYPE_IVAR) {
- if (!def->body.attr.location)
- return Qnil;
- return rb_ary_dup(def->body.attr.location);
- }
- return iseq_location(method_get_iseq(def));
+ return method_def_location(def);
}
/*
11 vm_method.c
View
@@ -1529,13 +1529,22 @@ rb_obj_respond_to(VALUE obj, ID id, int priv)
if (rb_obj_method_arity(obj, idRespond_to) != 1) {
argc = 2;
}
- else {
+ else if (!NIL_P(ruby_verbose)) {
VALUE klass = CLASS_OF(obj);
+ VALUE location = rb_mod_method_location(klass, idRespond_to);
rb_warn("%"PRIsVALUE"%c""respond_to?(:%"PRIsVALUE") is"
" old fashion which takes only one parameter",
(FL_TEST(klass, FL_SINGLETON) ? obj : klass),
(FL_TEST(klass, FL_SINGLETON) ? '.' : '#'),
QUOTE_ID(id));
+ if (!NIL_P(location)) {
+ VALUE path = RARRAY_PTR(location)[0];
+ VALUE line = RARRAY_PTR(location)[1];
+ if (!NIL_P(path)) {
+ rb_compile_warn(RSTRING_PTR(path), NUM2INT(line),
+ "respond_to? is defined here");
+ }
+ }
}
}
return RTEST(rb_funcall2(obj, idRespond_to, argc, args));
Please sign in to comment.
Something went wrong with that request. Please try again.