Branch: Tag:

2001-09-25

2001-09-25 05:55:13 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

fix for [bug 1858 (#1858)] (this_object() in constants)

Rev: src/array.c:1.119
Rev: src/array.h:1.38
Rev: src/mapping.c:1.138
Rev: src/mapping.h:1.40
Rev: src/multiset.c:1.39
Rev: src/multiset.h:1.19
Rev: src/program.c:1.373
Rev: src/svalue.c:1.125
Rev: src/svalue.h:1.97

5:   \*/      /* -  * $Id: array.h,v 1.37 2001/08/31 06:53:36 hubbe Exp $ +  * $Id: array.h,v 1.38 2001/09/25 05:55:10 hubbe Exp $    */   #ifndef ARRAY_H   #define ARRAY_H
96:   PMOD_EXPORT void simple_array_index_no_free(struct svalue *s,    struct array *a,struct svalue *ind);   PMOD_EXPORT void array_free_index(struct array *v,INT32 index); - PMOD_EXPORT void array_set_index(struct array *v,INT32 index, struct svalue *s); +    PMOD_EXPORT void simple_set_index(struct array *a,struct svalue *ind,struct svalue *s);   PMOD_EXPORT struct array *array_insert(struct array *v,struct svalue *s,INT32 index);   PMOD_EXPORT struct array *resize_array(struct array *a, INT32 size);
113:   PMOD_EXPORT void check_array_for_destruct(struct array *v);   PMOD_EXPORT INT32 array_find_destructed_object(struct array *v);   INT32 *get_order(struct array *v, cmpfun fun); - int set_svalue_cmpfun(const struct svalue *a, const struct svalue *b); + INLINE int set_svalue_cmpfun(const struct svalue *a, const struct svalue *b);   PMOD_EXPORT void sort_array_destructively(struct array *v);   PMOD_EXPORT INT32 *get_set_order(struct array *a);   PMOD_EXPORT INT32 *get_switch_order(struct array *a);
135:   PMOD_EXPORT struct array *array_zip(struct array *a, struct array *b,INT32 *zipper);   PMOD_EXPORT struct array *add_arrays(struct svalue *argp, INT32 args);   PMOD_EXPORT int array_equal_p(struct array *a, struct array *b, struct processing *p); - PMOD_EXPORT struct array *merge_array_with_order(struct array *a, struct array *b,INT32 op); + PMOD_EXPORT struct array *merge_array_with_order(struct array *a, +  struct array *b, INT32 op);   PMOD_EXPORT struct array *merge_array_without_order2(struct array *a, struct array *b,INT32 op);   PMOD_EXPORT struct array *merge_array_without_order(struct array *a,    struct array *b,    INT32 op);   PMOD_EXPORT struct array *subtract_arrays(struct array *a, struct array *b);   PMOD_EXPORT struct array *and_arrays(struct array *a, struct array *b); - int check_that_array_is_constant(struct array *a); + int array_is_constant(struct array *a, +  struct processing *p);   node *make_node_from_array(struct array *a);   PMOD_EXPORT void push_array_items(struct array *a);   void describe_array_low(struct array *a, struct processing *p, int indent);
160:   PMOD_EXPORT struct array *copy_array_recursively(struct array *a,struct processing *p);   PMOD_EXPORT void apply_array(struct array *a, INT32 args);   PMOD_EXPORT struct array *reverse_array(struct array *a); - PMOD_EXPORT void array_replace(struct array *a, + void array_replace(struct array *a,    struct svalue *from,    struct svalue *to);   PMOD_EXPORT void check_array(struct array *a);