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

Fixed the logic for determining which of two node names is "best". 

The code was not enforcing an order of precedence, which meant
that the lexigraphical order of EFHNBest() was able to override
the simpler case of one of the node names being a top level port.
This commit is contained in:
R. Timothy Edwards 2026-02-16 12:02:32 -05:00
parent 3b1de8ff40
commit 7e9b6fb61e
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.603
8.3.604

31
extflat/EFbuild.c
View File

@ -2116,7 +2116,7 @@ efNodeMerge(node1ptr, node2ptr)
/* Make all EFNodeNames point to "keeping" */
if (removing->efnode_name)
{
bool topportk, topportr, bestname;
bool topportk, topportr, bestname, swapnames;
for (nn = removing->efnode_name; nn; nn = nn->efnn_next)
{
@ -2127,10 +2127,31 @@ efNodeMerge(node1ptr, node2ptr)
topportk = (keeping->efnode_flags & EF_TOP_PORT) ? TRUE : FALSE;
topportr = (removing->efnode_flags & EF_TOP_PORT) ? TRUE : FALSE;
/* Concatenate list of EFNodeNames, taking into account precedence */
if ((!keeping->efnode_name) || (!topportk && topportr)
|| EFHNBest(removing->efnode_name->efnn_hier,
keeping->efnode_name->efnn_hier))
/* The node "keeping" is being kept, but we need to decide which
* node name of the two will be the node name of "keeping". If
* "keeping" has the best node name, then we're good; otherwise,
* we need to copy the name from "removing" to "keeping".
*
* Order of precedence:
* 1) If one node does not have a name, then use the name of the other.
* 2) If one node is a port and the other isn't, then use the port name.
* 3) Use the one with the preferred lexigraphical order according to
* EFHNBest().
*/
if ((!keeping->efnode_name) && (removing->efnode_name))
swapnames = TRUE;
else if ((keeping->efnode_name) && (!removing->efnode_name))
swapnames = FALSE;
else if (!topportk && topportr)
swapnames = TRUE;
else if (topportk && !topportr)
swapnames = FALSE;
else
swapnames = EFHNBest(removing->efnode_name->efnn_hier,
keeping->efnode_name->efnn_hier);
/* Concatenate list of EFNodeNames */
if (swapnames)
{
/*
* New official name is that of "removing".