Add comments for posterity.

This commit is contained in:
zardoru
2015-02-05 23:30:32 -03:00
parent 597a17dd30
commit da3326ab31
+2 -7
View File
@@ -230,7 +230,6 @@ struct bmsCommandTree
int conditionTriggerValue; // value which triggers this branch. does not apply to #ELSE int conditionTriggerValue; // value which triggers this branch. does not apply to #ELSE
}; };
bool Triggered;
BMSHeaders Commands; BMSHeaders Commands;
vector<RString> ChannelCommands; vector<RString> ChannelCommands;
vector<bmsNodeS*> branches; vector<bmsNodeS*> branches;
@@ -238,7 +237,6 @@ struct bmsCommandTree
bmsNodeS() bmsNodeS()
{ {
Triggered = true;
parent = NULL; parent = NULL;
conditionValue = 0; conditionValue = 0;
conditionType = CT_NULL; conditionType = CT_NULL;
@@ -359,7 +357,6 @@ struct bmsCommandTree
FOREACH(bmsNodeS*, node->branches, b) FOREACH(bmsNodeS*, node->branches, b)
if (evaluateNode(*b, headersOut, linesOut)) if (evaluateNode(*b, headersOut, linesOut))
{ {
node->Triggered = true;
return true; return true;
} }
@@ -379,16 +376,13 @@ struct bmsCommandTree
{ {
appendNodeElements(node, headersOut, linesOut); appendNodeElements(node, headersOut, linesOut);
triggerBranches(node, headersOut, linesOut); triggerBranches(node, headersOut, linesOut);
return true; return true; // returning true means to stop trying to triggering branches
} }
break; break;
case bmsNodeS::CT_ELSE: case bmsNodeS::CT_ELSE:
if (!node->parent->Triggered) // we're the only branch left, so okay, evaluate.
{
appendNodeElements(node, headersOut, linesOut); appendNodeElements(node, headersOut, linesOut);
triggerBranches(node, headersOut, linesOut); triggerBranches(node, headersOut, linesOut);
return true; return true;
}
break; break;
case bmsNodeS::CT_NULL: case bmsNodeS::CT_NULL:
appendNodeElements(node, headersOut, linesOut); appendNodeElements(node, headersOut, linesOut);
@@ -397,6 +391,7 @@ struct bmsCommandTree
break; break;
} }
// returning false means to execute any other branches.
return false; return false;
} }