summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-09 03:03:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-09 03:03:18 +0000
commit9e461b8fb016a8990c297bd72f4d2a635f8073ce (patch)
treed4794966fdc9c492feb0950df34a2095dd69f35f
parent548255eb27b329d18259eaf7d504be428aa34fb4 (diff)
downloadruby-9e461b8fb016a8990c297bd72f4d2a635f8073ce.tar.gz
ruby-9e461b8fb016a8990c297bd72f4d2a635f8073ce.tar.xz
ruby-9e461b8fb016a8990c297bd72f4d2a635f8073ce.zip
* parse.y (parser_magic_comment): delimits with a semicolon.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5056e3d57..918f1c0fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 9 12:03:16 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_magic_comment): delimits with a semicolon.
+
Sun Dec 9 11:29:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (tr_trans): get rid of segfaults when has mulitbytes but
diff --git a/parse.y b/parse.y
index 0a44cbe1d..2cf0ecde3 100644
--- a/parse.y
+++ b/parse.y
@@ -5860,7 +5860,7 @@ parser_magic_comment(struct parser_params *parser, const char *str, int len)
}
}
else {
- for (vbeg = str; len > 0 && *str != '"' && !ISSPACE(*str); --len, str++);
+ for (vbeg = str; len > 0 && *str != '"' && *str != ';' && !ISSPACE(*str); --len, str++);
vend = str;
}
while (len > 0 && (*str == ';' || ISSPACE(*str))) --len, str++;