pike.git/ src/ builtin.cmod

2003-02-08

2003-02-08 03:49:23 by Martin Stjernholm <mast@lysator.liu.se>

• de56ec6c2d8a189c9f41487f3efacff50da585a2 (26 lines) (+8/-18) ^{[ Show | Annotate ]}
  Branch: 7.9

Replaced MAKE_SHARED_CONSTANT_STRING with either MAKE_CONST_STRING or
REF_MAKE_CONST_STRING as appropriate.

Rev: src/builtin.cmod:1.115
Rev: src/interpret.h:1.126
Rev: src/iterators.cmod:1.34
Rev: src/language.yacc:1.315
Rev: src/las.c:1.324
Rev: src/opcodes.c:1.135
Rev: src/program.c:1.479
Rev: src/treeopt.in:1.73

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: builtin.cmod,v 1.114 2003/02/01 16:00:25 mast Exp $ + || $Id: builtin.cmod,v 1.115 2003/02/08 03:49:22 mast Exp $   */      #include "global.h"
372:    struct pike_string *gc_str;    if (facility->type != T_STRING)    SIMPLE_BAD_ARG_ERROR("trace", 2, "void|string"); -  MAKE_CONSTANT_SHARED_STRING(gc_str, "gc"); +  MAKE_CONST_STRING(gc_str, "gc");    if (facility->u.string == gc_str) { -  free_string(gc_str); +     old_level = gc_trace;    gc_trace = level;    }    else { -  free_string(gc_str); +     bad_arg_error("trace", Pike_sp-args, args, 2,    "trace facility identifier", Pike_sp-args+1,    "Bad argument 2 to trace(). Unknown trace facility.");
458:    SIMPLE_BAD_ARG_ERROR ("Pike.gc_parameters", 1, "void|mapping");      #define HANDLE_PARAM(NAME, CHECK_AND_SET, GET) do { \ -  MAKE_CONSTANT_SHARED_STRING (str, NAME); \ -  free_string (str); /* Got a ref above anyway. */ \ +  MAKE_CONST_STRING (str, NAME); \    if ((set = low_mapping_string_lookup (params->u.mapping, str))) { \    CHECK_AND_SET; \    } \
1638:    {    struct pike_string *string_t;    struct pike_string *int_t; -  MAKE_CONSTANT_SHARED_STRING( string_t, "string" ); -  MAKE_CONSTANT_SHARED_STRING( int_t, "int" ); +  MAKE_CONST_STRING( string_t, "string" ); +  MAKE_CONST_STRING( int_t, "int" );       if( type == string_t )    { -  free_string(string_t); -  free_string(int_t); +     pop_n_elems( args );    if( Pike_fp->current_object->refs != 1 )    f_Buffer_get_copy( 0 );
1653:    return;    }    -  free_string(string_t); -  +     if( type == int_t )    {    struct Buffer_struct *str = THIS; -  free_string(int_t); +     pop_stack();    if( Pike_fp->current_object->refs != 1 )    f_Buffer_get_copy( 0 );
1667:    o_cast_to_int( );    return;    } -  free_string(int_t); +     Pike_error("Cannot cast to %s\n", type->str );    }   
2301:    struct pike_string *usec;    struct pike_string *sec;    -  MAKE_CONSTANT_SHARED_STRING( sec, "sec" ); -  free_string (sec); -  MAKE_CONSTANT_SHARED_STRING( usec, "usec" ); -  free_string (usec); +  MAKE_CONST_STRING( sec, "sec" ); +  MAKE_CONST_STRING( usec, "usec" );       if( !x )    RETURN 0;