matz	2007-12-10 08:16:54 +0900 (Mon, 10 Dec 2007)

  New Revision: 14165

  Modified files:
    trunk/ChangeLog
    trunk/bootstraptest/test_thread.rb
    trunk/parse.y

  Log:
    * parse.y (parser_yylex): wrong token was generated.  [ruby-dev:32498]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=14165&r2=14164
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14165&r2=14164
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bootstraptest/test_thread.rb?r1=14165&r2=14164

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14164)
+++ ChangeLog	(revision 14165)
@@ -1,3 +1,7 @@
+Mon Dec 10 07:48:14 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* parse.y (parser_yylex): wrong token was generated.  [ruby-dev:32498]
+
 Mon Dec 10 06:44:47 2007  Tanaka Akira  <akr@f...>
 
 	* re.c (rb_reg_expr_str): use \xHH instead of \OOO.
Index: bootstraptest/test_thread.rb
===================================================================
--- bootstraptest/test_thread.rb	(revision 14164)
+++ bootstraptest/test_thread.rb	(revision 14165)
@@ -169,9 +169,9 @@
     Thread.current[:a]
   }.value + Thread.current[:a]
 }
-assert_equal %q{1000}, %q{
+assert_equal %q{100}, %q{
 begin
-  1000.times do |i|
+  100.times do |i|
     begin
       Thread.start(Thread.current) {|u| u.raise }
       raise
@@ -180,6 +180,6 @@
     end
   end
 rescue
-  1000
+  100
 end
 }, '[ruby-dev:31371]'
Index: parse.y
===================================================================
--- parse.y	(revision 14164)
+++ parse.y	(revision 14165)
@@ -6087,8 +6087,8 @@
 	c = nextc();
 	if (lex_state == EXPR_FNAME || lex_state == EXPR_DOT) {
 	    lex_state = EXPR_ARG;
-	    if (c != '@') {
-		pushback(c);
+	    if (c == '@') {
+		return '!';
 	    }
 	}
 	else {

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