diff options
Diffstat (limited to 'ext/-test-/st/foreach')
-rw-r--r-- | ext/-test-/st/foreach/depend | 5 | ||||
-rw-r--r-- | ext/-test-/st/foreach/foreach.c | 108 |
2 files changed, 57 insertions, 56 deletions
diff --git a/ext/-test-/st/foreach/depend b/ext/-test-/st/foreach/depend index 6128230798..36273f8df8 100644 --- a/ext/-test-/st/foreach/depend +++ b/ext/-test-/st/foreach/depend @@ -14,6 +14,7 @@ foreach.o: $(hdrdir)/ruby/backward/2/stdalign.h foreach.o: $(hdrdir)/ruby/backward/2/stdarg.h foreach.o: $(hdrdir)/ruby/defines.h foreach.o: $(hdrdir)/ruby/intern.h +foreach.o: $(hdrdir)/ruby/internal/abi.h foreach.o: $(hdrdir)/ruby/internal/anyargs.h foreach.o: $(hdrdir)/ruby/internal/arithmetic.h foreach.o: $(hdrdir)/ruby/internal/arithmetic/char.h @@ -51,6 +52,7 @@ foreach.o: $(hdrdir)/ruby/internal/attr/noexcept.h foreach.o: $(hdrdir)/ruby/internal/attr/noinline.h foreach.o: $(hdrdir)/ruby/internal/attr/nonnull.h foreach.o: $(hdrdir)/ruby/internal/attr/noreturn.h +foreach.o: $(hdrdir)/ruby/internal/attr/packed_struct.h foreach.o: $(hdrdir)/ruby/internal/attr/pure.h foreach.o: $(hdrdir)/ruby/internal/attr/restrict.h foreach.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -110,7 +112,6 @@ foreach.o: $(hdrdir)/ruby/internal/intern/enumerator.h foreach.o: $(hdrdir)/ruby/internal/intern/error.h foreach.o: $(hdrdir)/ruby/internal/intern/eval.h foreach.o: $(hdrdir)/ruby/internal/intern/file.h -foreach.o: $(hdrdir)/ruby/internal/intern/gc.h foreach.o: $(hdrdir)/ruby/internal/intern/hash.h foreach.o: $(hdrdir)/ruby/internal/intern/io.h foreach.o: $(hdrdir)/ruby/internal/intern/load.h @@ -141,12 +142,12 @@ foreach.o: $(hdrdir)/ruby/internal/memory.h foreach.o: $(hdrdir)/ruby/internal/method.h foreach.o: $(hdrdir)/ruby/internal/module.h foreach.o: $(hdrdir)/ruby/internal/newobj.h -foreach.o: $(hdrdir)/ruby/internal/rgengc.h foreach.o: $(hdrdir)/ruby/internal/scan_args.h foreach.o: $(hdrdir)/ruby/internal/special_consts.h foreach.o: $(hdrdir)/ruby/internal/static_assert.h foreach.o: $(hdrdir)/ruby/internal/stdalign.h foreach.o: $(hdrdir)/ruby/internal/stdbool.h +foreach.o: $(hdrdir)/ruby/internal/stdckdint.h foreach.o: $(hdrdir)/ruby/internal/symbol.h foreach.o: $(hdrdir)/ruby/internal/value.h foreach.o: $(hdrdir)/ruby/internal/value_type.h diff --git a/ext/-test-/st/foreach/foreach.c b/ext/-test-/st/foreach/foreach.c index 27ac18046f..7fbf064694 100644 --- a/ext/-test-/st/foreach/foreach.c +++ b/ext/-test-/st/foreach/foreach.c @@ -12,22 +12,22 @@ static void force_unpack_check(struct checker *c, st_data_t key, st_data_t val) { if (c->nr == 0) { - st_data_t i; + st_data_t i; - if (c->tbl->bins != NULL) rb_bug("should be packed\n"); + if (c->tbl->bins != NULL) rb_bug("should be packed"); - /* force unpacking during iteration: */ - for (i = 1; i < expect_size; i++) - st_add_direct(c->tbl, i, i); + /* force unpacking during iteration: */ + for (i = 1; i < expect_size; i++) + st_add_direct(c->tbl, i, i); - if (c->tbl->bins == NULL) rb_bug("should be unpacked\n"); + if (c->tbl->bins == NULL) rb_bug("should be unpacked"); } if (key != c->nr) { - rb_bug("unexpected key: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)key, (VALUE)c->nr); + rb_bug("unexpected key: %"PRIuVALUE" (expected %"PRIuVALUE")", (VALUE)key, (VALUE)c->nr); } if (val != c->nr) { - rb_bug("unexpected val: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)val, (VALUE)c->nr); + rb_bug("unexpected val: %"PRIuVALUE" (expected %"PRIuVALUE")", (VALUE)val, (VALUE)c->nr); } c->nr++; @@ -39,34 +39,34 @@ unp_fec_i(st_data_t key, st_data_t val, st_data_t args, int error) struct checker *c = (struct checker *)args; if (error) { - if (c->test == ID2SYM(rb_intern("delete2"))) - return ST_STOP; + if (c->test == ID2SYM(rb_intern("delete2"))) + return ST_STOP; - rb_bug("unexpected error"); + rb_bug("unexpected error"); } force_unpack_check(c, key, val); if (c->test == ID2SYM(rb_intern("check"))) { - return ST_CHECK; + return ST_CHECK; } if (c->test == ID2SYM(rb_intern("delete1"))) { - if (c->nr == 1) return ST_DELETE; - return ST_CHECK; + if (c->nr == 1) return ST_DELETE; + return ST_CHECK; } if (c->test == ID2SYM(rb_intern("delete2"))) { - if (c->nr == 1) { - st_data_t k = 0; - st_data_t v; - - if (!st_delete(c->tbl, &k, &v)) { - rb_bug("failed to delete\n"); - } - if (v != 0) { - rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v); - } - } - return ST_CHECK; + if (c->nr == 1) { + st_data_t k = 0; + st_data_t v; + + if (!st_delete(c->tbl, &k, &v)) { + rb_bug("failed to delete"); + } + if (v != 0) { + rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v); + } + } + return ST_CHECK; } rb_raise(rb_eArgError, "unexpected arg: %+"PRIsVALUE, c->test); @@ -84,21 +84,21 @@ unp_fec(VALUE self, VALUE test) st_add_direct(tbl, 0, 0); - if (tbl->bins != NULL) rb_bug("should still be packed\n"); + if (tbl->bins != NULL) rb_bug("should still be packed"); st_foreach_check(tbl, unp_fec_i, (st_data_t)&c, -1); if (c.test == ID2SYM(rb_intern("delete2"))) { - if (c.nr != 1) { - rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr); - } + if (c.nr != 1) { + rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)", (VALUE)c.nr); + } } else if (c.nr != expect_size) { - rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE")\n", - (VALUE)c.nr, (VALUE)expect_size); + rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE")", + (VALUE)c.nr, (VALUE)expect_size); } - if (tbl->bins == NULL) rb_bug("should be unpacked\n"); + if (tbl->bins == NULL) rb_bug("should be unpacked"); st_free_table(tbl); @@ -112,22 +112,22 @@ unp_fe_i(st_data_t key, st_data_t val, st_data_t args) force_unpack_check(c, key, val); if (c->test == ID2SYM(rb_intern("unpacked"))) { - return ST_CONTINUE; + return ST_CONTINUE; } else if (c->test == ID2SYM(rb_intern("unpack_delete"))) { - if (c->nr == 1) { - st_data_t k = 0; - st_data_t v; - - if (!st_delete(c->tbl, &k, &v)) { - rb_bug("failed to delete\n"); - } - if (v != 0) { - rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v); - } - return ST_CONTINUE; - } - rb_bug("should never get here\n"); + if (c->nr == 1) { + st_data_t k = 0; + st_data_t v; + + if (!st_delete(c->tbl, &k, &v)) { + rb_bug("failed to delete"); + } + if (v != 0) { + rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v); + } + return ST_CONTINUE; + } + rb_bug("should never get here"); } rb_raise(rb_eArgError, "unexpected arg: %+"PRIsVALUE, c->test); @@ -145,21 +145,21 @@ unp_fe(VALUE self, VALUE test) st_add_direct(tbl, 0, 0); - if (tbl->bins != NULL) rb_bug("should still be packed\n"); + if (tbl->bins != NULL) rb_bug("should still be packed"); st_foreach(tbl, unp_fe_i, (st_data_t)&c); if (c.test == ID2SYM(rb_intern("unpack_delete"))) { - if (c.nr != 1) { - rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr); - } + if (c.nr != 1) { + rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)", (VALUE)c.nr); + } } else if (c.nr != expect_size) { - rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE"o)\n", - (VALUE)c.nr, (VALUE)expect_size); + rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE"o)", + (VALUE)c.nr, (VALUE)expect_size); } - if (tbl->bins == NULL) rb_bug("should be unpacked\n"); + if (tbl->bins == NULL) rb_bug("should be unpacked"); st_free_table(tbl); |