Branch: Tag:

2001-03-03

2001-03-03 00:24:40 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Now uses MAKE_CONSTANT_TYPE().

Rev: src/builtin_functions.c:1.348
Rev: src/constants.c:1.28
Rev: src/las.c:1.242
Rev: src/program.c:1.300

5:   \*/   /**/   #include "global.h" - RCSID("$Id: builtin_functions.c,v 1.347 2001/02/28 04:18:42 hubbe Exp $"); + RCSID("$Id: builtin_functions.c,v 1.348 2001/03/03 00:23:21 grubba Exp $");   #include "interpret.h"   #include "svalue.h"   #include "pike_macros.h"
2435: Inside #if 1
  #if 1    if(deftype)    { + #ifdef USE_PIKE_TYPE +  t2 = make_pike_type(deftype); + #else /* !USE_PIKE_TYPE */    t2 = make_shared_binary_string(deftype, deftypelen); -  + #endif /* USE_PIKE_TYPE */    t = n->type;    n->type = or_pike_types(t,t2,0);    free_type(t);
2521:    /* FIXME: Should get the type from the pushed array. */    /* FIXME: Should probably be fixed in las.c:fix_type_field() */    /* FIXME: */ -  MAKE_CONSTANT_SHARED_STRING(new_type, tMap(tMixed, tMixed)); +  MAKE_CONSTANT_TYPE(new_type, tMap(tMixed, tMixed));    goto set_type;    }   #ifdef PIKE_DEBUG
2559:    }       if (!types[0]) { -  /* FIXME: */ -  MAKE_CONSTANT_SHARED_STRING(new_type, tMap(tZero, tZero)); +  MAKE_CONSTANT_TYPE(new_type, tMap(tZero, tZero));    goto set_type;    }   
2570:    push_type(T_MAPPING);    new_type = pop_unfinished_type();    } else { -  /* FIXME: */ -  MAKE_CONSTANT_SHARED_STRING(new_type, tMap(tZero, tZero)); +  MAKE_CONSTANT_TYPE(new_type, tMap(tZero, tZero));    goto set_type;    }    if (new_type) {