diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 10:52:38 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 10:52:38 +0000 |
| commit | b6a98140d57e7e298046dae1f0f09b068c423e57 (patch) | |
| tree | 708e41d16b3fdf724e9f81add842f32c5375bee3 /parse.y | |
| parent | 62cc5d4e01b2443cd48fc011affddf331d89301b (diff) | |
merges r24243 from trunk into ruby_1_9_1.
--
* vm_core.h (struct rb_iseq_t): add a new field line_no. This field
represents line number from which the original code of the iseq
starts. [ruby-dev:38698]
* iseq.c, compile.c: ditto.
* parse.y: line number hack (for Proc#source_location) is no longer
needed.
* test/ruby/test_settracefunc.rb: line number of set_trace_func is now
compatible with 1.8's.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -2941,7 +2941,6 @@ primary : literal reduce_nodes(&body); $$ = NEW_DEFN($2, $4, body, NOEX_PRIVATE); fixpos($$, $4); - fixpos($$->nd_defn, $4); local_pop(); /*% $$ = dispatch3(def, $2, $4, $5); @@ -2967,7 +2966,6 @@ primary : literal reduce_nodes(&body); $$ = NEW_DEFS($2, $5, $7, body); fixpos($$, $2); - fixpos($$->nd_defn, $2); local_pop(); /*% $$ = dispatch5(defs, $2, $3, $5, $7, $8); @@ -3670,8 +3668,6 @@ brace_block : '{' /*%%%*/ $$ = 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); |