From 4b53f843264df5694f6693a9a3461af055573fe0 Mon Sep 17 00:00:00 2001 From: svn Date: Fri, 5 Apr 2019 08:15:21 +0000 Subject: * expand tabs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- compile.c | 10 +++++----- vm_eval.c | 2 +- vm_insnhelper.c | 32 ++++++++++++++++---------------- vm_method.c | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/compile.c b/compile.c index b1b1cdbd09..46b8217e7e 100644 --- a/compile.c +++ b/compile.c @@ -7144,29 +7144,29 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in case NODE_DEFN:{ ID mid = node->nd_mid; const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn, - rb_id2str(mid), + rb_id2str(mid), ISEQ_TYPE_METHOD, line); debugp_param("defn/iseq", rb_iseqw_new(method_iseq)); ADD_INSN2(ret, line, definemethod, ID2SYM(mid), method_iseq); if (!popped) { - ADD_INSN1(ret, line, putobject, ID2SYM(mid)); + ADD_INSN1(ret, line, putobject, ID2SYM(mid)); } break; } case NODE_DEFS:{ ID mid = node->nd_mid; - const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(node->nd_defn, + const rb_iseq_t * singleton_method_iseq = NEW_ISEQ(node->nd_defn, rb_id2str(mid), ISEQ_TYPE_METHOD, line); - debugp_param("defs/iseq", rb_iseqw_new(singleton_method_iseq)); + debugp_param("defs/iseq", rb_iseqw_new(singleton_method_iseq)); CHECK(COMPILE(ret, "defs: recv", node->nd_recv)); ADD_INSN2(ret, line, definesmethod, ID2SYM(mid), singleton_method_iseq); - if (!popped) { + if (!popped) { ADD_INSN1(ret, line, putobject, ID2SYM(mid)); } break; diff --git a/vm_eval.c b/vm_eval.c index 55cd3ca3fc..f05621e2b4 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1322,7 +1322,7 @@ eval_string_with_cref(VALUE self, VALUE src, rb_cref_t *cref, VALUE file, int li /* TODO: what the code checking? */ if (!cref && block.as.captured.code.val) { - rb_cref_t *orig_cref = vm_get_cref(vm_block_ep(&block)); + rb_cref_t *orig_cref = vm_get_cref(vm_block_ep(&block)); cref = vm_cref_dup(orig_cref); } vm_set_eval_stack(ec, iseq, cref, &block); diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 662e827c15..1b0dbde832 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -773,7 +773,7 @@ vm_get_cref(const VALUE *ep) return cref; } else { - rb_bug("vm_get_cref: unreachable"); + rb_bug("vm_get_cref: unreachable"); } } @@ -906,7 +906,7 @@ vm_get_ev_const(rb_execution_context_t *ec, VALUE orig_klass, ID id, int is_defi if (orig_klass == Qnil) { /* in current lexical scope */ - const rb_cref_t *root_cref = vm_get_cref(ec->cfp->ep); + const rb_cref_t *root_cref = vm_get_cref(ec->cfp->ep); const rb_cref_t *cref; VALUE klass = Qnil; @@ -2610,7 +2610,7 @@ vm_call_method_each_type(rb_execution_context_t *ec, rb_control_frame_t *cfp, st return vm_call_zsuper(ec, cfp, calling, ci, cc, RCLASS_ORIGIN(cc->me->defined_class)); case VM_METHOD_TYPE_REFINED: { - const rb_cref_t *cref = vm_get_cref(cfp->ep); + const rb_cref_t *cref = vm_get_cref(cfp->ep); VALUE refinements = cref ? CREF_REFINEMENTS(cref) : Qnil; VALUE refinement; const rb_callable_method_entry_t *ref_me; @@ -3141,7 +3141,7 @@ vm_defined(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, rb_num_t op_ } break; case DEFINED_CVAR: { - const rb_cref_t *cref = vm_get_cref(GET_EP()); + const rb_cref_t *cref = vm_get_cref(GET_EP()); klass = vm_get_cvar_base(cref, GET_CFP()); if (rb_cvar_defined(klass, SYM2ID(obj))) { expr_type = DEFINED_CVAR; @@ -3510,10 +3510,10 @@ vm_scope_visibility_get(const rb_execution_context_t *ec) const rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); if (!vm_env_cref_by_cref(cfp->ep)) { - return METHOD_VISI_PUBLIC; + return METHOD_VISI_PUBLIC; } else { - return CREF_SCOPE_VISI(vm_ec_cref(ec))->method_visi; + return CREF_SCOPE_VISI(vm_ec_cref(ec))->method_visi; } } @@ -3523,10 +3523,10 @@ vm_scope_module_func_check(const rb_execution_context_t *ec) const rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(ec, ec->cfp); if (!vm_env_cref_by_cref(cfp->ep)) { - return FALSE; + return FALSE; } else { - return CREF_SCOPE_VISI(vm_ec_cref(ec))->module_func; + return CREF_SCOPE_VISI(vm_ec_cref(ec))->module_func; } } @@ -3538,23 +3538,23 @@ vm_define_method(const rb_execution_context_t *ec, VALUE obj, ID id, VALUE iseqv rb_cref_t *cref = vm_ec_cref(ec); if (!is_singleton) { - klass = CREF_CLASS(cref); - visi = vm_scope_visibility_get(ec); + klass = CREF_CLASS(cref); + visi = vm_scope_visibility_get(ec); } else { /* singleton */ - klass = rb_singleton_class(obj); /* class and frozen checked in this API */ - visi = METHOD_VISI_PUBLIC; + klass = rb_singleton_class(obj); /* class and frozen checked in this API */ + visi = METHOD_VISI_PUBLIC; } if (NIL_P(klass)) { - rb_raise(rb_eTypeError, "no class/module to add method"); + rb_raise(rb_eTypeError, "no class/module to add method"); } rb_add_method_iseq(klass, id, (const rb_iseq_t *)iseqval, cref, visi); if (!is_singleton && vm_scope_module_func_check(ec)) { - klass = rb_singleton_class(klass); - rb_add_method_iseq(klass, id, (const rb_iseq_t *)iseqval, cref, METHOD_VISI_PUBLIC); + klass = rb_singleton_class(klass); + rb_add_method_iseq(klass, id, (const rb_iseq_t *)iseqval, cref, METHOD_VISI_PUBLIC); } } @@ -3727,7 +3727,7 @@ static int vm_ic_hit_p(IC ic, const VALUE *reg_ep) { if (ic->ic_serial == GET_GLOBAL_CONSTANT_STATE()) { - return (ic->ic_cref == NULL || ic->ic_cref == vm_get_cref(reg_ep)); + return (ic->ic_cref == NULL || ic->ic_cref == vm_get_cref(reg_ep)); } return FALSE; } diff --git a/vm_method.c b/vm_method.c index 3a9dfc1c5d..8cb86263e2 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1148,9 +1148,9 @@ rb_attr(VALUE klass, ID id, int read, int write, int ex) visi = METHOD_VISI_PUBLIC; } else { - switch (vm_scope_visibility_get(ec)) { + switch (vm_scope_visibility_get(ec)) { case METHOD_VISI_PRIVATE: - if (vm_scope_module_func_check(ec)) { + if (vm_scope_module_func_check(ec)) { rb_warning("attribute accessor as module_function"); } visi = METHOD_VISI_PRIVATE; -- cgit v1.2.3