diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-22 12:52:18 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-09-22 12:52:18 +0000 |
commit | 742283385fc8539e76581ad2482ad62ed8a12c76 (patch) | |
tree | e139ff6c1bb02c3cfda4d5fa224f6b88c5b898f3 /parse.y | |
parent | f3cdd50125b9a66b18766dc1eaaff10fbc92a29d (diff) | |
download | ruby-742283385fc8539e76581ad2482ad62ed8a12c76.tar.gz |
* eval.c (call_trace_func): should not call trace function while
compilation.
* eval.c (rb_call0): also inside c-func.
* parse.y (yycompile): ditto.
* ruby.c (require_libraries): preserve source file/line for each
require.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2335,6 +2335,7 @@ yycompile(f, line) NODE *node = 0; struct RVarmap *vp, *vars = ruby_dyna_vars; + ruby_in_compile = 1; if (!compile_for_eval && rb_safe_level() == 0 && rb_const_defined(rb_cObject, rb_intern("SCRIPT_LINES__"))) { VALUE hash, fname; @@ -2365,7 +2366,6 @@ yycompile(f, line) quoted_term = -1; ruby_current_node = 0; ruby_sourcefile = rb_source_filename(f); - ruby_in_compile = 1; n = yyparse(); ruby_debug_lines = 0; compile_for_eval = 0; |