diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 20:01:09 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-14 20:01:09 +0000 |
commit | 5f06da63d61e782705667524a4fd3181acfab0fa (patch) | |
tree | 1ee3c1b6d09f4ba648ae0af861b71029829aa918 | |
parent | 2349592a517c89621560462ff9a36413b21f074c (diff) |
merge revision(s) 34415:
* parse.y (debug_lines, coverage): set file path encoding for coverage
result. [ruby-dev:44950]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Feb 15 04:49:23 2012 Yusuke Endoh <mame@tsg.ne.jp> + + * parse.y (debug_lines, coverage): set file path encoding for coverage + result. [ruby-dev:44950] + Tue Feb 14 16:57:11 2012 NAKAMURA Usaku <usa@ruby-lang.org> * lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to @@ -5153,7 +5153,7 @@ debug_lines(const char *f) if (rb_const_defined_at(rb_cObject, script_lines)) { VALUE hash = rb_const_get_at(rb_cObject, script_lines); if (TYPE(hash) == T_HASH) { - VALUE fname = rb_str_new2(f); + VALUE fname = rb_external_str_new_with_enc(f, strlen(f), rb_filesystem_encoding()); VALUE lines = rb_ary_new(); rb_hash_aset(hash, fname, lines); return lines; @@ -5167,7 +5167,7 @@ coverage(const char *f, int n) { VALUE coverages = rb_get_coverages(); if (RTEST(coverages) && RBASIC(coverages)->klass == 0) { - VALUE fname = rb_str_new2(f); + VALUE fname = rb_external_str_new_with_enc(f, strlen(f), rb_filesystem_encoding()); VALUE lines = rb_ary_new2(n); int i; RBASIC(lines)->klass = 0; @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 110 +#define RUBY_PATCHLEVEL 111 -#define RUBY_RELEASE_DATE "2012-02-14" +#define RUBY_RELEASE_DATE "2012-02-15" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 15 #include "ruby/version.h" |