Associative List multiplication. about hyphy

[spond]

Two issues in _AssociativeList::Merge

1. delete p_keys would actually delete all the keys in "b" in the above example (bad idea)
2. I rewrote the function to use AVL traversal, because otherwise we may run into issues where some of the elements in the dataList are empty (results of deletion operations on the list, for example), which would cause a different segfault.

Please use the following code patch for ::Merge

//_____________________________________________________________________________________________
void        _AssociativeList::Merge (_PMathObj p)
{
    //SW20111207: I don't think we should ever have to worry about avl traversing 
    //here as long as the other methods are implemented properly


    if(p==this){
        return;
    }

    if (p && p->ObjectClass() == ASSOCIATIVE_LIST) {

       _AssociativeList *rhs = (_AssociativeList*) p;

        _SimpleList  hist;
        long         ls,
                     cn = rhs->avl.Traverser (hist,ls,rhs->avl.GetRoot());



       /*   SLKP20120111: we need to skip over "blanks" (e.g. resulting from previous delete operations)
            here; using the traversal of the second list is the easiest way to go. */

        while (cn >= 0) {
            MStore(*(_String*)(*(_List*)rhs->avl.dataList)(cn),(_PMathObj)rhs->avl.GetXtra (cn),true);
            cn = avl.Traverser (hist,ls);
        }
    }
    else {
        WarnError ("Associative list merge operation requires an associative list argument.");
    }
}

[stevenweaver]

Ah I introduced the bug. I should have taken a look at the code before assigning it to you.

My apologies.

I'll go ahead and apply the patch.

The idea behind my change was to start reusing methods that explicitly take care of storage in an effort to reduce the lines and complexity in some parts of the code. I notice a few problems where I was a bit short-sighted though. I understand what you're doing now.