summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-23 08:40:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-23 08:40:36 +0000
commitcd3028319f21791dd31df7a5aef7a676a93ab322 (patch)
tree648f292f8f2887e2589080d033c57f6253475855
parentce8257da3c66608001bfc2ab22fc89c60a92fbb6 (diff)
* parse.y (warn_balanced): no warning for singleton class.
[ruby-core:30366] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27966 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b9e2f8a58..e6f41b1e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 23 17:40:34 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (warn_balanced): no warning for singleton class.
+ [ruby-core:30366]
+
Sun May 23 17:16:37 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (CONST_ID_CACHE, rb_intern_const): suppress
diff --git a/parse.y b/parse.y
index 7c53b56d64..7aa2fe48d5 100644
--- a/parse.y
+++ b/parse.y
@@ -6488,7 +6488,8 @@ parser_prepare(struct parser_params *parser)
#define ambiguous_operator(op, syn) dispatch2(operator_ambiguous, ripper_intern(op), rb_str_new_cstr(syn))
#endif
#define warn_balanced(op, syn) \
- (last_state != EXPR_DOT && last_state != EXPR_FNAME && last_state != EXPR_ENDFN && \
+ (last_state != EXPR_CLASS && last_state != EXPR_DOT && \
+ last_state != EXPR_FNAME && last_state != EXPR_ENDFN && \
space_seen && !ISSPACE(c) && \
(ambiguous_operator(op, syn), 0))