diff --git a/mrbgems/mruby-array-ext/src/array.c b/mrbgems/mruby-array-ext/src/array.c index 4e13d9e76..6ab679c29 100644 --- a/mrbgems/mruby-array-ext/src/array.c +++ b/mrbgems/mruby-array-ext/src/array.c @@ -1537,7 +1537,6 @@ ary_combination_next(mrb_state *mrb, mrb_value self) } /* ---------------------------*/ -#ifndef MRB_NO_PRESYM #define ARRAY_EXT_ROM_MT_SIZE 29 static struct { union mt_ptr vals[ARRAY_EXT_ROM_MT_SIZE]; @@ -1610,46 +1609,13 @@ static mt_tbl array_ext_rom_mt = { ARRAY_EXT_ROM_MT_SIZE, ARRAY_EXT_ROM_MT_SIZE, (union mt_ptr*)&array_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_array_ext_gem_init(mrb_state* mrb) { struct RClass * a = mrb->array_class; -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(a, &array_ext_rom_mt); -#else - mrb_define_method_id(mrb, a, MRB_SYM(assoc), ary_assoc, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(at), ary_at, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(rassoc), ary_rassoc, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(values_at), ary_values_at, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, a, MRB_SYM_B(slice), ary_slice_bang, MRB_ARGS_ARG(1,1)); - mrb_define_method_id(mrb, a, MRB_SYM(compact), ary_compact, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, a, MRB_SYM_B(compact), ary_compact_bang, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, a, MRB_SYM(rotate), ary_rotate, MRB_ARGS_OPT(1)); - mrb_define_method_id(mrb, a, MRB_SYM_B(rotate), ary_rotate_bang, MRB_ARGS_OPT(1)); - mrb_define_method_id(mrb, a, MRB_OPSYM(sub), ary_sub, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(difference), ary_difference, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, a, MRB_OPSYM(or), ary_union, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(union), ary_union_multi, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, a, MRB_OPSYM(and), ary_intersection, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(intersection), ary_intersection_multi, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, a, MRB_SYM_Q(intersect), ary_intersect_p, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(__fill_parse_arg), ary_fill_parse_arg, MRB_ARGS_ARG(0,4)); - mrb_define_method_id(mrb, a, MRB_SYM(__fill_exec), ary_fill_exec, MRB_ARGS_REQ(3)); - mrb_define_method_id(mrb, a, MRB_SYM(__uniq), ary_uniq, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, a, MRB_SYM_B(__uniq), ary_uniq_bang, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, a, MRB_SYM(flatten), ary_flatten, MRB_ARGS_OPT(1)); - mrb_define_method_id(mrb, a, MRB_SYM_B(flatten), ary_flatten_bang, MRB_ARGS_OPT(1)); - mrb_define_method_id(mrb, a, MRB_SYM(__normalize_index), ary_normalize_index, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, a, MRB_SYM(__fetch), ary_fetch, MRB_ARGS_REQ(3)); - mrb_define_method_id(mrb, a, MRB_SYM(insert), ary_insert, MRB_ARGS_ARG(1, -1)); - mrb_define_method_id(mrb, a, MRB_SYM(deconstruct), ary_deconstruct, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, a, MRB_SYM(__product_group), ary_product_group, MRB_ARGS_REQ(4)); - mrb_define_method_id(mrb, a, MRB_SYM(__combination_init), ary_combination_init, MRB_ARGS_REQ(2)); - mrb_define_method_id(mrb, a, MRB_SYM(__combination_next), ary_combination_next, MRB_ARGS_REQ(1)); -#endif } void diff --git a/mrbgems/mruby-class-ext/src/class.c b/mrbgems/mruby-class-ext/src/class.c index 8c2f682b9..3f4070962 100644 --- a/mrbgems/mruby-class-ext/src/class.c +++ b/mrbgems/mruby-class-ext/src/class.c @@ -335,7 +335,6 @@ mrb_mod_cmp(mrb_state *mrb, mrb_value self) } /* ---------------------------*/ -#ifndef MRB_NO_PRESYM #define MOD_EXT_ROM_MT_SIZE 9 static struct { union mt_ptr vals[MOD_EXT_ROM_MT_SIZE]; @@ -387,7 +386,6 @@ static mt_tbl cls_ext_rom_mt = { CLS_EXT_ROM_MT_SIZE, CLS_EXT_ROM_MT_SIZE, (union mt_ptr*)&cls_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ /* * Initialize the mruby-class-ext gem. @@ -404,27 +402,8 @@ mrb_mruby_class_ext_gem_init(mrb_state *mrb) struct RClass *mod = mrb->module_class; struct RClass *cls = mrb->class_class; -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(mod, &mod_ext_rom_mt); mrb_mt_init_rom(cls, &cls_ext_rom_mt); -#else - /* Module methods */ - mrb_define_method_id(mrb, mod, MRB_SYM(name), mod_name, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, mod, MRB_SYM_Q(singleton_class), mod_singleton_class_p, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, mod, MRB_SYM(module_exec), mod_module_exec, MRB_ARGS_ANY()|MRB_ARGS_BLOCK()); - mrb_define_method_id(mrb, mod, MRB_SYM(class_exec), mod_module_exec, MRB_ARGS_ANY()|MRB_ARGS_BLOCK()); - - /* Module comparison operators */ - mrb_define_method_id(mrb, mod, MRB_OPSYM(lt), mrb_mod_lt, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, mod, MRB_OPSYM(le), mrb_mod_le, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, mod, MRB_OPSYM(gt), mrb_mod_gt, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, mod, MRB_OPSYM(ge), mrb_mod_ge, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, mod, MRB_OPSYM(cmp), mrb_mod_cmp, MRB_ARGS_REQ(1)); - - /* Class-specific methods */ - mrb_define_method_id(mrb, cls, MRB_SYM(subclasses), class_subclasses, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, cls, MRB_SYM(attached_object), class_attached_object, MRB_ARGS_NONE()); -#endif } void diff --git a/mrbgems/mruby-hash-ext/src/hash_ext.c b/mrbgems/mruby-hash-ext/src/hash_ext.c index 2a7264399..c7c41d9c7 100644 --- a/mrbgems/mruby-hash-ext/src/hash_ext.c +++ b/mrbgems/mruby-hash-ext/src/hash_ext.c @@ -367,7 +367,6 @@ hash_merge(mrb_state *mrb, mrb_value hash) return hash; } -#ifndef MRB_NO_PRESYM #define HASH_EXT_ROM_MT_SIZE 6 static struct { union mt_ptr vals[HASH_EXT_ROM_MT_SIZE]; @@ -394,7 +393,6 @@ static mt_tbl hash_ext_rom_mt = { HASH_EXT_ROM_MT_SIZE, HASH_EXT_ROM_MT_SIZE, (union mt_ptr*)&hash_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_hash_ext_gem_init(mrb_state *mrb) @@ -402,16 +400,7 @@ mrb_mruby_hash_ext_gem_init(mrb_state *mrb) struct RClass *h; h = mrb->hash_class; -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(h, &hash_ext_rom_mt); -#else - mrb_define_method_id(mrb, h, MRB_SYM(values_at), hash_values_at, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, h, MRB_SYM(slice), hash_slice, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, h, MRB_SYM_B(slice), hash_slice_bang, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, h, MRB_SYM(except), hash_except, MRB_ARGS_ANY()); - mrb_define_method_id(mrb, h, MRB_SYM(key), hash_key, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, h, MRB_SYM(__merge), hash_merge, MRB_ARGS_ANY()); -#endif mrb_define_class_method_id(mrb, h, MRB_OPSYM(aref), hash_s_create, MRB_ARGS_ANY()); } diff --git a/mrbgems/mruby-kernel-ext/src/kernel.c b/mrbgems/mruby-kernel-ext/src/kernel.c index e9e8f21f4..5854fae83 100644 --- a/mrbgems/mruby-kernel-ext/src/kernel.c +++ b/mrbgems/mruby-kernel-ext/src/kernel.c @@ -288,7 +288,6 @@ mrb_f_hash(mrb_state *mrb, mrb_value self) return arg; } -#ifndef MRB_NO_PRESYM #define KERNEL_EXT_ROM_MT_SIZE 7 static struct { union mt_ptr vals[KERNEL_EXT_ROM_MT_SIZE]; @@ -317,7 +316,6 @@ static mt_tbl kernel_ext_rom_mt = { KERNEL_EXT_ROM_MT_SIZE, KERNEL_EXT_ROM_MT_SIZE, (union mt_ptr*)&kernel_ext_rom_data, NULL }; -#endif void mrb_mruby_kernel_ext_gem_init(mrb_state *mrb) @@ -329,18 +327,7 @@ mrb_mruby_kernel_ext_gem_init(mrb_state *mrb) #endif /* Hash stays as runtime (depends on mrb_ensure_hash_type availability) */ mrb_define_private_method_id(mrb, krn, MRB_SYM(Hash), mrb_f_hash, MRB_ARGS_REQ(1)); -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(krn, &kernel_ext_rom_mt); -#else - mrb_define_private_method_id(mrb, krn, MRB_SYM(fail), mrb_f_raise, MRB_ARGS_OPT(2)); - mrb_define_private_method_id(mrb, krn, MRB_SYM(caller), mrb_f_caller, MRB_ARGS_OPT(2)); - mrb_define_private_method_id(mrb, krn, MRB_SYM(__method__), mrb_f_method, MRB_ARGS_NONE()); - mrb_define_private_method_id(mrb, krn, MRB_SYM(__callee__), mrb_f_callee, MRB_ARGS_NONE()); - mrb_define_private_method_id(mrb, krn, MRB_SYM(Integer), mrb_f_integer, MRB_ARGS_ARG(1,1)); - mrb_define_private_method_id(mrb, krn, MRB_SYM(String), mrb_f_string, MRB_ARGS_REQ(1)); - mrb_define_private_method_id(mrb, krn, MRB_SYM(Array), mrb_f_array, MRB_ARGS_REQ(1)); - mrb_define_private_method_id(mrb, krn, MRB_SYM(Hash), mrb_f_hash, MRB_ARGS_REQ(1)); -#endif } void diff --git a/mrbgems/mruby-numeric-ext/src/numeric_ext.c b/mrbgems/mruby-numeric-ext/src/numeric_ext.c index 6321a81eb..e2c4f7aa0 100644 --- a/mrbgems/mruby-numeric-ext/src/numeric_ext.c +++ b/mrbgems/mruby-numeric-ext/src/numeric_ext.c @@ -480,7 +480,6 @@ int_sqrt(mrb_state *mrb, mrb_value self) } } -#ifndef MRB_NO_PRESYM #define INTEGER_EXT_ROM_MT_SIZE 9 static struct { union mt_ptr vals[INTEGER_EXT_ROM_MT_SIZE]; @@ -513,7 +512,6 @@ static mt_tbl integer_ext_rom_mt = { INTEGER_EXT_ROM_MT_SIZE, INTEGER_EXT_ROM_MT_SIZE, (union mt_ptr*)&integer_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_numeric_ext_gem_init(mrb_state* mrb) @@ -521,19 +519,7 @@ mrb_mruby_numeric_ext_gem_init(mrb_state* mrb) struct RClass *ic = mrb->integer_class; mrb_define_alias_id(mrb, ic, MRB_SYM(modulo), MRB_OPSYM(mod)); -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(ic, &integer_ext_rom_mt); -#else - mrb_define_method_id(mrb, ic, MRB_SYM(remainder), int_remainder, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, ic, MRB_SYM(pow), int_powm, MRB_ARGS_ARG(1,1)); - mrb_define_method_id(mrb, ic, MRB_SYM(digits), int_digits, MRB_ARGS_OPT(1)); - mrb_define_method_id(mrb, ic, MRB_SYM(size), int_size, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, ic, MRB_SYM(bit_length), int_bit_length, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, ic, MRB_SYM_Q(odd), int_odd, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, ic, MRB_SYM_Q(even), int_even, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, ic, MRB_SYM(gcd), int_gcd, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, ic, MRB_SYM(lcm), int_lcm, MRB_ARGS_REQ(1)); -#endif mrb_define_class_method_id(mrb, ic, MRB_SYM(sqrt), int_sqrt, MRB_ARGS_REQ(1)); #ifndef MRB_NO_FLOAT diff --git a/mrbgems/mruby-object-ext/src/object.c b/mrbgems/mruby-object-ext/src/object.c index 31cf6e7fd..eb38b7584 100644 --- a/mrbgems/mruby-object-ext/src/object.c +++ b/mrbgems/mruby-object-ext/src/object.c @@ -97,7 +97,6 @@ obj_instance_exec(mrb_state *mrb, mrb_value self) return mrb_object_exec(mrb, self, mrb_singleton_class_ptr(mrb, self)); } -#ifndef MRB_NO_PRESYM #define NIL_EXT_ROM_MT_SIZE 3 static struct { union mt_ptr vals[NIL_EXT_ROM_MT_SIZE]; @@ -152,35 +151,20 @@ static mt_tbl bob_ext_rom_mt = { BOB_EXT_ROM_MT_SIZE, BOB_EXT_ROM_MT_SIZE, (union mt_ptr*)&bob_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_object_ext_gem_init(mrb_state* mrb) { struct RClass * n = mrb->nil_class; -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(n, &nil_ext_rom_mt); -#else - mrb_define_method_id(mrb, n, MRB_SYM(to_a), nil_to_a, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, n, MRB_SYM(to_h), nil_to_h, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, n, MRB_SYM(to_i), nil_to_i, MRB_ARGS_NONE()); -#endif #ifndef MRB_NO_FLOAT mrb_define_method_id(mrb, n, MRB_SYM(to_f), nil_to_f, MRB_ARGS_NONE()); #endif -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(mrb->kernel_module, &kernel_ext_rom_mt); -#else - mrb_define_method_id(mrb, mrb->kernel_module, MRB_SYM(itself), mrb_obj_itself, MRB_ARGS_NONE()); -#endif -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(mrb_class_get_id(mrb, MRB_SYM(BasicObject)), &bob_ext_rom_mt); -#else - mrb_define_method_id(mrb, mrb_class_get_id(mrb, MRB_SYM(BasicObject)), MRB_SYM(instance_exec), obj_instance_exec, MRB_ARGS_ANY() | MRB_ARGS_BLOCK()); -#endif } void diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c index aa92b9e9e..43e49324f 100644 --- a/mrbgems/mruby-proc-ext/src/proc.c +++ b/mrbgems/mruby-proc-ext/src/proc.c @@ -244,7 +244,6 @@ mrb_proc_parameters(mrb_state *mrb, mrb_value self) } /* ---------------------------*/ -#ifndef MRB_NO_PRESYM #define PROC_EXT_ROM_MT_SIZE 5 static struct { union mt_ptr vals[PROC_EXT_ROM_MT_SIZE]; @@ -286,25 +285,14 @@ static mt_tbl kernel_ext_rom_mt = { KERNEL_EXT_ROM_MT_SIZE, KERNEL_EXT_ROM_MT_SIZE, (union mt_ptr*)&kernel_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_proc_ext_gem_init(mrb_state* mrb) { struct RClass *p = mrb->proc_class; -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(p, &proc_ext_rom_mt); mrb_mt_init_rom(mrb->kernel_module, &kernel_ext_rom_mt); -#else - mrb_define_method_id(mrb, p, MRB_SYM_Q(lambda), proc_lambda_p, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, p, MRB_SYM(source_location), proc_source_location, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, p, MRB_SYM(to_s), proc_inspect, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, p, MRB_SYM(inspect), proc_inspect, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, p, MRB_SYM(parameters), mrb_proc_parameters, MRB_ARGS_NONE()); - - mrb_define_private_method_id(mrb, mrb->kernel_module, MRB_SYM(proc), kernel_proc, MRB_ARGS_NONE()|MRB_ARGS_BLOCK()); -#endif } void diff --git a/mrbgems/mruby-range-ext/src/range.c b/mrbgems/mruby-range-ext/src/range.c index 8de1663f6..68c761ec2 100644 --- a/mrbgems/mruby-range-ext/src/range.c +++ b/mrbgems/mruby-range-ext/src/range.c @@ -216,7 +216,6 @@ range_empty_p(mrb_state *mrb, mrb_value range) return mrb_bool_value(comp == -2 || comp > 0 || (comp == 0 && excl)); } -#ifndef MRB_NO_PRESYM #define RANGE_EXT_ROM_MT_SIZE 3 static struct { union mt_ptr vals[RANGE_EXT_ROM_MT_SIZE]; @@ -237,20 +236,13 @@ static mt_tbl range_ext_rom_mt = { RANGE_EXT_ROM_MT_SIZE, RANGE_EXT_ROM_MT_SIZE, (union mt_ptr*)&range_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_range_ext_gem_init(mrb_state* mrb) { struct RClass *s = mrb->range_class; -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(s, &range_ext_rom_mt); -#else - mrb_define_method_id(mrb, s, MRB_SYM_Q(cover), range_cover, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(size), range_size, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_Q(__empty_range), range_empty_p, MRB_ARGS_REQ(3)); -#endif } void diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index bf8166720..0eaf90bff 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -2219,7 +2219,6 @@ str_prepend(mrb_state *mrb, mrb_value self) } /* ---------------------------*/ -#ifndef MRB_NO_PRESYM #define STRING_EXT_ROM_MT_SIZE 53 static struct { union mt_ptr vals[STRING_EXT_ROM_MT_SIZE]; @@ -2357,77 +2356,14 @@ static mt_tbl integer_chr_rom_mt = { INTEGER_CHR_ROM_MT_SIZE, INTEGER_CHR_ROM_MT_SIZE, (union mt_ptr*)&integer_chr_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_string_ext_gem_init(mrb_state* mrb) { struct RClass *s = mrb->string_class; -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(s, &string_ext_rom_mt); mrb_mt_init_rom(mrb->integer_class, &integer_chr_rom_mt); -#else - mrb_define_method_id(mrb, s, MRB_SYM(dump), mrb_str_dump, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(swapcase), str_swapcase_bang, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(slice), mrb_str_slice_bang, MRB_ARGS_ARG(1, 1)); - mrb_define_method_id(mrb, s, MRB_SYM(swapcase), str_swapcase, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(clear), str_clear, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_OPSYM(lshift), str_concat_m, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(concat), str_concat_m, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(append_as_bytes), str_append_as_bytes, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(count), str_count, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(tr), str_tr_m, MRB_ARGS_REQ(2)); - mrb_define_method_id(mrb, s, MRB_SYM(partition), str_partition, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(rpartition), str_rpartition, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(insert), str_insert, MRB_ARGS_REQ(2)); - mrb_define_method_id(mrb, s, MRB_SYM(prepend), str_prepend, MRB_ARGS_REST()); - mrb_define_method_id(mrb, s, MRB_SYM_B(tr), str_tr_bang, MRB_ARGS_REQ(2)); - mrb_define_method_id(mrb, s, MRB_SYM(tr_s), str_tr_s, MRB_ARGS_REQ(2)); - mrb_define_method_id(mrb, s, MRB_SYM_B(tr_s), str_tr_s_bang, MRB_ARGS_REQ(2)); - mrb_define_method_id(mrb, s, MRB_SYM(squeeze), str_squeeze_m, MRB_ARGS_OPT(1)); - mrb_define_method_id(mrb, s, MRB_SYM_B(squeeze), str_squeeze_bang, MRB_ARGS_OPT(1)); - mrb_define_method_id(mrb, s, MRB_SYM(delete), str_delete_m, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM_B(delete), str_delete_bang, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM_Q(start_with), str_start_with, MRB_ARGS_REST()); - mrb_define_method_id(mrb, s, MRB_SYM_Q(end_with), str_end_with, MRB_ARGS_REST()); - mrb_define_method_id(mrb, s, MRB_SYM(hex), str_hex, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(oct), str_oct, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(chr), str_chr, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(succ), str_succ, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(succ), str_succ_bang, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(next), str_succ, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(next), str_succ_bang, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(ord), str_ord, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(delete_prefix), str_del_prefix_bang, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(delete_prefix), str_del_prefix, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM_B(delete_suffix), str_del_suffix_bang, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(delete_suffix), str_del_suffix, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM(casecmp), str_casecmp, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM_Q(casecmp), str_casecmp_p, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_OPSYM(plus), str_uplus, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_OPSYM(minus), str_uminus, MRB_ARGS_REQ(1)); - mrb_define_method_id(mrb, s, MRB_SYM_Q(ascii_only), str_ascii_only_p, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(b), str_b, MRB_ARGS_NONE()); - - mrb_define_method_id(mrb, s, MRB_SYM(__lines), str_lines, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(__codepoints), str_codepoints, MRB_ARGS_NONE()); - - mrb_define_method_id(mrb, s, MRB_SYM(lstrip), str_lstrip, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(rstrip), str_rstrip, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(strip), str_strip, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(lstrip), str_lstrip_bang, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(rstrip), str_rstrip_bang, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM_B(strip), str_strip_bang, MRB_ARGS_NONE()); - - mrb_define_method_id(mrb, s, MRB_SYM(__chars), str_chars_ary, MRB_ARGS_NONE()); - - mrb_define_method_id(mrb, s, MRB_SYM(ljust), str_ljust_core, MRB_ARGS_ARG(1,1)); - mrb_define_method_id(mrb, s, MRB_SYM(rjust), str_rjust_core, MRB_ARGS_ARG(1,1)); - mrb_define_method_id(mrb, s, MRB_SYM(center), str_center_core, MRB_ARGS_ARG(1,1)); - - mrb_define_method_id(mrb, mrb->integer_class, MRB_SYM(chr), int_chr, MRB_ARGS_OPT(1)); -#endif } void diff --git a/mrbgems/mruby-symbol-ext/src/symbol.c b/mrbgems/mruby-symbol-ext/src/symbol.c index 7efd60a49..019deb41e 100644 --- a/mrbgems/mruby-symbol-ext/src/symbol.c +++ b/mrbgems/mruby-symbol-ext/src/symbol.c @@ -58,7 +58,6 @@ mrb_sym_length(mrb_state *mrb, mrb_value self) return mrb_fixnum_value(len); } -#ifndef MRB_NO_PRESYM #define SYMBOL_EXT_ROM_MT_SIZE 2 static struct { union mt_ptr vals[SYMBOL_EXT_ROM_MT_SIZE]; @@ -77,7 +76,6 @@ static mt_tbl symbol_ext_rom_mt = { SYMBOL_EXT_ROM_MT_SIZE, SYMBOL_EXT_ROM_MT_SIZE, (union mt_ptr*)&symbol_ext_rom_data, NULL }; -#endif /* !MRB_NO_PRESYM */ void mrb_mruby_symbol_ext_gem_init(mrb_state* mrb) @@ -86,12 +84,7 @@ mrb_mruby_symbol_ext_gem_init(mrb_state* mrb) #ifdef MRB_USE_ALL_SYMBOLS mrb_define_class_method_id(mrb, s, MRB_SYM(all_symbols), mrb_sym_all_symbols, MRB_ARGS_NONE()); #endif -#ifndef MRB_NO_PRESYM mrb_mt_init_rom(s, &symbol_ext_rom_mt); -#else - mrb_define_method_id(mrb, s, MRB_SYM(length), mrb_sym_length, MRB_ARGS_NONE()); - mrb_define_method_id(mrb, s, MRB_SYM(size), mrb_sym_length, MRB_ARGS_NONE()); -#endif } void