nobu	2008-09-26 22:47:01 +0900 (Fri, 26 Sep 2008)

  New Revision: 19592

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19592

  Log:
    * parse.y (primary, brace_block): fix for line number.
    
    * proc.c (rb_proc_location, rb_method_location): new methods
      {Proc,Method,UnboundMethod}#source_location.  [ruby-core:18452]

  Modified files:
    trunk/ChangeLog
    trunk/parse.y
    trunk/proc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19591)
+++ ChangeLog	(revision 19592)
@@ -1,3 +1,10 @@
+Fri Sep 26 22:46:58 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (primary, brace_block): fix for line number.
+
+	* proc.c (rb_proc_location, rb_method_location): new methods
+	  {Proc,Method,UnboundMethod}#source_location.  [ruby-core:18452]
+
 Fri Sep 26 21:36:33 2008  Koichi Sasada  <ko1@a...>
 
 	* vm_core.h (RUBY_VM_CHECK_INTS_TH): add an UNLIKELY hint.
Index: proc.c
===================================================================
--- proc.c	(revision 19591)
+++ proc.c	(revision 19592)
@@ -509,11 +509,11 @@
 {
     rb_proc_t *proc;
     rb_block_t *blockptr = 0;
+    rb_iseq_t *iseq;
     GetProcPtr(procval, proc);
 
-    if (BUILTIN_TYPE(proc->block.iseq) == T_NODE ||
-	proc->block.iseq->arg_block != -1) {
-
+    iseq = proc->block.iseq;
+    if (BUILTIN_TYPE(iseq) == T_NODE || iseq->arg_block != -1) {
 	if (rb_block_given_p()) {
 	    rb_proc_t *proc;
 	    VALUE procval;
@@ -620,10 +620,9 @@
     return iseq;
 }
 
-VALUE
-rb_proc_location(VALUE self)
+static VALUE
+iseq_location(rb_iseq_t *iseq)
 {
-    rb_iseq_t *iseq = get_proc_iseq(self);
     VALUE loc[2];
 
     if (!iseq) return Qnil;
@@ -639,6 +638,20 @@
 
 /*
  * call-seq:
+ *    prc.source_location  => [String, Fixnum]
+ *
+ * returns the ruby source filename and line number containing this proc
+ * or nil if this proc was not defined in ruby (i.e. native)
+ */
+
+VALUE
+rb_proc_location(VALUE self)
+{
+    return iseq_location(get_proc_iseq(self));
+}
+
+/*
+ * call-seq:
  *   prc == other_proc   =>  true or false
  *
  * Return <code>true</code> if <i>prc</i> is the same object as
@@ -1437,7 +1450,40 @@
     return rb_mod_method_arity(CLASS_OF(obj), id);
 }
 
+static rb_iseq_t *
+get_method_iseq(VALUE method)
+{
+    struct METHOD *data;
+    NODE *body;
+    rb_iseq_t *iseq;
+
+    Data_Get_Struct(method, struct METHOD, data);
+    body = data->body;
+    switch (nd_type(body)) {
+      case RUBY_VM_METHOD_NODE:
+	GetISeqPtr((VALUE)body->nd_body, iseq);
+	if (RUBY_VM_NORMAL_ISEQ_P(iseq)) break;
+      default:
+	return 0;
+    }
+    return iseq;
+}
+
 /*
+ * call-seq:
+ *    meth.source_location  => [String, Fixnum]
+ *
+ * returns the ruby source filename and line number containing this method
+ * or nil if this method was not defined in ruby (i.e. native)
+ */
+
+VALUE
+rb_method_location(VALUE method)
+{
+    return iseq_location(get_method_iseq(method));
+}
+
+/*
  *  call-seq:
  *   meth.to_s      =>  string
  *   meth.inspect   =>  string
@@ -1768,6 +1814,7 @@
     rb_define_method(rb_cProc, "lambda?", proc_lambda_p, 0);
     rb_define_method(rb_cProc, "binding", proc_binding, 0);
     rb_define_method(rb_cProc, "curry", proc_curry, -1);
+    rb_define_method(rb_cProc, "source_location", rb_proc_location, 0);
 
     /* Exceptions */
     rb_eLocalJumpError = rb_define_class("LocalJumpError", rb_eStandardError);
@@ -1802,6 +1849,7 @@
     rb_define_method(rb_cMethod, "name", method_name, 0);
     rb_define_method(rb_cMethod, "owner", method_owner, 0);
     rb_define_method(rb_cMethod, "unbind", method_unbind, 0);
+    rb_define_method(rb_cMethod, "source_location", rb_method_location, 0);
     rb_define_method(rb_mKernel, "method", rb_obj_method, 1);
     rb_define_method(rb_mKernel, "public_method", rb_obj_public_method, 1);
 
@@ -1819,6 +1867,7 @@
     rb_define_method(rb_cUnboundMethod, "name", method_name, 0);
     rb_define_method(rb_cUnboundMethod, "owner", method_owner, 0);
     rb_define_method(rb_cUnboundMethod, "bind", umethod_bind, 1);
+    rb_define_method(rb_cUnboundMethod, "source_location", rb_method_location, 0);
 
     /* Module#*_method */
     rb_define_method(rb_cModule, "instance_method", rb_mod_instance_method, 1);
Index: parse.y
===================================================================
--- parse.y	(revision 19591)
+++ parse.y	(revision 19592)
@@ -2886,6 +2886,7 @@
 			reduce_nodes(&body);
 			$$ = NEW_DEFN($2, $4, body, NOEX_PRIVATE);
 			fixpos($$, $4);
+			fixpos($$->nd_defn, $4);
 			local_pop();
 			in_def--;
 			cur_mid = $<id>3;
@@ -2913,6 +2914,7 @@
 			reduce_nodes(&body);
 			$$ = NEW_DEFS($2, $5, $7, body);
 			fixpos($$, $2);
+			fixpos($$->nd_defn, $2);
 			local_pop();
 			in_single--;
 		    /*%
@@ -3611,6 +3613,8 @@
 		    /*%%%*/
 			$$ = NEW_ITER($3,$4);
 			nd_set_line($$, $<num>2);
+			nd_set_line($$->nd_body, $<num>2);
+			nd_set_line($$->nd_body->nd_body, $<num>2);
 			dyna_pop();
 		    /*%
 			$$ = dispatch2(brace_block, escape_Qundef($3), $4);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/