summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-24 22:31:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-24 22:31:19 +0000
commit637f6122476ca1da7fa289a2b376c3d09324cc86 (patch)
tree0611b386a65ef900489c3c14a59dfebe7611a4f4
parent6eaa5f2b05c17cf05db5ced5e24f818e99a39828 (diff)
* parse.y (primary): allow newlines just before right argument
parenthesis. (ruby-bugs:PR#1221) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--parse.y2
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 77b0998c94..ab7e4a44b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 25 07:31:16 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (primary): allow newlines just before right argument
+ parenthesis. (ruby-bugs:PR#1221)
+
Mon Nov 24 23:32:06 2003 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb (OpenURI.open_loop, URI::HTTP#proxy_open): use
@@ -99,7 +104,7 @@ Fri Nov 21 01:40:00 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* configure.in: check <pthread.h>
- * ruby.h: include pthread.h if existence.
+ * ruby.h: include pthread.h if existence.
define is_ruby_native() macro when not HAVE_NATIVETHREAD
* eval.c: undef is_ruby_native() function when not HAVE_NATIVETHREAD
@@ -135,7 +140,7 @@ Thu Nov 20 17:50:58 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
Thu Nov 20 13:37:34 2003 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
- * ruby.h: define is_ruby_native_thread() for no native thread
+ * ruby.h: define is_ruby_native_thread() for no native thread
environment
* eval.c: ditto
diff --git a/parse.y b/parse.y
index c37a5bea7a..79bdc15db1 100644
--- a/parse.y
+++ b/parse.y
@@ -1426,7 +1426,7 @@ primary : literal
$$ = NEW_BEGIN($3);
nd_set_line($$, $<num>1);
}
- | tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} ')'
+ | tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} opt_nl ')'
{
rb_warning("(...) interpreted as grouped expression");
$$ = $2;