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(+) (limited to 'mrbgems/mruby-string-ext') 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(-) (limited to 'mrbgems/mruby-string-ext') 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(+) (limited to 'mrbgems/mruby-string-ext') 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(-) (limited to 'mrbgems/mruby-string-ext') 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(-) (limited to 'mrbgems/mruby-string-ext') 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(-) (limited to 'mrbgems/mruby-string-ext') 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