Log of pike.git/src/array.c

1995-10-29

1995-10-29 01:15:04 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

5c8e89060d917cb3b06f831ed7df43e52b125c5c (101 lines) (+55/-46) ^{[

Show
| Annotate

]}
Branch: branches/E-12

uLPC

Rev: README:1.1.1.1
Rev: bin/create_testsuite:1.1.1.1
Rev: bin/export.lpc:1.1.1.1
Rev: bin/fixdepends.lpc:1.1.1.1
Rev: bin/hilfe.lpc:1.1.1.1
Rev: bin/rsif:1.1.1.1
Rev: bin/uhttpd.lpc:1.1.1.1
Rev: doc/README:1.1.1.1
Rev: doc/builtin/add_efun:1.1.1.1
Rev: doc/builtin/aggregate:1.1.1.1
Rev: doc/builtin/aggregate_list:1.1.1.1
Rev: doc/builtin/aggregate_mapping:1.1.1.1
Rev: doc/builtin/all_efuns:1.1.1.1
Rev: doc/builtin/allocate:1.1.1.1
Rev: doc/builtin/arrayp:1.1.1.1
Rev: doc/builtin/backtrace:1.1.1.1
Rev: doc/builtin/call_function:1.1.1.1
Rev: doc/builtin/call_out:1.1.1.1
Rev: doc/builtin/call_out_info:1.1.1.1
Rev: doc/builtin/catch:1.1.1.1
Rev: doc/builtin/clone:1.1.1.1
Rev: doc/builtin/combine_path:1.1.1.1
Rev: doc/builtin/compile_file:1.1.1.1
Rev: doc/builtin/compile_string:1.1.1.1
Rev: doc/builtin/copy_value:1.1.1.1
Rev: doc/builtin/crypt:1.1.1.1
Rev: doc/builtin/ctime:1.1.1.1
Rev: doc/builtin/destruct:1.1.1.1
Rev: doc/builtin/equal:1.1.1.1
Rev: doc/builtin/exit:1.1.1.1
Rev: doc/builtin/explode:1.1.1.1
Rev: doc/builtin/find_call_out:1.1.1.1
Rev: doc/builtin/floatp:1.1.1.1
Rev: doc/builtin/function_name:1.1.1.1
Rev: doc/builtin/function_object:1.1.1.1
Rev: doc/builtin/functionp:1.1.1.1
Rev: doc/builtin/getpid:1.1.1.1
Rev: doc/builtin/hash:1.1.1.1
Rev: doc/builtin/implode:1.1.1.1
Rev: doc/builtin/indices:1.1.1.1
Rev: doc/builtin/intp:1.1.1.1
Rev: doc/builtin/kill:1.1.1.1
Rev: doc/builtin/listp:1.1.1.1
Rev: doc/builtin/lower_case:1.1.1.1
Rev: doc/builtin/m_delete:1.1.1.1
Rev: doc/builtin/mappingp:1.1.1.1
Rev: doc/builtin/mkmapping:1.1.1.1
Rev: doc/builtin/next_object:1.1.1.1
Rev: doc/builtin/object_program:1.1.1.1
Rev: doc/builtin/objectp:1.1.1.1
Rev: doc/builtin/programp:1.1.1.1
Rev: doc/builtin/query_host_name:1.1.1.1
Rev: doc/builtin/query_num_arg:1.1.1.1
Rev: doc/builtin/random:1.1.1.1
Rev: doc/builtin/remove_call_out:1.1.1.1
Rev: doc/builtin/replace:1.1.1.1
Rev: doc/builtin/reverse:1.1.1.1
Rev: doc/builtin/rusage:1.1.1.1
Rev: doc/builtin/search:1.1.1.1
Rev: doc/builtin/signal:1.1.1.1
Rev: doc/builtin/signame:1.1.1.1
Rev: doc/builtin/signum:1.1.1.1
Rev: doc/builtin/sizeof:1.1.1.1
Rev: doc/builtin/sleep:1.1.1.1
Rev: doc/builtin/sscanf:1.1.1.1
Rev: doc/builtin/stringp:1.1.1.1
Rev: doc/builtin/sum:1.1.1.1
Rev: doc/builtin/this_object:1.1.1.1
Rev: doc/builtin/throw:1.1.1.1
Rev: doc/builtin/time:1.1.1.1
Rev: doc/builtin/trace:1.1.1.1
Rev: doc/builtin/upper_case:1.1.1.1
Rev: doc/builtin/values:1.1.1.1
Rev: doc/builtin/zero_type:1.1.1.1
Rev: doc/files/cd:1.1.1.1
Rev: doc/files/exec:1.1.1.1
Rev: doc/files/file:1.1.1.1
Rev: doc/files/file_stat:1.1.1.1
Rev: doc/files/fork:1.1.1.1
Rev: doc/files/get_dir:1.1.1.1
Rev: doc/files/getcwd:1.1.1.1
Rev: doc/files/mkdir:1.1.1.1
Rev: doc/files/mv:1.1.1.1
Rev: doc/files/perror:1.1.1.1
Rev: doc/files/port:1.1.1.1
Rev: doc/files/rm:1.1.1.1
Rev: doc/lpc/command_line_options:1.1.1.1
Rev: doc/lpc/hilfe.hilfe:1.1.1.1
Rev: doc/lpc/how_to_make_modules:1.1.1.1
Rev: doc/lpc/preprocessor:1.1.1.1
Rev: doc/lpc/reserved:1.1.1.1
Rev: doc/manual/i-overview.html:1.1.1.1
Rev: doc/manual/index.html:1.1.1.1
Rev: doc/manual/t-hello.html:1.1.1.1
Rev: doc/manual/ulpc-inside3.gif:1.1.1.1
Rev: doc/math/acos:1.1.1.1
Rev: doc/math/asin:1.1.1.1
Rev: doc/math/atan:1.1.1.1
Rev: doc/math/ceil:1.1.1.1
Rev: doc/math/cos:1.1.1.1
Rev: doc/math/exp:1.1.1.1
Rev: doc/math/floor:1.1.1.1
Rev: doc/math/log:1.1.1.1
Rev: doc/math/pow:1.1.1.1
Rev: doc/math/sin:1.1.1.1
Rev: doc/math/sqrt:1.1.1.1
Rev: doc/math/tan:1.1.1.1
Rev: doc/operators/addition:1.1.1.1
Rev: doc/regexp/regexp:1.1.1.1
Rev: doc/simulated/PI:1.1.1.1
Rev: doc/simulated/capitalize:1.1.1.1
Rev: doc/simulated/code_value:1.1.1.1
Rev: doc/simulated/describe_backtrace:1.1.1.1
Rev: doc/simulated/exec:1.1.1.1
Rev: doc/simulated/file_size:1.1.1.1
Rev: doc/simulated/filter_array:1.1.1.1
Rev: doc/simulated/get_function:1.1.1.1
Rev: doc/simulated/getenv:1.1.1.1
Rev: doc/simulated/l_sizeof:1.1.1.1
Rev: doc/simulated/m_indices:1.1.1.1
Rev: doc/simulated/m_sizeof:1.1.1.1
Rev: doc/simulated/m_values:1.1.1.1
Rev: doc/simulated/map_array:1.1.1.1
Rev: doc/simulated/master:1.1.1.1
Rev: doc/simulated/member_array:1.1.1.1
Rev: doc/simulated/popen:1.1.1.1
Rev: doc/simulated/previous_object:1.1.1.1
Rev: doc/simulated/read_bytes:1.1.1.1
Rev: doc/simulated/regexp:1.1.1.1
Rev: doc/simulated/search_array:1.1.1.1
Rev: doc/simulated/sort_array:1.1.1.1
Rev: doc/simulated/spawn:1.1.1.1
Rev: doc/simulated/strlen:1.1.1.1
Rev: doc/simulated/strstr:1.1.1.1
Rev: doc/simulated/sum_arrays:1.1.1.1
Rev: doc/simulated/system:1.1.1.1
Rev: doc/simulated/this_function:1.1.1.1
Rev: doc/simulated/write:1.1.1.1
Rev: doc/simulated/write_file:1.1.1.1
Rev: doc/sprintf/sprintf:1.1.1.1
Rev: doc/types/array:1.1.1.1
Rev: doc/types/float:1.1.1.1
Rev: doc/types/function:1.1.1.1
Rev: doc/types/int:1.1.1.1
Rev: doc/types/list:1.1.1.1
Rev: doc/types/mapping:1.1.1.1
Rev: doc/types/object:1.1.1.1
Rev: doc/types/program:1.1.1.1
Rev: doc/types/string:1.1.1.1
Rev: lib/master.lpc:1.1.1.1
Rev: lib/simulate.lpc:1.1.1.1
Rev: lib/testsuite.lpc:1.1.1.1
Rev: src/BUGS:1.1.1.1
Rev: src/COPYING:1.1.1.1
Rev: src/COPYRIGHT:1.1.1.1
Rev: src/ChangeLog:1.1.1.1
Rev: src/DISCLAIMER:1.1.1.1
Rev: src/Makefile.in:1.1.1.1
Rev: src/README:1.1.1.1
Rev: src/add_efun.c:1.1.1.1
Rev: src/add_efun.h:1.1.1.1
Rev: src/alloca.c:1.1.1.1
Rev: src/array.c:1.1.1.1
Rev: src/array.h:1.1.1.1
Rev: src/backend.c:1.1.1.1
Rev: src/backend.h:1.1.1.1
Rev: src/build_modlist_h:1.1.1.1
Rev: src/builtin_efuns.c:1.1.1.1
Rev: src/builtin_efuns.h:1.1.1.1
Rev: src/call_out.c:1.1.1.1
Rev: src/call_out.h:1.1.1.1
Rev: src/callback.c:1.1.1.1
Rev: src/callback.h:1.1.1.1
Rev: src/compilation.h:1.1.1.1
Rev: src/config.h:1.1.1.1
Rev: src/config.log:1.1.1.1
Rev: src/configure:1.1.1.1
Rev: src/configure.in:1.1.1.1
Rev: src/debug.c:1.1.1.1
Rev: src/debug.h:1.1.1.1
Rev: src/docode.c:1.1.1.1
Rev: src/docode.h:1.1.1.1
Rev: src/dynamic_buffer.c:1.1.1.1
Rev: src/dynamic_buffer.h:1.1.1.1
Rev: src/efun.h:1.1.1.1
Rev: src/error.c:1.1.1.1
Rev: src/error.h:1.1.1.1
Rev: src/fd_control.c:1.1.1.1
Rev: src/fd_control.h:1.1.1.1
Rev: src/fsort.c:1.1.1.1
Rev: src/fsort.h:1.1.1.1
Rev: src/get_linker_options:1.1.1.1
Rev: src/global.h:1.1.1.1
Rev: src/hashtable.c:1.1.1.1
Rev: src/hashtable.h:1.1.1.1
Rev: src/install-sh:1.1.1.1
Rev: src/interpret.c:1.1.1.1
Rev: src/interpret.h:1.1.1.1
Rev: src/language.y:1.1.1.1
Rev: src/las.c:1.1.1.1
Rev: src/las.h:1.1.1.1
Rev: src/lex.c:1.1.1.1
Rev: src/lex.h:1.1.1.1
Rev: src/list.c:1.1.1.1
Rev: src/list.h:1.1.1.1
Rev: src/lpc_signal.c:1.1.1.1
Rev: src/lpc_signal.h:1.1.1.1
Rev: src/lpc_types.c:1.1.1.1
Rev: src/lpc_types.h:1.1.1.1
Rev: src/machine.h.in:1.1.1.1
Rev: src/macros.h:1.1.1.1
Rev: src/main.c:1.1.1.1
Rev: src/main.h:1.1.1.1
Rev: src/make_modules:1.1.1.1
Rev: src/mapping.c:1.1.1.1
Rev: src/mapping.h:1.1.1.1
Rev: src/memory.c:1.1.1.1
Rev: src/memory.h:1.1.1.1
Rev: src/module.c:1.1.1.1
Rev: src/module.h:1.1.1.1
Rev: src/modules/efuns.c:1.1.1.1
Rev: src/modules/files/Makefile.in:1.1.1.1
Rev: src/modules/files/configure:1.1.1.1
Rev: src/modules/files/configure.in:1.1.1.1
Rev: src/modules/files/datagram.c:1.1.1.1
Rev: src/modules/files/efuns.c:1.1.1.1
Rev: src/modules/files/file.c:1.1.1.1
Rev: src/modules/files/file.h:1.1.1.1
Rev: src/modules/files/file_machine.h.in:1.1.1.1
Rev: src/modules/files/socket.c:1.1.1.1
Rev: src/modules/math/Makefile.in:1.1.1.1
Rev: src/modules/math/configure:1.1.1.1
Rev: src/modules/math/configure.in:1.1.1.1
Rev: src/modules/math/math.c:1.1.1.1
Rev: src/modules/regexp/Makefile.in:1.1.1.1
Rev: src/modules/regexp/configure:1.1.1.1
Rev: src/modules/regexp/configure.in:1.1.1.1
Rev: src/modules/regexp/glue.c:1.1.1.1
Rev: src/modules/regexp/regexp.c:1.1.1.1
Rev: src/modules/regexp/regexp.h:1.1.1.1
Rev: src/modules/sprintf/Makefile.in:1.1.1.1
Rev: src/modules/sprintf/configure:1.1.1.1
Rev: src/modules/sprintf/configure.in:1.1.1.1
Rev: src/modules/sprintf/sprintf.c:1.1.1.1
Rev: src/object.c:1.1.1.1
Rev: src/object.h:1.1.1.1
Rev: src/opcodes.c:1.1.1.1
Rev: src/opcodes.h:1.1.1.1
Rev: src/operators.c:1.1.1.1
Rev: src/operators.h:1.1.1.1
Rev: src/otable.h:1.1.1.1
Rev: src/port.c:1.1.1.1
Rev: src/port.h:1.1.1.1
Rev: src/program.c:1.1.1.1
Rev: src/program.h:1.1.1.1
Rev: src/rusage.c:1.1.1.1
Rev: src/rusage.h:1.1.1.1
Rev: src/stamp-h:1.1.1.1
Rev: src/stralloc.c:1.1.1.1
Rev: src/stralloc.h:1.1.1.1
Rev: src/stuff.c:1.1.1.1
Rev: src/stuff.h:1.1.1.1
Rev: src/svalue.c:1.1.1.1
Rev: src/svalue.h:1.1.1.1
Rev: src/todo:1.1.1.1
Rev: src/types.h:1.1.1.1
Rev: src/ualarm.c:1.1.1.1

