luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup in usage of new_prop_string() and hash_names()

This commit is contained in:
stefan schippers 2023-09-28 23:19:14 +02:00
parent 433ec84278
commit db1bf8818a
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/actions.c
View File

@ -1205,7 +1205,7 @@ void attach_labels_to_inst(int interactive) /* offloaded from callback.c 201710
if(symname_pin && symname_wire) {
rebuild_selected_array();
k = xctx->lastsel;
first_call=1; /* 20171214 for place_symbol--> new_prop_string */
first_call=1;
prepare_netlist_structs(0);
for(j=0;j<k; ++j) if(xctx->sel_array[j].type==ELEMENT) {
found=1;
@ -1417,6 +1417,7 @@ int place_symbol(int pos, const char *symbol_name, double x, double y, short rot
if(i!=-1)
{
if(first_call) hash_names(-1, XINSERT);
check_inst_storage();
if(pos==-1 || pos > xctx->instances) n=xctx->instances;
else
@ -1450,7 +1451,6 @@ int place_symbol(int pos, const char *symbol_name, double x, double y, short rot
xctx->inst[n].prop_ptr=NULL;
xctx->inst[n].instname=NULL;
dbg(1, "place_symbol() :all inst_ptr members set\n"); /* 03-02-2000 */
if(first_call) hash_names(-1, XINSERT);
if(inst_props) {
new_prop_string(n, inst_props,!first_call, tclgetboolvar("disable_unique_names")); /* 20171214 first_call */
}

9
src/editprop.c
View File

@ -643,7 +643,7 @@ void set_inst_prop(int i)
my_strdup(_ALLOC_ID_, &xctx->inst[i].prop_ptr, ptr);
if(get_tok_value(ptr, "name",0)[0]) {
my_strdup(_ALLOC_ID_, &tmp, xctx->inst[i].prop_ptr);
new_prop_string(i, tmp, 0, tclgetboolvar("disable_unique_names"));
new_prop_string(i, tmp, 0, tclgetboolvar("disable_unique_names")); /* sets also inst[].instname */
my_free(_ALLOC_ID_, &tmp);
}
}
@ -1431,9 +1431,11 @@ static int update_symbol(const char *result, int x, int first_sel)
/* set unique name of current inst */
if(!pushed) { xctx->push_undo(); pushed=1;}
if(!k) hash_names(-1, XINSERT);
new_prop_string(*ii, ptr, k, tclgetboolvar("disable_unique_names")); /* set new prop_ptr */
hash_names(*ii, XDELETE);
new_prop_string(*ii, ptr, k, /* sets also inst[].instname */
tclgetboolvar("disable_unique_names")); /* set new prop_ptr */
hash_names(*ii, XINSERT);
}
set_inst_flags(&xctx->inst[*ii]);
/* set cached flags in instances */
type=xctx->sym[xctx->inst[*ii].ptr].type;
@ -1444,7 +1446,6 @@ static int update_symbol(const char *result, int x, int first_sel)
get_tok_value(xctx->inst[*ii].prop_ptr, "lab",0));
}
else xctx->inst[*ii].flags &= ~PIN_OR_LABEL;
} /* end for(k=0;k<xctx->lastsel; ++k) */
if(pushed) modified = 1;

6
src/move.c
View File

