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

Corrected the routines that determine the "best" name for a node 

so that they always give precedence to a port name over a global
name.
This commit is contained in:
Tim Edwards 2018-09-25 15:18:51 -04:00
parent d92a5a8506
commit 7189d84a08
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extflat/EFbuild.c
View File

@ -1451,7 +1451,8 @@ efNodeAddName(node, he, hn)
/* Link in the new name */ /* Link in the new name */
oldnn = node->efnode_name; oldnn = node->efnode_name;
if (oldnn == NULL || EFHNBest(newnn->efnn_hier, oldnn->efnn_hier)) if (oldnn == NULL || EFHNBest(newnn->efnn_hier, oldnn->efnn_hier)
|| (node->efnode_flags & EF_PORT))
{ {
/* New head of list */ /* New head of list */
newnn->efnn_next = oldnn; newnn->efnn_next = oldnn;
@ -1534,7 +1535,7 @@ efNodeMerge(node1, node2)
} }
/* Concatenate list of EFNodeNames, taking into account precedence */ /* Concatenate list of EFNodeNames, taking into account precedence */
if (EFHNBest(node2->efnode_name->efnn_hier, if ((node2->efnode_flags & EF_PORT) || EFHNBest(node2->efnode_name->efnn_hier,
node1->efnode_name->efnn_hier)) node1->efnode_name->efnn_hier))
{ {
/* /*