archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r29630 from trunk into ruby_1_9_2.

Browse source 
--
* iseq.c (iseq_s_compile): fix optional argument.
  a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-12-20 13:22:59 +00:00
parent 26879c1742
commit cc3a7df13b
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Oct 30 00:35:13 2010 Koichi Sasada <ko1@atdot.net>
* iseq.c (iseq_s_compile): fix optional argument.
a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
Mon Nov 22 21:30:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Nov 22 21:30:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_inspect): fix for ascii-compatible external * string.c (rb_str_inspect): fix for ascii-compatible external

2
iseq.c
View file

@ -579,7 +579,7 @@ iseq_s_compile(int argc, VALUE *argv, VALUE self)
rb_secure(1); rb_secure(1);
rb_scan_args(argc, argv, "13", &src, &file, &path, &line, &opt); rb_scan_args(argc, argv, "14", &src, &file, &path, &line, &opt);
if (NIL_P(file)) file = rb_str_new2("<compiled>"); if (NIL_P(file)) file = rb_str_new2("<compiled>");
if (NIL_P(line)) line = INT2FIX(1); if (NIL_P(line)) line = INT2FIX(1);

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 104 #define RUBY_PATCHLEVEL 105
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1