From b70d69de09130ce2bc89289b4826b3deea8afaae Mon Sep 17 00:00:00 2001 From: YAMAMOTO Masaya Date: Mon, 16 Oct 2017 18:15:47 +0900 Subject: Support MRB_WIHTOUT_FLOAT to mruby-kernel-ext --- mrbgems/mruby-kernel-ext/src/kernel.c | 4 ++++ mrbgems/mruby-kernel-ext/test/kernel.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'mrbgems/mruby-kernel-ext') diff --git a/mrbgems/mruby-kernel-ext/src/kernel.c b/mrbgems/mruby-kernel-ext/src/kernel.c index 7e6fa28bd..33abe1531 100644 --- a/mrbgems/mruby-kernel-ext/src/kernel.c +++ b/mrbgems/mruby-kernel-ext/src/kernel.c @@ -114,6 +114,7 @@ mrb_f_integer(mrb_state *mrb, mrb_value self) return mrb_convert_to_integer(mrb, arg, base); } +#ifndef MRB_WITHOUT_FLOAT /* * call-seq: * Float(arg) -> float @@ -134,6 +135,7 @@ mrb_f_float(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "o", &arg); return mrb_Float(mrb, arg); } +#endif /* * call-seq: @@ -231,7 +233,9 @@ mrb_mruby_kernel_ext_gem_init(mrb_state *mrb) mrb_define_module_function(mrb, krn, "caller", mrb_f_caller, MRB_ARGS_OPT(2)); mrb_define_method(mrb, krn, "__method__", mrb_f_method, MRB_ARGS_NONE()); mrb_define_module_function(mrb, krn, "Integer", mrb_f_integer, MRB_ARGS_ANY()); +#ifndef MRB_WITHOUT_FLOAT mrb_define_module_function(mrb, krn, "Float", mrb_f_float, MRB_ARGS_REQ(1)); +#endif mrb_define_module_function(mrb, krn, "String", mrb_f_string, MRB_ARGS_REQ(1)); mrb_define_module_function(mrb, krn, "Array", mrb_f_array, MRB_ARGS_REQ(1)); mrb_define_module_function(mrb, krn, "Hash", mrb_f_hash, MRB_ARGS_REQ(1)); diff --git a/mrbgems/mruby-kernel-ext/test/kernel.rb b/mrbgems/mruby-kernel-ext/test/kernel.rb index 89cedaf27..206b7ac74 100644 --- a/mrbgems/mruby-kernel-ext/test/kernel.rb +++ b/mrbgems/mruby-kernel-ext/test/kernel.rb @@ -49,7 +49,7 @@ assert('Kernel#__method__') do end assert('Kernel#Integer') do - assert_equal(123, Integer(123.999)) + assert_equal(123, Integer(123.999)) if class_defined?("Float") assert_equal(26, Integer("0x1a")) assert_equal(930, Integer("0930", 10)) assert_equal(7, Integer("111", 2)) @@ -63,7 +63,7 @@ assert('Kernel#Float') do assert_equal(123.456, Float(123.456)) assert_equal(123.456, Float("123.456")) assert_raise(TypeError) { Float(nil) } -end +end if class_defined?("Float") assert('Kernel#String') do assert_equal("main", String(self)) -- cgit v1.2.3