diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-21 04:36:05 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-21 04:36:05 +0000 |
commit | 82ba40b4340b01c97733561816dc8a4ee8adc081 (patch) | |
tree | f16567f8fbf724d97758724c65e51c9c7307f04b | |
parent | 2e1efa94993dee9b54ac4c9f4c58a06f41ed3232 (diff) | |
download | ruby-82ba40b4340b01c97733561816dc8a4ee8adc081.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | bootstraptest/test_syntax.rb | 3 | ||||
-rw-r--r-- | parse.y | 3 |
3 files changed, 6 insertions, 5 deletions
@@ -1,4 +1,7 @@ -Wed Apr 21 12:15:46 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Apr 21 13:36:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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) @@ -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 ':'; } |