summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-16 00:19:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-16 00:19:18 +0000
commit79e5fec36f647008b973d61ecab363cf76f223ad (patch)
tree95befbac94b8f8e15bd47d19a35f82c5343decf9
parent6cd533926f8cfa75029b2a78f78fc54049e9c642 (diff)
downloadruby-79e5fec36f647008b973d61ecab363cf76f223ad.tar.gz
ruby-79e5fec36f647008b973d61ecab363cf76f223ad.tar.xz
ruby-79e5fec36f647008b973d61ecab363cf76f223ad.zip
* parse.y (magic_comment_encoding): use rb_compile_warning() to
show the currently parsing file name. [ruby-core:23469] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cf7b75f34..239a8d23d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 16 09:19:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (magic_comment_encoding): use rb_compile_warning() to
+ show the currently parsing file name. [ruby-core:23469]
+
Sat May 16 09:03:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ruby_version): now version.h includes
diff --git a/parse.y b/parse.y
index e2e92ce74..ec711add0 100644
--- a/parse.y
+++ b/parse.y
@@ -6100,8 +6100,8 @@ static void
magic_comment_encoding(struct parser_params *parser, const char *name, const char *val)
{
if (!comment_at_top(parser)) {
- rb_warning("encoding '%s' is ignored, valid only in the first line except for shebang line.",
- val);
+ rb_warningS("encoding '%s' is ignored, valid only in the first line except for shebang line.",
+ val);
return;
}
parser_set_encode(parser, val);