kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: fix casts

Browse source 
* parse.y (reg_named_capture_assign_gen): remove needless cast.

* parse.y (must_be_dynamic_symbol, intern_cstr_without_pindown):
  get rid of type-punning cast.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46697 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-07-04 17:27:08 +00:00
parent 336f65eb57
commit 5405eff901
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
parse.y
View file

@ -9999,7 +9999,7 @@ reg_named_capture_assign_gen(struct parser_params* parser, VALUE regexp, NODE *m
arg.succ_block = 0; arg.succ_block = 0;
arg.fail_block = 0; arg.fail_block = 0;
arg.num = 0; arg.num = 0;
onig_foreach_name(RREGEXP(regexp)->ptr, reg_named_capture_assign_iter, (void*)&arg); onig_foreach_name(RREGEXP(regexp)->ptr, reg_named_capture_assign_iter, &arg);
if (arg.num == 0) if (arg.num == 0)
return match; return match;
@ -10419,10 +10419,10 @@ must_be_dynamic_symbol(VALUE x)
{ {
if (UNLIKELY(!DYNAMIC_SYM_P(x))) { if (UNLIKELY(!DYNAMIC_SYM_P(x))) {
if (STATIC_SYM_P(x)) { if (STATIC_SYM_P(x)) {
VALUE str; st_data_t str;
if (lookup_id_str(RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT), (st_data_t *)&str)) { if (lookup_id_str(RSHIFT((unsigned long)(x),RUBY_SPECIAL_SHIFT), &str)) {
rb_bug("wrong argument: %s (inappropriate Symbol)", RSTRING_PTR(str)); rb_bug("wrong argument: %s (inappropriate Symbol)", RSTRING_PTR((VALUE)str));
} }
else { else {
rb_bug("wrong argument: inappropriate Symbol (%p)", (void *)x); rb_bug("wrong argument: inappropriate Symbol (%p)", (void *)x);
@ -10475,14 +10475,14 @@ lookup_str_id(st_data_t str, st_data_t *data)
static ID static ID
intern_cstr_without_pindown(const char *name, long len, rb_encoding *enc) intern_cstr_without_pindown(const char *name, long len, rb_encoding *enc)
{ {
ID id; st_data_t id;
struct RString fake_str; struct RString fake_str;
VALUE str = setup_fake_str(&fake_str, name, len); VALUE str = setup_fake_str(&fake_str, name, len);
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
OBJ_FREEZE(str); OBJ_FREEZE(str);
if (st_lookup(global_symbols.str_id, str, (st_data_t *)&id)) { if (st_lookup(global_symbols.str_id, str, &id)) {
return id; return (ID)id;
} }
str = rb_enc_str_new(name, len, enc); /* make true string */ str = rb_enc_str_new(name, len, enc); /* make true string */