From 2004560bac27871caf0eeab404c88454e2b65c88 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 27 Nov 2009 02:55:25 +0000 Subject: merges r25095 from trunk into ruby_1_9_1. -- * iseq.c (compile_string): rename to parse_string(), because this function only parse String to NODE. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ iseq.c | 4 ++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d773f3b05..c69940124 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Sep 26 08:35:12 2009 Koichi Sasada + + * iseq.c (compile_string): rename to parse_string(), because + this function only parse String to NODE. + Thu Sep 24 09:41:42 2009 Marc-Andre Lafortune * lib/mathn.rb (Bignum#**): Fixed bignum**fixnum that was broken when diff --git a/iseq.c b/iseq.c index 159da22ed..159357cec 100644 --- a/iseq.c +++ b/iseq.c @@ -457,7 +457,7 @@ ruby_iseq_load(VALUE data, VALUE parent, VALUE opt) } static NODE * -compile_string(VALUE str, VALUE file, VALUE line) +parse_string(VALUE str, VALUE file, VALUE line) { VALUE parser = rb_parser_new(); NODE *node = rb_parser_compile_string(parser, StringValueCStr(file), @@ -473,7 +473,7 @@ VALUE rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt) { rb_compile_option_t option; - NODE *node = compile_string(StringValue(src), file, line); + NODE *node = parse_string(StringValue(src), file, line); rb_thread_t *th = GET_THREAD(); make_compile_option(&option, opt); diff --git a/version.h b/version.h index 0a048eff9..95c3ad3c1 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 351 +#define RUBY_PATCHLEVEL 352 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit