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

* compile.c: fixed indentation.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-06-05 04:49:54 +00:00
parent 35eb542588
commit 194a01a484
8 changed files with 36 additions and 34 deletions

View file

@ -993,9 +993,9 @@ Tue Mar 20 22:54:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
method is defined. [ruby-core:10646]
Tue Mar 20 21:36:47 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/shell.rb, lib/shell: support for ruby 1.9(YARV) thread model.
Tue Mar 20 16:36:08 2007 URABE Shyouhei <shyouhei@ruby-lang.org>
* distruby.rb: Add zip generation.
@ -1089,7 +1089,7 @@ Wed Mar 14 12:30:00 2007 Shigeo Kobayashi <shigeo@tinyforest.jp>
Tue Mar 13 19:04:30 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/sync.rb: support for ruby 1.9(YARV) thread model.
Tue Mar 13 09:25:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (clear-installed-list): separated from install-prereq.
@ -1172,9 +1172,9 @@ Thu Mar 8 09:17:59 2007 Minero Aoki <aamine@loveruby.net>
* vm_dump.c: ditto.
Tue Mar 6 16:35:04 2007 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/shell/process-controller.rb: fix thread synchronization problem for [ruby-dev:30477].
Tue Mar 6 11:53:25 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/sample/irbtkw.rbw: fails to exit process.
@ -2596,7 +2596,7 @@ Fri Jan 26 23:55:56 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: bug fix of WIN32OLE_VARIANT when variant
type is VT_BYREF|VT_VARIANT.
* test/win32ole/test_win32ole_variant_with_ie.rb: ditto.
Fri Jan 26 12:03:39 2007 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>

View file

