shyouhei	2009-01-06 09:03:06 +0900 (Tue, 06 Jan 2009)

  New Revision: 21349

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

  Log:
    merge revision(s) 18318:
    * parse.y (yylex): 8 and 9 in octal integer should cause compile
      error.  [ruby-dev:35729]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/parse.y
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/parse.y
===================================================================
--- ruby_1_8_6/parse.y	(revision 21348)
+++ ruby_1_8_6/parse.y	(revision 21349)
@@ -3903,7 +3903,8 @@
 			    nondigit = c;
 			    continue;
 			}
-			if (c < '0' || c > '7') break;
+			if (c < '0' || c > '9') break;
+			if (c > '7') goto invalid_octal;
 			nondigit = 0;
 			tokadd(c);
 		    } while ((c = nextc()) != -1);
@@ -3920,6 +3921,7 @@
 		    }
 		}
 		if (c > '7' && c <= '9') {
+		  invalid_octal:
 		    yyerror("Illegal octal digit");
 		}
 		else if (c == '.' || c == 'e' || c == 'E') {
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21348)
+++ ruby_1_8_6/ChangeLog	(revision 21349)
@@ -1,3 +1,8 @@
+Tue Jan  6 09:02:14 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (yylex): 8 and 9 in octal integer should cause compile
+	  error.  [ruby-dev:35729]
+
 Mon Jan  5 11:12:39 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_thread_schedule): runs deferred finalizers.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21348)
+++ ruby_1_8_6/version.h	(revision 21349)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2009-01-05"
+#define RUBY_RELEASE_DATE "2009-01-06"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20090105
-#define RUBY_PATCHLEVEL 290
+#define RUBY_RELEASE_CODE 20090106
+#define RUBY_PATCHLEVEL 291
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 6
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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