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

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2018-09-27 08:16:08 -04:00
parent 45b6a78245 7d3cf14cdb
commit 6f841f1ff8
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extflat/EFbuild.c
View File

@ -1442,6 +1442,7 @@ efNodeAddName(node, he, hn)
{ {
EFNodeName *newnn; EFNodeName *newnn;
EFNodeName *oldnn; EFNodeName *oldnn;
bool topport;
newnn = (EFNodeName *) mallocMagic((unsigned)(sizeof (EFNodeName))); newnn = (EFNodeName *) mallocMagic((unsigned)(sizeof (EFNodeName)));
newnn->efnn_node = node; newnn->efnn_node = node;
@ -1449,10 +1450,13 @@ efNodeAddName(node, he, hn)
newnn->efnn_port = -1; newnn->efnn_port = -1;
HashSetValue(he, (char *) newnn); HashSetValue(he, (char *) newnn);
topport = ((node->efnode_flags & EF_PORT) &&
(node->efnode_name->efnn_hier->hn_parent == NULL)) ?
TRUE : FALSE;
/* 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) || topport)
|| (node->efnode_flags & EF_PORT))
{ {
/* New head of list */ /* New head of list */
newnn->efnn_next = oldnn; newnn->efnn_next = oldnn;
@ -1528,14 +1532,20 @@ efNodeMerge(node1, node2)
/* Make all EFNodeNames point to node1 */ /* Make all EFNodeNames point to node1 */
if (node2->efnode_name) if (node2->efnode_name)
{ {
bool topport;
for (nn = node2->efnode_name; nn; nn = nn->efnn_next) for (nn = node2->efnode_name; nn; nn = nn->efnn_next)
{ {
nnlast = nn; nnlast = nn;
nn->efnn_node = node1; nn->efnn_node = node1;
} }
topport = ((node2->efnode_flags & EF_PORT) &&
(node2->efnode_name->efnn_hier->hn_parent == NULL)) ?
TRUE : FALSE;
/* Concatenate list of EFNodeNames, taking into account precedence */ /* Concatenate list of EFNodeNames, taking into account precedence */
if ((node2->efnode_flags & EF_PORT) || EFHNBest(node2->efnode_name->efnn_hier, if (topport || EFHNBest(node2->efnode_name->efnn_hier,
node1->efnode_name->efnn_hier)) node1->efnode_name->efnn_hier))
{ {
/* /*