From 88e2237573d34b0fef7839056cbe8083f2f7cb72 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Jul 2009 14:46:22 +0000 Subject: merges r23932 from trunk into ruby_1_9_1. -- * parse.y (parser_yylex): fixed wrong variable. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24052 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 fdab49081..2ecbcf73d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jul 2 07:53:44 2009 Nobuyoshi Nakada + + * parse.y (parser_yylex): fixed wrong variable. + Tue Jun 30 18:19:07 2009 Yukihiro Matsumoto * hash.c (rb_hash_hash): documentation fix. a patch from diff --git a/parse.y b/parse.y index 735f31c2c..44a5e0912 100644 --- a/parse.y +++ b/parse.y @@ -7056,7 +7056,7 @@ parser_yylex(struct parser_params *parser) } else { int c0 = nextc(); - if (c == -1 || !ISDIGIT(c0)) { + if (c0 == -1 || !ISDIGIT(c0)) { pushback(c0); goto decode_num; } diff --git a/version.h b/version.h index 6df12a6d0..350dedf3f 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-07-12" -#define RUBY_PATCHLEVEL 215 +#define RUBY_PATCHLEVEL 216 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit