pike.git/ src/ operators.c

2001-02-21

2001-02-21 18:25:25 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 07f543ab448eeaa519c23b91870d4498fb1110bd (81 lines) (+36/-45) ^{[ Show | Annotate ]}
  Branch: 7.9

More pike_type cleanups.

Rev: src/docode.c:1.105
Rev: src/las.c:1.235
Rev: src/opcodes.c:1.101
Rev: src/operators.c:1.126

6:   /**/   #include "global.h"   #include <math.h> - RCSID("$Id: operators.c,v 1.125 2001/02/20 15:59:49 grubba Exp $"); + RCSID("$Id: operators.c,v 1.126 2001/02/21 18:25:25 grubba Exp $");   #include "interpret.h"   #include "svalue.h"   #include "multiset.h"
1093:    type_stack_mark();    push_object_type(0, p->id);    free_svalue(sp - 2); -  sp[-2].u.string = pop_unfinished_type(); +  sp[-2].u.type = pop_unfinished_type();    sp[-2].type = T_TYPE;    }    if (sp[-1].type != T_TYPE)
1107:    type_stack_mark();    push_object_type(0, p->id);    free_svalue(sp - 1); -  sp[-1].u.string = pop_unfinished_type(); +  sp[-1].u.type = pop_unfinished_type();    sp[-1].type = T_TYPE;    }    }
1184:       case T_TYPE:    { -  struct pike_string *t; -  t = and_pike_types(sp[-2].u.string, sp[-1].u.string); +  struct pike_type *t; +  t = and_pike_types(sp[-2].u.type, sp[-1].u.type);    pop_n_elems(2); -  push_string(t); -  sp[-1].type = T_TYPE; +  push_type_value(t);    return;    }   
1196:    case T_PROGRAM:    {    struct program *p; -  struct pike_string *a; -  struct pike_string *b; -  struct pike_string *t; +  struct pike_type *a; +  struct pike_type *b; +  struct pike_type *t;       p = program_from_svalue(sp - 2);    if (!p) {
1221:    t = and_pike_types(a, b);       pop_n_elems(2); -  push_string(t); -  sp[-1].type = T_TYPE; -  free_string(a); -  free_string(b); +  push_type_value(t); +  free_type(a); +  free_type(b);    return;    }   
1432:    type_stack_mark();    push_object_type(0, p->id);    free_svalue(sp - 2); -  sp[-2].u.string = pop_unfinished_type(); +  sp[-2].u.type = pop_unfinished_type();    sp[-2].type = T_TYPE;    }    if (sp[-1].type != T_TYPE) {
1444:    type_stack_mark();    push_object_type(0, p->id);    free_svalue(sp - 1); -  sp[-1].u.string = pop_unfinished_type(); +  sp[-1].u.type = pop_unfinished_type();    sp[-1].type = T_TYPE;    }    } else {
1493:       case T_TYPE:    { -  struct pike_string *t; -  t = or_pike_types(sp[-2].u.string, sp[-1].u.string, 0); +  struct pike_type *t; +  t = or_pike_types(sp[-2].u.type, sp[-1].u.type, 0);    pop_n_elems(2); -  push_string(t); -  sp[-1].type = T_TYPE; +  push_type_value(t);    return;    }   
1505:    case T_PROGRAM:    {    struct program *p; -  struct pike_string *a; -  struct pike_string *b; -  struct pike_string *t; +  struct pike_type *a; +  struct pike_type *b; +  struct pike_type *t;       p = program_from_svalue(sp - 2);    if (!p) {
1530:    t = or_pike_types(a, b, 0);       pop_n_elems(2); -  push_string(t); -  sp[-1].type = T_TYPE; -  free_string(a); -  free_string(b); +  push_type_value(t); +  free_type(a); +  free_type(b);    return;    }   
1642:    type_stack_mark();    push_object_type(0, p->id);    free_svalue(sp - 2); -  sp[-2].u.string = pop_unfinished_type(); +  sp[-2].u.type = pop_unfinished_type();    sp[-2].type = T_TYPE;    }    if (sp[-1].type != T_TYPE) {
1654:    type_stack_mark();    push_object_type(0, p->id);    free_svalue(sp - 1); -  sp[-1].u.string = pop_unfinished_type(); +  sp[-1].u.type = pop_unfinished_type();    sp[-1].type = T_TYPE;    }    } else {
1714:    type_stack_mark();    push_object_type(0, p->id);    pop_stack(); -  push_string(pop_unfinished_type()); -  sp[-1].type = T_TYPE; +  push_type_value(pop_unfinished_type());       stack_swap();   
1728:    type_stack_mark();    push_object_type(0, p->id);    pop_stack(); -  push_string(pop_unfinished_type()); -  sp[-1].type = T_TYPE; +  push_type_value(pop_unfinished_type());    }    /* FALL_THROUGH */    case T_TYPE:    {    /* a ^ b == (a&~b)|(~a&b) */ -  struct pike_string *a; -  struct pike_string *b; -  copy_shared_string(a, sp[-2].u.string); -  copy_shared_string(b, sp[-1].u.string); +  struct pike_type *a; +  struct pike_type *b; +  copy_type(a, sp[-2].u.type); +  copy_type(b, sp[-1].u.type);    o_compl(); /* ~b */    o_and(); /* a&~b */ -  push_string(a); -  sp[-1].type = T_TYPE; +  push_type_value(a);    o_compl(); /* ~a */ -  push_string(b); -  sp[-1].type = T_TYPE; +  push_type_value(b);    o_and(); /* ~a&b */    o_or(); /* (a&~b)|(~a&b) */    return;
2835:    push_type(T_NOT);    }    pop_stack(); -  push_string(pop_unfinished_type()); -  sp[-1].type = T_TYPE; +  push_type_value(pop_unfinished_type());    break;       case T_FUNCTION:
2851:    push_object_type(0, p->id);    push_type(T_NOT);    pop_stack(); -  push_string(pop_unfinished_type()); -  sp[-1].type = T_TYPE; +  push_type_value(pop_unfinished_type());    }    break;