diff options
Diffstat (limited to 'mrbgems')
| -rw-r--r-- | mrbgems/mruby-bin-debugger/bintest/print.rb | 10 | ||||
| -rw-r--r-- | mrbgems/mruby-complex/mrbgem.rake | 3 | ||||
| -rw-r--r-- | mrbgems/mruby-complex/mrblib/complex.rb | 10 | ||||
| -rw-r--r-- | mrbgems/mruby-io/README.md | 1 | ||||
| -rw-r--r-- | mrbgems/mruby-io/mrbgem.rake | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-io/src/file.c | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-io/src/file_test.c | 5 | ||||
| -rw-r--r-- | mrbgems/mruby-io/src/io.c | 13 | ||||
| -rw-r--r-- | mrbgems/mruby-io/test/mruby_io_test.c | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-metaprog/src/metaprog.c | 33 | ||||
| -rw-r--r-- | mrbgems/mruby-pack/README.md | 1 | ||||
| -rw-r--r-- | mrbgems/mruby-pack/mrbgem.rake | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-sleep/mrbgem.rake | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-sleep/src/mrb_sleep.c | 1 | ||||
| -rw-r--r-- | mrbgems/mruby-socket/README.md | 1 | ||||
| -rw-r--r-- | mrbgems/mruby-socket/mrbgem.rake | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-test/vformat.c | 320 |
17 files changed, 191 insertions, 222 deletions
diff --git a/mrbgems/mruby-bin-debugger/bintest/print.rb b/mrbgems/mruby-bin-debugger/bintest/print.rb index 6675392b8..314c7041a 100644 --- a/mrbgems/mruby-bin-debugger/bintest/print.rb +++ b/mrbgems/mruby-bin-debugger/bintest/print.rb @@ -90,8 +90,8 @@ assert('mruby-bin-debugger(print) error') do # test case tc = [] - tc << {:cmd=>"p (1+2", :exp=>'$1 = SyntaxError'} - tc << {:cmd=>"p bar", :exp=>'$2 = (eval):2: undefined method'} + tc << {:cmd=>"p (1+2", :exp=>'$1 = line 1: syntax error'} + tc << {:cmd=>"p bar", :exp=>'$2 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end @@ -588,7 +588,7 @@ SRC tc << {:cmd=>'p foo=[foo,bar,baz]', :exp=>'$2 = ["foo", "bar", "baz"]'} tc << {:cmd=>'p undefined=-1', :exp=>'$3 = -1'} - tc << {:cmd=>'p "#{undefined}"', :exp=>'$4 = (eval):2: undefined method'} + tc << {:cmd=>'p "#{undefined}"', :exp=>'$4 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end @@ -626,7 +626,7 @@ SRC tc << {:cmd=>'p [a,b]', :exp=>'$13 = [20, 10]'} tc << {:cmd=>'p undefined=-1', :exp=>'$14 = -1'} - tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = (eval):2: undefined method'} + tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end @@ -694,7 +694,7 @@ SRC tc << {:cmd=>'p [a,b]', :exp=>'$13 = [20, 10]'} tc << {:cmd=>'p undefined=-1', :exp=>'$14 = -1'} - tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = (eval):2: undefined method'} + tc << {:cmd=>'p "#{undefined}"', :exp=>'$15 = undefined method'} BinTest_MrubyBinDebugger.test(src, tc) end diff --git a/mrbgems/mruby-complex/mrbgem.rake b/mrbgems/mruby-complex/mrbgem.rake index 19612e74d..8f782ae18 100644 --- a/mrbgems/mruby-complex/mrbgem.rake +++ b/mrbgems/mruby-complex/mrbgem.rake @@ -3,8 +3,5 @@ MRuby::Gem::Specification.new('mruby-complex') do |spec| spec.author = 'mruby developers' spec.summary = 'Complex class' - spec.add_dependency 'mruby-metaprog', core: 'mruby-metaprog' - spec.add_dependency 'mruby-object-ext', core: 'mruby-object-ext' - spec.add_dependency 'mruby-numeric-ext', core: 'mruby-numeric-ext' spec.add_dependency 'mruby-math', core: 'mruby-math' end diff --git a/mrbgems/mruby-complex/mrblib/complex.rb b/mrbgems/mruby-complex/mrblib/complex.rb index f32b84c8b..ea8530919 100644 --- a/mrbgems/mruby-complex/mrblib/complex.rb +++ b/mrbgems/mruby-complex/mrblib/complex.rb @@ -8,7 +8,7 @@ class Complex < Numeric end def to_s - "#{real}#{'+' unless imaginary.negative?}#{imaginary}i" + "#{real}#{'+' unless imaginary < 0}#{imaginary}i" end def +@ @@ -56,7 +56,7 @@ class Complex < Numeric if rhs.is_a? Complex real == rhs.real && imaginary == rhs.imaginary elsif rhs.is_a? Numeric - imaginary.zero? && real == rhs + imaginary == 0 && real == rhs end end @@ -106,14 +106,14 @@ class Complex < Numeric [Fixnum, Float].each do |cls| [:+, :-, :*, :/, :==].each do |op| - cls.instance_exec do + cls.instance_eval do original_operator_name = "__original_operator_#{op}_complex" alias_method original_operator_name, op define_method op do |rhs| if rhs.is_a? Complex - Complex(self).send(op, rhs) + Complex(self).__send__(op, rhs) else - send(original_operator_name, rhs) + __send__(original_operator_name, rhs) end end end diff --git a/mrbgems/mruby-io/README.md b/mrbgems/mruby-io/README.md index ccf56f970..2c5b762d8 100644 --- a/mrbgems/mruby-io/README.md +++ b/mrbgems/mruby-io/README.md @@ -171,6 +171,7 @@ Add the line below to your `build_config.rb`: ## License Copyright (c) 2013 Internet Initiative Japan Inc. +Copyright (c) 2017 mruby developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/mrbgems/mruby-io/mrbgem.rake b/mrbgems/mruby-io/mrbgem.rake index e4f0b7bb6..bd20f6d20 100644 --- a/mrbgems/mruby-io/mrbgem.rake +++ b/mrbgems/mruby-io/mrbgem.rake @@ -1,6 +1,6 @@ MRuby::Gem::Specification.new('mruby-io') do |spec| spec.license = 'MIT' - spec.authors = 'Internet Initiative Japan Inc.' + spec.authors = ['Internet Initiative Japan Inc.', 'mruby developers'] spec.summary = 'IO and File class' spec.cc.include_paths << "#{build.root}/src" diff --git a/mrbgems/mruby-io/src/file.c b/mrbgems/mruby-io/src/file.c index f9ccb6148..673decc20 100644 --- a/mrbgems/mruby-io/src/file.c +++ b/mrbgems/mruby-io/src/file.c @@ -7,12 +7,7 @@ #include "mruby/data.h" #include "mruby/string.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/mrbgems/mruby-io/src/file_test.c b/mrbgems/mruby-io/src/file_test.c index 445bafde9..aadd1ac1c 100644 --- a/mrbgems/mruby-io/src/file_test.c +++ b/mrbgems/mruby-io/src/file_test.c @@ -7,12 +7,7 @@ #include "mruby/data.h" #include "mruby/string.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 5bc88e047..32128fa07 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -10,12 +10,7 @@ #include "mruby/string.h" #include "mruby/variable.h" #include "mruby/ext/io.h" - -#if MRUBY_RELEASE_NO < 10000 -#include "error.h" -#else #include "mruby/error.h" -#endif #include <sys/types.h> #include <sys/stat.h> @@ -66,14 +61,6 @@ static int mrb_io_modestr_to_flags(mrb_state *mrb, const char *modestr); static int mrb_io_flags_to_modenum(mrb_state *mrb, int flags); static void fptr_finalize(mrb_state *mrb, struct mrb_io *fptr, int quiet); -#if MRUBY_RELEASE_NO < 10000 -static struct RClass * -mrb_module_get(mrb_state *mrb, const char *name) -{ - return mrb_class_get(mrb, name); -} -#endif - static struct mrb_io * io_get_open_fptr(mrb_state *mrb, mrb_value self) { diff --git a/mrbgems/mruby-io/test/mruby_io_test.c b/mrbgems/mruby-io/test/mruby_io_test.c index f5c55499b..1c31c5fe0 100644 --- a/mrbgems/mruby-io/test/mruby_io_test.c +++ b/mrbgems/mruby-io/test/mruby_io_test.c @@ -18,7 +18,7 @@ typedef int mode_t; #define open _open #define close _close -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__MINGW32__) #include <sys/stat.h> static int diff --git a/mrbgems/mruby-metaprog/src/metaprog.c b/mrbgems/mruby-metaprog/src/metaprog.c index bca8ab34c..f00c4493b 100644 --- a/mrbgems/mruby-metaprog/src/metaprog.c +++ b/mrbgems/mruby-metaprog/src/metaprog.c @@ -172,7 +172,7 @@ mrb_local_variables(mrb_state *mrb, mrb_value self) KHASH_DECLARE(st, mrb_sym, char, FALSE) static void -method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set) +method_entry_loop(mrb_state *mrb, struct RClass *klass, khash_t(st) *set, khash_t(st) *undef) { khint_t i; @@ -181,20 +181,28 @@ method_entry_loop(mrb_state *mrb, struct RClass* klass, khash_t(st)* set) for (i=0;i<kh_end(h);i++) { if (kh_exist(h, i)) { mrb_method_t m = kh_value(h, i); - if (MRB_METHOD_UNDEF_P(m)) continue; - kh_put(st, mrb, set, kh_key(h, i)); + if (MRB_METHOD_UNDEF_P(m)) { + if (undef) { + kh_put(st, mrb, undef, kh_key(h, i)); + } + } + else if (undef == NULL || + kh_get(st, mrb, undef, kh_key(h, i)) == kh_end(undef)) { + kh_put(st, mrb, set, kh_key(h, i)); + } } } } static mrb_value -mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* klass, int obj) +mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass *klass, int obj) { khint_t i; mrb_value ary; mrb_bool prepended = FALSE; - struct RClass* oldklass; - khash_t(st)* set = kh_init(st, mrb); + struct RClass *oldklass; + khash_t(st) *set = kh_init(st, mrb); + khash_t(st) *undef = (recur ? kh_init(st, mrb) : NULL); if (!recur && (klass->flags & MRB_FL_CLASS_IS_PREPENDED)) { MRB_CLASS_ORIGIN(klass); @@ -203,7 +211,7 @@ mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* kl oldklass = 0; while (klass && (klass != oldklass)) { - method_entry_loop(mrb, klass, set); + method_entry_loop(mrb, klass, set, undef); if ((klass->tt == MRB_TT_ICLASS && !prepended) || (klass->tt == MRB_TT_SCLASS)) { } @@ -221,6 +229,7 @@ mrb_class_instance_method_list(mrb_state *mrb, mrb_bool recur, struct RClass* kl } } kh_destroy(st, mrb, set); + if (undef) kh_destroy(st, mrb, undef); return ary; } @@ -313,18 +322,19 @@ mrb_obj_singleton_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj) { khint_t i; mrb_value ary; - struct RClass* klass; - khash_t(st)* set = kh_init(st, mrb); + struct RClass *klass; + khash_t(st) *set = kh_init(st, mrb); + khash_t(st) *undef = (recur ? kh_init(st, mrb) : NULL); klass = mrb_class(mrb, obj); if (klass && (klass->tt == MRB_TT_SCLASS)) { - method_entry_loop(mrb, klass, set); + method_entry_loop(mrb, klass, set, undef); klass = klass->super; } if (recur) { while (klass && ((klass->tt == MRB_TT_SCLASS) || (klass->tt == MRB_TT_ICLASS))) { - method_entry_loop(mrb, klass, set); + method_entry_loop(mrb, klass, set, undef); klass = klass->super; } } @@ -336,6 +346,7 @@ mrb_obj_singleton_methods(mrb_state *mrb, mrb_bool recur, mrb_value obj) } } kh_destroy(st, mrb, set); + if (undef) kh_destroy(st, mrb, undef); return ary; } diff --git a/mrbgems/mruby-pack/README.md b/mrbgems/mruby-pack/README.md index 95733e2d5..c8a653fba 100644 --- a/mrbgems/mruby-pack/README.md +++ b/mrbgems/mruby-pack/README.md @@ -49,6 +49,7 @@ There is no dependency on other mrbgems. ## License Copyright (c) 2012 Internet Initiative Japan Inc. +Copyright (c) 2017 mruby developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/mrbgems/mruby-pack/mrbgem.rake b/mrbgems/mruby-pack/mrbgem.rake index 6e8375d1e..f1c0306b1 100644 --- a/mrbgems/mruby-pack/mrbgem.rake +++ b/mrbgems/mruby-pack/mrbgem.rake @@ -1,6 +1,6 @@ MRuby::Gem::Specification.new('mruby-pack') do |spec| spec.license = 'MIT' - spec.authors = 'Internet Initiative Japan Inc.' + spec.authors = ['Internet Initiative Japan Inc.', 'mruby developers'] spec.summary = 'Array#pack and String#unpack method' spec.cc.include_paths << "#{build.root}/src" diff --git a/mrbgems/mruby-sleep/mrbgem.rake b/mrbgems/mruby-sleep/mrbgem.rake index 8827b3580..7a303b81c 100644 --- a/mrbgems/mruby-sleep/mrbgem.rake +++ b/mrbgems/mruby-sleep/mrbgem.rake @@ -1,5 +1,5 @@ MRuby::Gem::Specification.new('mruby-sleep') do |spec| spec.license = 'MIT' - spec.authors = 'MATSUMOTO Ryosuke' + spec.authors = ['MATSUMOTO Ryosuke', 'mruby developers'] spec.version = '0.0.1' end diff --git a/mrbgems/mruby-sleep/src/mrb_sleep.c b/mrbgems/mruby-sleep/src/mrb_sleep.c index 3f8ef90cf..ac9b07e85 100644 --- a/mrbgems/mruby-sleep/src/mrb_sleep.c +++ b/mrbgems/mruby-sleep/src/mrb_sleep.c @@ -2,6 +2,7 @@ ** mrb_sleep - sleep methods for mruby ** ** Copyright (c) mod_mruby developers 2012- +** Copyright (c) mruby developers 2018 ** ** Permission is hereby granted, free of charge, to any person obtaining ** a copy of this software and associated documentation files (the diff --git a/mrbgems/mruby-socket/README.md b/mrbgems/mruby-socket/README.md index ceb50c651..947a24e9e 100644 --- a/mrbgems/mruby-socket/README.md +++ b/mrbgems/mruby-socket/README.md @@ -35,6 +35,7 @@ Date: Tue, 21 May 2013 04:31:30 GMT ## License Copyright (c) 2013 Internet Initiative Japan Inc. +Copyright (c) 2017 mruby developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/mrbgems/mruby-socket/mrbgem.rake b/mrbgems/mruby-socket/mrbgem.rake index b0894e095..24d6f953d 100644 --- a/mrbgems/mruby-socket/mrbgem.rake +++ b/mrbgems/mruby-socket/mrbgem.rake @@ -1,6 +1,6 @@ MRuby::Gem::Specification.new('mruby-socket') do |spec| spec.license = 'MIT' - spec.authors = 'Internet Initiative Japan' + spec.authors = ['Internet Initiative Japan', 'mruby developers'] spec.summary = 'standard socket class' spec.cc.include_paths << "#{build.root}/src" diff --git a/mrbgems/mruby-test/vformat.c b/mrbgems/mruby-test/vformat.c index 6984aaeb1..7775e1fd2 100644 --- a/mrbgems/mruby-test/vformat.c +++ b/mrbgems/mruby-test/vformat.c @@ -4,197 +4,177 @@ #include <mruby/data.h> #include <mruby/string.h> -#ifdef MRB_WITHOUT_FLOAT -typedef mrb_int mrb_float; -#define mrb_float(o) mrb_fixnum(o) +/* no argument */ +static mrb_value +vf_s_format_0(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str; + const char *fmt; + + mrb_get_args(mrb, "S", &fmt_str); + fmt = RSTRING_CSTR(mrb, fmt_str); + + return mrb_format(mrb, fmt); +} + +/* c char */ +static mrb_value +vf_s_format_c(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_str; + const char *fmt; + char c; + + mrb_get_args(mrb, "SS", &fmt_str, &arg_str); + fmt = RSTRING_CSTR(mrb, fmt_str); + c = RSTRING_CSTR(mrb, arg_str)[0]; + + return mrb_format(mrb, fmt, c); +} + +/* d int */ +static mrb_value +vf_s_format_d(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_int; + const char *fmt; + int d; + + mrb_get_args(mrb, "Si", &fmt_str, &arg_int); + fmt = RSTRING_CSTR(mrb, fmt_str); + d = mrb_fixnum(arg_int); + + return mrb_format(mrb, fmt, d); +} + +#ifndef MRB_WITHOUT_FLOAT +/* f float */ +static mrb_value +vf_s_format_f(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_flt; + const char *fmt; + mrb_float f; + + mrb_get_args(mrb, "Sf", &fmt_str, &arg_flt); + fmt = RSTRING_CSTR(mrb, fmt_str); + f = mrb_float(arg_flt); + + return mrb_format(mrb, fmt, f); +} #endif -#define NATIVE_TYPES \ - char c; \ - int d; \ - mrb_float f; \ - mrb_int i; \ -/* size_t l; */\ - mrb_sym n; \ - char *s; \ - struct RClass *C - -#define NATIVE_DEFINE_TYPE_FUNC(t) \ - static mrb_value \ - native_s_##t(mrb_state *mrb, mrb_value klass) \ - { \ - mrb_value obj, type = mrb_fixnum_value(ARG_##t); \ - mrb_get_args(mrb, "o", &obj); \ - return mrb_funcall(mrb, klass, "new", 2, type, obj); \ - } - -#define NATIVE_DEFINE_TYPE_METHOD(t) \ - mrb_define_class_method(mrb, n, #t, native_s_##t, MRB_ARGS_REQ(1)) - -typedef enum { - ARG_c, - ARG_d, - ARG_f, - ARG_i, -/* ARG_l,*/ - ARG_n, - ARG_s, - ARG_C, - ARG_v, -} VFArgumentType; - -typedef struct { - VFArgumentType type; - union { NATIVE_TYPES; }; -} VFNative; - -typedef struct { - VFArgumentType type; - union { - NATIVE_TYPES; - mrb_value v; - }; -} VFArgument; - -static void -native_free(mrb_state *mrb, void *data) +/* i fixnum */ +static mrb_value +vf_s_format_i(mrb_state *mrb, mrb_value klass) { - VFNative *native = (VFNative*)data; - if (native->type == ARG_s) mrb_free(mrb, native->s); - mrb_free(mrb, native); + mrb_value fmt_str, arg_int; + const char *fmt; + mrb_int i; + + mrb_get_args(mrb, "Si", &fmt_str, &arg_int); + fmt = RSTRING_CSTR(mrb, fmt_str); + i = mrb_fixnum(arg_int); + + return mrb_format(mrb, fmt, i); } -static const struct mrb_data_type native_data_type = { - "TestVFormat::Native", native_free -}; +/* l char*, size_t */ +static mrb_value +vf_s_format_l(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_str, arg_int; + const char *fmt; + const char *s; + size_t len; + + mrb_get_args(mrb, "SSi", &fmt_str, &arg_str, &arg_int); + fmt = RSTRING_CSTR(mrb, fmt_str); + s = RSTRING_PTR(arg_str); + len = (size_t)mrb_fixnum(arg_int); + if (len > (size_t)RSTRING_LEN(arg_str)) len = (size_t)RSTRING_LEN(arg_str); + + return mrb_format(mrb, fmt, s, len); +} +/* n symbol */ static mrb_value -native_initialize(mrb_state *mrb, mrb_value self) +vf_s_format_n(mrb_state *mrb, mrb_value klass) { - VFNative data, *datap; - mrb_int type; - mrb_value obj; - - mrb_get_args(mrb, "io", &type, &obj); - data.type = (VFArgumentType)type; - switch (data.type) { - case ARG_c: data.c = RSTRING_PTR(obj)[0]; break; - case ARG_d: data.d = (int)mrb_fixnum(obj); break; - case ARG_f: data.f = mrb_float(obj); break; - case ARG_i: data.i = mrb_fixnum(obj); break; -/* case ARG_l: data.l = (size_t)mrb_fixnum(obj); break;*/ - case ARG_n: data.n = mrb_symbol(obj); break; - case ARG_s: data.s = (char*)mrb_malloc(mrb, RSTRING_LEN(obj) + 1); - memcpy(data.s, RSTRING_PTR(obj), RSTRING_LEN(obj)); - data.s[RSTRING_LEN(obj)] = '\0'; break; - case ARG_C: data.C = mrb_class_ptr(obj); break; - default: mrb_raise(mrb, E_ARGUMENT_ERROR, "unknown type"); - } - datap = (VFNative*)mrb_malloc(mrb, sizeof(VFNative)); - *datap = data; - mrb_data_init(self, datap, &native_data_type); - return self; + mrb_value fmt_str, arg_sym; + const char *fmt; + mrb_sym n; + + mrb_get_args(mrb, "Sn", &fmt_str, &arg_sym); + fmt = RSTRING_CSTR(mrb, fmt_str); + n = mrb_symbol(arg_sym); + + return mrb_format(mrb, fmt, n); } -NATIVE_DEFINE_TYPE_FUNC(c) -NATIVE_DEFINE_TYPE_FUNC(d) -NATIVE_DEFINE_TYPE_FUNC(f) -NATIVE_DEFINE_TYPE_FUNC(i) -/*NATIVE_DEFINE_TYPE_FUNC(l)*/ -NATIVE_DEFINE_TYPE_FUNC(n) -NATIVE_DEFINE_TYPE_FUNC(s) -NATIVE_DEFINE_TYPE_FUNC(C) - -static VFArgument* -arg_from_obj(mrb_state *mrb, mrb_value obj, struct RClass *native_class, - VFArgument *vf_arg) +/* s char* */ +static mrb_value +vf_s_format_s(mrb_state *mrb, mrb_value klass) { - if (mrb_obj_is_instance_of(mrb, obj, native_class)) { - const VFNative *native = (VFNative*)DATA_PTR(obj); - *(VFNative*)vf_arg = *native; - } - else { - vf_arg->v = obj; - vf_arg->type = ARG_v; - } - return vf_arg; + mrb_value fmt_str, arg_str; + const char *fmt; + const char *s; + + mrb_get_args(mrb, "SS", &fmt_str, &arg_str); + fmt = RSTRING_CSTR(mrb, fmt_str); + s = RSTRING_CSTR(mrb, arg_str); + + return mrb_format(mrb, fmt, s); } -#define VF_FORMAT_INIT(klass) \ - struct RClass *vf_native_class = \ - mrb_class_get_under(mrb, mrb_class_ptr(klass), "Native"); \ - VFArgument vf_args[2]; - -#define VF_ARG(args, idx) \ - arg_from_obj(mrb, args[idx], vf_native_class, &vf_args[idx]) - -#define VF_FORMAT0(fmt) mrb_format(mrb, fmt); -#define VF_FORMAT1(fmt, args) \ - (VF_ARG(args, 0), VF_FORMAT_TYPED(fmt, 1, vf_args, NULL)) -#define VF_FORMAT2(fmt, args) ( \ - VF_ARG(args, 0), VF_ARG(args, 1), \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, c) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, d) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, f) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, i) : \ -/* VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, l) : */\ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, n) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, s) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, C) : \ - VF_FORMAT2_COND_EXPR(fmt, vf_args, vf_args+1, v) : \ - mrb_nil_value() /* not reached */ \ -) -#define VF_FORMAT2_COND_EXPR(fmt, a1, a2, t) \ - a1->type == ARG_##t ? VF_FORMAT_TYPED(fmt, 2, a2, (a1)->t) -#define VF_FORMAT_TYPED(fmt, n_arg, type_a, v1) \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, c) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, d) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, f) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, i) : \ -/* VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, l) : */\ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, n) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, s) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, C) : \ - VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, v) : \ - mrb_nil_value() /* not reached */ -#define VF_FORMAT_TYPED_COND_EXPR(fmt, n_arg, type_a, v1, t) \ - (type_a)->type == ARG_##t ? n_arg == 1 ? \ - mrb_format(mrb, fmt, (type_a)->t) : mrb_format(mrb, fmt, v1, (type_a)->t) +/* C RClass */ +static mrb_value +vf_s_format_C(mrb_state *mrb, mrb_value klass) +{ + mrb_value fmt_str, arg_cls; + const char *fmt; + struct RClass *c; + + mrb_get_args(mrb, "SC", &fmt_str, &arg_cls); + fmt = RSTRING_CSTR(mrb, fmt_str); + c = mrb_class_ptr(arg_cls); + return mrb_format(mrb, fmt, c); +} + +/* v value */ static mrb_value -vf_s_format(mrb_state *mrb, mrb_value klass) +vf_s_format_v(mrb_state *mrb, mrb_value klass) { - mrb_value fmt_str, args[2]; - mrb_int argc = mrb_get_args(mrb, "S|oo", &fmt_str, args, args+1); - const char *fmt = RSTRING_CSTR(mrb, fmt_str); - - VF_FORMAT_INIT(klass); - - switch (argc) { - case 1: return VF_FORMAT0(fmt); - case 2: return VF_FORMAT1(fmt, args); - case 3: return VF_FORMAT2(fmt, args); - default: return mrb_nil_value(); /* not reached */ - } + mrb_value fmt_str, arg_v; + const char *fmt; + + mrb_get_args(mrb, "So", &fmt_str, &arg_v); + fmt = RSTRING_CSTR(mrb, fmt_str); + + return mrb_format(mrb, fmt, arg_v); } void mrb_init_test_vformat(mrb_state *mrb) { - struct RClass *vf, *n; + struct RClass *vf; vf = mrb_define_module(mrb, "TestVFormat"); - mrb_define_class_method(mrb, vf, "format", vf_s_format, MRB_ARGS_ARG(1,2)); - - n = mrb_define_class_under(mrb, vf, "Native", mrb->object_class); - MRB_SET_INSTANCE_TT(n, MRB_TT_DATA); - NATIVE_DEFINE_TYPE_METHOD(c); - NATIVE_DEFINE_TYPE_METHOD(d); - NATIVE_DEFINE_TYPE_METHOD(f); - NATIVE_DEFINE_TYPE_METHOD(i); -/* NATIVE_DEFINE_TYPE_METHOD(l);*/ - NATIVE_DEFINE_TYPE_METHOD(n); - NATIVE_DEFINE_TYPE_METHOD(s); - NATIVE_DEFINE_TYPE_METHOD(C); - mrb_define_method(mrb, n, "initialize", native_initialize, MRB_ARGS_REQ(2)); + mrb_define_class_method(mrb, vf, "z", vf_s_format_0, MRB_ARGS_REQ(1)); + +#define VF_DEFINE_FORMAT_METHOD(t) VF_DEFINE_FORMAT_METHOD_n(t,2) +#define VF_DEFINE_FORMAT_METHOD_n(t,n) mrb_define_class_method(mrb, vf, #t, vf_s_format_##t, MRB_ARGS_REQ(n)); + + VF_DEFINE_FORMAT_METHOD(c); + VF_DEFINE_FORMAT_METHOD(d); +#ifndef MRB_WITHOUT_FLOAT + VF_DEFINE_FORMAT_METHOD(f); +#endif + VF_DEFINE_FORMAT_METHOD(i); + VF_DEFINE_FORMAT_METHOD_n(l,3); + VF_DEFINE_FORMAT_METHOD(n); + VF_DEFINE_FORMAT_METHOD(s); + VF_DEFINE_FORMAT_METHOD(C); + VF_DEFINE_FORMAT_METHOD(v); } |