summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-11-18 00:03:50 +0900
committerGitHub <[email protected]>2017-11-18 00:03:50 +0900
commit31ce73ddc30b9369dffdda01903bfa45277a2829 (patch)
tree7a38adb1a5f2145b1a6867af53a6519a8f79ea00
parent269f9f212594fb89c5d7ea6c2be85e28fe7a6f08 (diff)
parenta2d0ee59c63051e763b8ebeb4d57d16d65bdbe1a (diff)
downloadmruby-31ce73ddc30b9369dffdda01903bfa45277a2829.tar.gz
mruby-31ce73ddc30b9369dffdda01903bfa45277a2829.zip
Merge pull request #3853 from ukrainskiysergey/variable_c_cosmetic_changes
Removed useless condition
-rw-r--r--src/variable.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/variable.c b/src/variable.c
index be06d1a04..93fe8aba9 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -666,7 +666,6 @@ const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym, mrb_bool top)
{
struct RClass *c = base;
mrb_value v;
- iv_tbl *t;
mrb_bool retry = FALSE;
mrb_value name;
struct RClass *oclass = mrb->object_class;
@@ -674,13 +673,12 @@ const_get(mrb_state *mrb, struct RClass *base, mrb_sym sym, mrb_bool top)
L_RETRY:
while (c) {
if (c->iv && (top || c != oclass || base == oclass)) {
- t = c->iv;
- if (iv_get(mrb, t, sym, &v))
+ if (iv_get(mrb, c->iv, sym, &v))
return v;
}
c = c->super;
}
- if (!retry && base && base->tt == MRB_TT_MODULE) {
+ if (!retry && base->tt == MRB_TT_MODULE) {
c = oclass;
retry = TRUE;
goto L_RETRY;