* Add coverage measurement constant COVERAGE__. This constant is not

  for casual use.  Usage: (1) assign {} to COVERAGE__, (2) require or
  load Ruby source file, and (3) COVERAGE__["sourcefilepath"] will
  return an array whose elements represent number of executions per
  line of source code.

* vm_core.h: add field of coverage array to iseq.

* iseq.c (prepare_iseq_build): ditto.

* insns.def (trace): update coverage array.

* parse.y (coverage): create and initialize coverage array.

* compile.h (ADD_TRACE): add trace instruction to update covearge
  array.

* thread.c (clear_coverage): delete coverage array when forking.
  Otherwise, double count of coverage may occur.

* lib/coverage.rb: sample coverage measurement tool.

* error.c: distinguish explicitly between parse_in_eval and
  mild_compile_error.

* load.c: ditto.

* vm_eval.c: ditto.


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

1 files changed, 10 insertions, 3 deletions

diff --git a/compile.h b/compile.h
index c7688949e5..73a2567468 100644
--- a/compile.h
+++ b/compile.h
@@ -163,9 +163,16 @@ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
                          (VALUE)id, (VALUE)argc, (VALUE)block, (VALUE)flag))
 
 #define ADD_TRACE(seq, line, event) \
-  if (iseq->compile_data->option->trace_instruction) { \
-      ADD_INSN1(seq, line, trace, INT2FIX(event)); \
-  }
+  do { \
+      VALUE coverage = Qfalse; \
+      if ((event) == RUBY_EVENT_LINE && iseq->coverage && RARRAY_PTR(iseq->coverage)[(line) - 1] == Qnil) { \
+          RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
+          coverage = iseq->coverage; \
+      } \
+      if (iseq->compile_data->option->trace_instruction || coverage) { \
+          ADD_INSN2(seq, line, trace, INT2FIX(event), coverage); \
+      } \
+  }while(0);
 
 /* add label */
 #define ADD_LABEL(seq, label) \