From 65e802f769eb324da62541b299e93e87a3b4dbce Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 15 Aug 2013 01:49:37 +0900 Subject: remove Class#alloc method --- src/class.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/class.c b/src/class.c index b5c561d06..5b6ae6a12 100644 --- a/src/class.c +++ b/src/class.c @@ -1886,7 +1886,6 @@ mrb_init_class(mrb_state *mrb) mrb_define_method(mrb, bob, "method_missing", mrb_bob_missing, MRB_ARGS_ANY()); /* 15.3.1.3.30 */ mrb_define_class_method(mrb, cls, "new", mrb_class_new_class, MRB_ARGS_ANY()); - mrb_define_method(mrb, cls, "alloc", mrb_instance_alloc, MRB_ARGS_NONE()); mrb_define_method(mrb, cls, "superclass", mrb_class_superclass, MRB_ARGS_NONE()); /* 15.2.3.3.4 */ mrb_define_method(mrb, cls, "new", mrb_instance_new, MRB_ARGS_ANY()); /* 15.2.3.3.3 */ mrb_define_method(mrb, cls, "inherited", mrb_bob_init, MRB_ARGS_REQ(1)); -- cgit v1.2.3 From de5f5732fe222858e629f62aedaf6d32d14f167d Mon Sep 17 00:00:00 2001 From: Frederick John Milens III Date: Thu, 22 Aug 2013 16:37:42 -0500 Subject: Added test case for String#start_with? with string of length 1. --- mrbgems/mruby-string-ext/test/string.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/mrbgems/mruby-string-ext/test/string.rb b/mrbgems/mruby-string-ext/test/string.rb index 9eb6f6aaa..79e4360b5 100644 --- a/mrbgems/mruby-string-ext/test/string.rb +++ b/mrbgems/mruby-string-ext/test/string.rb @@ -104,6 +104,7 @@ end assert('String#start_with?') do assert_true "hello".start_with?("heaven", "hell") assert_true !"hello".start_with?("heaven", "paradise") + assert_true !"h".start_with?("heaven", "hell") end assert('String#end_with?') do -- cgit v1.2.3 From 28211d677173c8279cfa8b89dd7df31ec30ee1c3 Mon Sep 17 00:00:00 2001 From: Frederick John Milens III Date: Thu, 22 Aug 2013 16:44:00 -0500 Subject: Fix for string-length-related issue in String#start_with? logic. --- mrbgems/mruby-string-ext/src/string.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index edebcecbc..9763794f4 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -107,6 +107,7 @@ mrb_str_concat2(mrb_state *mrb, mrb_value self) * # returns true if one of the prefixes matches. * "hello".start_with?("heaven", "hell") #=> true * "hello".start_with?("heaven", "paradise") #=> false + * "h".start_with?("heaven", "hell") #=> false */ static mrb_value mrb_str_start_with(mrb_state *mrb, mrb_value self) @@ -119,10 +120,12 @@ mrb_str_start_with(mrb_state *mrb, mrb_value self) size_t len_l, len_r, len_cmp; len_l = RSTRING_LEN(self); len_r = RSTRING_LEN(argv[i]); - len_cmp = (len_l > len_r) ? len_r : len_l; - if (memcmp(RSTRING_PTR(self), RSTRING_PTR(argv[i]), len_cmp) == 0) { - return mrb_true_value(); - } + if (len_l >= len_r) { + len_cmp = (len_l > len_r) ? len_r : len_l; + if (memcmp(RSTRING_PTR(self), RSTRING_PTR(argv[i]), len_cmp) == 0) { + return mrb_true_value(); + } + } } return mrb_false_value(); } -- cgit v1.2.3 From d42427870b6c558c43f5bcc876e373b7411ef0e9 Mon Sep 17 00:00:00 2001 From: Frederick John Milens III Date: Thu, 22 Aug 2013 18:41:23 -0500 Subject: Added test case for String#end_with? with string of length 2. --- mrbgems/mruby-string-ext/test/string.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/mrbgems/mruby-string-ext/test/string.rb b/mrbgems/mruby-string-ext/test/string.rb index 9eb6f6aaa..ee887a120 100644 --- a/mrbgems/mruby-string-ext/test/string.rb +++ b/mrbgems/mruby-string-ext/test/string.rb @@ -109,4 +109,5 @@ end assert('String#end_with?') do assert_true "string".end_with?("ing", "mng") assert_true !"string".end_with?("str", "tri") + assert_true !"ng".end_with?("ing", "mng") end -- cgit v1.2.3 From a0183b394a699224a6451deb9762b8806799aea7 Mon Sep 17 00:00:00 2001 From: Frederick John Milens III Date: Thu, 22 Aug 2013 18:55:07 -0500 Subject: Fix for string-length-related issue in String#end_with? logic. --- mrbgems/mruby-string-ext/src/string.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index edebcecbc..e2ba24d1b 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -144,12 +144,14 @@ mrb_str_end_with(mrb_state *mrb, mrb_value self) size_t len_l, len_r, len_cmp; len_l = RSTRING_LEN(self); len_r = RSTRING_LEN(argv[i]); - len_cmp = (len_l > len_r) ? len_r : len_l; - if (memcmp(RSTRING_PTR(self) + (len_l - len_cmp), - RSTRING_PTR(argv[i]) + (len_r - len_cmp), - len_cmp) == 0) { - return mrb_true_value(); - } + if (len_l >= len_r) { + len_cmp = (len_l > len_r) ? len_r : len_l; + if (memcmp(RSTRING_PTR(self) + (len_l - len_cmp), + RSTRING_PTR(argv[i]) + (len_r - len_cmp), + len_cmp) == 0) { + return mrb_true_value(); + } + } } return mrb_false_value(); } -- cgit v1.2.3 From d682be9d328227aff3597ddb40cb21ecb5816f1d Mon Sep 17 00:00:00 2001 From: Frederick John Milens III Date: Thu, 22 Aug 2013 19:23:53 -0500 Subject: Refactor of String#end_with? comparison logic. --- mrbgems/mruby-string-ext/src/string.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index e2ba24d1b..4f8f87949 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -141,14 +141,13 @@ mrb_str_end_with(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "*", &argv, &argc); for (i = 0; i < argc; i++) { - size_t len_l, len_r, len_cmp; + size_t len_l, len_r; len_l = RSTRING_LEN(self); len_r = RSTRING_LEN(argv[i]); if (len_l >= len_r) { - len_cmp = (len_l > len_r) ? len_r : len_l; - if (memcmp(RSTRING_PTR(self) + (len_l - len_cmp), - RSTRING_PTR(argv[i]) + (len_r - len_cmp), - len_cmp) == 0) { + if (memcmp(RSTRING_PTR(self) + (len_l - len_r), + RSTRING_PTR(argv[i]), + len_r) == 0) { return mrb_true_value(); } } -- cgit v1.2.3 From 2548569f60a9e64843f9da04cb497d268af33082 Mon Sep 17 00:00:00 2001 From: Frederick John Milens III Date: Thu, 22 Aug 2013 19:29:36 -0500 Subject: Refactor of String#start_with? comparison logic. --- mrbgems/mruby-string-ext/src/string.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 9763794f4..33ed3095b 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -117,12 +117,11 @@ mrb_str_start_with(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "*", &argv, &argc); for (i = 0; i < argc; i++) { - size_t len_l, len_r, len_cmp; + size_t len_l, len_r; len_l = RSTRING_LEN(self); len_r = RSTRING_LEN(argv[i]); if (len_l >= len_r) { - len_cmp = (len_l > len_r) ? len_r : len_l; - if (memcmp(RSTRING_PTR(self), RSTRING_PTR(argv[i]), len_cmp) == 0) { + if (memcmp(RSTRING_PTR(self), RSTRING_PTR(argv[i]), len_r) == 0) { return mrb_true_value(); } } -- cgit v1.2.3 From 23df879a81161a0b87721f422ca7e68f63f6746e Mon Sep 17 00:00:00 2001 From: h2so5 Date: Sat, 24 Aug 2013 06:49:58 +0900 Subject: Fix a problem of 'z' option and shared string --- src/class.c | 7 ++++++- src/string.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/class.c b/src/class.c index b5c561d06..df034737e 100644 --- a/src/class.c +++ b/src/class.c @@ -489,14 +489,19 @@ mrb_get_args(mrb_state *mrb, const char *format, ...) mrb_value ss; struct RString *s; char **ps; + mrb_int len; ps = va_arg(ap, char**); if (i < argc) { ss = to_str(mrb, *sp++); s = mrb_str_ptr(ss); - if ((mrb_int)strlen(s->ptr) < s->len) { + len = (mrb_int)strlen(s->ptr); + if (len < s->len) { mrb_raise(mrb, E_ARGUMENT_ERROR, "String contains NUL"); } + else if (len > s->len) { + mrb_str_modify(mrb, s); + } *ps = s->ptr; i++; } diff --git a/src/string.c b/src/string.c index 2004c9fe8..88dcfc63e 100644 --- a/src/string.c +++ b/src/string.c @@ -62,6 +62,7 @@ mrb_str_modify(mrb_state *mrb, struct RString *s) if (shared->refcnt == 1 && s->ptr == shared->ptr) { s->ptr = shared->ptr; s->aux.capa = shared->len; + s->ptr[s->len] = '\0'; mrb_free(mrb, shared); } else { -- cgit v1.2.3 From 7007ce7ce0aa4b18fac346bcbf5f9f73c50039ea Mon Sep 17 00:00:00 2001 From: wanabe Date: Sun, 25 Aug 2013 01:16:31 +0900 Subject: add Exception#backtrace --- src/backtrace.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++------ src/error.c | 3 ++ 2 files changed, 88 insertions(+), 9 deletions(-) diff --git a/src/backtrace.c b/src/backtrace.c index e05ad4326..d0574fda6 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -7,18 +7,70 @@ #include "mruby.h" #include "mruby/variable.h" #include "mruby/proc.h" +#include "mruby/array.h" +#include "mruby/string.h" +#include -void -mrb_print_backtrace(mrb_state *mrb) +typedef void (*output_stream_func)(mrb_state*, void*, int, const char*, ...); + +static void +print_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) +{ + va_list ap; + + va_start(ap, format); + vfprintf((FILE*)stream, format, ap); + va_end(ap); +} + +#define MIN_BUFSIZE 127 + +static void +get_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) +{ + va_list ap; + mrb_value ary; + int len, ai; + + if (level > 0) { + return; + } + + ai = mrb_gc_arena_save(mrb); + ary = mrb_obj_value((struct RArray*)stream); + va_start(ap, format); + len = vsnprintf(NULL, 0, format, ap); + va_end(ap); + + if (len < MIN_BUFSIZE) { + char buf[MIN_BUFSIZE + 1]; + + va_start(ap, format); + vsnprintf(buf, MIN_BUFSIZE, format, ap); + va_end(ap); + mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); + } + else { + char *buf = (char*)mrb_alloca(mrb, len + 1); + + va_start(ap, format); + vsnprintf(buf, len, format, ap); + va_end(ap); + mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); + } + mrb_gc_arena_restore(mrb, ai); +} + +static void +mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func func, void *stream) { -#ifdef ENABLE_STDIO mrb_callinfo *ci; mrb_int ciidx; const char *filename, *method, *sep; int i, line; - fputs("trace:\n", stderr); - ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern2(mrb, "ciidx", 5))); + func(mrb, stream, 1, "trace:\n"); + ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "ciidx", 5))); if (ciidx >= mrb->c->ciend - mrb->c->cibase) ciidx = 10; /* ciidx is broken... */ @@ -41,7 +93,7 @@ mrb_print_backtrace(mrb_state *mrb) pc = mrb->c->cibase[i+1].pc; } else { - pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6))); + pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "lastpc", 6))); } if (irep->iseq <= pc && pc < irep->iseq + irep->ilen) { line = irep->lines[pc - irep->iseq - 1]; @@ -59,15 +111,39 @@ mrb_print_backtrace(mrb_state *mrb) const char *cn = mrb_class_name(mrb, ci->proc->target_class); if (cn) { - fprintf(stderr, "\t[%d] %s:%d:in %s%s%s\n", i, filename, line, cn, sep, method); + func(mrb, stream, 1, "\t[%d] ", i); + func(mrb, stream, 0, "%s:%d:in %s%s%s", filename, line, cn, sep, method); + func(mrb, stream, 1, "\n"); } else { - fprintf(stderr, "\t[%d] %s:%d:in %s\n", i, filename, line, method); + func(mrb, stream, 1, "\t[%d] ", i); + func(mrb, stream, 0, "%s:%d:in %s", filename, line, method); + func(mrb, stream, 1, "\n"); } } else { - fprintf(stderr, "\t[%d] %s:%d\n", i, filename, line); + func(mrb, stream, 1, "\t[%d] ", i); + func(mrb, stream, 0, "%s:%d", filename, line); + func(mrb, stream, 1, "\n"); } } +} + +void +mrb_print_backtrace(mrb_state *mrb) +{ +#ifdef ENABLE_STDIO + mrb_output_backtrace(mrb, mrb->exc, print_backtrace_i, stderr); #endif } + +mrb_value +mrb_get_backtrace(mrb_state *mrb, mrb_value self) +{ + mrb_value ary; + + ary = mrb_ary_new(mrb); + mrb_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, mrb_ary_ptr(ary)); + + return ary; +} diff --git a/src/error.c b/src/error.c index 98b49ad82..03f587a38 100644 --- a/src/error.c +++ b/src/error.c @@ -435,6 +435,8 @@ mrb_sys_fail(mrb_state *mrb, const char *mesg) } } +mrb_value mrb_get_backtrace(mrb_state*, mrb_value); + void mrb_init_exception(mrb_state *mrb) { @@ -448,6 +450,7 @@ mrb_init_exception(mrb_state *mrb) mrb_define_method(mrb, e, "to_s", exc_to_s, MRB_ARGS_NONE()); mrb_define_method(mrb, e, "message", exc_message, MRB_ARGS_NONE()); mrb_define_method(mrb, e, "inspect", exc_inspect, MRB_ARGS_NONE()); + mrb_define_method(mrb, e, "backtrace", mrb_get_backtrace, MRB_ARGS_NONE()); mrb->eStandardError_class = mrb_define_class(mrb, "StandardError", mrb->eException_class); /* 15.2.23 */ mrb_define_class(mrb, "RuntimeError", mrb->eStandardError_class); /* 15.2.28 */ -- cgit v1.2.3 From dd4b7ead7eaaed8def165c1e79e48fe319685376 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 26 Aug 2013 16:00:37 +0900 Subject: undef print_backtrace_i() unless ENABLE_STDIO --- src/backtrace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/backtrace.c b/src/backtrace.c index d0574fda6..acddc2c42 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -13,6 +13,7 @@ typedef void (*output_stream_func)(mrb_state*, void*, int, const char*, ...); +#ifdef ENABLE_STDIO static void print_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) { @@ -22,6 +23,7 @@ print_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, . vfprintf((FILE*)stream, format, ap); va_end(ap); } +#endif #define MIN_BUFSIZE 127 -- cgit v1.2.3 From f18837886ca0b41e3ee54df0655ee332eca22e3f Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 26 Aug 2013 16:10:42 +0900 Subject: add cast to void* --- src/backtrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backtrace.c b/src/backtrace.c index acddc2c42..a70330add 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -135,7 +135,7 @@ void mrb_print_backtrace(mrb_state *mrb) { #ifdef ENABLE_STDIO - mrb_output_backtrace(mrb, mrb->exc, print_backtrace_i, stderr); + mrb_output_backtrace(mrb, mrb->exc, print_backtrace_i, (void*)stderr); #endif } @@ -145,7 +145,7 @@ mrb_get_backtrace(mrb_state *mrb, mrb_value self) mrb_value ary; ary = mrb_ary_new(mrb); - mrb_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, mrb_ary_ptr(ary)); + mrb_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, (void*)mrb_ary_ptr(ary)); return ary; } -- cgit v1.2.3 From f3c8cf673556ad6420dbe4e21ee532b1a68b3301 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 26 Aug 2013 16:33:27 +0900 Subject: do not use mrb_alloca() that keeps memory until mrb_state freed --- src/backtrace.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/backtrace.c b/src/backtrace.c index a70330add..77906e843 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -31,7 +31,7 @@ static void get_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) { va_list ap; - mrb_value ary; + mrb_value ary, str; int len, ai; if (level > 0) { @@ -42,24 +42,10 @@ get_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ... ary = mrb_obj_value((struct RArray*)stream); va_start(ap, format); len = vsnprintf(NULL, 0, format, ap); + str = mrb_str_new(mrb, 0, len); + vsnprintf(RSTRING_PTR(str), len, format, ap); + mrb_ary_push(mrb, ary, str); va_end(ap); - - if (len < MIN_BUFSIZE) { - char buf[MIN_BUFSIZE + 1]; - - va_start(ap, format); - vsnprintf(buf, MIN_BUFSIZE, format, ap); - va_end(ap); - mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); - } - else { - char *buf = (char*)mrb_alloca(mrb, len + 1); - - va_start(ap, format); - vsnprintf(buf, len, format, ap); - va_end(ap); - mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); - } mrb_gc_arena_restore(mrb, ai); } -- cgit v1.2.3 From b6ab216f970757c6f7a8edd5f141b555c2eef157 Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Mon, 26 Aug 2013 17:56:49 +0900 Subject: support file extension .cpp/.cxx in mrbgem and tool --- Rakefile | 4 ++-- tasks/mrbgem_spec.rake | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Rakefile b/Rakefile index 0902cb330..c230a5f2f 100644 --- a/Rakefile +++ b/Rakefile @@ -41,7 +41,7 @@ depfiles = MRuby.targets['host'].bins.map do |bin| FileUtils.rm_f t.name, { :verbose => $verbose } FileUtils.cp t.prerequisites.first, t.name, { :verbose => $verbose } end - + install_path end @@ -53,7 +53,7 @@ MRuby.each_target do |target| gem.bins.each do |bin| exec = exefile("#{build_dir}/bin/#{bin}") - objs = Dir.glob("#{current_dir}/tools/#{bin}/*.c").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) } + objs = Dir.glob("#{current_dir}/tools/#{bin}/*.{c,cpp,cxx}").map { |f| objfile(f.pathmap("#{current_build_dir}/tools/#{bin}/%n")) } file exec => objs + [libfile("#{build_dir}/lib/libmruby")] do |t| gem_flags = gems.map { |g| g.linker.flags } diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake index 3363b4885..6ff4286ce 100644 --- a/tasks/mrbgem_spec.rake +++ b/tasks/mrbgem_spec.rake @@ -6,7 +6,7 @@ module MRuby class << self attr_accessor :current end - LinkerConfig = Struct.new(:libraries, :library_paths, :flags, :flags_before_libraries, :flags_after_libraries) + LinkerConfig = Struct.new(:libraries, :library_paths, :flags, :flags_before_libraries, :flags_after_libraries) class Specification include Rake::DSL @@ -53,13 +53,13 @@ module MRuby @linker = LinkerConfig.new([], [], [], []) @rbfiles = Dir.glob("#{dir}/mrblib/*.rb").sort - @objs = Dir.glob("#{dir}/src/*.{c,cpp,m,asm,S}").map do |f| + @objs = Dir.glob("#{dir}/src/*.{c,cpp,cxx,m,asm,S}").map do |f| objfile(f.relative_path_from(@dir).to_s.pathmap("#{build_dir}/%X")) end @objs << objfile("#{build_dir}/gem_init") @test_rbfiles = Dir.glob("#{dir}/test/*.rb") - @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map do |f| + @test_objs = Dir.glob("#{dir}/test/*.{c,cpp,cxx,m,asm,S}").map do |f| objfile(f.relative_path_from(dir).to_s.pathmap("#{build_dir}/%X")) end @test_preload = 'test/assert.rb' @@ -211,7 +211,7 @@ module MRuby end # ~> compare algorithm - # + # # Example: # ~> 2.2 means >= 2.2.0 and < 3.0.0 # ~> 2.2.0 means >= 2.2.0 and < 2.3.0 -- cgit v1.2.3