kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r25266 from trunk into ruby_1_9_1.

Browse source 
--
* compile.c (ADD_TRACE): fire coverage event in ensure clause.
  [ruby-dev:39303]

* iseq.h, iseq.c: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-01-30 12:45:14 +00:00
parent 3efa5181dc
commit 1ca6da8d80
5 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Oct 9 01:07:34 2009 Yusuke Endoh <mame@tsg.ne.jp>
* compile.c (ADD_TRACE): fire coverage event in ensure clause.
[ruby-dev:39303]
* iseq.h, iseq.c: ditto.
Fri Oct 9 00:33:29 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/net/telnet.rb (cmd): Pass FailEOF options: patch by Brian

3
compile.c
View file

@ -219,8 +219,9 @@ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
#define ADD_TRACE(seq, line, event) \
do { \
if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
RARRAY_PTR(iseq->coverage)[(line) - 1] == Qnil) { \
(line) != iseq->compile_data->last_coverable_line) { \
RARRAY_PTR(iseq->coverage)[(line) - 1] = INT2FIX(0); \
iseq->compile_data->last_coverable_line = (line); \
ADD_INSN1(seq, line, trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
} \
if (iseq->compile_data->option->trace_instruction) { \

1
iseq.c
View file

@ -191,6 +191,7 @@ prepare_iseq_build(rb_iseq_t *iseq,
iseq->compile_data->storage_head->buff =
(char *)(&iseq->compile_data->storage_head->buff + 1);
iseq->compile_data->option = option;
iseq->compile_data->last_coverable_line = -1;
set_relation(iseq, parent);

1
iseq.h
View file

@ -82,6 +82,7 @@ struct iseq_compile_data {
struct iseq_compile_data_storage *storage_head;
struct iseq_compile_data_storage *storage_current;
int last_line;
int last_coverable_line;
int flip_cnt;
int label_no;
int node_level;

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 381
#define RUBY_PATCHLEVEL 382
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1