* compile.c (iseq_compile_each): add pop after throw as return.

* bootstraptest/test_knownbug.rb, test_syntax.rb: move resolved test.
* vm_core.h, iseq.c, compile.h: add debug output code.



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

1 files changed, 28 insertions, 13 deletions

diff --git a/iseq.c b/iseq.c
index e9e65c76fa..6ad0e8d25a 100644
--- a/iseq.c
+++ b/iseq.c
@@ -534,25 +534,34 @@ iseq_to_a(VALUE self)
     return iseq_data_to_ary(iseq);
 }
 
-/*
-  now, search algorithm is brute force. but this should be binary search.
- */
-static unsigned short
-find_line_no(rb_iseq_t *iseqdat, unsigned long pos)
+/* TODO: search algorithm is brute force.
+         this should be binary search or so. */
+
+static struct iseq_insn_info_entry *
+get_insn_info(const rb_iseq_t *iseq, const unsigned long pos)
 {
-    unsigned long i, size = iseqdat->insn_info_size;
-    struct iseq_insn_info_entry *iiary = iseqdat->insn_info_table;
+    unsigned long i, size = iseq->insn_info_size;
+    struct iseq_insn_info_entry *table = iseq->insn_info_table;
 
     for (i = 0; i < size; i++) {
-	if (iiary[i].position == pos) {
-	    return iiary[i].line_no;
+	if (table[i].position == pos) {
+	    return &table[i];
 	}
     }
-    /* rb_bug("find_line_no: can't find %lu", pos); */
+
     return 0;
 }
 
 static unsigned short
+find_line_no(rb_iseq_t *iseq, unsigned long pos)
+{
+    struct iseq_insn_info_entry *entry = get_insn_info(iseq, pos);
+    if (entry) {
+	return entry->line_no;
+    }
+}
+
+static unsigned short
 find_prev_line_no(rb_iseq_t *iseqdat, unsigned long pos)
 {
     unsigned long i, size = iseqdat->insn_info_size;
@@ -569,8 +578,6 @@ find_prev_line_no(rb_iseq_t *iseqdat, unsigned long pos)
 	}
     }
 
-    /* rb_bug("find_prev_line_no: can't find - %lu", pos); */
-
     return 0;
 }
 
@@ -717,7 +724,7 @@ ruby_iseq_disasm_insn(VALUE ret, VALUE *iseq, int pos,
 	}
     }
 
-    {
+    if (1) {
 	int line_no = find_line_no(iseqdat, pos);
 	int prev = find_prev_line_no(iseqdat, pos);
 	if (line_no && line_no != prev) {
@@ -726,6 +733,14 @@ ruby_iseq_disasm_insn(VALUE ret, VALUE *iseq, int pos,
 	    str = rb_str_new2(buff);
 	}
     }
+    else {
+	/* for debug */
+	struct iseq_insn_info_entry *entry = get_insn_info(iseqdat, pos);
+	snprintf(buff, sizeof(buff), "%-60s(line: %d, sp: %d)",
+		 RSTRING_PTR(str), entry->line_no, entry->sp);
+	str = rb_str_new2(buff);
+    }
+
     if (ret) {
 	rb_str_cat2(str, "\n");
 	rb_str_concat(ret, str);