From a20cf402cfa15e0f078e2750dc0fc17c44b529f6 Mon Sep 17 00:00:00 2001 From: tadf Date: Mon, 9 Jun 2008 12:02:29 +0000 Subject: * complex.c (nucomp_s_convert): can accept Complex('i'). [ruby-dev:34991] and some minor changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- complex.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'complex.c') diff --git a/complex.c b/complex.c index 6bc004a5d0..f2f331a040 100644 --- a/complex.c +++ b/complex.c @@ -1125,22 +1125,21 @@ numeric_to_c(VALUE self) } static VALUE comp_pat1, comp_pat2, a_slash, a_dot_and_an_e, - image_garbages_pat, null_string, underscores_pat, an_underscore; + null_string, underscores_pat, an_underscore; #define DIGITS "(?:\\d(?:_\\d|\\d)*)" #define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?" #define DENOMINATOR "[-+]?" DIGITS #define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?" #define NUMBERNOS NUMERATOR "(?:\\/" DENOMINATOR ")?" -#define PATTERN1 "\\A(" NUMBER "|\\(" NUMBER "\\))[iIjJ]" -#define PATTERN2 "\\A(" NUMBER ")([-+](?:" NUMBERNOS "|\\(" NUMBER "\\))[iIjJ])?" +#define PATTERN1 "\\A(" NUMBER "|\\(" NUMBER "\\))?[iIjJ]" +#define PATTERN2 "\\A(" NUMBER ")(([-+])(?:(" NUMBERNOS ")|\\((" NUMBER ")\\))?[iIjJ])?" static void make_patterns(void) { static const char comp_pat1_source[] = PATTERN1; static const char comp_pat2_source[] = PATTERN2; - static const char image_garbages_pat_source[] = "[+\\(\\)iIjJ]"; static const char underscores_pat_source[] = "_+"; if (comp_pat1) return; @@ -1157,10 +1156,6 @@ make_patterns(void) a_dot_and_an_e = rb_str_new2(".eE"); rb_global_variable(&a_dot_and_an_e); - image_garbages_pat = rb_reg_new(image_garbages_pat_source, - sizeof image_garbages_pat_source - 1, 0); - rb_global_variable(&image_garbages_pat); - null_string = rb_str_new2(""); rb_global_variable(&null_string); @@ -1213,6 +1208,8 @@ string_to_c_internal(VALUE self) if (!NIL_P(m)) { sr = Qnil; si = f_aref(m, INT2FIX(1)); + if (NIL_P(si)) + si = rb_str_new2("1"); re = f_post_match(m); } if (NIL_P(m)) { @@ -1220,7 +1217,19 @@ string_to_c_internal(VALUE self) if (NIL_P(m)) return rb_assoc_new(Qnil, self); sr = f_aref(m, INT2FIX(1)); - si = f_aref(m, INT2FIX(2)); + if (NIL_P(f_aref(m, INT2FIX(2)))) + si = Qnil; + else { + VALUE t; + + si = f_aref(m, INT2FIX(3)); + t = f_aref(m, INT2FIX(4)); + if (NIL_P(t)) + t = f_aref(m, INT2FIX(5)); + if (NIL_P(t)) + t = rb_str_new2("1"); + rb_str_concat(si, t); + } re = f_post_match(m); } r = INT2FIX(0); @@ -1234,7 +1243,6 @@ string_to_c_internal(VALUE self) r = f_to_i(sr); } if (!NIL_P(si)) { - f_gsub_bang(si, image_garbages_pat, null_string); if (f_include_p(si, a_slash)) i = f_to_r(si); else if (f_gt_p(f_count(si, a_dot_and_an_e), INT2FIX(0))) -- cgit v1.2.3