717:   {    INT32 tmp;    if(tmp=(a->type - b->type)) return tmp; - #ifdef NORMALIZED_FLOATS - if(tmp=(a->u.integer - b->u.integer)) return tmp; - if(a->type == T_FUNCTION ) return a->subtype - b->subtype; - return 0; - #else +    switch(a->type)    {    case T_FLOAT:
730:    return 0;       case T_FUNCTION: - if(tmp=(a->u.integer - b->u.integer)) return tmp; + if(a->u.refs < b->u.refs) return -1; + if(a->u.refs > b->u.refs) return 1;    return a->subtype - b->subtype;    - default: + case T_INT:    return a->u.integer - b->u.integer; - + + default: + if(a->u.refs < b->u.refs) return -1; + if(a->u.refs > b->u.refs) return 1; + return 0;    } - #endif +   }    - static int set_anything_cmpfun(union anything *a, union anything *b) + static int set_anything_cmpfun_int(union anything *a, union anything *b)   {    return a->integer - b->integer;   }    - + static int set_anything_cmpfun_ptr(union anything *a, union anything *b) + { + if(a->refs < b->refs) return -1; + if(a->refs > b->refs) return 1; + return 0; + } +   static int set_anything_cmpfun_float(union anything *a, union anything *b)   {    if(a->float_number < b->float_number) return -1;
751:    return 0;   }    - #ifdef NORMALIZED_FLOATS - +   static short_cmpfun get_set_cmpfun(TYPE_T t)   { - return set_anything_cmpfun; - } - - #else - - static short_cmpfun get_set_cmpfun(TYPE_T t) + switch(t)    { - if(t == T_FLOAT) return set_anything_cmpfun_float; - return set_anything_cmpfun; + case T_FLOAT: return set_anything_cmpfun_float; + case T_INT: return set_anything_cmpfun_int; + default: return set_anything_cmpfun_ptr;    } - + }    - #endif - +   static int switch_anything_cmpfun_string(union anything *a, union anything *b)   { - + if(!a->string || !b->string) + return set_anything_cmpfun_ptr(a,b);    return my_strcmp(a->string, b->string);   }
778:   {    switch(t)    { - case T_INT: return set_anything_cmpfun; - case T_FLOAT: - return set_anything_cmpfun_float; - case T_STRING: - return switch_anything_cmpfun_string; + case T_INT: return set_anything_cmpfun_int; + case T_FLOAT: return set_anything_cmpfun_float; + case T_STRING: return switch_anything_cmpfun_string;    default:    error("Illegal type in switch.\n");    return 0; /* Make apcc happy */
810:    }   }    - +   /*    * return an 'order' suitable for making mappings, lists other sets    */
854:    if(a<v->size && fun(ITEM(v)+a,s)<0) a++;    return ~a;    - }else if(s->type == v->array_type){ + }else if(s->type == v->array_type || + (s->type==T_INT && v->array_type != T_FLOAT)){    short_cmpfun fun; - fun=backfun(s->type); + fun=backfun(v->array_type);       a=0;    b=v->size;
877:       }else{    /* face it, it's not there */ - if(s->type < v->array_type) return -1; + if((long)s->type < (long)v->array_type) return -1;    return ~v->size;    }   }
970:   struct array *compact_array(struct array *v)   {    INT32 e; + int type;    struct array *ret;    if(v->array_type != T_MIXED) return v;
977:       array_fix_type_field(v);    + type=-1;    switch(v->type_field)    { - case BIT_INT | BIT_STRING: - case BIT_INT | BIT_ARRAY: - case BIT_INT | BIT_MAPPING: - case BIT_INT | BIT_LIST: - case BIT_INT | BIT_OBJECT: - case BIT_INT | BIT_PROGRAM: + case BIT_INT | BIT_STRING: type=T_STRING; goto check_possible; + case BIT_INT | BIT_ARRAY: type=T_ARRAY; goto check_possible; + case BIT_INT | BIT_MAPPING: type=T_MAPPING; goto check_possible; + case BIT_INT | BIT_LIST: type=T_LIST; goto check_possible; + case BIT_INT | BIT_OBJECT: type=T_OBJECT; goto check_possible; + case BIT_INT | BIT_PROGRAM: type=T_PROGRAM; + + check_possible:    for(e=0; e<v->size; e++)    if(ITEM(v)[e].type == T_INT)    if(ITEM(v)[e].u.integer != 0)    return v;    - case BIT_INT: - case BIT_FLOAT: - case BIT_STRING: - case BIT_ARRAY: - case BIT_MAPPING: - case BIT_LIST: - case BIT_OBJECT: - case BIT_PROGRAM: - ret=allocate_array_no_init(v->size, 0, ITEM(v)[0].type); + goto do_compact; + + case BIT_INT: type=T_INT; goto do_compact; + case BIT_FLOAT: type=T_FLOAT; goto do_compact; + case BIT_STRING: type=T_STRING; goto do_compact; + case BIT_ARRAY: type=T_ARRAY; goto do_compact; + case BIT_MAPPING: type=T_MAPPING; goto do_compact; + case BIT_LIST: type=T_LIST; goto do_compact; + case BIT_OBJECT: type=T_OBJECT; goto do_compact; + case BIT_PROGRAM: type=T_PROGRAM; goto do_compact; + + do_compact: + ret=allocate_array_no_init(v->size, 0, type);    for(e=0; e<v->size; e++)    assign_to_short_svalue_no_free(SHORT_ITEM(ret)+e,    ITEM(v)[e].type,

pike.git/ src/ array.c

1995-10-29

1995-10-29 01:15:04 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>