@ -1106,7 +1106,8 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
char type = types[j];
/* printf("--> [%c - (%d-%d)]\n", type, k, j); */
switch (type) {
case TS_OFFSET:{
case TS_OFFSET:
{
/* label(destination position) */
lobj = (LABEL *)operands[j];
if (lobj->set != Qtrue) {
@ -1119,7 +1120,8 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
lobj->position - (pos + len);
break;
}
case TS_CDHASH:{
case TS_CDHASH:
{
/*
* [obj, label, ...]
*/
@ -1131,7 +1133,7 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
VALUE obj = rb_ary_entry(lits, i);
VALUE lv = rb_ary_entry(lits, i+1);
lobj = (LABEL *)(lv & ~1);
if (lobj->set != Qtrue) {
rb_bug("unknown label");
}
@ -1142,12 +1144,12 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
iseq_add_mark_object(iseq, map);
break;
}
case TS_LINDEX:
case TS_DINDEX:
case TS_NUM: /* ulong */
case TS_LINDEX:
case TS_DINDEX:
case TS_NUM: /* ulong */
generated_iseq[pos + 1 + j] = FIX2INT(operands[j]);
break;
case TS_ISEQ: /* iseq */
case TS_ISEQ: /* iseq */
{
VALUE v = operands[j];
rb_iseq_t *block = 0;
@ -1157,7 +1159,7 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
generated_iseq[pos + 1 + j] = (VALUE)block;
break;
}
case TS_VALUE: /* VALUE */
case TS_VALUE: /* VALUE */
{
VALUE v = operands[j];
generated_iseq[pos + 1 + j] = v;
@ -1167,24 +1169,24 @@ set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
}
break;
}
case TS_IC: /* inline cache */
case TS_IC: /* inline cache */
{
VALUE v = (VALUE)NEW_INLINE_CACHE_ENTRY();
generated_iseq[pos + 1 + j] = v;
iseq_add_mark_object(iseq, v);
break;
}
case TS_ID: /* ID */
case TS_ID: /* ID */
generated_iseq[pos + 1 + j] = SYM2ID(operands[j]);
break;
case TS_GENTRY:
case TS_GENTRY:
{
struct global_entry *entry =
(struct global_entry *)(operands[j] & (~1));
generated_iseq[pos + 1 + j] = (VALUE)entry;
}
break;
default:
default:
rb_bug("unknown operand type: %c", type);
return 0;
}
@ -2778,7 +2780,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
}
else if (nd_type(vals) == NODE_SPLAT || nd_type(vals) == NODE_ARGSCAT) {
NODE *val = vals->nd_head;
if (nd_type(vals) == NODE_ARGSCAT) {
NODE *vs = vals->nd_head;
val = vals->nd_body;
@ -3468,15 +3470,15 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
case NODE_OP_ASGN_OR:{
LABEL *lfin = NEW_LABEL(nd_line(node));
LABEL *lassign = NEW_LABEL(nd_line(node));
if (nd_type(node) == NODE_OP_ASGN_OR) {
defined_expr(iseq, ret, node->nd_head, lassign, Qfalse);
ADD_INSNL(ret, nd_line(node), branchunless, lassign);
}
COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
ADD_INSN(ret, nd_line(node), dup);
if (nd_type(node) == NODE_OP_ASGN_AND) {
ADD_INSNL(ret, nd_line(node), branchunless, lfin);
}
@ -4879,7 +4881,7 @@ iseq_build_from_ary(rb_iseq_t *iseq, VALUE line,
iseq->arg_block = FIX2INT(arg_block);
iseq->arg_opt_tbl = (VALUE *)ALLOC_N(VALUE, iseq->arg_opts);
for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) {
iseq->arg_opt_tbl[i] =
(VALUE)register_label(iseq, labels_table,

2
eval.c
View file

@ -1710,7 +1710,7 @@ eval(VALUE self, VALUE src, VALUE scope, char *file, int line)
VALUE iseqval;
if (scope != Qnil) {
if (CLASS_OF(scope) == rb_cBinding) {
GetBindingPtr(scope, bind);
envval = bind->env;

8
pack.c
View file

@ -1652,7 +1652,7 @@ pack_unpack(VALUE str, VALUE fmt)
}
PACK_ITEM_ADJUST();
break;
case 'E':
PACK_LENGTH_ADJUST(double,sizeof(double));
while (len-- > 0) {
@ -1666,7 +1666,7 @@ pack_unpack(VALUE str, VALUE fmt)
}
PACK_ITEM_ADJUST();
break;
case 'D':
case 'd':
PACK_LENGTH_ADJUST(double,sizeof(double));
@ -1692,7 +1692,7 @@ pack_unpack(VALUE str, VALUE fmt)
}
PACK_ITEM_ADJUST();
break;
case 'G':
PACK_LENGTH_ADJUST(double,sizeof(double));
while (len-- > 0) {
@ -1706,7 +1706,7 @@ pack_unpack(VALUE str, VALUE fmt)
}
PACK_ITEM_ADJUST();
break;
case 'U':
if (len > send - s) len = send - s;
while (len > 0 && s < send) {

View file

@ -7915,7 +7915,7 @@ arg_dup_check(ID vid, VALUE m, VALUE list, NODE *node)
ruby_sourceline = nd_line(node);
return 1;
}
rb_ary_push(list, sym);
rb_ary_push(list, sym);
return 0;
}

View file

@ -343,7 +343,7 @@ native_sleep(rb_thread_t *th, struct timeval *tv)
GVL_UNLOCK_BEGIN();
{
pthread_mutex_lock(&th->interrupt_lock);
if (th->interrupt_flag) {
/* interrupted. return immediate */
thread_debug("native_sleep: interrupted before sleep\n");

6
vm.c
View file

@ -126,13 +126,13 @@ pop_frame(rb_thread_t *th)
rb_control_frame_t *cfp = th->cfp;
cfp->prof_time_self = current_time - cfp->prof_time_self;
(cfp+1)->prof_time_chld += cfp->prof_time_self;
cfp->iseq->profile.count++;
cfp->iseq->profile.time_cumu = cfp->prof_time_self;
cfp->iseq->profile.time_self = cfp->prof_time_self - cfp->prof_time_chld;
}
else if (0 /* c method? */) {
}
#endif
th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
@ -1195,7 +1195,7 @@ eval_get_ev_const(rb_thread_t *th, rb_iseq_t *iseq,
while (cref && cref->nd_next) {
klass = cref->nd_clss;
cref = cref->nd_next;
if (klass == 0) {
continue;
}

View file

@ -584,7 +584,7 @@ yarv_bug(void)
if (GET_THREAD()->vm) {
int i;
SDR();
bt = th_backtrace(th, 0);
if (TYPE(bt) == T_ARRAY)
for (i = 0; i < RARRAY_LEN(bt); i++) {