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 r23474 from trunk into ruby_1_9_1.

Browse source 
--
* compile.c (rb_parse_in_eval): returns true in true eval, not in
  main.  [ruby-dev:38382]

* parse.y (program): inherits dvars in eval or main.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-05-22 09:49:28 +00:00
parent 6bfaf6e209
commit 68a2b3cf7f
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sun May 17 14:23:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (rb_parse_in_eval): returns true in true eval, not in
main. [ruby-dev:38382]
* parse.y (program): inherits dvars in eval or main.
Sun May 17 13:15:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (rb_vm_get_sourceline): should not access out of bound.

2
compile.c
View file

@ -5413,7 +5413,7 @@ rb_local_defined(ID id)
int
rb_parse_in_eval(void)
{
return GET_THREAD()->parse_in_eval != 0;
return GET_THREAD()->parse_in_eval > 0;
}
int

7
parse.y
View file

@ -765,14 +765,15 @@ static void token_info_pop(struct parser_params*, const char *token);
program : {
lex_state = EXPR_BEG;
/*%%%*/
local_push(compile_for_eval);
$<num>$ = compile_for_eval || rb_parse_in_main();
local_push($<num>$);
/*%
%*/
}
top_compstmt
{
/*%%%*/
if ($2 && !compile_for_eval) {
if ($2 && !$<num>1) {
/* last expression should not be void */
if (nd_type($2) != NODE_BLOCK) void_expr($2);
else {
@ -5024,7 +5025,7 @@ yycompile0(VALUE arg, int tracing)
NODE *tree;
struct parser_params *parser = (struct parser_params *)arg;
if ((!compile_for_eval || rb_parse_in_main()) && rb_safe_level() == 0) {
if (!compile_for_eval && rb_safe_level() == 0) {
ruby_debug_lines = debug_lines(ruby_sourcefile);
if (ruby_debug_lines && ruby_sourceline > 0) {
VALUE str = STR_NEW0();

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-12"
#define RUBY_PATCHLEVEL 149
#define RUBY_PATCHLEVEL 150
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1