pike.git/ src/ operators.c

2008-08-24

2008-08-24 21:32:00 by Stephen R. van den Berg <srb@cuci.nl>

• 08261e683f86fc7f6d433307e14e89c87310c13b (65 lines) (+20/-45) ^{[ Show | Annotate ]}
  Branch: 7.9

Revert: fix overflow bug when casting float to string.
Revert: Optimise optimisation and move inline int2string
from roxen.c to operators.c.

Rev: src/modules/_Roxen/roxen.c:1.53
Rev: src/operators.c:1.240

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: operators.c,v 1.239 2008/08/22 14:13:20 srb Exp $ + || $Id: operators.c,v 1.240 2008/08/24 21:32:00 srb Exp $   */      #include "global.h"
39:   #define OP_MODULO_BY_ZERO_ERROR(FUNC) \    math_error(FUNC, sp-2, 2, 0, "Modulo by zero.\n")    -  /* These calculations should always give some margin based on the size. */ -  /* One extra char for the sign. */ - #define MAX_INT_SPRINTF_LEN (1 + (SIZEOF_INT_TYPE * 5 + 1) / 2) -  /* Six extra chars: Mantissa sign, decimal point, zero before the -  * decimal point, the 'e', exponent sign, and an extra digit due -  * to the mantissa/exponent split. */ - #define MAX_FLOAT_SPRINTF_LEN (6 + (SIZEOF_FLOAT_TYPE * 5 + 1) / 2) -  +    /* The destructive multiset merge code is broken.    * l->msd gets -1 refs.    *
351:   /* Special case for casting to string. */   PMOD_EXPORT void o_cast_to_string(void)   { +  char buf[200];    switch(sp[-1].type)    {    case PIKE_T_STRING: -  break; +  return;       case T_OBJECT:    if(!sp[-1].u.object->prog) {
394:    get_name_of_type(sp[-1].type));    }    } -  break; +  return;       case T_INT: -  { -  INT_TYPE org; -  char buf[MAX_INT_SPRINTF_LEN]; -  register char*b = buf+sizeof buf-1; -  register unsigned INT_TYPE i; -  org = sp[-1].u.integer; -  pop_stack(); -  *b-- = '\0'; -  i = org; -  -  if( org < 0 ) -  i = -i; -  -  goto jin; /* C as a macro assembler :-) */ -  do { -  i /= 10; - jin: *b-- = '0'+(i%10); -  } -  while( i >= 10 ); -  -  if( org<0 ) -  *b = '-'; -  else -  b++; -  push_text( b ); -  } +  sprintf(buf, "%"PRINTPIKEINT"d", sp[-1].u.integer);    break;       case T_ARRAY:
494:    pop_stack();    push_string(s);    } -  break; +  return;    -  case T_FLOAT: { -  char buf[MAX_FLOAT_SPRINTF_LEN+1+1+1+1+7+1]; -  snprintf(buf, sizeof buf, "%.*g", -  MAX_FLOAT_SPRINTF_LEN, (double)sp[-1].u.float_number); -  pop_stack(); -  push_text(buf); +  case T_FLOAT: +  sprintf(buf, "%f", (double)sp[-1].u.float_number);    break; -  } +        default:    Pike_error("Cannot cast %s to string.\n", get_name_of_type(sp[-1].type));    } -  +  +  sp[-1].type = PIKE_T_STRING; +  sp[-1].u.string = make_shared_string(buf);   }      PMOD_EXPORT void o_cast(struct pike_type *type, INT32 run_time_type)
1590:    e = -args;    }    +  /* These calculations should always give some margin based on the size. */ +  /* One extra char for the sign. */ + #define MAX_INT_SPRINTF_LEN (1 + (SIZEOF_INT_TYPE * 5 + 1) / 2) +  /* Six extra chars: Mantissa sign, decimal point, zero before the +  * decimal point, the 'e', exponent sign, and an extra digit due +  * to the mantissa/exponent split. */ + #define MAX_FLOAT_SPRINTF_LEN (6 + (SIZEOF_FLOAT_TYPE * 5 + 1) / 2) +     size=0;    for(e=-args;e<0;e++)    {