* vm_core.h: add a data type rb_location_t to store iseq location

  information.
  rb_location_t#filename, filepath, name and line_no was moved from
  rb_iseq_t.  rb_location_t#basename is a new field which is
  similar to `name' field without any decoration.
  `name' field contains some decoration such as `block in foo'.
  `basename' only contains `foo'.
  rb_iseq_t contains memory object of rb_location_t.
* iseq.c: setup rb_location_t for each rb_iseq_t memory objects.
* compile.c, proc.c, vm.c, vm_dump.c, vm_eval.c, vm_insnhelper.c,
  vm_method.c: support about it.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 5 deletions

diff --git a/vm_core.h b/vm_core.h
index e87d5aed0b..51fceb52b2 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -150,6 +150,14 @@ struct iseq_inline_cache_entry {
 #define GetISeqPtr(obj, ptr) \
   GetCoreDataFromValue((obj), rb_iseq_t, (ptr))
 
+typedef struct rb_location_struct {
+    VALUE filename;
+    VALUE filepath;
+    VALUE basename;
+    VALUE name;
+    size_t line_no;
+} rb_location_t;
+
 struct rb_iseq_struct;
 
 struct rb_iseq_struct {
@@ -169,16 +177,14 @@ struct rb_iseq_struct {
 	ISEQ_TYPE_DEFINED_GUARD
     } type;              /* instruction sequence type */
 
-    VALUE name;	         /* String: iseq name */
-    VALUE filename;      /* file information where this sequence from */
-    VALUE filepath;      /* real file path or nil */
+    rb_location_t location;
+
     VALUE *iseq;         /* iseq (insn number and operands) */
     VALUE *iseq_encoded; /* encoded iseq */
     unsigned long iseq_size;
     VALUE mark_ary;	/* Array: includes operands which should be GC marked */
     VALUE coverage;     /* coverage array */
-    unsigned short line_no;
-
+    
     /* insn info, must be freed */
     struct iseq_line_info_entry *line_info_table;
     size_t line_info_size;