kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

trivial changes.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37707 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2012-11-18 00:26:15 +00:00
parent 55915036a6
commit 7a1985a969
2 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
complex.c
View file

@ -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 This implementation is based on Keiju Ishitsuka's Complex library
which is written in ruby. which is written in ruby.
@ -1626,10 +1626,8 @@ str2num(char *s)
{ {
if (strchr(s, '/')) if (strchr(s, '/'))
return rb_cstr_to_rat(s, 0); return rb_cstr_to_rat(s, 0);
if (strpbrk(s, ".eE")) { if (strpbrk(s, ".eE"))
double d = rb_cstr_to_dbl(s, 0); return DBL2NUM(rb_cstr_to_dbl(s, 0));
return DBL2NUM(d);
}
return rb_cstr_to_inum(s, 10, 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 static int
parse_comp(const char *s, int strict, parse_comp(const char *s, int strict,
VALUE *num) VALUE *num)
@ -1724,14 +1729,10 @@ parse_comp(const char *s, int strict,
buf = ALLOCA_N(char, strlen(s) + 1); buf = ALLOCA_N(char, strlen(s) + 1);
b = buf; b = buf;
while (isspace((unsigned char)*s)) skip_ws(&s);
s++;
if (!read_comp(&s, strict, num, &b)) if (!read_comp(&s, strict, num, &b))
return 0; return 0;
skip_ws(&s);
while (isspace((unsigned char)*s))
s++;
if (strict) if (strict)
if (*s != '\0') if (*s != '\0')

17
rational.c
View file

@ -1,5 +1,5 @@
/* /*
rational.c: Coded by Tadayoshi Funaba 2008-2011 rational.c: Coded by Tadayoshi Funaba 2008-2012
This implementation is based on Keiju Ishitsuka's Rational library This implementation is based on Keiju Ishitsuka's Rational library
which is written in ruby. which is written in ruby.
@ -2093,18 +2093,21 @@ read_rat(const char **s, int strict,
return 1; return 1;
} }
static void
skip_ws(const char **s)
{
while (isspace((unsigned char)**s))
(*s)++;
}
static int static int
parse_rat(const char *s, int strict, parse_rat(const char *s, int strict,
VALUE *num) VALUE *num)
{ {
while (isspace((unsigned char)*s)) skip_ws(&s);
s++;
if (!read_rat(&s, strict, num)) if (!read_rat(&s, strict, num))
return 0; return 0;
skip_ws(&s);
while (isspace((unsigned char)*s))
s++;
if (strict) if (strict)
if (*s != '\0') if (*s != '\0')