summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-05 13:34:42 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-05 13:34:42 +0000
commit377a6581693b16975794115ae27ee1af1be36f94 (patch)
treef40912a0f168f745bb1e932ebe9171a7ad402362
parent51782c7f38f39f2146b5882d56df0cb8d1ec1847 (diff)
merges r20536 from trunk into ruby_1_9_1.
* compile.c (iseq_set_sequence): uses rb_compile_warning() for warning at compilation time. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--compile.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c360a45e98..3fb0b91524 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 5 12:38:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * compile.c (iseq_set_sequence): uses rb_compile_warning() for
+ warning at compilation time.
+
Fri Dec 5 12:35:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (ruby_iseq_compile, ruby_iseq_translate_threaded_code),
diff --git a/compile.c b/compile.c
index 62021c8908..7f3f53b45d 100644
--- a/compile.c
+++ b/compile.c
@@ -1355,7 +1355,8 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
rb_hash_aset(map, obj, INT2FIX(lobj->position - (pos+len)));
}
else {
- rb_warning("duplicated when clause is ignored");
+ rb_compile_warning(RSTRING_PTR(iseq->filename), iobj->line_no,
+ "duplicated when clause is ignored");
}
}
generated_iseq[pos + 1 + j] = map;