From 2bdd8561e604f9dd5c83bca0e6014720cb397592 Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 30 Jan 2010 12:47:08 +0000 Subject: merges r25318 from trunk into ruby_1_9_1. -- * parse.y (parser_magic_comment): fixed normalization. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 2 +- version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e693a3c57b..6656ce2d0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 13 18:20:57 2009 Nobuyoshi Nakada + + * parse.y (parser_magic_comment): fixed normalization. + Mon Oct 12 23:27:57 2009 Shugo Maeda * lib/net/ftp.rb (login): use "anonymous@" as a default password. diff --git a/parse.y b/parse.y index a552767674..15a3b787e5 100644 --- a/parse.y +++ b/parse.y @@ -6332,7 +6332,7 @@ parser_magic_comment(struct parser_params *parser, const char *str, int len) str_copy(name, beg, n); s = RSTRING_PTR(name); for (i = 0; i < n; ++i) { - if (*s == '-') *s = '_'; + if (s[i] == '-') s[i] = '_'; } #ifndef RIPPER do { diff --git a/version.h b/version.h index a5096069ac..900fb81fc9 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 388 +#define RUBY_PATCHLEVEL 389 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3