aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-04 14:59:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-04 14:59:43 +0000
commite168b64b03403fb4efbd8dcbbdaeed83710b4d39 (patch)
treee18042665f2b24b783eba250faf17fd9c7b3c17e
parent0d1896a88fe091000ce0d9c8ef3cf7ef1e2e991b (diff)
downloadruby-e168b64b03403fb4efbd8dcbbdaeed83710b4d39.tar.gz
* parse.y (tokadd_string): newlines have no special meanings in
%w/%W, otherwise they are ignored only when interpolation is enabled. [ruby-dev:21325] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--parse.y5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a3295f015c..bbf1e1075e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 4 23:59:40 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (tokadd_string): newlines have no special meanings in
+ %w/%W, otherwise they are ignored only when interpolation is
+ enabled. [ruby-dev:21325]
+
Wed Sep 4 19:38:25 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
* ext/io/wait/.cvsignore: added.
diff --git a/parse.y b/parse.y
index 917a92b7ef..35a94c9e89 100644
--- a/parse.y
+++ b/parse.y
@@ -2999,7 +2999,10 @@ tokadd_string(func, term, paren, nest)
}
switch (c) {
case '\n':
- continue;
+ if (func & STR_FUNC_QWORDS) break;
+ if (func & STR_FUNC_EXPAND) continue;
+ tokadd('\\');
+ break;
case '\\':
if (func & STR_FUNC_ESCAPE) tokadd(c);