diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 19:08:39 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 19:08:39 +0000 |
commit | ea55a3fb7b99c3ed906f32583e25576918d31014 (patch) | |
tree | 1561ffa52e23c9e6ac6e08dd8ad46c3981f61218 | |
parent | 18ae1ce5ce711de2b182fa09d93d1d80f8f7377e (diff) | |
download | ruby-ea55a3fb7b99c3ed906f32583e25576918d31014.tar.gz |
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@12951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | lib/net/imap.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Thu Aug 16 04:08:20 2007 Shugo Maeda <shugo@ruby-lang.org> + + * lib/net/imap.rb (ResponseParser#next_token): fixed + error message. (backported from HEAD) + + * lib/net/imap.rb (ResponseParser#parse_error): fixed + the condition not to refer @token.symbol unexpectedly. + Thanks, Dick Monahan. (backported from HEAD) + Thu Aug 16 04:05:20 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * marshal.c (w_extended): erroneous check condition when dump diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 4cd1d6780f..586f3fe4c0 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -3046,7 +3046,7 @@ module Net elsif $7 return Token.new(T_RPAR, $+) else - parse_error("[Net::IMAP BUG] BEG_REGEXP is invalid") + parse_error("[Net::IMAP BUG] DATA_REGEXP is invalid") end else @str.index(/\S*/n, @pos) @@ -3100,7 +3100,7 @@ module Net $stderr.printf("@str: %s\n", @str.dump) $stderr.printf("@pos: %d\n", @pos) $stderr.printf("@lex_state: %s\n", @lex_state) - if @token.symbol + if @token $stderr.printf("@token.symbol: %s\n", @token.symbol) $stderr.printf("@token.value: %s\n", @token.value.inspect) end @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 54 +#define RUBY_PATCHLEVEL 55 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |