From 4ece1e3e293501d4e65a0ad007c86c5254342a88 Mon Sep 17 00:00:00 2001 From: mattn Date: Mon, 11 Aug 2014 15:00:44 +0900 Subject: "-a-a-".succ should be "-a-b-" --- mrbgems/mruby-string-ext/src/string.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'mrbgems/mruby-string-ext/src/string.c') diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 2732f8599..085de76ef 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -266,25 +266,27 @@ mrb_str_succ_bang(mrb_state *mrb, mrb_value self) t = e = p + l; *(e--) = 0; - while (b < e) { - if (ISALNUM(*b)) - break; - b++; - } - - if (b > e) { - b = p; - result = mrb_str_new_lit(mrb, ""); - } else - result = mrb_str_new(mrb, (char*) p, b - p); - + // find trailing ascii/number while (e >= b) { if (ISALNUM(*e)) break; e--; } - if (e < b) + if (e < b) { e = p + l - 1; + result = mrb_str_new_lit(mrb, ""); + } else { + // find leading letter of the ascii/number + b = e; + while (b > p) { + if (!ISALNUM(*b) || (ISALNUM(*b) && *b != '9' && *b != 'z' && *b != 'Z')) + break; + b--; + } + if (!ISALNUM(*b)) + b++; + result = mrb_str_new(mrb, (char*) p, b - p); + } while (e >= b) { if (!ISALNUM(*e)) { -- cgit v1.2.3