shyouhei	2007-08-22 08:28:09 +0900 (Wed, 22 Aug 2007)

  New Revision: 13134

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/net/imap.rb
    branches/ruby_1_8_6/version.h

  Log:
    * 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)


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=13134&r2=13133
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=13134&r2=13133
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/net/imap.rb?r1=13134&r2=13133

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 13133)
+++ ruby_1_8_6/ChangeLog	(revision 13134)
@@ -1,3 +1,12 @@
+Wed Aug 22 08:27:53 2007  Shugo Maeda  <shugo@r...>
+
+	* 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)
+
 Wed Aug 22 08:26:33 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* marshal.c (w_extended): erroneous check condition when dump
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 13133)
+++ ruby_1_8_6/version.h	(revision 13134)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2007-08-22"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 41
+#define RUBY_PATCHLEVEL 42
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/lib/net/imap.rb
===================================================================
--- ruby_1_8_6/lib/net/imap.rb	(revision 13133)
+++ ruby_1_8_6/lib/net/imap.rb	(revision 13134)
@@ -3059,7 +3059,7 @@
             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)
@@ -3113,7 +3113,7 @@
           $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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml