summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-13 10:13:40 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-13 10:13:40 +0000
commit2a22cbfcf08c25053642340f055807ef11b65e78 (patch)
tree4cd38cd9d39213a9c9cb5e07a53bbf53da270506
parent0238ad4d7a5419ec386daa64786c9393221181fb (diff)
downloadruby-2a22cbfcf08c25053642340f055807ef11b65e78.tar.gz
ruby-2a22cbfcf08c25053642340f055807ef11b65e78.tar.xz
ruby-2a22cbfcf08c25053642340f055807ef11b65e78.zip
* parse.y (token_info_pop): show source filename. [ruby-dev:36710]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y5
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a93e3d37d..5bb46f861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 13 19:07:52 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * parse.y (token_info_pop): show source filename. [ruby-dev:36710]
+
Mon Oct 13 08:59:08 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (load_conv_function51932): support
diff --git a/parse.y b/parse.y
index f60d248c2..4adf43e87 100644
--- a/parse.y
+++ b/parse.y
@@ -4856,8 +4856,9 @@ token_info_pop(struct parser_params *parser, const char *token)
if (token_info_has_nonspaces(parser, token) || ptinfo->nonspc) { /* SKIP */
goto finish;
}
- rb_warning("mismatched indentations: line %d:'%s' and line %d:'%s'",
- ptinfo->linenum, ptinfo->token, linenum, token);
+ rb_compile_warning(ruby_sourcefile, linenum,
+ "mismatched indentations at '%s' with '%s' at %d",
+ token, ptinfo->token, ptinfo->linenum);
finish:
xfree(ptinfo);