pike.git/ src/ operators.c

1996-02-25

1996-02-25 22:53:54 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• bce86cd77c173ec0a979d529083959c4b67d88cc (90 lines) (+67/-23) ^{[ Show | Annotate ]}
  Branch: 27cc2a4775b94a281a35f29d84e935c83a7b76e9

typeof() implemented

Rev: src/ChangeLog:1.19
Rev: src/Makefile.in:1.10
Rev: src/builtin_efuns.c:1.13
Rev: src/language.y:1.11
Rev: src/lex.c:1.8
Rev: src/lpc_types.c:1.3
Rev: src/lpc_types.h:1.2
Rev: src/object.c:1.7
Rev: src/operators.c:1.4
Rev: src/svalue.c:1.7
Rev: src/svalue.h:1.5

169:    break;    }    +  case BIT_FLOAT | BIT_INT: +  { +  FLOAT_TYPE sum; +  sum=0.0; +  for(e=-args; e<0; e++) +  { +  if(sp[e].type==T_FLOAT) +  { +  sum+=sp[e].u.float_number; +  }else{ +  sum+=(FLOAT_TYPE)sp[e].u.integer; +  } +  } +  sp-=args-1; +  sp[-1].u.float_number=sum; +  break; +  } +     case BIT_ARRAY:    {    struct array *a;
231:    fatal("Couldn't find argument!\n");   #endif    -  if((*second_arg)->type == (*first_arg)->type) +  if((*second_arg)->type == (*first_arg)->type && +  compile_type_to_runtime_type((*second_arg)->type) != T_MIXED)    {    if((*first_arg)->token == F_APPLY &&    CAR(*first_arg)->token == F_CONSTANT &&
295:    return 0;   }    + static int float_promote() + { +  if(sp[-2].type==T_INT) +  { +  sp[-2].u.float_number=(FLOAT_TYPE)sp[-2].u.integer; +  sp[-2].type=T_FLOAT; +  }    -  +  if(sp[-1].type==T_INT) +  { +  sp[-1].u.float_number=(FLOAT_TYPE)sp[-1].u.integer; +  sp[-1].type=T_FLOAT; +  } +  +  return sp[-2].type == sp[-1].type; + } +    void o_subtract()   { -  if (sp[-2].type != sp[-1].type ) +  if (sp[-2].type != sp[-1].type && !float_promote())    error("Subtract on different types.\n");       switch(sp[-1].type)
659:    return 0;   }    +  + #define TWO_TYPES(X,Y) (((X)<<8)|(Y))   void o_multiply()   { -  switch(sp[-2].type) +  switch(TWO_TYPES(sp[-2].type,sp[-1].type))    { -  case T_ARRAY: -  if(sp[-1].type!=T_STRING) +  case TWO_TYPES(T_ARRAY,T_STRING):    { -  error("Bad argument 2 to multiply.\n"); -  }else{ +     struct lpc_string *ret;    sp--;    ret=implode(sp[-1].u.array,sp[0].u.string);
678:    return;    }    -  case T_FLOAT: -  if(sp[-1].type!=T_FLOAT) error("Bad argument 2 to multiply.\n"); +  case TWO_TYPES(T_FLOAT,T_FLOAT):    sp--;    sp[-1].u.float_number *= sp[0].u.float_number;    return;    -  case T_INT: -  if(sp[-1].type!=T_INT) error("Bad argument 2 to multiply.\n"); +  case TWO_TYPES(T_FLOAT,T_INT):    sp--; -  +  sp[-1].u.float_number *= (FLOAT_TYPE)sp[0].u.integer; +  return; +  +  case TWO_TYPES(T_INT,T_FLOAT): +  sp--; +  sp[-1].u.float_number= +  (FLOAT_TYPE) sp[-1].u.integer * (FLOAT_TYPE)sp[0].u.float_number; +  sp[-1].type=T_FLOAT; +  return; +  +  case TWO_TYPES(T_INT,T_INT): +  sp--;    sp[-1].u.integer *= sp[0].u.integer;    return;       default: -  error("Bad argument 1 to multiply.\n"); +  error("Bad arguments to multiply.\n");    }   }   
726:      void o_divide()   { -  if(sp[-2].type!=sp[-1].type) +  if(sp[-2].type!=sp[-1].type && !float_promote())    error("Division on different types.\n");       switch(sp[-2].type)
782:      void o_mod()   { -  if(sp[-2].type != sp[-1].type) +  if(sp[-2].type != sp[-1].type && !float_promote())    error("Modulo on different types.\n");       switch(sp[-1].type)
956:   {    add_efun2("`==",f_eq,"function(mixed,mixed:int)",0,0,generate_comparison);    add_efun2("`!=",f_ne,"function(mixed,mixed:int)",0,0,generate_comparison); -  add_efun2("`<", f_lt,"function(int,int:int)|function(float,float:int)|function(string,string:int)",0,0,generate_comparison); -  add_efun2("`<=",f_le,"function(int,int:int)|function(float,float:int)|function(string,string:int)",0,0,generate_comparison); -  add_efun2("`>", f_gt,"function(int,int:int)|function(float,float:int)|function(string,string:int)",0,0,generate_comparison); -  add_efun2("`>=",f_ge,"function(int,int:int)|function(float,float:int)|function(string,string:int)",0,0,generate_comparison); +  add_efun2("`<", f_lt,"function(int|float,int|float:int)|function(string,string:int)",0,0,generate_comparison); +  add_efun2("`<=",f_le,"function(int|float,int|float:int)|function(string,string:int)",0,0,generate_comparison); +  add_efun2("`>", f_gt,"function(int|float,int|float:int)|function(string,string:int)",0,0,generate_comparison); +  add_efun2("`>=",f_ge,"function(int|float,int|float:int)|function(string,string:int)",0,0,generate_comparison);    -  add_efun2("`+",f_add,"function(int ...:int)|function(float ...:float)|function(string,string|int|float ...:string)|function(string,string|int|float ...:string)|function(int|float,string,string|int|float:string)|function(array ...:array)|function(mapping ...:mapping)|function(list...:list)",0,optimize_binary,generate_sum); +  add_efun2("`+",f_add,"function(int...:int)|!function(int...:mixed)&function(int|float...:float)|!function(int|float...:mixed)&function(string|int|float...:string)|function(array...:array)|function(mapping...:mapping)|function(list...:list)",0,optimize_binary,generate_sum);    -  add_efun2("`-",f_minus,"function(int:int)|function(float:float)|function(array,array:array)|function(mapping,mapping:mapping)|function(list,list:list)|function(float,float:float)|function(int,int:int)|function(string,string:string)",0,0,generate_minus); +  add_efun2("`-",f_minus,"function(int:int)|function(float:float)|function(array,array:array)|function(mapping,mapping:mapping)|function(list,list:list)|function(float|int,float:float)|function(float,int:float)|function(int,int:int)|function(string,string:string)",0,0,generate_minus);       add_efun2("`&",f_and,"function(int...:int)|function(mapping...:mapping)|function(list...:list)|function(array...:array)",0,optimize_binary,generate_and);   
974:    add_efun2("`<<",f_lsh,"function(int,int:int)",0,0,generate_lsh);    add_efun2("`>>",f_rsh,"function(int,int:int)",0,0,generate_rsh);    -  add_efun2("`*",f_multiply,"function(int...:int)|function(float...:float)|function(string*,string:string)",0,optimize_binary,generate_multiply); +  add_efun2("`*",f_multiply,"function(int...:int)|!function(int...:mixed)&function(float|int...:float)|function(string*,string:string)",0,optimize_binary,generate_multiply);    -  add_efun2("`/",f_divide,"function(int,int:int)|function(float,float:float)|function(string,string:string*)",0,0,generate_divide); +  add_efun2("`/",f_divide,"function(int,int:int)|function(float|int,float:float)|function(float,int:float)|function(string,string:string*)",0,0,generate_divide);       add_efun2("`%",f_mod,"function(int,int:int)|function(float,float:float)",0,0,generate_mod);       add_efun2("`!",f_not,"function(mixed:int)",0,0,generate_not);    add_efun2("`~",f_compl,"function(int:int)",0,0,generate_compl); -  +    }