summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro Matsumoto <[email protected]>2012-05-09 11:04:36 +0900
committerYukihiro Matsumoto <[email protected]>2012-05-09 11:04:36 +0900
commit96168852c358b0940f28730cd8f97ae5a819244a (patch)
tree877d197c7e05da359c519952bb02d3366609a3d2
parent22bd603a7ee41f018c81fad94e6f18738713245b (diff)
downloadmruby-96168852c358b0940f28730cd8f97ae5a819244a.tar.gz
mruby-96168852c358b0940f28730cd8f97ae5a819244a.zip
move declaration in the middle
-rw-r--r--src/kernel.c7
-rw-r--r--src/re.c5
2 files changed, 5 insertions, 7 deletions
diff --git a/src/kernel.c b/src/kernel.c
index 8ae04de32..64e780df2 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -765,13 +765,10 @@ mrb_obj_ivar_set(mrb_state *mrb, mrb_value self)
{
mrb_value key;
mrb_value val;
+ mrb_sym id;
mrb_get_args(mrb, "oo", &key, &val);
- mrb_sym id = mrb_to_id(mrb, key);
-
- //if (!mrb_is_instance_id(id)) {
- // mrb_name_error(mrb, id, "`%s' is not allowed as an instance variable name", mrb_sym2name(mrb, id));
- //}
+ id = mrb_to_id(mrb, key);
mrb_iv_set(mrb, self, id, val);
return val;
}
diff --git a/src/re.c b/src/re.c
index 9e5b8d9a8..c54ac75a8 100644
--- a/src/re.c
+++ b/src/re.c
@@ -1976,9 +1976,10 @@ mrb_match_init_copy(mrb_state *mrb, mrb_value obj/*, mrb_value orig*/)
mrb_value argv[16];
int argc;
struct rmatch *rm;
+ mrb_value orig;
mrb_get_args(mrb, "*", &argv, &argc);
- mrb_value orig = argv[0];
+ orig = argv[0];
if (mrb_obj_equal(mrb, obj, orig)) return obj;
@@ -2006,7 +2007,7 @@ mrb_match_init_copy(mrb_state *mrb, mrb_value obj/*, mrb_value orig*/)
rm->char_offset_num_allocated = rm->regs.num_regs;
}
memcpy(rm->char_offset, RMATCH(orig)->rmatch->char_offset,
- sizeof(struct rmatch_offset)* rm->regs.num_regs);
+ sizeof(struct rmatch_offset) * rm->regs.num_regs);
rm->char_offset_updated = 1;
}