method HasNext()->boolean
{
return Node_$T$(this).Next == 0; // This is wrong, should be != 0.
} method IsFinished()->boolean
{
return this == 0;
}//.
private method Fetch($T$ key)->Node_$T$
{
return LoadInteger(Table,integer(this),$HashFunc$(key));
}//.
method Add($T$ key,integer value)->boolean
{
Node_$T$ node;
if(m_count > 0 && Contains(key)) return false; // m_count > 0 is the common case, I wouldn't have this check...
node = Node_$T$.create(key,value);
if(m_count > 0)
{
m_first.Prev = node;
node.Next = m_first;
}
m_first = node;
m_count+=1;
SaveInteger(Table,integer(this),$HashFunc$(key),node);
return true;
}//.
if(m_count > 0)
{
m_first.Prev = node;
node.Next = m_first;
}
m_first = node;//.
Prev.Next = node; // no first check, no extra first array thing
node.Prev=Prev
node.Next=this
Prev=node//.
Node_$T$ node;
integer retVal = 0;
if(key == m_first.Key) // first element.
{
RemoveSavedInteger(Table,integer(this),$HashFunc$(key),m_first);
retVal = m_first.Value;
node = m_first;
m_first = m_first.Next;
node.destroy();
m_count-=1;
return retVal;
}
node = Fetch(key);
if(node == 0) return retVal;
RemoveSavedInteger(Table,integer(this),$HashFunc$(key),node);
retVal = node.Value;
node.Prev.Next = node.Next;
node.Next.Prev = node.Prev;
node.destroy();
//m_count-=1; // <-- this line is missing, your count seems to be broken.//.
Node_$T$ node = Fetch(key);
integer retVal = node.Value; // if the node is 0, the value of an array at slot 0 is 0 anyway.
if(retVal != 0)
{
RemoveSavedInteger(Table,integer(this),$HashFunc$(key),node);
node.Prev.Next = node.Next;
node.Next.Prev = node.Prev;
node.destroy();
m_count-=1;
}
return retVal;
Though about that, but then it won't inline, so I still wouldn't use it.
JASS://. private method Fetch($T$ key)->Node_$T$ { return LoadInteger(Table,integer(this),$HashFunc$(key)); }
This is too low in your struct. In vJass, that would be called with a trigger evaluate. Is that the same for Zinc? Major optimisation just for moving it (the inline engine screws up if you have something try to inline through two func/method calls and an evaluate).
JASS://. method Add($T$ key,integer value)->boolean { Node_$T$ node; if(m_count > 0 && Contains(key)) return false; // m_count > 0 is the common case, I wouldn't have this check... node = Node_$T$.create(key,value); if(m_count > 0) { m_first.Prev = node; node.Next = m_first; } m_first = node; m_count+=1; SaveInteger(Table,integer(this),$HashFunc$(key),node); return true; }
(See comment above.)
JASS://. if(m_count > 0) { m_first.Prev = node; node.Next = m_first; } m_first = node;
-->
Make Dict extend Node...
JASS://. Prev.Next = node; // no first check, no extra first array thing node.Prev=Prev node.Next=this Prev=node
And then...
JASS://. Node_$T$ node; integer retVal = 0; if(key == m_first.Key) // first element. { RemoveSavedInteger(Table,integer(this),$HashFunc$(key),m_first); retVal = m_first.Value; node = m_first; m_first = m_first.Next; node.destroy(); m_count-=1; return retVal; } node = Fetch(key); if(node == 0) return retVal; RemoveSavedInteger(Table,integer(this),$HashFunc$(key),node); retVal = node.Value; node.Prev.Next = node.Next; node.Next.Prev = node.Prev; node.destroy(); //m_count-=1; // <-- this line is missing, your count seems to be broken.
-->
JASS://. Node_$T$ node = Fetch(key); integer retVal = node.Value; // if the node is 0, the value of an array at slot 0 is 0 anyway. if(retVal != 0) { RemoveSavedInteger(Table,integer(this),$HashFunc$(key),node); node.Prev.Next = node.Next; node.Next.Prev = node.Prev; node.destroy(); m_count-=1; } return retVal;
Feel the magic.
Now instead of exitwhen this==0, you need to use exitwhen this==dict (single var read). But your add/remove logic is cleaner and faster.
if(dict.Contains(7))then
set res = dict[7]
endif if(dict.TryGetValue(7))then
set res = dict.Value
endif
Varine:
Varine:
The Helper:
Varine:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
The Helper:
