diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-31 16:04:11 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-31 16:04:11 +0000 |
commit | d64a9753968e793e23f03c6b5de31d300e4bd438 (patch) | |
tree | 6fa226540c93aa0199ebb8c6bc79abf9690333d1 | |
parent | 6cb161a66c014db83c62ebf8a0d6beff60f44382 (diff) | |
download | ruby-d64a9753968e793e23f03c6b5de31d300e4bd438.tar.gz |
* ruby.c (process_options): rejects dummy encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ruby.c | 3 | ||||
-rw-r--r-- | version.h | 10 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Tue Jan 1 01:04:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.c (process_options): rejects dummy encoding. + Mon Dec 31 23:53:55 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.c (proc_options, process_options): delays finding encoding @@ -969,6 +969,9 @@ process_options(VALUE arg) if ((opt->enc_index = rb_enc_find_index(s)) < 0) { rb_raise(rb_eRuntimeError, "unknown encoding name - %s", s); } + else if (rb_enc_dummy_p(rb_enc_from_index(opt->enc_index))) { + rb_raise(rb_eRuntimeError, "dummy encoding is not acceptable - %s ", s); + } } if (opt->e_script) { if (opt->enc_index >= 0) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-12-31" +#define RUBY_RELEASE_DATE "2008-01-01" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071231 +#define RUBY_RELEASE_CODE 20080101 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 0 -#define RUBY_RELEASE_YEAR 2007 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_YEAR 2008 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 1 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |