From 7a1985a96970f7e759b945be74e7a8f41a797cd8 Mon Sep 17 00:00:00 2001 From: tadf Date: Sun, 18 Nov 2012 00:26:15 +0000 Subject: trivial changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- complex.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'complex.c') diff --git a/complex.c b/complex.c index 8af4a5203d..e073acf7cc 100644 --- a/complex.c +++ b/complex.c @@ -1,5 +1,5 @@ /* - complex.c: Coded by Tadayoshi Funaba 2008-2011 + complex.c: Coded by Tadayoshi Funaba 2008-2012 This implementation is based on Keiju Ishitsuka's Complex library which is written in ruby. @@ -1626,10 +1626,8 @@ str2num(char *s) { if (strchr(s, '/')) return rb_cstr_to_rat(s, 0); - if (strpbrk(s, ".eE")) { - double d = rb_cstr_to_dbl(s, 0); - return DBL2NUM(d); - } + if (strpbrk(s, ".eE")) + return DBL2NUM(rb_cstr_to_dbl(s, 0)); return rb_cstr_to_inum(s, 10, 0); } @@ -1715,6 +1713,13 @@ read_comp(const char **s, int strict, } } +static void +skip_ws(const char **s) +{ + while (isspace((unsigned char)**s)) + (*s)++; +} + static int parse_comp(const char *s, int strict, VALUE *num) @@ -1724,14 +1729,10 @@ parse_comp(const char *s, int strict, buf = ALLOCA_N(char, strlen(s) + 1); b = buf; - while (isspace((unsigned char)*s)) - s++; - + skip_ws(&s); if (!read_comp(&s, strict, num, &b)) return 0; - - while (isspace((unsigned char)*s)) - s++; + skip_ws(&s); if (strict) if (*s != '\0') -- cgit v1.2.3