1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ruby.c (set_internal_encoding_once): check double contradicted

Browse Source 
specification of the encoding from command line.

* ruby.c (set_external_encoding_once): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-10-14 00:41:09 +00:00
parent f143d606f1
commit 339ceda4e8
2 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Oct 14 09:39:32 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.c (set_internal_encoding_once): check double contradicted
specification of the encoding from command line.
* ruby.c (set_external_encoding_once): ditto.
Tue Oct 14 08:28:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Oct 14 08:28:31 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): allow reserved word to be keyword argument. * parse.y (parser_yylex): allow reserved word to be keyword argument.

43
ruby.c
View File

@ -586,6 +586,38 @@ dump_option(const char *str, int len, void *arg)
rb_warn("don't know how to dump `%.*s', (insns)", len, str); rb_warn("don't know how to dump `%.*s', (insns)", len, str);
} }
static void
set_internal_encoding_once(struct cmdline_options *opt, const char *e, int elen)
{
VALUE ename;
if (!elen) elen = strlen(e);
ename = rb_str_new(e, elen);
if (opt->intern.enc.name &&
rb_funcall(ename, rb_intern("casecmp"), 1, opt->intern.enc.name) != INT2FIX(0)) {
rb_raise(rb_eRuntimeError,
"default_intenal already set to %s", RSTRING_PTR(opt->intern.enc.name));
}
opt->intern.enc.name = ename;
}
static void
set_external_encoding_once(struct cmdline_options *opt, const char *e, int elen)
{
VALUE ename;
if (!elen) elen = strlen(e);
ename = rb_str_new(e, elen);
if (opt->ext.enc.name &&
rb_funcall(ename, rb_intern("casecmp"), 1, opt->ext.enc.name) != INT2FIX(0)) {
rb_raise(rb_eRuntimeError,
"default_external already set to %s", RSTRING_PTR(opt->ext.enc.name));
}
opt->ext.enc.name = ename;
}
static int static int
proc_options(int argc, char **argv, struct cmdline_options *opt) proc_options(int argc, char **argv, struct cmdline_options *opt)
{ {
@ -759,7 +791,7 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
goto encoding; goto encoding;
case 'U': case 'U':
opt->intern.enc.name = rb_str_new2("utf-8"); set_internal_encoding_once(opt, "UTF-8", 0);
break; break;
case 'K': case 'K':
@ -781,7 +813,7 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
} }
if (enc_name) { if (enc_name) {
opt->src.enc.name = rb_str_new2(enc_name); opt->src.enc.name = rb_str_new2(enc_name);
opt->ext.enc.name = opt->src.enc.name; set_external_encoding_once(opt, enc_name, 0);
} }
s++; s++;
} }
@ -871,12 +903,12 @@ proc_options(int argc, char **argv, struct cmdline_options *opt)
p = strchr(s, ':'); p = strchr(s, ':');
if (p) { if (p) {
if (p > s) if (p > s)
opt->ext.enc.name = rb_str_new(s, p-s); set_external_encoding_once(opt, s, p-s);
if (*++p) if (*++p)
opt->intern.enc.name = rb_str_new2(p); set_internal_encoding_once(opt, p, 0);
} }
else else
opt->ext.enc.name = rb_str_new2(s); set_external_encoding_once(opt, s, 0);
} }
else if (strcmp("version", s) == 0) else if (strcmp("version", s) == 0)
opt->version = 1; opt->version = 1;
@ -981,6 +1013,7 @@ process_options(VALUE arg)
VALUE ext_enc_name = opt->ext.enc.name; VALUE ext_enc_name = opt->ext.enc.name;
VALUE int_enc_name = opt->intern.enc.name; VALUE int_enc_name = opt->intern.enc.name;
opt->src.enc.name = opt->ext.enc.name = opt->intern.enc.name = 0;
while (ISSPACE(*s)) while (ISSPACE(*s))
s++; s++;
if (*s == 'T' || (*s == '-' && *(s + 1) == 'T')) { if (*s == 'T' || (*s == '-' && *(s + 1) == 'T')) {