summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-25 11:50:20 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-10-25 11:50:20 +0000
commitc6629c48e61f341aa5e0b4b8f0c4816a2e9e0cc1 (patch)
tree0d5cb5ea209a5931690afd0d0d744e77b3dffa7c
parentdb1f7079b6ff3c7227f20fc9c0743f9147bba2d2 (diff)
Revert r37316
The commit introduces too many failures and disturbs release engineering. Re-commit it with fixed tests. Thu Oct 25 13:09:01 2012 NAKAMURA Usaku <usa@ruby-lang.org> * parse.y: show a warning for concatenating string literals because it will be deprecated in the future. patched by mame (Yusuke Endoh) at [ruby-core:44207]. [ruby-core:44156] [Feature #6265] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--parse.y1
2 files changed, 0 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index edde7cc3ec9..60de2f6399e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,13 +19,6 @@ Thu Oct 25 13:35:07 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/mkconfig.rb: remove string literal concatenation.
-Thu Oct 25 13:09:01 2012 NAKAMURA Usaku <usa@ruby-lang.org>
-
- * parse.y: show a warning for concatenating string literals because
- it will be deprecated in the future.
- patched by mame (Yusuke Endoh) at [ruby-core:44207].
- [ruby-core:44156] [Feature #6265]
-
Wed Oct 24 18:49:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/objspace/objspace.c (type2sym, count_objects_size): use enum
diff --git a/parse.y b/parse.y
index 7bf3149e2b4..7eaab6b1b8a 100644
--- a/parse.y
+++ b/parse.y
@@ -3810,7 +3810,6 @@ string : tCHAR
| string string1
{
/*%%%*/
- rb_warning0("string concatenation syntax will be deprecated");
$$ = literal_concat($1, $2);
/*%
$$ = dispatch2(string_concat, $1, $2);