@ -1041,13 +1041,13 @@ void copy_objects(int what)
xctx->inst[xctx->instances].rot = (xctx->inst[xctx->instances].rot + ( (xctx->move_flip &&
(xctx->inst[xctx->instances].rot & 1) ) ? xctx->move_rot+2 : xctx->move_rot) ) & 0x3;
xctx->inst[xctx->instances].flip = (xctx->move_flip? !xctx->inst[n].flip:xctx->inst[n].flip);
my_strdup(_ALLOC_ID_, &xctx->inst[xctx->instances].instname, xctx->inst[n].instname);
/* the newpropcnt argument is zero for the 1st call and used in */
/* new_prop_string() for cleaning some internal caches. */
if(!newpropcnt) hash_names(-1, XINSERT);
new_prop_string(xctx->instances, xctx->inst[n].prop_ptr,newpropcnt++,
new_prop_string(xctx->instances, xctx->inst[n].prop_ptr,newpropcnt++, /* sets also inst[].instname */
tclgetboolvar("disable_unique_names"));
my_strdup(_ALLOC_ID_, &xctx->inst[xctx->instances].instname,
get_tok_value(xctx->inst[xctx->instances].prop_ptr, "name", 0));
hash_names(xctx->instances, XINSERT);
/* this is needed since no find_inst_to_be_redrawn() is executed if floaters are present */
if(floaters) symbol_bbox(xctx->instances,
&xctx->inst[xctx->instances].x1, &xctx->inst[xctx->instances].y1,

1
src/paste.c
View File

@ -279,6 +279,7 @@ static void merge_inst(int k,FILE *fd)
new_prop_string(i, prop_ptr, k, tclgetboolvar("disable_unique_names")); /* will also assign .instname */
/* the final tmp argument is zero for the 1st call and used in */
/* new_prop_string() for cleaning some internal caches. */
hash_names(i, XINSERT);
my_free(_ALLOC_ID_, &prop_ptr);
xctx->instances++;
}

11
src/scheduler.c
View File

@ -3319,9 +3319,10 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
if(prefix) name[0]=(char)prefix; /* change prefix if changing symbol type; */
my_strdup(_ALLOC_ID_, &ptr,subst_token(xctx->inst[inst].prop_ptr, "name", name) );
if(!fast) hash_names(-1, XINSERT);
new_prop_string(inst, ptr, fast, tclgetboolvar("disable_unique_names")); /* set new prop_ptr */
my_strdup(_ALLOC_ID_, &xctx->inst[inst].instname, get_tok_value(xctx->inst[inst].prop_ptr, "name", 0));
hash_names(inst, XDELETE);
new_prop_string(inst, ptr, fast, /* sets also inst[].instname */
tclgetboolvar("disable_unique_names")); /* set new prop_ptr */
hash_names(inst, XINSERT);
type=xctx->sym[xctx->inst[inst].ptr].type;
cond= type && IS_LABEL_SH_OR_PIN(type);
if(cond) {
@ -4021,15 +4022,17 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
xctx->prep_hash_inst=0;
xctx->prep_net_structs=0;
xctx->prep_hi_structs=0;
if(!strcmp(argv[4], "name")) hash_names(-1, XINSERT);
if(!strcmp(argv[4], "name") && fast == 0) hash_names(-1, XINSERT);
if(argc > 5) {
my_strdup2(_ALLOC_ID_, &subst, subst_token(xctx->inst[inst].prop_ptr, argv[4], argv[5]));
} else {/* assume argc == 5 , delete attribute */
my_strdup2(_ALLOC_ID_, &subst, subst_token(xctx->inst[inst].prop_ptr, argv[4], NULL));
}
hash_names(inst, XDELETE);
new_prop_string(inst, subst, fast, tclgetboolvar("disable_unique_names"));
my_free(_ALLOC_ID_, &subst);
set_inst_flags(&xctx->inst[inst]);
hash_names(inst, XINSERT);
type=xctx->sym[xctx->inst[inst].ptr].type;
cond= type && IS_LABEL_SH_OR_PIN(type);

6
src/token.c
View File

@ -61,6 +61,7 @@ void hash_names(int inst, int action)
int i, mult, start, stop;
char *upinst = NULL;
char *upinst_ptr, *upinst_state, *single_name;
dbg(1, "hash_names(): inst=%d, action=%d\n", inst, action);
if(inst == -1) {
int_hash_free(&xctx->inst_name_table);
int_hash_init(&xctx->inst_name_table, HASHSIZE);
@ -88,7 +89,7 @@ void hash_names(int inst, int action)
}
}
}
my_free(_ALLOC_ID_, &upinst);
if(upinst) my_free(_ALLOC_ID_, &upinst);
}
@ -187,7 +188,6 @@ void check_unique_names(int rename)
if( (xctx->inst[i].color != -10000)) {
my_strdup(_ALLOC_ID_, &tmp, xctx->inst[i].prop_ptr);
new_prop_string(i, tmp, newpropcnt++, 0);
my_strdup(_ALLOC_ID_, &xctx->inst[i].instname, get_tok_value(xctx->inst[i].prop_ptr, "name", 0));
hash_names(i, XINSERT);
symbol_bbox(i, &xctx->inst[i].x1, &xctx->inst[i].y1, &xctx->inst[i].x2, &xctx->inst[i].y2);
bbox(ADD, xctx->inst[i].x1, xctx->inst[i].y1, xctx->inst[i].x2, xctx->inst[i].y2);
@ -795,7 +795,6 @@ void new_prop_string(int i, const char *old_prop, int fast, int dis_uniq_names)
is_used = name_is_used(old_name);
if(dis_uniq_names || is_used == -1 || is_used == i) {
my_strdup(_ALLOC_ID_, &xctx->inst[i].prop_ptr, old_prop);
hash_names(i, XINSERT); /* add instance 'i' to xctx->inst_name_table */
my_free(_ALLOC_ID_, &old_name);
return;
}
@ -823,7 +822,6 @@ void new_prop_string(int i, const char *old_prop, int fast, int dis_uniq_names)
if(strcmp(new_prop, old_prop) ) {
my_strdup(_ALLOC_ID_, &xctx->inst[i].prop_ptr, new_prop);
my_strdup2(_ALLOC_ID_, &xctx->inst[i].instname, new_name);
hash_names(i, XINSERT);
}
my_free(_ALLOC_ID_, &old_name);
my_free(_ALLOC_ID_, &new_name);