shyouhei	2009-11-24 16:14:33 +0900 (Tue, 24 Nov 2009)

  New Revision: 25901

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25901

  Log:
    merge revision(s) 25340:
    * lib/net/imap.rb (resp_text_code): accepts response codes without
      text.  backported from trunk.  [ruby-core:24194]

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

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 25900)
+++ ruby_1_8_7/ChangeLog	(revision 25901)
@@ -1,3 +1,8 @@
+Tue Nov 24 16:12:33 2009  Shugo Maeda  <shugo@r...>
+
+	* lib/net/imap.rb (resp_text_code): accepts response codes without
+	  text.  backported from trunk.  [ruby-core:24194]
+
 Tue Nov 24 16:09:41 2009  Shugo Maeda  <shugo@r...>
 
 	* lib/net/ftp.rb (getaddress): rescue exceptions.  [ruby-dev:39451]
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 25900)
+++ ruby_1_8_7/version.h	(revision 25901)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-11-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091124
-#define RUBY_PATCHLEVEL 218
+#define RUBY_PATCHLEVEL 219
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/net/imap.rb
===================================================================
--- ruby_1_8_7/lib/net/imap.rb	(revision 25900)
+++ ruby_1_8_7/lib/net/imap.rb	(revision 25901)
@@ -2764,11 +2764,16 @@
           match(T_SPACE)
           result = ResponseCode.new(name, number)
         else
-          match(T_SPACE)
-          @lex_state = EXPR_CTEXT
-          token = match(T_TEXT)
-          @lex_state = EXPR_BEG
-          result = ResponseCode.new(name, token.value)
+          token = lookahead
+          if token.symbol == T_SPACE
+            shift_token
+            @lex_state = EXPR_CTEXT
+            token = match(T_TEXT)
+            @lex_state = EXPR_BEG
+            result = ResponseCode.new(name, token.value)
+          else
+            result = ResponseCode.new(name, nil)
+          end
         end
         match(T_RBRA)
         @lex_state = EXPR_RTEXT

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