From 82ba40b4340b01c97733561816dc8a4ee8adc081 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 21 Apr 2010 04:36:05 +0000 Subject: * parse.y (parser_yylex): reverted r27388 due to backward compatibility. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- bootstraptest/test_syntax.rb | 3 --- parse.y | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e328147ba..d2a6acf423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Wed Apr 21 12:15:46 2010 Nobuyoshi Nakada +Wed Apr 21 13:36:01 2010 Nobuyoshi Nakada + + * parse.y (parser_yylex): reverted r27388 due to backward + compatibility. * parse.y (parser_yylex): warn confusing binary operators after local variable. diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb index 30219c048e..44db11babf 100644 --- a/bootstraptest/test_syntax.rb +++ b/bootstraptest/test_syntax.rb @@ -890,6 +890,3 @@ assert_valid_syntax('x y { "#{}".z { } }', bug1240) assert_valid_syntax('x y { "#{}".z do end }', bug1240) assert_valid_syntax('y "#{a 1}" do end', '[ruby-core:29579]') - -bug3163 = '[ruby-core:29578]' -assert_valid_syntax('foo = 1; foo :bar', bug3163) diff --git a/parse.y b/parse.y index 9603d61670..23f4362857 100644 --- a/parse.y +++ b/parse.y @@ -7203,8 +7203,9 @@ parser_yylex(struct parser_params *parser) lex_state = EXPR_DOT; return tCOLON2; } - if ((IS_END() && !space_seen) || ISSPACE(c)) { + if (IS_END() || ISSPACE(c)) { pushback(c); + warn_balanced(":", "symbol literal"); lex_state = EXPR_BEG; return ':'; } -- cgit v1.2.3