From 9b383bd6cf96e1fe21c41528dec1f3ed508f335b Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 9 Jun 2006 21:20:17 +0000 Subject: * sprintf.c (rb_str_format): allow %c to print one character string (e.g. ?x). * lib/tempfile.rb (Tempfile::make_tmpname): put dot between basename and pid. [ruby-talk:196272] * parse.y (do_block): remove -> style block. * parse.y (parser_yylex): remove tLAMBDA_ARG. * eval.c (rb_call0): binding for the return event hook should have consistent scope. [ruby-core:07928] * eval.c (proc_invoke): return behavior should depend whether it is surrounded by a lambda or a mere block. * eval.c (formal_assign): handles post splat arguments. * eval.c (rb_call0): ditto. * st.c (strhash): use FNV-1a hash. * parse.y (parser_yylex): removed experimental ';;' terminator. * eval.c (rb_node_arity): should be aware of post splat arguments. * eval.c (rb_proc_arity): ditto. * parse.y (f_args): syntax rule enhanced to support arguments after the splat. * parse.y (block_param): ditto for block parameters. * parse.y (f_post_arg): mandatory formal arguments after the splat argument. * parse.y (new_args_gen): generate nodes for mandatory formal arguments after the splat argument. * eval.c (rb_eval): dispatch mandatory formal arguments after the splat argument. * parse.y (args): allow more than one splat in the argument list. * parse.y (method_call): allow aref [] to accept all kind of method argument, including assocs, splat, and block argument. * eval.c (SETUP_ARGS0): prepare block argument as well. * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931] * eval.c (error_line): print receivers true/false/nil specially. * eval.c (rb_proc_yield): handles parameters in yield semantics. * eval.c (nil_yield): gives LocalJumpError to denote no block error. * io.c (rb_io_getc): now takes one-character string. * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo hashing algorithm. * string.c (rb_str_aref): str[0] now returns 1 character string, instead of a fixnum. [Ruby2] * parse.y (parser_yylex): ?c now returns 1 character string, instead of a fixnum. [Ruby2] * string.c (rb_str_aset): no longer support fixnum insertion. * eval.c (umethod_bind): should not update original class. [ruby-dev:28636] * eval.c (ev_const_get): should support constant access from within instance_eval(). [ruby-dev:28327] * time.c (time_timeval): should round for usec floating number. [ruby-core:07896] * time.c (time_add): ditto. * dir.c (sys_warning): should not call a vararg function rb_sys_warning() indirectly. [ruby-core:07886] * numeric.c (flo_divmod): the first element of Float#divmod should be an integer. [ruby-dev:28589] * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder. * re.c (rb_reg_initialize): should not allow modifying literal regexps. frozen check moved from rb_reg_initialize_m as well. * re.c (rb_reg_initialize): should not modify untainted objects in safe levels higher than 3. * re.c (rb_memcmp): type change from char* to const void*. * dir.c (dir_close): should not close untainted dir stream. * dir.c (GetDIR): add tainted/frozen check for each dir operation. * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg): typo fixed. a patch from Florian Gross . * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from event_hooks. no guarantee for arbitrary hook deletion. [ruby-dev:28632] * util.c (ruby_strtod): differ addition to minimize error. [ruby-dev:28619] * util.c (ruby_strtod): should not raise ERANGE when the input string does not have any digits. [ruby-dev:28629] * eval.c (proc_invoke): should restore old ruby_frame->block. thanks to ts . [ruby-core:07833] also fix [ruby-dev:28614] as well. * signal.c (trap): sig should be less then NSIG. Coverity found this bug. a patch from Kevin Tew . [ruby-core:07823] * math.c (math_log2): add new method inspired by [ruby-talk:191237]. * math.c (math_log): add optional base argument to Math::log(). [ruby-talk:191308] * ext/syck/emitter.c (syck_scan_scalar): avoid accessing uninitialized array element. a patch from Pat Eyler . [ruby-core:07809] * array.c (rb_ary_fill): initialize local variables first. a patch from Pat Eyler . [ruby-core:07810] * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free type_tag. a patch from Pat Eyler . [ruby-core:07808] * ext/socket/socket.c (make_hostent_internal): accept ai_family check from Sam Roberts . [ruby-core:07691] * util.c (ruby_strtod): should not cut off 18 digits for no reason. [ruby-core:07796] * array.c (rb_ary_fill): internalize local variable "beg" to pacify Coverity. [ruby-core:07770] * pack.c (pack_unpack): now supports CRLF newlines. a patch from . [ruby-dev:28601] * applied code clean-up patch from Stefan Huehner . [ruby-core:07764] * lib/jcode.rb (String::tr_s): should have translated non squeezing character sequence (i.e. a character) as well. thanks to Hiroshi Ichikawa [ruby-list:42090] * ext/socket/socket.c: document update patch from Sam Roberts . [ruby-core:07701] * lib/mathn.rb (Integer): need not to remove gcd2. a patch from NARUSE, Yui . [ruby-dev:28570] * parse.y (arg): too much NEW_LIST() * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen. * eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1. [ruby-dev:28585] * parse.y (arg): use NODE_ARGSCAT for placeholder. * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from mathew . [ruby-core:07738] * variable.c (rb_const_set): raise error when no target klass is supplied. [ruby-dev:28582] * prec.c (prec_prec_f): documentation patch from . [ruby-core:07689] * bignum.c (rb_big_pow): second operand may be too big even if it's a Fixnum. [ruby-talk:187984] * README.EXT: update symbol description. [ruby-talk:188104] * COPYING: explicitly note GPLv2. [ruby-talk:187922] * parse.y: remove some obsolete syntax rules (unparenthesized method calls in argument list). * eval.c (rb_call0): insecure calling should be checked for non NODE_SCOPE method invocations too. * eval.c (rb_alias): should preserve the current safe level as well as method definition. * process.c (rb_f_sleep): remove RDoc description about SIGALRM which is not valid on the current implementation. [ruby-dev:28464] Thu Mar 23 21:40:47 2006 K.Kosako * eval.c (method_missing): should support argument splat in super. a bug in combination of super, splat and method_missing. [ruby-talk:185438] * configure.in: Solaris SunPro compiler -rapth patch from . [ruby-dev:28443] * configure.in: remove enable_rpath=no for Solaris. [ruby-dev:28440] * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. * ruby.1: a clarification patch from David Lutterkort . [ruby-core:7508] * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel . [ruby-core:07423] * eval.c (rb_clear_cache_by_class): clearing wrong cache. * ext/extmk.rb: use :remove_destination to install extension libraries to avoid SEGV. [ruby-dev:28417] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). * array.c (rb_ary_flatten_bang): allow specifying recursion level. [ruby-talk:182170] * array.c (rb_ary_flatten): ditto. * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan Weil . * eval.c (rb_call): use separate cache for fcall/vcall invocation. * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local functions. * eval.c (rb_mod_local): a new method to specify newly added visibility "local". * eval.c (search_method): search for local methods which are visible only from the current class. * class.c (rb_class_local_methods): a method to list local methods. * object.c (Init_Object): add BasicObject class as a top level BlankSlate class. * ruby.h (SYM2ID): should not cast to signed long. [ruby-core:07414] * class.c (rb_include_module): allow module duplication. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- util.c | 90 ++++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 44 insertions(+), 46 deletions(-) (limited to 'util.c') diff --git a/util.c b/util.c index 953927d145..fbc08de1e7 100644 --- a/util.c +++ b/util.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #ifdef _WIN32 #include "missing/file.h" @@ -664,11 +666,9 @@ ruby_getcwd(void) * */ -#define TRUE 1 -#define FALSE 0 +#define MDMINEXPT DBL_MIN_EXP +#define MDMAXEXPT DBL_MAX_EXP -static int MDMINEXPT = -323; -static int MDMAXEXPT = 309; static double powersOf10[] = { /* Table giving binary powers of 10. Entry */ 10.0, /* is 10^2^i. Used to convert decimal */ 100.0, /* exponents into floating-point numbers. */ @@ -720,8 +720,8 @@ ruby_strtod( char **endPtr) /* If non-NULL, store terminating character's * address here. */ { - int sign, expSign = FALSE; - double fraction, dblExp, *d; + int sign, expSign = Qfalse; + double fraction = 0.0, dblExp, *d; register const char *p; register int c; int exp = 0; /* Exponent read from "EX" field. */ @@ -735,8 +735,8 @@ ruby_strtod( * case, fracExp is incremented one for each * dropped digit. */ int mantSize = 0; /* Number of digits in mantissa. */ - int hasPoint = FALSE; /* Decimal point exists. */ - int hasDigit = FALSE; /* I or F exists. */ + int hasPoint = Qfalse; /* Decimal point exists. */ + int hasDigit = Qfalse; /* I or F exists. */ const char *pMant; /* Temporarily holds location of mantissa * in string. */ const char *pExp; /* Temporarily holds location of exponent @@ -748,44 +748,43 @@ ruby_strtod( errno = 0; p = string; - while (ISSPACE(*p)) { - p += 1; - } + while (ISSPACE(*p)) p++; if (*p == '-') { - sign = TRUE; - p += 1; + sign = Qtrue; + p++; } else { - if (*p == '+') { - p += 1; - } - sign = FALSE; + if (*p == '+') p++; + sign = Qfalse; } + fraction = 0.; + exp = 0; + /* * Count the number of digits in the mantissa * and also locate the decimal point. */ - for ( ; c = *p; p += 1) { + for ( ; c = *p; p++) { if (!ISDIGIT(c)) { if (c != '.' || hasPoint) { break; } - hasPoint = TRUE; + hasPoint = Qtrue; } else { if (hasPoint) { /* already in fractional part */ - fracExp -= 1; + fracExp--; } if (mantSize) { /* already in mantissa */ - mantSize += 1; + mantSize++; } else if (c != '0') { /* have entered mantissa */ - mantSize += 1; + mantSize++; pMant = p; } - hasDigit = TRUE; + hasDigit = Qtrue; } } @@ -796,7 +795,7 @@ ruby_strtod( * they can't affect the value anyway. */ - pExp = p; + pExp = p; if (mantSize) { p = pMant; } @@ -809,7 +808,7 @@ ruby_strtod( p = string; } else { - int frac1, frac2; + double frac1, frac2; frac1 = 0; for ( ; mantSize > 9; mantSize -= 1) { c = *p; @@ -837,21 +836,20 @@ ruby_strtod( p = pExp; if ((*p == 'E') || (*p == 'e')) { - p += 1; + p++; if (*p == '-') { - expSign = TRUE; - p += 1; + expSign = Qtrue; + p++; } else { if (*p == '+') { - p += 1; + p++; } - expSign = FALSE; + expSign = Qfalse; } if (ISDIGIT(*p)) { do { - exp = exp * 10 + (*p - '0'); - p += 1; + exp = exp * 10 + (*p++ - '0'); } while (ISDIGIT(*p)); } @@ -873,22 +871,22 @@ ruby_strtod( * fraction. */ - if (exp >= MDMAXEXPT - 18) { - exp = MDMAXEXPT; + if (exp >= MDMAXEXPT) { errno = ERANGE; + return HUGE_VAL * (sign ? -1.0 : 1.0); } - else if (exp < MDMINEXPT + 18) { - exp = MDMINEXPT; + else if (exp < MDMINEXPT) { errno = ERANGE; + return 0.0 * (sign ? -1.0 : 1.0); } fracExp = exp; exp += 9; if (exp < 0) { - expSign = TRUE; + expSign = Qtrue; exp = -exp; } else { - expSign = FALSE; + expSign = Qfalse; } dblExp = 1.0; for (d = powersOf10; exp != 0; exp >>= 1, d += 1) { @@ -897,18 +895,18 @@ ruby_strtod( } } if (expSign) { - fraction = frac1 / dblExp; + frac1 /= dblExp; } else { - fraction = frac1 * dblExp; + frac1 *= dblExp; } exp = fracExp; if (exp < 0) { - expSign = TRUE; + expSign = Qtrue; exp = -exp; } else { - expSign = FALSE; + expSign = Qfalse; } dblExp = 1.0; for (d = powersOf10; exp != 0; exp >>= 1, d += 1) { @@ -917,17 +915,17 @@ ruby_strtod( } } if (expSign) { - fraction += frac2 / dblExp; + frac2 /= dblExp; } else { - fraction += frac2 * dblExp; + frac2 *= dblExp; } + fraction = frac1 + frac2; } if (endPtr != NULL) { - *endPtr = (char *) p; + *endPtr = (char *)p; } - if (sign) { return -fraction; } -- cgit v1.2.3